From c6656e152ae55e1820569e4de1ca3edb5ae1fb54 Mon Sep 17 00:00:00 2001 From: Faiz Hashmi Date: Tue, 17 Sep 2024 17:25:33 +0300 Subject: [PATCH] RequestModule Completed --- lib/main.dart | 24 ++-- lib/view_models/dashboard_view_model.dart | 2 - lib/views/dashboard/dashboard_view.dart | 2 +- .../settings/branch/branch_list_page.dart | 5 +- .../settings/branch/define_branch_view.dart | 108 ++++++++++-------- 5 files changed, 78 insertions(+), 63 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index c4590b6..86fb33d 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -44,18 +44,18 @@ import 'config/provider_routes.dart'; Future main() async { WidgetsFlutterBinding.ensureInitialized(); await EasyLocalization.ensureInitialized(); - if(Platform.isAndroid) { - await Firebase.initializeApp( - options: const FirebaseOptions( - apiKey: 'AIzaSyD1WNNGrbBiCNvCrI31d3DV5AOgToq-Lus', - appId: '1:294636898500:android:e93b7e5d1cc15ae6b0e191', - messagingSenderId: '294636898500', - projectId: 'mowater-2c81a', - ), - ); - } else{ - await Firebase.initializeApp(); - } + if (Platform.isAndroid) { + await Firebase.initializeApp( + options: const FirebaseOptions( + apiKey: 'AIzaSyD1WNNGrbBiCNvCrI31d3DV5AOgToq-Lus', + appId: '1:294636898500:android:e93b7e5d1cc15ae6b0e191', + messagingSenderId: '294636898500', + projectId: 'mowater-2c81a', + ), + ); + } else { + await Firebase.initializeApp(); + } ProviderAppDependencies.addDependencies(); injector.get().initializeNotifications(); ProviderAppRoutes.routes.addAll(AppRoutes.routes); diff --git a/lib/view_models/dashboard_view_model.dart b/lib/view_models/dashboard_view_model.dart index ea5cb5b..472d190 100644 --- a/lib/view_models/dashboard_view_model.dart +++ b/lib/view_models/dashboard_view_model.dart @@ -15,8 +15,6 @@ import 'package:mc_common_app/services/common_services.dart'; import 'package:mc_common_app/utils/enums.dart'; import 'package:mc_common_app/utils/navigator.dart'; import 'package:provider/provider.dart'; -import 'package:mc_common_app/services/firebase_service.dart'; -import 'package:mc_common_app/utils/enums.dart'; import 'package:mc_common_app/utils/location/Location.dart'; import 'package:mc_common_app/utils/shared_prefrence.dart'; import 'package:mc_common_app/utils/utils.dart'; diff --git a/lib/views/dashboard/dashboard_view.dart b/lib/views/dashboard/dashboard_view.dart index 6876ac4..61b2d70 100644 --- a/lib/views/dashboard/dashboard_view.dart +++ b/lib/views/dashboard/dashboard_view.dart @@ -2,12 +2,12 @@ import 'dart:async'; import 'package:car_provider_app/view_models/dashboard_view_model.dart'; import 'package:car_provider_app/views/settings/branch/branch_list_page.dart'; import 'package:flutter/material.dart'; +import 'package:mc_common_app/views/common_fragments/requests_fragment.dart'; import 'package:mc_common_app/widgets/common_widgets/bottom_nav_bar.dart'; import 'package:provider/provider.dart'; import 'fragments/branch_appointment_fragment.dart'; import 'fragments/home_fragment.dart'; import 'package:mc_common_app/views/common_fragments/ads_fragment.dart'; -import 'package:mc_common_app/views/common_fragments/my_requests_fragment.dart'; class DashboardView extends StatefulWidget { const DashboardView({Key? key}) : super(key: key); diff --git a/lib/views/settings/branch/branch_list_page.dart b/lib/views/settings/branch/branch_list_page.dart index c5ced59..fc762db 100644 --- a/lib/views/settings/branch/branch_list_page.dart +++ b/lib/views/settings/branch/branch_list_page.dart @@ -2,7 +2,6 @@ import 'package:car_provider_app/config/provider_routes.dart'; import 'package:flutter/gestures.dart'; import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/generated/locale_keys.g.dart'; -import 'package:mc_common_app/utils/app_permission_handler.dart'; import 'package:mc_common_app/utils/dialogs_and_bottomsheets.dart'; import 'package:mc_common_app/view_models/service_view_model.dart'; import 'package:easy_localization/easy_localization.dart'; @@ -27,7 +26,7 @@ import 'package:provider/provider.dart'; class BranchListPage extends StatelessWidget { const BranchListPage({Key? key}) : super(key: key); - void deleteAdBottomSheet(BuildContext context, int branchID) { + void deleteBranchBottomSheet(BuildContext context, int branchID) { return actionConfirmationBottomSheet( context: context, title: LocaleKeys.deleteBranchConfirmation.tr().toText(fontSize: 28, isBold: true, letterSpacing: -1.44), @@ -125,7 +124,7 @@ class BranchListPage extends StatelessWidget { dragStartBehavior: DragStartBehavior.start, direction: DismissDirection.endToStart, confirmDismiss: (DismissDirection direction) async { - deleteAdBottomSheet(context, branchModel.id!); + deleteBranchBottomSheet(context, branchModel.id!); }, child: Row( children: [ diff --git a/lib/views/settings/branch/define_branch_view.dart b/lib/views/settings/branch/define_branch_view.dart index 8c98c15..66b3c3c 100644 --- a/lib/views/settings/branch/define_branch_view.dart +++ b/lib/views/settings/branch/define_branch_view.dart @@ -10,7 +10,7 @@ import 'package:mc_common_app/views/location_views/pick_location_page.dart'; import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/models/provider_branches_models/branch_detail_model.dart'; import 'package:mc_common_app/theme/colors.dart'; -import 'package:provider/provider.dart'; +import 'package:provider/provider.dart'; import 'package:mc_common_app/utils/enums.dart'; import 'package:mc_common_app/utils/navigator.dart'; import 'package:mc_common_app/views/advertisement/ad_creation_steps/ad_creation_steps_containers.dart'; @@ -101,6 +101,7 @@ class _DefineBranchViewState extends State { ), 12.height, TxtField( + maxLines: 3, hint: "${LocaleKeys.branchDescription.tr()}*", value: serviceVM.branchDescription, onChanged: (v) { @@ -149,56 +150,73 @@ class _DefineBranchViewState extends State { TxtField( hint: LocaleKeys.address.tr(), isNeedClickAll: false, - maxLines: 3, value: serviceVM.address, + postfixWidget: IconButton( + icon: const Icon( + size: 28, + Icons.add_location_outlined, + ), + onPressed: () { + navigateTo( + context, + PickLocationPage( + onPickAddress: (double latitude, double longitude, String address) { + serviceVM.latitude = latitude; + serviceVM.longitude = longitude; + serviceVM.address = address; + serviceVM.setState(ViewState.idle); + }, + ), + ); + }), onChanged: (v) { serviceVM.address = v; }, ), 12.height, - InkWell( - onTap: () { - navigateTo( - context, - PickLocationPage( - onPickAddress: (double latitude, double longitude, String address) { - serviceVM.latitude = latitude; - serviceVM.longitude = longitude; - serviceVM.address = address; - serviceVM.setState(ViewState.idle); - }, - ), - ); - }, - child: Container( - width: double.infinity, - height: 45, - decoration: BoxDecoration( - color: Colors.transparent, - border: Border.all(color: MyColors.darkPrimaryColor, width: 2), - borderRadius: const BorderRadius.all(Radius.circular(8)), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - const Icon( - Icons.place_outlined, - size: 18, - color: MyColors.darkPrimaryColor, - ), - 8.width, - Text( - LocaleKeys.pickAddress.tr(), - style: const TextStyle( - color: MyColors.darkPrimaryColor, - ), - ), - ], - ), - ), - ), - 12.height, + // InkWell( + // onTap: () { + // navigateTo( + // context, + // PickLocationPage( + // onPickAddress: (double latitude, double longitude, String address) { + // serviceVM.latitude = latitude; + // serviceVM.longitude = longitude; + // serviceVM.address = address; + // serviceVM.setState(ViewState.idle); + // }, + // ), + // ); + // }, + // child: Container( + // width: double.infinity, + // height: 45, + // decoration: BoxDecoration( + // color: Colors.transparent, + // border: Border.all(color: MyColors.darkPrimaryColor, width: 2), + // borderRadius: const BorderRadius.all(Radius.circular(8)), + // ), + // child: Row( + // mainAxisAlignment: MainAxisAlignment.center, + // crossAxisAlignment: CrossAxisAlignment.center, + // children: [ + // const Icon( + // Icons.place_outlined, + // size: 18, + // color: MyColors.darkPrimaryColor, + // ), + // 8.width, + // Text( + // LocaleKeys.pickAddress.tr(), + // style: const TextStyle( + // color: MyColors.darkPrimaryColor, + // ), + // ), + // ], + // ), + // ), + // ), + // 12.height, DottedRectContainer( onTap: () => serviceVM.pickMultipleImages(), text: LocaleKeys.attachImage.tr(),