Hotfix - iOS (#269)

bluecherrydvr · Sep 22, 2024 · 1b30981 · 1b30981
2 parents d3e1c1c + f95cc66
commit 1b30981
Show file tree

Hide file tree

Showing 9 changed files with 120 additions and 106 deletions.
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -144,6 +144,7 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				E22EC2F6BFEAC8DF12155F5E /* [CP] Embed Pods Frameworks */,
+				CF944AD1CE6CF5D1780609E6 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -256,6 +257,23 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		CF944AD1CE6CF5D1780609E6 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		E22EC2F6BFEAC8DF12155F5E /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift
@@ -2,7 +2,7 @@ import UIKit
 import Flutter
 import awesome_notifications
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

diff --git a/lib/screens/layouts/mobile/mobile_device_grid.dart b/lib/screens/layouts/mobile/mobile_device_grid.dart
@@ -67,17 +67,16 @@ class _SmallDeviceGridState extends State<SmallDeviceGrid> {
   Widget build(BuildContext context) {
     final view = context.watch<MobileViewProvider>();
     final settings = context.watch<SettingsProvider>();
-    final viewPadding = MediaQuery.viewPaddingOf(context);
     final theme = Theme.of(context);
     final loc = AppLocalizations.of(context);
 
-    return SafeArea(
-      bottom: false,
-      child: Column(children: [
-        if (view.tab == -1)
-          const Spacer()
-        else
-          Expanded(
+    return Column(children: [
+      if (view.tab == -1)
+        const Spacer()
+      else
+        Expanded(
+          child: SafeArea(
+            bottom: false,
             child: PageTransitionSwitcher(
               child: view.devices.keys
                   .map((key) => _SmallDeviceGridChild(tab: key))
@@ -97,69 +96,62 @@ class _SmallDeviceGridState extends State<SmallDeviceGrid> {
               },
             ),
           ),
-        DecoratedBox(
-          decoration: const BoxDecoration(boxShadow: [
-            BoxShadow(color: Colors.black45, blurRadius: 8.0),
-          ]),
-          child: Material(
-            child: Container(
-              height: kMobileBottomBarHeight + viewPadding.bottom,
-              padding: EdgeInsetsDirectional.only(
-                start: 16.0 + viewPadding.horizontal,
-                end: 16.0 + viewPadding.horizontal,
-                bottom: viewPadding.bottom,
+        ),
+      Material(
+        child: SafeArea(
+          top: false,
+          child: Container(
+            height: kMobileBottomBarHeight,
+            padding: const EdgeInsetsDirectional.symmetric(horizontal: 16.0),
+            width: double.infinity,
+            child: Row(children: <Widget>[
+              UnityDrawerButton(
+                iconColor: theme.colorScheme.onSurface,
+                iconSize: 18.0,
+                splashRadius: 24.0,
               ),
-              width: double.infinity,
-              child: Row(children: <Widget>[
-                UnityDrawerButton(
-                  iconColor: theme.colorScheme.onSurface,
-                  iconSize: 18.0,
-                  splashRadius: 24.0,
-                ),
-                IconButton(
-                  icon: Icon(
-                    Icons.cyclone,
-                    size: 18.0,
-                    color: settings.kLayoutCycleEnabled.value
-                        ? theme.colorScheme.primary
-                        : theme.colorScheme.onSurface,
-                  ),
-                  tooltip: loc.cycle,
-                  onPressed: settings.toggleCycling,
+              IconButton(
+                icon: Icon(
+                  Icons.cyclone,
+                  size: 18.0,
+                  color: settings.kLayoutCycleEnabled.value
+                      ? theme.colorScheme.primary
+                      : theme.colorScheme.onSurface,
                 ),
-                const Spacer(),
-                ...view.devices.keys.map((tab) {
-                  return Container(
-                    height: 48.0,
-                    width: 48.0,
-                    alignment: AlignmentDirectional.centerEnd,
-                    child: DecoratedBox(
-                      decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(100),
-                        color:
-                            view.tab == tab ? theme.colorScheme.primary : null,
-                      ),
-                      child: IconButton(
-                        onPressed: () => view.setTab(tab),
-                        icon: Text(
-                          '$tab',
-                          style: TextStyle(
-                            color: view.tab == tab
-                                ? theme.colorScheme.onPrimary
-                                : theme.colorScheme.onSurface,
-                            fontSize: 18.0,
-                          ),
+                tooltip: loc.cycle,
+                onPressed: settings.toggleCycling,
+              ),
+              const Spacer(),
+              ...view.devices.keys.map((tab) {
+                return Container(
+                  height: 48.0,
+                  width: 48.0,
+                  alignment: AlignmentDirectional.centerEnd,
+                  child: DecoratedBox(
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(100),
+                      color: view.tab == tab ? theme.colorScheme.primary : null,
+                    ),
+                    child: IconButton(
+                      onPressed: () => view.setTab(tab),
+                      icon: Text(
+                        '$tab',
+                        style: TextStyle(
+                          color: view.tab == tab
+                              ? theme.colorScheme.onPrimary
+                              : theme.colorScheme.onSurface,
+                          fontSize: 18.0,
                         ),
                       ),
                     ),
-                  );
-                }),
-              ]),
-            ),
+                  ),
+                );
+              }),
+            ]),
           ),
         ),
-      ]),
-    );
+      ),
+    ]);
   }
 }
 

diff --git a/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig
@@ -1,11 +1,12 @@
 // This is a generated file; do not edit or check into version control.
-FLUTTER_ROOT=C:\Progs_no_install\flutter
-FLUTTER_APPLICATION_PATH=C:\Users\brunodlukaa\Documents\unity
+FLUTTER_ROOT=/Users/user249455/Documents/development/flutter
+FLUTTER_APPLICATION_PATH=/Users/user249455/Documents/GitHub/unity
 COCOAPODS_PARALLEL_CODE_SIGN=true
+FLUTTER_TARGET=/Users/user249455/Documents/GitHub/unity/lib/main.dart
 FLUTTER_BUILD_DIR=build
 FLUTTER_BUILD_NAME=3.0.019
 FLUTTER_BUILD_NUMBER=3.0.019
 DART_OBFUSCATION=false
 TRACK_WIDGET_CREATION=true
 TREE_SHAKE_ICONS=false
-PACKAGE_CONFIG=.dart_tool/package_config.json
+PACKAGE_CONFIG=/Users/user249455/Documents/GitHub/unity/.dart_tool/package_config.json
diff --git a/macos/Flutter/ephemeral/flutter_export_environment.sh b/macos/Flutter/ephemeral/flutter_export_environment.sh
@@ -1,12 +1,13 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=C:\Progs_no_install\flutter"
-export "FLUTTER_APPLICATION_PATH=C:\Users\brunodlukaa\Documents\unity"
+export "FLUTTER_ROOT=/Users/user249455/Documents/development/flutter"
+export "FLUTTER_APPLICATION_PATH=/Users/user249455/Documents/GitHub/unity"
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
+export "FLUTTER_TARGET=/Users/user249455/Documents/GitHub/unity/lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "FLUTTER_BUILD_NAME=3.0.019"
 export "FLUTTER_BUILD_NUMBER=3.0.019"
 export "DART_OBFUSCATION=false"
 export "TRACK_WIDGET_CREATION=true"
 export "TREE_SHAKE_ICONS=false"
-export "PACKAGE_CONFIG=.dart_tool/package_config.json"
+export "PACKAGE_CONFIG=/Users/user249455/Documents/GitHub/unity/.dart_tool/package_config.json"
diff --git a/macos/Podfile.lock b/macos/Podfile.lock
@@ -4,8 +4,8 @@ PODS:
   - awesome_notifications (0.0.1):
     - FlutterMacOS
   - connectivity_plus (0.0.1):
+    - Flutter
     - FlutterMacOS
-    - ReachabilitySwift
   - device_info_plus (0.0.1):
     - FlutterMacOS
   - Firebase/CoreOnly (10.7.0):
@@ -42,6 +42,10 @@ PODS:
     - GoogleUtilities/UserDefaults (~> 7.8)
     - nanopb (< 2.30910.0, >= 2.30908.0)
   - FlutterMacOS (1.0.0)
+  - fvp (0.24.1):
+    - Flutter
+    - FlutterMacOS
+    - mdk (~> 0.29.1)
   - GoogleDataTransport (9.3.0):
     - GoogleUtilities/Environment (~> 7.7)
     - nanopb (< 2.30910.0, >= 2.30908.0)
@@ -63,6 +67,7 @@ PODS:
     - GoogleUtilities/Logger
   - GoogleUtilities/UserDefaults (7.12.0):
     - GoogleUtilities/Logger
+  - mdk (0.29.1)
   - media_kit_libs_macos_video (1.0.4):
     - FlutterMacOS
   - media_kit_native_event_loop (1.0.0):
@@ -80,13 +85,10 @@ PODS:
     - Flutter
     - FlutterMacOS
   - PromisesObjC (2.3.1)
-  - ReachabilitySwift (5.0.0)
   - screen_brightness_macos (0.1.0):
     - FlutterMacOS
   - screen_retriever (0.0.1):
     - FlutterMacOS
-  - system_date_time_format (0.0.1):
-    - FlutterMacOS
   - url_launcher_macos (0.0.1):
     - FlutterMacOS
   - video_player_avfoundation (0.0.1):
@@ -100,19 +102,19 @@ PODS:
 DEPENDENCIES:
   - app_links (from `Flutter/ephemeral/.symlinks/plugins/app_links/macos`)
   - awesome_notifications (from `Flutter/ephemeral/.symlinks/plugins/awesome_notifications/macos`)
-  - connectivity_plus (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos`)
+  - connectivity_plus (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus/darwin`)
   - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
   - firebase_core (from `Flutter/ephemeral/.symlinks/plugins/firebase_core/macos`)
   - firebase_messaging (from `Flutter/ephemeral/.symlinks/plugins/firebase_messaging/macos`)
   - FlutterMacOS (from `Flutter/ephemeral`)
+  - fvp (from `Flutter/ephemeral/.symlinks/plugins/fvp/darwin`)
   - media_kit_libs_macos_video (from `Flutter/ephemeral/.symlinks/plugins/media_kit_libs_macos_video/macos`)
   - media_kit_native_event_loop (from `Flutter/ephemeral/.symlinks/plugins/media_kit_native_event_loop/macos`)
   - media_kit_video (from `Flutter/ephemeral/.symlinks/plugins/media_kit_video/macos`)
   - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
   - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
   - screen_brightness_macos (from `Flutter/ephemeral/.symlinks/plugins/screen_brightness_macos/macos`)
   - screen_retriever (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos`)
-  - system_date_time_format (from `Flutter/ephemeral/.symlinks/plugins/system_date_time_format/macos`)
   - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
   - video_player_avfoundation (from `Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin`)
   - wakelock_plus (from `Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos`)
@@ -127,17 +129,17 @@ SPEC REPOS:
     - FirebaseMessaging
     - GoogleDataTransport
     - GoogleUtilities
+    - mdk
     - nanopb
     - PromisesObjC
-    - ReachabilitySwift
 
 EXTERNAL SOURCES:
   app_links:
     :path: Flutter/ephemeral/.symlinks/plugins/app_links/macos
   awesome_notifications:
     :path: Flutter/ephemeral/.symlinks/plugins/awesome_notifications/macos
   connectivity_plus:
-    :path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos
+    :path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus/darwin
   device_info_plus:
     :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos
   firebase_core:
@@ -146,6 +148,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/firebase_messaging/macos
   FlutterMacOS:
     :path: Flutter/ephemeral
+  fvp:
+    :path: Flutter/ephemeral/.symlinks/plugins/fvp/darwin
   media_kit_libs_macos_video:
     :path: Flutter/ephemeral/.symlinks/plugins/media_kit_libs_macos_video/macos
   media_kit_native_event_loop:
@@ -160,8 +164,6 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/screen_brightness_macos/macos
   screen_retriever:
     :path: Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos
-  system_date_time_format:
-    :path: Flutter/ephemeral/.symlinks/plugins/system_date_time_format/macos
   url_launcher_macos:
     :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
   video_player_avfoundation:
@@ -174,8 +176,8 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   app_links: 10e0a0ab602ffaf34d142cd4862f29d34b303b2a
   awesome_notifications: 428f5c15a700b117418aed09e29c21c5806fcf69
-  connectivity_plus: 18d3c32514c886e046de60e9c13895109866c747
-  device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f
+  connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
+  device_info_plus: ce1b7762849d3ec103d0e0517299f2db7ad60720
   Firebase: 0219acf760880eeec8ce479895bd7767466d9f81
   firebase_core: 104c957652eab7d9d9c779102f509714a56ad382
   firebase_messaging: fbe4ca035331b288ae5475e7106060fe06e245df
@@ -184,21 +186,21 @@ SPEC CHECKSUMS:
   FirebaseInstallations: 033d199474164db20c8350736842a94fe717b960
   FirebaseMessaging: ac9062bcc35ed56e15a0241d8fd317022499baf8
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
+  fvp: 81fd93b02f03649892a996cab2dc38d6804fa8de
   GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe
   GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
+  mdk: 3c49affb38303cf86fd9f8ea1e05fe029c4dc194
   media_kit_libs_macos_video: b3e2bbec2eef97c285f2b1baa7963c67c753fb82
   media_kit_native_event_loop: 81fd5b45192b72f8b5b69eaf5b540f45777eb8d5
   media_kit_video: c75b07f14d59706c775778e4dd47dd027de8d1e5
   nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
-  package_info_plus: 02d7a575e80f194102bef286361c6c326e4c29ce
-  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
+  package_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0c
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
-  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   screen_brightness_macos: 2d6d3af2165592d9a55ffcd95b7550970e41ebda
   screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
-  system_date_time_format: 4f3982edee40a537cf15c817d1e939b9dbfa457d
-  url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95
-  video_player_avfoundation: 02011213dab73ae3687df27ce441fbbcc82b5579
+  url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
+  video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
   wakelock_plus: 4783562c9a43d209c458cb9b30692134af456269
   window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
 

diff --git a/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import Cocoa
 import FlutterMacOS
 
-@NSApplicationMain
+@main
 class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
     // https://pub.dev/packages/window_manager#macos

diff --git a/packages/unity_multi_window/example/pubspec.lock b/packages/unity_multi_window/example/pubspec.lock
@@ -203,10 +203,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.4"
+    version: "14.2.5"
 sdks:
   dart: ">=3.3.0 <4.0.0"
   flutter: ">=3.18.0-18.0.pre.54"