Issues Fixed

aamir_dev
Faiz Hashmi 2 years ago
parent 1d8a19472c
commit df25461575

@ -5,7 +5,8 @@
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" /> <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" /> <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" /> <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<application <application
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"

@ -8,6 +8,7 @@ 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/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/utils/location/Location.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';
import 'package:mc_common_app/view_models/dashboard_view_model_customer.dart'; import 'package:mc_common_app/view_models/dashboard_view_model_customer.dart';
@ -57,7 +58,9 @@ Future<void> main() async {
} }
CustomerDependencies.addDependencies(); CustomerDependencies.addDependencies();
injector.get<FirebaseMessagingService>().initializeNotifications(); injector.get<FirebaseMessagingService>().initializeNotifications().whenComplete(() {
injector.get<Location>().handleLocationPermission();
});
CustomerAppRoutes.routes.addAll(AppRoutes.routes); CustomerAppRoutes.routes.addAll(AppRoutes.routes);
initializeDateFormatting().then((_) => runApp( initializeDateFormatting().then((_) => runApp(
MultiProvider( MultiProvider(

@ -1,6 +1,7 @@
import 'dart:async'; import 'dart:async';
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/utils/utils.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';
@ -169,11 +170,15 @@ class _BranchDetailViewState extends State<BranchDetailView> {
), ),
ShowFillButton( ShowFillButton(
maxHeight: 55, maxHeight: 55,
// isDisabled: widget.branchDetailModel.branchServices!.length == 0, isDisabled: widget.branchDetailModel.branchServices!.length == 0,
title: LocaleKeys.bookAppointment.tr(), title: LocaleKeys.bookAppointment.tr(),
margin: EdgeInsets.all(12), margin: EdgeInsets.all(12),
maxWidth: double.infinity, maxWidth: double.infinity,
onPressed: () { onPressed: () {
if (widget.branchDetailModel.branchServices!.length == 0) {
Utils.showToast(LocaleKeys.noServicesAvailable.tr());
return;
}
navigateWithName(context, AppRoutes.bookAppointmenServicesView); navigateWithName(context, AppRoutes.bookAppointmenServicesView);
context.read<AppointmentsVM>().updateSelectedBranch(widget.branchDetailModel); context.read<AppointmentsVM>().updateSelectedBranch(widget.branchDetailModel);
}, },

@ -40,7 +40,7 @@ class _ItemsListSheetState extends State<ItemsListSheet> {
return Center(child: CircularProgressIndicator()); return Center(child: CircularProgressIndicator());
} }
return appointmentsVM.serviceItemsFromApi.isEmpty return appointmentsVM.serviceItemsFromApi.isEmpty
? EmptyWidget(text: LocaleKeys.noItemstoShow.tr(), isWrappedColumn: false) ? EmptyWidget(text: LocaleKeys.noItemsToShow.tr(), isWrappedColumn: false)
: ListView.separated( : ListView.separated(
itemCount: appointmentsVM.serviceItemsFromApi.length, itemCount: appointmentsVM.serviceItemsFromApi.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {

Loading…
Cancel
Save