Display item text when viewing subitems

gruvw · Nov 25, 2023 · ec9246d · ec9246d
1 parent 96d38c5
commit ec9246d
Show file tree

Hide file tree

Showing 8 changed files with 315 additions and 68 deletions.
diff --git a/lib/global/styles/layouts.dart b/lib/global/styles/layouts.dart
@@ -14,11 +14,14 @@ abstract class CollectionLayout {
   static const titleSectionDividerWidth = 3.0;
   static const titleVerticalPadding = 10.0;
   static const titleHorizontalPadding = 10.0;
+  static const itemTextVerticalPadding = 2.0;
+
+  static const contentVerticalPadding = 8.0;
+  static const contentHorizontalPadding = 6.0;
 
   static const dividerWidth = 1.0;
   static const fatDividerWidth = 2.0;
 
-  static const contentRightPadding = 10.0;
   static const slidableWidth = 100.0;
   static const slideThreshold = 0.9;
 

diff --git a/lib/state/application/collection.dart b/lib/state/application/collection.dart
@@ -65,3 +65,13 @@ List<Item>? items(
       .sorted(ordering)
       .toList();
 }
+
+@riverpod
+Collection? parent(
+  ParentRef ref, {
+  required String? itemId,
+}) {
+  final item = ref.watch(itemProvider(itemId: itemId));
+  final parent = ref.watch(collectionProvider(collectionId: item?.parentId));
+  return parent;
+}
diff --git a/lib/state/application/collection.g.dart b/lib/state/application/collection.g.dart
diff --git a/lib/widgets/collections/collection_entry.dart b/lib/widgets/collections/collection_entry.dart
@@ -6,27 +6,35 @@ import 'package:open_items/global/styles/ui_colors.dart';
 import 'package:open_items/global/styles/ui_text.dart';
 
 class CollectionEntry extends StatelessWidget {
-  final Widget? icon;
-  final VoidCallback? onIconClick;
+  final Widget? leading;
+  final VoidCallback? leadingOnClick;
   final VoidCallback? onClick;
   final VoidCallback? onDelete;
   final Object? groupTag;
   final bool reorderEnabled;
+  final bool divider;
   final bool fatDividier;
   final int index;
   final String content;
   final bool isFat;
+  final bool slidable;
+  final bool reversed;
+  final bool wrap;
 
   const CollectionEntry({
     super.key,
     this.onClick,
-    this.icon,
-    this.onIconClick,
+    this.leading,
+    this.leadingOnClick,
     this.onDelete,
     this.groupTag,
+    this.slidable = true,
     this.reorderEnabled = true,
+    this.divider = true,
     this.fatDividier = false,
     this.isFat = false,
+    this.reversed = false,
+    this.wrap = false,
     required this.index,
     required this.content,
   });
@@ -37,30 +45,36 @@ class CollectionEntry extends StatelessWidget {
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.stretch,
         children: [
-          if (icon != null)
-            IconButton(
-              color: UIColors.primary,
-              disabledColor: UIColors.primary,
-              onPressed: onIconClick,
-              icon: icon!,
+          if (leading != null)
+            Column(
+              children: [
+                IconButton(
+                  color: UIColors.primary,
+                  disabledColor: UIColors.primary,
+                  onPressed: leadingOnClick,
+                  icon: leading!,
+                  style: IconButton.styleFrom(
+                    // Reset material padding and boxes
+                    padding: const EdgeInsets.only(
+                      right: CollectionLayout.contentHorizontalPadding,
+                    ),
+                    minimumSize: Size.zero,
+                    tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                  ),
+                ),
+              ],
             ),
           Expanded(
             child: InkWell(
               hoverColor: UIColors.none,
               onTap: onClick,
-              child: Row(
-                children: [
-                  Expanded(
-                    child: Text(
-                      this.content,
-                      overflow: TextOverflow.ellipsis,
-                      style: UITexts.normalText.copyWith(
-                        fontWeight: isFat ? FontWeight.w600 : FontWeight.normal,
-                      ),
-                    ),
-                  ),
-                  const SizedBox(width: CollectionLayout.contentRightPadding),
-                ],
+              child: Text(
+                this.content,
+                overflow: wrap ? null : TextOverflow.ellipsis,
+                style: UITexts.normalText.copyWith(
+                  fontWeight: isFat ? FontWeight.w600 : FontWeight.normal,
+                  color: reversed ? UIColors.secondary : UIColors.primary,
+                ),
               ),
             ),
           ),
@@ -78,6 +92,7 @@ class CollectionEntry extends StatelessWidget {
       child: Column(
         children: [
           Slidable(
+            enabled: slidable,
             groupTag: groupTag,
             endActionPane: ActionPane(
               motion: const StretchMotion(),
@@ -96,13 +111,20 @@ class CollectionEntry extends StatelessWidget {
                 )
               ],
             ),
-            child: content,
-          ),
-          Divider(
-            height: dividerWidth,
-            thickness: dividerWidth,
-            color: UIColors.primary,
+            child: Padding(
+              padding: const EdgeInsets.symmetric(
+                vertical: CollectionLayout.contentVerticalPadding,
+                horizontal: CollectionLayout.contentHorizontalPadding,
+              ),
+              child: content,
+            ),
           ),
+          if (divider)
+            Divider(
+              height: dividerWidth,
+              thickness: dividerWidth,
+              color: UIColors.primary,
+            ),
         ],
       ),
     );