Merge pull request #685 from juicycleff/feat/upgrade_flutter_3_3

juicycleff · web-flow · commit c884be09a229 · 2022-09-01T12:50:24.000+02:00
feat: bumped to flutter 3.3.0
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -1,6 +1,6 @@
 {
   "projectName": "flutter-unity-view-widget",
-  "projectOwner": "snowballdigital",
+  "projectOwner": "juicycleff",
   "repoType": "github",
   "repoHost": "https://github.com",
   "files": [
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -11,7 +11,7 @@ jobs:
 
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.0.0'
+          flutter-version: '3.3.0'
           channel: 'stable'
 
       - name: Clean Dependencies
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2022.2.0
+
+* Enable AndroidView due to native view improvement in flutter 3.3.0
+
 ## 2022.1.7+1
 
 * **BREAKING-CHANGE**:
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ First depend on the library by adding this to your packages `pubspec.yaml`:
  -  Flutter 3.0.0
 ```yaml
 dependencies:
-  flutter_unity_widget: ^2022.1.1+3
+  flutter_unity_widget: ^2022.2.0
 ```
 
 
diff --git a/example/lib/screens/simple_screen.dart b/example/lib/screens/simple_screen.dart
@@ -46,7 +46,7 @@ class _SimpleScreenState extends State<SimpleScreen> {
                 onUnityCreated: _onUnityCreated,
                 onUnityMessage: onUnityMessage,
                 onUnitySceneLoaded: onUnitySceneLoaded,
-                useAndroidViewSurface: true,
+                useAndroidViewSurface: false,
                 borderRadius: BorderRadius.all(Radius.circular(70)),
               ),
               PointerInterceptor(
diff --git a/example/unity/DemoApp/Assets/StreamingAssets.meta b/example/unity/DemoApp/Assets/StreamingAssets.meta
diff --git a/example/unity/DemoApp/Packages/manifest.json b/example/unity/DemoApp/Packages/manifest.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
-    "com.unity.collab-proxy": "1.15.18",
+    "com.unity.collab-proxy": "1.17.1",
     "com.unity.ext.nunit": "1.0.6",
-    "com.unity.ide.rider": "3.0.14",
-    "com.unity.ide.visualstudio": "2.0.15",
+    "com.unity.ide.rider": "3.0.15",
+    "com.unity.ide.visualstudio": "2.0.16",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.test-framework": "1.1.31",
     "com.unity.textmeshpro": "3.0.6",
diff --git a/example/unity/DemoApp/Packages/packages-lock.json b/example/unity/DemoApp/Packages/packages-lock.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.unity.collab-proxy": {
-      "version": "1.15.18",
+      "version": "1.17.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -24,7 +24,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.14",
+      "version": "3.0.15",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -33,7 +33,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.15",
+      "version": "2.0.16",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -56,7 +56,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.services.core": {
-      "version": "1.4.0",
+      "version": "1.4.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {
diff --git a/example/unity/DemoApp/ProjectSettings/ProjectSettings.asset b/example/unity/DemoApp/ProjectSettings/ProjectSettings.asset
@@ -139,8 +139,8 @@ PlayerSettings:
     Others: 1
   bundleVersion: 0.1
   preloadedAssets:
-  - {fileID: 4800000, guid: e7c77f6eaab324a819efdc13b8125a39, type: 3}
-  - {fileID: -5691617579673776505, guid: 1356279c9d721447b97eebba41ddf775, type: 2}
+  - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3}
+  - {fileID: 673190512444688615, guid: 1356279c9d721447b97eebba41ddf775, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
diff --git a/example/unity/DemoApp/ProjectSettings/ProjectVersion.txt b/example/unity/DemoApp/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.1.7f1
-m_EditorVersionWithRevision: 2022.1.7f1 (240f4c1f462c)
+m_EditorVersion: 2022.1.13f1
+m_EditorVersionWithRevision: 2022.1.13f1 (22856944e6d2)
diff --git a/ios/Classes/UnityPlayerUtils.swift b/ios/Classes/UnityPlayerUtils.swift
@@ -251,15 +251,13 @@ var sharedApplication: UIApplication?
     /// the controller handler methods
     @objc
     func unityMessageHandlers(_ message: UnsafePointer<Int8>?) {
-
         for c in globalControllers {
             if let strMsg = message {
                 c.handleMessage(message: String(utf8String: strMsg) ?? "")
             } else {
                 c.handleMessage(message: "")
             }
         }
-
     }
 
     func unitySceneLoadedHandlers(name: UnsafePointer<Int8>?, buildIndex: UnsafePointer<Int32>?, isLoaded: UnsafePointer<Bool>?, isValid: UnsafePointer<Bool>?) {
diff --git a/lib/src/io/device_method.dart b/lib/src/io/device_method.dart
@@ -169,18 +169,17 @@ class MethodChannelUnityWidget extends UnityWidgetPlatform {
     }
 
     if (defaultTargetPlatform == TargetPlatform.android) {
-      // commented for 3.0.0 changes in platform view rendition
-      // if (!useAndroidViewSurface) {
-      //   return AndroidView(
-      //     viewType: _viewType,
-      //     onPlatformViewCreated: onPlatformViewCreated,
-      //     gestureRecognizers: gestureRecognizers,
-      //     creationParams: creationParams,
-      //     creationParamsCodec: const StandardMessageCodec(),
-      //     hitTestBehavior: PlatformViewHitTestBehavior.opaque,
-      //     layoutDirection: TextDirection.ltr,
-      //   );
-      // }
+      if (!useAndroidViewSurface) {
+        return AndroidView(
+          viewType: _viewType,
+          onPlatformViewCreated: onPlatformViewCreated,
+          gestureRecognizers: gestureRecognizers,
+          creationParams: creationParams,
+          creationParamsCodec: const StandardMessageCodec(),
+          hitTestBehavior: PlatformViewHitTestBehavior.opaque,
+          layoutDirection: TextDirection.ltr,
+        );
+      }
 
       return PlatformViewLink(
         viewType: _viewType,
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_unity_widget
 description: Flutter Unity 3D widget for embedding Unity game scenes in flutter. This library now supports Unity as a Library.
-version: 2022.1.7+1
+version: 2022.2.0
 #authors:
 #  - Rex Raphael <rex.raphael@outlook.com>
 #  - Thomas Stockx <thomas@stockxit.com>
@@ -9,7 +9,7 @@ homepage: https://github.com/juicycleff/flutter-unity-view-widget/tree/master
 
 environment:
   sdk: ">=2.16.0 <3.0.0"
-  flutter: ">=3.0.0"
+  flutter: ">=3.3.0"
 
 dependencies:
   flutter:
@@ -19,9 +19,8 @@ dependencies:
   flutter_plugin_android_lifecycle: ^2.0.7
   stream_transform: ^2.0.0
   plugin_platform_interface: ^2.1.2
-  webview_flutter: ^2.8.0
   webviewx: ^0.2.1
-  ffi: ^1.2.1
+#  ffi: ^1.2.1 // required for windows support
 
 dev_dependencies:
   flutter_test:
diff --git a/test/flutter_unity_widget_test.dart b/test/flutter_unity_widget_test.dart
@@ -79,8 +79,7 @@ Future<void> main() async {
         ),
       );
 
-      expect(find.byType(PlatformViewLink), findsOneWidget);
-      // expect(find.byType(AndroidView), findsOneWidget);
+      expect(find.byType(AndroidView), findsOneWidget);
       expect(find.byType(UnityWidget), findsOneWidget);
     },
   );

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"projectName": "flutter-unity-view-widget",`
`3`		`- "projectOwner": "snowballdigital",`
	`3`	`+ "projectOwner": "juicycleff",`
`4`	`4`	`"repoType": "github",`
`5`	`5`	`"repoHost": "https://github.com",`
`6`	`6`	`"files": [`
Original file line number	Diff line number	Diff line change
`@@ -251,15 +251,13 @@ var sharedApplication: UIApplication?`
`251`	`251`	`/// the controller handler methods`
`252`	`252`	`@objc`
`253`	`253`	`func unityMessageHandlers(_ message: UnsafePointer<Int8>?) {`
`254`		`-`
`255`	`254`	`for c in globalControllers {`
`256`	`255`	`if let strMsg = message {`
`257`	`256`	`c.handleMessage(message: String(utf8String: strMsg) ?? "")`
`258`	`257`	`} else {`
`259`	`258`	`c.handleMessage(message: "")`
`260`	`259`	`}`
`261`	`260`	`}`
`262`		`-`
`263`	`261`	`}`
`264`	`262`
`265`	`263`	`func unitySceneLoadedHandlers(name: UnsafePointer<Int8>?, buildIndex: UnsafePointer<Int32>?, isLoaded: UnsafePointer<Bool>?, isValid: UnsafePointer<Bool>?) {`