From 68b43eef4e82b595e27e1b5e2764d64677bea39e Mon Sep 17 00:00:00 2001 From: FaizHashmiCS22 Date: Tue, 21 Mar 2023 11:50:29 +0300 Subject: [PATCH] Design Progress 3-20 --- .../dashboard/fragments/home_fragment.dart | 2 +- .../dashboard/widgets/drawer_widget.dart | 32 +++++++++---------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/lib/views/dashboard/fragments/home_fragment.dart b/lib/views/dashboard/fragments/home_fragment.dart index 360666c..78ece26 100644 --- a/lib/views/dashboard/fragments/home_fragment.dart +++ b/lib/views/dashboard/fragments/home_fragment.dart @@ -1,9 +1,9 @@ -import 'package:car_customer_app/extensions/int_extensions.dart'; import 'package:car_customer_app/views/dashboard/widgets/ad_widget.dart'; import 'package:car_customer_app/views/dashboard/widgets/appointment_slider_widget.dart'; import 'package:car_customer_app/views/dashboard/widgets/my_branches_widget.dart'; import 'package:car_customer_app/views/dashboard/widgets/view_all_widget.dart'; import 'package:flutter/material.dart'; +import 'package:mc_common_app/extensions/int_extensions.dart'; class HomeFragment extends StatelessWidget { const HomeFragment({Key? key}) : super(key: key); diff --git a/lib/views/dashboard/widgets/drawer_widget.dart b/lib/views/dashboard/widgets/drawer_widget.dart index ad1b9e2..8be46b6 100644 --- a/lib/views/dashboard/widgets/drawer_widget.dart +++ b/lib/views/dashboard/widgets/drawer_widget.dart @@ -1,24 +1,23 @@ -import 'package:car_customer_app/classes/app_state.dart'; -import 'package:car_customer_app/classes/consts.dart'; -import 'package:car_customer_app/config/routes.dart'; -import 'package:car_customer_app/extensions/int_extensions.dart'; -import 'package:car_customer_app/extensions/string_extensions.dart'; -import 'package:car_customer_app/extensions/widget_extensions.dart'; +import 'package:mc_common_app/classes/app_state_cm.dart'; +import 'package:mc_common_app/classes/consts.dart'; +import 'package:mc_common_app/config/routes.dart'; +import 'package:mc_common_app/extensions/int_extensions.dart'; +import 'package:mc_common_app/extensions/string_extensions.dart'; +import 'package:mc_common_app/extensions/widget_extensions.dart'; import 'package:car_customer_app/generated/locale_keys.g.dart'; -import 'package:car_customer_app/models/user/image_response.dart'; -import 'package:car_customer_app/theme/colors.dart'; -import 'package:car_customer_app/utils/navigator.dart'; -import 'package:car_customer_app/utils/utils.dart'; +import 'package:mc_common_app/models/user/image_response.dart'; +import 'package:mc_common_app/theme/colors.dart'; +import 'package:mc_common_app/utils/navigator.dart'; +import 'package:mc_common_app/utils/utils.dart'; import 'package:car_customer_app/view_models/dashboard_view_model.dart'; -import 'package:car_customer_app/widgets/show_fill_button.dart'; +import 'package:mc_common_app/widgets/show_fill_button.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; - - class CustomDrawer extends StatefulWidget { final DashboardVM dashboardVM; + const CustomDrawer({Key? key, required this.dashboardVM}) : super(key: key); @override @@ -26,7 +25,6 @@ class CustomDrawer extends StatefulWidget { } class _CustomDrawerState extends State { - void _openImagePicker() { showDialog( context: context, @@ -52,7 +50,7 @@ class _CustomDrawerState extends State { height: 200, color: MyColors.darkPrimaryColor.withOpacity(0.01), child: Image.network( - ApiConsts.baseUrlServices + AppState().getUser.data!.userInfo!.userImageUrl.toString(), + ApiConsts.baseUrlServices + AppStateCm().getUser.data!.userInfo!.userImageUrl.toString(), ), ), Positioned( @@ -96,7 +94,7 @@ class _CustomDrawerState extends State { if (response.messageStatus == 1) { Utils.showToast("Image is Deleted"); setState(() { - AppState().getUser.data!.userInfo!.userImageUrl = response.data; + AppStateCm().getUser.data!.userInfo!.userImageUrl = response.data; }); } Utils.hideLoading(context); @@ -125,7 +123,7 @@ class _CustomDrawerState extends State { fontSize: 20, letterSpacing: -1.44, ), - AppState().getUser.data!.userInfo!.roleName!.toText(fontSize: 10), + AppStateCm().getUser.data!.userInfo!.roleName!.toText(fontSize: 10), ], ), ),