Merge pull request #105 from gilardh/master

Update graphics and delete unnecessary files

app/src/main/java/org/myhush/silentdragon/TransactionItemFragment.kt

@@ -72,19 +72,20 @@ class TransactionItemFragment : Fragment() {
         amt.text = (if (tx?.type == "send") "" else "+") +  DecimalFormat("#0.00########").format(amtzec) + " " + DataModel.mainResponseData?.tokenName
 
         if (tx?.type == "send") {
-            col.setImageResource(R.color.colorAccent)
             amt.setTextColor(ContextCompat.getColor(view.context,
-                R.color.colorAccent
+                R.color.white_selected
             ))
         } else {
-            col.setImageResource(R.color.white_selected)
             amt.setTextColor(ContextCompat.getColor(view.context,
                 R.color.white_selected
             ))
         }
 
         if (param2 == "odd")
-            view.findViewById<ConstraintLayout>(R.id.outlineLayout).background = null
+            col.setBackgroundColor(ContextCompat.getColor(view.context,
+                R.color.colorPrimaryDark
+            ))
+
         return view
     }
 

app/src/main/res/drawable-anydpi/settings.xml

@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF">
+    <group android:translateX="0"
+        android:translateY="0">
+        <path
+            android:fillColor="#FF000000"
+            android:pathData="M14.62,21.38c0,1.45-1.17,2.62-2.62,2.62c-1.44,0-2.62-1.18-2.62-2.62c0-1.45,1.18-2.62,2.62-2.62
+				C13.45,18.76,14.62,19.93,14.62,21.38z"/>
+
+        <path
+            android:fillColor="#FF000000"
+            android:pathData="M14.62,12.15c0,1.45-1.17,2.62-2.62,2.62c-1.44,0-2.62-1.18-2.62-2.62c0-1.44,1.18-2.62,2.62-2.62
+				C13.45,9.53,14.62,10.7,14.62,12.15z"/>
+
+        <path
+            android:fillColor="#FF000000"
+            android:pathData="M14.62,2.62c0,1.44-1.17,2.62-2.62,2.62c-1.44,0-2.62-1.18-2.62-2.62S10.56,0,12,0
+				C13.45,0,14.62,1.18,14.62,2.62z"/>
+    </group>
+</vector>

app/src/main/res/layout/activity_main.xml

@@ -16,7 +16,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorPrimary"
+                android:background="?attr/colorPrimaryDark"
                 app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
     </com.google.android.material.appbar.AppBarLayout>

app/src/main/res/layout/activity_qr_reader.xml

@@ -35,6 +35,8 @@
             android:text="@string/cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
             android:id="@+id/btnQrCodeCancel"
             app:layout_constraintStart_toStartOf="parent"
             android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/content_main.xml

@@ -5,26 +5,28 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+    android:background="@color/colorPrimary"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:showIn="@layout/activity_main"
         tools:context="org.myhush.silentdragon.MainActivity">
 
     <ImageView
-            android:layout_width="0dp"
-            android:layout_height="150dp" app:srcCompat="?attr/colorPrimary"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" android:id="@+id/imageView2"
-            app:layout_constraintHorizontal_bias="0.524"
-            app:layout_constraintTop_toTopOf="parent"/>
+        android:layout_width="0dp"
+        android:layout_height="150dp"
+        app:srcCompat="@color/colorPrimary"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" android:id="@+id/imageView2"
+        app:layout_constraintHorizontal_bias="0.524"
+        app:layout_constraintTop_toTopOf="parent"/>
     <TextView
-            android:text="@string/balance"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/lblBalance" android:layout_marginTop="24dp"
-            app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginStart="16dp" app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginEnd="16dp"
-            app:layout_constraintBottom_toTopOf="@+id/txtMainBalance" android:textColor="@color/light_grey"/>
+        android:text="@string/balance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/lblBalance" android:layout_marginTop="12dp"
+        app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginStart="16dp" app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintBottom_toTopOf="@+id/txtMainBalance" android:textColor="@color/light_grey"/>
 
     <TextView
         android:id="@+id/txtMainBalance"
@@ -61,11 +63,12 @@
         app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@mipmap/ic_launcher_dragon_foreground" />
