ViewBinding update

dkrivoruchko · Mar 8, 2021 · 5c689bd · 5c689bd
1 parent 57d99c6
commit 5c689bd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId = "info.dvkr.screenstream"
         minSdkVersion(21)
         targetSdkVersion(30)
-        versionCode = 30503
-        versionName = "3.5.3"
+        versionCode = 30504
+        versionName = "3.5.4"
         resConfigs("en", "ru", "pt-rBR", "zh-rTW", "fr-rFR", "fa", "it", "pl", "hi", "de", "sk", "es", "ar", "ja", "gl", "ca")
 
         vectorDrawables.useSupportLibrary = true

diff --git a/app/src/main/kotlin/info/dvkr/screenstream/ui/ViewBindingHelper.kt b/app/src/main/kotlin/info/dvkr/screenstream/ui/ViewBindingHelper.kt
@@ -17,20 +17,19 @@ abstract class ViewBindingProperty<in R, T : ViewBinding>(
 ) : ReadOnlyProperty<R, T> {
 
     internal var viewBinding: T? = null
-    private val lifecycleObserver = BindingLifecycleObserver()
+    private val lifecycleObserver = ClearOnDestroyLifecycleObserver()
 
     protected abstract fun getLifecycleOwner(thisRef: R): LifecycleOwner
 
     @MainThread
     override fun getValue(thisRef: R, property: KProperty<*>): T {
-        check(Looper.myLooper() == Looper.getMainLooper())
         viewBinding?.let { return it }
 
         getLifecycleOwner(thisRef).lifecycle.addObserver(lifecycleObserver)
         return viewBinder(thisRef).also { viewBinding = it }
     }
 
-    private inner class BindingLifecycleObserver : DefaultLifecycleObserver {
+    private inner class ClearOnDestroyLifecycleObserver : DefaultLifecycleObserver {
         @MainThread
         override fun onDestroy(owner: LifecycleOwner) {
             owner.lifecycle.removeObserver(this)
@@ -60,7 +59,7 @@ internal class DialogFragmentViewBindingProperty<F : DialogFragment, T : ViewBin
 ) : ViewBindingProperty<F, T>(viewBinder) {
 
     override fun getLifecycleOwner(thisRef: F): LifecycleOwner {
-        return if (thisRef.view == null) thisRef.viewLifecycleOwner else thisRef
+        return if (thisRef.showsDialog) thisRef else thisRef.viewLifecycleOwner
     }
 }
 

diff --git a/data/build.gradle b/data/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion(21)
         targetSdkVersion(30)
-        versionCode = 30503
-        versionName = "3.5.3"
+        versionCode = 30504
+        versionName = "3.5.4"
     }
 
     compileOptions {