diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 531e31a..758115e 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/src/main/java/com/sqz/checklist/ui/MainLayout.kt b/app/src/main/java/com/sqz/checklist/ui/MainLayout.kt index 6418256..1f68bd3 100644 --- a/app/src/main/java/com/sqz/checklist/ui/MainLayout.kt +++ b/app/src/main/java/com/sqz/checklist/ui/MainLayout.kt @@ -185,34 +185,6 @@ fun TopBar( } } }, - navigationIcon = { - val visible = topBarState.heightOffset >= topBarState.heightOffsetLimit * 0.58 - if (topBarState.heightOffset != topBarState.heightOffsetLimit) { - AnimatedVisibility( - visible = visible, - enter = expandHorizontally( - expandFrom = Alignment.CenterHorizontally - ) + fadeIn( - initialAlpha = 0.3f - ), - exit = slideOutHorizontally() + fadeOut() - ) { - Row( - modifier = modifier.padding(top = 8.dp), - verticalAlignment = Alignment.Bottom - ) { - Spacer(modifier = modifier.width(10.dp)) - Text( - text = topBarContent(week), - maxLines = 1, - fontSize = 22.sp, - color = MaterialTheme.colorScheme.primary, - overflow = TextOverflow.Visible - ) - } - } - } - }, actions = { IconButton(onClick = onClick) { Icon( @@ -223,6 +195,32 @@ fun TopBar( }, scrollBehavior = scrollBehavior ) + val visible = topBarState.heightOffset >= topBarState.heightOffsetLimit * 0.58 + if (topBarState.heightOffset != topBarState.heightOffsetLimit) { + AnimatedVisibility( + visible = visible, + enter = expandHorizontally( + expandFrom = Alignment.CenterHorizontally + ) + fadeIn( + initialAlpha = 0.3f + ), + exit = slideOutHorizontally() + fadeOut() + ) { + Row( + modifier = modifier.padding(top = 22.dp, start = 4.dp), + verticalAlignment = Alignment.Bottom + ) { + Spacer(modifier = modifier.width(10.dp)) + Text( + text = topBarContent(week), + maxLines = 1, + fontSize = 22.sp, + color = MaterialTheme.colorScheme.primary, + overflow = TextOverflow.Visible + ) + } + } + } } @Composable diff --git a/app/src/main/java/com/sqz/checklist/ui/mainLayout/MainLayoutDialogs.kt b/app/src/main/java/com/sqz/checklist/ui/mainLayout/MainLayoutDialogs.kt index ab2d3d1..6574404 100644 --- a/app/src/main/java/com/sqz/checklist/ui/mainLayout/MainLayoutDialogs.kt +++ b/app/src/main/java/com/sqz/checklist/ui/mainLayout/MainLayoutDialogs.kt @@ -37,6 +37,7 @@ import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp @@ -117,6 +118,7 @@ fun TaskChangeContentCard( ), cursorBrush = SolidColor(MaterialTheme.colorScheme.onSurfaceVariant), keyboardOptions = KeyboardOptions( + capitalization = KeyboardCapitalization.Sentences, imeAction = if (doneImeAction) { ImeAction.Done } else ImeAction.Default