diff --git a/assets/icons/branches_icon.svg b/assets/icons/branches_icon.svg
new file mode 100644
index 0000000..c0ba51c
--- /dev/null
+++ b/assets/icons/branches_icon.svg
@@ -0,0 +1,9 @@
+
diff --git a/assets/icons/maintenance_icon.svg b/assets/icons/maintenance_icon.svg
new file mode 100644
index 0000000..ac739fd
--- /dev/null
+++ b/assets/icons/maintenance_icon.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/icons/modifications_icon.svg b/assets/icons/modifications_icon.svg
new file mode 100644
index 0000000..58692b8
--- /dev/null
+++ b/assets/icons/modifications_icon.svg
@@ -0,0 +1,9 @@
+
diff --git a/assets/icons/requests_icon.svg b/assets/icons/requests_icon.svg
new file mode 100644
index 0000000..c6fd34a
--- /dev/null
+++ b/assets/icons/requests_icon.svg
@@ -0,0 +1,5 @@
+
diff --git a/assets/icons/star_icon.svg b/assets/icons/star_icon.svg
new file mode 100644
index 0000000..4000dca
--- /dev/null
+++ b/assets/icons/star_icon.svg
@@ -0,0 +1,9 @@
+
diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json
index 495e501..c4861e1 100644
--- a/assets/langs/ar-SA.json
+++ b/assets/langs/ar-SA.json
@@ -164,5 +164,10 @@
"enter_licence_detail": "الرجاء إدخال تفاصيل السجلات التجارية وإرفاق صور الترخيص",
"country": "بلد",
"city": "مدينة",
- "editServices": "تحرير الخدمات"
+ "editServices": "تحرير الخدمات",
+ "maintenance": "صيانة",
+ "accessories_modifications": "الملحقات والتعديلات",
+ "my_recent_providers": "مزودي الخدمة الجدد",
+ "my_active_ads": "إعلاناتي النشطة",
+ "recommended_Ads": "الإعلانات الموصى بها"
}
\ No newline at end of file
diff --git a/assets/langs/en-US.json b/assets/langs/en-US.json
index e477a88..575756a 100644
--- a/assets/langs/en-US.json
+++ b/assets/langs/en-US.json
@@ -164,5 +164,10 @@
"enter_licence_detail": "Please enter the detail for commercial records and attach the license images",
"country": "country",
"city": "city",
- "editServices": "Edit Services"
+ "editServices": "Edit Services",
+ "maintenance": "Maintenance",
+ "accessories_modifications": "Accessories and Modifications",
+ "my_recent_providers": "My Recent Service Providers",
+ "my_active_ads": "My Active Ads",
+ "recommended_Ads": "Recommended Ads"
}
\ No newline at end of file
diff --git a/lib/classes/app_state.dart b/lib/classes/app_state.dart
index 32a5f71..964f7be 100644
--- a/lib/classes/app_state.dart
+++ b/lib/classes/app_state.dart
@@ -1,8 +1,7 @@
-
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:mc_common_app/models/post_params_model.dart';
import 'package:mc_common_app/models/user/user.dart';
-
+import 'package:mc_common_app/utils/enums.dart';
class AppState {
static final AppState _instance = AppState._internal();
@@ -17,17 +16,24 @@ class AppState {
bool? get getIsLogged => isLogged;
+ AppType currentAppType = AppType.provider;
+
+ void setAppType(AppType appType) {
+ currentAppType = appType;
+ }
+
User? _user = null;
set setUser(v) => _user = v;
- User get getUser => _user??User();
+ User get getUser => _user ?? User();
PostParamsModel? _postParams;
PostParamsModel? get postParamsObject => _postParams;
Map get postParamsJson => _postParams?.toJson() ?? {};
+
void setPostParamsModel(PostParamsModel _postParams) {
this._postParams = _postParams;
}
@@ -37,5 +43,4 @@ class AppState {
set setCurrentLocation(v) => currentLocation = v;
LatLng get getCurrentLocation => currentLocation;
-
}
diff --git a/lib/classes/consts.dart b/lib/classes/consts.dart
index a2cef92..972c57c 100644
--- a/lib/classes/consts.dart
+++ b/lib/classes/consts.dart
@@ -4,53 +4,51 @@ import 'package:mc_common_app/generated/codegen_loader.g.dart';
class ApiConsts {
// static String baseUrl = "http://10.200.204.20:2801/"; // Local server
static String baseUrl = "https://ms.hmg.com/"; // production server
- static String baseUrlServices = baseUrl + ""; // production server
- static String BasicOTP = baseUrlServices + "api/Register/BasicOTP";
- static String BasicVerify = baseUrlServices + "api/Register/BasicVerify";
- static String BasicComplete = baseUrlServices + "api/Register/BasicComplete";
- static String RefreshToken = baseUrlServices + "api/Account/RefreshToken";
-
+ static String baseUrlServices = "$baseUrl"; // production server
+ static String BasicOTP = "${baseUrlServices}api/Register/BasicOTP";
+ static String BasicVerify = "${baseUrlServices}api/Register/BasicVerify";
+ static String BasicComplete = "${baseUrlServices}api/Register/BasicComplete";
+ static String RefreshToken = "${baseUrlServices}api/Account/RefreshToken";
//User
- static String Login_V1 = baseUrlServices + "api/Account/Login_V1";
- static String Login_V2_OTP = baseUrlServices + "api/Account/Login_V2_OTP";
- static String Login_V2_OTPVerify = baseUrlServices + "api/Account/Login_V2_OTPVerify";
- static String user = baseUrlServices + "api/User/";
- static String GetAllCountry = baseUrlServices + "api/Master/Country_Get";
- static String GetProviderRoles = baseUrlServices + "api/Master/RoleServiceProvider_Get";
- static String GetAllCities = baseUrlServices + "api/Master/City_Get";
- static String ForgetPasswordOTPRequest = baseUrlServices + "api/Account/ForgetPasswordOTPRequest";
- static String ForgetPasswordOTPCompare = baseUrlServices + "api/Account/ForgetPasswordOTPCompare";
- static String ForgetPassword = baseUrlServices + "api/Account/ForgetPassword";
- static String Login_Email_OTP = baseUrlServices + "api/Account/EmailVerify";
- static String Login_Email_OTPVerify = baseUrlServices + "api/Account/EmailVerifyOTPVerify";
- static String ChangePassword = baseUrlServices + "api/Account/ChangePassword";
- static String ChangeMobileNoOTPRequest = baseUrlServices + "api/Account/ChangeMobileNoOTPRequest";
- static String ChangeMobileNo = baseUrlServices + "api/Account/ChangeMobileNo";
- static String ChangeEmailOTPRequest = baseUrlServices + "api/Account/ChangeEmailOTPRequest";
- static String ChangeEmail = baseUrlServices + "api/Account/ChangeEmail";
- static String EmailVerify = baseUrlServices + "api/Account/EmailVerify";
- static String EmailVerifyOTPVerify = baseUrlServices + "api/Account/EmailVerifyOTPVerify";
- static String UpdateUserImage = baseUrlServices + "api/User_UpdateProfileImage";
- static String GetUserImage = baseUrlServices + "api/ProfileImage";
-
+ static String Login_V1 = "${baseUrlServices}api/Account/Login_V1";
+ static String Login_V2_OTP = "${baseUrlServices}api/Account/Login_V2_OTP";
+ static String Login_V2_OTPVerify = "${baseUrlServices}api/Account/Login_V2_OTPVerify";
+ static String user = "${baseUrlServices}api/User/";
+ static String GetAllCountry = "${baseUrlServices}api/Master/Country_Get";
+ static String GetProviderRoles = "${baseUrlServices}api/Master/RoleServiceProvider_Get";
+ static String GetAllCities = "${baseUrlServices}api/Master/City_Get";
+ static String ForgetPasswordOTPRequest = "${baseUrlServices}api/Account/ForgetPasswordOTPRequest";
+ static String ForgetPasswordOTPCompare = "${baseUrlServices}api/Account/ForgetPasswordOTPCompare";
+ static String ForgetPassword = "${baseUrlServices}api/Account/ForgetPassword";
+ static String Login_Email_OTP = "${baseUrlServices}api/Account/EmailVerify";
+ static String Login_Email_OTPVerify = "${baseUrlServices}api/Account/EmailVerifyOTPVerify";
+ static String ChangePassword = "${baseUrlServices}api/Account/ChangePassword";
+ static String ChangeMobileNoOTPRequest = "${baseUrlServices}api/Account/ChangeMobileNoOTPRequest";
+ static String ChangeMobileNo = "${baseUrlServices}api/Account/ChangeMobileNo";
+ static String ChangeEmailOTPRequest = "${baseUrlServices}api/Account/ChangeEmailOTPRequest";
+ static String ChangeEmail = "${baseUrlServices}api/Account/ChangeEmail";
+ static String EmailVerify = "${baseUrlServices}api/Account/EmailVerify";
+ static String EmailVerifyOTPVerify = "${baseUrlServices}api/Account/EmailVerifyOTPVerify";
+ static String UpdateUserImage = "${baseUrlServices}api/User_UpdateProfileImage";
+ static String GetUserImage = "${baseUrlServices}api/ProfileImage";
//Profile
- static String GetProviderDocument = baseUrlServices + "api/ServiceProviders/ServiceProviderDocument_Get";
- static String ServiceProviderDocument_Update = baseUrlServices + "api/ServiceProviders/ServiceProviderDocument_Update";
+ static String GetProviderDocument = "${baseUrlServices}api/ServiceProviders/ServiceProviderDocument_Get";
+ static String ServiceProviderDocument_Update = "${baseUrlServices}api/ServiceProviders/ServiceProviderDocument_Update";
//Branch
- static String getProviderBranch = baseUrlServices + "api/ServiceProviders/ServiceProviderBranch_Get";
- static String createProviderBranch = baseUrlServices + "api/ServiceProviders/ServiceProviderBranch_Create";
- static String updateProviderBranch = baseUrlServices + "api/ServiceProviders/ServiceProviderBranch_Update";
- static String ServiceProviderBranchGet = baseUrlServices + "api/ServiceProviders/ServiceProviderBranch_Get";
- static String ServiceCategory_Get = baseUrlServices + "api/Master/ServiceCategory_Get";
- static String Services_Get = baseUrlServices + "api/ServiceProviders/Services_Get";
- static String ServiceProviderService_Create = baseUrlServices + "api/ServiceProviders/ServiceProviderService_Create";
- static String ServiceProviderService_Update = baseUrlServices + "api/ServiceProviders/ServiceProviderService_Update";
-
- static String ServiceProviderService_Get= baseUrlServices + "api/ServiceProviders/ServiceProviderService_Get";
- static String BranchesAndServices= baseUrlServices + "api/ServiceProviders/ServiceProviderDetail_Get";
+ static String getProviderBranch = "${baseUrlServices}api/ServiceProviders/ServiceProviderBranch_Get";
+ static String createProviderBranch = "${baseUrlServices}api/ServiceProviders/ServiceProviderBranch_Create";
+ static String updateProviderBranch = "${baseUrlServices}api/ServiceProviders/ServiceProviderBranch_Update";
+ static String ServiceProviderBranchGet = "${baseUrlServices}api/ServiceProviders/ServiceProviderBranch_Get";
+ static String ServiceCategory_Get = "${baseUrlServices}api/Master/ServiceCategory_Get";
+ static String Services_Get = "${baseUrlServices}api/ServiceProviders/Services_Get";
+ static String ServiceProviderService_Create = "${baseUrlServices}api/ServiceProviders/ServiceProviderService_Create";
+ static String ServiceProviderService_Update = "${baseUrlServices}api/ServiceProviders/ServiceProviderService_Update";
+
+ static String ServiceProviderService_Get = "${baseUrlServices}api/ServiceProviders/ServiceProviderService_Get";
+ static String BranchesAndServices = "${baseUrlServices}api/ServiceProviders/ServiceProviderDetail_Get";
}
class GlobalConsts {
@@ -65,42 +63,77 @@ class GlobalConsts {
class MyAssets {
- //Banner
- static String carBanner = "assets/images/bn_car.jpeg";
-
-
- //NavBar Icons
- static String homeIcon = "assets/icons/home_icon.svg";
- static String announcementIcon = "assets/icons/anouncement_icon.svg";
- static String dashboardDrawerIcon = "assets/icons/drawer_icon.svg";
- static String closeIcon = "assets/icons/close_icon.svg";
- static String appointmentsIcon = "assets/icons/appointments_icon.svg";
- static String providersIcon = "assets/icons/providers_icon.svg";
- static String miniClock = "assets/icons/mini_clock.svg";
- static String nextIcon = "assets/icons/next_icon.svg";
- static String settingsIcon = "assets/icons/settings_icon.svg";
- static String notificationsIcon = "assets/icons/notification_bell.svg";
-
+ static const String assetPath = "packages/mc_common_app/assets/";
+ //JPEG
+ static String bnCar = "${assetPath}images/bn_car.jpeg";
+ static String carBanner = "${assetPath}images/bn_car.jpeg";
+
+ //SVG
+ static String homeIcon = "${assetPath}icons/home_icon.svg";
+ static String announcementIcon = "${assetPath}icons/anouncement_icon.svg";
+ static String dashboardDrawerIcon = "${assetPath}icons/drawer_icon.svg";
+ static String closeIcon = "${assetPath}icons/close_icon.svg";
+ static String appointmentsIcon = "${assetPath}icons/appointments_icon.svg";
+ static String providersIcon = "${assetPath}icons/providers_icon.svg";
+ static String miniClock = "${assetPath}icons/mini_clock.svg";
+ static String nextIcon = "${assetPath}icons/next_icon.svg";
+ static String settingsIcon = "${assetPath}icons/settings_icon.svg";
+ static String branchesIcon = "${assetPath}icons/branches_icon.svg";
+ static String icAds = "${assetPath}icons/ic_ads.svg";
+ static String icAppointments = "${assetPath}icons/ic_appointments.svg";
+ static String icBranches = "${assetPath}icons/ic_branches.svg";
+ static String icCloseAccount = "${assetPath}icons/ic_close_account.svg";
+ static String icFace = "${assetPath}icons/ic_face.svg";
+ static String icFingerprintSvg = "${assetPath}icons/ic_fingerprint.svg";
+ static String icHome = "${assetPath}icons/ic_home.svg";
+ static String icProvider = "${assetPath}icons/ic_provider.svg";
+ static String icRequests = "${assetPath}icons/ic_requests.svg";
+ static String icServices = "${assetPath}icons/ic_services.svg";
+ static String icSettings = "${assetPath}icons/ic_settings.svg";
+ static String icSmsSvg = "${assetPath}icons/ic_sms.svg";
+ static String icWhatsAppSvg = "${assetPath}icons/ic_whatsapp.svg";
+ static String maintenanceIcon = "${assetPath}icons/maintenance_icon.svg";
+ static String modificationsIcon = "${assetPath}icons/modifications_icon.svg";
+ static String notificationsBellIcon = "${assetPath}icons/notification_bell.svg";
+ static String requestsIcon = "${assetPath}icons/requests_icon.svg";
+ static String starIcon = "${assetPath}icons/star_icon.svg";
+ static String bcIntro = "${assetPath}images/bc_intro.svg";
+ static String bnLogo = "${assetPath}images/bn_logo.svg";
+ static String icCar = "${assetPath}images/ic_car.svg";
+ static String icEdit = "${assetPath}images/ic_edit.svg";
+ static String icEmail = "${assetPath}images/ic_email.svg";
+ static String icLock = "${assetPath}images/ic_lock.svg";
+ static String icLogout = "${assetPath}images/ic_logout.svg";
+ static String icMobile = "${assetPath}images/ic_mobile.svg";
+ static String icNotes = "${assetPath}images/ic_notes.svg";
+ static String icNotification = "${assetPath}images/ic_notification.svg";
+ static String logo = "${assetPath}images/logo.svg";
+ static String splashLogo = "${assetPath}images/splash_logo.svg";
+
+ //PNG
+ static String icWorldPng = "${assetPath}images/ic_world.png";
+ static String bnIntroPng = "${assetPath}images/bn_Intro.png";
+ static String icLogoWhitePng = "${assetPath}images/ic_logo_white.png";
+ static String icEnginePng = "${assetPath}images/ic_engine.png";
+ static String bnMapPng = "${assetPath}images/bn_map.png";
+ static String icWhatsAppPng = "${assetPath}icons/ic_whatsapp.png";
+ static String icSmsPng = "${assetPath}icons/ic_sms.png";
+ static String icFingerprintPng = "${assetPath}icons/ic_fingerprint.png";
}
-const String icons = "assets/icons/";
-const String categorySvgIcons = "assets/category/svg/";
-const String svgIcons = "assets/svg/";
RegExp numReg = RegExp(r".*[0-9].*");
RegExp letterReg = RegExp(r".*[A-Za-z].*");
-
class MyLocales {
static const List supportedLocales = [Locale('ar', 'SA'), Locale('en', 'US')];
static const Locale startLocale = Locale('en', 'US');
static const Locale fallBackLocale = Locale('en', 'US');
static const CodegenLoader assetLoader = CodegenLoader();
- static String assetsPath = "assets/langs";
+ static String localesAssetPath = "${MyAssets.assetPath}langs";
}
class MyFonts {
-
- static const poppinsFont = "Poppins";
+ static const poppinsFont = "packages/mc_common_app/Poppins";
}
diff --git a/lib/generated/codegen_loader.g.dart b/lib/generated/codegen_loader.g.dart
deleted file mode 100644
index 2bf0a3e..0000000
--- a/lib/generated/codegen_loader.g.dart
+++ /dev/null
@@ -1,316 +0,0 @@
-// DO NOT EDIT. This is code generated via package:easy_localization/generate.dart
-
-// ignore_for_file: prefer_single_quotes
-
-import 'dart:ui';
-
-import 'package:easy_localization/easy_localization.dart' show AssetLoader;
-
-class CodegenLoader extends AssetLoader{
- const CodegenLoader();
-
- @override
- Future