zcash-hackworks
/
zcash-android-wallet-zcon1
mirror of https://github.com/zcash-hackworks/zcash-android-wallet-zcon1.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

checkpoint: build

This commit is contained in:
Kevin Gorham 2019-02-04 14:11:22 -05:00 committed by Kevin Gorham
parent c7712f58eb
commit bca3fcf804
4 changed files with 45 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/di/module/SynchronizerModule.kt
View File

@ -87,8 +87,8 @@ internal object SynchronizerModule {
object Properties { object Properties {
val COMPACT_BLOCK_SERVER = Servers.ZCASH_TESTNET.host val COMPACT_BLOCK_SERVER = Servers.ZCASH_TESTNET.host
const val COMPACT_BLOCK_PORT = 9067 const val COMPACT_BLOCK_PORT = 9067
const val CACHE_DB_NAME = "wallet_cache19.db" const val CACHE_DB_NAME = "wallet_cache21.db"
const val DATA_DB_NAME = "wallet_data19.db" const val DATA_DB_NAME = "wallet_data21.db"
val SEED_PROVIDER = SampleSeedProvider("dummyseed") val SEED_PROVIDER = SampleSeedProvider("dummyseed")
} }

33
zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/HomeFragment.kt
View File

@ -108,18 +108,19 @@ class HomeFragment : BaseFragment(), HomePresenter.HomeView {
onCancelActiveTransaction() onCancelActiveTransaction()
} }
// refresh_layout.setOnRefreshListener { refresh_layout.setOnRefreshListener {
// val fauxRefresh = Random.nextLong(750L..3000L) val fauxRefresh = Random.nextLong(750L..3000L)
// refresh_layout.postDelayed({ refresh_layout.postDelayed({
// refresh_layout.isRefreshing = false refresh_layout.isRefreshing = false
// }, fauxRefresh) }, fauxRefresh)
// } }
launch { launch {
setFirstRunShown(mainActivity.synchronizer.isFirstRun()) 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) { private fun setFirstRunShown(isShown: Boolean) {
@ -228,9 +229,11 @@ class HomeFragment : BaseFragment(), HomePresenter.HomeView {
var subtitle = "Processing..." var subtitle = "Processing..."
when (transactionState) { when (transactionState) {
TransactionState.Creating -> { 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}" subtitle = "to ${(transaction as ActiveSendTransaction).toAddress}"
button_active_transaction_cancel.text = "cancel" button_active_transaction_cancel.text = "cancel"
setActiveTransactionRaised(true)
} }
TransactionState.SendingToNetwork -> { TransactionState.SendingToNetwork -> {
title = "Sending Transaction" title = "Sending Transaction"
@ -353,10 +356,14 @@ class HomeFragment : BaseFragment(), HomePresenter.HomeView {
} }
private fun onCancelActiveTransaction() { private fun onCancelActiveTransaction() {
button_active_transaction_cancel.isEnabled = false setActiveTransactionRaised(false)
button_active_transaction_cancel.text = "cancel" button_active_transaction_cancel.text = "cancel"
}
private fun setActiveTransactionRaised(isRaised: Boolean) {
button_active_transaction_cancel.isEnabled = isRaised
header_active_transaction.animate().apply { header_active_transaction.animate().apply {
translationZ(0f) translationZ(if (isRaised) 10f else 0f)
duration = 200L duration = 200L
interpolator = AccelerateInterpolator() interpolator = AccelerateInterpolator()
setListener(object : Animator.AnimatorListener { setListener(object : Animator.AnimatorListener {
@ -364,7 +371,9 @@ class HomeFragment : BaseFragment(), HomePresenter.HomeView {
} }
override fun onAnimationEnd(animation: Animator?) { override fun onAnimationEnd(animation: Animator?) {
header_active_transaction.setBackgroundResource(0) header_active_transaction.apply {
if(translationZ == 0f) setBackgroundResource(0)
}
} }
override fun onAnimationCancel(animation: Animator?) { override fun onAnimationCancel(animation: Animator?) {
@ -375,9 +384,9 @@ class HomeFragment : BaseFragment(), HomePresenter.HomeView {
} ) } )
} }
homePresenter.onCancelActiveTransaction()
} }
inner class HomeTransitionListener : Transition.TransitionListener { inner class HomeTransitionListener : Transition.TransitionListener {
override fun onTransitionStart(transition: Transition) { override fun onTransitionStart(transition: Transition) {
onActiveTransactionTransitionStart() onActiveTransactionTransitionStart()

27
zcash-android-wallet-app/app/src/main/java/cash/z/android/wallet/ui/fragment/SendFragment.kt
View File

@ -42,15 +42,15 @@ class SendFragment : BaseFragment(), SendPresenter.SendView {
inflater: LayoutInflater, container: ViewGroup?, inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle? savedInstanceState: Bundle?
): View? { ): View? {
val enterTransitionSet = TransitionInflater.from(mainActivity).inflateTransition(R.transition.transition_zec_sent).apply { // val enterTransitionSet = TransitionInflater.from(mainActivity).inflateTransition(R.transition.transition_zec_sent).apply {
duration = 3500L // duration = 3500L
} // }
//
this.sharedElementReturnTransition = enterTransitionSet // this.sharedElementReturnTransition = enterTransitionSet
this.sharedElementEnterTransition = enterTransitionSet // this.sharedElementEnterTransition = enterTransitionSet
//
this.allowReturnTransitionOverlap = false // this.allowReturnTransitionOverlap = false
allowEnterTransitionOverlap = false // allowEnterTransitionOverlap = false
0 0
return DataBindingUtil.inflate<FragmentSendBinding>( return DataBindingUtil.inflate<FragmentSendBinding>(
inflater, R.layout.fragment_send, container, false inflater, R.layout.fragment_send, container, false
@ -126,7 +126,14 @@ class SendFragment : BaseFragment(), SendPresenter.SendView {
sendPresenter.stop() 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) { var extras = with(binding) {
listOf(dialogSendBackground, dialogSendContents, dialogTextTitle, dialogTextAddress) listOf(dialogSendBackground, dialogSendContents, dialogTextTitle, dialogTextAddress)
.map{ it to it.transitionName } .map{ it to it.transitionName }

10
zcash-android-wallet-app/app/src/main/res/layout/include_home_content.xml
View File

@ -9,10 +9,10 @@
android:fillViewport="true" android:fillViewport="true"
app:layout_behavior="@string/appbar_scrolling_view_behavior"> app:layout_behavior="@string/appbar_scrolling_view_behavior">
<!--<androidx.swiperefreshlayout.widget.SwipeRefreshLayout--> <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
<!--android:id="@+id/refresh_layout"--> android:id="@+id/refresh_layout"
<!--android:layout_width="wrap_content"--> android:layout_width="wrap_content"
<!--android:layout_height="wrap_content">--> android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/content_home" android:id="@+id/content_home"
@ -156,5 +156,5 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:constraint_referenced_ids="image_empty_wallet,text_wallet_message" /> app:constraint_referenced_ids="image_empty_wallet,text_wallet_message" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<!--</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>--> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>