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: dialog UI is feature complete 

Now, just need to complete the other side of the transition
This commit is contained in:
Kevin Gorham 2019-02-02 01:42:23 -05:00 committed by Kevin Gorham
parent 2550d3a12e
commit 3404082869
7 changed files with 108 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,7 @@ class HomeFragment : BaseFragment(), HomePresenter.HomeView {
): View? {
viewsInitialized = false
val enterTransitionSet = TransitionInflater.from(mainActivity).inflateTransition(R.transition.transition_zec_sent).apply {
duration = 350L
duration = 3500L
}
this.sharedElementEnterTransition = enterTransitionSet

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

@ -91,7 +91,7 @@ class SendFragment : BaseFragment(), SendPresenter.SendView {
binding.dialogSendBackground.setOnClickListener {
hideSendDialog()
}
binding.dialogSendContents.setOnClickListener {
binding.dialogSubmitButton.setOnClickListener {
sendPresenter.onDialogConfirm()
}
}

3
zcash-android-wallet-app/app/src/main/res/drawable/background_rounded_corners.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="8dp" />
<solid android:color="@color/zcashBlue" />
<!--<solid android:color="@color/zcashWhite_87" />-->
<solid android:color="@color/zcashWhite_87" />
</shape>

5
zcash-android-wallet-app/app/src/main/res/drawable/background_rounded_corners_opaque.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="8dp" />
<solid android:color="@color/zcashWhite" />
</shape>

9
zcash-android-wallet-app/app/src/main/res/drawable/ic_check_black_24dp.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
</vector>

97
zcash-android-wallet-app/app/src/main/res/layout/fragment_send.xml
View File

@ -278,27 +278,110 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/zcashBlack_54"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:visibility="gone"/>
tools:visibility="visible" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/dialog_send_contents"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/background_rounded_corners"
android:layout_height="wrap_content"
android:background="@drawable/background_rounded_corners_opaque"
android:backgroundTint="@color/zcashWhite"
android:clickable="true"
android:focusable="true"
android:transitionName="@string/transition_active_transaction"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHeight_default="percent"
app:layout_constraintHeight_percent="0.25"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="@dimen/ratio_golden_small"
app:layout_constraintWidth_default="percent"
app:layout_constraintWidth_percent="0.80">
app:layout_constraintWidth_percent="0.80"
tools:visibility="visible">
<TextView
android:id="@+id/dialog_text_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dp"
android:text="Send 1.73 ZEC ($200.23)?"
android:textSize="@dimen/text_size_h6"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/dialog_text_address"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="spread_inside" />
<TextView
android:id="@+id/dialog_text_to"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="16dp"
android:text="To"
android:textColor="@color/text_dark_dimmed"
android:textSize="@dimen/text_size_body_1"
app:layout_constraintBottom_toBottomOf="@+id/dialog_text_address"
app:layout_constraintEnd_toStartOf="@+id/dialog_text_address"
app:layout_constraintHorizontal_chainStyle="spread_inside"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/dialog_text_address" />
<TextView
android:id="@+id/dialog_text_address"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:fontFamily="@font/inconsolata"
android:lines="3"
android:paddingTop="16dp"
android:paddingEnd="16dp"
android:paddingRight="16dp"
android:text="ztestsapling1snmqdnfqnc407pvqw7sld8w5zxx6nd0523kvlj4jf39uvxvh7vn0hs3q38n07806dwwecqwke3t"
android:textColor="@color/colorPrimary"
android:textSize="@dimen/text_size_body_1"
app:layout_constraintBottom_toTopOf="@+id/dialog_text_memo_included"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/dialog_text_to"
app:layout_constraintTop_toBottomOf="@id/dialog_text_title" />
<TextView
android:id="@+id/dialog_text_memo_included"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_check_black_24dp"
android:drawablePadding="8dp"
android:drawableTint="@color/colorPrimary"
android:paddingTop="30dp"
android:paddingBottom="30dp"
android:text="Includes a transaction memo"
android:textColor="@color/text_dark_dimmed"
android:textSize="@dimen/text_size_body_1"
app:layout_constraintBottom_toTopOf="@id/dialog_divider"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/dialog_text_address" />
<View
android:id="@+id/dialog_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider_background"
app:layout_constraintBottom_toTopOf="@+id/dialog_submit_button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/dialog_text_memo_included" />
<Button
android:id="@+id/dialog_submit_button"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@null"
android:text="swipe right to send"
android:textColor="@color/colorPrimary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/dialog_divider" />
</androidx.constraintlayout.widget.ConstraintLayout>
<!-- -->

1
zcash-android-wallet-app/app/src/main/res/values/colors.xml
View File

@ -61,6 +61,7 @@
<color name="launcher_icon_background">@color/zcashPrimaryMedium</color>
<color name="receive_title_background">@color/zcashBlack_12</color>
<color name="home_transaction_item_background">@color/zcashBlueGray</color>
<color name="divider_background">@color/zcashBlack_12</color>
<!-- controls -->
<color name="progress_bar_active">@color/zcashBlack_12</color>