From ef5dc177b225e809776195a4b74febfaa348ed89 Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Sat, 28 Oct 2023 23:05:12 +0300 Subject: [PATCH] Revert "bump..." This reverts commit c7f4b2d5b0cf788f41ee4a57ba9f2b716fbd195f. --- .../unitto/feature/calculator/components/HistoryList.kt | 8 ++++++++ gradle/libs.versions.toml | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt index a5d4b56b..544531c9 100644 --- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt +++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt @@ -49,6 +49,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalClipboardManager +import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.platform.LocalTextInputService import androidx.compose.ui.platform.LocalTextToolbar import androidx.compose.ui.platform.LocalView @@ -118,6 +119,13 @@ private fun HistoryListContent( formatterSymbols: FormatterSymbols, ) { val state = rememberLazyListState() + val focusManager = LocalFocusManager.current + + // Very bad workaround for https://issuetracker.google.com/issues/295745063 + // Will remove once the fix is released + LaunchedEffect(state.isScrollInProgress) { + focusManager.clearFocus(true) + } LaunchedEffect(historyItems) { state.scrollToItem(0) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c0cb633f..fe60b527 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,15 +5,15 @@ appName = "Olive Green" androidxBrowserBrowser = "1.6.0" androidGradlePlugin = "8.1.2" androidxAppCompatAppCompat = "1.6.1" -androidxCompose = "1.6.0-alpha08" +androidxCompose = "1.6.0-alpha07" androidxComposeCompiler = "1.5.0" -androidxComposeMaterial3 = "1.2.0-alpha10" +androidxComposeMaterial3 = "1.2.0-alpha09" androidxCoreCoreKts = "1.12.0" androidxDatastoreDatastorePreferences = "1.0.0" androidxHiltHiltNavigationCompose = "1.0.0" androidxLifecycleLifecycleRuntimeCompose = "2.6.2" androidxNavigationNavigationCompose = "2.7.4" -androidxRoom = "2.6.0" +androidxRoom = "2.6.0-rc01" androidxTest = "1.5.0" androidxTestExtJunitKtx = "1.1.5" androidxTestRunner = "1.5.2"