RequestModule Completed

aamir_dev
Faiz Hashmi 2 years ago
parent 646ebbd3a5
commit c6656e152a

@ -44,18 +44,18 @@ import 'config/provider_routes.dart';
Future<void> main() async { Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
await EasyLocalization.ensureInitialized(); await EasyLocalization.ensureInitialized();
if(Platform.isAndroid) { if (Platform.isAndroid) {
await Firebase.initializeApp( await Firebase.initializeApp(
options: const FirebaseOptions( options: const FirebaseOptions(
apiKey: 'AIzaSyD1WNNGrbBiCNvCrI31d3DV5AOgToq-Lus', apiKey: 'AIzaSyD1WNNGrbBiCNvCrI31d3DV5AOgToq-Lus',
appId: '1:294636898500:android:e93b7e5d1cc15ae6b0e191', appId: '1:294636898500:android:e93b7e5d1cc15ae6b0e191',
messagingSenderId: '294636898500', messagingSenderId: '294636898500',
projectId: 'mowater-2c81a', projectId: 'mowater-2c81a',
), ),
); );
} else{ } else {
await Firebase.initializeApp(); await Firebase.initializeApp();
} }
ProviderAppDependencies.addDependencies(); ProviderAppDependencies.addDependencies();
injector.get<FirebaseMessagingService>().initializeNotifications(); injector.get<FirebaseMessagingService>().initializeNotifications();
ProviderAppRoutes.routes.addAll(AppRoutes.routes); ProviderAppRoutes.routes.addAll(AppRoutes.routes);

@ -15,8 +15,6 @@ import 'package:mc_common_app/services/common_services.dart';
import 'package:mc_common_app/utils/enums.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:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:mc_common_app/services/firebase_service.dart';
import 'package:mc_common_app/utils/enums.dart';
import 'package:mc_common_app/utils/location/Location.dart'; import 'package:mc_common_app/utils/location/Location.dart';
import 'package:mc_common_app/utils/shared_prefrence.dart'; import 'package:mc_common_app/utils/shared_prefrence.dart';
import 'package:mc_common_app/utils/utils.dart'; import 'package:mc_common_app/utils/utils.dart';

@ -2,12 +2,12 @@ import 'dart:async';
import 'package:car_provider_app/view_models/dashboard_view_model.dart'; import 'package:car_provider_app/view_models/dashboard_view_model.dart';
import 'package:car_provider_app/views/settings/branch/branch_list_page.dart'; import 'package:car_provider_app/views/settings/branch/branch_list_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mc_common_app/views/common_fragments/requests_fragment.dart';
import 'package:mc_common_app/widgets/common_widgets/bottom_nav_bar.dart'; import 'package:mc_common_app/widgets/common_widgets/bottom_nav_bar.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'fragments/branch_appointment_fragment.dart'; import 'fragments/branch_appointment_fragment.dart';
import 'fragments/home_fragment.dart'; import 'fragments/home_fragment.dart';
import 'package:mc_common_app/views/common_fragments/ads_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';
class DashboardView extends StatefulWidget { class DashboardView extends StatefulWidget {
const DashboardView({Key? key}) : super(key: key); const DashboardView({Key? key}) : super(key: key);

@ -2,7 +2,6 @@ import 'package:car_provider_app/config/provider_routes.dart';
import 'package:flutter/gestures.dart'; import 'package:flutter/gestures.dart';
import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/classes/consts.dart';
import 'package:mc_common_app/generated/locale_keys.g.dart'; import 'package:mc_common_app/generated/locale_keys.g.dart';
import 'package:mc_common_app/utils/app_permission_handler.dart';
import 'package:mc_common_app/utils/dialogs_and_bottomsheets.dart'; import 'package:mc_common_app/utils/dialogs_and_bottomsheets.dart';
import 'package:mc_common_app/view_models/service_view_model.dart'; import 'package:mc_common_app/view_models/service_view_model.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
@ -27,7 +26,7 @@ import 'package:provider/provider.dart';
class BranchListPage extends StatelessWidget { class BranchListPage extends StatelessWidget {
const BranchListPage({Key? key}) : super(key: key); const BranchListPage({Key? key}) : super(key: key);
void deleteAdBottomSheet(BuildContext context, int branchID) { void deleteBranchBottomSheet(BuildContext context, int branchID) {
return actionConfirmationBottomSheet( return actionConfirmationBottomSheet(
context: context, context: context,
title: LocaleKeys.deleteBranchConfirmation.tr().toText(fontSize: 28, isBold: true, letterSpacing: -1.44), title: LocaleKeys.deleteBranchConfirmation.tr().toText(fontSize: 28, isBold: true, letterSpacing: -1.44),
@ -125,7 +124,7 @@ class BranchListPage extends StatelessWidget {
dragStartBehavior: DragStartBehavior.start, dragStartBehavior: DragStartBehavior.start,
direction: DismissDirection.endToStart, direction: DismissDirection.endToStart,
confirmDismiss: (DismissDirection direction) async { confirmDismiss: (DismissDirection direction) async {
deleteAdBottomSheet(context, branchModel.id!); deleteBranchBottomSheet(context, branchModel.id!);
}, },
child: Row( child: Row(
children: [ children: [

@ -10,7 +10,7 @@ import 'package:mc_common_app/views/location_views/pick_location_page.dart';
import 'package:mc_common_app/extensions/int_extensions.dart'; import 'package:mc_common_app/extensions/int_extensions.dart';
import 'package:mc_common_app/models/provider_branches_models/branch_detail_model.dart'; import 'package:mc_common_app/models/provider_branches_models/branch_detail_model.dart';
import 'package:mc_common_app/theme/colors.dart'; import 'package:mc_common_app/theme/colors.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:mc_common_app/utils/enums.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/views/advertisement/ad_creation_steps/ad_creation_steps_containers.dart'; import 'package:mc_common_app/views/advertisement/ad_creation_steps/ad_creation_steps_containers.dart';
@ -101,6 +101,7 @@ class _DefineBranchViewState extends State<DefineBranchView> {
), ),
12.height, 12.height,
TxtField( TxtField(
maxLines: 3,
hint: "${LocaleKeys.branchDescription.tr()}*", hint: "${LocaleKeys.branchDescription.tr()}*",
value: serviceVM.branchDescription, value: serviceVM.branchDescription,
onChanged: (v) { onChanged: (v) {
@ -149,56 +150,73 @@ class _DefineBranchViewState extends State<DefineBranchView> {
TxtField( TxtField(
hint: LocaleKeys.address.tr(), hint: LocaleKeys.address.tr(),
isNeedClickAll: false, isNeedClickAll: false,
maxLines: 3,
value: serviceVM.address, value: serviceVM.address,
postfixWidget: IconButton(
icon: const Icon(
size: 28,
Icons.add_location_outlined,
),
onPressed: () {
navigateTo(
context,
PickLocationPage(
onPickAddress: (double latitude, double longitude, String address) {
serviceVM.latitude = latitude;
serviceVM.longitude = longitude;
serviceVM.address = address;
serviceVM.setState(ViewState.idle);
},
),
);
}),
onChanged: (v) { onChanged: (v) {
serviceVM.address = v; serviceVM.address = v;
}, },
), ),
12.height, 12.height,
InkWell( // InkWell(
onTap: () { // onTap: () {
navigateTo( // navigateTo(
context, // context,
PickLocationPage( // PickLocationPage(
onPickAddress: (double latitude, double longitude, String address) { // onPickAddress: (double latitude, double longitude, String address) {
serviceVM.latitude = latitude; // serviceVM.latitude = latitude;
serviceVM.longitude = longitude; // serviceVM.longitude = longitude;
serviceVM.address = address; // serviceVM.address = address;
serviceVM.setState(ViewState.idle); // serviceVM.setState(ViewState.idle);
}, // },
), // ),
); // );
}, // },
child: Container( // child: Container(
width: double.infinity, // width: double.infinity,
height: 45, // height: 45,
decoration: BoxDecoration( // decoration: BoxDecoration(
color: Colors.transparent, // color: Colors.transparent,
border: Border.all(color: MyColors.darkPrimaryColor, width: 2), // border: Border.all(color: MyColors.darkPrimaryColor, width: 2),
borderRadius: const BorderRadius.all(Radius.circular(8)), // borderRadius: const BorderRadius.all(Radius.circular(8)),
), // ),
child: Row( // child: Row(
mainAxisAlignment: MainAxisAlignment.center, // mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, // crossAxisAlignment: CrossAxisAlignment.center,
children: [ // children: [
const Icon( // const Icon(
Icons.place_outlined, // Icons.place_outlined,
size: 18, // size: 18,
color: MyColors.darkPrimaryColor, // color: MyColors.darkPrimaryColor,
), // ),
8.width, // 8.width,
Text( // Text(
LocaleKeys.pickAddress.tr(), // LocaleKeys.pickAddress.tr(),
style: const TextStyle( // style: const TextStyle(
color: MyColors.darkPrimaryColor, // color: MyColors.darkPrimaryColor,
), // ),
), // ),
], // ],
), // ),
), // ),
), // ),
12.height, // 12.height,
DottedRectContainer( DottedRectContainer(
onTap: () => serviceVM.pickMultipleImages(), onTap: () => serviceVM.pickMultipleImages(),
text: LocaleKeys.attachImage.tr(), text: LocaleKeys.attachImage.tr(),

Loading…
Cancel
Save