Merge pull request #502 from mysteriumnetwork/feature/Dark-mode

Added dark mode
mysteriumnetwork · Dec 30, 2021 · 8e76597 · 8e76597
2 parents 3229efa + f4012b5
commit 8e76597
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 11 deletions.
diff --git a/...oid/app/src/main/java/updated/mysterium/vpn/ui/top/up/card/summary/CardSummaryActivity.kt b/...oid/app/src/main/java/updated/mysterium/vpn/ui/top/up/card/summary/CardSummaryActivity.kt
@@ -98,7 +98,7 @@ class CardSummaryActivity : BaseActivity() {
         binding.vatValueTextView.text = cardOrder.taxes.toString()
         binding.totalValueTextView.text = cardOrder.orderTotalAmount.toString()
 
-        val taxesPercent = cardOrder.orderTotalAmount / cardOrder.payAmount
+        val taxesPercent = cardOrder.taxes / cardOrder.orderTotalAmount * 100
         binding.vatTextView.text = getString(
             R.string.card_payment_vat_value, taxesPercent
         )

diff --git a/android/app/src/main/res/drawable-night/icon_currency_dropdown.xml b/android/app/src/main/res/drawable-night/icon_currency_dropdown.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10dp"
+    android:height="8dp"
+    android:viewportWidth="10"
+    android:viewportHeight="8">
+  <path
+      android:pathData="M4.2235,7.0378C4.6237,7.533 5.3787,7.533 5.7789,7.0378L9.747,2.1286C10.2756,1.4747 9.8101,0.5 8.9693,0.5H1.0331C0.1923,0.5 -0.2732,1.4747 0.2554,2.1286L4.2235,7.0378Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/android/app/src/main/res/drawable-night/shape_payment_button_disable.xml b/android/app/src/main/res/drawable-night/shape_payment_button_disable.xml
@@ -0,0 +1,5 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="100dp" />
+    <solid android:color="@color/card_payment_background" />
+</shape>
diff --git a/android/app/src/main/res/drawable/icon_currency_dropdown.xml b/android/app/src/main/res/drawable/icon_currency_dropdown.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10dp"
+    android:height="8dp"
+    android:viewportWidth="10"
+    android:viewportHeight="8">
+  <path
+      android:pathData="M4.2235,7.0378C4.6237,7.533 5.3787,7.533 5.7789,7.0378L9.747,2.1286C10.2756,1.4747 9.8101,0.5 8.9693,0.5H1.0331C0.1923,0.5 -0.2732,1.4747 0.2554,2.1286L4.2235,7.0378Z"
+      android:fillColor="#5A597D"/>
+</vector>
diff --git a/android/app/src/main/res/drawable/payment_button_background.xml b/android/app/src/main/res/drawable/payment_button_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/shape_primary_button_tapped" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_payment_button_disable" android:state_enabled="false" />
+    <item android:drawable="@drawable/shape_primary_button" />
+</selector>
diff --git a/android/app/src/main/res/drawable/shape_payment_button_disable.xml b/android/app/src/main/res/drawable/shape_payment_button_disable.xml
@@ -0,0 +1,5 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="100dp" />
+    <solid android:color="@color/top_up_unselected_state" />
+</shape>
diff --git a/android/app/src/main/res/drawable/spinner_countries_background.xml b/android/app/src/main/res/drawable/spinner_countries_background.xml
@@ -4,10 +4,10 @@
 
     <corners android:radius="10dp" />
 
-    <solid android:color="@color/top_up_unselected_state" />
+    <solid android:color="@color/card_payment_background" />
 
     <stroke
         android:width="1dp"
-        android:color="@color/manual_connect_divider_grey_blue" />
+        android:color="@color/card_payment_divider" />
 
 </shape>
diff --git a/android/app/src/main/res/layout/activity_card_currency.xml b/android/app/src/main/res/layout/activity_card_currency.xml
@@ -100,7 +100,6 @@
                     android:layout_marginHorizontal="@dimen/margin_padding_size_xlarge"
                     android:background="@drawable/spinner_countries_background"
                     android:dropDownWidth="match_parent"
-                    android:dropDownVerticalOffset="@dimen/margin_padding_size_xsmall"
                     android:gravity="center"
                     android:overlapAnchor="false"
                     android:popupBackground="@drawable/spinner_countries_background"
@@ -110,15 +109,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end|center"
-                    android:layout_marginEnd="@dimen/margin_padding_size_small_medium"
-                    android:src="@drawable/icon_drop_down_png"
+                    android:layout_marginHorizontal="@dimen/margin_padding_size_biggest"
+                    android:src="@drawable/icon_currency_dropdown"
                     tools:ignore="ContentDescription" />
 
             </FrameLayout>
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/confirmButton"
-                style="@style/Widget.PrimaryButton"
+                style="@style/Widget.Payment"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"

diff --git a/android/app/src/main/res/layout/activity_card_summary.xml b/android/app/src/main/res/layout/activity_card_summary.xml
@@ -100,7 +100,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginEnd="@dimen/margin_padding_size_xlarge"
-                android:textColor="@color/pop_up_title"
+                android:textColor="@color/card_payment_value"
                 app:layout_constraintBottom_toBottomOf="@+id/mystTextView"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/mystTextView"
@@ -114,7 +114,7 @@
                 android:layout_height="match_parent"
                 android:layout_marginStart="@dimen/margin_padding_size_xlarge"
                 android:layout_marginBottom="@dimen/margin_padding_size_small_medium"
-                android:textColor="@color/home_country_amount"
+                android:textColor="@color/card_payment_title"
                 app:layout_constraintBottom_toTopOf="@+id/divider3"
                 app:layout_constraintStart_toStartOf="parent"
                 tools:text="10 MYST Top-up" />
@@ -135,7 +135,7 @@
                 android:layout_height="match_parent"
                 android:layout_marginEnd="@dimen/margin_padding_size_xlarge"
                 android:text="-"
-                android:textColor="@color/pop_up_title"
+                android:textColor="@color/card_payment_value"
                 app:layout_constraintBottom_toBottomOf="@+id/vatTextView"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/vatTextView"
@@ -149,7 +149,7 @@
                 android:layout_marginStart="@dimen/margin_padding_size_xlarge"
                 android:layout_marginBottom="@dimen/margin_padding_size_small_medium"
                 android:text="@string/card_payment_vat_title"
-                android:textColor="@color/home_country_amount"
+                android:textColor="@color/card_payment_title"
                 app:layout_constraintBottom_toTopOf="@+id/divider2"
                 app:layout_constraintStart_toStartOf="parent" />
 
@@ -206,6 +206,7 @@
                 android:paddingHorizontal="@dimen/margin_padding_size_medium"
                 android:text="@string/card_payment_cardinity"
                 android:textAlignment="center"
+                android:textColor="@color/card_payment_description"
                 app:layout_constraintBottom_toTopOf="@+id/confirmButton"
                 app:layout_constraintEnd_toEndOf="@+id/confirmButton"
                 app:layout_constraintStart_toStartOf="@+id/confirmButton" />

diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml
@@ -18,6 +18,11 @@
     <color name="create_account_trial_button_text_tapped">#FFFFFF</color>
 
     <color name="top_up_unselected_state">#10FFFFFF</color>
+    <color name="card_payment_background">#60607B</color>
+    <color name="card_payment_divider">#30FFFFFF</color>
+    <color name="card_payment_title">#FFFFFF</color>
+    <color name="card_payment_value">#FFFFFF</color>
+    <color name="card_payment_description">#FFFFFF</color>
 
     <color name="manual_connect_list_background">#514D69</color>
     <color name="manual_connect_items_empty_background">#10FFFFFF</color>

diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
@@ -28,6 +28,11 @@
     <color name="create_account_trial_button_text_tapped">#503C3857</color>
 
     <color name="top_up_unselected_state">#F4F4FC</color>
+    <color name="card_payment_background">#F4F4FC</color>
+    <color name="card_payment_divider">#9090BB</color>
+    <color name="card_payment_title">#9090BB</color>
+    <color name="card_payment_value">#5A597D</color>
+    <color name="card_payment_description">#9090BB</color>
 
     <color name="manual_connect_items_empty_background">#F4F4FC</color>
     <color name="manual_connect_list_background">#FFFFFF</color>

diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
@@ -126,6 +126,17 @@
         <item name="android:textSize">18sp</item>
     </style>
 
+    <!--  Payment Button  -->
+    <style name="Widget.Payment" parent="Widget.MaterialComponents.Button">
+        <item name="android:textAppearance">@style/TextAppearance.PrimaryButton</item>
+        <item name="android:background">@drawable/payment_button_background</item>
+        <item name="android:foreground">@drawable/ripple_rounded_effect</item>
+        <item name="android:textColor">@color/primary_text_color</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:paddingStart">@dimen/margin_padding_size_medium</item>
+        <item name="android:paddingEnd">@dimen/margin_padding_size_medium</item>
+    </style>
+
     <!--  NegativeButton  -->
     <style name="Widget.NegativeButton" parent="Widget.MaterialComponents.Button">
         <item name="android:textAppearance">@style/TextAppearance.NegativeButton</item>