fix ios icon & fix ios navigation bug

docker-compose.yml

@@ -7,12 +7,12 @@ services:
   #============== Nginx Proxy Manager ====================================================================
   mih-nginx:
     container_name: mih-nginx
-    image: 'jc21/nginx-proxy-manager:latest'
+    image: "jc21/nginx-proxy-manager:latest"
     restart: unless-stopped
     ports:
-      - '80:80'   # Public HTTP
+      - "80:80" # Public HTTP
-      - '443:443' # Public HTTPS
+      - "443:443" # Public HTTPS
-      - '127.0.0.1:81:81'   # Admin Web Port
+      - "127.0.0.1:81:81" # Admin Web Port
     volumes:
       - ./mih_nginx/data:/data
       - ./mih_nginx/letsencrypt:/etc/letsencrypt
@@ -68,11 +68,11 @@ services:
     depends_on:
       - mih-db
     ports:
-      - '127.0.0.1:3567:3567'
+      - "127.0.0.1:3567:3567"
     environment:
-      REFRESH_TOKEN_VALIDITY: '604800'
+      REFRESH_TOKEN_VALIDITY: "604800"
-      ACCESS_TOKEN_VALIDITY: '86400'
+      ACCESS_TOKEN_VALIDITY: "86400"
-      PASSWORD_RESET_TOKEN_LIFETIME: '7200000'
+      PASSWORD_RESET_TOKEN_LIFETIME: "7200000"
       MYSQL_USER: ${SQL_USER}
       MYSQL_PASSWORD: ${SQL_USER_PW}
       MYSQL_HOST: mih-db
@@ -94,7 +94,7 @@ services:
     image: wordpress
     restart: always
     ports:
-      - '127.0.0.1:8081:80'
+      - "127.0.0.1:8081:80"
     environment:
       WORDPRESS_DB_HOST: mih-wp-db
       WORDPRESS_DB_USER: ${WP_SQL_USER}
@@ -112,7 +112,7 @@ services:
       MARIADB_DATABASE: ${WP_SQL_DB}
       MARIADB_USER: ${WP_SQL_USER}
       MARIADB_PASSWORD: ${WP_SQL_USER_PW}
-      MARIADB_RANDOM_ROOT_PASSWORD: '1'
+      MARIADB_RANDOM_ROOT_PASSWORD: "1"
     volumes:
       - ./mih_wp/database:/var/lib/mysql
     networks:
@@ -156,7 +156,7 @@ services:
     networks:
       - mih-network
     ports:
-      - '127.0.0.1:3306:3306'
+      - "127.0.0.1:3306:3306"
     volumes:
       - ./mih_db:/var/lib/mysql
   #============== PHP My Admin ====================================================================
@@ -182,10 +182,10 @@ services:
     hostname: mih-minio
     image: minio/minio
     ports:
-      - '127.0.0.1:9000:9000'
+      - "127.0.0.1:9000:9000"
-      - '127.0.0.1:9001:9001'
+      - "127.0.0.1:9001:9001"
     volumes:
-      - './mih_minio:/data'
+      - "./mih_minio:/data"
     environment:
       MINIO_ROOT_USER: ${MINIO_ROOT_USER}
       MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PW}
@@ -197,7 +197,7 @@ services:
     container_name: mih-monitor
     image: portainer/portainer-ce:2.20.3
     ports:
-      - '127.0.0.1:9444:9443'
+      - "127.0.0.1:9444:9443"
     volumes:
       - ./mih_monitor/data:/data
       - /var/run/docker.sock:/var/run/docker.sock
@@ -207,9 +207,9 @@ services:
   #============== MIH-AI Ollama ====================================================================
   mih-ai:
     container_name: mih-ai
-    image: ollama/ollama:latest
+    image: ollama/ollama:0.21.2
     ports:
-      - '127.0.0.1:11434:11434'
+      - "127.0.0.1:11434:11434"
     volumes:
       - ./mih_ai/ollama/ollama:/root/.ollama
     pull_policy: always

mih_api_hub/main.py

