Multi-line texts on items + better icon padding / click

gruvw · Nov 25, 2023 · 5aed4e5 · 5aed4e5
1 parent ec9246d
commit 5aed4e5
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 19 deletions.
diff --git a/lib/global/styles/layouts.dart b/lib/global/styles/layouts.dart
@@ -51,7 +51,7 @@ abstract class ButtonLayout {
 abstract class TextInputLayout {
   static const borderWidth = 2.0;
 
-  static const contentVerticalPadding = 2.0;
+  static const contentVerticalPadding = 8.0;
   static const contentHorizontalPadding = 10.0;
 
   static const errorMaxLines = 10;

diff --git a/lib/widgets/collections/collection_entry.dart b/lib/widgets/collections/collection_entry.dart
@@ -48,18 +48,16 @@ class CollectionEntry extends StatelessWidget {
           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,
+                InkWell(
+                  onTap: leadingOnClick,
+                  child: Padding(
+                    padding: const EdgeInsets.fromLTRB(
+                      0,
+                      CollectionLayout.contentVerticalPadding,
+                      CollectionLayout.contentHorizontalPadding,
+                      CollectionLayout.contentVerticalPadding,
                     ),
-                    minimumSize: Size.zero,
-                    tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                    child: leading!,
                   ),
                 ),
               ],
@@ -68,12 +66,18 @@ class CollectionEntry extends StatelessWidget {
             child: InkWell(
               hoverColor: UIColors.none,
               onTap: onClick,
-              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,
+              child: Padding(
+                padding: const EdgeInsets.symmetric(
+                  vertical: CollectionLayout.contentVerticalPadding,
+                ),
+                child: Text(
+                  this.content,
+                  maxLines: wrap ? null : 1,
+                  overflow: wrap ? null : TextOverflow.ellipsis,
+                  style: UITexts.normalText.copyWith(
+                    fontWeight: isFat ? FontWeight.w600 : FontWeight.normal,
+                    color: reversed ? UIColors.secondary : UIColors.primary,
+                  ),
                 ),
               ),
             ),
@@ -113,7 +117,6 @@ class CollectionEntry extends StatelessWidget {
             ),
             child: Padding(
               padding: const EdgeInsets.symmetric(
-                vertical: CollectionLayout.contentVerticalPadding,
                 horizontal: CollectionLayout.contentHorizontalPadding,
               ),
               child: content,

diff --git a/lib/widgets/collections/collection_page/collection_page.dart b/lib/widgets/collections/collection_page/collection_page.dart
@@ -224,6 +224,7 @@ class CollectionPage extends ConsumerWidget {
           builder: (_) => TextDialog(
             title: "New Item Text",
             submitText: "Create",
+            wrap: true,
             capitalization: TextCapitalization.sentences,
             placeholder: UIPlaceholders.itemText,
             validation: validItemText,

diff --git a/lib/widgets/collections/dialogs/edit_item_text.dart b/lib/widgets/collections/dialogs/edit_item_text.dart
@@ -34,6 +34,7 @@ class EditItemTextDialog extends ConsumerWidget {
     return TextDialog(
       title: "Edit Item Text",
       submitText: "Edit",
+      wrap: true,
       capitalization: TextCapitalization.sentences,
       placeholder: UIPlaceholders.itemText,
       initialValue: item.text,

diff --git a/lib/widgets/components/input/text.dart b/lib/widgets/components/input/text.dart
@@ -14,6 +14,7 @@ class TextInput extends HookWidget {
   final bool? obscureText;
   final TextCapitalization? capitalization;
   final bool autoFocus;
+  final bool wrap;
   final void Function(String value)? onChanged;
 
   const TextInput({
@@ -25,6 +26,7 @@ class TextInput extends HookWidget {
     this.obscureText,
     this.onChanged,
     this.capitalization,
+    this.wrap = false,
     this.autoFocus = false,
   });
 
@@ -75,6 +77,7 @@ class TextInput extends HookWidget {
       style: UITexts.normalText,
       cursorColor: UIColors.primary,
       onChanged: onChanged,
+      maxLines: wrap ? null : 1,
       decoration: InputDecoration(
         contentPadding: const EdgeInsets.symmetric(
           vertical: TextInputLayout.contentVerticalPadding,

diff --git a/lib/widgets/components/modals/text_dialog.dart b/lib/widgets/components/modals/text_dialog.dart
@@ -17,6 +17,7 @@ class TextDialog extends HookWidget {
   final String? submitText;
   final String? cancelText;
   final TextCapitalization? capitalization;
+  final bool wrap;
 
   const TextDialog({
     super.key,
@@ -30,6 +31,7 @@ class TextDialog extends HookWidget {
     this.submitText,
     this.cancelText,
     this.capitalization,
+    this.wrap = false,
   });
 
   @override
@@ -59,6 +61,7 @@ class TextDialog extends HookWidget {
       },
       body: TextInput(
         autoFocus: true,
+        wrap: wrap,
         controller: offlineNameController,
         placeholder: placeholder,
         label: inputLabel,