diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 7b0be8a..e5e0717 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -5,7 +5,8 @@
-
+
+
main() async {
}
CustomerDependencies.addDependencies();
- injector.get().initializeNotifications();
+ injector.get().initializeNotifications().whenComplete(() {
+ injector.get().handleLocationPermission();
+ });
CustomerAppRoutes.routes.addAll(AppRoutes.routes);
initializeDateFormatting().then((_) => runApp(
MultiProvider(
diff --git a/lib/views/branches/branch_detail_view.dart b/lib/views/branches/branch_detail_view.dart
index 52dfed2..717aa65 100644
--- a/lib/views/branches/branch_detail_view.dart
+++ b/lib/views/branches/branch_detail_view.dart
@@ -1,6 +1,7 @@
import 'dart:async';
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:mc_common_app/utils/utils.dart';
import 'package:mc_common_app/view_models/appointments_view_model.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
@@ -169,11 +170,15 @@ class _BranchDetailViewState extends State {
),
ShowFillButton(
maxHeight: 55,
- // isDisabled: widget.branchDetailModel.branchServices!.length == 0,
+ isDisabled: widget.branchDetailModel.branchServices!.length == 0,
title: LocaleKeys.bookAppointment.tr(),
margin: EdgeInsets.all(12),
maxWidth: double.infinity,
onPressed: () {
+ if (widget.branchDetailModel.branchServices!.length == 0) {
+ Utils.showToast(LocaleKeys.noServicesAvailable.tr());
+ return;
+ }
navigateWithName(context, AppRoutes.bookAppointmenServicesView);
context.read().updateSelectedBranch(widget.branchDetailModel);
},
diff --git a/lib/views/branches/components/items_list_sheet.dart b/lib/views/branches/components/items_list_sheet.dart
index d6ccf08..bf4629a 100644
--- a/lib/views/branches/components/items_list_sheet.dart
+++ b/lib/views/branches/components/items_list_sheet.dart
@@ -23,7 +23,7 @@ class ItemsListSheet extends StatefulWidget {
}
class _ItemsListSheetState extends State {
- void initState() {
+ void initState() {
super.initState();
scheduleMicrotask(() {
context.read().getServiceItems(widget.serviceId);
@@ -40,7 +40,7 @@ class _ItemsListSheetState extends State {
return Center(child: CircularProgressIndicator());
}
return appointmentsVM.serviceItemsFromApi.isEmpty
- ? EmptyWidget(text: LocaleKeys.noItemstoShow.tr(), isWrappedColumn: false)
+ ? EmptyWidget(text: LocaleKeys.noItemsToShow.tr(), isWrappedColumn: false)
: ListView.separated(
itemCount: appointmentsVM.serviceItemsFromApi.length,
itemBuilder: (BuildContext context, int index) {