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

Align exit icons across all screens.

This commit is contained in:
Kevin Gorham 2020-09-25 11:49:38 -04:00
parent 5e2f79ba62
commit bda474e65d
No known key found for this signature in database
GPG Key ID: CCA55602DF49FC38
3 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/cash/z/ecc/android/ui/profile/ProfileFragment.kt
View File

@ -39,7 +39,7 @@ class ProfileFragment : BaseFragment<FragmentProfileBinding>() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
binding.hitAreaSettings.onClickNavTo(R.id.action_nav_profile_to_nav_settings) binding.hitAreaSettings.onClickNavTo(R.id.action_nav_profile_to_nav_settings)
binding.hitAreaClose.onClickNavBack() { tapped(PROFILE_CLOSE) } binding.hitAreaExit.onClickNavBack() { tapped(PROFILE_CLOSE) }
binding.buttonBackup.onClickNavTo(R.id.action_nav_profile_to_nav_backup) { tapped(PROFILE_BACKUP) } binding.buttonBackup.onClickNavTo(R.id.action_nav_profile_to_nav_backup) { tapped(PROFILE_BACKUP) }
binding.buttonFeedback.onClickNavTo(R.id.action_nav_profile_to_nav_feedback) { binding.buttonFeedback.onClickNavTo(R.id.action_nav_profile_to_nav_feedback) {
tapped(PROFILE_SEND_FEEDBACK) tapped(PROFILE_SEND_FEEDBACK)

80
app/src/main/res/layout/fragment_profile.xml
View File

@ -2,9 +2,9 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/background_home"> android:background="@drawable/background_home">
<androidx.constraintlayout.widget.Guideline <androidx.constraintlayout.widget.Guideline
@ -36,11 +36,11 @@
app:layout_constraintGuide_percent="0.85" /> app:layout_constraintGuide_percent="0.85" />
<View <View
android:id="@+id/hit_area_settings" android:id="@+id/hit_area_exit"
android:layout_width="68dp" android:layout_width="68dp"
android:layout_height="68dp" android:layout_height="68dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:alpha="0.3" android:alpha="0.3"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:elevation="6dp" android:elevation="6dp"
@ -49,21 +49,23 @@
app:layout_constraintTop_toTopOf="@id/guideline_hit_area_top" /> app:layout_constraintTop_toTopOf="@id/guideline_hit_area_top" />
<ImageView <ImageView
android:id="@+id/icon_settings" android:id="@+id/icon_exit"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginStart="44dp"
android:elevation="6dp" android:elevation="6dp"
android:tint="@color/text_light_dimmed"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="H,1:1" app:layout_constraintDimensionRatio="H,1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.088"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.064" app:layout_constraintVertical_bias="0.065"
app:layout_constraintWidth_percent="0.08" app:layout_constraintWidth_percent="0.08"
app:srcCompat="@drawable/ic_settings" /> app:srcCompat="@drawable/ic_cancel" />
<ImageView <ImageView
android:id="@+id/icon_close" android:id="@+id/icon_settings"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:elevation="6dp" android:elevation="6dp"
@ -74,9 +76,9 @@
app:layout_constraintHorizontal_bias="0.912" app:layout_constraintHorizontal_bias="0.912"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.064" app:layout_constraintVertical_bias="0.065"
app:layout_constraintWidth_percent="0.08" app:layout_constraintWidth_percent="0.08"
app:srcCompat="@drawable/ic_cancel" /> app:srcCompat="@drawable/ic_settings" />
<ImageView <ImageView
android:id="@+id/icon_profile" android:id="@+id/icon_profile"
@ -93,7 +95,7 @@
app:srcCompat="@drawable/ic_profile_zebra_01" /> app:srcCompat="@drawable/ic_profile_zebra_01" />
<View <View
android:id="@+id/hit_area_close" android:id="@+id/hit_area_settings"
android:layout_width="68dp" android:layout_width="68dp"
android:layout_height="68dp" android:layout_height="68dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
@ -108,35 +110,35 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
style="@style/TextAppearance.AppCompat.Body1" style="@style/TextAppearance.AppCompat.Body1"
android:textSize="20sp"
android:text="@string/profile_shielded_user" android:text="@string/profile_shielded_user"
app:layout_constraintTop_toBottomOf="@id/icon_profile" android:textSize="20sp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/icon_profile" />
<TextView <TextView
android:id="@+id/text_address" android:id="@+id/text_address"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/Zcash.TextAppearance.AddressPart" style="@style/Zcash.TextAppearance.AddressPart"
android:textSize="16sp"
tools:text="zs1g7cqw...9qmvyzgm"
android:textColor="@color/text_light_dimmed" android:textColor="@color/text_light_dimmed"
app:layout_constraintTop_toBottomOf="@id/text_username" android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/text_username"
tools:text="zs1g7cqw...9qmvyzgm" />
<ImageView <ImageView
android:id="@+id/image_copy" android:id="@+id/image_copy"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:src="@drawable/ic_content_copy" android:src="@drawable/ic_content_copy"
app:layout_constraintTop_toTopOf="@id/text_address"
app:layout_constraintBottom_toBottomOf="@id/text_address" app:layout_constraintBottom_toBottomOf="@id/text_address"
app:layout_constraintStart_toEndOf="@id/text_address" app:layout_constraintDimensionRatio="W,1:1"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.15" app:layout_constraintHorizontal_bias="0.15"
app:layout_constraintDimensionRatio="W,1:1"/> app:layout_constraintStart_toEndOf="@id/text_address"
app:layout_constraintTop_toTopOf="@id/text_address" />
<View <View
android:id="@+id/hit_area_address" android:id="@+id/hit_area_address"
@ -144,10 +146,10 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:onClick="copyAddress" android:onClick="copyAddress"
app:layout_constraintStart_toStartOf="@id/text_address"
app:layout_constraintEnd_toEndOf="@id/guideline_content_end"
app:layout_constraintTop_toTopOf="@id/text_username"
app:layout_constraintBottom_toTopOf="@id/button_feedback" app:layout_constraintBottom_toTopOf="@id/button_feedback"
app:layout_constraintEnd_toEndOf="@id/guideline_content_end"
app:layout_constraintStart_toStartOf="@id/text_address"
app:layout_constraintTop_toTopOf="@id/text_username"
tools:background="@color/spacer" /> tools:background="@color/spacer" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
@ -155,15 +157,15 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/Zcash.Button" style="@style/Zcash.Button"
android:gravity="center"
android:padding="12dp"
android:text="@string/profile_send_feedback" android:text="@string/profile_send_feedback"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:textColor="#000000" android:textColor="#000000"
android:gravity="center"
android:padding="12dp"
app:layout_constraintStart_toStartOf="@id/guideline_content_start"
app:layout_constraintEnd_toEndOf="@id/guideline_content_end"
app:layout_constraintTop_toBottomOf="@id/text_address"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/guideline_content_end"
app:layout_constraintStart_toStartOf="@id/guideline_content_start"
app:layout_constraintTop_toBottomOf="@id/text_address"
app:layout_constraintVertical_bias="0.1" /> app:layout_constraintVertical_bias="0.1" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
@ -171,13 +173,13 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/Zcash.Button.OutlinedButton" style="@style/Zcash.Button.OutlinedButton"
android:gravity="center"
android:padding="12dp"
android:text="@string/profile_backup_wallet" android:text="@string/profile_backup_wallet"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:textColor="@color/text_light" android:textColor="@color/text_light"
android:gravity="center"
android:padding="12dp"
app:layout_constraintStart_toStartOf="@id/guideline_content_start"
app:layout_constraintEnd_toEndOf="@id/guideline_content_end" app:layout_constraintEnd_toEndOf="@id/guideline_content_end"
app:layout_constraintStart_toStartOf="@id/guideline_content_start"
app:layout_constraintTop_toBottomOf="@id/button_feedback" /> app:layout_constraintTop_toBottomOf="@id/button_feedback" />
<TextView <TextView
@ -186,12 +188,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
style="@style/TextAppearance.AppCompat.Body1" style="@style/TextAppearance.AppCompat.Body1"
android:textSize="16sp"
android:text="@string/profile_see_application_logs" android:text="@string/profile_see_application_logs"
android:textColor="@color/selector_button_text_light_dimmed" android:textColor="@color/selector_button_text_light_dimmed"
app:layout_constraintTop_toBottomOf="@id/button_backup" android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/button_backup" />
<!-- --> <!-- -->
<!-- Banner --> <!-- Banner -->
@ -199,27 +201,27 @@
<TextView <TextView
android:id="@+id/text_banner_message" android:id="@+id/text_banner_message"
android:elevation="6dp"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/background_banner" android:background="@drawable/background_banner"
android:elevation="6dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:text="@string/profile_ecc_wallet" android:text="@string/profile_ecc_wallet"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:textColor="@color/selector_button_text_light" android:textColor="@color/selector_button_text_light"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/guideline_content_end" app:layout_constraintEnd_toEndOf="@id/guideline_content_end"
app:layout_constraintStart_toStartOf="@id/guideline_content_start" app:layout_constraintStart_toStartOf="@id/guideline_content_start"
app:layout_constraintTop_toBottomOf="@id/button_logs" app:layout_constraintTop_toBottomOf="@id/button_logs" />
app:layout_constraintBottom_toBottomOf="parent"/>
<TextView <TextView
android:id="@+id/text_version" android:id="@+id/text_version"
android:elevation="6dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:elevation="6dp"
android:text="@string/profile_app_version" android:text="@string/profile_app_version"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:textColor="@color/text_light_dimmed" android:textColor="@color/text_light_dimmed"

19
app/src/main/res/layout/fragment_receive_new.xml
View File

@ -128,25 +128,26 @@
<!-- Back Button --> <!-- Back Button -->
<ImageView <ImageView
android:id="@+id/back_button" android:id="@+id/back_button"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:tint="@color/text_light" android:tint="@color/text_light_dimmed"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.05" app:layout_constraintHorizontal_bias="0.088"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintDimensionRatio="H,1:1"
app:layout_constraintWidth_percent="0.08"
app:layout_constraintVertical_bias="0.065" app:layout_constraintVertical_bias="0.065"
app:srcCompat="@drawable/ic_close_black_24dp" /> app:srcCompat="@drawable/ic_cancel" />
<View <View
android:id="@+id/back_button_hit_area" android:id="@+id/back_button_hit_area"
android:layout_width="56dp" android:layout_width="68dp"
android:layout_height="56dp" android:layout_height="68dp"
android:layout_marginStart="24dp"
android:clickable="true" android:clickable="true"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.01"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.045" /> app:layout_constraintVertical_bias="0.045" />