diff --git a/zcash-android-wallet-app/app/build.gradle b/zcash-android-wallet-app/app/build.gradle index ec3f542..8476a12 100644 --- a/zcash-android-wallet-app/app/build.gradle +++ b/zcash-android-wallet-app/app/build.gradle @@ -15,7 +15,7 @@ android { minSdkVersion buildConfig.minSdkVersion targetSdkVersion buildConfig.targetSdkVersion versionCode 17 // todo: change this to 1_00_04 format, once we graduate beyond zero for the major version number because leading zeros indicate on octal number. - versionName "0.4.2-alpha" + versionName "0.4.5-alpha" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true multiDexEnabled true diff --git a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/AboutFragment.kt b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/AboutFragment.kt index de249de..af36abd 100644 --- a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/AboutFragment.kt +++ b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/AboutFragment.kt @@ -7,6 +7,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.databinding.DataBindingUtil +import cash.z.android.wallet.BuildConfig import cash.z.android.wallet.R import cash.z.android.wallet.databinding.FragmentAboutBinding import dagger.Module @@ -25,6 +26,7 @@ class AboutFragment : BaseFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + binding.textAboutVersionValue.text = BuildConfig.VERSION_NAME binding.textAboutLicensingValue.setOnClickListener { openUrl("https://z.cash/trademark-policy/") } diff --git a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/ScanFragment.kt b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/ScanFragment.kt index 3f8be7f..b058f8d 100644 --- a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/ScanFragment.kt +++ b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/ScanFragment.kt @@ -17,7 +17,6 @@ import cash.z.android.cameraview.CameraView import cash.z.android.wallet.R import cash.z.android.wallet.databinding.FragmentScanBinding import cash.z.android.wallet.extention.Toaster -import cash.z.android.wallet.ui.activity.MainActivity import com.google.firebase.ml.vision.FirebaseVision import com.google.firebase.ml.vision.barcode.FirebaseVisionBarcode import com.google.firebase.ml.vision.barcode.FirebaseVisionBarcodeDetectorOptions @@ -193,7 +192,9 @@ class ScanFragment : BaseFragment() { override fun onRequestPermissionsResult(requestCode: Int, permissions: Array, grantResults: IntArray) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) if (allPermissionsGranted()) { - onStartCamera() + view!!.postDelayed({ + onStartCamera() + },2000L) // TODO: remove this temp hack to sidestep crash when permissions were not available } } @@ -234,8 +235,6 @@ class ScanFragment : BaseFragment() { if (results.isNotEmpty()) { val barcode = results[0] val value = barcode.rawValue - val message = "found: $value" - Toaster.short(message) onScanSuccess(value!!) // TODO: highlight the barcode var bounds = barcode.boundingBox @@ -251,10 +250,8 @@ class ScanFragment : BaseFragment() { binding.cameraView.stop() if (!pendingSuccess) { pendingSuccess = true - with(binding.cameraView) { - postDelayed({ - barcodeCallback?.onBarcodeScanned(value) - }, 3000L) + binding.cameraView.post { + barcodeCallback?.onBarcodeScanned(value) } } } diff --git a/zcash-android-wallet-app/app/src/main/res/layout/fragment_about.xml b/zcash-android-wallet-app/app/src/main/res/layout/fragment_about.xml index 8dea392..159bcae 100644 --- a/zcash-android-wallet-app/app/src/main/res/layout/fragment_about.xml +++ b/zcash-android-wallet-app/app/src/main/res/layout/fragment_about.xml @@ -156,7 +156,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="32dp" - android:text="0.4.2-alpha" android:textColor="@color/zcashGray_dark" android:textSize="@dimen/text_size_body_2" app:layout_constraintBottom_toTopOf="@id/text_about_updated_value" diff --git a/zcash-android-wallet-app/app/src/main/res/layout/fragment_send.xml b/zcash-android-wallet-app/app/src/main/res/layout/fragment_send.xml index 2b4fffc..a03ab2e 100644 --- a/zcash-android-wallet-app/app/src/main/res/layout/fragment_send.xml +++ b/zcash-android-wallet-app/app/src/main/res/layout/fragment_send.xml @@ -462,6 +462,7 @@ transition_active_transaction_bg, text_value_subheader, text_dollar_symbol_subheader, + image_zec_symbol_subheader, image_zec_symbol_header, text_dollar_symbol_header, text_amount_background,