From 32a129eb46e70806f8d83807edb494dc22a1e864 Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Sun, 12 Feb 2023 15:57:49 +0400 Subject: [PATCH] Bump and fixes Compose bump caused crashes, fixed --- .../src/main/java/UnittoLibraryPlugin.kt | 1 - .../feature/unitslist/components/SearchBar.kt | 67 ++++++++----------- gradle/libs.versions.toml | 32 ++++----- 3 files changed, 45 insertions(+), 55 deletions(-) diff --git a/build-logic/convention/src/main/java/UnittoLibraryPlugin.kt b/build-logic/convention/src/main/java/UnittoLibraryPlugin.kt index b7cafbfb..4e1bc798 100644 --- a/build-logic/convention/src/main/java/UnittoLibraryPlugin.kt +++ b/build-logic/convention/src/main/java/UnittoLibraryPlugin.kt @@ -36,7 +36,6 @@ class UnittoLibraryPlugin : Plugin { extensions.configure { configureKotlinAndroid(this) defaultConfig.minSdk = 21 - defaultConfig.targetSdk = 33 defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" defaultConfig.consumerProguardFiles("consumer-rules.pro") } diff --git a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/SearchBar.kt b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/SearchBar.kt index 887f0543..7cee6021 100644 --- a/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/SearchBar.kt +++ b/feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/SearchBar.kt @@ -105,43 +105,36 @@ internal fun SearchBar( TopAppBar( title = { Crossfade(targetState = showSearch) { textFieldShown -> - Row( - verticalAlignment = Alignment.CenterVertically - ) { - when (textFieldShown) { - // No search text field - false -> { - Text( - modifier = Modifier - .fillMaxWidth() - .weight(1f), - text = title, - style = MaterialTheme.typography.titleLarge - ) - } - // With text field - true -> { - SearchTextField( - modifier = Modifier - .fillMaxWidth() - .weight(1f) - .focusRequester(focusRequester), - value = value, - onValueChange = onValueChange, - onSearch = { - // Close searchbar if there is nothing in search query and user - // clicks search button on his keyboard - if (value.isEmpty()) { - showSearch = false - } else { - focusManager.clearFocus() - } + Row(verticalAlignment = Alignment.CenterVertically) { + if (textFieldShown) { + SearchTextField( + modifier = Modifier + .fillMaxWidth() + .weight(1f) + .focusRequester(focusRequester), + value = value, + onValueChange = onValueChange, + onSearch = { + // Close searchbar if there is nothing in search query and user + // clicks search button on his keyboard + if (value.isEmpty()) { + showSearch = false + } else { + focusManager.clearFocus() } - ) - LaunchedEffect(Unit) { - focusRequester.requestFocus() } + ) + LaunchedEffect(Unit) { + focusRequester.requestFocus() } + } else { + Text( + modifier = Modifier + .fillMaxWidth() + .weight(1f), + text = title, + style = MaterialTheme.typography.titleLarge + ) } } } @@ -195,17 +188,15 @@ private fun SearchTextField( keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search), keyboardActions = KeyboardActions(onSearch = onSearch), decorationBox = { innerTextField -> + innerTextField() // Showing placeholder only when there is query is empty - if (value.isEmpty()) { - innerTextField() + value.ifEmpty { Text( modifier = Modifier.alpha(0.7f), text = stringResource(R.string.search_bar_placeholder), style = MaterialTheme.typography.titleLarge, color = MaterialTheme.colorScheme.onSurface ) - } else { - innerTextField() } } ) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ff4dc0fd..4b166edf 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,21 +1,16 @@ [versions] appCode = "14" appName = "Glaucous" +kotlin = "1.8.10" androidxCore = "1.9.0" -androidxTest = "1.5.0" -androidxTestExt = "1.1.4" -androidDesugarJdkLibs = "2.0.0" -junit = "4.13.2" -androidxTestRunner = "1.5.1" -androidxTestRules = "1.5.0" -orgRobolectric = "4.9" +androidGradlePlugin = "7.4.1" orgJetbrainsKotlinxCoroutinesTest = "1.6.4" -androidxCompose = "1.4.0-alpha05" -androidxComposeCompiler = "1.4.0" -androidxComposeUi = "1.4.0-alpha05" +androidxCompose = "1.4.0-beta01" +androidxComposeCompiler = "1.4.2" +androidxComposeUi = "1.4.0-beta01" +androidxComposeMaterial3 = "1.1.0-alpha06" androidxNavigation = "2.5.3" -androidxLifecycleRuntimeCompose = "2.6.0-alpha05" -androidxComposeMaterial3 = "1.1.0-alpha05" +androidxLifecycleRuntimeCompose = "2.6.0-beta01" androidxHilt = "1.0.0" comGoogleDagger = "2.44.2" androidxComposeMaterialIconsExtended = "1.4.0-alpha04" @@ -27,9 +22,14 @@ comSquareupRetrofit2 = "2.9.0" comGithubSadellieThemmo = "cf6be7e592" orgBurnoutcrewComposereorderable = "0.9.6" comGithubSadellieExprk = "e55cba8f41" -androidGradlePlugin = "7.4.1" -kotlin = "1.8.0" mxParser = "5.2.1" +junit = "4.13.2" +androidxTest = "1.5.0" +androidxTestExt = "1.1.4" +androidDesugarJdkLibs = "2.0.2" +androidxTestRunner = "1.5.1" +androidxTestRules = "1.5.0" +orgRobolectric = "4.9" [libraries] androidx-core = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" } @@ -45,9 +45,9 @@ androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "u androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "androidxComposeUi" } androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "androidxCompose" } androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "androidxCompose" } -androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxNavigation" } -androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidxLifecycleRuntimeCompose" } androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidxComposeMaterial3" } +androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidxLifecycleRuntimeCompose" } +androidx-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxNavigation" } androidx-hilt = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHilt" } com-google-dagger-processor = { group = "com.google.dagger", name = "dagger-android-processor", version.ref = "comGoogleDagger" } com-google-dagger-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "comGoogleDagger" }