* Revert "Fix crash when deleting filters" This reverts commit717d3717ba. * Revert "Update dependency dev.chrisbanes.compose:compose-bom to v2023.11.00-alpha02" This reverts commit38c18149Reason for revert: https://issuetracker.google.com/issues/295745063#comment57
This commit is contained in:
1 parent
6738dc6cdc
commit
89be27995e
3 files changed
+5
-7
No files matched your search
@@ -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 = {},
|
||||
) {
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@ fun CombinedCircularProgressIndicator(progress: Float) {
|
||||
label = "rotation",
|
||||
)
|
||||
CircularProgressIndicator(
|
||||
progress = { animatedProgress },
|
||||
progress = animatedProgress,
|
||||
modifier = Modifier.rotate(rotation),
|
||||
)
|
||||
}
|
||||
|
||||
@@ -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"]
|
||||
|
||||
Reference in new issue
Block a user