Merge pull request #551 from mysteriumnetwork/bugfix/payment_banner_c…

…olor Fixed design of payment balance limit banner
mysteriumnetwork · Mar 29, 2022 · 17cf97a · 17cf97a
2 parents e75eed2 + a36d79d
commit 17cf97a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/android/app/src/main/res/drawable/icon_close_payment_banner.xml b/android/app/src/main/res/drawable/icon_close_payment_banner.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="30">
   <path
       android:pathData="M15,15m-15,0a15,15 0,1 1,30 0a15,15 0,1 1,-30 0"
-      android:fillColor="@color/onboarding_title_dark_blue"/>
+      android:fillColor="@color/payment_banner_icon_background"/>
   <path
       android:pathData="M20.5706,11.2752L18.7239,9.4285L14.9992,13.1532L11.2744,9.4285L9.4277,11.2752L13.1525,14.9999L9.4277,18.7246L11.2744,20.5713L14.9992,16.8466L18.7239,20.5713L20.5706,18.7246L16.8458,14.9999L20.5706,11.2752Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/payment_banner_icon_color"/>
 </vector>
diff --git a/android/app/src/main/res/layout/activity_card_summary.xml b/android/app/src/main/res/layout/activity_card_summary.xml
@@ -52,16 +52,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <include
-        android:id="@+id/paymentProcessingLayout"
-        layout="@layout/item_payment_processing_banner"
-        app:layout_constraintBottom_toTopOf="parent" />
-
-    <include
-        android:id="@+id/paymentBalanceLimitLayout"
-        layout="@layout/item_payment_balance_limit_banner"
-        app:layout_constraintBottom_toTopOf="parent" />
-
     <com.airbnb.lottie.LottieAnimationView
         android:layout_width="wrap_content"
         android:layout_height="0dp"
@@ -74,6 +64,16 @@
         app:lottie_loop="false"
         app:lottie_rawRes="@raw/choose_country_animation" />
 
+    <include
+        android:id="@+id/paymentProcessingLayout"
+        layout="@layout/item_payment_processing_banner"
+        app:layout_constraintBottom_toTopOf="parent" />
+
+    <include
+        android:id="@+id/paymentBalanceLimitLayout"
+        layout="@layout/item_payment_balance_limit_banner"
+        app:layout_constraintBottom_toTopOf="parent" />
+
     <TextView
         android:id="@+id/descriptionTextView"
         style="@style/TextAppearance.Headline"

diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
@@ -81,11 +81,14 @@
     <color name="pop_up_password_hint">#503C3857</color>
     <color name="pop_up_negative_button_text">#B33C3857</color>
 
+    <color name="payment_banner_icon_background">#3C3857</color>
+    <color name="payment_banner_icon_color">#ffffff</color>
+
     <color name="payment_processing_card_shadow">#1A704C60</color>
     <color name="payment_processing_icon_color">#FF8440</color>
     <color name="payment_processing_card_color">#33FF8440</color>
 
     <color name="payment_balance_limit_card_shadow">#1A704C60</color>
     <color name="payment_balance_limit_icon_color">#ED5BAC</color>
-    <color name="payment_balance_limit_card_color">#33ED5BAC</color>
+    <color name="payment_balance_limit_card_color">#B3ED5BAC</color>
 </resources>