TF-913 Fix button text line break in advanced search view

2022-09-21 11:52:42 +07:00
parent 7fe899daf5
commit d0ff07edfb
7 changed files with 182 additions and 139 deletions
@@ -22,71 +22,68 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>

  @override
  Widget build(BuildContext context) {
-    return Material(
-      color: Colors.white,
-      child: Column(
-        children: [
-          _buildSuggestionFilterField(
-            listTagSelected: controller.searchEmailFilter.from,
+    return Column(
+      children: [
+        _buildSuggestionFilterField(
+          listTagSelected: controller.searchEmailFilter.from,
+          context: context,
+          advancedSearchFilterField: AdvancedSearchFilterField.form,
+          listTagInitial: controller.searchEmailFilter.from,
+          currentFocusNode: controller.focusManager.fromFieldFocusNode,
+          nextFocusNode: controller.focusManager.toFieldFocusNode
+        ),
+        _buildSuggestionFilterField(
+          listTagSelected: controller.searchEmailFilter.to,
+          context: context,
+          advancedSearchFilterField: AdvancedSearchFilterField.to,
+          listTagInitial: controller.searchEmailFilter.to,
+          currentFocusNode: controller.focusManager.toFieldFocusNode,
+          nextFocusNode: controller.focusManager.subjectFieldFocusNode
+        ),
+        _buildFilterField(
+          textEditingController: controller.subjectFilterInputController,
+          context: context,
+          advancedSearchFilterField: AdvancedSearchFilterField.subject,
+          currentFocusNode: controller.focusManager.subjectFieldFocusNode,
+          nextFocusNode: controller.focusManager.hasKeywordFieldFocusNode
+        ),
+        _buildFilterField(
+          textEditingController: controller.hasKeyWordFilterInputController,
+          context: context,
+          advancedSearchFilterField: AdvancedSearchFilterField.hasKeyword,
+          currentFocusNode: controller.focusManager.hasKeywordFieldFocusNode,
+          nextFocusNode: controller.focusManager.notKeywordFieldFocusNode
+        ),
+        _buildFilterField(
+          textEditingController: controller.notKeyWordFilterInputController,
+          context: context,
+          advancedSearchFilterField: AdvancedSearchFilterField.notKeyword,
+          currentFocusNode: controller.focusManager.notKeywordFieldFocusNode,
+          nextFocusNode: controller.focusManager.mailboxFieldFocusNode,
+        ),
+        _buildFilterField(
+            textEditingController: controller.mailBoxFilterInputController,
            context: context,
-            advancedSearchFilterField: AdvancedSearchFilterField.form,
-            listTagInitial: controller.searchEmailFilter.from,
-            currentFocusNode: controller.focusManager.fromFieldFocusNode,
-            nextFocusNode: controller.focusManager.toFieldFocusNode
-          ),
-          _buildSuggestionFilterField(
-            listTagSelected: controller.searchEmailFilter.to,
-            context: context,
-            advancedSearchFilterField: AdvancedSearchFilterField.to,
-            listTagInitial: controller.searchEmailFilter.to,
-            currentFocusNode: controller.focusManager.toFieldFocusNode,
-            nextFocusNode: controller.focusManager.subjectFieldFocusNode
-          ),
-          _buildFilterField(
-            textEditingController: controller.subjectFilterInputController,
-            context: context,
-            advancedSearchFilterField: AdvancedSearchFilterField.subject,
-            currentFocusNode: controller.focusManager.subjectFieldFocusNode,
-            nextFocusNode: controller.focusManager.hasKeywordFieldFocusNode
-          ),
-          _buildFilterField(
-            textEditingController: controller.hasKeyWordFilterInputController,
-            context: context,
-            advancedSearchFilterField: AdvancedSearchFilterField.hasKeyword,
-            currentFocusNode: controller.focusManager.hasKeywordFieldFocusNode,
-            nextFocusNode: controller.focusManager.notKeywordFieldFocusNode
-          ),
-          _buildFilterField(
-            textEditingController: controller.notKeyWordFilterInputController,
-            context: context,
-            advancedSearchFilterField: AdvancedSearchFilterField.notKeyword,
-            currentFocusNode: controller.focusManager.notKeywordFieldFocusNode,
-            nextFocusNode: controller.focusManager.mailboxFieldFocusNode,
-          ),
-          _buildFilterField(
-              textEditingController: controller.mailBoxFilterInputController,
-              context: context,
-              advancedSearchFilterField: AdvancedSearchFilterField.mailBox,
-              isSelectFormList: true,
-              currentFocusNode: controller.focusManager.mailboxFieldFocusNode,
-              nextFocusNode: controller.focusManager.attachmentCheckboxFocusNode,
-              mouseCursor: SystemMouseCursors.click,
-              onTap: () => controller.selectedMailBox()),
-          _buildFilterField(
-            textEditingController: controller.dateFilterInputController,
-            context: context,
-            advancedSearchFilterField: AdvancedSearchFilterField.date,
+            advancedSearchFilterField: AdvancedSearchFilterField.mailBox,
            isSelectFormList: true,
-            onTap: () {
-              openContextMenuAction(
-                context,
-                _buildEmailReceiveTimeTypeActionTiles(context),
-              );
-            },
-          ),
-          AdvancedSearchFilterFormBottomView(focusManager: controller.focusManager)
-        ],
-      ),
+            currentFocusNode: controller.focusManager.mailboxFieldFocusNode,
+            nextFocusNode: controller.focusManager.attachmentCheckboxFocusNode,
+            mouseCursor: SystemMouseCursors.click,
+            onTap: () => controller.selectedMailBox()),
+        _buildFilterField(
+          textEditingController: controller.dateFilterInputController,
+          context: context,
+          advancedSearchFilterField: AdvancedSearchFilterField.date,
+          isSelectFormList: true,
+          onTap: () {
+            openContextMenuAction(
+              context,
+              _buildEmailReceiveTimeTypeActionTiles(context),
+            );
+          },
+        ),
+        AdvancedSearchFilterFormBottomView(focusManager: controller.focusManager)
+      ],
    );
  }

@@ -347,10 +344,8 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
    return RawKeyboardListener(
      focusNode: currentFocusNode ?? FocusNode(),
      onKey: (event) {
-        log('AdvancedSearchInputForm::_buildTextField(): Event runtimeType is ${event.runtimeType}');
        if (event is RawKeyDownEvent &&
            event.logicalKey == LogicalKeyboardKey.tab) {
-          log('AdvancedSearchInputForm::_buildTextField(): PRESS TAB');
          nextFocusNode?.requestFocus();
        }
      },
@@ -382,9 +377,11 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
            ),
          ),
          hintText: advancedSearchFilterField.getHintText(context),
