ui changes

main_production_RSG
Sikander Saleem 2 months ago
parent e0fda1e00a
commit 1bfa8858f3

@ -206,18 +206,18 @@ class _CleanerSearchFormViewState extends State<CleanerSearchFormView> {
// Site Autocomplete Field // Site Autocomplete Field
Container( Container(
padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 8.toScreenHeight), 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( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
'Site', 'Site',
style: Theme.of(context).textTheme.bodySmall?.copyWith( style: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: AppColor.floatingTextStyleColor(context)),
color: context.isDark ? AppColor.neutral30 : AppColor.neutral20,
fontWeight: FontWeight.w500,
),
), ),
SizedBox(height: 4.toScreenHeight),
SizedBox( SizedBox(
height: 24.toScreenHeight, // Fixed height for consistency height: 24.toScreenHeight, // Fixed height for consistency
child: Autocomplete<Hospital>( child: Autocomplete<Hospital>(
@ -264,14 +264,11 @@ class _CleanerSearchFormViewState extends State<CleanerSearchFormView> {
controller: controller, controller: controller,
// focusNode: _siteFocusNode, // focusNode: _siteFocusNode,
focusNode: focusNode, focusNode: focusNode,
style: AppTextStyles.bodyText.copyWith( cursorColor: AppColor.loadingColor(context),
color: context.isDark ? AppColor.neutral30 : AppColor.black10, style: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 14, color: AppColor.textStyleColor(context)),
),
decoration: InputDecoration( decoration: InputDecoration(
hintText: 'Search site...', hintText: 'Search site...',
hintStyle: AppTextStyles.bodyText.copyWith( hintStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: AppColor.labelTextStyleColor(context)),
color: AppColor.neutral20,
),
filled: false, filled: false,
border: InputBorder.none, border: InputBorder.none,
enabledBorder: InputBorder.none, enabledBorder: InputBorder.none,
@ -308,9 +305,9 @@ class _CleanerSearchFormViewState extends State<CleanerSearchFormView> {
_allDeptRoomList = []; _allDeptRoomList = [];
}); });
}, },
child: const Icon( child: Icon(
Icons.clear, Icons.clear,
color: AppColor.neutral20, color: AppColor.icon2Color(context),
size: 20, size: 20,
), ),
), ),

@ -191,7 +191,8 @@ class _AppTextFormFieldState extends State<AppTextFormField> {
? 4 ? 4
: 1, : 1,
obscuringCharacter: "*", 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, textInputAction: widget.textInputType == TextInputType.multiline ? null : widget.textInputAction ?? TextInputAction.next,
onEditingComplete: widget.onAction ?? () => FocusScope.of(context).nextFocus(), onEditingComplete: widget.onAction ?? () => FocusScope.of(context).nextFocus(),
style: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 14, color: AppColor.textStyleColor(context)), style: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 14, color: AppColor.textStyleColor(context)),
@ -209,8 +210,7 @@ class _AppTextFormFieldState extends State<AppTextFormField> {
constraints: const BoxConstraints(), constraints: const BoxConstraints(),
suffixIconConstraints: const BoxConstraints(minWidth: 0), suffixIconConstraints: const BoxConstraints(minWidth: 0),
filled: true, filled: true,
fillColor: fillColor: (context.isDark && !widget.enable
(context.isDark && !widget.enable
? AppColor.neutral50 ? AppColor.neutral50
: !widget.enable : !widget.enable
? (widget.enableColor ?? AppColor.disableDark) ? (widget.enableColor ?? AppColor.disableDark)

Loading…
Cancel
Save