From 40ec8947af3cfa805f927edc0c9b2bd6d6d9a5d3 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Thu, 7 May 2026 15:59:21 +0300 Subject: [PATCH] ui improvements --- .../my_request/all_requests_search_page.dart | 15 ++++++------- .../widgets/request_search_buttons.dart | 22 ++++++------------- .../widgets/static_filter_buttons.dart | 8 +------ 3 files changed, 15 insertions(+), 30 deletions(-) diff --git a/lib/new_views/pages/land_page/my_request/all_requests_search_page.dart b/lib/new_views/pages/land_page/my_request/all_requests_search_page.dart index a25c4c81..13a48f4e 100644 --- a/lib/new_views/pages/land_page/my_request/all_requests_search_page.dart +++ b/lib/new_views/pages/land_page/my_request/all_requests_search_page.dart @@ -131,7 +131,7 @@ class _AllRequestsSearchPageState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - context.translation.searchBy.heading5(context), + Text(context.translation.searchBy, style: AppTextStyles.heading5.copyWith(color: AppColor.labelTextStyleColor(context))), 8.height, RequestsSearchButtons( items: [search!.requestNumber!, search!.assetName!, search!.assetNo!, search!.manufacture!, search!.sn!, search!.model!], @@ -151,13 +151,9 @@ class _AllRequestsSearchPageState extends State { controller: search!.searchBySelectedValue?.controller, labelText: search!.searchBySelectedValue?.label, textInputType: search!.searchBySelectedValue?.inputType, - // labelStyle: AppTextStyles.bodyText2, - // style: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: context.isDark ? Colors.white : const Color(0xff3B3D4A)), - // floatingLabelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: context.isDark ? Colors.white : const Color(0xff3B3D4A)), - // labelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: context.isDark ? Colors.white : const Color(0xff767676)), labelStyle: AppTextStyles.textFieldLabelStyle, hintStyle: AppTextStyles.textFieldLabelStyle, - // showBorder: true, + showBorder: true, onChange: (text) { search!.searchBySelectedValue?.controller?.text = text; search!.searchBySelectedValue?.controller?.selection = TextSelection.fromPosition(TextPosition(offset: search!.searchBySelectedValue!.controller!.text.length)); @@ -168,7 +164,10 @@ class _AllRequestsSearchPageState extends State { }, ), 16.height, - "Sort".heading5(context), + RichText( + text: TextSpan(text: "Sort ", style: AppTextStyles.heading5.copyWith(color: AppColor.textStyleColor(context)), children: [ + TextSpan(text: "(By Date)", style: AppTextStyles.bodyText2.copyWith(color: AppColor.textStyleColor(context))), + ])), 8.height, Row( children: [ @@ -209,7 +208,7 @@ class _AllRequestsSearchPageState extends State { ], ), 16.height, - context.translation.pickDate.heading5(context), + Text(context.translation.pickDate, style: AppTextStyles.heading5.copyWith(color: AppColor.labelTextStyleColor(context))), 8.height, Row( children: [ diff --git a/lib/new_views/pages/land_page/widgets/request_search_buttons.dart b/lib/new_views/pages/land_page/widgets/request_search_buttons.dart index 6ebf120e..24dc4dbf 100644 --- a/lib/new_views/pages/land_page/widgets/request_search_buttons.dart +++ b/lib/new_views/pages/land_page/widgets/request_search_buttons.dart @@ -12,7 +12,7 @@ class RequestsSearchButtons extends StatefulWidget { final List items; final SearchAllRequestsBaseModel initialValue; - const RequestsSearchButtons({Key? key, required this.items,required this.initialValue,required this.onSelect}) : super(key: key); + const RequestsSearchButtons({Key? key, required this.items, required this.initialValue, required this.onSelect}) : super(key: key); @override State createState() => _RequestsSearchButtonsState(); @@ -45,25 +45,17 @@ class _RequestsSearchButtonsState extends State { children: widget.items .map( (data) => Container( - padding: EdgeInsets.symmetric(vertical: 8.toScreenHeight, horizontal: (_data == data ? 12 : 8).toScreenWidth), - foregroundDecoration: _data != data - ? null - : ShapeDecoration( - color: (context.isDark ? AppColor.neutral30 : AppColor.neutral50).withOpacity(0.1), - shape: RoundedRectangleBorder( - side: BorderSide(width: 1, color: AppColor.blueStatus(context)), - borderRadius: BorderRadius.circular(7), - ), - ), + padding: EdgeInsets.symmetric(vertical: 8.toScreenHeight, horizontal: 12.toScreenWidth), decoration: ShapeDecoration( - color: _data == data ? AppColor.selectedButtonColor(context) : AppColor.unSelectedButtonColor(context), + color: AppColor.background(context), shape: RoundedRectangleBorder( - side: _data == data ? BorderSide(width: 1, color: AppColor.blueStatus(context)) : BorderSide.none, - borderRadius: BorderRadius.circular(7), + side: BorderSide(width: 1, color: _data == data ? AppColor.primary10 : AppColor.border2Color(context)), + borderRadius: BorderRadius.circular(6), ), shadows: [BoxShadow(color: Colors.black.withOpacity(0.05), blurRadius: 14, offset: const Offset(0, 0), spreadRadius: 0)], ), - child: data.label!.tinyFont(context).custom(color: AppColor.filterButtonTextColor(context)), + child: data.label!.tinyFont(context).custom(color: _data == data ? AppColor.primary10 : AppColor.filterButtonTextColor(context)), + // child: data.label!.tinyFont(context).custom(color: AppColor.filterButtonTextColor(context)), ).onPress( () { setState(() { diff --git a/lib/new_views/pages/land_page/widgets/static_filter_buttons.dart b/lib/new_views/pages/land_page/widgets/static_filter_buttons.dart index 2a728266..89df5e83 100644 --- a/lib/new_views/pages/land_page/widgets/static_filter_buttons.dart +++ b/lib/new_views/pages/land_page/widgets/static_filter_buttons.dart @@ -47,19 +47,13 @@ class _RequestsTypeFilterState extends State { padding: EdgeInsets.symmetric(vertical: 8.toScreenHeight, horizontal: 12.toScreenWidth), decoration: ShapeDecoration( color: AppColor.background(context), - // _selected.contains(widget.items[data]) ? AppColor.selectedButtonColor(context) : AppColor.unSelectedButtonColor(context), shape: RoundedRectangleBorder( side: BorderSide(width: 1, color: _selected.contains(widget.items[data]) ? AppColor.primary10 : AppColor.border2Color(context)), - - // side: _selected.contains(widget.items[data]) ? BorderSide(width: 1, color: AppColor.loadingColor(context)) : BorderSide.none, borderRadius: BorderRadius.circular(6), ), shadows: [BoxShadow(color: Colors.black.withOpacity(0.05), blurRadius: 14, offset: const Offset(0, 0), spreadRadius: 0)], ), - child: data.tinyFont(context).custom(color: _selected.contains(widget.items[data]) ? AppColor.primary10 : AppColor.filterButtonTextColor(context) - - // AppColor.filterButtonTextColor(context) - ), + child: data.tinyFont(context).custom(color: _selected.contains(widget.items[data]) ? AppColor.primary10 : AppColor.filterButtonTextColor(context)), ).onPress( () { if (_selected.contains(widget.items[data])) {