[1.184.*] Pre-release merge (#596)

msasikanth · Jun 3, 2024 · d958995 · d958995
2 parents 806060c + aedd651
commit d958995
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 25 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -16,7 +16,7 @@ kotlinx_serialization_json = "1.6.3"
 decompose = "3.0.0"
 essenty = "2.0.0"
 androidx_activity = "1.9.0"
-androidx_appcompat = "1.6.1"
+androidx_appcompat = "1.7.0"
 androidx_core = "1.13.1"
 androidx_collection = "1.4.0"
 androidx_test_runner = "1.5.2"
@@ -41,7 +41,7 @@ okio = "3.9.0"
 paging = "3.3.0-alpha02-0.5.1"
 stately = "2.0.7"
 xmlutil = "0.86.3"
-ktxml = "0.2.3"
+ktxml = "0.2.4"
 uri = "0.0.18"
 webview = "1.9.8"
 uuid = "0.8.4"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/app/App.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/app/App.kt
@@ -49,6 +49,7 @@ import dev.sasikanth.rss.reader.search.ui.SearchScreen
 import dev.sasikanth.rss.reader.settings.ui.SettingsScreen
 import dev.sasikanth.rss.reader.share.LocalShareHandler
 import dev.sasikanth.rss.reader.share.ShareHandler
+import dev.sasikanth.rss.reader.util.DispatchersProvider
 import dev.sasikanth.rss.reader.utils.LocalWindowSizeClass
 import me.tatarka.inject.annotations.Inject
 
@@ -62,6 +63,7 @@ fun App(
   shareHandler: ShareHandler,
   linkHandler: LinkHandler,
   imageLoader: ImageLoader,
+  dispatchersProvider: DispatchersProvider,
 ) {
   setSingletonImageLoaderFactory { imageLoader }
 
@@ -109,7 +111,11 @@ fun App(
                 AboutScreen(aboutPresenter = screen.presenter, modifier = fillMaxSizeModifier)
               }
               is Screen.Reader -> {
-                ReaderScreen(presenter = screen.presenter, modifier = fillMaxSizeModifier)
+                ReaderScreen(
+                  presenter = screen.presenter,
+                  dispatchersProvider = dispatchersProvider,
+                  modifier = fillMaxSizeModifier
+                )
               }
               is Screen.AddFeed -> {
                 AddFeedScreen(presenter = screen.presenter, modifier = fillMaxSizeModifier)

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderHTML.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderHTML.kt
@@ -16,9 +16,6 @@
 
 package dev.sasikanth.rss.reader.reader.ui
 
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.IO
-import kotlinx.coroutines.withContext
 import twine.shared.generated.resources.Res
 
 object ReaderHTML {
@@ -89,6 +86,6 @@ object ReaderHTML {
   }
 
   private suspend fun readFile(fileName: String): String {
-    return withContext(Dispatchers.IO) { Res.readBytes("files/reader/$fileName").decodeToString() }
+    return Res.readBytes("files/reader/$fileName").decodeToString()
   }
 }
diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderScreen.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderScreen.kt
@@ -68,11 +68,17 @@ import dev.sasikanth.rss.reader.resources.icons.TwineIcons
 import dev.sasikanth.rss.reader.resources.icons.Website
 import dev.sasikanth.rss.reader.share.LocalShareHandler
 import dev.sasikanth.rss.reader.ui.AppTheme
+import dev.sasikanth.rss.reader.util.DispatchersProvider
 import dev.sasikanth.rss.reader.utils.asJSString
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 @Composable
-internal fun ReaderScreen(presenter: ReaderPresenter, modifier: Modifier = Modifier) {
+internal fun ReaderScreen(
+  presenter: ReaderPresenter,
+  dispatchersProvider: DispatchersProvider,
+  modifier: Modifier = Modifier
+) {
   val state by presenter.state.collectAsState()
   val coroutineScope = rememberCoroutineScope()
   val linkHandler = LocalLinkHandler.current
@@ -229,25 +235,30 @@ internal fun ReaderScreen(presenter: ReaderPresenter, modifier: Modifier = Modif
         }
 
         LaunchedEffect(state.content) {
-          val html =
-            ReaderHTML.create(
-              title = state.title!!,
-              feedName = state.feed!!.name,
-              feedHomePageLink = state.feed!!.homepageLink,
-              publishedAt = state.publishedAt!!,
-            )
+          withContext(dispatchersProvider.io) {
+            val htmlTemplate =
+              ReaderHTML.create(
+                title = state.title!!,
+                feedName = state.feed!!.name,
+                feedHomePageLink = state.feed!!.homepageLink,
+                publishedAt = state.publishedAt!!,
+              )
 
-          navigator.loadHtml(html, state.link)
+            navigator.loadHtml(htmlTemplate, state.link)
+          }
         }
 
         LaunchedEffect(webViewState.loadingState) {
-          if (
-            webViewState.loadingState == LoadingState.Finished && !state.content.isNullOrBlank()
-          ) {
-            navigator.evaluateJavaScript(
-              script =
-                "renderReaderView(${state.link.asJSString}, ${state.content.asJSString}, ${colors.asJSString})"
-            )
+          withContext(dispatchersProvider.io) {
+            val hasHtmlTemplateLoaded =
+              webViewState.loadingState == LoadingState.Finished && !state.content.isNullOrBlank()
+
+            if (hasHtmlTemplateLoaded) {
+              navigator.evaluateJavaScript(
+                script =
+                  "renderReaderView(${state.link.asJSString}, ${state.content.asJSString}, ${colors.asJSString})"
+              )
+            }
           }
         }