diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/legacy/SearchLayout.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/legacy/SearchLayout.kt index 22b25658d..45f4be69d 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/legacy/SearchLayout.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/legacy/SearchLayout.kt @@ -16,8 +16,8 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ElevatedCard import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.SecondaryTabRow import androidx.compose.material3.Tab +import androidx.compose.material3.TabRow import androidx.compose.material3.Text import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass @@ -132,7 +132,7 @@ class SearchLayout @JvmOverloads constructor( } } } - SecondaryTabRow( + TabRow( selectedTabIndex = if (vm.isNormalMode) 0 else 1, divider = {}, ) { diff --git a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/CircularProgressIndicator.kt b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/CircularProgressIndicator.kt index d236d6f6e..19f6714f3 100644 --- a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/CircularProgressIndicator.kt +++ b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/viewer/CircularProgressIndicator.kt @@ -46,7 +46,7 @@ fun CombinedCircularProgressIndicator(progress: Float) { label = "rotation", ) CircularProgressIndicator( - progress = { animatedProgress }, + progress = animatedProgress, modifier = Modifier.rotate(rotation), ) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2f7f65442..4788543cd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -23,7 +23,7 @@ androidx-work = "2.8.1" arrow = "1.2.1" chucker = "4.0.0" coil = "2.5.0" -compose-bom = "2023.11.00-alpha02" +compose-bom = "2023.11.00-alpha01" compose-compiler = "1.5.4-dev-k1.9.20-RC2-93f1625925e" google-accompanist = "0.32.0" google-android-material = "1.11.0-beta01" @@ -82,8 +82,6 @@ coil-bom = { module = "io.coil-kt:coil-bom", version.ref = "coil" } coil-compose = { module = "io.coil-kt:coil-compose" } coil-gif = { module = "io.coil-kt:coil-gif" } -# https://issuetracker.google.com/issues/295745063#comment57 -compose-foundation = { module = "androidx.compose.foundation:foundation-android", version = { strictly = "1.6.0-alpha07" } } compose-bom = { module = "dev.chrisbanes.compose:compose-bom", version.ref = "compose-bom" } # For renovate compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" } @@ -137,7 +135,7 @@ androidx-navigation = ["androidx-navigation-compose", "androidx-navigation-fragm androidx-paging = ["androidx-paging-compose", "androidx-paging-runtime"] androidx-recyclerview = ["androidx-recyclerview", "androidx-recyclerview-selection"] coil = ["coil-compose", "coil-gif"] -compose = ["compose-foundation", "compose-material-icons-extended", "compose-material3", "compose-material3-windowsizeclass", "compose-ui-util", "compose-ui-viewbinding"] +compose = ["compose-material-icons-extended", "compose-material3", "compose-material3-windowsizeclass", "compose-ui-util", "compose-ui-viewbinding"] cronet = ["cronet-api", "cronet-gms"] kotlinx-serialization = ["kotlinx-serialization-cbor", "kotlinx-serialization-json", "kotlinx-serialization-json-okio"] ktor = ["ktor-io-jvm", "ktor-utils-jvm"]