Merge branch 'faiz_development' into aamir_dev

aamir_dev
Aamir 2 years ago
commit 5654434fe2

@ -6,6 +6,7 @@ import 'package:mc_common_app/repositories/branch_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/appointment_repo.dart'; import 'package:mc_common_app/repositories/appointment_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/setting_options_repo.dart';
import 'package:mc_common_app/services/firebase_service.dart'; import 'package:mc_common_app/services/firebase_service.dart';
import 'package:mc_common_app/view_models/appointments_view_model.dart'; import 'package:mc_common_app/view_models/appointments_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';
@ -28,6 +29,7 @@ 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/base_view_model.dart'; import 'package:mc_common_app/view_models/base_view_model.dart';
import 'package:mc_common_app/view_models/payment_view_model.dart'; import 'package:mc_common_app/view_models/payment_view_model.dart';
import 'package:mc_common_app/view_models/setting_options_view_model.dart';
import 'package:mc_common_app/view_models/user_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:mc_common_app/widgets/extensions/extensions_widget.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -60,7 +62,9 @@ Future<void> main() async {
initializeDateFormatting().then((_) => runApp( initializeDateFormatting().then((_) => runApp(
MultiProvider( MultiProvider(
providers: <SingleChildWidget>[ providers: <SingleChildWidget>[
ChangeNotifierProvider<BaseVM>(create: (_) => BaseVM()), ChangeNotifierProvider<BaseVM>(
create: (_) => BaseVM(),
),
ChangeNotifierProvider<DashboardVmCustomer>( ChangeNotifierProvider<DashboardVmCustomer>(
create: (_) => DashboardVmCustomer( create: (_) => DashboardVmCustomer(
commonServices: injector.get<CommonAppServices>(), commonServices: injector.get<CommonAppServices>(),
@ -107,6 +111,11 @@ Future<void> main() async {
commonRepo: injector.get<CommonRepo>(), commonRepo: injector.get<CommonRepo>(),
), ),
), ),
ChangeNotifierProvider<SettingOptionsVM>(
create: (_) => SettingOptionsVM(
settingOptionsRepo: injector.get<SettingOptionsRepo>(),
),
),
], ],
child: MyApp(), child: MyApp(),
).setupLocale(), ).setupLocale(),

@ -1,9 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'dart:developer';
import 'package:car_customer_app/views/branches/components/branch_reviews_widget.dart'; import 'package:car_customer_app/views/branches/components/branch_reviews_widget.dart';
import 'package:car_customer_app/views/branches/components/items_list_sheet.dart'; import 'package:car_customer_app/views/branches/components/items_list_sheet.dart';
import 'package:mc_common_app/main.dart';
import 'package:mc_common_app/view_models/appointments_view_model.dart'; import 'package:mc_common_app/view_models/appointments_view_model.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -191,17 +188,16 @@ class _BranchDetailViewState extends State<BranchDetailView> {
itemBuilder: (context, index) { itemBuilder: (context, index) {
return ExpansionTile( return ExpansionTile(
tilePadding: EdgeInsets.zero, tilePadding: EdgeInsets.zero,
title: (widget.branchDetailModel.branchServices![index].serviceDescription ?? "").toText( title: (widget.branchDetailModel.branchServices![index].serviceDescription ?? "").toText(fontSize: 16),
fontSize: 16,
isBold: true,
),
children: [ children: [
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
showItem(LocaleKeys.allowingHomeService.tr() + " :", (widget.branchDetailModel.branchServices![index].isAllowAppointment ?? false) ? "Yes" : "No", valueColor: Colors.green), showItem(LocaleKeys.allowingHomeService.tr() + " :", (widget.branchDetailModel.branchServices![index].isAllowAppointment ?? false) ? LocaleKeys.yes.tr() : LocaleKeys.no.tr(), valueColor: Colors.green),
showItem(LocaleKeys.homeServiceRange.tr() + " :", widget.branchDetailModel.branchServices![index].customerLocationRange.toString() + "KM"), if ((widget.branchDetailModel.branchServices![index].isAllowAppointment ?? false)) ...[
showItem(LocaleKeys.chargesPerKM.tr() + " :", widget.branchDetailModel.branchServices![index].customerLocationRange.toString() + LocaleKeys.sar.tr()), showItem(LocaleKeys.homeServiceRange.tr() + " :", widget.branchDetailModel.branchServices![index].customerLocationRange.toString() + "KM"),
showItem(LocaleKeys.chargesPerKM.tr() + " :", widget.branchDetailModel.branchServices![index].customerLocationRange.toString() + LocaleKeys.sar.tr()),
],
8.height, 8.height,
((widget.branchDetailModel.branchServices![index].itemsCount != null && widget.branchDetailModel.branchServices![index].itemsCount! > 0) ((widget.branchDetailModel.branchServices![index].itemsCount != null && widget.branchDetailModel.branchServices![index].itemsCount! > 0)
? widget.branchDetailModel.branchServices![index].itemsCount.toString() + " items" ? widget.branchDetailModel.branchServices![index].itemsCount.toString() + " items"
@ -247,9 +243,9 @@ class _BranchDetailViewState extends State<BranchDetailView> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
item.toText(fontSize: 12, color: MyColors.lightTextColor, isBold: true), item.toText(fontSize: 12, color: MyColors.lightTextColor),
4.width, 4.width,
value.toText(fontSize: 12, color: valueColor, isBold: true), value.toText(fontSize: 12, color: valueColor),
], ],
); );
} }

@ -16,7 +16,6 @@ import 'package:mc_common_app/widgets/common_widgets/app_bar.dart';
import 'package:mc_common_app/widgets/common_widgets/view_all_widget.dart'; import 'package:mc_common_app/widgets/common_widgets/view_all_widget.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:badges/badges.dart' as b;
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
class HomeFragment extends StatelessWidget { class HomeFragment extends StatelessWidget {
@ -29,26 +28,26 @@ class HomeFragment extends StatelessWidget {
appBar: CustomAppBar( appBar: CustomAppBar(
isDrawerEnabled: true, isDrawerEnabled: true,
leadingWidth: 100, leadingWidth: 100,
onTap: () => navigateWithName(context, AppRoutes.settingOptionsLanguages), onTap: () => navigateWithName(context, AppRoutes.settingOptionsMore),
actions: [ actions: [
IconButton( // IconButton(
onPressed: () => context.read<DashboardVmCustomer>().onRefresh(context), // onPressed: () {},
icon: const b.Badge( // icon: const b.Badge(
badgeContent: Text( // badgeContent: Text(
'3', // '3',
style: TextStyle( // style: TextStyle(
fontSize: 10, // fontSize: 10,
color: Colors.white, // color: Colors.white,
), // ),
), // ),
badgeStyle: b.BadgeStyle( // badgeStyle: b.BadgeStyle(
badgeColor: MyColors.primaryColor, // badgeColor: MyColors.primaryColor,
padding: EdgeInsets.all(5), // padding: EdgeInsets.all(5),
), // ),
child: Icon(Icons.notifications_active), // child: Icon(Icons.notifications_active),
), // ),
), // ),
10.width, // 10.width,
], ],
), ),
body: SizedBox( body: SizedBox(

Loading…
Cancel
Save