Skip to content

Commit 2f9b7b7

Browse files
authored
Merge pull request #14729 from woocommerce/feat/WOOMOB-1156-pos-order-list-design-ui
[POS Historical Orders] Orders List UI
2 parents a4105ff + be5cb03 commit 2f9b7b7

File tree

7 files changed

+447
-81
lines changed

7 files changed

+447
-81
lines changed

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/common/composeui/designsystem/WooPosTheme.kt

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@ data class CustomColors(
2828
val onSurfaceVariantLowest: Color,
2929
val onSurfaceVariantHighest: Color,
3030

31+
val infoLowest: Color,
32+
val onInfoLowest: Color,
33+
34+
val errorLowest: Color,
35+
val onErrorLowest: Color,
36+
37+
val default: Color,
38+
val onDefault: Color,
39+
3140
val tertiaryIconColor: Color,
3241

3342
val transparent: Color = Color.Transparent,
@@ -40,8 +49,11 @@ private object WooPosColors {
4049
val WooPurple50 = Color(0xFF720EEC)
4150
val WooPurple80 = Color(0xFF3C087E)
4251

52+
val WooRed0 = Color(0xFFF7EBEC)
53+
val WooRed10 = Color(0xFFFFABAF)
4354
val WooRed50 = Color(0xFFD63638)
4455
val WooRed30 = Color(0xFFF86368)
56+
val WooRed80 = Color(0xFF691C1C)
4557

4658
val White = Color(0xFFFFFFFF)
4759
val Black = Color(0xFF000000)
@@ -62,6 +74,10 @@ private object WooPosColors {
6274
val Gray80 = Color(0xFF373A3E)
6375
val Gray90 = Color(0xFF1D2327)
6476
val Gray100 = Color(0xFF101517)
77+
78+
val Blue10 = Color(0xFFD6DDF9)
79+
val Blue20 = Color(0xFFADBAF3)
80+
val Blue80 = Color(0xFF1F3286)
6581
}
6682

6783
private val LightColorScheme = lightColorScheme(
@@ -141,7 +157,16 @@ private val LightCustomColors = CustomColors(
141157
onSurfaceVariantLowest = WooPosColors.Gray30,
142158
onSurfaceVariantHighest = WooPosColors.Gray60,
143159

144-
tertiaryIconColor = WooPosColors.WooPurple80,
160+
infoLowest = WooPosColors.Blue10,
161+
errorLowest = WooPosColors.WooRed0,
162+
163+
default = WooPosColors.Gray5,
164+
onDefault = WooPosColors.Gray100,
165+
166+
onInfoLowest = WooPosColors.Blue80,
167+
onErrorLowest = WooPosColors.WooRed80,
168+
169+
tertiaryIconColor = WooPosColors.WooPurple80
145170
)
146171

147172
private val DarkCustomColors = CustomColors(
@@ -157,7 +182,16 @@ private val DarkCustomColors = CustomColors(
157182
onSurfaceVariantLowest = WooPosColors.Gray50,
158183
onSurfaceVariantHighest = WooPosColors.Gray20,
159184

160-
tertiaryIconColor = WooPosColors.WooPurple50,
185+
infoLowest = WooPosColors.Blue20,
186+
errorLowest = WooPosColors.WooRed10,
187+
188+
default = WooPosColors.Gray5,
189+
onDefault = WooPosColors.Gray100,
190+
191+
onInfoLowest = WooPosColors.Blue80,
192+
onErrorLowest = WooPosColors.WooRed80,
193+
194+
tertiaryIconColor = WooPosColors.WooPurple50
161195
)
162196

163197
@Composable

0 commit comments

Comments
 (0)