merge changes

aamir_dev
FaizHashmiCS22 2 years ago
parent 37ec048a2c
commit 4f91c03913

@ -15,14 +15,17 @@ import 'package:mc_common_app/config/dependencies.dart';
import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/config/routes.dart';
import 'package:mc_common_app/models/general_models/post_params_model.dart'; import 'package:mc_common_app/models/general_models/post_params_model.dart';
import 'package:mc_common_app/repositories/ads_repo.dart'; import 'package:mc_common_app/repositories/ads_repo.dart';
import 'package:mc_common_app/repositories/appointment_repo.dart';
import 'package:mc_common_app/repositories/chat_repo.dart'; import 'package:mc_common_app/repositories/chat_repo.dart';
import 'package:mc_common_app/repositories/common_repo.dart'; import 'package:mc_common_app/repositories/common_repo.dart';
import 'package:mc_common_app/repositories/provider_repo.dart';
import 'package:mc_common_app/repositories/request_repo.dart'; import 'package:mc_common_app/repositories/request_repo.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/theme/app_theme.dart'; import 'package:mc_common_app/theme/app_theme.dart';
import 'package:mc_common_app/utils/enums.dart'; import 'package:mc_common_app/utils/enums.dart';
import 'package:mc_common_app/view_models/ad_view_model.dart'; import 'package:mc_common_app/view_models/ad_view_model.dart';
import 'package:mc_common_app/view_models/appointments_view_model.dart';
import 'package:mc_common_app/view_models/base_view_model.dart'; import 'package:mc_common_app/view_models/base_view_model.dart';
import 'package:mc_common_app/view_models/chat_view_model.dart'; import 'package:mc_common_app/view_models/chat_view_model.dart';
import 'package:mc_common_app/view_models/requests_view_model.dart'; import 'package:mc_common_app/view_models/requests_view_model.dart';
@ -95,6 +98,14 @@ Future<void> main() async {
requestRepo: injector.get<RequestRepo>(), requestRepo: injector.get<RequestRepo>(),
), ),
), ),
ChangeNotifierProvider<AppointmentsVM>(
create: (_) => AppointmentsVM(
scheduleRepo: injector.get<AppointmentRepo>(),
providerRepo: injector.get<ProviderRepo>(),
commonServices: injector.get<CommonAppServices>(),
commonRepo: injector.get<CommonRepo>(),
),
),
ChangeNotifierProvider<ChatVM>( ChangeNotifierProvider<ChatVM>(
create: (_) => ChatVM( create: (_) => ChatVM(
chatRepo: injector.get<ChatRepo>(), chatRepo: injector.get<ChatRepo>(),

@ -1,19 +1,20 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mc_common_app/classes/app_state.dart'; import 'package:mc_common_app/classes/app_state.dart';
import 'package:mc_common_app/config/dependencies.dart';
import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/config/routes.dart';
import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/extensions/int_extensions.dart';
import 'package:mc_common_app/generated/locale_keys.g.dart'; import 'package:mc_common_app/extensions/string_extensions.dart';
import 'package:mc_common_app/models/advertisment_models/ad_details_model.dart';
import 'package:mc_common_app/theme/colors.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/utils/navigator.dart';
import 'package:mc_common_app/view_models/ad_view_model.dart'; import 'package:mc_common_app/view_models/ad_view_model.dart';
import 'package:mc_common_app/view_models/requests_view_model.dart';
import 'package:mc_common_app/views/advertisement/ads_list.dart'; import 'package:mc_common_app/views/advertisement/ads_list.dart';
import 'package:mc_common_app/widgets/button/show_fill_button.dart'; import 'package:mc_common_app/widgets/button/show_fill_button.dart';
import 'package:mc_common_app/widgets/common_widgets/app_bar.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:mc_common_app/widgets/common_widgets/categories_list.dart';
import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:easy_localization/easy_localization.dart';
class AdsFragment extends StatelessWidget { class AdsFragment extends StatelessWidget {
bool isNeedAppBar; bool isNeedAppBar;
@ -27,13 +28,23 @@ class AdsFragment extends StatelessWidget {
await adVM.getMyAds(); await adVM.getMyAds();
} }
List<AdDetailsModel> getAdsList(AdVM adVM) {
if (adVM.isExploreAdsTapped) {
return adVM.exploreAdsFilteredList;
}
if (adVM.myAdsFilteredList.isNotEmpty) {
return adVM.myAdsFilteredList;
}
return [];
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: !isNeedAppBar appBar: !isNeedAppBar
? null ? null
: CustomAppBar( : CustomAppBar(
title: LocaleKeys.myServiceBranches.tr(), title: "Ads",
onBackButtonTapped: onBackButtonTapped, onBackButtonTapped: onBackButtonTapped,
), ),
body: Container( body: Container(
@ -43,70 +54,65 @@ class AdsFragment extends StatelessWidget {
child: Column( child: Column(
children: [ children: [
16.height, 16.height,
// Consumer( Consumer(
// builder: (BuildContext context, AdVM adVM, Widget? child) { builder: (BuildContext context, AdVM adVM, Widget? child) {
// return Column( return Column(
// children: [ children: [
// Row( Row(
// children: [ children: [
// Expanded( Expanded(
// child: ShowFillButton( child: ShowFillButton(
// isFilled: adVM.isExploreAdsTapped, isFilled: adVM.isExploreAdsTapped,
// maxHeight: 55, maxHeight: 55,
// title: "Explore Ads", title: "Explore Ads",
// txtColor: adVM.isExploreAdsTapped ? MyColors.white : MyColors.darkTextColor, txtColor: adVM.isExploreAdsTapped ? MyColors.white : MyColors.darkTextColor,
// onPressed: () { onPressed: () {
// print("ads: ${AppState().getUser.data!.accessToken}"); print("ads: ${AppState().getUser.data!.accessToken}");
// adVM.updateIsExploreAds(true); adVM.updateIsExploreAds(true);
// }, },
// ), ),
// ), ),
// 12.width, 12.width,
// Expanded( Expanded(
// child: ShowFillButton( child: ShowFillButton(
// isFilled: !adVM.isExploreAdsTapped, isFilled: !adVM.isExploreAdsTapped,
// txtColor: !adVM.isExploreAdsTapped ? MyColors.white : MyColors.darkTextColor, txtColor: !adVM.isExploreAdsTapped ? MyColors.white : MyColors.darkTextColor,
// maxHeight: 55, maxHeight: 55,
// title: "My Ads", title: "My Ads",
// onPressed: () { onPressed: () {
// adVM.updateIsExploreAds(false); adVM.updateIsExploreAds(false);
// }, },
// ), ),
// ), ),
// ], ],
// ).horPaddingMain(), ).horPaddingMain(),
// if (adVM.isExploreAdsTapped && adVM.exploreAds.isNotEmpty) ...[ if (adVM.isExploreAdsTapped) ...[
// 16.height, 16.height,
// FiltersList(filterList: adVM.exploreAdsFilterOptions, onFilterTapped: (index, selectedFilterId) => adVM.applyFilterOnExploreAds(index: index), needLeftPadding: false) FiltersList(
// .paddingOnly(left: 21), filterList: adVM.exploreAdsFilterOptions,
// ], onFilterTapped: (index, selectedFilterId) => adVM.applyFilterOnExploreAds(createdByRoleFilter: selectedFilterId.toCreatedByRoleEnum()),
// if (!adVM.isExploreAdsTapped && adVM.myAds.isNotEmpty) ...[ needLeftPadding: false)
// 16.height, .paddingOnly(left: 21),
// FiltersList( ],
// filterList: adVM.myAdsFilterOptions, if (!adVM.isExploreAdsTapped) ...[
// onFilterTapped: (index, selectedFilterId) => adVM.applyFilterOnMyAds(index: index, selectedFilterId: selectedFilterId), 16.height,
// needLeftPadding: false) FiltersList(
// .paddingOnly(left: 21), filterList: adVM.myAdsFilterOptions,
// ], onFilterTapped: (index, selectedFilterId) => adVM.applyFilterOnMyAds(adPostStatusEnum: selectedFilterId.toAdPostEnum()),
// ], needLeftPadding: false,
// ); ).paddingOnly(left: 21),
// }, ],
// ), ],
);
},
),
16.height, 16.height,
Expanded( Expanded(
child: RefreshIndicator( child: RefreshIndicator(
onRefresh: () => onRefreshAds(context), onRefresh: () => onRefreshAds(context),
child: Consumer( child: Consumer(
builder: (BuildContext context, AdVM adVM, Widget? child) { builder: (BuildContext context, AdVM adVM, Widget? child) {
return BuildAdsList( return BuildAdsList(isAdsFragment: true, shouldShowAdStatus: !adVM.isExploreAdsTapped, adsList: getAdsList(adVM));
isAdsFragment: true,
shouldShowAdStatus: !adVM.isExploreAdsTapped,
adsList: adVM.isExploreAdsTapped && adVM.exploreAdsFilteredList.isNotEmpty
? adVM.exploreAdsFilteredList
: !adVM.isExploreAdsTapped && adVM.myAdsFilteredList.isNotEmpty
? adVM.myAdsFilteredList
: [],
);
}, },
), ),
), ),
@ -115,14 +121,11 @@ class AdsFragment extends StatelessWidget {
), ),
), ),
floatingActionButton: FloatingActionButton( floatingActionButton: FloatingActionButton(
onPressed: () { onPressed: () async {
context.read<AdVM>().getVehicleTypes(); navigateWithName(context, AppRoutes.selectAdTypeView, arguments: injector.get<AppState>().currentAppType == AppType.provider);
context.read<RequestsVM>().populateRequestsFilterList();
navigateWithName(context, AppRoutes.createAdView);
}, },
backgroundColor: MyColors.darkPrimaryColor, backgroundColor: MyColors.darkPrimaryColor,
child: const Icon( child: Icon(
Icons.add, Icons.add,
color: MyColors.white, color: MyColors.white,
), ),

File diff suppressed because it is too large Load Diff

@ -39,7 +39,7 @@ dependencies:
# path: C:/Users/mirza.shafique/AndroidStudioProjects/mc_common_app # path: C:/Users/mirza.shafique/AndroidStudioProjects/mc_common_app
mc_common_app: mc_common_app:
path: /Volumes/Data/Projects/Flutter/car_common_app path: D:\Development\car_common_app
@ -53,7 +53,7 @@ dev_dependencies:
# activated in the `analysis_options.yaml` file located at the root of your # activated in the `analysis_options.yaml` file located at the root of your
# package. See that file for information about deactivating specific lint # package. See that file for information about deactivating specific lint
# rules and activating additional ones. # rules and activating additional ones.
flutter_lints: ^1.0.0 flutter_lints: ^2.0.0
# For information on the generic Dart part of this file, see the # For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec # following page: https://dart.dev/tools/pub/pubspec

Loading…
Cancel
Save