+        app:srcCompat="@mipmap/ic_dragon" />
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/swiperefresh"
             android:layout_width="match_parent"
             android:layout_height="0dp"
+
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/imageView3" app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toTopOf="@+id/bottomNav">
@@ -78,44 +81,54 @@
                 android:fillViewport="true" android:clipToPadding="false"
                 android:layout_marginTop="8dp" app:layout_constraintTop_toBottomOf="parent">
             <LinearLayout android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:id="@+id/txList" android:orientation="vertical">
+                android:layout_height="wrap_content"
+                android:background="@color/colorPrimary"
+                android:id="@+id/txList" android:orientation="vertical">
                 <TextView
                         android:text="@string/past_transactions"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" android:id="@+id/textView2" android:textStyle="bold"
-                        android:textSize="18sp" android:padding="16dp"/>
+                        android:textSize="18sp" android:padding="8dp"/>
             </LinearLayout>
         </ScrollView>
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="364dp" app:layout_constraintTop_toBottomOf="@+id/imageView3"
+
             android:layout_marginBottom="32dp" app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"
             android:layout_marginTop="32dp" android:layout_marginStart="8dp" android:layout_marginEnd="8dp"
             android:id="@+id/layoutConnect">
 
-        <ImageView
-                android:layout_width="72dp"
-                android:layout_height="72dp"
-                android:src="@mipmap/ic_silent_dragon_round"
-                android:id="@+id/imageView5" app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginTop="8dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                android:layout_marginEnd="8dp"
-                android:layout_marginBottom="8dp" app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintVertical_bias="0.22000003" app:layout_constraintStart_toStartOf="parent"
-                android:layout_marginStart="8dp"/>
+
+
+        <TextView
+            android:text=""
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:id="@+id/lblConnectionHush"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="8dp" app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintVertical_bias="0.22000003" app:layout_constraintStart_toStartOf="parent"
+            android:layout_marginStart="8dp"/>
+
+
         <Button
                 android:text="@string/scan_qr_code"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:background="@color/colorPrimaryDark"
                 android:id="@+id/btnConnect" app:layout_constraintStart_toStartOf="parent"
                 android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
                 android:layout_marginEnd="8dp"
                 android:layout_marginTop="8dp"
-                app:layout_constraintTop_toBottomOf="@+id/imageView5"/>
+                app:layout_constraintTop_toBottomOf="@+id/lblConnectionHush"/>
         <TextView
                 android:text="@string/or"
                 android:layout_width="0dp"
@@ -128,10 +141,13 @@
                 android:text="@string/reconnect"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:background="@color/colorPrimaryDark"
                 android:id="@+id/btnReconnect" android:layout_marginTop="8dp"
                 app:layout_constraintTop_toBottomOf="@+id/lblConnectionOr" app:layout_constraintStart_toStartOf="parent"
                 android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
-                android:layout_marginEnd="8dp"/>
+                android:layout_marginEnd="8dp" android:textAlignment="center"/>
 
         <Button
             android:id="@+id/btnHelp"
@@ -139,6 +155,8 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
             android:text="@string/help"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -147,6 +165,7 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
     <com.google.android.material.bottomnavigation.BottomNavigationView
             android:layout_width="match_parent"
+            android:background="@color/colorPrimaryDark"
             android:layout_height="0dp" app:menu="@menu/menu_nav"
             android:id="@+id/bottomNav"
             app:itemIconTint="@null"

app/src/main/res/layout/content_receive.xml

@@ -45,10 +45,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="zAddr"/>
-        <com.google.android.material.tabs.TabItem
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="tAddr"/>
 
     </com.google.android.material.tabs.TabLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/content_send.xml

@@ -228,7 +228,7 @@
                 android:layout_height="wrap_content"
                 app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"
                 android:id="@+id/btnSend"
-                android:background="@color/colorAccent"
+                android:background="@color/colorPrimaryDark"
                 android:textColor="@android:color/white" tools:layout_conversion_absoluteHeight="48dp"
                 tools:layout_conversion_absoluteWidth="88dp"
                 app:layout_constraintHorizontal_bias="0.498"

app/src/main/res/layout/content_tx_details.xml

@@ -177,18 +177,25 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/textView14" />
             </androidx.constraintlayout.widget.ConstraintLayout>
+
             <Button
