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

improvements

Browse Source
ui_ux_rollout_merge
Sikander Saleem 2 weeks ago
parent 872798407a
commit c922f9e4a2
4 changed files with 70 additions and 68 deletions
Show Stats Download Patch File Download Diff File

1
lib/extensions/context_extension.dart
Unescape Escape View File

@ -7,6 +7,7 @@ import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/new_views/swipe_module/dialoge/confirm_dialog.dart'; import 'package:test_sa/new_views/swipe_module/dialoge/confirm_dialog.dart';
import 'package:test_sa/new_views/swipe_module/dialoge/info_dialog.dart'; import 'package:test_sa/new_views/swipe_module/dialoge/info_dialog.dart';
import 'package:test_sa/views/full_screen_image_viewer.dart'; import 'package:test_sa/views/full_screen_image_viewer.dart';
import 'package:test_sa/views/widgets/dialogs/confirm_dialog.dart';
import '../controllers/providers/settings/setting_provider.dart'; import '../controllers/providers/settings/setting_provider.dart';
import '../l10n/app_localizations.dart'; import '../l10n/app_localizations.dart';

122
lib/new_views/swipe_module/dialoge/confirm_dialog.dart
Unescape Escape View File

@ -1,61 +1,61 @@
import 'package:flutter/material.dart'; // import 'package:flutter/material.dart';
import 'package:test_sa/extensions/int_extensions.dart'; // import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart'; // 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';
//
class ConfirmDialog extends StatelessWidget { // class ConfirmDialog extends StatelessWidget {
final String? title; // final String? title;
final String? message; // final String? message;
final String? okTitle; // final String? okTitle;
final VoidCallback? onTap; // final VoidCallback? onTap;
final VoidCallback? onCloseTap; // final VoidCallback? onCloseTap;
//
const ConfirmDialog({Key? key, this.title, this.message, this.okTitle, this.onTap, this.onCloseTap}) : super(key: key); // const ConfirmDialog({Key? key, this.title, this.message, this.okTitle, this.onTap, this.onCloseTap}) : super(key: key);
//
@override // @override
Widget build(BuildContext context) { // Widget build(BuildContext context) {
return Dialog( // return Dialog(
backgroundColor: AppColor.background(context), // backgroundColor: AppColor.background(context),
shape: const RoundedRectangleBorder(), // shape: const RoundedRectangleBorder(),
insetPadding: const EdgeInsets.only(left: 21, right: 21), // insetPadding: const EdgeInsets.only(left: 21, right: 21),
child: Padding( // child: Padding(
padding: const EdgeInsets.only(left: 20, right: 20, top: 18, bottom: 28), // padding: const EdgeInsets.only(left: 20, right: 20, top: 18, bottom: 28),
child: Column( // child: Column(
crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, // mainAxisSize: MainAxisSize.min,
children: [ // children: [
Row( // Row(
crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
children: [ // children: [
Expanded( // Expanded(
child: Text( // child: Text(
title ?? "Confirm", // title ?? "Confirm",
style: TextStyle(fontSize: 24, fontWeight: FontWeight.w600, color: AppColor.headingTextColor(context), height: 35 / 24, letterSpacing: -0.96), // style: TextStyle(fontSize: 24, fontWeight: FontWeight.w600, color: AppColor.headingTextColor(context), height: 35 / 24, letterSpacing: -0.96),
).paddingOnly(top: 16), // ).paddingOnly(top: 16),
), // ),
IconButton( // IconButton(
padding: EdgeInsets.zero, // padding: EdgeInsets.zero,
icon: const Icon(Icons.close), // icon: const Icon(Icons.close),
color: AppColor.iconColor(context), // color: AppColor.iconColor(context),
constraints: const BoxConstraints(), // constraints: const BoxConstraints(),
onPressed: () => onCloseTap ?? Navigator.pop(context), // onPressed: () => onCloseTap ?? Navigator.pop(context),
// onPressed: () => Navigator.pop(context), // // onPressed: () => Navigator.pop(context),
) // )
], // ],
), // ),
message != null ? message!.heading5(context).custom(color: AppColor.textColor(context)) : const SizedBox(), // message != null ? message!.heading5(context).custom(color: AppColor.textColor(context)) : const SizedBox(),
28.height, // 28.height,
AppFilledButton( // AppFilledButton(
label: okTitle ?? "OK", // label: okTitle ?? "OK",
onPressed: onTap ?? () => Navigator.pop(context), // onPressed: onTap ?? () => Navigator.pop(context),
textColor: Colors.white, // textColor: Colors.white,
//color: Ap.green, // //color: Ap.green,
), // ),
], // ],
), // ),
), // ),
); // );
} // }
} // }

