diff --git a/assets/assets/fonts/Poppins-Medium.ttf b/assets/assets/fonts/Poppins-Medium.ttf deleted file mode 100644 index 6bcdcc2..0000000 Binary files a/assets/assets/fonts/Poppins-Medium.ttf and /dev/null differ diff --git a/assets/assets/icons/Group 17.png b/assets/assets/icons/Group 17.png deleted file mode 100644 index 7bb404a..0000000 Binary files a/assets/assets/icons/Group 17.png and /dev/null differ diff --git a/assets/assets/icons/ic_branchs.svg b/assets/assets/icons/ic_branchs.svg deleted file mode 100644 index d074656..0000000 --- a/assets/assets/icons/ic_branchs.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/assets/icons/ic_close_account.svg b/assets/assets/icons/ic_close_account.svg deleted file mode 100644 index 93adb61..0000000 --- a/assets/assets/icons/ic_close_account.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/assets/assets/icons/ic_face.svg b/assets/assets/icons/ic_face.svg deleted file mode 100644 index 5fa9a9c..0000000 --- a/assets/assets/icons/ic_face.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/assets/assets/icons/ic_face_id.png b/assets/assets/icons/ic_face_id.png deleted file mode 100644 index 913e850..0000000 Binary files a/assets/assets/icons/ic_face_id.png and /dev/null differ diff --git a/assets/assets/icons/ic_fingerprint.png b/assets/assets/icons/ic_fingerprint.png deleted file mode 100644 index bf73197..0000000 Binary files a/assets/assets/icons/ic_fingerprint.png and /dev/null differ diff --git a/assets/assets/icons/ic_fingerprint.svg b/assets/assets/icons/ic_fingerprint.svg deleted file mode 100644 index ba45417..0000000 --- a/assets/assets/icons/ic_fingerprint.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/assets/assets/icons/ic_provider.svg b/assets/assets/icons/ic_provider.svg deleted file mode 100644 index e22c356..0000000 --- a/assets/assets/icons/ic_provider.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/assets/icons/ic_services.svg b/assets/assets/icons/ic_services.svg deleted file mode 100644 index b0d0606..0000000 --- a/assets/assets/icons/ic_services.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/assets/assets/icons/ic_settings.svg b/assets/assets/icons/ic_settings.svg deleted file mode 100644 index 6435135..0000000 --- a/assets/assets/icons/ic_settings.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/assets/assets/icons/ic_sms.png b/assets/assets/icons/ic_sms.png deleted file mode 100644 index aa72e0e..0000000 Binary files a/assets/assets/icons/ic_sms.png and /dev/null differ diff --git a/assets/assets/icons/ic_sms.svg b/assets/assets/icons/ic_sms.svg deleted file mode 100644 index 132ab7f..0000000 --- a/assets/assets/icons/ic_sms.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/assets/assets/icons/ic_whatsapp.png b/assets/assets/icons/ic_whatsapp.png deleted file mode 100644 index 3f36403..0000000 Binary files a/assets/assets/icons/ic_whatsapp.png and /dev/null differ diff --git a/assets/assets/icons/ic_whatsapp.svg b/assets/assets/icons/ic_whatsapp.svg deleted file mode 100644 index 073e581..0000000 --- a/assets/assets/icons/ic_whatsapp.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/assets/assets/images/bn_car.jpeg b/assets/assets/images/bn_car.jpeg deleted file mode 100644 index 5a6bd85..0000000 Binary files a/assets/assets/images/bn_car.jpeg and /dev/null differ diff --git a/assets/assets/images/bn_logo.svg b/assets/assets/images/bn_logo.svg deleted file mode 100644 index b0c971d..0000000 --- a/assets/assets/images/bn_logo.svg +++ /dev/null @@ -1,560 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/assets/images/bn_map.png b/assets/assets/images/bn_map.png deleted file mode 100644 index b04b5aa..0000000 Binary files a/assets/assets/images/bn_map.png and /dev/null differ diff --git a/assets/assets/images/ic_car.svg b/assets/assets/images/ic_car.svg deleted file mode 100644 index 804f607..0000000 --- a/assets/assets/images/ic_car.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/assets/assets/images/ic_edit.svg b/assets/assets/images/ic_edit.svg deleted file mode 100644 index c14165f..0000000 --- a/assets/assets/images/ic_edit.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/assets/assets/images/ic_email.svg b/assets/assets/images/ic_email.svg deleted file mode 100644 index 81c4573..0000000 --- a/assets/assets/images/ic_email.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/assets/assets/images/ic_engine.png b/assets/assets/images/ic_engine.png deleted file mode 100644 index 0256ff0..0000000 Binary files a/assets/assets/images/ic_engine.png and /dev/null differ diff --git a/assets/assets/images/ic_lock.svg b/assets/assets/images/ic_lock.svg deleted file mode 100644 index 1273157..0000000 --- a/assets/assets/images/ic_lock.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/assets/images/ic_logo_white.png b/assets/assets/images/ic_logo_white.png deleted file mode 100644 index 779fda4..0000000 Binary files a/assets/assets/images/ic_logo_white.png and /dev/null differ diff --git a/assets/assets/images/ic_logout.svg b/assets/assets/images/ic_logout.svg deleted file mode 100644 index 2be107f..0000000 --- a/assets/assets/images/ic_logout.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/assets/assets/images/ic_mobile.svg b/assets/assets/images/ic_mobile.svg deleted file mode 100644 index 068cf7a..0000000 --- a/assets/assets/images/ic_mobile.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/assets/assets/images/ic_notes.svg b/assets/assets/images/ic_notes.svg deleted file mode 100644 index 009cf17..0000000 --- a/assets/assets/images/ic_notes.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/assets/assets/images/ic_notification.svg b/assets/assets/images/ic_notification.svg deleted file mode 100644 index e45bab2..0000000 --- a/assets/assets/images/ic_notification.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/assets/assets/images/ic_settings.svg b/assets/assets/images/ic_settings.svg deleted file mode 100644 index 83b64c9..0000000 --- a/assets/assets/images/ic_settings.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/assets/assets/images/ic_world.png b/assets/assets/images/ic_world.png deleted file mode 100644 index 01ea634..0000000 Binary files a/assets/assets/images/ic_world.png and /dev/null differ diff --git a/assets/assets/images/logo.svg b/assets/assets/images/logo.svg deleted file mode 100644 index 8552147..0000000 --- a/assets/assets/images/logo.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/assets/images/splash_logo.svg b/assets/assets/images/splash_logo.svg deleted file mode 100644 index 481226e..0000000 --- a/assets/assets/images/splash_logo.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/assets/fonts/Poppins-Medium.ttf b/assets/fonts/Poppins-Medium.ttf deleted file mode 100644 index 6bcdcc2..0000000 Binary files a/assets/fonts/Poppins-Medium.ttf and /dev/null differ diff --git a/lib/config/customer_dependencies.dart b/lib/config/customer_dependencies.dart index d74aa71..53792ef 100644 --- a/lib/config/customer_dependencies.dart +++ b/lib/config/customer_dependencies.dart @@ -4,6 +4,5 @@ class CustomerDependencies { static void addDependencies() { AppDependencies.addDependencies(); - } } diff --git a/lib/main.dart b/lib/main.dart index d1cbb8b..aa4a166 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -4,6 +4,7 @@ import 'package:car_customer_app/view_models/dashboard_view_model.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:mc_common_app/classes/app_state_cm.dart'; +import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/services/services.dart'; import 'package:mc_common_app/theme/app_theme.dart'; import 'package:mc_common_app/config/dependencies.dart'; @@ -12,6 +13,7 @@ import 'package:mc_common_app/models/post_params_model.dart'; import 'package:mc_common_app/repositories/user_repo.dart'; import 'package:mc_common_app/view_models/base_view_model.dart'; import 'package:mc_common_app/view_models/user_view_model.dart'; +import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; import 'package:sizer/sizer.dart'; import 'package:provider/provider.dart'; import 'package:provider/single_child_widget.dart'; @@ -23,31 +25,25 @@ Future main() async { CustomerDependencies.addDependencies(); await EasyLocalization.ensureInitialized(); CustomerAppRoutes.routes.addAll(AppRoutes.routes); + runApp( - EasyLocalization( - supportedLocales: const [Locale('ar', 'SA'), Locale('en', 'US')], - fallbackLocale: const Locale('en', 'US'), - startLocale: const Locale('en', 'US'), - assetLoader: const CodegenLoader(), - path: "assetsl/langs", - child: MultiProvider( - providers: [ - ChangeNotifierProvider( - create: (_) => BaseVM(), - ), - ChangeNotifierProvider( - create: (_) => DashboardVM( - userRepo: injector.get(), - commonServices: injector.get(), - ), - ), - ChangeNotifierProvider( - create: (_) => UserVM(userRepo: injector.get()), + MultiProvider( + providers: [ + ChangeNotifierProvider( + create: (_) => BaseVM(), + ), + ChangeNotifierProvider( + create: (_) => DashboardVM( + userRepo: injector.get(), + commonServices: injector.get(), ), - ], - child: const MyApp(), - ), - ), + ), + ChangeNotifierProvider( + create: (_) => UserVM(userRepo: injector.get()), + ), + ], + child: const MyApp(), + ).setupLocale(), ); } diff --git a/lib/views/dashboard/dashboard_page.dart b/lib/views/dashboard/dashboard_page.dart index 9e54184..e9a5664 100644 --- a/lib/views/dashboard/dashboard_page.dart +++ b/lib/views/dashboard/dashboard_page.dart @@ -1,10 +1,12 @@ import 'package:car_customer_app/view_models/dashboard_view_model.dart'; import 'package:car_customer_app/views/dashboard/fragments/home_fragment.dart'; -import 'package:car_customer_app/views/dashboard/widgets/bottom_nav_bar.dart'; import 'package:car_customer_app/views/dashboard/widgets/drawer_widget.dart'; import 'package:flutter/material.dart'; -import 'package:mc_common_app/widgets/app_bar.dart'; +import 'package:mc_common_app/classes/consts.dart'; +import 'package:mc_common_app/widgets/common_widgets/app_bar.dart'; +import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; import 'package:provider/provider.dart'; +import 'package:mc_common_app/widgets/common_widgets/bottom_nav_bar.dart'; class DashboardPage extends StatefulWidget { const DashboardPage({Key? key}) : super(key: key); @@ -35,9 +37,19 @@ class _DashboardPageState extends State { @override Widget build(BuildContext context) { return Scaffold( - appBar: const CustomAppBar(title: "Logo/Brand", isRemoveBackButton: true), + + appBar: CustomAppBar( + profileImageUrl: "assets/images/bn_car.jpeg", + isRemoveBackButton: false, + isDrawerEnabled: true, + actions: [MyAssets.notificationsIcon.buildSvg().paddingOnly(right: 21)], + ), drawer: CustomDrawer(dashboardVM: dashboardVM), - bottomNavigationBar: const CustomBottomNavbar(), + bottomNavigationBar: CustomBottomNavbar( + selectedNavbarBarIndex: dashboardVM.selectedNavbarBarIndex, + onSelected: (int index) { + dashboardVM.onNavbarTapped(index); + }), body: fragments[dashboardVM.selectedNavbarBarIndex], ); } diff --git a/lib/views/dashboard/fragments/home_fragment.dart b/lib/views/dashboard/fragments/home_fragment.dart index 4415b19..71d7289 100644 --- a/lib/views/dashboard/fragments/home_fragment.dart +++ b/lib/views/dashboard/fragments/home_fragment.dart @@ -1,10 +1,10 @@ -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'; import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; +import 'package:mc_common_app/widgets/common_widgets/ad_widget.dart'; +import 'package:mc_common_app/widgets/common_widgets/appointment_slider_widget.dart'; +import 'package:mc_common_app/widgets/common_widgets/view_all_widget.dart'; +import 'package:mc_common_app/widgets/common_widgets/my_service_provider.dart'; class HomeFragment extends StatelessWidget { const HomeFragment({Key? key}) : super(key: key); @@ -20,6 +20,7 @@ class HomeFragment extends StatelessWidget { child: Column( mainAxisSize: MainAxisSize.max, children: [ + ViewAllWidget(title: "Upcoming Appointment".toUpperCase(), subTitle: "View All").horPaddingMain(), const AppointmentSliderWidget(), 7.height, diff --git a/lib/views/dashboard/widgets/ad_widget.dart b/lib/views/dashboard/widgets/ad_widget.dart deleted file mode 100644 index 4cf8920..0000000 --- a/lib/views/dashboard/widgets/ad_widget.dart +++ /dev/null @@ -1,111 +0,0 @@ - -import 'package:flutter/material.dart'; -import 'package:mc_common_app/extensions/int_extensions.dart'; -import 'package:mc_common_app/extensions/string_extensions.dart'; -import 'package:mc_common_app/theme/colors.dart'; -import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; - -class AdWidget extends StatelessWidget { - final int count; - - const AdWidget({Key? key, required this.count}) : super(key: key); - - @override - Widget build(BuildContext context) { - return ListView.builder( - itemCount: count, - shrinkWrap: true, - physics: const NeverScrollableScrollPhysics(), - itemBuilder: (BuildContext context, int index) { - return Padding( - padding: const EdgeInsets.only(bottom: 15), - child: buildAdContainer(), - ); - }); - } - - Widget buildAdContainer() { - return Row( - children: [ - Image.asset( - "assets/images/bn_car.jpeg", - width: 80, - height: 80, - fit: BoxFit.cover, - ), - 12.width, - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - "Toyota Crolla".toText(fontSize: 16, isBold: true), - Row( - children: [ - "Model:".toText( - color: MyColors.lightTextColor, - ), - 2.width, - "2019".toText(), - ], - ), - Row( - children: [ - "Mileage:".toText( - color: MyColors.lightTextColor, - ), - 2.width, - "73,000 km".toText(), - ], - ), - ], - ), - ), - Column( - crossAxisAlignment: CrossAxisAlignment.end, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - "Riyadh".toText( - color: MyColors.lightTextColor, - ), - "9 Hours Ago".toText( - color: MyColors.lightTextColor, - ), - ], - ), - ], - ), - 8.height, - Row( - children: [ - Expanded( - child: Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - "30,000".toText(fontSize: 16, isBold: true), - 2.width, - "SAR:".toText( - color: MyColors.lightTextColor, - ), - ], - ), - ), - const Icon(Icons.arrow_forward) - ], - ), - ], - ), - ), - ], - ).toWhiteContainer(width: double.infinity, allPading: 12); - } -} diff --git a/lib/views/dashboard/widgets/appointment_slider_widget.dart b/lib/views/dashboard/widgets/appointment_slider_widget.dart deleted file mode 100644 index b8c5a72..0000000 --- a/lib/views/dashboard/widgets/appointment_slider_widget.dart +++ /dev/null @@ -1,176 +0,0 @@ -import 'package:carousel_slider/carousel_slider.dart'; -import 'package:flutter/material.dart'; -import 'package:mc_common_app/extensions/int_extensions.dart'; -import 'package:mc_common_app/extensions/string_extensions.dart'; -import 'package:mc_common_app/theme/colors.dart'; -import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; - -class AppointmentSliderWidget extends StatelessWidget { - const AppointmentSliderWidget({Key? key}) : super(key: key); - - Widget buildAppointmentContainerForProvider() { - return Container( - margin: EdgeInsets.only(bottom: 21, left: 21, right: 21, top: 7), - child: Column( - children: [ - Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - "Olaya Brach".toText( - color: MyColors.lightTextColor, - isBold: true, - ), - "Abdullah Alhbas".toText( - isBold: true, - fontSize: 14, - ), - Row( - children: [ - "Appt. On:".toText( - color: MyColors.lightTextColor, - ), - 2.width, - "19-Mar-2023 11:48 AM".toText(), - ], - ), - ], - ), - ), - "1+ Requests".toText(fontSize: 10).toContainer( - borderRadius: 15, - backgroundColor: MyColors.lightGreyEAColor, - padding: const EdgeInsets.symmetric( - vertical: 6, - horizontal: 12, - ), - ), - ], - ), - 8.height, - Row( - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - Expanded( - child: Column( - children: [ - showServices("Maintenance"), - 2.height, - showServices("Accessories and Modification"), - ], - ), - ), - const Icon( - Icons.arrow_forward, - ), - ], - ), - ], - ).toWhiteContainer(width: double.infinity, allPading: 12), - ); - } - - Widget buildAppointmentSliderForConsumer() { - return Container( - margin: EdgeInsets.only(bottom: 21, left: 21, right: 21, top: 7), - child: Column( - children: [ - Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - "Olaya Brach".toText( - color: MyColors.lightTextColor, - isBold: true, - ), - "Abdullah Alhbas".toText( - isBold: true, - fontSize: 14, - ), - Row( - children: [ - "Appt. On:".toText( - color: MyColors.lightTextColor, - ), - 2.width, - "19-Mar-2023 11:48 AM".toText(), - ], - ), - ], - ), - ), - "1+ Requests".toText(fontSize: 10).toContainer( - borderRadius: 15, - backgroundColor: MyColors.lightGreyEAColor, - padding: const EdgeInsets.symmetric( - vertical: 6, - horizontal: 12, - ), - ), - ], - ), - 8.height, - Row( - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - Expanded( - child: Column( - children: [ - showServices("Maintenance"), - 2.height, - showServices("Accessories and Modification"), - ], - ), - ), - const Icon( - Icons.arrow_forward, - ), - ], - ), - ], - ).toWhiteContainer(width: double.infinity, allPading: 12), - ); - } - - @override - Widget build(BuildContext context) { - return CarouselSlider.builder( - options: CarouselOptions( - height: 160, - viewportFraction: 1.0, - enlargeCenterPage: true, - enableInfiniteScroll: false, - // - // onPageChanged: (index) { - // setState(() { - // _current = index; - // }); - // }, - ), - itemCount: 10, - itemBuilder: (BuildContext context, int itemIndex, int pageViewIndex) => buildAppointmentSliderForConsumer()); - } - - Widget showServices(String title) { - return Row( - children: [ - const Icon( - Icons.ac_unit, - color: MyColors.primaryColor, - size: 18, - ), - 8.width, - title.toText( - fontSize: 14, - isBold: true, - ), - ], - ); - } -} diff --git a/lib/views/dashboard/widgets/bottom_nav_bar.dart b/lib/views/dashboard/widgets/bottom_nav_bar.dart deleted file mode 100644 index fb8f3e9..0000000 --- a/lib/views/dashboard/widgets/bottom_nav_bar.dart +++ /dev/null @@ -1,61 +0,0 @@ -import 'package:car_customer_app/generated/locale_keys.g.dart'; -import 'package:car_customer_app/view_models/dashboard_view_model.dart'; -import 'package:easy_localization/easy_localization.dart'; -import 'package:flutter/material.dart'; -import 'package:mc_common_app/extensions/widget_extensions.dart'; -import 'package:mc_common_app/theme/colors.dart'; -import 'package:provider/provider.dart'; -import 'package:flutter_svg/flutter_svg.dart'; -import 'package:mc_common_app/classes/consts.dart'; - -class CustomBottomNavbar extends StatelessWidget { - const CustomBottomNavbar({Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - final DashboardVM dashboardVM = context.watch(); - return BottomNavigationBar( - items: [ - BottomNavigationBarItem( - icon: SvgPicture.asset(MyAssets.providersIcon).paddingAll(5), - activeIcon: SvgPicture.asset(MyAssets.providersIcon, color: MyColors.darkIconColor).paddingAll(5), - label: LocaleKeys.providers.tr(), - ), - BottomNavigationBarItem( - icon: SvgPicture.asset(MyAssets.appointmentsIcon).paddingAll(5), - activeIcon: SvgPicture.asset(MyAssets.appointmentsIcon, color: MyColors.darkIconColor).paddingAll(5), - label: LocaleKeys.appointments.tr(), - ), - BottomNavigationBarItem( - icon: SvgPicture.asset( - MyAssets.homeIcon, - color: MyColors.lightIconColor, - ).paddingAll(5), - activeIcon: SvgPicture.asset(MyAssets.homeIcon, color: MyColors.darkIconColor).paddingAll(5), - label: LocaleKeys.home.tr(), - ), - BottomNavigationBarItem( - icon: SvgPicture.asset(MyAssets.announcementIcon).paddingAll(5), - activeIcon: SvgPicture.asset(MyAssets.announcementIcon, color: MyColors.darkIconColor).paddingAll(5), - label: LocaleKeys.ads.tr(), - ), - BottomNavigationBarItem( - icon: SvgPicture.asset(MyAssets.settingsIcon).paddingAll(5), - activeIcon: SvgPicture.asset(MyAssets.settingsIcon, color: MyColors.darkIconColor).paddingAll(5), - label: LocaleKeys.settings.tr(), - ), - ], - currentIndex: dashboardVM.selectedNavbarBarIndex, - type: BottomNavigationBarType.fixed, - selectedItemColor: MyColors.darkIconColor, - showSelectedLabels: true, - showUnselectedLabels: true, - unselectedItemColor: MyColors.lightTextColor, - unselectedFontSize: 11, - selectedFontSize: 11, - selectedLabelStyle: const TextStyle(fontFamily: "Poppins"), - unselectedLabelStyle: const TextStyle(fontFamily: "Poppins"), - onTap: (index) => dashboardVM.onNavbarTapped(index), - ); - } -} diff --git a/lib/views/dashboard/widgets/my_branches_widget.dart b/lib/views/dashboard/widgets/my_branches_widget.dart deleted file mode 100644 index 0f250fe..0000000 --- a/lib/views/dashboard/widgets/my_branches_widget.dart +++ /dev/null @@ -1,39 +0,0 @@ - -import 'package:flutter/material.dart'; -import 'package:mc_common_app/extensions/int_extensions.dart'; -import 'package:mc_common_app/extensions/string_extensions.dart'; -import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; - -class ServiceProviderWidget extends StatelessWidget { - const ServiceProviderWidget({Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return SizedBox( - width: double.infinity, - height: 140, - child: ListView.builder( - itemCount: 9, - scrollDirection: Axis.horizontal, - shrinkWrap: true, - itemBuilder: (BuildContext context, int index) { - return SizedBox( - width: 90, - child: Column( - children: [ - Image.asset( - "assets/images/bn_car.jpeg", - width: 80, - height: 80, - fit: BoxFit.cover, - ).toCircle(borderRadius: 100), - 8.height, - "Olaya Branch".toText(fontSize: 14, isBold: true, textAlign: TextAlign.center), - ], - ), - ); - }, - ), - ); - } -} diff --git a/lib/views/dashboard/widgets/view_all_widget.dart b/lib/views/dashboard/widgets/view_all_widget.dart deleted file mode 100644 index b46d67c..0000000 --- a/lib/views/dashboard/widgets/view_all_widget.dart +++ /dev/null @@ -1,30 +0,0 @@ - -import 'package:flutter/cupertino.dart'; -import 'package:mc_common_app/extensions/string_extensions.dart'; -import 'package:mc_common_app/theme/colors.dart'; - -class ViewAllWidget extends StatelessWidget { - final String title; - final String subTitle; - - const ViewAllWidget({Key? key, required this.title, required this.subTitle}) : super(key: key); - - @override - Widget build(BuildContext context) { - return Container( - width: double.infinity, - padding: const EdgeInsets.only(bottom: 7), - child: Row( - children: [ - Expanded(child: title.toText(isBold: true, fontSize: 18)), - subTitle.toText( - fontSize: 11, - isBold: true, - color: MyColors.primaryColor, - textDecoration: TextDecoration.underline, - ) - ], - ), - ); - } -} diff --git a/pubspec.yaml b/pubspec.yaml index 50481cb..3c34c8f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -34,9 +34,6 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 - flutter_password_strength: ^0.1.6 - - carousel_slider: ^4.2.1 mc_common_app: path: D:/Development/car_common_app @@ -86,9 +83,9 @@ flutter: # "family" key with the font family name, and a "fonts" key with a # list giving the asset and other descriptors for the font. For # example: - fonts: - - family: Poppins - fonts: - - asset: assets/fonts/Poppins-Medium.ttf +# fonts: +# - family: Poppins +# fonts: +# - asset: assets/fonts/Poppins-Medium.ttf # For details regarding fonts from package dependencies, # see https://flutter.dev/custom-fonts/#from-packages