commit 4fb20f3960491e453f6a8563ec04803b16668b03
parent 01509d7a3d93fd61886687625397a417c1ee1b29
Author: Bohdan Potuzhnyi <bohdan.potuzhnyi@gmail.com>
Date: Thu, 24 Apr 2025 13:44:27 +0200
merchant-terminal making it more Taler like
Diffstat:
7 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/merchant-terminal/src/main/res/color/button_bottom.xml b/merchant-terminal/src/main/res/color/button_bottom.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="@color/bottomButtons" android:state_enabled="true" />
- <item android:alpha="0.12" android:color="?attr/colorOnSurface" />
+ <item android:color="@color/colorTertiary" android:state_enabled="true" />
+ <item android:alpha="0.12" android:color="@color/colorSecondaryContainer" />
</selector>
diff --git a/merchant-terminal/src/main/res/color/complete_button_bottom.xml b/merchant-terminal/src/main/res/color/complete_button_bottom.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="@color/colorPrimary" android:state_enabled="true" />
+ <item android:alpha="0.12" android:color="@color/colorSecondary" />
+</selector>
diff --git a/merchant-terminal/src/main/res/drawable/side_nav_bar.xml b/merchant-terminal/src/main/res/drawable/side_nav_bar.xml
@@ -1,9 +1,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
- android:angle="135"
- android:centerColor="@color/colorPrimaryDark"
- android:endColor="@color/colorPrimaryDark"
+ android:angle="-45"
+ android:endColor="@color/colorTertiary"
android:startColor="@color/colorPrimary"
android:type="linear" />
</shape>
\ No newline at end of file
diff --git a/merchant-terminal/src/main/res/layout/fragment_order.xml b/merchant-terminal/src/main/res/layout/fragment_order.xml
@@ -155,7 +155,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
- android:backgroundTint="@color/green"
+ android:backgroundTint="@color/complete_button_bottom"
android:text="@string/order_complete"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/merchant-terminal/src/main/res/values/colors.xml b/merchant-terminal/src/main/res/values/colors.xml
@@ -1,8 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="colorPrimary">#795548</color>
- <color name="colorPrimaryDark">#5D4037</color>
- <color name="colorAccent">#FFEB3B</color>
+<!-- Core colors -->
+<color name="colorPrimary">#0042b3</color>
+<color name="colorSecondary">#586a88</color>
+<color name="colorTertiary">#338af0</color>
+<color name="colorError">#b3261e</color>
+<color name="colorNeutral">#fdfdff</color>
+<color name="colorNeutralVariant">#e0e3ec</color>
- <color name="bottomButtons">#9E9D24</color>
+<!-- Extended colors -->
+<color name="colorOnPrimary">#ffffff</color>
+<color name="colorPrimaryContainer">#d3deff</color>
+<color name="colorOnPrimaryContainer">#00134a</color>
+<color name="colorInversePrimary">#afc6ff</color>
+
+<color name="colorOnSecondary">#ffffff</color>
+<color name="colorSecondaryContainer">#d8e3f9</color>
+<color name="colorOnSecondaryContainer">#111c2b</color>
+
+<color name="colorOnTertiary">#ffffff</color>
+<color name="colorTertiaryContainer">#d1e4ff</color>
+<color name="colorOnTertiaryContainer">#001c39</color>
+
+<color name="colorOnError">#ffffff</color>
+<color name="colorErrorContainer">#f9dedc</color>
+<color name="colorOnErrorContainer">#410e0b</color>
+
+<color name="colorOutline">#767880</color>
+<color name="colorOutlineVariant">#c4c6d0</color>
+
+<color name="colorBackground">#fdfdff</color>
+<color name="colorOnBackground">#1a1c1f</color>
+
+<color name="colorSurface">#fdfdff</color>
+<color name="colorOnSurface">#1c1b1f</color>
+<color name="colorOnSurfaceVariant">#45474f</color>
+<color name="colorSurfaceVariant">#e0e3ec</color>
+
+<color name="colorInverseOnSurface">#f4eff4</color>
+<color name="colorInverseSurface">#313033</color>
+
+<color name="colorSurfaceTint">#0042b3</color>
+
+<color name="colorShadow">#000000</color>
+<color name="colorScrim">#000000</color>
</resources>
diff --git a/merchant-terminal/src/main/res/values/strings.xml b/merchant-terminal/src/main/res/values/strings.xml
@@ -19,7 +19,7 @@
<string name="order_previous">Prev</string>
<string name="order_next">Next</string>
<string name="order_custom">Add custom product</string>
- <string name="order_complete">Complete</string>
+ <string name="order_complete">Complete order</string>
<string name="order_custom_product">Custom product name</string>
<string name="order_custom_product_default">Tip</string>
<string name="order_custom_add_button">Add</string>
diff --git a/merchant-terminal/src/main/res/values/styles.xml b/merchant-terminal/src/main/res/values/styles.xml
@@ -4,8 +4,8 @@
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorOnPrimary">@android:color/white</item>
- <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
- <item name="colorAccent">@color/colorAccent</item>
+ <item name="colorPrimaryDark">@color/colorInversePrimary</item>
+ <item name="colorAccent">@color/colorTertiary</item>
</style>
<style name="AppTheme.NoActionBar">
