Merge pull request #15 from DenioD/master

Change Colours and some logos

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

@@ -67,7 +67,7 @@ class SendActivity : AppCompatActivity() {
                 if (DataModel.isValidAddress(s.toString())) {
                     txtValidAddress.text = "\u2713 Valid address"
                     txtValidAddress.setTextColor(ContextCompat.getColor(applicationContext,
-                        R.color.colorPrimary
+                        R.color.white_selected
                     ))
                 } else {
                     txtValidAddress.text = "Not a valid Hush address!"
@@ -125,7 +125,7 @@ class SendActivity : AppCompatActivity() {
                     ))
                 } else {
                     txtMemoSize.setTextColor(ContextCompat.getColor(applicationContext,
-                        R.color.colorPrimary
+                        R.color.white_selected
                     ))
                 }
             }
@@ -247,7 +247,7 @@ class SendActivity : AppCompatActivity() {
         amountUSD.setText( (zprice * amt).format(2))
 
         amountHUSH.text =
-                "${DataModel.mainResponseData?.tokenName} " + DecimalFormat("#.########").format(amt)
+            "${DataModel.mainResponseData?.tokenName} " + DecimalFormat("#.########").format(amt)
     }
 
     private fun setAmount(amt: Double?) {
@@ -275,7 +275,7 @@ class SendActivity : AppCompatActivity() {
                         sendAddress.setText(data.data?.host ?: "", TextView.BufferType.EDITABLE)
 
                         var amt = data.data?.getQueryParameter("amt") ?:
-                                    data.data?.getQueryParameter("amount")
+                        data.data?.getQueryParameter("amount")
 
                         // Remove all commas.
                         amt = amt?.replace(",", ".")

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

@@ -77,9 +77,9 @@ class TransactionItemFragment : Fragment() {
                 R.color.colorAccent
             ))
         } else {
-            col.setImageResource(R.color.colorPrimary)
+            col.setImageResource(R.color.white_selected)
             amt.setTextColor(ContextCompat.getColor(view.context,
-                R.color.colorPrimary
+                R.color.white_selected
             ))
         }
 

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

@@ -53,13 +53,17 @@
             app:layout_constraintTop_toBottomOf="@+id/txtMainBalance"
             android:textColor="@color/light_grey" app:layout_constraintBottom_toBottomOf="@+id/imageView2"
             android:layout_marginBottom="32dp"/>
+
     <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="46dp" app:srcCompat="@mipmap/ic_launcher_round"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" android:id="@+id/imageView3"
-            app:layout_constraintHorizontal_bias="0.498"
-            app:layout_constraintTop_toTopOf="parent" android:layout_marginTop="125dp"/>
+        android:id="@+id/imageView3"
+        android:layout_width="wrap_content"
+        android:layout_height="46dp"
+        android:layout_marginTop="125dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@mipmap/ic_launcher_hush_new_foreground" />
     <android.support.v4.widget.SwipeRefreshLayout
             android:id="@+id/swiperefresh"
             android:layout_width="match_parent"

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

@@ -106,7 +106,7 @@
                     android:selectAllOnFocus="true"
                     android:singleLine="true"
                     android:textAlignment="center"
-                    android:textColor="@android:color/background_dark"
+                    android:textColor="#FFFFFF"
                     android:textSize="36sp"
                     app:layout_constraintBottom_toTopOf="@+id/amountHUSH"
                     app:layout_constraintEnd_toEndOf="parent"

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

