closes: #120
This commit is contained in:
Sad Ellie 2023-11-28 14:06:47 +03:00
parent 7b7fa7ca67
commit bbf34fb289
6 changed files with 19 additions and 14 deletions

View File

@ -65,6 +65,7 @@ internal fun ColumnScope.SheetContent(
AnimatedContent( AnimatedContent(
targetState = showHello, targetState = showHello,
label = "Hello reveal",
modifier = Modifier.clickable( modifier = Modifier.clickable(
interactionSource = interactionSource, interactionSource = interactionSource,
indication = null, indication = null,

View File

@ -26,7 +26,7 @@ import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredWidth import androidx.compose.foundation.layout.requiredWidth
import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.material3.AlertDialog import androidx.compose.material3.BasicAlertDialog
import androidx.compose.material3.DatePicker import androidx.compose.material3.DatePicker
import androidx.compose.material3.DatePickerDefaults import androidx.compose.material3.DatePickerDefaults
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
@ -64,7 +64,7 @@ fun DatePickerDialog(
yearRange = 0..9999, yearRange = 0..9999,
) )
AlertDialog( BasicAlertDialog(
onDismissRequest = onDismiss, onDismissRequest = onDismiss,
modifier = modifier.wrapContentHeight(), modifier = modifier.wrapContentHeight(),
properties = DialogProperties(usePlatformDefaultWidth = false) properties = DialogProperties(usePlatformDefaultWidth = false)

View File

@ -34,7 +34,7 @@ import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Keyboard import androidx.compose.material.icons.outlined.Keyboard
import androidx.compose.material.icons.outlined.Schedule import androidx.compose.material.icons.outlined.Schedule
import androidx.compose.material3.AlertDialog import androidx.compose.material3.BasicAlertDialog
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
@ -78,11 +78,11 @@ fun TimePickerDialog(
val configuration = LocalConfiguration.current val configuration = LocalConfiguration.current
var showingPicker by rememberSaveable { mutableStateOf(true) } var showingPicker by rememberSaveable { mutableStateOf(true) }
AlertDialog( BasicAlertDialog(
onDismissRequest = onCancel, onDismissRequest = onCancel,
properties = DialogProperties( properties = DialogProperties(
usePlatformDefaultWidth = false usePlatformDefaultWidth = false
), )
) { ) {
Surface( Surface(
shape = MaterialTheme.shapes.extraLarge, shape = MaterialTheme.shapes.extraLarge,

View File

@ -42,7 +42,6 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton import androidx.compose.material3.IconButton
import androidx.compose.material3.IconButtonDefaults import androidx.compose.material3.IconButtonDefaults
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import com.sadellie.unitto.core.ui.WindowHeightSizeClass
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
@ -56,6 +55,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import com.sadellie.unitto.core.base.Token import com.sadellie.unitto.core.base.Token
import com.sadellie.unitto.core.ui.LocalWindowSize import com.sadellie.unitto.core.ui.LocalWindowSize
import com.sadellie.unitto.core.ui.WindowHeightSizeClass
import com.sadellie.unitto.core.ui.common.ColumnWithConstraints import com.sadellie.unitto.core.ui.common.ColumnWithConstraints
import com.sadellie.unitto.core.ui.common.KeyboardButtonAdditional import com.sadellie.unitto.core.ui.common.KeyboardButtonAdditional
import com.sadellie.unitto.core.ui.common.KeyboardButtonContentHeightShort import com.sadellie.unitto.core.ui.common.KeyboardButtonContentHeightShort
@ -204,6 +204,7 @@ private fun PortraitKeyboard(
) { ) {
Crossfade( Crossfade(
targetState = invMode, targetState = invMode,
label = "Inverse switch",
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.weight(1f) .weight(1f)
@ -346,6 +347,7 @@ private fun AdditionalPortrait(
AnimatedContent( AnimatedContent(
targetState = showAdditional, targetState = showAdditional,
modifier = modifier, modifier = modifier,
label = "Additional buttons reveal",
transitionSpec = { transitionSpec = {
expandVertically(expandFrom = Alignment.Top) togetherWith expandVertically(expandFrom = Alignment.Top) togetherWith
shrinkVertically(shrinkTowards = Alignment.Top) using (SizeTransform()) shrinkVertically(shrinkTowards = Alignment.Top) using (SizeTransform())
@ -409,6 +411,7 @@ private fun LandscapeKeyboard(
) { ) {
Crossfade( Crossfade(
targetState = invMode, targetState = invMode,
label = "Inverse switch",
modifier = modifier modifier = modifier
) { inverse -> ) { inverse ->
if (inverse) { if (inverse) {

View File

@ -121,6 +121,7 @@ private fun DateDifferenceView(
AnimatedContent( AnimatedContent(
targetState = uiState.result, targetState = uiState.result,
label = "Result reveal",
modifier = Modifier.fillMaxWidth() modifier = Modifier.fillMaxWidth()
) { result -> ) { result ->
when (result) { when (result) {

View File

@ -2,23 +2,23 @@
appCode = "30" appCode = "30"
appName = "Popstar" appName = "Popstar"
androidxBrowserBrowser = "1.6.0" androidxBrowserBrowser = "1.7.0"
androidGradlePlugin = "8.1.2" androidGradlePlugin = "8.1.4"
androidxAppCompatAppCompat = "1.6.1" androidxAppCompatAppCompat = "1.6.1"
androidxCompose = "1.6.0-alpha07" androidxCompose = "1.6.0-beta01"
androidxComposeCompiler = "1.5.0" androidxComposeCompiler = "1.5.0"
androidxComposeMaterial3 = "1.2.0-alpha09" androidxComposeMaterial3 = "1.2.0-alpha11"
androidxCoreCoreKts = "1.12.0" androidxCoreCoreKts = "1.12.0"
androidxDatastoreDatastorePreferences = "1.0.0" androidxDatastoreDatastorePreferences = "1.0.0"
androidxHiltHiltNavigationCompose = "1.0.0" androidxHiltHiltNavigationCompose = "1.1.0"
androidxLifecycleLifecycleRuntimeCompose = "2.6.2" androidxLifecycleLifecycleRuntimeCompose = "2.6.2"
androidxNavigationNavigationCompose = "2.7.4" androidxNavigationNavigationCompose = "2.7.5"
androidxRoom = "2.6.0-rc01" androidxRoom = "2.6.0"
androidxTest = "1.5.0" androidxTest = "1.5.0"
androidxTestExtJunitKtx = "1.1.5" androidxTestExtJunitKtx = "1.1.5"
androidxTestRunner = "1.5.2" androidxTestRunner = "1.5.2"
androidxWindowWindow = "1.2.0" androidxWindowWindow = "1.2.0"
comAndroidToolsDesugarJdkLibs = "2.0.3" comAndroidToolsDesugarJdkLibs = "2.0.4"
comGithubSadellieThemmo = "1.1.2" comGithubSadellieThemmo = "1.1.2"
comGoogleAccompanistAccompanistSystemuicontroller = "0.30.1" comGoogleAccompanistAccompanistSystemuicontroller = "0.30.1"
comGoogleDagger = "2.47" comGoogleDagger = "2.47"