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

Updated and corrected home screen icons.

This commit is contained in:
Kevin Gorham 2020-08-28 04:00:32 -04:00
parent 5b02f188f6
commit de84bcbe7c
No known key found for this signature in database
GPG Key ID: CCA55602DF49FC38
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/cash/z/ecc/android/ui/home/HomeFragment.kt
View File

@ -18,9 +18,7 @@ import cash.z.ecc.android.ui.home.HomeFragment.BannerAction.*
import cash.z.ecc.android.ui.send.SendViewModel
import cash.z.ecc.android.ui.setup.WalletSetupViewModel
import cash.z.ecc.android.ui.setup.WalletSetupViewModel.WalletSetupState.NO_SEED
import cash.z.ecc.android.sdk.Synchronizer
import cash.z.ecc.android.sdk.Synchronizer.Status.*
import cash.z.ecc.android.sdk.block.CompactBlockProcessor
import cash.z.ecc.android.sdk.ext.convertZatoshiToZecString
import cash.z.ecc.android.sdk.ext.convertZecToZatoshi
import cash.z.ecc.android.sdk.ext.safelyConvertToBigDecimal
@ -92,11 +90,9 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>() {
buttonNumberPadDecimal.asKey(),
buttonNumberPadBack.asKey()
)
hitAreaReceive.onClickNavTo(R.id.action_nav_home_to_nav_profile) { tapped(HOME_PROFILE) }
hitAreaScan.setOnClickListener {
mainActivity?.maybeOpenScan().also { tapped(HOME_SCAN) }
}
hitAreaProfile.onClickNavTo(R.id.action_nav_home_to_nav_profile) { tapped(HOME_PROFILE) }
textHistory.onClickNavTo(R.id.action_nav_home_to_nav_history) { tapped(HOME_HISTORY) }
hitAreaReceive.onClickNavTo(R.id.action_nav_home_to_nav_receive) { tapped(HOME_RECEIVE) }
textBannerAction.setOnClickListener {
onBannerAction(BannerAction.from((it as? TextView)?.text?.toString()))

26
app/src/main/res/layout/fragment_home.xml
View File

@ -294,20 +294,20 @@
android:id="@+id/icon_scan"
android:layout_width="0dp"
android:layout_height="0dp"
android:padding="2dp"
android:elevation="6dp"
app:tint="@color/colorAccent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toBottomOf="@id/icon_profile"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHeight_percent="0.052"
app:layout_constraintHeight_percent="0.038"
app:layout_constraintHorizontal_bias="0.088"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0574"
app:layout_constraintTop_toTopOf="@id/icon_profile"
app:layout_constraintWidth_percent="0.0887"
app:srcCompat="@drawable/ic_qrcode_24dp" />
app:srcCompat="@drawable/ic_address_qr" />
<ImageView
android:id="@+id/icon_logo"
android:id="@+id/icon_profile"
android:layout_width="0dp"
android:layout_height="0dp"
android:elevation="6dp"
@ -322,7 +322,7 @@
app:srcCompat="@drawable/ic_account_circle" />
<View
android:id="@+id/hit_area_scan"
android:id="@+id/hit_area_receive"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_marginStart="24dp"
@ -333,7 +333,7 @@
app:layout_constraintTop_toTopOf="@id/guideline_hit_area_top" />
<View
android:id="@+id/hit_area_receive"
android:id="@+id/hit_area_profile"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_marginEnd="24dp"
@ -354,10 +354,10 @@
app:autoSizeMaxTextSize="16sp"
app:autoSizeMinTextSize="2sp"
app:autoSizeTextType="uniform"
app:layout_constraintTop_toTopOf="@id/icon_logo"
app:layout_constraintBottom_toBottomOf="@id/icon_logo"
app:layout_constraintStart_toEndOf="@id/hit_area_scan"
app:layout_constraintEnd_toStartOf="@id/hit_area_receive" />
app:layout_constraintTop_toTopOf="@id/icon_profile"
app:layout_constraintBottom_toBottomOf="@id/icon_profile"
app:layout_constraintStart_toEndOf="@id/hit_area_receive"
app:layout_constraintEnd_toStartOf="@id/hit_area_profile" />
<TextView
android:id="@+id/text_history"
@ -411,7 +411,7 @@
android:text="No Balance"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:textColor="@color/text_light"
app:layout_constraintEnd_toEndOf="@id/icon_logo"
app:layout_constraintEnd_toEndOf="@id/icon_profile"
app:layout_constraintStart_toStartOf="@id/icon_scan"
app:layout_constraintTop_toBottomOf="@id/text_send_amount" />