refactor(theme): consolidate design system, remove legacy theme

Author: bmc08gt

apps/flipcash/shared/theme/src/main/kotlin/com/flipcash/app/theme/FlipcashPreview.kt

@@ -9,18 +9,15 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.tooling.preview.PreviewWrapper
 import androidx.compose.ui.tooling.preview.PreviewWrapperProvider
 import com.getcode.animation.LocalSharedTransitionScope
 import com.flipcash.app.theme.internal.Flipcash2DesignSystem
-import com.flipcash.app.theme.internal.FlipcashLegacyDesignSystem
 import com.getcode.theme.CodeTheme
 
 @Deprecated("Use FlipcashThemeWrapper")
 @Composable
 fun FlipcashPreview(
     showBackground: Boolean = false,
-    useLegacyColors: Boolean = false,
     content: @Composable () -> Unit
 ) {
     val previewContent = @Composable {
@@ -39,11 +36,7 @@ fun FlipcashPreview(
         }
     }
 
-    if (useLegacyColors) {
-        FlipcashLegacyDesignSystem(previewContent)
-    } else {
-        Flipcash2DesignSystem(previewContent)
-    }
+    Flipcash2DesignSystem(previewContent)
 }
 
 class FlipcashThemeWrapper: PreviewWrapperProvider {

apps/flipcash/shared/theme/src/main/kotlin/com/flipcash/app/theme/FlipcashTheme.kt

@@ -2,16 +2,10 @@ package com.flipcash.app.theme
 
 import androidx.compose.runtime.Composable
 import com.flipcash.app.theme.internal.Flipcash2DesignSystem
-import com.flipcash.app.theme.internal.FlipcashLegacyDesignSystem
 
 @Composable
 fun FlipcashTheme(
-    useLegacyColors: Boolean = false,
     content: @Composable () -> Unit,
 ) {
-    if (useLegacyColors) {
-        FlipcashLegacyDesignSystem(content)
-    } else {
-        Flipcash2DesignSystem(content)
-    }
+    Flipcash2DesignSystem(content)
 }

…/theme/internal/Flipcash2DesignSystem.kt …p/theme/internal/FlipcashDesignSystem.ktapps/flipcash/shared/theme/src/main/kotlin/com/flipcash/app/theme/internal/Flipcash2DesignSystem.kt renamed to apps/flipcash/shared/theme/src/main/kotlin/com/flipcash/app/theme/internal/FlipcashDesignSystem.kt apps/flipcash/shared/theme/src/main/kotlin/com/flipcash/app/theme/internal/Flipcash2DesignSystem.kt renamed to apps/flipcash/shared/theme/src/main/kotlin/com/flipcash/app/theme/internal/FlipcashDesignSystem.kt

@@ -52,6 +52,14 @@ object Flipcash2ColorSpec {
         borderColor = null,
         borderWidth = 0f,
     )
+    val contactAvatar = GradientSpec(
+        background = Color.Black,
+        colors = listOf(
+            Color(0xFF414141),
+            Color(0xFF202020)
+        ),
+        stops = listOf(0f, 1f)
+    )
 }
 
 private val colors = with(Flipcash2ColorSpec) {
@@ -94,7 +102,8 @@ private val colors = with(Flipcash2ColorSpec) {
         bannerWarning = Warning,
         bannerSuccess = BannerSuccess,
         scrim = Black40,
-        accessKey = accessKey
+        accessKey = accessKey,
+        contactAvatar = contactAvatar,
     )
 }
 @Composable

apps/flipcash/shared/theme/src/main/kotlin/com/flipcash/app/theme/internal/FlipcashLegacyDesignSystem.kt

@@ -68,6 +68,15 @@ val CodeAccessKey = GradientSpec(
     stops = listOf(0f, 0.3f, 0.6f, 1f)
 )
 
+val CodeContactAvatar = GradientSpec(
+    background = Brand,
+    colors = listOf(
+        Color(0xFF4A5568),
+        Color(0xFF6B7A90),
+    ),
+    stops = listOf(0f, 1f)
+)
+
 data class GradientSpec(
     val background: Color,
     val colors: List<Color>,

ui/theme/src/main/kotlin/com/getcode/theme/Color.kt

@@ -58,6 +58,7 @@ internal val CodeDefaultColorScheme = ColorScheme(
     bannerSuccess = BannerSuccess,
     scrim = Black40,
     accessKey = CodeAccessKey,
+    contactAvatar = CodeContactAvatar,
 )
 
 @Composable
@@ -148,6 +149,7 @@ class ColorScheme(
     bannerSuccess: Color,
     scrim: Color,
     accessKey: GradientSpec,
+    contactAvatar: GradientSpec,
 ) {
     var brand by mutableStateOf(brand)
         private set
@@ -230,6 +232,8 @@ class ColorScheme(
 
     var accessKey by mutableStateOf(accessKey)
         private set
+    var contactAvatar by mutableStateOf(contactAvatar)
+        private set
 
 
     fun update(other: ColorScheme) {
@@ -272,6 +276,7 @@ class ColorScheme(
         bannerSuccess = other.bannerSuccess
         scrim = other.scrim
         accessKey = other.accessKey
+        contactAvatar = other.contactAvatar
     }
 
     fun copy(): ColorScheme = ColorScheme(
@@ -314,6 +319,7 @@ class ColorScheme(
         bannerSuccess = bannerSuccess,
         scrim = scrim,
         accessKey = accessKey,
+        contactAvatar = contactAvatar,
     )
 }
 
@@ -361,7 +367,7 @@ fun inputColors(
     borderColor: Color = CodeTheme.colors.border,
     unfocusedBorderColor: Color = borderColor,
     backgroundColor: Color = White05,
-    placeholderColor: Color = CodeTheme.colors.textTertiary,
+    placeholderColor: Color = CodeTheme.colors.textSecondary,
     cursorColor: Color = Color.White,
     errorBorderColor: Color = CodeTheme.colors.error,
 ) = TextFieldDefaults.outlinedTextFieldColors(