diff --git a/app/src/main/java/eu/kanade/presentation/components/AppBar.kt b/app/src/main/java/eu/kanade/presentation/components/AppBar.kt index fa1c217946..4046e10423 100644 --- a/app/src/main/java/eu/kanade/presentation/components/AppBar.kt +++ b/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, ), diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt index 6803a1bf6e..788d48eb7b 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaToolbar.kt +++ b/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()), diff --git a/app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt b/app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt index 8cc56af079..661ae3fc89 100644 --- a/app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt +++ b/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!!) }, ), ), ) diff --git a/gradle/androidx.versions.toml b/gradle/androidx.versions.toml index 14a9de485d..20b391722e 100644 --- a/gradle/androidx.versions.toml +++ b/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" diff --git a/gradle/compose.versions.toml b/gradle/compose.versions.toml index 046aa4030a..68c020cef0 100644 --- a/gradle/compose.versions.toml +++ b/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"