Fix initial view may not be able to load previewed content (#3)

dianqk · web-flow · commit 7d77c3bca90b · 2023-01-28T23:24:51.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -137,7 +137,7 @@ dependencies {
     implementation "androidx.compose.material:material:$material_version"
     implementation "androidx.compose.material3:material3:$material3_version"
     implementation "com.google.accompanist:accompanist-navigation-animation:$accompanist_version"
-    implementation "com.google.accompanist:accompanist-webview:$accompanist_version"
+    implementation "com.google.accompanist:accompanist-webview:0.29.1-SNAPSHOT"
 
     implementation 'com.google.android.material:material:1.8.0'
 
diff --git a/app/src/main/java/org/dianqk/ruslin/ui/component/MarkdownRichText.kt b/app/src/main/java/org/dianqk/ruslin/ui/component/MarkdownRichText.kt
@@ -12,7 +12,6 @@ import android.webkit.WebView
 import android.widget.Toast
 import androidx.annotation.WorkerThread
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
@@ -72,15 +71,9 @@ class MarkdownRichTextViewModel @Inject constructor(
 fun MarkdownRichText(
     modifier: Modifier = Modifier,
     viewModel: MarkdownRichTextViewModel = hiltViewModel(),
-    htmlBodyText: String?,
+    htmlBodyText: String,
     navigateToNote: (String) -> Unit,
 ) {
-    if (htmlBodyText == null) {
-        Box(modifier = modifier.background(MaterialTheme.colorScheme.background)) {
-
-        }
-        return
-    }
     val webViewState = rememberWebViewStateWithHTMLData(
         data = htmlBodyText,
     )
@@ -152,22 +145,20 @@ fun MarkdownRichText(
 
     val background = MaterialTheme.colorScheme.background
 
-    Box(modifier = modifier.background(background)) {
-        WebView(
-            state = webViewState,
-            modifier = Modifier
-                .fillMaxSize()
-                .background(background),
-            captureBackPresses = false,
-            onCreated = { webView ->
-                webView.setBackgroundColor(background.toArgb())
-                val webViewSettings = webView.settings
-                webViewSettings.allowFileAccess = false
-                webViewSettings.allowContentAccess = false
-            },
-            client = client
-        )
-    }
+    WebView(
+        state = webViewState,
+        modifier = modifier
+            .fillMaxSize()
+            .background(background),
+        captureBackPresses = false,
+        onCreated = { webView ->
+            webView.setBackgroundColor(background.toArgb())
+            val webViewSettings = webView.settings
+            webViewSettings.allowFileAccess = false
+            webViewSettings.allowContentAccess = false
+        },
+        client = client
+    )
 }
 
 private class LocalContentWebViewClient(
diff --git a/app/src/main/java/org/dianqk/ruslin/ui/page/note_detail/NoteDetailViewModel.kt b/app/src/main/java/org/dianqk/ruslin/ui/page/note_detail/NoteDetailViewModel.kt
@@ -27,7 +27,7 @@ data class NoteDetailUiState(
     val title: String = "",
     val body: String = "",
     val isLoading: Boolean = false,
-    val previewHtml: String? = null,
+    val previewHtml: String = "<!DOCTYPE html><html><body></body><html>"
 )
 
 const val TAG = "NoteDetailViewModel"
@@ -222,7 +222,7 @@ class NoteDetailViewModel @Inject constructor(
     }
 
     fun updatePreviewHtml() {
-        if (!edited && _uiState.value.previewHtml != null) {
+        if (!edited) {
             return
         }
         setPreviewHtml(body = _uiState.value.body)
diff --git a/settings.gradle b/settings.gradle
@@ -10,6 +10,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
     }
 }
 rootProject.name = "Ruslin"

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ data class NoteDetailUiState(`
`27`	`27`	`val title: String = "",`
`28`	`28`	`val body: String = "",`
`29`	`29`	`val isLoading: Boolean = false,`
`30`		`- val previewHtml: String? = null,`
	`30`	`+ val previewHtml: String = "<!DOCTYPE html><html><body></body><html>"`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`const val TAG = "NoteDetailViewModel"`
`@@ -222,7 +222,7 @@ class NoteDetailViewModel @Inject constructor(`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`fun updatePreviewHtml() {`
`225`		`- if (!edited && _uiState.value.previewHtml != null) {`
	`225`	`+ if (!edited) {`
`226`	`226`	`return`
`227`	`227`	`}`
`228`	`228`	`setPreviewHtml(body = _uiState.value.body)`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ dependencyResolutionManagement {`
`10`	`10`	`repositories {`
`11`	`11`	`google()`
`12`	`12`	`mavenCentral()`
	`13`	`+ maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }`
`13`	`14`	`}`
`14`	`15`	`}`
`15`	`16`	`rootProject.name = "Ruslin"`