From 267a4445d1925dcbe7d751fefe1e71bc747ffa4b Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Tue, 10 Feb 2026 12:49:02 +0300 Subject: [PATCH] ui improvements --- .../widgets/request_category_fragment.dart | 2 +- .../common_widgets/default_app_bar.dart | 45 ++++++++++--------- .../my_request/my_requests_page.dart | 2 +- lib/views/widgets/equipment/asset_picker.dart | 2 +- 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/lib/dashboard_latest/widgets/request_category_fragment.dart b/lib/dashboard_latest/widgets/request_category_fragment.dart index 0736fe80..c33e8747 100644 --- a/lib/dashboard_latest/widgets/request_category_fragment.dart +++ b/lib/dashboard_latest/widgets/request_category_fragment.dart @@ -73,7 +73,7 @@ class RequestCategoryFragment extends StatelessWidget { Widget getTabs({required BuildContext context, required DashBoardProvider requestsProvider, required UsersTypes? userType}) { List tabs = CategoryTabs.getTabs(userType: userType ?? UsersTypes.normal_user, context: context); return SizedBox( - height: 44 + (context.isTablet() ? 36 : 16), + height: 44 + (context.isTablet() ? 36 : 16).toScreenHeight, child: ListView.separated( scrollDirection: Axis.horizontal, separatorBuilder: (cxt, index) => 12.width, diff --git a/lib/new_views/common_widgets/default_app_bar.dart b/lib/new_views/common_widgets/default_app_bar.dart index 3b3fcf3f..58ac9631 100644 --- a/lib/new_views/common_widgets/default_app_bar.dart +++ b/lib/new_views/common_widgets/default_app_bar.dart @@ -17,7 +17,7 @@ class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget { final VoidCallback? onWillPopScope; final TextStyle? titleStyle; - const DefaultAppBar({this.title, this.onBackPress, this.onWillPopScope, this.actions,this.titleStyle, this.showHomeActionButton = false, this.showBackButton = true, Key? key}) : super(key: key); + const DefaultAppBar({this.title, this.onBackPress, this.onWillPopScope, this.actions, this.titleStyle, this.showHomeActionButton = false, this.showBackButton = true, Key? key}) : super(key: key); @override Widget build(BuildContext context) { @@ -43,30 +43,31 @@ class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget { titleSpacing: 16, title: Row( children: [ - if(showBackButton) - const Icon(Icons.arrow_back_ios).onPress(() { - if (onWillPopScope != null) { - showDialog( - context: context, - builder: (BuildContext cxt) => AcknowledgeWorkDialog( - onSave: onWillPopScope!, - onDiscard: () { - Navigator.of(cxt).pop(); - }, - ), - ); - return; - } - if (onBackPress != null) { - onBackPress!(); - } else { - Navigator.of(context).pop(); - } - }), + if (showBackButton) + const Icon(Icons.arrow_back_ios).onPress(() { + if (onWillPopScope != null) { + showDialog( + context: context, + builder: (BuildContext cxt) => AcknowledgeWorkDialog( + onSave: onWillPopScope!, + onDiscard: () { + Navigator.of(cxt).pop(); + }, + ), + ); + return; + } + if (onBackPress != null) { + onBackPress!(); + } else { + Navigator.of(context).pop(); + } + }), 10.width, Text( title ?? "", - style:titleStyle?? AppTextStyles.heading3.copyWith(fontWeight: FontWeight.w500, color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), + style: titleStyle ?? + (context.isTablet() ? AppTextStyles.heading4 : AppTextStyles.heading3).copyWith(fontWeight: FontWeight.w500, color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), ).expanded, ], ), diff --git a/lib/new_views/pages/land_page/my_request/my_requests_page.dart b/lib/new_views/pages/land_page/my_request/my_requests_page.dart index 2d1d1c40..8209f2c8 100644 --- a/lib/new_views/pages/land_page/my_request/my_requests_page.dart +++ b/lib/new_views/pages/land_page/my_request/my_requests_page.dart @@ -114,7 +114,7 @@ class _MyRequestsPageState extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Container( - height: 40, + height: 40.toScreenHeight, padding: const EdgeInsets.only(left: 16, right: 8), alignment: Alignment.center, decoration: ShapeDecoration( diff --git a/lib/views/widgets/equipment/asset_picker.dart b/lib/views/widgets/equipment/asset_picker.dart index a57a08f0..d94d0d2b 100644 --- a/lib/views/widgets/equipment/asset_picker.dart +++ b/lib/views/widgets/equipment/asset_picker.dart @@ -62,7 +62,7 @@ class AssetPicker extends StatelessWidget { children: [ if (device == null && deviceList.isEmpty) Container( - height: 50, + height: 50.toScreenHeight, alignment: Alignment.center, decoration: BoxDecoration( color: buttonColor ?? backgroundColor ?? AppColor.blueStatus(context),