From dc24e985fe66f82dc9a713ea571fbc568e82b344 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 21 Jun 2018 22:58:50 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .idea/caches/build_file_checksums.ser        | Bin 536 -> 536 bytes
 app/src/main/res/drawable/rounded_shape.xml  |   2 +-
 app/src/main/res/layout/fr_loaded_wallet.xml |  99 ++++++++++++-------
 app/src/main/res/values/colors.xml           |  19 ++--
 app/src/main/res/values/styles.xml           |   2 +-
 5 files changed, 73 insertions(+), 49 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 96dd881085d26da2be48544055191bd34b2fecb8..0a9a997b0ba35fd1249fe4e00b8005cf4cfca263 100644
GIT binary patch
delta 15
XcmbQiGJ|Ep3>GEf1!5cL)Gz`7D6a(?

delta 15
XcmbQiGJ|Ep3>I-ihQ%A_)Gz`7C@KXS

diff --git a/app/src/main/res/drawable/rounded_shape.xml b/app/src/main/res/drawable/rounded_shape.xml
index c1d49517de..c287465b5a 100644
--- a/app/src/main/res/drawable/rounded_shape.xml
+++ b/app/src/main/res/drawable/rounded_shape.xml
@@ -3,7 +3,7 @@
     android:shape="rectangle">
 
     <solid
-        android:color="@color/colorAccent">
+        android:color="@color/colorPrimary">
     </solid>
 
     <corners
diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml
index 8854f6064e..e14e7a07c1 100644
--- a/app/src/main/res/layout/fr_loaded_wallet.xml
+++ b/app/src/main/res/layout/fr_loaded_wallet.xml
@@ -29,11 +29,11 @@
             android:layout_height="match_parent">
 
             <LinearLayout
-                android:gravity="center"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="false"
                 android:background="@color/white"
+                android:gravity="center"
                 android:orientation="vertical">
 
                 <TextView
@@ -53,21 +53,52 @@
                     android:layout_width="325dp"
                     android:layout_height="0dp"
                     android:layout_weight="1"
-                    android:src="@drawable/tangem_card_2"
-                    />
+                    android:src="@drawable/tangem_card_2"/>
 
-                <ImageView
-                    android:visibility="gone"
-                    android:id="@+id/imgBlockchain"
-                    android:layout_width="32dp"
-                    android:layout_height="32dp"
-                    android:src="@drawable/tangem_logo_small_new"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginEnd="10dp"
+                    android:layout_marginStart="10dp"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/textView15"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="Verified balance"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/text_size_large"
+                        tools:text="Verified balance"/>
+
+                    <TextView
+                        android:id="@+id/tvBalance"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="0.05 BTC (Bitcoin)"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/text_size_large"/>
+
+                    <TextView
+                        android:id="@+id/textView10"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10dp"
+                        android:text="99.99% safe. Authorized merchant loading in progress. Complete in 4:57"/>
+
+                </LinearLayout>
+
+                <!--<ImageView-->
+                <!--android:visibility="gone"-->
+                <!--android:id="@+id/imgBlockchain"-->
+                <!--android:layout_width="32dp"-->
+                <!--android:layout_height="32dp"-->
+                <!--android:src="@drawable/tangem_logo_small_new"-->
+                <!--app:layout_constraintBottom_toBottomOf="parent"-->
+                <!--app:layout_constraintEnd_toEndOf="parent"-->
+                <!--app:layout_constraintTop_toTopOf="parent"/>-->
 
                 <TextView
-                    android:visibility="gone"
                     android:id="@+id/tvHeader"
                     android:layout_width="match_parent"
                     android:layout_height="35dp"
@@ -76,7 +107,8 @@
                     android:text="@string/banknote"
                     android:textAlignment="center"
                     android:textColor="@color/primary_dark"
-                    android:textSize="@dimen/text_size_medium"/>
+                    android:textSize="@dimen/text_size_medium"
+                    android:visibility="gone"/>
 
                 <android.support.constraint.ConstraintLayout
                     android:layout_width="match_parent"
@@ -85,7 +117,8 @@
                     android:paddingBottom="2dp"
                     android:paddingLeft="8dp"
                     android:paddingRight="8dp"
