refac (*) icons

Author: alekshawtf

processor/src/main/kotlin/kotli/template/multiplatform/compose/userflow/common/component/image/coil/CoilProcessor.kt

@@ -47,7 +47,7 @@ object CoilProcessor : BaseFeatureProcessor() {
         state.onApplyRules(
             Rules.PresentationComponentIcon,
             RemoveMarkedBlock("{userflow.coil}"),
-            RemoveMarkedLine("UrlModel"),
+            RemoveMarkedLine("DsIconModel.Url"),
             RemoveMarkedLine("coil"),
         )
 

template/app/src/commonMain/kotlin/kotli/app/auth/common/presentation/AuthButton.kt

@@ -5,7 +5,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import org.jetbrains.compose.resources.DrawableResource
 import shared.presentation.ui.component.DsOutlinedButton
-import shared.presentation.ui.icon.DrawableResourceModel
+import shared.presentation.ui.icon.DsIconModel
 
 @Composable
 fun AuthButton(
@@ -16,7 +16,7 @@ fun AuthButton(
 ) {
     DsOutlinedButton(
         modifier = modifier,
-        icon = DrawableResourceModel(icon),
+        icon = DsIconModel.DrawableResource(icon),
         iconTint = Color.Unspecified,
         onClick = onClick,
         text = text

template/app/src/commonMain/kotlin/kotli/app/auth/signin/email/presentation/SignInWithEmailButton.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import org.jetbrains.compose.resources.stringResource
 import shared.presentation.ui.component.DsOutlinedButton
-import shared.presentation.ui.icon.DrawableResourceModel
+import shared.presentation.ui.icon.DsIconModel
 import template.app.generated.resources.Res
 import template.app.generated.resources.auth_email
 import template.app.generated.resources.auth_sign_in_email
@@ -16,8 +16,8 @@ fun SignInWithEmailButton(
 ) {
     DsOutlinedButton(
         modifier = modifier,
-        icon = DrawableResourceModel(Res.drawable.auth_email),
+        icon = DsIconModel.DrawableResource(Res.drawable.auth_email),
+        text = stringResource(Res.string.auth_sign_in_email),
         onClick = onClick,
-        text = stringResource(Res.string.auth_sign_in_email)
     )
 }

template/app/src/commonMain/kotlin/kotli/app/showcases/presentation/userflow/common/component/image/coil/CoilScreen.kt

@@ -13,7 +13,7 @@ import androidx.compose.ui.unit.dp
 import kotli.app.showcases.presentation.ShowcaseHintBlock
 import shared.presentation.ui.component.DsIcon
 import shared.presentation.ui.container.DsFixedTopBarLazyColumn
-import shared.presentation.ui.icon.UrlModel
+import shared.presentation.ui.icon.DsIconModel
 import shared.presentation.ui.theme.DsTheme
 import kotlin.random.Random
 
@@ -43,7 +43,7 @@ fun CoilScreen(onBack: () -> Unit) {
                                 .padding(8.dp)
                                 .clip(RoundedCornerShape(Random.nextInt(50)))
                                 .background(DsTheme.current.highlightPrimary),
-                            model = UrlModel("https://picsum.photos/id/${idx + 1}/200/300")
+                            model = DsIconModel.Url("https://picsum.photos/id/${idx + 1}/200/300")
                         )
                     }
                 }

template/shared/presentation/src/commonMain/kotlin/shared/presentation/ui/component/DsIcon.kt

@@ -14,11 +14,6 @@ import androidx.compose.ui.unit.Dp
 import coil3.compose.rememberAsyncImagePainter
 import org.jetbrains.compose.resources.painterResource
 import shared.presentation.ui.icon.DsIconModel
-import shared.presentation.ui.icon.ColorModel
-import shared.presentation.ui.icon.DrawableResourceModel
-import shared.presentation.ui.icon.ImageVectorModel
-import shared.presentation.ui.icon.PainterModel
-import shared.presentation.ui.icon.UrlModel
 
 @Composable
 fun DsIcon(
@@ -28,11 +23,11 @@ fun DsIcon(
     model: DsIconModel?
 ) {
     when (model) {
-        is UrlModel -> DsIcon(modifier, size, model)
-        is ColorModel -> DsIcon(modifier, size, model)
-        is PainterModel -> DsIcon(modifier, tint, size, model)
-        is ImageVectorModel -> DsIcon(modifier, tint, size, model)
-        is DrawableResourceModel -> DsIcon(modifier, tint, size, model)
+        is DsIconModel.Url -> DsIcon(modifier, size, model)
+        is DsIconModel.Color -> DsIcon(modifier, size, model)
+        is DsIconModel.Painter -> DsIcon(modifier, tint, size, model)
+        is DsIconModel.ImageVector -> DsIcon(modifier, tint, size, model)
+        is DsIconModel.DrawableResource -> DsIcon(modifier, tint, size, model)
         else -> Box(modifier = modifier.size(size).background(tint))
     }
 }
@@ -43,7 +38,7 @@ private fun DsIcon(
     modifier: Modifier = Modifier,
     tint: Color = LocalContentColor.current,
     size: Dp = Dp.Unspecified,
-    model: PainterModel
+    model: DsIconModel.Painter
 ) {
     Icon(
         modifier = modifier.size(size),
@@ -59,7 +54,7 @@ private fun DsIcon(
 private fun DsIcon(
     modifier: Modifier = Modifier,
     size: Dp = Dp.Unspecified,
-    model: UrlModel
+    model: DsIconModel.Url
 ) {
     Image(
         painter = rememberAsyncImagePainter(model.value),
@@ -75,7 +70,7 @@ private fun DsIcon(
     modifier: Modifier = Modifier,
     tint: Color = LocalContentColor.current,
     size: Dp = Dp.Unspecified,
-    model: ImageVectorModel
+    model: DsIconModel.ImageVector
 ) {
     Icon(
         modifier = modifier.size(size),
@@ -91,7 +86,7 @@ private fun DsIcon(
     modifier: Modifier = Modifier,
     tint: Color = LocalContentColor.current,
     size: Dp = Dp.Unspecified,
-    model: DrawableResourceModel
+    model: DsIconModel.DrawableResource
 ) {
     Icon(
         modifier = modifier.size(size),
@@ -106,7 +101,7 @@ private fun DsIcon(
 private fun DsIcon(
     modifier: Modifier = Modifier,
     size: Dp = Dp.Unspecified,
-    model: ColorModel
+    model: DsIconModel.Color
 ) {
     Box(
         modifier = modifier

template/shared/presentation/src/commonMain/kotlin/shared/presentation/ui/component/DsSpacer.kt

@@ -74,6 +74,5 @@ fun DsSpacerDynamic(modifier: Modifier = Modifier, heightState: State<Int>) {
     Spacer(
         modifier
             .height(with(LocalDensity.current) { heightState.value.toDp() })
-            .fillMaxWidth()
     )
 }

template/shared/presentation/src/commonMain/kotlin/shared/presentation/ui/container/DsFixedTopBar.kt

@@ -16,10 +16,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.NonRestartableComposable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import shared.presentation.ui.theme.DsTheme
 import shared.presentation.ui.component.DsActionButton
 import shared.presentation.ui.component.DsSpacerStatusBar
 import shared.presentation.ui.icon.DsIcons
+import shared.presentation.ui.theme.DsTheme
 
 @Composable
 @NonRestartableComposable
@@ -61,14 +61,15 @@ fun DsFixedTopBarColumn(
 @Composable
 @NonRestartableComposable
 fun DsFixedTopBarLazyColumn(
+    modifier: Modifier = Modifier.imePadding(),
     title: String? = null,
     onBack: (() -> Unit)? = null,
     actions: @Composable RowScope.() -> Unit = {},
     footer: @Composable (ColumnScope.() -> Unit)? = null,
     content: LazyListScope.() -> Unit
 ) {
     DsFixedHeaderFooterLazyColumn(
-        modifier = Modifier.fillMaxSize(),
+        modifier = modifier,
         appearance = DsFixedHeaderFooterAppearance.default(
             footerBrush = null
         ),

template/shared/presentation/src/commonMain/kotlin/shared/presentation/ui/icon/DsIconModel.kt

@@ -2,23 +2,19 @@ package shared.presentation.ui.icon
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.graphics.vector.ImageVector
-import org.jetbrains.compose.resources.DrawableResource
+import androidx.compose.ui.graphics.Color as UiColor
+import androidx.compose.ui.graphics.painter.Painter as UiPainter
+import androidx.compose.ui.graphics.vector.ImageVector as UiImageVector
+import org.jetbrains.compose.resources.DrawableResource as UiDrawableResource
 
 @Immutable
-sealed class DsIconModel
-
-data class ColorModel(val value: Color) : DsIconModel()
-
-data class UrlModel(val value: String?) : DsIconModel()
-
-data class ImageVectorModel(val value: ImageVector) : DsIconModel()
-
-data class DrawableResourceModel(val value: DrawableResource) : DsIconModel()
-
-data class PainterModel(val value: @Composable () -> Painter) : DsIconModel()
-
+sealed class DsIconModel {
+
+    data class DrawableResource(val value: UiDrawableResource) : DsIconModel()
+    data class Painter(val value: @Composable () -> UiPainter) : DsIconModel()
+    data class ImageVector(val value: UiImageVector) : DsIconModel()
+    data class Color(val value: UiColor) : DsIconModel()
+    data class Url(val value: String?) : DsIconModel()
+}
 
 

template/shared/presentation/src/commonMain/kotlin/shared/presentation/ui/icon/DsIcons.kt

@@ -17,27 +17,27 @@ import template.shared.presentation.generated.resources.ic_wine_bar
 object DsIcons {
 
     val info: DsIconModel
-        get() = DrawableResourceModel(Res.drawable.ic_info)
+        get() = DsIconModel.DrawableResource(Res.drawable.ic_info)
     val cancel: DsIconModel
-        get() = DrawableResourceModel(Res.drawable.ic_cancel)
+        get() = DsIconModel.DrawableResource(Res.drawable.ic_cancel)
     val arrowBack: DsIconModel
-        get() = DrawableResourceModel(Res.drawable.ic_arrow_back)
+        get() = DsIconModel.DrawableResource(Res.drawable.ic_arrow_back)
     val chevronRight: DsIconModel
-        get() = DrawableResourceModel(Res.drawable.ic_chevron_right)
+        get() = DsIconModel.DrawableResource(Res.drawable.ic_chevron_right)
     val lightMode: DsIconModel
-        get() = DrawableResourceModel(Res.drawable.ic_light_mode)
+        get() = DsIconModel.DrawableResource(Res.drawable.ic_light_mode)
     val darkMode: DsIconModel
-        get() = DrawableResourceModel(Res.drawable.ic_dark_mode)
+        get() = DsIconModel.DrawableResource(Res.drawable.ic_dark_mode)
     val school: DsIconModel
-        get() = DrawableResourceModel(Res.drawable.ic_school)
+        get() = DsIconModel.DrawableResource(Res.drawable.ic_school)
     val coffee: DsIconModel
-        get() = DrawableResourceModel(Res.drawable.ic_coffee)
+        get() = DsIconModel.DrawableResource(Res.drawable.ic_coffee)
     val wineBar: DsIconModel
-        get() = DrawableResourceModel(Res.drawable.ic_wine_bar)
+        get() = DsIconModel.DrawableResource(Res.drawable.ic_wine_bar)
     val localDrink: DsIconModel
-        get() = DrawableResourceModel(Res.drawable.ic_local_drink)
+        get() = DsIconModel.DrawableResource(Res.drawable.ic_local_drink)
     val delete: DsIconModel
-        get() = DrawableResourceModel(Res.drawable.ic_delete)
+        get() = DsIconModel.DrawableResource(Res.drawable.ic_delete)
     val backspace: DsIconModel
-        get() = DrawableResourceModel(Res.drawable.ic_backspace)
+        get() = DsIconModel.DrawableResource(Res.drawable.ic_backspace)
 }