1
lib/new_views/swipe_module/utils/swipe_general_utils.dart
Unescape Escape View File

@ -29,6 +29,7 @@ import 'package:test_sa/new_views/swipe_module/enums/swipe_type.dart';
import 'package:test_sa/new_views/swipe_module/models/swipe_model.dart'; import 'package:test_sa/new_views/swipe_module/models/swipe_model.dart';
import 'package:test_sa/new_views/swipe_module/swipe_success_view.dart'; import 'package:test_sa/new_views/swipe_module/swipe_success_view.dart';
import 'package:test_sa/new_views/swipe_module/utils/location_utils.dart'; import 'package:test_sa/new_views/swipe_module/utils/location_utils.dart';
import 'package:test_sa/views/widgets/dialogs/confirm_dialog.dart';
import 'package:test_sa/views/widgets/item_views/info_header_widget.dart'; import 'package:test_sa/views/widgets/item_views/info_header_widget.dart';
import 'package:test_sa/views/widgets/item_views/info_text_widget.dart'; import 'package:test_sa/views/widgets/item_views/info_text_widget.dart';
import 'package:test_sa/views/widgets/qr/scan_qr.dart'; import 'package:test_sa/views/widgets/qr/scan_qr.dart';

14
lib/views/widgets/dialogs/confirm_dialog.dart
Unescape Escape View File

@ -2,21 +2,22 @@ import 'package:flutter/material.dart';
import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart'; 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/common_widgets/app_filled_button.dart'; import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
class ConfirmDialog extends StatelessWidget { class ConfirmDialog extends StatelessWidget {
final String? title; final String? title;
final String message; final String? message;
final String? okTitle; final String? okTitle;
final VoidCallback? onTap; final VoidCallback? onTap;
final VoidCallback? onCloseTap; final VoidCallback? onCloseTap;
const ConfirmDialog({Key? key, this.title, required this.message, this.okTitle, this.onTap, this.onCloseTap}) : super(key: key); const ConfirmDialog({Key? key, this.title, this.message, this.okTitle, this.onTap, this.onCloseTap}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Dialog( return Dialog(
backgroundColor: Colors.white, backgroundColor: AppColor.background(context),
shape: const RoundedRectangleBorder(), shape: const RoundedRectangleBorder(),
insetPadding: const EdgeInsets.only(left: 21, right: 21), insetPadding: const EdgeInsets.only(left: 21, right: 21),
child: Padding( child: Padding(
@ -31,21 +32,20 @@ class ConfirmDialog extends StatelessWidget {
Expanded( Expanded(
child: Text( child: Text(
title ?? "Confirm", title ?? "Confirm",
style: const TextStyle(fontSize: 24, fontWeight: FontWeight.w600, color: Colors.black87, height: 35 / 24, letterSpacing: -0.96), style: TextStyle(fontSize: 24, fontWeight: FontWeight.w600, color: AppColor.headingTextColor(context), height: 35 / 24, letterSpacing: -0.96),
).paddingOnly(top: 16), ).paddingOnly(top: 16),
), ),
IconButton( IconButton(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
icon: const Icon(Icons.close), icon: const Icon(Icons.close),
color: Colors.black87, color: AppColor.iconColor(context),
constraints: const BoxConstraints(), constraints: const BoxConstraints(),
onPressed: () => onCloseTap ?? Navigator.pop(context), onPressed: () => onCloseTap ?? Navigator.pop(context),
// onPressed: () => Navigator.pop(context), // onPressed: () => Navigator.pop(context),
) )
], ],
), ),
16.height, message != null ? message!.heading5(context).custom(color: AppColor.textColor(context)) : const SizedBox(),
message.bodyText(context),
28.height, 28.height,
AppFilledButton( AppFilledButton(
label: okTitle ?? "OK", label: okTitle ?? "OK",

Write Preview
Loading…
Cancel
Save