Name Refactoring

aamir_dev
Faiz Hashmi 2 years ago
parent 272760bad3
commit 46839624c7

@ -11,7 +11,7 @@ import 'package:car_provider_app/views/settings/branch/define_branch_page.dart';
import 'package:car_provider_app/views/settings/schedule/add_schedules_page.dart'; import 'package:car_provider_app/views/settings/schedule/add_schedules_page.dart';
import 'package:car_provider_app/views/settings/schedule/schedules_list_page.dart'; import 'package:car_provider_app/views/settings/schedule/schedules_list_page.dart';
import 'package:car_provider_app/views/settings/services/create_item_page.dart'; import 'package:car_provider_app/views/settings/services/create_item_page.dart';
import 'package:car_provider_app/views/settings/dealership_page.dart'; import 'package:car_provider_app/views/settings/dealership_view.dart';
import 'package:car_provider_app/views/settings/services/create_services_page3.dart'; import 'package:car_provider_app/views/settings/services/create_services_page3.dart';
import 'package:car_provider_app/views/settings/services/duplication/matched_services_page.dart'; import 'package:car_provider_app/views/settings/services/duplication/matched_services_page.dart';
import 'package:car_provider_app/views/settings/services/duplication/sheet/approved_branches_list_sheet.dart'; import 'package:car_provider_app/views/settings/services/duplication/sheet/approved_branches_list_sheet.dart';
@ -31,7 +31,7 @@ import 'package:mc_common_app/views/advertisement/select_ad_type_view.dart';
import 'package:mc_common_app/views/chat/chat_view.dart'; import 'package:mc_common_app/views/chat/chat_view.dart';
import 'package:mc_common_app/views/payments/payment_methods_view.dart'; import 'package:mc_common_app/views/payments/payment_methods_view.dart';
import '../views/dashboard/dashboard_page.dart'; import '../views/dashboard/dashboard_view.dart';
class ProviderAppRoutes { class ProviderAppRoutes {
//settings //settings
@ -75,10 +75,10 @@ class ProviderAppRoutes {
static final Map<String, WidgetBuilder> routes = { static final Map<String, WidgetBuilder> routes = {
//Home page //Home page
AppRoutes.dashboard: (context) => const DashboardPage(), AppRoutes.dashboard: (context) => const DashboardView(),
// defineLicense: (context) => DefineLicensePage(), // defineLicense: (context) => DefineLicensePage(),
dealershipSetting: (context) => DealershipPage(), dealershipSetting: (context) => DealershipView(),
// branchList: (context) => BranchListPage(), // branchList: (context) => BranchListPage(),
defineBranch: (context) => DefineBranchPage((ModalRoute.of(context)!.settings.arguments) == null ? null : (ModalRoute.of(context)!.settings.arguments as BranchDetailModel)), defineBranch: (context) => DefineBranchPage((ModalRoute.of(context)!.settings.arguments) == null ? null : (ModalRoute.of(context)!.settings.arguments as BranchDetailModel)),
branchDetail: (context) => BranchDetailPage(ModalRoute.of(context)!.settings.arguments as BranchDetailModel), branchDetail: (context) => BranchDetailPage(ModalRoute.of(context)!.settings.arguments as BranchDetailModel),

@ -1,4 +1,6 @@
import 'dart:io'; import 'dart:io';
import 'package:car_provider_app/config/provider_routes.dart';
import 'package:car_provider_app/views/settings/branch/dealer/widget/add_phone_num_wiget.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
@ -11,6 +13,7 @@ import 'package:mc_common_app/models/user_models/image_response.dart';
import 'package:mc_common_app/repositories/user_repo.dart'; import 'package:mc_common_app/repositories/user_repo.dart';
import 'package:mc_common_app/services/common_services.dart'; import 'package:mc_common_app/services/common_services.dart';
import 'package:mc_common_app/utils/enums.dart'; import 'package:mc_common_app/utils/enums.dart';
import 'package:mc_common_app/utils/navigator.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:mc_common_app/services/firebase_service.dart'; import 'package:mc_common_app/services/firebase_service.dart';
import 'package:mc_common_app/utils/enums.dart'; import 'package:mc_common_app/utils/enums.dart';
@ -102,33 +105,6 @@ class DashboardVM extends BaseVM {
await requestsVM.getRequests(appType: AppType.provider); await requestsVM.getRequests(appType: AppType.provider);
await subscriptionsVM.getMySubscriptionsBySP(AppState().getUser.data?.userInfo?.providerId.toString() ?? ""); await subscriptionsVM.getMySubscriptionsBySP(AppState().getUser.data?.userInfo?.providerId.toString() ?? "");
await subscriptionsVM.getSubscriptionBySP(AppState().getUser.data?.userInfo?.providerId.toString() ?? "", true); await subscriptionsVM.getSubscriptionBySP(AppState().getUser.data?.userInfo?.providerId.toString() ?? "", true);
// if (adVm.myAds.isEmpty) {
// await adVm.getMyAds();
// }
//
// if (adVm.exploreAds.isEmpty) {
// await adVm.getExploreAds();
// }
// if (adVm.vehicleTypes.isEmpty) {
// await adVm.getVehicleTypes();
// }
//
// if (adVm.vehicleAdsDurations.isEmpty) {
// await adVm.getVehicleAdsDuration();
// }
//
// if (requestsVM.myRequests.isEmpty) {
// await requestsVM.getRequests(appType: AppType.provider);
// }
//
// if (subscriptionsVM.mySubscriptionsBySp.isEmpty) {
// await subscriptionsVM.getMySubscriptionsBySP(AppState().getUser.data?.userInfo?.providerId.toString() ?? "");
// }
//
// if (subscriptionsVM.tempSubscriptions.isEmpty) {
// await subscriptionsVM.getSubscriptionBySP(AppState().getUser.data?.userInfo?.providerId.toString() ?? "", true);
// }
} }
void checkUserSubscription(SubscriptionActionTypeEnum actionType, BuildContext context, {required Function() callback}) async { void checkUserSubscription(SubscriptionActionTypeEnum actionType, BuildContext context, {required Function() callback}) async {
@ -145,7 +121,6 @@ class DashboardVM extends BaseVM {
} }
} }
void performCheckOnBranches(BuildContext context) async { void performCheckOnBranches(BuildContext context) async {
if (AppState().getproviderSubscription.isNotEmpty && AppState().getproviderSubscription.first.branchesRemaining! > 0) { if (AppState().getproviderSubscription.isNotEmpty && AppState().getproviderSubscription.first.branchesRemaining! > 0) {
await navigateWithName(context, ProviderAppRoutes.defineBranch); await navigateWithName(context, ProviderAppRoutes.defineBranch);
@ -164,12 +139,7 @@ class DashboardVM extends BaseVM {
void performCheckOnUsers(BuildContext context, Function() callBack) async { void performCheckOnUsers(BuildContext context, Function() callBack) async {
if (AppState().getproviderSubscription.isNotEmpty && AppState().getproviderSubscription.first.subUsersRemaining! > 0) { if (AppState().getproviderSubscription.isNotEmpty && AppState().getproviderSubscription.first.subUsersRemaining! > 0) {
showMyBottomSheet( showMyBottomSheet(context, isDismissible: false, child: const AddPhoneNumWidget(), callBackFunc: callBack);
context,
isDismissible: false,
child: const AddPhoneNumWidget(),
callBackFunc: callBack
);
} else { } else {
Utils.showToast("Upgrade your subscription to add more Sub Users."); Utils.showToast("Upgrade your subscription to add more Sub Users.");
} }

@ -9,14 +9,14 @@ import 'fragments/home_fragment.dart';
import 'package:mc_common_app/views/common_fragments/ads_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'; import 'package:mc_common_app/views/common_fragments/my_requests_fragment.dart';
class DashboardPage extends StatefulWidget { class DashboardView extends StatefulWidget {
const DashboardPage({Key? key}) : super(key: key); const DashboardView({Key? key}) : super(key: key);
@override @override
State<DashboardPage> createState() => _DashboardPageState(); State<DashboardView> createState() => _DashboardViewState();
} }
class _DashboardPageState extends State<DashboardPage> { class _DashboardViewState extends State<DashboardView> {
late DashboardVM dashboardVM; late DashboardVM dashboardVM;
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>(); final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();

@ -1,22 +1,22 @@
import 'package:car_provider_app/config/provider_routes.dart'; import 'package:car_provider_app/config/provider_routes.dart';
import 'package:car_provider_app/generated/locale_keys.g.dart';
import 'package:easy_localization/src/public_ext.dart'; import 'package:easy_localization/src/public_ext.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/classes/consts.dart';
import 'package:mc_common_app/config/routes.dart';
import 'package:mc_common_app/extensions/string_extensions.dart'; import 'package:mc_common_app/extensions/string_extensions.dart';
import 'package:mc_common_app/generated/locale_keys.g.dart'; import 'package:mc_common_app/generated/locale_keys.g.dart';
import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/theme/colors.dart';
import 'package:mc_common_app/utils/navigator.dart'; import 'package:mc_common_app/utils/navigator.dart';
import 'package:mc_common_app/widgets/common_widgets/app_bar.dart'; import 'package:mc_common_app/widgets/common_widgets/app_bar.dart';
class DealershipPage extends StatelessWidget { class DealershipView extends StatelessWidget {
const DealershipView({super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: CustomAppBar(title: LocaleKeys.dealershipSettings.tr()), appBar: CustomAppBar(title: LocaleKeys.dealershipSettings.tr()),
body: Container( body: SizedBox(
width: double.infinity, width: double.infinity,
height: double.infinity, height: double.infinity,
child: Column( child: Column(

@ -48,7 +48,6 @@ class _CreateServicesPage3State extends State<CreateServicesPage3> {
@override @override
void initState() { void initState() {
// TODO: implement initState
super.initState(); super.initState();
scheduleMicrotask(() { scheduleMicrotask(() {
ServiceVM serviceVM = context.read<ServiceVM>(); ServiceVM serviceVM = context.read<ServiceVM>();

Loading…
Cancel
Save