@@ -42,6 +42,7 @@ st_api_key = os.getenv("SUPERTOKENS_API_KEY")
 origins = [
     "http://localhost",
     "http://localhost:80",
+    "http://localhost:83",
     "http://localhost:1995",
     "http://localhost:8080",
     "http://MIH-API-Hub:80",

mih_ui/Dockerfile

@@ -7,13 +7,15 @@ RUN apt-get update && apt-get install -y \
 	&& rm -rf /var/lib/apt/lists/*
 
 # Clone Flutter SDK 
-RUN git clone -b flutter-3.32-candidate.0 https://github.com/flutter/flutter.git /usr/local/flutter
+RUN git clone -b stable https://github.com/flutter/flutter.git /usr/local/flutter
 ENV PATH="/usr/local/flutter/bin:/usr/local/flutter/bin/cache/dart-sdk/bin:${PATH}"
 
 # Build the Flutter web app 
+RUN flutter config --enable-web && flutter precache --web
 WORKDIR /app
+COPY pubspec.yaml pubspec.lock ./
+RUN flutter pub get
 COPY . .
-RUN flutter config --enable-web
 RUN flutter build web --release -t ./lib/main_prod.dart
 
 # --- STAGE 2: The Final Production Image ---

mih_ui/android/app/build.gradle.kts

@@ -19,7 +19,7 @@ if (keystorePropertiesFile.exists()) {
 
 android {
     namespace = "za.co.mzansiinnovationhub.mih"
-    compileSdk = 35
+    compileSdk = 36
     ndkVersion = "27.0.12077973"
     // ndkVersion = flutter.ndkVersion
 
@@ -37,7 +37,7 @@ android {
         applicationId = "za.co.mzansiinnovationhub.mih"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
-        minSdk = 23
+        minSdk = flutter.minSdkVersion
         //minSdk = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode

mih_ui/flutter_launcher_icons.yaml

@@ -3,26 +3,19 @@ flutter_launcher_icons:
   # Original
   image_path: "lib/mih_package_components/assets/images/app_icon/mih_logo_app.png"
 
-  # Women For Change
-  # image_path: "lib/mih_package_components/assets/images/app_icon/mih_logo_app_w4c.png"
-
   android: "launcher_icon"
   min_sdk_android: 21 # android min sdk min:16, default 21
   # Original
   adaptive_icon_background: "#3A4454"
   adaptive_icon_foreground: "lib/mih_package_components/assets/images/app_icon/mih_logo_app.png"
 
-  # Women For Change
-  # adaptive_icon_background: "#6641b2"
-  # adaptive_icon_foreground: "lib/mih_package_components/assets/images/app_icon/mih_logo_app_w4c.png"
-
   ios: true
   # Original
   image_path_ios: "lib/mih_package_components/assets/images/app_icon/mih_logo_app.png"
-
+  image_path_ios_dark_transparent: "lib/mih_package_components/assets/images/app_icon/mih_logo_app.png"
-  # Women For Change
+  image_path_ios_tinted_grayscale: "lib/mih_package_components/assets/images/app_icon/mih_logo_app.png"
-  # image_path_ios: "lib/mih_package_components/assets/images/app_icon/mih_logo_app_w4c.png"
+  remove_alpha_ios: true
-  remove_alpha_channel_ios: true
+  background_color_ios: "#3A4454"
 
   web:
     generate: true
@@ -31,11 +24,6 @@ flutter_launcher_icons:
     background_color: "#3A4454"
     theme_color: "#3A4454"
 
-  # Women For Change
-    # image_path: "lib/mih_package_components/assets/images/app_icon/mih_logo_web_w4c.png"
-    # background_color: "#6641b2"
-    # theme_color: "#6641b2"
-
   windows:
     generate: true
     image_path: "lib/mih_package_components/assets/images/app_icon/mih_logo_web.png"

mih_ui/ios/Flutter/AppFrameworkInfo.plist

@@ -20,7 +20,5 @@
   <string>????</string>
   <key>CFBundleVersion</key>
   <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>12.0</string>
 </dict>
 </plist>

mih_ui/ios/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - app_settings (5.1.1):
+  - app_settings (6.1.2):
     - Flutter
   - AppCheckCore (11.2.0):
     - GoogleUtilities/Environment (~> 8.0)
@@ -303,7 +303,7 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/webview_flutter_wkwebview/darwin"
 
 SPEC CHECKSUMS:
-  app_settings: 5127ae0678de1dcc19f2293271c51d37c89428b2
+  app_settings: 0341ec6daa4f0c50f5a421bf0ad7c36084db6e90
   AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f
   camera_avfoundation: be3be85408cd4126f250386828e9b1dfa40ab436
   device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
@@ -325,7 +325,7 @@ SPEC CHECKSUMS:
   FirebaseCoreExtension: 6605938d51f765d8b18bfcafd2085276a252bee2
   FirebaseCoreInternal: fe5fa466aeb314787093a7dce9f0beeaad5a2a21
   fl_downloader: dc99aa8dd303f862cccb830087f37acc9b0156ee
-  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
   flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
   flutter_tts: b88dbc8655d3dc961bc4a796e4e16a4cc1795833
   geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e

mih_ui/ios/Runner.xcodeproj/project.pbxproj

@@ -476,7 +476,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -489,7 +489,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_packageIcon_NAME = packageIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = AppIcon;
+				ASSETCATALOG_COMPILER_packageIcon_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -608,7 +610,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -657,7 +659,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -672,7 +674,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_packageIcon_NAME = packageIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = AppIcon;
+				ASSETCATALOG_COMPILER_packageIcon_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -699,7 +703,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_packageIcon_NAME = packageIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = AppIcon;
+				ASSETCATALOG_COMPILER_packageIcon_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";

mih_ui/ios/Runner/AppDelegate.swift

@@ -1,13 +1,16 @@
-import UIKit
 import Flutter
+import UIKit
 
 @main
-@objc class AppDelegate: FlutterAppDelegate {
+@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
   override func application(
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
-    GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
+
+  func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
+    GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
+  }
 }

mih_ui/ios/Runner/Info.plist

@@ -2,31 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-		<key>NSMicrophoneUsageDescription</key>
-		<string>This app needs access to your microphone to enable voice input for the chat.</string>
-		<key>NSSpeechRecognitionUsageDescription</key>
-		<string>This app uses speech recognition to convert your voice messages into text.</string>
-		<key>ITSAppUsesNonExemptEncryption</key>
-		<false/>
-		<key>NSMicrophoneUsageDescription</key>
-		<string>This app needs access to your microphone to enable voice input for the chat.</string>
-		<key>NSSpeechRecognitionUsageDescription</key>
-		<string>This app uses speech recognition to convert your voice messages into text.</string>
-		<key>ITSAppUsesNonExemptEncryption</key>
-		<false/>
-		<key>SKAdNetworkItems</key>
-		<array>
-			<dict>
-				<key>SKAdNetworkIdentifier</key>
-				<string>v9wttpbfk9.skadnetwork</string>
-			</dict>
-			<dict>
-				<key>SKAdNetworkIdentifier</key>
-				<string>n38lu8286q.skadnetwork</string>
-			</dict>
-		</array>
-		<key>GADApplicationIdentifier</key>
-		<string>ca-app-pub-4781880856775334~6935644635</string>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 	<key>CFBundleDevelopmentRegion</key>
@@ -49,6 +24,10 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>GADApplicationIdentifier</key>
+	<string>ca-app-pub-4781880856775334~6935644635</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>sms</string>
@@ -60,16 +39,52 @@
 	<true/>
 	<key>NSCameraUsageDescription</key>
 	<string>This app needs camera access to scan QR codes</string>
-		<key>NSFaceIDUsageDescription</key>
-		<string>Why is my app authenticating using face id?</string>
-		<key>NSLocationWhenInUseUsageDescription</key>
-		<string>This app needs access to location when open.</string>
-		<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-		<string>This app needs access to your location at all times to provide [Explain your specific, complete reason here, e.g., real-time tracking, background updates, etc.].</string>
-		<key>NSPhotoLibraryUsageDescription</key>
-		<string>This app needs to access your photo library to select images.</string>
 	<key>NSDownloadsFolderUsageDescription</key>
 	<string>This app needs to access your downloads folder to select files from there.</string>
+	<key>NSFaceIDUsageDescription</key>
+	<string>Why is my app authenticating using face id?</string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>This app needs access to your location at all times to provide [Explain your specific, complete reason here, e.g., real-time tracking, background updates, etc.].</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>This app needs access to location when open.</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>This app needs access to your microphone to enable voice input for the chat.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>This app needs to access your photo library to select images.</string>
+	<key>NSSpeechRecognitionUsageDescription</key>
+	<string>This app uses speech recognition to convert your voice messages into text.</string>
+	<key>SKAdNetworkItems</key>
+	<array>
+		<dict>
+			<key>SKAdNetworkIdentifier</key>
+			<string>v9wttpbfk9.skadnetwork</string>
+		</dict>
+		<dict>
+			<key>SKAdNetworkIdentifier</key>
+			<string>n38lu8286q.skadnetwork</string>
+		</dict>
+	</array>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneClassName</key>
+					<string>UIWindowScene</string>
+					<key>UISceneConfigurationName</key>
+					<string>flutter</string>
+					<key>UISceneDelegateClassName</key>
+					<string>FlutterSceneDelegate</string>
+					<key>UISceneStoryboardFile</key>
+					<string>Main</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>UIBackgroundModes</key>

mih_ui/lib/mih_package_components/Example/package_tiles/test_package_tile.dart

@@ -18,7 +18,7 @@ class _TestPackageTileState extends State<TestPackageTile> {
   Widget build(BuildContext context) {
     return MihPackageTile(
       onTap: () {
-        context.goNamed(
+        context.pushNamed(
           'testPackage',
         );
         // Navigator.of(context).pushNamed(