Converted mock icons to grayscale. Also fixed bugs.

zcash-android-wallet-app/app/src/debug/java/cash/z/android/wallet/di/module/SynchronizerModule.kt

@@ -48,8 +48,8 @@ internal object SynchronizerModule {
     @JvmStatic
     @Provides
     @Singleton
-    fun provideWallet(application: ZcashWalletApplication, converter: JniConverter, twigger: Twig): Wallet {
-        return Wallet(converter, application.getDatabasePath(SampleProperties.wallet.dataDbName).absolutePath, "${application.cacheDir.absolutePath}/params", seedProvider = SampleProperties.wallet.seedProvider, spendingKeyProvider = SampleProperties.wallet.spendingKeyProvider, logger = twigger)
+    fun provideWallet(application: ZcashWalletApplication, converter: JniConverter): Wallet {
+        return Wallet(converter, application.getDatabasePath(SampleProperties.wallet.dataDbName).absolutePath, "${application.cacheDir.absolutePath}/params", seedProvider = SampleProperties.wallet.seedProvider, spendingKeyProvider = SampleProperties.wallet.spendingKeyProvider)
     }
 
     @JvmStatic
@@ -76,10 +76,9 @@ internal object SynchronizerModule {
         processor: CompactBlockProcessor,
         repository: TransactionRepository,
         manager: ActiveTransactionManager,
-        wallet: Wallet,
-        twigger: Twig
+        wallet: Wallet
     ): Synchronizer {
-        return SdkSynchronizer(downloader, processor, repository, manager, wallet, blockPollFrequency = 500_000L, logger = twigger)
+        return SdkSynchronizer(downloader, processor, repository, manager, wallet, blockPollFrequency = 500_000L)
     }
 
 }

zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/adapter/TransactionAdapter.kt

@@ -47,14 +47,15 @@ class TransactionViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
         val transactionColor = if (tx.isSend) R.color.send_associated else R.color.receive_associated
         val transactionIcon = if (tx.isSend) R.drawable.ic_sent_transaction else R.drawable.ic_received_transaction
         val zecAbsoluteValue = tx.value.absoluteValue.convertZatoshiToZec(3)
-        val senderAddress = if (tx.address != null) "to ${tx.address}" else "from shielded mystery person"
+        val toOrFrom = if (tx.isSend) "to" else "from"
+        val srcOrDestination = address ?: "from shielded mystery person"
         timestamp.text = if (!tx.isMined || tx.timeInSeconds == 0L) "Pending" else formatter.format(tx.timeInSeconds * 1000)
         amount.text = "$sign$zecAbsoluteValue"
         amount.setTextColor(amountColor.toAppColor())
 
         // maybes - and if this gets to be too much, then pass in a custom holder when constructing the adapter, instead
         status?.setBackgroundColor(transactionColor.toAppColor())
-        address?.text = senderAddress
+        address?.text = "$toOrFrom $srcOrDestination"
         icon?.setImageResource(transactionIcon)
     }
 }

zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/RequestFragment.kt

@@ -63,6 +63,11 @@ class RequestFragment : BaseFragment() {
         }
     }
 
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        mainActivity.setToolbarShown(true)
+    }
+
     override fun onDetach() {
         super.onDetach()
         listener = null

zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/presenter/ProgressPresenter.kt

@@ -40,6 +40,8 @@ class ProgressPresenter(
         for (i in channel) {
             bind(i)
         }
+        // TODO: remove this temp fix:
+        bind(100)
         twig("progress monitor exiting!")
     }
 

zcash-android-wallet-app/app/src/main/res/layout/item_transaction_history.xml

@@ -4,11 +4,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container_transaction"
     android:layout_width="match_parent"
-    android:layout_height="60dp"
+    android:layout_height="wrap_content"
     android:background="@color/history_transaction_item_background"
     android:elevation="1dp"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+    android:paddingEnd="10dp"
+    android:paddingStart="8dp"
     android:layout_marginTop="8dp"
     tools:ignore="RtlSymmetry">
 
@@ -37,15 +39,18 @@
 
     <TextView
         android:id="@+id/text_transaction_address"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textColor="@color/text_dark_dimmed"
         android:textSize="@dimen/text_size_body_2"
-
+        android:paddingEnd="16dp"
+        android:maxLines="1"
+        android:ellipsize="end"
+        app:layout_constraintEnd_toStartOf="@id/text_transaction_amount"
         app:layout_constraintStart_toStartOf="@id/text_transaction_timestamp"
         app:layout_constraintTop_toBottomOf="@id/text_transaction_timestamp"
         app:layout_constraintBottom_toBottomOf="parent"
-        tools:text="8/23 3:24pm" />
+        tools:text="8/23 3:24pmadfasdfasdfasdfasdfafasdfasdfasd" />
 
     <TextView
         android:id="@+id/text_transaction_amount"

zcash-android-wallet-app/app/src/mock/res/mipmap-anydpi-v26/ic_launcher_shield.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/zcashGray_dark"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground_shield"/>
+</adaptive-icon>

zcash-android-wallet-app/app/src/mock/res/mipmap-anydpi-v26/ic_launcher_shield_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/zcashGray_dark"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground_shield"/>
+</adaptive-icon>

zcash-android-wallet-app/app/src/mock/res/values/strings.xml

@@ -0,0 +1,5 @@
+<resources>
+    <string name="app_name">Zcash Wallet (Mock)</string>
+    <string name="product_name">Reference Wallet Mock</string>
+
+</resources>

zcash-android-wallet-app/build.gradle

@@ -49,7 +49,7 @@ buildscript {
         'speeddial': 'com.leinardi.android:speed-dial:2.0.0',
         'stetho': 'com.facebook.stetho:stetho:1.5.0',
         'zcash': [
-            'walletSdk': "cash.z.android.wallet:zcash-android-wallet-sdk:1.7.0@aar"
+            'walletSdk': "cash.z.android.wallet:zcash-android-wallet-sdk:1.7.1@aar"
         ]
     ]
     repositories {