chor: stop using suspendCoroutine

Author: m-abs

flutter_readium/android/src/main/kotlin/dk/nota/flutter_readium/ReadiumReaderView.kt

@@ -140,17 +140,16 @@ internal class ReadiumReaderView(
     initialLocations = initialLocator?.locations?.let { if (canScroll(it)) it else null }
 
     if (!reuseFragment || epubReaderFragment == null) {
+      val vm = EpubReaderViewModel();
+      vm.identifier = pubIdentifier
+      vm.pubUrl = pubUrl
+      vm.publication = publication
+      vm.locator = initialLocator
+      vm.preferences = initialPreferences
+
       navigator = EpubReaderFragment()
-      navigator.vm = EpubReaderViewModel().let()
-      {
-        it.identifier = pubIdentifier
-        it.pubUrl = pubUrl
-        it.publication = publication
-        it.locator = initialLocator
-        it.preferences = initialPreferences
-
-        it
-      }
+      navigator.vm = vm
+
       layout = LinearLayout(context, attrs)
       layout.id = generateViewId()
 

flutter_readium/android/src/main/kotlin/dk/nota/flutter_readium/fragments/EpubReaderFragment.kt

@@ -8,14 +8,12 @@ import android.view.ViewGroup
 import androidx.fragment.app.commitNow
 import androidx.lifecycle.lifecycleScope
 import dk.nota.flutter_readium.R
-import dk.nota.flutter_readium.StartLifecycleObserver
 import dk.nota.flutter_readium.models.EpubReaderViewModel
 import dk.nota.flutter_readium.throttleLatest
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import org.readium.r2.navigator.Decoration
 import org.readium.r2.navigator.epub.EpubNavigatorFragment
@@ -24,8 +22,6 @@ import org.readium.r2.navigator.epub.EpubPreferencesEditor
 import org.readium.r2.shared.ExperimentalReadiumApi
 import org.readium.r2.shared.publication.Locator
 import org.readium.r2.shared.util.AbsoluteUrl
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
 import kotlin.time.Duration
 
 
@@ -152,20 +148,20 @@ class EpubReaderFragment : VisualReaderFragment(), EpubNavigatorFragment.Listene
             return
         }
 
+        if (editor == null) {
+            return
+        }
+
         try {
-            suspendCoroutine {
-                editor?.let {
-                    it.apply {
-                        fontFamily.set(preferences.fontFamily)
-                        fontSize.set(preferences.fontSize)
-                        fontWeight.set(preferences.fontWeight)
-                        scroll.set(preferences.scroll)
-                        backgroundColor.set(preferences.backgroundColor)
-                        textColor.set(preferences.textColor)
-                    }
-
-                    navigator.submitPreferences(it.preferences)
-                }
+            editor?.apply {
+                fontFamily.set(preferences.fontFamily)
+                fontSize.set(preferences.fontSize)
+                fontWeight.set(preferences.fontWeight)
+                scroll.set(preferences.scroll)
+                backgroundColor.set(preferences.backgroundColor)
+                textColor.set(preferences.textColor)
+
+                navigator.submitPreferences(preferences)
             }
         } catch (ex: Exception) {
             Log.e(TAG, "Error applying EpubPreferences: $ex")
@@ -181,13 +177,10 @@ class EpubReaderFragment : VisualReaderFragment(), EpubNavigatorFragment.Listene
             return
         }
 
-        suspendCoroutine {
-            if (navigator.goBackward(animated)) {
-                Log.d(TAG, "::goLeft: Went back.")
-            } else {
-                Log.d(TAG, "::goLeft: Couldn't go back.")
-            }
-            it.resume(Unit)
+        if (navigator.goBackward(animated)) {
+            Log.d(TAG, "::goLeft: Went back.")
+        } else {
+            Log.d(TAG, "::goLeft: Couldn't go back.")
         }
     }
 
@@ -200,14 +193,10 @@ class EpubReaderFragment : VisualReaderFragment(), EpubNavigatorFragment.Listene
             return
         }
 
-        suspendCoroutine {
-            if (navigator.goForward(animated)) {
-                Log.d(TAG, "::goRight: Went forward.")
-            } else {
-                Log.d(TAG, "::goRight: Couldn't go forward.")
-            }
-
-            it.resume(Unit)
+        if (navigator.goForward(animated)) {
+            Log.d(TAG, "::goRight: Went forward.")
+        } else {
+            Log.d(TAG, "::goRight: Couldn't go forward.")
         }
     }