From ac5b9f3d904157cd2118306d4642e715e4879f1b Mon Sep 17 00:00:00 2001 From: 8954sood <8954sood@naver.com> Date: Mon, 23 Sep 2024 20:17:58 +0900 Subject: [PATCH 1/3] chore: Bottom Sheet Time Picker Internal to Public --- .../kotlin/com/b1nd/dodam/designsystem/component/TimePicker.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TimePicker.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TimePicker.kt index c931fe7..4652aa6 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TimePicker.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TimePicker.kt @@ -104,7 +104,7 @@ fun DodamTimePickerDialog( @OptIn(ExperimentalMaterial3Api::class) @Composable -internal fun DodamTimePickerBottomSheet( +fun DodamTimePickerBottomSheet( modifier: Modifier = Modifier, onDismissRequest: () -> Unit, sheetState: SheetState = rememberModalBottomSheetState(), From 99e06a65cf353cf1e139befa05cc642b88b4341e Mon Sep 17 00:00:00 2001 From: 8954sood <8954sood@naver.com> Date: Mon, 23 Sep 2024 20:21:20 +0900 Subject: [PATCH 2/3] chroe: Remove Not Use Import --- .../com/b1nd/dodam/designsystem/DodamTheme.kt | 7 ---- .../designsystem/animation/DodamIndication.kt | 1 - .../dodam/designsystem/component/Avatar.kt | 3 -- .../dodam/designsystem/component/Button.kt | 2 - .../dodam/designsystem/component/CheckBox.kt | 3 -- .../designsystem/component/DatePicker.kt | 10 ++++- .../dodam/designsystem/component/Dialog.kt | 3 -- .../dodam/designsystem/component/Divider.kt | 4 -- .../designsystem/component/IconButton.kt | 1 - .../dodam/designsystem/component/Indicator.kt | 6 --- .../designsystem/component/LoadingDots.kt | 1 - .../component/ModalBottomSheet.kt | 4 -- .../designsystem/component/NavigationBar.kt | 4 -- .../designsystem/component/SegmentedButton.kt | 4 -- .../dodam/designsystem/component/TabRow.kt | 6 --- .../designsystem/component/TextButton.kt | 1 - .../dodam/designsystem/component/TextField.kt | 39 ++++++++----------- .../designsystem/component/TimePicker.kt | 6 --- .../dodam/designsystem/component/TopAppBar.kt | 1 - .../foundation/DodamTypography.kt | 2 - .../designsystem/tokens/TypographyTokens.kt | 1 - .../designsystem/component/DatePicker.ios.kt | 5 --- .../component/DatePicker.android.kt | 15 ------- 23 files changed, 26 insertions(+), 103 deletions(-) diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/DodamTheme.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/DodamTheme.kt index fc63181..e2f14b2 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/DodamTheme.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/DodamTheme.kt @@ -2,18 +2,11 @@ package com.b1nd.dodam.designsystem import androidx.compose.foundation.LocalIndication import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Home -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Shapes -import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable -import androidx.compose.runtime.CompositionLocal import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.ReadOnlyComposable import com.b1nd.dodam.designsystem.animation.rememberBounceIndication import com.b1nd.dodam.designsystem.foundation.DodamColors -import com.b1nd.dodam.designsystem.foundation.DodamIcons import com.b1nd.dodam.designsystem.foundation.DodamShapes import com.b1nd.dodam.designsystem.foundation.DodamTypography import com.b1nd.dodam.designsystem.foundation.LocalDodamColors diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/animation/DodamIndication.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/animation/DodamIndication.kt index 46c4a2d..c6fdd33 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/animation/DodamIndication.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/animation/DodamIndication.kt @@ -18,7 +18,6 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.drawscope.ContentDrawScope import androidx.compose.ui.graphics.drawscope.scale import androidx.compose.ui.unit.Density -import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.b1nd.dodam.designsystem.DodamTheme diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Avatar.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Avatar.kt index 985cde9..e13adf3 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Avatar.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Avatar.kt @@ -3,7 +3,6 @@ package com.b1nd.dodam.designsystem.component import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape import androidx.compose.runtime.Composable @@ -14,8 +13,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.DefaultAlpha -import androidx.compose.ui.graphics.painter.Painter -import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Button.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Button.kt index 6b18d7a..1d44135 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Button.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Button.kt @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.defaultMinSize -import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CornerBasedShape @@ -25,7 +24,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/CheckBox.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/CheckBox.kt index 1803360..4588aa5 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/CheckBox.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/CheckBox.kt @@ -19,9 +19,7 @@ import androidx.compose.material3.Icon import androidx.compose.material3.Surface import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha @@ -29,7 +27,6 @@ import androidx.compose.ui.unit.dp import com.b1nd.dodam.designsystem.DodamTheme import com.b1nd.dodam.designsystem.animation.rememberBounceIndication import com.b1nd.dodam.designsystem.foundation.DodamIcons -import org.jetbrains.compose.ui.tooling.preview.Preview @Composable fun DodamCheckBox( diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/DatePicker.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/DatePicker.kt index 6350deb..4a86218 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/DatePicker.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/DatePicker.kt @@ -19,10 +19,18 @@ import androidx.compose.material3.SheetState import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.rememberModalBottomSheetState -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.ReadOnlyComposable +import androidx.compose.runtime.Stable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.saveable.Saver import androidx.compose.runtime.saveable.listSaver import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.drawBehind diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Dialog.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Dialog.kt index a5516fe..3434351 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Dialog.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Dialog.kt @@ -5,8 +5,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.sizeIn import androidx.compose.foundation.layout.width @@ -17,7 +15,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.b1nd.dodam.designsystem.DodamTheme -import org.jetbrains.compose.ui.tooling.preview.Preview @Composable fun DodamDialog( diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Divider.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Divider.kt index cf24d24..1a0044e 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Divider.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Divider.kt @@ -1,20 +1,16 @@ package com.b1nd.dodam.designsystem.component import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.runtime.Composable import androidx.compose.runtime.Stable -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.b1nd.dodam.designsystem.DodamTheme -import org.jetbrains.compose.ui.tooling.preview.Preview @Composable fun DodamDivider( diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/IconButton.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/IconButton.kt index 2394ae0..800faec 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/IconButton.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/IconButton.kt @@ -17,7 +17,6 @@ import androidx.compose.ui.unit.dp import com.b1nd.dodam.designsystem.DodamTheme import com.b1nd.dodam.designsystem.animation.rememberBounceIndication import com.b1nd.dodam.designsystem.foundation.DodamIcons -import org.jetbrains.compose.ui.tooling.preview.Preview @Composable fun DodamIconButton( diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Indicator.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Indicator.kt index 5d38276..6a48481 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Indicator.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/Indicator.kt @@ -9,9 +9,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.heightIn -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.requiredHeight import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.pager.PagerState @@ -20,13 +17,10 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.ReadOnlyComposable import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.draw.drawWithContent -import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.unit.dp import com.b1nd.dodam.designsystem.DodamTheme -import org.jetbrains.compose.ui.tooling.preview.Preview @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/LoadingDots.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/LoadingDots.kt index 9e3a0eb..512d4b4 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/LoadingDots.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/LoadingDots.kt @@ -19,7 +19,6 @@ import androidx.compose.ui.unit.dp import com.b1nd.dodam.designsystem.DodamTheme import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import org.jetbrains.compose.ui.tooling.preview.Preview @Composable diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/ModalBottomSheet.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/ModalBottomSheet.kt index 4c39c6d..7cfa48c 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/ModalBottomSheet.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/ModalBottomSheet.kt @@ -9,13 +9,10 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width -import androidx.compose.material3.BottomSheetScaffold import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ModalBottomSheet -import androidx.compose.material3.ModalBottomSheetDefaults import androidx.compose.material3.SheetState import androidx.compose.material3.Surface -import androidx.compose.material3.Text import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -24,7 +21,6 @@ import androidx.compose.ui.graphics.Shape import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.b1nd.dodam.designsystem.DodamTheme -import org.jetbrains.compose.ui.tooling.preview.Preview @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/NavigationBar.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/NavigationBar.kt index b7083b5..97140f1 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/NavigationBar.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/NavigationBar.kt @@ -20,9 +20,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable import androidx.compose.runtime.Stable import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalDensity @@ -33,8 +31,6 @@ import com.b1nd.dodam.designsystem.DodamTheme import com.b1nd.dodam.designsystem.animation.rememberBounceIndication import com.b1nd.dodam.designsystem.foundation.DodamIcons import kotlinx.collections.immutable.ImmutableList -import kotlinx.collections.immutable.toImmutableList -import org.jetbrains.compose.ui.tooling.preview.Preview @Composable fun DodamNavigationBar( diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/SegmentedButton.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/SegmentedButton.kt index 691cd4e..a11de4f 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/SegmentedButton.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/SegmentedButton.kt @@ -20,9 +20,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalDensity @@ -32,8 +30,6 @@ import androidx.compose.ui.util.fastForEach import com.b1nd.dodam.designsystem.DodamTheme import com.b1nd.dodam.designsystem.animation.rememberBounceIndication import kotlinx.collections.immutable.ImmutableList -import kotlinx.collections.immutable.toImmutableList -import org.jetbrains.compose.ui.tooling.preview.Preview @Composable fun DodamSegmentedButton( diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TabRow.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TabRow.kt index bea76a9..48c6708 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TabRow.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TabRow.kt @@ -6,11 +6,9 @@ import androidx.compose.foundation.background import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxWithConstraints -import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxHeight -import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.offset @@ -23,13 +21,11 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable import androidx.compose.runtime.getValue import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.geometry.Offset -import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp @@ -37,8 +33,6 @@ import androidx.compose.ui.util.fastForEach import com.b1nd.dodam.designsystem.DodamTheme import com.b1nd.dodam.designsystem.animation.rememberBounceIndication import kotlinx.collections.immutable.ImmutableList -import kotlinx.collections.immutable.toImmutableList -import org.jetbrains.compose.ui.tooling.preview.Preview @Composable fun DodamTabRow( diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TextButton.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TextButton.kt index 0567a9e..1c7440a 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TextButton.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TextButton.kt @@ -17,7 +17,6 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp import com.b1nd.dodam.designsystem.DodamTheme import com.b1nd.dodam.designsystem.animation.rememberBounceIndication -import org.jetbrains.compose.ui.tooling.preview.Preview @Composable fun DodamTextButton( diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TextField.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TextField.kt index 0f11cd3..7072ae9 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TextField.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TextField.kt @@ -1,42 +1,38 @@ package com.b1nd.dodam.designsystem.component import androidx.compose.animation.animateColorAsState -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.heightIn -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.text.BasicTextField -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.Stable -import androidx.compose.runtime.derivedStateOf -import androidx.compose.runtime.getValue -import androidx.compose.runtime.remember -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.text.lerp -import androidx.compose.ui.unit.dp import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.animateDp import androidx.compose.animation.core.updateTransition import androidx.compose.foundation.Image +import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable -import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.offset +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.text.BasicTextField import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.Stable +import androidx.compose.runtime.derivedStateOf +import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.draw.drawBehind import androidx.compose.ui.focus.FocusRequester @@ -47,18 +43,17 @@ import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.platform.LocalDensity -import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.input.VisualTransformation +import androidx.compose.ui.text.lerp +import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.toSize import com.b1nd.dodam.designsystem.DodamTheme import com.b1nd.dodam.designsystem.animation.rememberBounceIndication import com.b1nd.dodam.designsystem.foundation.DodamIcons import com.b1nd.dodam.designsystem.foundation.icons.rememberIcColoredExclamationMarkCircle -import org.jetbrains.compose.ui.tooling.preview.Preview sealed interface InputType { data object Default : InputType diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TimePicker.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TimePicker.kt index 4652aa6..0427666 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TimePicker.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TimePicker.kt @@ -19,7 +19,6 @@ import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.SheetState import androidx.compose.material3.Surface import androidx.compose.material3.Text @@ -29,9 +28,7 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf -import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember -import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -40,10 +37,7 @@ import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import com.b1nd.dodam.designsystem.DodamTheme -import com.b1nd.dodam.designsystem.DodamTheme.colors import kotlinx.collections.immutable.toImmutableList -import kotlinx.coroutines.launch -import org.jetbrains.compose.ui.tooling.preview.Preview @Composable fun DodamTimePickerDialog( diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TopAppBar.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TopAppBar.kt index 1ee46f7..d0445f2 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TopAppBar.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/component/TopAppBar.kt @@ -22,7 +22,6 @@ import com.b1nd.dodam.designsystem.DodamTheme import com.b1nd.dodam.designsystem.foundation.DodamIcons import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.persistentListOf -import org.jetbrains.compose.ui.tooling.preview.Preview @Stable enum class TopAppBarType { diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/foundation/DodamTypography.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/foundation/DodamTypography.kt index 9fd8437..45b609d 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/foundation/DodamTypography.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/foundation/DodamTypography.kt @@ -1,9 +1,7 @@ package com.b1nd.dodam.designsystem.foundation import androidx.compose.runtime.Composable -import androidx.compose.runtime.CompositionLocal import androidx.compose.runtime.Immutable -import androidx.compose.runtime.compositionLocalOf import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.text.TextStyle import com.b1nd.dodam.designsystem.tokens.TypographyTokens diff --git a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/tokens/TypographyTokens.kt b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/tokens/TypographyTokens.kt index 3b4fc6b..49fd652 100644 --- a/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/tokens/TypographyTokens.kt +++ b/dodam-design-system/src/commonMain/kotlin/com/b1nd/dodam/designsystem/tokens/TypographyTokens.kt @@ -1,7 +1,6 @@ package com.b1nd.dodam.designsystem.tokens import androidx.compose.runtime.Composable -import androidx.compose.ui.text.PlatformTextStyle import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.LineHeightStyle import androidx.compose.ui.unit.em diff --git a/dodam-design-system/src/iosMain/kotlin/com/b1nd/dodam/designsystem/component/DatePicker.ios.kt b/dodam-design-system/src/iosMain/kotlin/com/b1nd/dodam/designsystem/component/DatePicker.ios.kt index 7f0c7bf..b13db95 100644 --- a/dodam-design-system/src/iosMain/kotlin/com/b1nd/dodam/designsystem/component/DatePicker.ios.kt +++ b/dodam-design-system/src/iosMain/kotlin/com/b1nd/dodam/designsystem/component/DatePicker.ios.kt @@ -7,7 +7,6 @@ import kotlinx.cinterop.ExperimentalForeignApi import kotlinx.cinterop.ptr import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList -import kotlinx.datetime.Clock import kotlinx.datetime.DateTimeUnit import kotlinx.datetime.Instant import kotlinx.datetime.LocalDate @@ -21,15 +20,11 @@ import kotlinx.datetime.toInstant import kotlinx.datetime.toKotlinInstant import kotlinx.datetime.toLocalDateTime import kotlinx.datetime.until -import org.jetbrains.skia.skottie.LogLevel -import org.jetbrains.skia.skottie.Logger import platform.Foundation.NSCalendar import platform.Foundation.NSDate -import platform.Foundation.NSDateFormatter import platform.Foundation.NSLocale import platform.Foundation.currentLocale import platform.Foundation.now -import platform.Foundation.systemLocale import platform.darwin.OS_LOG_DEFAULT import platform.darwin.OS_LOG_TYPE_INFO import platform.darwin.__dso_handle diff --git a/dodam-design-system/src/main/java/com/b1nd/dodam/designsystem/component/DatePicker.android.kt b/dodam-design-system/src/main/java/com/b1nd/dodam/designsystem/component/DatePicker.android.kt index 66ee348..883e6e2 100644 --- a/dodam-design-system/src/main/java/com/b1nd/dodam/designsystem/component/DatePicker.android.kt +++ b/dodam-design-system/src/main/java/com/b1nd/dodam/designsystem/component/DatePicker.android.kt @@ -1,31 +1,16 @@ package com.b1nd.dodam.designsystem.component -import android.content.res.Configuration.UI_MODE_NIGHT_YES -import android.text.format.DateFormat -import androidx.annotation.RequiresApi -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.rememberModalBottomSheetState import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.ReadOnlyComposable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.rememberCoroutineScope -import androidx.compose.runtime.setValue import androidx.compose.ui.platform.LocalConfiguration -import com.b1nd.dodam.designsystem.DodamTheme import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList -import kotlinx.coroutines.launch import java.time.DayOfWeek import java.time.Instant import java.time.LocalDate import java.time.LocalTime import java.time.ZoneId import java.time.ZoneOffset -import java.time.format.DateTimeFormatter -import java.time.format.DecimalStyle import java.time.format.TextStyle import java.time.temporal.WeekFields import java.util.Locale From b8768f96f98cdc4d20466d2b0b7673cb16959501 Mon Sep 17 00:00:00 2001 From: 8954sood <8954sood@naver.com> Date: Mon, 23 Sep 2024 20:22:04 +0900 Subject: [PATCH 3/3] docs: Version Up to 1.0.7 --- README.md | 2 +- dodam-design-system/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8098567..3cad259 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![version](https://img.shields.io/badge/version-1.0.6-blue) +![version](https://img.shields.io/badge/version-1.0.7-blue) ## How to use? in your project diff --git a/dodam-design-system/build.gradle.kts b/dodam-design-system/build.gradle.kts index c9040a4..24303dc 100644 --- a/dodam-design-system/build.gradle.kts +++ b/dodam-design-system/build.gradle.kts @@ -80,7 +80,7 @@ mavenPublishing { coordinates( groupId = "com.b1nd.dodam", artifactId = "dodam-design-system", - version = "1.0.6" + version = "1.0.7" ) pom {