diff --git a/GoogleService-Info.plist b/GoogleService-Info.plist
deleted file mode 100644
index 0c093a2a..00000000
--- a/GoogleService-Info.plist
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
- CLIENT_ID
- 864393916058-ekeb4s8tgfo58dutv0l54399t7ivr06r.apps.googleusercontent.com
- REVERSED_CLIENT_ID
- com.googleusercontent.apps.864393916058-ekeb4s8tgfo58dutv0l54399t7ivr06r
- API_KEY
- AIzaSyA_6ayGCk4fly7o7eTVBrj9kuHBYHMAOfs
- GCM_SENDER_ID
- 864393916058
- PLIST_VERSION
- 1
- BUNDLE_ID
- com.cloud.diplomaticquarterapp
- PROJECT_ID
- diplomaticquarter-d2385
- STORAGE_BUCKET
- diplomaticquarter-d2385.appspot.com
- IS_ADS_ENABLED
-
- IS_ANALYTICS_ENABLED
-
- IS_APPINVITE_ENABLED
-
- IS_GCM_ENABLED
-
- IS_SIGNIN_ENABLED
-
- GOOGLE_APP_ID
- 1:864393916058:ios:13f787bbfe6051f8b97923
- DATABASE_URL
- https://diplomaticquarter-d2385.firebaseio.com
-
-
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 11e99a2a..d88df7fe 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -39,7 +39,8 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
- applicationId "com.cloud.diplomaticquarterapp"
+// applicationId "com.cloud.diplomaticquarterapp"
+ applicationId "com.ejada.hmg"
minSdkVersion 21
targetSdkVersion 30
versionCode flutterVersionCode.toInteger()
diff --git a/android/app/google-services.json b/android/app/google-services.json
old mode 100644
new mode 100755
index a4655794..dd4038cf
--- a/android/app/google-services.json
+++ b/android/app/google-services.json
@@ -1,37 +1,39 @@
{
"project_info": {
- "project_number": "864393916058",
- "firebase_url": "https://diplomaticquarter-d2385.firebaseio.com",
- "project_id": "diplomaticquarter-d2385",
- "storage_bucket": "diplomaticquarter-d2385.appspot.com"
+ "project_number": "815750722565",
+ "firebase_url": "https://api-project-815750722565.firebaseio.com",
+ "project_id": "api-project-815750722565",
+ "storage_bucket": "api-project-815750722565.appspot.com"
},
"client": [
{
"client_info": {
- "mobilesdk_app_id": "1:864393916058:android:5b5a65cd6d8c18b4b97923",
+ "mobilesdk_app_id": "1:815750722565:android:62281cd3e5df4063",
"android_client_info": {
- "package_name": "com.cloud.diplomaticquarterapp"
+ "package_name": "com.ejada.hmg"
}
},
"oauth_client": [
{
- "client_id": "864393916058-tphjrn8j39ntevt32ekcvmll8aue7qql.apps.googleusercontent.com",
+ "client_id": "815750722565-3a0gc7neins0eoahdrimrfksk0sqice8.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
- "current_key": "AIzaSyBdV3mos1BPhUzNKCj2KANJtiO3o2zh9IM"
+ "current_key": "AIzaSyDUfg6AKM1-00WyzpvLImUBC46wFrq9-qw"
}
],
"services": {
+ "analytics_service": {
+ "status": 1
+ },
"appinvite_service": {
- "other_platform_oauth_client": [
- {
- "client_id": "864393916058-tphjrn8j39ntevt32ekcvmll8aue7qql.apps.googleusercontent.com",
- "client_type": 3
- }
- ]
+ "status": 1,
+ "other_platform_oauth_client": []
+ },
+ "ads_service": {
+ "status": 2
}
}
}
diff --git a/android/app/gradle/wrapper/gradle-wrapper.properties b/android/app/gradle/wrapper/gradle-wrapper.properties
index 8fc3bbec..a2c20300 100644
--- a/android/app/gradle/wrapper/gradle-wrapper.properties
+++ b/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 1a3d4cfe..1238814b 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -34,7 +34,7 @@
android:name="io.flutter.app.FlutterApplication"
android:icon="@mipmap/ic_launcher"
android:usesCleartextTraffic="true"
- android:label="diplomaticquarterapp">
+ android:label="Dr. Alhabib">
CLIENT_ID
- 864393916058-ekeb4s8tgfo58dutv0l54399t7ivr06r.apps.googleusercontent.com
+ 815750722565-da8p56le8bd6apsbm9eft0jjl1rtpgkt.apps.googleusercontent.com
REVERSED_CLIENT_ID
- com.googleusercontent.apps.864393916058-ekeb4s8tgfo58dutv0l54399t7ivr06r
+ com.googleusercontent.apps.815750722565-da8p56le8bd6apsbm9eft0jjl1rtpgkt
+ ANDROID_CLIENT_ID
+ 815750722565-m14h8mkosm7cnq6uh6rhqr54dn02d705.apps.googleusercontent.com
API_KEY
- AIzaSyA_6ayGCk4fly7o7eTVBrj9kuHBYHMAOfs
+ AIzaSyDiXnCO00li4V7Ioa2YZ_M4ECxRsu_P9tA
GCM_SENDER_ID
- 864393916058
+ 815750722565
PLIST_VERSION
1
BUNDLE_ID
- com.cloud.diplomaticquarterapp
+ com.HMG.HMG-Smartphone
PROJECT_ID
- diplomaticquarter-d2385
+ api-project-815750722565
STORAGE_BUCKET
- diplomaticquarter-d2385.appspot.com
+ api-project-815750722565.appspot.com
IS_ADS_ENABLED
IS_ANALYTICS_ENABLED
@@ -29,8 +31,8 @@
IS_SIGNIN_ENABLED
GOOGLE_APP_ID
- 1:864393916058:ios:13f787bbfe6051f8b97923
+ 1:815750722565:ios:328ec247a81a2ca23c186c
DATABASE_URL
- https://diplomaticquarter-d2385.firebaseio.com
+ https://api-project-815750722565.firebaseio.com
\ No newline at end of file
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index ae084167..72bd4ac9 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -11,7 +11,7 @@
CFBundleInfoDictionaryVersion
6.0
CFBundleName
- diplomaticquarterapp
+ Dr. Alhabib
CFBundlePackageType
APPL
CFBundleShortVersionString
diff --git a/lib/config/config.dart b/lib/config/config.dart
index f87b7628..b197a515 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -13,16 +13,16 @@ const PACKAGES_CUSTOMER = '/api/customers';
const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items';
const PACKAGES_ORDERS = '/api/orders';
-const BASE_URL = 'https://uat.hmgwebservices.com/';
-//const BASE_URL = 'https://hmgwebservices.com/';
+//const BASE_URL = 'https://uat.hmgwebservices.com/';
+const BASE_URL = 'https://hmgwebservices.com/';
// Pharmacy UAT URLs
-const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
-const PHARMACY_BASE_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
+//const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
+//const PHARMACY_BASE_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
// Pharmacy Production URLs
-// const BASE_PHARMACY_URL = 'https://mdlaboratories.com/exacartapi/api/';
-// const PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapi/api/';
+const BASE_PHARMACY_URL = 'https://mdlaboratories.com/exacartapi/api/';
+const PHARMACY_BASE_URL = 'https://mdlaboratories.com/exacartapi/api/';
const PING_SERVICE = 'Services/Weather.svc/REST/CheckConnectivity';
diff --git a/lib/services/permission/permission_service.dart b/lib/services/permission/permission_service.dart
index 237b2fa8..d88ec599 100644
--- a/lib/services/permission/permission_service.dart
+++ b/lib/services/permission/permission_service.dart
@@ -11,7 +11,7 @@ import 'package:localstorage/localstorage.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:vibration/vibration.dart';
import 'package:geolocator/geolocator.dart' as geo;
-import 'package:open_settings/open_settings.dart';
+// import 'package:open_settings/open_settings.dart';
class PermissionService extends BaseService {
final LocalStorage storage = new LocalStorage("permission");
@@ -78,6 +78,6 @@ class PermissionService extends BaseService {
}
openAccessbility() {
- OpenSettings.openAppSetting();
+ // OpenSettings.openAppSetting();
}
}
diff --git a/pubspec.yaml b/pubspec.yaml
index 7451cb6a..c86b4a59 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -162,7 +162,7 @@ dependencies:
# recase: ^3.0.0
wakelock: ^0.1.4
after_layout: ^1.0.7
- twilio_programmable_video: ^0.5.0+3
+ twilio_programmable_video: ^0.6.2
cached_network_image: ^2.4.1
flutter_tts:
path: flutter_tts-voice_enhancement
@@ -176,7 +176,7 @@ dependencies:
path: speech_to_text
badges: ^1.1.4
- open_settings: ^2.0.1
+# open_settings: ^2.0.1
# Dep by Zohaib
shimmer: ^1.1.2
carousel_slider: ^2.3.1