From 47732d67cbde1cc1250356cd151a4bb4b9500a13 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Sun, 25 Dec 2022 12:01:21 +0300 Subject: [PATCH] drawer item align issue fixed on arabic. --- lib/extensions/string_extensions.dart | 4 +- lib/provider/chat_provider_model.dart | 4 +- lib/ui/dialogs/success_dialog.dart | 3 + lib/ui/landing/widget/app_drawer.dart | 8 +-- lib/ui/landing/widget/drawer_item.dart | 60 ------------------- .../dynamic_screens/dynamic_input_screen.dart | 10 ++-- lib/widgets/mark_attendance_widget.dart | 2 - 7 files changed, 14 insertions(+), 77 deletions(-) delete mode 100644 lib/ui/landing/widget/drawer_item.dart diff --git a/lib/extensions/string_extensions.dart b/lib/extensions/string_extensions.dart index e9e7e93..e323487 100644 --- a/lib/extensions/string_extensions.dart +++ b/lib/extensions/string_extensions.dart @@ -90,9 +90,9 @@ extension EmailValidator on String { style: TextStyle(fontSize: 13, fontWeight: FontWeight.w600, color: color ?? MyColors.darkTextColor, letterSpacing: -0.52, decoration: isUnderLine ? TextDecoration.underline : null), ); - Widget toText14({Color? color, bool isUnderLine = false, bool isBold = false, FontWeight? weight, int? maxlines, bool isCenter = false}) => Text( + Widget toText14({Color? color, bool isUnderLine = false, bool isBold = false, FontWeight? weight, int? maxlines, TextAlign? textAlign, bool isCenter = false}) => Text( this, - textAlign: isCenter ? TextAlign.center : TextAlign.left, + textAlign: isCenter ? TextAlign.center : (textAlign ?? TextAlign.left), maxLines: maxlines, style: TextStyle( color: color ?? MyColors.darkTextColor, diff --git a/lib/provider/chat_provider_model.dart b/lib/provider/chat_provider_model.dart index a96080b..ec4aa0c 100644 --- a/lib/provider/chat_provider_model.dart +++ b/lib/provider/chat_provider_model.dart @@ -820,8 +820,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { sFileType = ""; deleteData(); favUsersList.clear(); - searchedChats!.clear(); - pChatHistory!.clear(); + searchedChats?.clear(); + pChatHistory?.clear(); chatHubConnection.stop(); AppState().chatDetails = null; } diff --git a/lib/ui/dialogs/success_dialog.dart b/lib/ui/dialogs/success_dialog.dart index a5df64f..65c6ec3 100644 --- a/lib/ui/dialogs/success_dialog.dart +++ b/lib/ui/dialogs/success_dialog.dart @@ -48,6 +48,9 @@ class _SuccessDialogState extends State with TickerProviderStateM width: size, height: size, child: Card( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(25.0), + ), child: Lottie.asset( 'assets/lottie/lt_success.json', repeat: false, diff --git a/lib/ui/landing/widget/app_drawer.dart b/lib/ui/landing/widget/app_drawer.dart index 4b4219d..7df697c 100644 --- a/lib/ui/landing/widget/app_drawer.dart +++ b/lib/ui/landing/widget/app_drawer.dart @@ -150,13 +150,9 @@ class _AppDrawerState extends State { Widget menuItem(String icon, String title, String routeName, {Color? color, bool closeDrawer = true, VoidCallback? onPress}) { return Row( children: [ - SvgPicture.asset( - icon, - height: 20, - width: 20, - ), + SvgPicture.asset(icon, height: 20, width: 20), 9.width, - title.toText14(color: color).expanded + title.toText14(color: color, textAlign: AppState().isArabic(context) ? TextAlign.right : null).expanded, ], ).paddingOnly(left: 21, top: 10, bottom: 10, right: 21).onPress(closeDrawer ? () async { diff --git a/lib/ui/landing/widget/drawer_item.dart b/lib/ui/landing/widget/drawer_item.dart deleted file mode 100644 index 4654e5b..0000000 --- a/lib/ui/landing/widget/drawer_item.dart +++ /dev/null @@ -1,60 +0,0 @@ -import 'dart:ui'; - -import 'package:flutter/material.dart'; - -class DrawerItem extends StatefulWidget { - final String title; - final String subTitle; - final IconData icon; - final Color color; - final dynamic assetLink; - - const DrawerItem(this.title, {required this.icon, required this.color, this.subTitle = '', this.assetLink}); - - @override - _DrawerItemState createState() => _DrawerItemState(); -} - -class _DrawerItemState extends State { - @override - Widget build(BuildContext context) { - return Container( - margin: EdgeInsets.only(top: 0, bottom: 5, left: 0, right: 0), - child: Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - if (widget.assetLink != null) - Container( - height: 20, - width: 20, - child: Image.asset(widget.assetLink), - ), - if (widget.assetLink == null) - Icon( - widget.icon, - color: widget.color, - size: 25, - ), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Container( - width: MediaQuery.of(context).size.width * 0.45, - child: Text(widget.title, - style: TextStyle( - color: widget.color ?? Color(0xFF2E303A), - fontSize: 14, - fontFamily: 'Poppins', - fontWeight: FontWeight.w600, - letterSpacing: -0.84, - )), - ), - ], - ), - ), - ], - )); - } -} diff --git a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart index a94a6e2..1ec79a0 100644 --- a/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart +++ b/lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart @@ -57,7 +57,7 @@ class _DynamicInputScreenState extends State { } void validateTransaction() async { - try { + // try { Utils.showLoading(context); List> values = getEitDffStructureList!.map((e) { String tempVar = e.eSERVICESDV?.pIDCOLUMNNAME ?? ""; @@ -98,10 +98,10 @@ class _DynamicInputScreenState extends State { Utils.showLoading(context); await LeaveBalanceApiClient().cancelHrTransaction(submitEITTransactionList.pTRANSACTIONID!); Utils.hideLoading(context); - } catch (ex) { - Utils.hideLoading(context); - Utils.handleException(ex, context, null); - } + // } catch (ex) { + // Utils.hideLoading(context); + // Utils.handleException(ex, context, null); + // } } String dESCFLEXCONTEXTCODE = ""; diff --git a/lib/widgets/mark_attendance_widget.dart b/lib/widgets/mark_attendance_widget.dart index cbf70ad..a599c79 100644 --- a/lib/widgets/mark_attendance_widget.dart +++ b/lib/widgets/mark_attendance_widget.dart @@ -170,7 +170,6 @@ class _MarkAttendanceWidgetState extends State { ); } } catch (ex) { - print(ex); Utils.hideLoading(context); Utils.handleException(ex, context, (msg) { Utils.confirmDialog(context, msg); @@ -239,7 +238,6 @@ class _MarkAttendanceWidgetState extends State { child: SuccessDialog(widget.isFromDashboard), ); } catch (ex) { - print("performWifiAttendance: " + ex.toString()); await closeWifiRequest(); Utils.hideLoading(context); Utils.handleException(ex, context, (msg) {