From bca3fcf8044d260aa6d480d83fc9fb2537fc3010 Mon Sep 17 00:00:00 2001 From: Kevin Gorham Date: Mon, 4 Feb 2019 14:11:22 -0500 Subject: [PATCH] checkpoint: build --- .../wallet/di/module/SynchronizerModule.kt | 4 +-- .../wallet/ui/fragment/HomeFragment.kt | 33 ++++++++++++------- .../wallet/ui/fragment/SendFragment.kt | 27 +++++++++------ .../main/res/layout/include_home_content.xml | 10 +++--- 4 files changed, 45 insertions(+), 29 deletions(-) diff --git a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/di/module/SynchronizerModule.kt b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/di/module/SynchronizerModule.kt index 1033b08..e29cef5 100644 --- a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/di/module/SynchronizerModule.kt +++ b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/di/module/SynchronizerModule.kt @@ -87,8 +87,8 @@ internal object SynchronizerModule { object Properties { val COMPACT_BLOCK_SERVER = Servers.ZCASH_TESTNET.host const val COMPACT_BLOCK_PORT = 9067 - const val CACHE_DB_NAME = "wallet_cache19.db" - const val DATA_DB_NAME = "wallet_data19.db" + const val CACHE_DB_NAME = "wallet_cache21.db" + const val DATA_DB_NAME = "wallet_data21.db" val SEED_PROVIDER = SampleSeedProvider("dummyseed") } diff --git a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/HomeFragment.kt b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/HomeFragment.kt index 453c3f0..ac68841 100644 --- a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/HomeFragment.kt +++ b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/HomeFragment.kt @@ -108,18 +108,19 @@ class HomeFragment : BaseFragment(), HomePresenter.HomeView { onCancelActiveTransaction() } -// refresh_layout.setOnRefreshListener { -// val fauxRefresh = Random.nextLong(750L..3000L) -// refresh_layout.postDelayed({ -// refresh_layout.isRefreshing = false -// }, fauxRefresh) -// } + refresh_layout.setOnRefreshListener { + val fauxRefresh = Random.nextLong(750L..3000L) + refresh_layout.postDelayed({ + refresh_layout.isRefreshing = false + }, fauxRefresh) + } launch { setFirstRunShown(mainActivity.synchronizer.isFirstRun()) } -// refresh_layout.setProgressViewEndTarget(false, (86f * resources.displayMetrics.density).toInt()) + header_active_transaction.visibility = View.GONE + refresh_layout.setProgressViewEndTarget(false, (86f * resources.displayMetrics.density).toInt()) } private fun setFirstRunShown(isShown: Boolean) { @@ -228,9 +229,11 @@ class HomeFragment : BaseFragment(), HomePresenter.HomeView { var subtitle = "Processing..." when (transactionState) { TransactionState.Creating -> { - title = "Preparing ${transaction.value.toZec(2)} ZEC" + header_active_transaction.visibility = View.VISIBLE + title = "Preparing ${transaction.value.toZec(3)} ZEC" subtitle = "to ${(transaction as ActiveSendTransaction).toAddress}" button_active_transaction_cancel.text = "cancel" + setActiveTransactionRaised(true) } TransactionState.SendingToNetwork -> { title = "Sending Transaction" @@ -353,10 +356,14 @@ class HomeFragment : BaseFragment(), HomePresenter.HomeView { } private fun onCancelActiveTransaction() { - button_active_transaction_cancel.isEnabled = false + setActiveTransactionRaised(false) button_active_transaction_cancel.text = "cancel" + } + + private fun setActiveTransactionRaised(isRaised: Boolean) { + button_active_transaction_cancel.isEnabled = isRaised header_active_transaction.animate().apply { - translationZ(0f) + translationZ(if (isRaised) 10f else 0f) duration = 200L interpolator = AccelerateInterpolator() setListener(object : Animator.AnimatorListener { @@ -364,7 +371,9 @@ class HomeFragment : BaseFragment(), HomePresenter.HomeView { } override fun onAnimationEnd(animation: Animator?) { - header_active_transaction.setBackgroundResource(0) + header_active_transaction.apply { + if(translationZ == 0f) setBackgroundResource(0) + } } override fun onAnimationCancel(animation: Animator?) { @@ -375,9 +384,9 @@ class HomeFragment : BaseFragment(), HomePresenter.HomeView { } ) } - homePresenter.onCancelActiveTransaction() } + inner class HomeTransitionListener : Transition.TransitionListener { override fun onTransitionStart(transition: Transition) { onActiveTransactionTransitionStart() diff --git a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/SendFragment.kt b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/SendFragment.kt index b3f01df..a260be4 100644 --- a/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/SendFragment.kt +++ b/zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/SendFragment.kt @@ -42,15 +42,15 @@ class SendFragment : BaseFragment(), SendPresenter.SendView { inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? ): View? { - val enterTransitionSet = TransitionInflater.from(mainActivity).inflateTransition(R.transition.transition_zec_sent).apply { - duration = 3500L - } - - this.sharedElementReturnTransition = enterTransitionSet - this.sharedElementEnterTransition = enterTransitionSet - - this.allowReturnTransitionOverlap = false - allowEnterTransitionOverlap = false +// val enterTransitionSet = TransitionInflater.from(mainActivity).inflateTransition(R.transition.transition_zec_sent).apply { +// duration = 3500L +// } +// +// this.sharedElementReturnTransition = enterTransitionSet +// this.sharedElementEnterTransition = enterTransitionSet +// +// this.allowReturnTransitionOverlap = false +// allowEnterTransitionOverlap = false 0 return DataBindingUtil.inflate( inflater, R.layout.fragment_send, container, false @@ -126,7 +126,14 @@ class SendFragment : BaseFragment(), SendPresenter.SendView { sendPresenter.stop() } - override fun submit(){ + override fun submit() { + mainActivity.navController.navigate(R.id.nav_home_fragment, + null, + null, + FragmentNavigatorExtras(binding.dialogTextTitle to "transition_active_transaction_title")) + } + + fun submitOld() { var extras = with(binding) { listOf(dialogSendBackground, dialogSendContents, dialogTextTitle, dialogTextAddress) .map{ it to it.transitionName } diff --git a/zcash-android-wallet-app/app/src/main/res/layout/include_home_content.xml b/zcash-android-wallet-app/app/src/main/res/layout/include_home_content.xml index c1e22b5..97c741c 100644 --- a/zcash-android-wallet-app/app/src/main/res/layout/include_home_content.xml +++ b/zcash-android-wallet-app/app/src/main/res/layout/include_home_content.xml @@ -9,10 +9,10 @@ android:fillViewport="true" app:layout_behavior="@string/appbar_scrolling_view_behavior"> - - - - + - + \ No newline at end of file