Update Image Branding

app/src/main/AndroidManifest.xml

@@ -9,9 +9,9 @@
             tools:replace="android:allowBackup"
             android:name="com.adityapk.zcash.zqwandroid.ZQWApp"
             android:allowBackup="true"
-            android:icon="@mipmap/logo"
+            android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
-            android:roundIcon="@mipmap/logo_round"
+            android:roundIcon="@mipmap/ic_launcher_round"
             android:supportsRtl="true"
             android:theme="@style/AppTheme"
             android:usesCleartextTraffic="true">

app/src/main/java/com/adityapk/zcash/zqwandroid/SendActivity.kt

@@ -4,13 +4,15 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.AlertDialog
 import android.content.Context
-import android.content.DialogInterface
 import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
 import android.support.v4.content.ContextCompat
 import android.support.v7.app.AppCompatActivity
-import android.text.*
+import android.text.Editable
+import android.text.InputType
+import android.text.SpannableStringBuilder
+import android.text.TextWatcher
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.widget.TextView
@@ -220,7 +222,7 @@ class SendActivity : AppCompatActivity() {
         setAmount(amt / (DataModel.mainResponseData?.zecprice ?: 0.0))
     }
 
-    private fun setAmountZec(amt: Double?) {
+    private fun setAmountHush(amt: Double?) {
         if (amt == null) {
             return;
         }
@@ -265,7 +267,7 @@ class SendActivity : AppCompatActivity() {
                         amt = amt?.replace(",", ".")
 
                         if (amt != null) {
-                            setAmountZec(amt.toDoubleOrNull())
+                            setAmountHush(amt.toDoubleOrNull())
                         }
 
                         val memo = data.data?.getQueryParameter("memo")

app/src/main/java/com/adityapk/zcash/zqwandroid/TxDetailsActivity.kt

@@ -17,9 +17,6 @@ import android.support.constraint.ConstraintLayout
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.R.attr.right
-
-
 
 
 class TxDetailsActivity : AppCompatActivity() {
@@ -63,7 +60,7 @@ class TxDetailsActivity : AppCompatActivity() {
         val amt = kotlin.math.abs(tx?.amount?.toDoubleOrNull() ?: 0.0)
         val amtStr = DecimalFormat("#0.0000####").format(amt)
 
-        txtAmtZec.text = "${DataModel.mainResponseData?.tokenName} $amtStr"
+        txtAmtHush.text = "${DataModel.mainResponseData?.tokenName} $amtStr"
         txtAmtUSD.text = "$ " + DecimalFormat("#,##0.00").format(
             (amt) * (DataModel.mainResponseData?.zecprice ?: 0.0))
 

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

@@ -32,7 +32,7 @@
                 app:layout_constraintTop_toBottomOf="@+id/txtSettingsConnString" android:layout_marginEnd="16dp"
                 app:layout_constraintEnd_toEndOf="parent"/>
         <TextView
-                android:text="ZecWallet connection address"
+                android:text="HushWallet connection address"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/textView"
@@ -55,7 +55,7 @@
                 android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent"
                 android:layout_marginEnd="8dp"/>
         <TextView
-                android:text="If checked, the app will only attempt a direct connection to ZecWallet, and not route traffic over the internet via the external helper service. Please see the FAQ for more details"
+                android:text="If checked, the app will only attempt a direct connection to HushWallet, and not route traffic over the internet via the external helper service. Please see the FAQ for more details"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:id="@+id/textView4" app:layout_constraintStart_toStartOf="parent"
@@ -79,14 +79,14 @@
                 android:layout_marginStart="16dp" android:layout_marginTop="16dp"
                 app:layout_constraintTop_toBottomOf="@+id/textView10"/>
         <TextView
-                android:text="ZecWallet server version"
+                android:text="HushWallet server version"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/textView10" app:layout_constraintStart_toStartOf="parent"
                 android:layout_marginStart="16dp" android:layout_marginTop="16dp"
                 app:layout_constraintTop_toBottomOf="@+id/lblVersionName" android:textStyle="bold"/>
         <TextView
-                android:text="ZecWallet android version"
+                android:text="HushWallet android version"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:id="@+id/textView3" android:layout_marginTop="16dp"

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

@@ -55,7 +55,7 @@
             android:layout_marginBottom="32dp"/>
     <ImageView
             android:layout_width="wrap_content"
-            android:layout_height="46dp" app:srcCompat="@mipmap/logo_round"
+            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/src/main/res/layout/content_tx_details.xml

@@ -91,7 +91,7 @@
                 <TextView
                         android:text="HUSH 2.1234"
                         android:layout_width="0dp"
-                        android:layout_height="wrap_content" android:id="@+id/txtAmtZec"
+                        android:layout_height="wrap_content" android:id="@+id/txtAmtHush"
                         app:layout_constraintStart_toStartOf="parent"
                         android:textSize="24sp"
                         android:textAlignment="textEnd"
@@ -103,7 +103,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content" android:id="@+id/txtAmtUSD"
                         android:layout_marginTop="8dp"
-                        app:layout_constraintTop_toBottomOf="@+id/txtAmtZec" app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/txtAmtHush" app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         android:layout_marginEnd="8dp" android:textSize="18sp" android:textAlignment="textEnd"
                         app:layout_constraintBottom_toBottomOf="parent" android:layout_marginBottom="16dp"/>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.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="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_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="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/logo.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/logobg"/>
-    <foreground android:drawable="@mipmap/logofg"/>
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/logo_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/logobg"/>
-    <foreground android:drawable="@mipmap/logofg"/>
-</adaptive-icon>

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

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

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">ZecWallet</string>
+    <string name="app_name">HushWallet</string>
     <string name="action_settings">Settings</string>
     <string name="title_activity_scrolling">ScrollingActivity</string>