diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7014bd2..7b0be8a 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -34,6 +34,7 @@ + @@ -43,6 +44,10 @@ + + main() async { ), ), ChangeNotifierProvider( - create: (_) => UserVM(userRepo: injector.get(), commanServices: injector.get()), + create: (_) => UserVM( + userRepo: injector.get(), + commanServices: injector.get(), + ), ), ChangeNotifierProvider( create: (_) => AdVM( @@ -86,7 +89,10 @@ Future main() async { ), ), ChangeNotifierProvider( - create: (_) => PaymentVM(paymentService: injector.get(), paymentRepo: injector.get()), + create: (_) => PaymentVM( + paymentService: injector.get(), + paymentRepo: injector.get(), + ), ), ChangeNotifierProvider( create: (_) => ChatVM( diff --git a/lib/views/dashboard/dashboard_view.dart b/lib/views/dashboard/dashboard_view.dart index f5d7868..75ebc78 100644 --- a/lib/views/dashboard/dashboard_view.dart +++ b/lib/views/dashboard/dashboard_view.dart @@ -7,7 +7,7 @@ import 'package:mc_common_app/view_models/dashboard_view_model_customer.dart'; import 'package:provider/provider.dart'; import 'fragments/branches_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/requests_fragment.dart'; class DashboardView extends StatefulWidget { const DashboardView({Key? key}) : super(key: key); diff --git a/lib/views/dashboard/fragments/my_requests_fragment.dart b/lib/views/dashboard/fragments/my_requests_fragment.dart deleted file mode 100644 index b237d1d..0000000 --- a/lib/views/dashboard/fragments/my_requests_fragment.dart +++ /dev/null @@ -1,80 +0,0 @@ -// import 'package:mc_common_app/generated/locale_keys.g.dart'; -// import 'package:mc_common_app/view_models/requests_view_model.dart'; -// import 'package:flutter/material.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/theme/colors.dart'; -// import 'package:mc_common_app/utils/enums.dart'; -// import 'package:mc_common_app/utils/navigator.dart'; -// import 'package:mc_common_app/views/requests/widget/request_item.dart'; -// import 'package:mc_common_app/widgets/common_widgets/app_bar.dart'; -// import 'package:mc_common_app/widgets/common_widgets/categories_list.dart'; -// import 'package:provider/provider.dart'; -// import 'package:easy_localization/easy_localization.dart'; -// -// class MyRequestsFragment extends StatelessWidget { -// const MyRequestsFragment({super.key}); -// -// @override -// Widget build(BuildContext context) { -// return Scaffold( -// appBar: CustomAppBar( -// title: LocaleKeys.myRequests.tr(), -// isRemoveBackButton: true, -// ), -// body: SizedBox( -// width: double.infinity, -// height: double.infinity, -// child: Consumer(builder: (BuildContext context, RequestsVM requestsVM, Widget? child) { -// return Column( -// children: [ -// 16.height, -// FiltersList( -// filterList: requestsVM.requestsTypeFilterOptions, -// onFilterTapped: (index, selectedFilterId) { -// requestsVM.applyFilterOnRequestsVM(requestsTypeEnum: selectedFilterId.toRequestTypeStatusEnum()); -// }, -// ), -// 8.height, -// Expanded( -// child: RefreshIndicator( -// onRefresh: () async => await requestsVM.getRequests(isNeedToRebuild: true, appType: AppType.customer), -// child: requestsVM.state == ViewState.busy -// ? const Center(child: CircularProgressIndicator()) -// : requestsVM.myFilteredRequests.isEmpty -// ? Column( -// mainAxisAlignment: MainAxisAlignment.center, -// children: [ -// LocaleKeys.noRequeststoShow.tr().toText(fontSize: 16, color: MyColors.lightTextColor), -// ], -// ) -// : ListView.separated( -// itemBuilder: (context, index) { -// return RequestItem( -// request: requestsVM.myFilteredRequests[index], -// appType: AppType.customer, -// requestIndex: index, -// ); -// }, -// separatorBuilder: (context, index) => 16.height, -// itemCount: requestsVM.myFilteredRequests.length, -// padding: const EdgeInsets.only(left: 16, right: 16, bottom: 16, top: 8), -// ), -// ), -// ) -// ], -// ); -// }), -// ), -// floatingActionButton: FloatingActionButton( -// onPressed: () => navigateWithName(context, AppRoutes.createRequestPage), -// backgroundColor: MyColors.darkPrimaryColor, -// child: const Icon( -// Icons.add, -// color: MyColors.white, -// ), -// ), -// ); -// } -// }