瀏覽代碼

Bump dependencies

arkon 2 年之前
父節點
當前提交
9432d2d06a

+ 1 - 1
app/src/main/java/eu/kanade/presentation/components/AppBar.kt

@@ -137,7 +137,7 @@ fun AppBar(
             },
             title = titleContent,
             actions = actions,
-            colors = TopAppBarDefaults.smallTopAppBarColors(
+            colors = TopAppBarDefaults.topAppBarColors(
                 containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(
                     elevation = if (isActionMode) 3.dp else 0.dp,
                 ),

+ 1 - 1
app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt

@@ -142,7 +142,7 @@ fun MangaToolbar(
                     }
                 }
             },
-            colors = TopAppBarDefaults.smallTopAppBarColors(
+            colors = TopAppBarDefaults.topAppBarColors(
                 containerColor = MaterialTheme.colorScheme
                     .surfaceColorAtElevation(3.dp)
                     .copy(alpha = if (isActionMode) 1f else backgroundAlphaProvider()),

+ 4 - 4
app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt

@@ -49,7 +49,7 @@ fun WebViewScreenContent(
             Box {
                 AppBar(
                     title = state.pageTitle ?: initialTitle,
-                    subtitle = state.content.getCurrentUrl(),
+                    subtitle = state.lastLoadedUrl,
                     navigateUp = onNavigateUp,
                     navigationIcon = Icons.Outlined.Close,
                     actions = {
@@ -81,15 +81,15 @@ fun WebViewScreenContent(
                                 ),
                                 AppBar.OverflowAction(
                                     title = stringResource(R.string.action_share),
-                                    onClick = { onShare(state.content.getCurrentUrl()!!) },
+                                    onClick = { onShare(state.lastLoadedUrl!!) },
                                 ),
                                 AppBar.OverflowAction(
                                     title = stringResource(R.string.action_open_in_browser),
-                                    onClick = { onOpenInBrowser(state.content.getCurrentUrl()!!) },
+                                    onClick = { onOpenInBrowser(state.lastLoadedUrl!!) },
                                 ),
                                 AppBar.OverflowAction(
                                     title = stringResource(R.string.pref_clear_cookies),
-                                    onClick = { onClearCookies(state.content.getCurrentUrl()!!) },
+                                    onClick = { onClearCookies(state.lastLoadedUrl!!) },
                                 ),
                             ),
                         )

+ 3 - 3
gradle/androidx.versions.toml

@@ -1,16 +1,16 @@
 [versions]
 agp_version = "7.4.1"
-lifecycle_version = "2.6.0-beta01"
+lifecycle_version = "2.6.0-rc01"
 
 [libraries]
 gradle = { module = "com.android.tools.build:gradle", version.ref = "agp_version" }
 
-annotation = "androidx.annotation:annotation:1.5.0"
+annotation = "androidx.annotation:annotation:1.6.0"
 appcompat = "androidx.appcompat:appcompat:1.6.1"
 biometricktx = "androidx.biometric:biometric-ktx:1.2.0-alpha05"
 constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4"
 coordinatorlayout = "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
-corektx = "androidx.core:core-ktx:1.10.0-alpha02"
+corektx = "androidx.core:core-ktx:1.10.0-beta01"
 splashscreen = "androidx.core:core-splashscreen:1.0.0-alpha02"
 recyclerview = "androidx.recyclerview:recyclerview:1.3.0-rc01"
 viewpager = "androidx.viewpager:viewpager:1.1.0-alpha01"

+ 1 - 1
gradle/compose.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-compiler = "1.4.2"
+compiler = "1.4.3"
 compose-bom = "2023.02.00-beta01"
 accompanist = "0.29.1-alpha"