-                    android:paddingTop="2dp">
+                    android:paddingTop="2dp"
+                    android:visibility="gone">
 
                     <TextView
                         android:id="@+id/tvBalanceLabel"
@@ -100,24 +133,21 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"/>
 
-                    <TextView
-                        android:id="@+id/tvBalance"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="0dp"
-                        android:fontFamily="@font/montserrat_light"
-                        android:lines="1"
-                        android:maxLines="1"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/text_size_large"
-                        android:textStyle="normal|bold"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toStartOf="@id/imgBlockchain"
-                        app:layout_constraintStart_toEndOf="@+id/tvBalanceLabel"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="0 mBTC"/>
-
-
+                    <!--<TextView-->
+                    <!--android:id="@+id/tvBalance"-->
+                    <!--android:layout_width="0dp"-->
+                    <!--android:layout_height="wrap_content"-->
+                    <!--android:layout_marginStart="0dp"-->
+                    <!--android:fontFamily="@font/montserrat_light"-->
+                    <!--android:lines="1"-->
+                    <!--android:maxLines="1"-->
+                    <!--android:textColor="@color/black"-->
+                    <!--android:textSize="@dimen/text_size_large"-->
+                    <!--android:textStyle="normal|bold"-->
+                    <!--app:layout_constraintBottom_toBottomOf="parent"-->
+                    <!--app:layout_constraintStart_toEndOf="@+id/tvBalanceLabel"-->
+                    <!--app:layout_constraintTop_toTopOf="parent"-->
+                    <!--tools:text="0 mBTC"/>-->
 
                 </android.support.constraint.ConstraintLayout>
 
@@ -127,7 +157,8 @@
                     android:gravity="start"
                     android:orientation="horizontal"
                     android:paddingLeft="8dp"
-                    android:paddingRight="8dp">
+                    android:paddingRight="8dp"
+                    android:visibility="gone">
 
                     <TextView
                         android:id="@+id/tvOffline"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7780651534..984c815663 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/tools">
-    <color name="colorPrimary">#3f51b5</color>
-    <color name="colorPrimaryDark">#303f9f</color>
-    <color name="colorAccent">#3f51b5</color>
+
+    <color name="colorPrimary">#027AFF</color>
+    <color name="colorPrimaryDark">#027AFF</color>
+    <color name="colorAccent">#027AFF</color>
+
     <color name="bg_window">#FFF0F0F0</color>
-    <!--<color name="primary">#DC3432</color>-->
-    <!--<color name="primary">#9E9E9E</color>-->
     <color name="primary">#616161</color>
-    <!--<color name="primary_dark">#B71C1C</color>-->
-    <!--<color name="primary_dark">#616161</color>-->
     <color name="primary_dark">@color/bg_material_dark</color>
-    <!--<color name="accent">@android:color/holo_blue_dark</color>-->
+
     <color name="accent">#000000</color>
-    <!--<color name="primary_text">#FFFFFF</color>-->
-    <!--<color name="primary_text">#000000</color>-->
-    <!--<color name="secondary_text">#000000</color>-->
     <color name="white">@android:color/white</color>
     <color name="black">#000000</color>
     <color name="bg_separator">#FFBABABA</color>
@@ -22,7 +17,6 @@
     <color name="msg_send">@color/accent</color>
     <color name="msg_rcv">#4a763d</color>
     <color name="msg_okay">#4fc84f</color>
-    <!--<color name="msg_err">@android:color/holo_red_light</color>-->
     <color name="msg_err">#ff4444</color>
     <color name="msg_start">#4a086e</color>
     <color name="msg_action">#0c15c1</color>
@@ -39,7 +33,6 @@
     <color name="fab">#4f98c0</color>
     <color name="type_banknote">#ffffff</color>
     <color name="type_wallet">#ffffff</color>
-
     <color name="black_overlay">#66000000</color>
     <color name="confirmed" >#106800</color>
     <color name="not_confirmed" >#7c0a02</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 381e750a10..cbb612d8ca 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -4,7 +4,7 @@
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorPrimary</item>
+        <item name="colorAccent">@color/colorAccent</item>
     </style>
 
     <style name="spinner_item_actionbar" parent="Widget.AppCompat.Light.Spinner.DropDown.ActionBar">