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

Fix Flutter 3.24 kotlin compilation. #977

Merged
merged 1 commit into from
Aug 15, 2024
Merged

Fix Flutter 3.24 kotlin compilation. #977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* [Android] Fix touch detection when using Unity's New Input System. [#938](https://github.com/juicycleff/flutter-unity-view-widget/pull/938)
* [Android] Workaround for mUnityplayer error in Unity plugins using the AndroidJavaProxy. [#908](https://github.com/juicycleff/flutter-unity-view-widget/pull/908)
* [Android] Add namespace for Android gradle plugin (AGP) 8 compatibility.
* [Android] Fix kotlin compilation error with Flutter 3.24 and newer. [#973](https://github.com/juicycleff/flutter-unity-view-widget/issues/973)

## 2022.2.1

Expand Down
140 changes: 71 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 @@ -87,78 +87,80 @@ class FlutterUnityWidgetPlugin : FlutterPlugin, ActivityAware {
}

/**
* [August 2024 UPDATE] This unused class was disabled to fix compilation errors in Flutter 3.24.
*
* This class provides a {@link LifecycleOwner} for the activity driven by {@link
* ActivityLifecycleCallbacks}.
*
* <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
// }
// }
}
Loading