From 5275b2d763555df2732648415c7146c11b5ca432 Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Wed, 23 Aug 2023 09:59:04 +0300 Subject: [PATCH] Clear focus after leaving AddSubtractPage --- .../unitto/feature/datecalculator/DateCalculatorScreen.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/DateCalculatorScreen.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/DateCalculatorScreen.kt index 9a79d92b..d9337f73 100644 --- a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/DateCalculatorScreen.kt +++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/DateCalculatorScreen.kt @@ -30,6 +30,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import com.sadellie.unitto.core.base.R @@ -58,6 +59,7 @@ internal fun DateCalculatorScreen( ) { val addSubtractLabel = "${stringResource(R.string.add)}/${stringResource(R.string.subtract)}" val differenceLabel = stringResource(R.string.difference) + val focusManager = LocalFocusManager.current val allTabs = remember { mutableListOf(addSubtractLabel, differenceLabel) } val pagerState = rememberPagerState { allTabs.size } @@ -96,7 +98,9 @@ internal fun DateCalculatorScreen( ) { page -> when (page) { 0 -> AddSubtractPage() - 1 -> DateDifferencePage() + 1 -> DateDifferencePage().also { + focusManager.clearFocus(true) + } } } }