-          hintStyle: const TextStyle(
-            fontSize: 14,
-            color: AppColor.colorHintSearchBar,
+          hintStyle: TextStyle(
+            fontSize: 16,
+            color: advancedSearchFilterField == AdvancedSearchFilterField.mailBox
+              ? Colors.black
+              : AppColor.colorHintSearchBar,
          ),
          suffixIconConstraints: const BoxConstraints(minHeight: 24, minWidth: 24),
          suffixIcon: isSelectFormList
@@ -65,8 +65,8 @@ class AdvancedSearchFilterFormBottomView extends GetWidget<AdvancedFilterControl
              controller.cleanSearchFilter(context);
              popBack();
            },
-            colorButton: AppColor.primaryColor.withOpacity(0.06),
-            colorText: AppColor.primaryColor,
+            colorButton: Colors.white,
+            colorText: AppColor.colorContentEmail,
            text: AppLocalizations.of(context).clearFilter,
            context: context,
            responsiveUtils: responsiveUtils,
@@ -96,11 +96,12 @@ class AdvancedSearchFilterFormBottomView extends GetWidget<AdvancedFilterControl
            controller.cleanSearchFilter(context);
            popBack();
          },
-          colorButton: AppColor.primaryColor.withOpacity(0.06),
-          colorText: AppColor.primaryColor,
+          colorButton: Colors.white,
+          colorText: AppColor.colorContentEmail,
          text: AppLocalizations.of(context).clearFilter,
          context: context,
          responsiveUtils: responsiveUtils,
+          minWidth: 92
        ),
        const SizedBox(width: 12),
        _buildButton(
@@ -113,6 +114,7 @@ class AdvancedSearchFilterFormBottomView extends GetWidget<AdvancedFilterControl
          text: AppLocalizations.of(context).search,
          context: context,
          responsiveUtils: responsiveUtils,
+          minWidth: 144,
          currentFocusNode: focusManager?.searchButtonFocusNode,
          nextFocusNode: focusManager?.fromFieldFocusNode
        ),
