Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes for Flutter Bump to 3.24.0 #975

Closed
wants to merge 2 commits into from
Closed

Changes for Flutter Bump to 3.24.0 #975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
874d102
Removed webview.
bhaveshhzt Aug 3, 2023
eb90776
ProxyLifecycleProvider Class Commented
samarthsinghpundir Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 69 additions & 69 deletions android/src/main/kotlin/com/xraph/plugin/flutter_unity_widget/FlutterUnityWidgetPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,73 +92,73 @@ class FlutterUnityWidgetPlugin : FlutterPlugin, ActivityAware {
*
* <p>This is used in the case where a direct Lifecycle/Owner is not available.
*/
@SuppressLint("NewApi")
private class ProxyLifecycleProvider(activity: Activity) : Application.ActivityLifecycleCallbacks, LifecycleOwner, LifecycleProvider {
private val lifecycle = LifecycleRegistry(this)
private var registrarActivityHashCode: Int = 0

init {
UnityPlayerUtils.activity = activity
this.registrarActivityHashCode = activity.hashCode()
activity.application.registerActivityLifecycleCallbacks(this)
}

override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
UnityPlayerUtils.activity = activity
if (activity.hashCode() != registrarActivityHashCode) {
return
}
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
}

override fun onActivityStarted(activity: Activity) {
UnityPlayerUtils.activity = activity
if (activity.hashCode() != registrarActivityHashCode) {
return
}
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_START)
}

override fun onActivityResumed(activity: Activity) {
UnityPlayerUtils.activity = activity
if (activity.hashCode() != registrarActivityHashCode) {
return
}
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
}

override fun onActivityPaused(activity: Activity) {
UnityPlayerUtils.activity = activity
if (activity.hashCode() != registrarActivityHashCode) {
return
}
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_PAUSE)
}

override fun onActivityStopped(activity: Activity) {
UnityPlayerUtils.activity = activity
if (activity.hashCode() != registrarActivityHashCode) {
return
}
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
}

override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
UnityPlayerUtils.activity = activity
}

override fun onActivityDestroyed(activity: Activity) {
UnityPlayerUtils.activity = activity
if (activity.hashCode() != registrarActivityHashCode) {
return
}

activity.application.unregisterActivityLifecycleCallbacks(this)
lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
}

override fun getLifecycle(): Lifecycle {
return lifecycle
}
}
// @SuppressLint("NewApi")
// private class ProxyLifecycleProvider(activity: Activity) : Application.ActivityLifecycleCallbacks, LifecycleOwner, LifecycleProvider {
// private val lifecycle = LifecycleRegistry(this)
// private var registrarActivityHashCode: Int = 0
//
// init {
// UnityPlayerUtils.activity = activity
// this.registrarActivityHashCode = activity.hashCode()
// activity.application.registerActivityLifecycleCallbacks(this)
// }
//
// override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
// UnityPlayerUtils.activity = activity
// if (activity.hashCode() != registrarActivityHashCode) {
// return
// }
// lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
// }
//
// override fun onActivityStarted(activity: Activity) {
// UnityPlayerUtils.activity = activity
// if (activity.hashCode() != registrarActivityHashCode) {
// return
// }
// lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_START)
// }
//
// override fun onActivityResumed(activity: Activity) {
// UnityPlayerUtils.activity = activity
// if (activity.hashCode() != registrarActivityHashCode) {
// return
// }
// lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_RESUME)
// }
//
// override fun onActivityPaused(activity: Activity) {
// UnityPlayerUtils.activity = activity
// if (activity.hashCode() != registrarActivityHashCode) {
// return
// }
// lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_PAUSE)
// }
//
// override fun onActivityStopped(activity: Activity) {
// UnityPlayerUtils.activity = activity
// if (activity.hashCode() != registrarActivityHashCode) {
// return
// }
// lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
// }
//
// override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
// UnityPlayerUtils.activity = activity
// }
//
// override fun onActivityDestroyed(activity: Activity) {
// UnityPlayerUtils.activity = activity
// if (activity.hashCode() != registrarActivityHashCode) {
// return
// }
//
// activity.application.unregisterActivityLifecycleCallbacks(this)
// lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
// }
//
// override fun getLifecycle(): Lifecycle {
// return lifecycle
// }
// }
}
10 changes: 1 addition & 9 deletions lib/src/web/web_unity_widget_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:webviewx/webviewx.dart';

class WebUnityWidgetView extends StatefulWidget {
const WebUnityWidgetView({
Expand Down Expand Up @@ -29,13 +28,6 @@ class _WebUnityWidgetViewState extends State<WebUnityWidgetView> {

@override
Widget build(BuildContext context) {
return WebViewX(
initialContent: '${Uri.base.origin}/UnityLibrary/index.html',
initialSourceType: SourceType.url,
javascriptMode: JavascriptMode.unrestricted,
onWebViewCreated: (_) {},
height: MediaQuery.of(context).size.height,
width: MediaQuery.of(context).size.width,
);
return Container();
}
}
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies:
flutter_plugin_android_lifecycle: ^2.0.7
stream_transform: ^2.0.0
plugin_platform_interface: ^2.1.2
webviewx: ^0.2.1
# webviewx: ^0.2.1
# ffi: ^1.2.1 // required for windows support

dev_dependencies:
Expand Down