Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 25 Wiki Activity

improvements

Browse Source
ui_ux_rollout_merge
Sikander Saleem 2 weeks ago
parent cb1a1475fa
commit 897a75e2c7
12 changed files with 61 additions and 73 deletions
Show Stats Download Patch File Download Diff File

3
lib/modules/cm_module/cm_detail_page.dart
Unescape Escape View File

@ -121,9 +121,10 @@ class _CMDetailPageState extends State<CMDetailPage> {
}), }),
if (isNurse) if (isNurse)
IconButton( IconButton(
icon: 'qr'.toSvgAsset(height: 24, width: 24), icon: 'qr'.toSvgAsset(height: 24, width: 24, color: AppColor.icon2Color(context)),
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
tooltip: "QR Code",
onPressed: () { onPressed: () {
ServiceRequestBottomSheet.getQRCodeBottomSheet(context: context); ServiceRequestBottomSheet.getQRCodeBottomSheet(context: context);
}, },

1
lib/modules/export_module/provider/export_provider.dart
Unescape Escape View File

@ -50,6 +50,7 @@ class ExportApiProvider extends ChangeNotifier {
valueColor: textColor, valueColor: textColor,
elevation: 4, elevation: 4,
msgFontSize: 14, msgFontSize: 14,
borderRadius: 14,
backgroundColor: backgroundColor, backgroundColor: backgroundColor,
cancel: Cancel( cancel: Cancel(
cancelClicked: () { cancelClicked: () {

41
lib/modules/export_module/widgets/file_success_dialog.dart
Unescape Escape View File

@ -7,6 +7,7 @@ import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/common_widgets/app_filled_button.dart'; import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
import 'package:test_sa/views/widgets/item_views/info_header_widget.dart';
/// Reusable success dialog for file operations (export, print, etc.) /// Reusable success dialog for file operations (export, print, etc.)
class FileSuccessDialog { class FileSuccessDialog {
@ -31,47 +32,25 @@ class FileSuccessDialog {
return Dialog( return Dialog(
backgroundColor: AppColor.background(context), backgroundColor: AppColor.background(context),
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(16), side: BorderSide(color: AppColor.borderColor(context)),
borderRadius: BorderRadius.circular(14),
), ),
child: Padding( child: Padding(
padding: const EdgeInsets.all(24.0), padding: const EdgeInsets.all(16.0),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
// Close button
Align( Align(
alignment: Alignment.topRight, alignment: Alignment.topRight,
child: 'clear'.toSvgAsset( child: 'clear'.toSvgAsset(color: AppColor.icon2Color(context), width: 18, height: 18).onPress(() {
color: AppColor.icon2Color(context),
width: 18,
height: 18,
).onPress(() {
Navigator.of(dialogContext).pop(); Navigator.of(dialogContext).pop();
}), }),
), ),
// Success icon
'done'.toSvgAsset(color: AppColor.green70, width: 56, height: 56), 'done'.toSvgAsset(color: AppColor.green70, width: 56, height: 56),
const SizedBox(height: 24), const SizedBox(height: 24),
// Title title.heading5(context).custom(fontWeight: FontWeight.w600, color: AppColor.textStyleColor(context)),
Text(
title,
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
color: AppColor.headingTextColor(context),
),
textAlign: TextAlign.center,
),
const SizedBox(height: 12), const SizedBox(height: 12),
// Message message.heading6(context).custom(align: TextAlign.center, fontWeight: FontWeight.w500, color: AppColor.lightTextColor(context)),
Text(
message,
style: TextStyle(
fontSize: 18,
color: AppColor.lightTextColor(context),
),
textAlign: TextAlign.center,
),
const SizedBox(height: 32), const SizedBox(height: 32),
// Action buttons // Action buttons
Row( Row(
@ -84,14 +63,13 @@ class FileSuccessDialog {
final result = await OpenFile.open(filePath); final result = await OpenFile.open(filePath);
if (result.type != ResultType.done) { if (result.type != ResultType.done) {
log('⚠️ Could not open file: ${result.message}'); log('⚠️ Could not open file: ${result.message}');
'No app found to open this file type. File saved to: $filePath' 'No app found to open this file type. File saved to: $filePath'.showToast;
.showToast;
} }
}, },
label: 'Open', label: 'Open',
// buttonColor: AppColor.primary10, // buttonColor: AppColor.primary10,
showIcon: true, showIcon: true,
icon: Icon(Icons.folder_open, color: AppColor.background(context)), icon: Icon(Icons.folder_open, color: AppColor.background(context)),
height: 48, height: 48,
), ),
), ),
@ -131,4 +109,3 @@ class FileSuccessDialog {
); );
} }
} }

1
lib/modules/tm_module/device_transfer/device_filter_screen.dart
Unescape Escape View File

@ -91,6 +91,7 @@ class _DeviceFilterScreenState extends State<DeviceFilterScreen> {
return Scaffold( return Scaffold(
appBar: DefaultAppBar( appBar: DefaultAppBar(
title: context.translation.filter, title: context.translation.filter,
showBackButtonAsCancel: true,
actions: [ actions: [
if (loading == false && _showResetButton()) if (loading == false && _showResetButton())
TextButton( TextButton(

1
lib/modules/tm_module/device_transfer/device_search_screen.dart
Unescape Escape View File

@ -61,6 +61,7 @@ class _DeviceSearchScreenState extends State<DeviceSearchScreen> {
return Scaffold( return Scaffold(
appBar: DefaultAppBar( appBar: DefaultAppBar(
title: context.translation.search, title: context.translation.search,
showBackButtonAsCancel: true,
actions: [ actions: [
if (_showResetButton()) if (_showResetButton())
TextButton( TextButton(

12
lib/new_views/common_widgets/default_app_bar.dart
Unescape Escape View File

@ -18,8 +18,11 @@ class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget {
final bool showBackButton; final bool showBackButton;
final VoidCallback? onWillPopScope; final VoidCallback? onWillPopScope;
final TextStyle? titleStyle; final TextStyle? titleStyle;
final bool showBackButtonAsCancel;
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, this.showBackButtonAsCancel = false, Key? key})
: super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -46,7 +49,7 @@ class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget {
title: Row( title: Row(
children: [ children: [
if (showBackButton) if (showBackButton)
Icon(Platform.isIOS ? Icons.arrow_back_ios : Icons.arrow_back).onPress(() { Icon(showBackButtonAsCancel ? Icons.clear : (Platform.isIOS ? Icons.arrow_back_ios : Icons.arrow_back)).onPress(() {
if (onWillPopScope != null) { if (onWillPopScope != null) {
showDialog( showDialog(
context: context, context: context,
@ -65,11 +68,10 @@ class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget {
Navigator.of(context).pop(); Navigator.of(context).pop();
} }
}), }),
10.width, 12.width,
Text( Text(
title ?? "", title ?? "",
style: titleStyle ?? style: titleStyle ?? (AppTextStyles.heading5).copyWith(fontWeight: FontWeight.w500, color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
(context.isTablet() ? AppTextStyles.heading4 : AppTextStyles.heading3).copyWith(fontWeight: FontWeight.w500, color: context.isDark ? AppColor.neutral30 : AppColor.neutral50),
).expanded, ).expanded,
], ],
), ),

2
lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
Unescape Escape View File

@ -169,7 +169,7 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
} }
return Scaffold( return Scaffold(
appBar: DefaultAppBar( appBar: DefaultAppBar(
title: context.translation.filter, title: context.translation.filter,showBackButtonAsCancel: true,
actions: [ actions: [
if (_showResetButton()) if (_showResetButton())
TextButton( TextButton(

1
lib/new_views/pages/land_page/my_request/all_requests_search_page.dart
Unescape Escape View File

@ -88,6 +88,7 @@ class _AllRequestsSearchPageState extends State<AllRequestsSearchPage> {
// ).paddingOnly(bottom: 75), // ).paddingOnly(bottom: 75),
appBar: DefaultAppBar( appBar: DefaultAppBar(
title: context.translation.search, title: context.translation.search,
showBackButtonAsCancel: true,
actions: [ actions: [
if (_showResetButton()) if (_showResetButton())
TextButton( TextButton(

4
lib/new_views/pages/land_page/my_request/my_requests_page.dart
Unescape Escape View File

@ -194,7 +194,7 @@ class _MyRequestsPageState extends State<MyRequestsPage> with SingleTickerProvid
], ],
), ),
).onPress(() async { ).onPress(() async {
final result = await Navigator.push(context, CupertinoPageRoute(builder: (context) => AllRequestsSearchPage(data: _search))); final result = await Navigator.push(context, CupertinoPageRoute(fullscreenDialog: true, builder: (context) => AllRequestsSearchPage(data: _search)));
if (result != null) { if (result != null) {
_search = result; _search = result;
setState(() {}); setState(() {});
@ -227,7 +227,7 @@ class _MyRequestsPageState extends State<MyRequestsPage> with SingleTickerProvid
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
tooltip: "Filter", tooltip: "Filter",
onPressed: () async { onPressed: () async {
final result = await Navigator.push(context, CupertinoPageRoute(builder: (context) => AllRequestsFilterPage(data: _search))); final result = await Navigator.push(context, CupertinoPageRoute(fullscreenDialog: true, builder: (context) => AllRequestsFilterPage(data: _search)));
if (result != null) { if (result != null) {
_search = result; _search = result;
setState(() {}); setState(() {});

6
lib/views/widgets/equipment/my_assets_page.dart
Unescape Escape View File

@ -99,7 +99,7 @@ class _MyAssetsPageState extends State<MyAssetsPage> with SingleTickerProviderSt
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
if (!widget.fromBottomBar) if (!widget.fromBottomBar)
Icon(Platform.isIOS ? Icons.arrow_back_ios : Icons.arrow_back).onPress(() { Icon(Platform.isIOS ? Icons.arrow_back_ios : Icons.arrow_back).onPress(() {
Navigator.of(context).pop(); Navigator.of(context).pop();
}), }),
Container( Container(
@ -124,7 +124,7 @@ class _MyAssetsPageState extends State<MyAssetsPage> with SingleTickerProviderSt
], ],
), ),
).onPress(() async { ).onPress(() async {
final result = await Navigator.push(context, MaterialPageRoute(builder: (context) => const DeviceSearchScreen())); final result = await Navigator.push(context, CupertinoPageRoute(fullscreenDialog: true, builder: (context) => const DeviceSearchScreen()));
if (result != null) { if (result != null) {
_searchAsset = result; _searchAsset = result;
} }
@ -167,7 +167,7 @@ class _MyAssetsPageState extends State<MyAssetsPage> with SingleTickerProviderSt
visualDensity: VisualDensity.compact, visualDensity: VisualDensity.compact,
tooltip: "Filter", tooltip: "Filter",
onPressed: () async { onPressed: () async {
final result = await Navigator.push(context, CupertinoPageRoute(builder: (context) => DeviceFilterScreen(data: _searchAsset))); final result = await Navigator.push(context, CupertinoPageRoute(fullscreenDialog: true, builder: (context) => DeviceFilterScreen(data: _searchAsset)));
if (result != null) { if (result != null) {
_searchAsset = result; _searchAsset = result;
} }

6
lib/views/widgets/fullscreen_dialogs/multiple_selection_fullscreen_dialog.dart
Unescape Escape View File

@ -7,6 +7,7 @@ import 'package:test_sa/models/base.dart';
import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart'; import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/common_widgets/app_filled_button.dart'; import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
typedef SelectionBuilderString = String Function(dynamic); typedef SelectionBuilderString = String Function(dynamic);
@ -61,8 +62,9 @@ class _SelectionBottomSheetState<T extends Base> extends State<MultipleSelection
Widget build(BuildContext context) { Widget build(BuildContext context) {
bool isAllSelected = _selectedValue.isNotEmpty && (widget.items?.length ?? 0) == _selectedValue.length; bool isAllSelected = _selectedValue.isNotEmpty && (widget.items?.length ?? 0) == _selectedValue.length;
return Scaffold( return Scaffold(
appBar: AppBar( appBar: DefaultAppBar(
title: widget.title.heading5(context).custom(color: AppColor.textStyleColor(context)), title: widget.title,
showBackButtonAsCancel: true,
actions: [ actions: [
if (widget.showCancel) if (widget.showCancel)
AnimatedContainer( AnimatedContainer(

56
lib/views/widgets/fullscreen_dialogs/selection_fullscreen_dialog.dart
Unescape Escape View File

@ -7,6 +7,7 @@ import 'package:test_sa/models/base.dart';
import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart'; import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.dart';
import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/common_widgets/app_filled_button.dart'; import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
typedef SelectionBuilderString = String Function(dynamic); typedef SelectionBuilderString = String Function(dynamic);
@ -57,35 +58,36 @@ class _SelectionBottomSheetState<T extends Base> extends State<SelectionFullScre
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: DefaultAppBar(
title: widget.title.heading5(context).custom(color: AppColor.textStyleColor(context)), title: widget.title,
showBackButtonAsCancel: true,
actions: [ actions: [
if (widget.showCancel) if (widget.showCancel)
AnimatedContainer( AnimatedContainer(
height: 24, height: 24,
duration: const Duration(milliseconds: 250), duration: const Duration(milliseconds: 250),
margin: const EdgeInsets.only(right: 16), margin: const EdgeInsets.only(right: 16),
decoration: BoxDecoration(color: _selectedValue != null ? const Color(0xffF63939).withOpacity(.75) : Colors.grey.withOpacity(.75), borderRadius: BorderRadius.circular(30)), decoration: BoxDecoration(color: _selectedValue != null ? const Color(0xffF63939).withOpacity(.75) : Colors.grey.withOpacity(.75), borderRadius: BorderRadius.circular(30)),
padding: const EdgeInsets.only(left: 4, right: 8, top: 4, bottom: 4), padding: const EdgeInsets.only(left: 4, right: 8, top: 4, bottom: 4),
alignment: Alignment.center, alignment: Alignment.center,
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
const Icon(Icons.clear, color: Colors.white, size: 16), const Icon(Icons.clear, color: Colors.white, size: 16),
4.width, 4.width,
const Text( const Text(
"Clear", "Clear",
style: TextStyle(fontSize: 14, color: Colors.white, height: 1), style: TextStyle(fontSize: 14, color: Colors.white, height: 1),
) )
], ],
).onPress(_selectedValue != null ).onPress(_selectedValue != null
? () { ? () {
Navigator.pop(context); Navigator.pop(context);
widget.onSelect(null); widget.onSelect(null);
} }
: null), : null),
), ),
], ],
), ),
body: Column( body: Column(

Write Preview
Loading…
Cancel
Save