@@ -128,28 +130,21 @@ class AdvancedSearchFilterFormBottomView extends GetWidget<AdvancedFilterControl
      }
  ) {
    return Obx(
-      () => SizedBox(
-        width: 220,
-        child: RawKeyboardListener(
-          focusNode: FocusNode(),
-          onKey: (event) {
-            log('AdvancedSearchFilterFormBottomView::_buildCheckboxHasAttachment(): Event runtimeType is ${event.runtimeType}');
-            if (event is RawKeyDownEvent &&
-                event.logicalKey == LogicalKeyboardKey.tab) {
-              log('AdvancedSearchFilterFormBottomView::_buildCheckboxHasAttachment(): PRESS TAB');
-              nextFocusNode?.requestFocus();
-            }
-          },
-          child: CheckboxListTile(
-            focusNode: currentFocusNode,
-            contentPadding: EdgeInsets.zero,
-            controlAffinity: ListTileControlAffinity.leading,
-            value: controller.hasAttachment.value,
-            onChanged: (value) {
-              controller.hasAttachment.value = value ?? false;
-            },
-            title: Text(AppLocalizations.of(context).hasAttachment),
-          ),
+      () => RawKeyboardListener(
+        focusNode: FocusNode(),
+        onKey: (event) {
+          if (event is RawKeyDownEvent &&
+              event.logicalKey == LogicalKeyboardKey.tab) {
+            nextFocusNode?.requestFocus();
+          }
+        },
+        child: LabeledCheckbox(
+          label: AppLocalizations.of(context).hasAttachment,
+          focusNode: currentFocusNode,
+          contentPadding: EdgeInsets.zero,
+          value: controller.hasAttachment.value,
+          activeColor: AppColor.primaryColor,
+          onChanged: (value) => controller.hasAttachment.value = value ?? false,
        ),
      ),
    );
@@ -164,31 +159,27 @@ class AdvancedSearchFilterFormBottomView extends GetWidget<AdvancedFilterControl
    required ResponsiveUtils responsiveUtils,
    FocusNode? currentFocusNode,
    FocusNode? nextFocusNode,
+    double? minWidth,
  }) {
    return RawKeyboardListener(
      focusNode: FocusNode(),
      onKey: (event) {
-        log('AdvancedSearchFilterFormBottomView::_buildButton(): Event runtimeType is ${event.runtimeType}');
        if (event is RawKeyDownEvent &&
            event.logicalKey == LogicalKeyboardKey.tab) {
-          log('AdvancedSearchFilterFormBottomView::_buildButton(): PRESS TAB');
          nextFocusNode?.requestFocus();
        }
      },
-      child: buildTextButton(
+      child: buildButtonWrapText(
          text,
          focusNode: currentFocusNode,
-          width: _isMobileAndLandscapeTablet(context, responsiveUtils)
-              ? double.infinity
-              : 144,
-          height: 44,
          radius: 10,
-          textStyle: TextStyle(fontSize: 17, color: colorText),
-          backgroundColor: colorButton,
-          padding: EdgeInsets.symmetric(
-              horizontal: _isMobileAndLandscapeTablet(context, responsiveUtils)
-                  ? 0
-                  : 26),
+          height: 44,
+          minWidth: minWidth,
+          textStyle: TextStyle(
+              fontSize: 17,
+              color: colorText,
+              fontWeight: FontWeight.w500),
+          bgColor: colorButton,
          onTap: onAction),
    );
  }
@@ -1,6 +1,5 @@
 import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/utils/responsive_utils.dart';
-import 'package:core/utils/app_logger.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/advanced_search/advanced_search_filter_form.dart';
@@ -21,36 +20,28 @@ class AdvancedSearchFilterOverlay extends StatelessWidget {
    return GestureDetector(
      onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
      child: Padding(
-        padding: const EdgeInsets.only(top: 8, bottom: 16),
+        padding: const EdgeInsets.only(top: 4, bottom: 16),
        child: Container(
          constraints: BoxConstraints(
-            minWidth: maxWidth ?? 660,
            maxHeight: _getHeightOverlay(context, responsiveUtils),
          ),
          width: maxWidth ?? 660,
-          height: _getHeightOverlay(context, responsiveUtils),
-          padding: responsiveUtils.landscapeTabletSupported(context)
-            ? EdgeInsets.zero
-            : const EdgeInsets.all(24),
+          padding: const EdgeInsets.all(32),
          decoration: BoxDecoration(
              color: Colors.white,
              borderRadius: BorderRadius.circular(16),
              boxShadow: const [
                BoxShadow(
-                    color: AppColor.colorShadowBgContentEmail,
-                    spreadRadius: 1,
-                    blurRadius: 1,
-                    offset: Offset(0, 0.5)),
+                    color: AppColor.colorShadowComposer,
+                    blurRadius: 32,
+                    offset: Offset.zero),
+                BoxShadow(
+                    color: AppColor.colorDropShadow,
+                    blurRadius: 4,
+                    offset: Offset.zero),
              ]),
          child: SingleChildScrollView(
-            child: Padding(
-              padding: EdgeInsets.symmetric(
-                  horizontal: responsiveUtils.landscapeTabletSupported(context)
-                      ? 16 : 28,
-                  vertical: responsiveUtils.landscapeTabletSupported(context)
-                      ? 16 : 12),
-              child: AdvancedSearchInputForm(),
-            ),
+            child: AdvancedSearchInputForm(),
          ),
        ),
      ),
@@ -58,18 +49,10 @@ class AdvancedSearchFilterOverlay extends StatelessWidget {
  }

  double _getHeightOverlay(BuildContext context, ResponsiveUtils responsiveUtils) {
-    const double maxHeightTopBar = 160;
-    const double maxHeightOverlay = 568;
+    const double maxHeightTopBar = 80;
+    const double paddingBottom = 16;
    final currentHeight = responsiveUtils.getSizeScreenHeight(context);
-    double maxHeightForm = maxHeightOverlay;
-
-    if (currentHeight < maxHeightOverlay) {
-      maxHeightForm = currentHeight > maxHeightTopBar
-          ? currentHeight - maxHeightTopBar
-          : currentHeight;
-    }
-
-    log('AdvancedSearchFilterOverlay::_getHeightOverlay(): maxHeightForm: $maxHeightForm');
+    double maxHeightForm = currentHeight - maxHeightTopBar - paddingBottom;
    return maxHeightForm;
  }
 }