diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/100.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/100.png index 65f0d55..fbf9aad 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/100.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/100.png differ diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/1024.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/1024.png index b998b66..a7c19ff 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/1024.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/114.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/114.png index 0f50e25..98fa21a 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/114.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/114.png differ diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/120.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/120.png index a0e68f6..76963bc 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/120.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/120.png differ diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/144.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/144.png index 2b2f92a..b883d34 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/144.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/144.png differ diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/152.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/152.png index 05fe8bd..fdfc3d1 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/152.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/152.png differ diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/167.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/167.png index 6f68927..21a0c40 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/167.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/167.png differ diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/180.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/180.png index 3505586..cc27e40 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/180.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/180.png differ diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/20.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/20.png index 7cf1ec6..d40e5fa 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/20.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/20.png differ diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/29.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/29.png index 72041ef..b1989b3 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/29.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/29.png differ diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/40.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/40.png index 165c664..3ff7c3b 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/40.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/40.png differ diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/50.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/50.png index fd54195..d25d14f 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/50.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/50.png differ diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/57.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/57.png index d7c7d71..3920765 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/57.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/57.png differ diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/58.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/58.png index affd0a3..5fd0a66 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/58.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/58.png differ diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/60.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/60.png index d05b84c..80c8849 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/60.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/60.png differ diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/72.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/72.png index 68a1ef7..9d07a35 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/72.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/72.png differ diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/76.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/76.png index f6f3236..5474008 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/76.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/76.png differ diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/80.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/80.png index 8b90576..d528dba 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/80.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/80.png differ diff --git a/AppIcons/Assets.xcassets/AppIcon.appiconset/87.png b/AppIcons/Assets.xcassets/AppIcon.appiconset/87.png index e74668b..bedfd1b 100644 Binary files a/AppIcons/Assets.xcassets/AppIcon.appiconset/87.png and b/AppIcons/Assets.xcassets/AppIcon.appiconset/87.png differ diff --git a/AppIcons/appstore.png b/AppIcons/appstore.png index b998b66..a7c19ff 100644 Binary files a/AppIcons/appstore.png and b/AppIcons/appstore.png differ diff --git a/AppIcons/playstore.png b/AppIcons/playstore.png index d8a9dae..dae7a86 100644 Binary files a/AppIcons/playstore.png and b/AppIcons/playstore.png differ diff --git a/android/app/build.gradle b/android/app/build.gradle index 372164e..e760f43 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -53,7 +53,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.cloudsolutions.alhabibmohemm" minSdkVersion 28 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index f492b94..dc6699c 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -12,6 +12,9 @@ + + + @@ -30,7 +33,7 @@ android:networkSecurityConfig="@xml/network_security_config" diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 68a1ef7..652db0b 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index af09a79..dc60cc8 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 4df02c0..19a0f9c 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 2b2f92a..bbbe7dd 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 1e38881..19eced5 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/assets/images/logos/loading_mohemm_logo.gif b/assets/images/logos/loading_mohemm_logo.gif index ffefdb0..eb8b36f 100644 Binary files a/assets/images/logos/loading_mohemm_logo.gif and b/assets/images/logos/loading_mohemm_logo.gif differ diff --git a/assets/images/logos/loading_mohemm_logo_old.gif b/assets/images/logos/loading_mohemm_logo_old.gif new file mode 100644 index 0000000..ffefdb0 Binary files /dev/null and b/assets/images/logos/loading_mohemm_logo_old.gif differ diff --git a/assets/images/logos/main_mohemm_logo.png b/assets/images/logos/main_mohemm_logo.png index 5536c07..8ea04aa 100644 Binary files a/assets/images/logos/main_mohemm_logo.png and b/assets/images/logos/main_mohemm_logo.png differ diff --git a/assets/images/logos/main_mohemm_logo_old.png b/assets/images/logos/main_mohemm_logo_old.png new file mode 100644 index 0000000..5536c07 Binary files /dev/null and b/assets/images/logos/main_mohemm_logo_old.png differ diff --git a/lib/app_state/app_state.dart b/lib/app_state/app_state.dart index 2e91d5d..287bf19 100644 --- a/lib/app_state/app_state.dart +++ b/lib/app_state/app_state.dart @@ -90,7 +90,7 @@ class AppState { String get getHuaweiPushToken => _huaweiPushToken; - final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 33, versionID: 6.0, mobileType: Platform.isAndroid ? "android" : "ios"); + final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 33, versionID: 8.3, mobileType: Platform.isAndroid ? "android" : "ios"); void setPostParamsInitConfig() { isAuthenticated = false; diff --git a/lib/provider/chat_provider_model.dart b/lib/provider/chat_provider_model.dart index 380278d..08a7fa3 100644 --- a/lib/provider/chat_provider_model.dart +++ b/lib/provider/chat_provider_model.dart @@ -1444,7 +1444,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin { pChatHistory?.clear(); uGroups?.clear(); searchGroup?.clear(); - chatHubConnection.stop(); + if(chatHubConnection != null) chatHubConnection.stop(); AppState().chatDetails = null; } } diff --git a/lib/ui/landing/widget/app_drawer.dart b/lib/ui/landing/widget/app_drawer.dart index 4721470..f754e1b 100644 --- a/lib/ui/landing/widget/app_drawer.dart +++ b/lib/ui/landing/widget/app_drawer.dart @@ -175,7 +175,7 @@ class _AppDrawerState extends State { AppState().isAuthenticated = false; AppState().isLogged = false; AppState().setPostParamsInitConfig(); - chatData.disposeData(); + // chatData.disposeData(); // SharedPreferences prefs = await SharedPreferences.getInstance(); // await prefs.clear(); Navigator.pushNamedAndRemoveUntil(context, AppRoutes.login, (Route route) => false, arguments: null); diff --git a/pubspec.yaml b/pubspec.yaml index c354c5c..14a7fc5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 3.7.6+1 +version: 4.4.4+4000026 environment: sdk: ">=2.16.0 <3.0.0" @@ -119,7 +119,7 @@ dependencies: # store_checker: ^1.1.0 google_api_availability: ^3.0.1 - in_app_update: 3.0.0 + in_app_update: 4.1.0 #todo its for temporary purpose, later will remove this. dotted_border: ^2.0.0+3