From 1bfa8858f3e386f89abd2a58e3043ceedfbbbea1 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Tue, 5 May 2026 17:47:56 +0300 Subject: [PATCH] ui changes --- .../pages/cleaner_search_form_view.dart | 25 ++++++++----------- .../common_widgets/app_text_form_field.dart | 14 +++++------ 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/lib/modules/cleaner_module/pages/cleaner_search_form_view.dart b/lib/modules/cleaner_module/pages/cleaner_search_form_view.dart index 071a36c7..c812cb84 100644 --- a/lib/modules/cleaner_module/pages/cleaner_search_form_view.dart +++ b/lib/modules/cleaner_module/pages/cleaner_search_form_view.dart @@ -206,18 +206,18 @@ class _CleanerSearchFormViewState extends State { // Site Autocomplete Field Container( padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 8.toScreenHeight), - decoration: BoxDecoration(color: AppColor.fieldBgColor(context), borderRadius: BorderRadius.circular(16), border: Border.all(color: AppColor.borderColor(context))), + decoration: BoxDecoration( + color: AppColor.dropDownBackground(context), + borderRadius: BorderRadius.circular(16), + border: Border.all(color: AppColor.border2Color(context), width: 1), + ), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( 'Site', - style: Theme.of(context).textTheme.bodySmall?.copyWith( - color: context.isDark ? AppColor.neutral30 : AppColor.neutral20, - fontWeight: FontWeight.w500, - ), + style: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: AppColor.floatingTextStyleColor(context)), ), - SizedBox(height: 4.toScreenHeight), SizedBox( height: 24.toScreenHeight, // Fixed height for consistency child: Autocomplete( @@ -264,14 +264,11 @@ class _CleanerSearchFormViewState extends State { controller: controller, // focusNode: _siteFocusNode, focusNode: focusNode, - style: AppTextStyles.bodyText.copyWith( - color: context.isDark ? AppColor.neutral30 : AppColor.black10, - ), + cursorColor: AppColor.loadingColor(context), + style: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 14, color: AppColor.textStyleColor(context)), decoration: InputDecoration( hintText: 'Search site...', - hintStyle: AppTextStyles.bodyText.copyWith( - color: AppColor.neutral20, - ), + hintStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: AppColor.labelTextStyleColor(context)), filled: false, border: InputBorder.none, enabledBorder: InputBorder.none, @@ -308,9 +305,9 @@ class _CleanerSearchFormViewState extends State { _allDeptRoomList = []; }); }, - child: const Icon( + child: Icon( Icons.clear, - color: AppColor.neutral20, + color: AppColor.icon2Color(context), size: 20, ), ), diff --git a/lib/new_views/common_widgets/app_text_form_field.dart b/lib/new_views/common_widgets/app_text_form_field.dart index ba70ef28..360272ae 100644 --- a/lib/new_views/common_widgets/app_text_form_field.dart +++ b/lib/new_views/common_widgets/app_text_form_field.dart @@ -191,7 +191,8 @@ class _AppTextFormFieldState extends State { ? 4 : 1, obscuringCharacter: "*", - controller: widget.controller,cursorColor: AppColor.loadingColor(context), + controller: widget.controller, + cursorColor: AppColor.loadingColor(context), textInputAction: widget.textInputType == TextInputType.multiline ? null : widget.textInputAction ?? TextInputAction.next, onEditingComplete: widget.onAction ?? () => FocusScope.of(context).nextFocus(), style: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 14, color: AppColor.textStyleColor(context)), @@ -209,17 +210,16 @@ class _AppTextFormFieldState extends State { constraints: const BoxConstraints(), suffixIconConstraints: const BoxConstraints(minWidth: 0), filled: true, - fillColor: - (context.isDark && !widget.enable + fillColor: (context.isDark && !widget.enable ? AppColor.neutral50 - : !widget.enable - ? (widget.enableColor ?? AppColor.disableDark) - : AppColor.dropDownBackground(context)), + : !widget.enable + ? (widget.enableColor ?? AppColor.disableDark) + : AppColor.dropDownBackground(context)), errorStyle: AppTextStyle.tiny.copyWith(color: context.isDark ? AppColor.red50 : AppColor.red30), // floatingLabelStyle: widget.floatingLabelStyle ?? AppTextStyle.body1.copyWith(fontWeight: FontWeight.w500, color: context.isDark ? AppColor.white10 : AppColor.neutral20), - floatingLabelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: AppColor.floatingTextStyleColor(context)), + floatingLabelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: AppColor.floatingTextStyleColor(context)), labelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: AppColor.labelTextStyleColor(context)), hintText: widget.hintText ?? "", // labelText: (widget.showSpeechToText && _speechToText.isListening) ? "Listening..." : widget.labelText ?? "",