Skip to content

Commit b66a52e

Browse files
committed
Updated targetApi, updated strings.xml, added Javadoc
1 parent 9a4d9c1 commit b66a52e

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

WebView/WebkitWebView/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
android:label="@string/app_name"
2727
android:supportsRtl="true"
2828
android:theme="@style/Theme.WebViewSample"
29-
tools:targetApi="31">
29+
tools:targetApi="34">
3030
<activity
3131
android:name="com.google.webkit.webviewsample.MainActivity"
3232
android:exported="true"

WebView/WebkitWebView/app/src/main/java/com/google/webkit/webviewsample/MainActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import androidx.compose.foundation.layout.fillMaxSize
2424
import androidx.compose.material.MaterialTheme
2525
import androidx.compose.material.Surface
2626
import androidx.compose.ui.Modifier
27+
import androidx.compose.ui.res.stringResource
2728
import androidx.compose.ui.viewinterop.AndroidView
2829
import androidx.webkit.WebSettingsCompat
2930
import androidx.webkit.WebViewFeature
@@ -36,7 +37,7 @@ class MainActivity : ComponentActivity() {
3637
override fun onCreate(savedInstanceState: Bundle?) {
3738
super.onCreate(savedInstanceState)
3839
setContent {
39-
val url = "https://alder-sunny-bicycle.glitch.me/"
40+
val url = stringResource(R.string.server_url)
4041
WebViewSampleTheme {
4142
Surface(
4243
modifier = Modifier.fillMaxSize(),

WebView/WebkitWebView/app/src/main/java/com/google/webkit/webviewsample/WebViewClientImpl.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ package com.google.webkit.webviewsample
1818
import android.webkit.WebView
1919
import android.webkit.WebViewClient
2020

21+
/**
22+
* A simple WebViewClient class that causes the WebView to continue loading the URL during load.
23+
* See the corresponding [documentation](https://developer.android.com/reference/android/webkit/WebViewClient#shouldOverrideUrlLoading(android.webkit.WebView,%20android.webkit.WebResourceRequest)
24+
*/
2125
class WebViewClientImpl : WebViewClient() {
2226
override fun shouldOverrideUrlLoading(view: WebView?, url: String?): Boolean {
2327
return false
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
<resources>
22
<string name="app_name">WebViewSample</string>
3+
<string name="server_url">https://alder-sunny-bicycle.glitch.me/</string>
34
</resources>

0 commit comments

Comments
 (0)