@@ -1,40 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                             xmlns:app="http://schemas.android.com/apk/res-auto"
-                                             xmlns:tools="http://schemas.android.com/tools"
-                                             android:layout_width="match_parent"
-                                             android:layout_height="wrap_content"
-                                             tools:context="org.myhush.silentdragon.TransactionItemFragment" android:id="@+id/outlineLayout"
-                                             android:background="@color/light_grey">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/outlineLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="#867070"
+    tools:context="org.myhush.silentdragon.TransactionItemFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <ImageView
-            android:src="@color/colorPrimary"
-            android:layout_width="8dp"
-            android:layout_height="0dp" android:id="@+id/typeColor" app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintRight_toLeftOf="@id/txdate" app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintBaseline_toBaselineOf="parent" android:layout_marginLeft="8dp"
-            app:layout_constraintStart_toStartOf="parent" android:layout_marginTop="2dp"
-            android:layout_marginBottom="2dp"/>
+        android:id="@+id/typeColor"
+        android:layout_width="8dp"
+        android:layout_height="0dp"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="2dp"
+        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" />
+
     <TextView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:text="Date" android:id="@+id/txdate"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintLeft_toRightOf="@+id/typeColor"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/typeColor" android:layout_marginStart="16dp"
-            android:layout_marginTop="8dp" android:layout_marginBottom="8dp"
-            app:layout_constraintEnd_toStartOf="@+id/txamt" android:layout_marginEnd="7dp"
-    />
+        android:id="@+id/txdate"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="7dp"
+        android:layout_marginBottom="8dp"
+        android:text="Date"
+        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" />
+
     <TextView
-            android:text="Amt"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content" android:id="@+id/txamt"
-            android:layout_marginStart="8dp" app:layout_constraintStart_toEndOf="@+id/txdate"
-            app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="8dp" android:layout_marginTop="8dp"
-            app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent"
-            android:textAlignment="textEnd" android:layout_marginBottom="8dp"/>
+        android:id="@+id/txamt"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:text="Amt"
+        android:textAlignment="textEnd"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/txdate"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </android.support.constraint.ConstraintLayout>

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

@@ -5,37 +5,54 @@
                                              android:layout_width="match_parent"
                                              android:layout_height="match_parent"
                                              tools:context="org.myhush.silentdragon.UnconfirmedTxItemFragment" android:id="@+id/frameLayout">
+
     <android.support.constraint.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" android:layout_marginStart="16dp" android:layout_marginEnd="16dp"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="8dp" android:background="@color/light_grey"
-            android:id="@+id/layoutUnconfirmedItem" android:layout_marginBottom="8dp"
-            app:layout_constraintBottom_toBottomOf="parent">
+        android:id="@+id/layoutUnconfirmedItem"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <ProgressBar
-                style="?android:attr/progressBarStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/prgUnconfirmed" app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent" android:layout_marginTop="8dp"
-                android:layout_marginStart="32dp" app:layout_constraintBottom_toBottomOf="parent"
-                android:layout_marginBottom="8dp" android:progress="23"/>
+            android:id="@+id/prgUnconfirmed"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:progress="23"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <TextView
-                android:text="Recieving HUSH 0.12345678"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" android:id="@+id/txtUnconfirmedTx"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginTop="8dp" android:layout_marginStart="24dp"
-                app:layout_constraintStart_toEndOf="@+id/prgUnconfirmed" android:textSize="18sp"/>
+            android:id="@+id/txtUnconfirmedTx"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="8dp"
+            android:text="Recieving HUSH 0.12345678"
+            android:textSize="18sp"
+            app:layout_constraintStart_toEndOf="@+id/prgUnconfirmed"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <TextView
-                android:text="Unconfirmed Transaction"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/textView9"
-                app:layout_constraintTop_toBottomOf="@+id/txtUnconfirmedTx" android:layout_marginTop="8dp"
-                app:layout_constraintBottom_toBottomOf="parent" android:layout_marginBottom="8dp"
-                app:layout_constraintLeft_toLeftOf="@+id/txtUnconfirmedTx" android:textColor="@color/colorAccent"/>
+            android:id="@+id/textView9"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="Unconfirmed Transaction"
+            android:textColor="@color/colorAccent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="@+id/txtUnconfirmedTx"
+            app:layout_constraintTop_toBottomOf="@+id/txtUnconfirmedTx" />
     </android.support.constraint.ConstraintLayout>
 </android.support.constraint.ConstraintLayout>

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

@@ -0,0 +1,5 @@
+<?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/mipmap-anydpi-v26/ic_launcher_hush_new_round.xml

@@ -0,0 +1,5 @@
+<?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>