-                    android:text="@string/view_on_block_explorer"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" android:id="@+id/btnExternal"
-                    android:layout_marginTop="24dp"
-                    app:layout_constraintTop_toBottomOf="@+id/layoutMemo"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    android:layout_marginBottom="16dp" app:layout_constraintStart_toStartOf="parent"
-                    android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
-                    android:layout_marginEnd="8dp" app:layout_constraintVertical_bias="0.0"
-                    android:background="@color/colorAccent" android:textColor="@android:color/white"
-                    android:paddingLeft="10dp" android:paddingRight="10dp"/>
+                android:id="@+id/btnExternal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="24dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginBottom="16dp"
+                android:background="@color/colorPrimaryDark"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:text="@string/view_on_block_explorer"
+                android:textColor="@android:color/white"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/layoutMemo"
+                app:layout_constraintVertical_bias="0.0" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_transaction_item.xml

@@ -5,22 +5,20 @@
     android:id="@+id/outlineLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="#AFAFAF"
     tools:context="org.myhush.silentdragon.TransactionItemFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <ImageView
         android:id="@+id/typeColor"
-        android:layout_width="8dp"
+        android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_marginLeft="8dp"
-        android:layout_marginTop="2dp"
+        android:layout_marginRight="8dp"
+        android:layout_marginTop="0dp"
         android:layout_marginBottom="2dp"
-        android:src="@color/white_selected"
         app:layout_constraintBaseline_toBaselineOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@id/txdate"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -28,7 +26,7 @@
         android:id="@+id/txdate"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="7dp"
         android:layout_marginBottom="8dp"
@@ -36,8 +34,9 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/txamt"
         app:layout_constraintLeft_toRightOf="@+id/typeColor"
-        app:layout_constraintStart_toEndOf="@+id/typeColor"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintStart_toStartOf="@+id/typeColor"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0" />
 
     <TextView
         android:id="@+id/txamt"
@@ -45,7 +44,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="16dp"
         android:layout_marginBottom="8dp"
         android:text="@string/amt"
         android:textAlignment="textEnd"

app/src/main/res/layout/fragment_unconfirmed_tx_item.xml

@@ -50,7 +50,7 @@
             android:layout_marginTop="8dp"
             android:layout_marginBottom="8dp"
             android:text="@string/unconfirmed_transaction"
-            android:textColor="@color/colorAccent"
+            android:textColor="@color/colorPrimaryDark"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="@+id/txtUnconfirmedTx"
             app:layout_constraintTop_toBottomOf="@+id/txtUnconfirmedTx" />

app/src/main/res/menu/menu_main.xml

@@ -4,15 +4,12 @@
       xmlns:compat="http://schemas.android.com/apk/res-auto"
       tools:context="org.myhush.silentdragon.MainActivity">
     <item android:id="@+id/action_settings"
-          android:title="@string/action_settings"
-          android:orderInCategory="100"
-          app:showAsAction="never"/>
+          android:title="@string/action_settings"/>
     <item android:id="@+id/action_about"
         android:title="@string/action_about"
         android:orderInCategory="100"
         app:showAsAction="never"/>
     <item android:title="@string/refresh" android:id="@+id/action_refresh"
           compat:showAsAction="ifRoom"
-
           android:icon="@drawable/refresh"/>
 </menu>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_dragon.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_dragon_foreground"/>
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_dragon_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_dragon_foreground"/>
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_hush_new.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_dragon_foreground"/>
-    <foreground android:drawable="@mipmap/ic_launcher_dragon_foreground"/>
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_hush_new_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_hush_new_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_hush_new_foreground"/>
-</adaptive-icon>

app/src/main/res/values/colors.xml

@@ -2,6 +2,7 @@
 <resources>
     <color name="colorPrimary">#292B2F</color>
     <color name="colorPrimaryDark">#1D1F21</color>
+
     <color name="colorAccent">#FF0033</color>
     <color name="windowBackground">#2F3237</color>
     <color name="light_grey">#E3E3E3</color>

app/src/main/res/values/ic_launcher_dragon_background.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_dragon_background">#FFFFFF</color>
-</resources>

build.gradle

@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Feb 29 17:16:24 EET 2020
+#Wed Jun 10 21:35:32 CEST 2020
 distributionBase=PROJECT
 distributionPath=.gradle/wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip