From 3d4ae2ae63a7ac2e0b129dcbe44e204e075b3db5 Mon Sep 17 00:00:00 2001
From: Kevin Gorham <kevin.gorham@electriccoin.co>
Date: Thu, 26 Mar 2020 09:37:21 -0400
Subject: [PATCH] Minor tweaks.

Improved spannable ext function
Updated wallet details to wallet history
---
 .../java/cash/z/ecc/android/ext/Spannable.kt  |  2 +-
 .../z/ecc/android/ui/home/HomeFragment.kt     |  1 -
 app/src/main/res/layout/fragment_home.xml     | 33 ++-----------------
 .../main/res/layout/fragment_send_memo.xml    |  4 +--
 4 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/cash/z/ecc/android/ext/Spannable.kt b/app/src/main/java/cash/z/ecc/android/ext/Spannable.kt
index 1d361a5..29247c7 100644
--- a/app/src/main/java/cash/z/ecc/android/ext/Spannable.kt
+++ b/app/src/main/java/cash/z/ecc/android/ext/Spannable.kt
@@ -5,7 +5,7 @@ import android.text.Spanned
 import android.text.style.ForegroundColorSpan
 import androidx.core.text.toSpannable
 
-fun String.toColoredSpan(colorResId: Int, coloredPortion: String): Spannable {
+fun CharSequence.toColoredSpan(colorResId: Int, coloredPortion: String): Spannable {
     return toSpannable().apply {
         val start = this@toColoredSpan.indexOf(coloredPortion)
         setSpan(ForegroundColorSpan(colorResId.toAppColor()), start, start + coloredPortion.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
diff --git a/app/src/main/java/cash/z/ecc/android/ui/home/HomeFragment.kt b/app/src/main/java/cash/z/ecc/android/ui/home/HomeFragment.kt
index 44f62e4..6f0a498 100644
--- a/app/src/main/java/cash/z/ecc/android/ui/home/HomeFragment.kt
+++ b/app/src/main/java/cash/z/ecc/android/ui/home/HomeFragment.kt
@@ -92,7 +92,6 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
                 buttonNumberPadBack.asKey()
             )
             hitAreaReceive.onClickNavTo(R.id.action_nav_home_to_nav_profile) { tapped(HOME_PROFILE) }
-            iconDetail.onClickNavTo(R.id.action_nav_home_to_nav_detail) { tapped(HOME_DETAIL) }
             textDetail.onClickNavTo(R.id.action_nav_home_to_nav_detail) { tapped(HOME_DETAIL) }
             hitAreaScan.setOnClickListener {
                 mainActivity?.maybeOpenScan().also { tapped(HOME_SCAN) }
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 6efd77f..965c89a 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -241,18 +241,6 @@
         app:layout_constraintTop_toBottomOf="@id/button_number_pad_9"
         app:layout_constraintWidth_percent="@dimen/calculator_button_width_percent" />
 
-<!--    <com.google.android.material.button.MaterialButton-->
-<!--        android:id="@+id/button_send"-->
-<!--        android:layout_width="0dp"-->
-<!--        android:layout_height="0dp"-->
-<!--        style="@style/Zcash.Button"-->
-<!--        android:text=""-->
-<!--        android:enabled="false"-->
-<!--        app:layout_constraintEnd_toEndOf="@id/guide_keys"-->
-<!--        app:layout_constraintStart_toStartOf="@id/guide_keys"-->
-<!--        app:layout_constraintTop_toTopOf="@id/lottie_button_loading"-->
-<!--        app:layout_constraintBottom_toBottomOf="@id/lottie_button_loading"/>-->
-
     <View
         android:id="@+id/layer_lock"
         android:layout_width="match_parent"
@@ -307,7 +295,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:elevation="6dp"
-        android:tint="@color/colorAccent"
+        app:tint="@color/colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHeight_percent="0.052"
@@ -333,21 +321,6 @@
         app:layout_constraintWidth_percent="0.08"
         app:srcCompat="@drawable/ic_account_circle" />
 
-    <ImageView
-        android:id="@+id/icon_detail"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:elevation="6dp"
-        android:tint="@color/colorAccent"
-        app:layout_constraintBottom_toBottomOf="@id/text_detail"
-        app:layout_constraintEnd_toStartOf="@id/text_detail"
-        app:layout_constraintHeight_percent="0.044"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/text_detail"
-        app:layout_constraintWidth_percent="0.0887"
-        app:srcCompat="@drawable/ic_receipt_24dp" />
-
     <View
         android:id="@+id/hit_area_scan"
         android:layout_width="68dp"
@@ -376,13 +349,13 @@
         android:padding="12dp"
         android:elevation="6dp"
         android:layout_marginTop="12dp"
-        android:text="Wallet Details"
+        android:text="Wallet History"
         android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
         android:textColor="@color/colorAccent"
         android:tint="@color/colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/icon_detail"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/lottie_button_loading" />
 
     <TextView
diff --git a/app/src/main/res/layout/fragment_send_memo.xml b/app/src/main/res/layout/fragment_send_memo.xml
index 07191ba..5a3616b 100644
--- a/app/src/main/res/layout/fragment_send_memo.xml
+++ b/app/src/main/res/layout/fragment_send_memo.xml
@@ -223,7 +223,7 @@
         android:id="@+id/group_transparent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        tools:visibility="visible"
+        tools:visibility="gone"
         app:constraint_referenced_ids="sad_description, sad_icon, sad_title, sad_checkbox" />
 
     <androidx.constraintlayout.widget.Group
@@ -231,5 +231,5 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:constraint_referenced_ids="clear_memo, background_memo, input_memo, check_include_address, text_info_shielded"
-        tools:visibility="gone" />
+        tools:visibility="visible" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file