Merge pull request #663

Components part2

Author: TorinAsakura

mobile/kmp/gradle/libs.versions.toml

@@ -1,13 +1,17 @@
 [versions]
+calendar = "2.9.0"
 kotlin = "2.2.0"
 ktor = "3.3.1"
 compose = "1.10.0-rc02"
 composeShadow = "2.0.4"
 coilCompose = "3.3.0"
+kotlinxDatetime = "0.6.1"
 agp = "8.9.0"
 androidx-activityCompose = "1.9.3"
 
 [libraries]
+compose-calendar = { module = "com.kizitonwose.calendar:compose-multiplatform", version.ref = "calendar" }
+kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
 compose-shadow = { module = "com.adamglin:compose-shadow", version.ref = "composeShadow" }
 coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coilCompose" }

mobile/kmp/sample/src/commonMain/kotlin/com/atls/hyperion/sample/App.kt

@@ -9,7 +9,11 @@ import com.atls.hyperion.ui.components.card.stories.CardStory
 import com.atls.hyperion.ui.components.checkbox.stories.CheckboxStory
 import com.atls.hyperion.ui.components.divider.stories.DividerStory
 import com.atls.hyperion.ui.components.input.stories.InputStory
+import com.atls.hyperion.ui.components.modal.bottom.stories.BottomDialogStory
+import com.atls.hyperion.ui.components.modal.popup.stories.PopupStory
 import com.atls.hyperion.ui.components.switch.stories.SwitchStory
+import com.atls.hyperion.ui.fragment.datepicker.stories.DatePickerStory
+import com.atls.hyperion.ui.fragment.datepicker.stories.DateRangePickerStory
 import com.atls.hyperion.ui.primitives.stories.LinkStory
 import com.atls.hyperion.ui.primitives.stories.TextStory
 
@@ -19,10 +23,14 @@ fun App() {
         Storybook(
             components = listOf(
                 AvatarStory(),
+                BottomDialogStory(),
                 ButtonStory(),
                 CheckboxStory(),
+                DatePickerStory(),
+                DateRangePickerStory(),
                 DividerStory(),
                 InputStory(),
+                PopupStory(),
                 SwitchStory(),
                 CardStory(),
                 TextStory(),

mobile/kmp/storybook/src/commonMain/kotlin/com/atls/hyperion/storybook/shared/ui/ComponentVariants.kt

@@ -3,8 +3,10 @@ package com.atls.hyperion.storybook.shared.ui
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Divider
@@ -55,6 +57,7 @@ fun <A, S> ComponentVariants(
                             fontSize = FontSize.small,
                             modifier = Modifier.padding(top = Padding.tiny)
                         )
+                        Spacer(Modifier.width(Padding.small))
                         content(appearanceProvider(), shapeProvider())
                     }
                     Divider()

mobile/kmp/ui/build.gradle.kts

@@ -34,12 +34,15 @@ kotlin {
             implementation(compose.runtime)
             implementation(compose.foundation)
             implementation(compose.material)
+            implementation(compose.material3)
             implementation(compose.ui)
             implementation(compose.components.resources)
             implementation(compose.components.uiToolingPreview)
             implementation(libs.compose.shadow)
             implementation(libs.coil.compose)
             implementation(libs.coil.network.ktor)
+            implementation(libs.compose.calendar)
+            api(libs.kotlinx.datetime)
         }
 
         androidMain {

mobile/kmp/ui/src/commonMain/composeResources/drawable/chevron_left.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M18.325,6.175C18.781,6.63 18.781,7.369 18.325,7.825L12.15,14L18.325,20.175C18.781,20.63 18.781,21.369 18.325,21.825C17.869,22.28 17.131,22.28 16.675,21.825L9.675,14.825C9.219,14.369 9.219,13.63 9.675,13.175L16.675,6.175C17.131,5.719 17.869,5.719 18.325,6.175Z"
+      android:fillColor="#18181B"
+      android:fillType="evenOdd"/>
+</vector>

mobile/kmp/ui/src/commonMain/composeResources/drawable/chevron_right.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M8.293,5.293C8.683,4.902 9.317,4.902 9.707,5.293L15.707,11.293C16.098,11.683 16.098,12.317 15.707,12.707L9.707,18.707C9.317,19.098 8.683,19.098 8.293,18.707C7.902,18.317 7.902,17.683 8.293,17.293L13.586,12L8.293,6.707C7.902,6.317 7.902,5.683 8.293,5.293Z"
+      android:fillColor="#18181B"
+      android:fillType="evenOdd"/>
+</vector>

mobile/kmp/ui/src/commonMain/kotlin/com/atls/hyperion/ui/components/button/Layout.kt

@@ -23,7 +23,7 @@ import com.atls.hyperion.ui.components.button.styles.appearance.Colors
 import com.atls.hyperion.ui.components.button.styles.shape.ButtonShape
 import com.atls.hyperion.ui.shared.addon.AddonPosition
 import com.atls.hyperion.ui.shared.addon.AddonSlotManager
-import com.atls.hyperion.ui.theme.tokens.Elevation
+import com.atls.hyperion.ui.theme.tokens.layout.Elevation
 import com.atls.hyperion.ui.theme.tokens.colors.Colors as ThemeColors
 
 @OptIn(ExperimentalMaterialApi::class)

mobile/kmp/ui/src/commonMain/kotlin/com/atls/hyperion/ui/components/button/styles/appearance/Appearance.kt

@@ -2,7 +2,7 @@ package com.atls.hyperion.ui.components.button.styles.appearance
 
 import androidx.compose.ui.unit.Dp
 import com.atls.hyperion.ui.components.button.state.ButtonState
-import com.atls.hyperion.ui.theme.tokens.Elevation
+import com.atls.hyperion.ui.theme.tokens.layout.Elevation
 
 data class ButtonAppearance(
     val default: Colors,

mobile/kmp/ui/src/commonMain/kotlin/com/atls/hyperion/ui/components/card/style/appearance/Appearance.kt

@@ -2,7 +2,7 @@ package com.atls.hyperion.ui.components.card.style.appearance
 
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
-import com.atls.hyperion.ui.theme.tokens.Elevation
+import com.atls.hyperion.ui.theme.tokens.layout.Elevation
 import com.atls.hyperion.ui.theme.tokens.colors.Colors as ThemeColors
 
 data class CardAppearance(

mobile/kmp/ui/src/commonMain/kotlin/com/atls/hyperion/ui/components/checkbox/Component.kt

@@ -16,7 +16,7 @@ import com.atls.hyperion.ui.components.checkbox.locals.LocalState
 import com.atls.hyperion.ui.components.checkbox.state.State
 import com.atls.hyperion.ui.components.checkbox.styles.appearance.CheckboxAppearance
 import com.atls.hyperion.ui.components.checkbox.styles.shape.CheckboxShape
-import com.atls.hyperion.ui.primitives.Icon
+import com.atls.hyperion.ui.primitives.icon.Icon
 import com.atls.hyperion.ui.theme.tokens.layout.Weight
 
 @Composable