From bbf34fb2894980c062db7e107ecd94e68e9415d2 Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Tue, 28 Nov 2023 14:06:47 +0300 Subject: [PATCH] Bump closes: #120 --- .../unitto/core/ui/common/UnittoSheetContent.kt | 1 + .../ui/common/datetimepicker/DatePickerDialog.kt | 4 ++-- .../ui/common/datetimepicker/TimePickerDialog.kt | 6 +++--- .../calculator/components/CalculatorKeyboard.kt | 5 ++++- .../difference/DateDifferencePage.kt | 1 + gradle/libs.versions.toml | 16 ++++++++-------- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoSheetContent.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoSheetContent.kt index fbe481e9..7bc0c259 100644 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoSheetContent.kt +++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoSheetContent.kt @@ -65,6 +65,7 @@ internal fun ColumnScope.SheetContent( AnimatedContent( targetState = showHello, + label = "Hello reveal", modifier = Modifier.clickable( interactionSource = interactionSource, indication = null, diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/datetimepicker/DatePickerDialog.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/datetimepicker/DatePickerDialog.kt index 2828bdea..16c535bc 100644 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/datetimepicker/DatePickerDialog.kt +++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/datetimepicker/DatePickerDialog.kt @@ -26,7 +26,7 @@ import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.requiredWidth 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.DatePickerDefaults import androidx.compose.material3.MaterialTheme @@ -64,7 +64,7 @@ fun DatePickerDialog( yearRange = 0..9999, ) - AlertDialog( + BasicAlertDialog( onDismissRequest = onDismiss, modifier = modifier.wrapContentHeight(), properties = DialogProperties(usePlatformDefaultWidth = false) diff --git a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/datetimepicker/TimePickerDialog.kt b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/datetimepicker/TimePickerDialog.kt index 20f56364..aa07c739 100644 --- a/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/datetimepicker/TimePickerDialog.kt +++ b/core/ui/src/main/java/com/sadellie/unitto/core/ui/common/datetimepicker/TimePickerDialog.kt @@ -34,7 +34,7 @@ import androidx.compose.foundation.layout.width import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Keyboard 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.IconButton import androidx.compose.material3.MaterialTheme @@ -78,11 +78,11 @@ fun TimePickerDialog( val configuration = LocalConfiguration.current var showingPicker by rememberSaveable { mutableStateOf(true) } - AlertDialog( + BasicAlertDialog( onDismissRequest = onCancel, properties = DialogProperties( usePlatformDefaultWidth = false - ), + ) ) { Surface( shape = MaterialTheme.shapes.extraLarge, diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/CalculatorKeyboard.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/CalculatorKeyboard.kt index a5f76b17..1659adb3 100644 --- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/CalculatorKeyboard.kt +++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/CalculatorKeyboard.kt @@ -42,7 +42,6 @@ import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.IconButtonDefaults import androidx.compose.material3.MaterialTheme -import com.sadellie.unitto.core.ui.WindowHeightSizeClass import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -56,6 +55,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import com.sadellie.unitto.core.base.Token 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.KeyboardButtonAdditional import com.sadellie.unitto.core.ui.common.KeyboardButtonContentHeightShort @@ -204,6 +204,7 @@ private fun PortraitKeyboard( ) { Crossfade( targetState = invMode, + label = "Inverse switch", modifier = Modifier .fillMaxWidth() .weight(1f) @@ -346,6 +347,7 @@ private fun AdditionalPortrait( AnimatedContent( targetState = showAdditional, modifier = modifier, + label = "Additional buttons reveal", transitionSpec = { expandVertically(expandFrom = Alignment.Top) togetherWith shrinkVertically(shrinkTowards = Alignment.Top) using (SizeTransform()) @@ -409,6 +411,7 @@ private fun LandscapeKeyboard( ) { Crossfade( targetState = invMode, + label = "Inverse switch", modifier = modifier ) { inverse -> if (inverse) { diff --git a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DateDifferencePage.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DateDifferencePage.kt index 6d7b6f85..1320a801 100644 --- a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DateDifferencePage.kt +++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/difference/DateDifferencePage.kt @@ -121,6 +121,7 @@ private fun DateDifferenceView( AnimatedContent( targetState = uiState.result, + label = "Result reveal", modifier = Modifier.fillMaxWidth() ) { result -> when (result) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e12d1224..1081efb5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,23 +2,23 @@ appCode = "30" appName = "Popstar" -androidxBrowserBrowser = "1.6.0" -androidGradlePlugin = "8.1.2" +androidxBrowserBrowser = "1.7.0" +androidGradlePlugin = "8.1.4" androidxAppCompatAppCompat = "1.6.1" -androidxCompose = "1.6.0-alpha07" +androidxCompose = "1.6.0-beta01" androidxComposeCompiler = "1.5.0" -androidxComposeMaterial3 = "1.2.0-alpha09" +androidxComposeMaterial3 = "1.2.0-alpha11" androidxCoreCoreKts = "1.12.0" androidxDatastoreDatastorePreferences = "1.0.0" -androidxHiltHiltNavigationCompose = "1.0.0" +androidxHiltHiltNavigationCompose = "1.1.0" androidxLifecycleLifecycleRuntimeCompose = "2.6.2" -androidxNavigationNavigationCompose = "2.7.4" -androidxRoom = "2.6.0-rc01" +androidxNavigationNavigationCompose = "2.7.5" +androidxRoom = "2.6.0" androidxTest = "1.5.0" androidxTestExtJunitKtx = "1.1.5" androidxTestRunner = "1.5.2" androidxWindowWindow = "1.2.0" -comAndroidToolsDesugarJdkLibs = "2.0.3" +comAndroidToolsDesugarJdkLibs = "2.0.4" comGithubSadellieThemmo = "1.1.2" comGoogleAccompanistAccompanistSystemuicontroller = "0.30.1" comGoogleDagger = "2.47"