diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6264603f..b2c9d074 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,13 +11,13 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.BasilReader" + android:theme="@style/Theme.CapyReader" android:enableOnBackInvokedCallback="true" tools:targetApi="33"> + android:theme="@style/Theme.CapyReader"> diff --git a/app/src/main/java/com/jocmp/capyreader/ui/components/WebView.kt b/app/src/main/java/com/jocmp/capyreader/ui/components/WebView.kt index 8abde566..6dd7535e 100644 --- a/app/src/main/java/com/jocmp/capyreader/ui/components/WebView.kt +++ b/app/src/main/java/com/jocmp/capyreader/ui/components/WebView.kt @@ -4,6 +4,7 @@ import android.annotation.SuppressLint import android.content.Context import android.graphics.Bitmap import android.os.Bundle +import android.view.LayoutInflater import android.view.ViewGroup.LayoutParams import android.webkit.WebChromeClient import android.webkit.WebResourceError @@ -30,6 +31,7 @@ import androidx.compose.runtime.snapshotFlow import androidx.compose.runtime.snapshots.SnapshotStateList import androidx.compose.ui.Modifier import androidx.compose.ui.viewinterop.AndroidView +import com.jocmp.capyreader.R import com.jocmp.capyreader.ui.components.LoadingState.Finished import com.jocmp.capyreader.ui.components.LoadingState.Loading import kotlinx.coroutines.CoroutineScope @@ -195,7 +197,7 @@ fun WebView( AndroidView( factory = { context -> - (factory?.invoke(context) ?: WebView(context)).apply { + (factory?.invoke(context) ?: context.inflateWebView()).apply { onCreated(this) this.settings.javaScriptEnabled = true @@ -677,3 +679,9 @@ val WebStateSaver: Saver = run { } ) } + +private fun Context.inflateWebView(): WebView { + return LayoutInflater + .from(this) + .inflate(R.layout.article_webview, null, false) as WebView +} diff --git a/app/src/main/res/layout/article_webview.xml b/app/src/main/res/layout/article_webview.xml new file mode 100644 index 00000000..cee9823a --- /dev/null +++ b/app/src/main/res/layout/article_webview.xml @@ -0,0 +1,6 @@ + + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 7ae7e976..d0a4a38f 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,5 +1,5 @@ -