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

Make numberpad not respond to taps while disabled. 

Addresses item 2 in issue #1
This commit is contained in:
Kevin Gorham 2019-12-13 05:59:56 -05:00
parent a36fa8b4d4
commit 1e232a726c
No known key found for this signature in database
GPG Key ID: CCA55602DF49FC38
4 changed files with 80 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -8,7 +8,7 @@ apply plugin: 'kotlin-kapt'
archivesBaseName = 'zcash-android-wallet'
group = 'cash.z.ecc.android'
version = '1.0.0-alpha01'
version = '1.0.0-alpha02'
android {
compileSdkVersion Deps.compileSdkVersion
@ -18,7 +18,7 @@ android {
applicationId 'cash.z.ecc.android'
minSdkVersion Deps.minSdkVersion
targetSdkVersion Deps.targetSdkVersion
versionCode = 1_00_00_001
versionCode = 1_00_00_002
// last digits are alpha(0XX) beta(2XX) rc(4XX) release(8XX). Ex: 1_08_04_401 is an release candidate build of version 1.8.4 and 1_08_04_800 would be the final release.
versionName = "$version"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

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

@ -16,27 +16,43 @@ import dagger.Module
import dagger.android.ContributesAndroidInjector
class HomeFragment : BaseFragment<FragmentHomeBinding>() {
private lateinit var numberPad: List<TextView>
override fun inflate(inflater: LayoutInflater): FragmentHomeBinding =
FragmentHomeBinding.inflate(inflater)
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
with(binding) {
numberPad = arrayListOf(
buttonNumberPad0,
buttonNumberPad1,
buttonNumberPad2,
buttonNumberPad3,
buttonNumberPad4,
buttonNumberPad5,
buttonNumberPad6,
buttonNumberPad7,
buttonNumberPad8,
buttonNumberPad9,
buttonNumberPadDecimal,
buttonNumberPadBack
)
hitAreaReceive.onClickNavTo(R.id.action_nav_home_to_nav_receive)
iconDetail.onClickNavTo(R.id.action_nav_home_to_nav_detail)
textDetail.onClickNavTo(R.id.action_nav_home_to_nav_detail)
hitAreaScan.onClickNavTo(R.id.action_nav_home_to_nav_send)
textBannerAction.setOnClickListener {
onBannerAction(BannerAction.from((it as? TextView)?.text?.toString()))
}
}
// TODO: trigger this from presenter
onNoFunds()
}
override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
binding.hitAreaReceive.onClickNavTo(R.id.action_nav_home_to_nav_receive)
binding.iconDetail.onClickNavTo(R.id.action_nav_home_to_nav_detail)
binding.textDetail.onClickNavTo(R.id.action_nav_home_to_nav_detail)
binding.hitAreaScan.onClickNavTo(R.id.action_nav_home_to_nav_send)
binding.textBannerAction.setOnClickListener {
onBannerAction(BannerAction.from((it as? TextView)?.text?.toString()))
}
}
private fun onBannerAction(action: BannerAction) {
when (action) {
LEARN_MORE -> {

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

@ -55,16 +55,16 @@
<!-- -->
<!-- Calculator -->
<!-- Number Pad -->
<!-- -->
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/button_calculator_1"
android:id="@+id/button_number_pad_1"
android:layout_width="0dp"
android:layout_height="0dp"
style="@style/Zcash.TextView.Calculator"
style="@style/Zcash.TextView.NumberPad"
android:text="1"
app:layout_constraintBottom_toTopOf="@id/button_calculator_4"
app:layout_constraintBottom_toTopOf="@id/button_number_pad_4"
app:layout_constraintDimensionRatio="H,1:1"
app:layout_constraintStart_toStartOf="@id/guide_keys"
app:layout_constraintTop_toTopOf="@id/guide_keys"
@ -72,12 +72,12 @@
app:layout_constraintWidth_percent="@dimen/calculator_button_width_percent" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/button_calculator_2"
android:id="@+id/button_number_pad_2"
android:layout_width="0dp"
android:layout_height="0dp"
style="@style/Zcash.TextView.Calculator"
style="@style/Zcash.TextView.NumberPad"
android:text="2"
app:layout_constraintBottom_toTopOf="@id/button_calculator_5"
app:layout_constraintBottom_toTopOf="@id/button_number_pad_5"
app:layout_constraintDimensionRatio="H,1:1"
app:layout_constraintEnd_toEndOf="@id/guide_keys"
app:layout_constraintStart_toStartOf="@id/guide_keys"
@ -86,12 +86,12 @@
app:layout_constraintWidth_percent="@dimen/calculator_button_width_percent" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/button_calculator_3"
android:id="@+id/button_number_pad_3"
android:layout_width="0dp"
android:layout_height="0dp"
style="@style/Zcash.TextView.Calculator"
style="@style/Zcash.TextView.NumberPad"
android:text="3"
app:layout_constraintBottom_toTopOf="@id/button_calculator_6"
app:layout_constraintBottom_toTopOf="@id/button_number_pad_6"
app:layout_constraintDimensionRatio="H,1:1"
app:layout_constraintEnd_toEndOf="@id/guide_keys"
app:layout_constraintTop_toTopOf="@id/guide_keys"
@ -99,118 +99,118 @@
app:layout_constraintWidth_percent="@dimen/calculator_button_width_percent" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/button_calculator_4"
android:id="@+id/button_number_pad_4"
android:layout_width="0dp"
android:layout_height="0dp"
style="@style/Zcash.TextView.Calculator"
style="@style/Zcash.TextView.NumberPad"
android:text="4"
app:layout_constraintBottom_toTopOf="@id/button_calculator_7"
app:layout_constraintBottom_toTopOf="@id/button_number_pad_7"
app:layout_constraintDimensionRatio="H,1:1"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="@id/guide_keys"
app:layout_constraintTop_toBottomOf="@id/button_calculator_1"
app:layout_constraintTop_toBottomOf="@id/button_number_pad_1"
app:layout_constraintWidth_percent="@dimen/calculator_button_width_percent" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/button_calculator_5"
android:id="@+id/button_number_pad_5"
android:layout_width="0dp"
android:layout_height="0dp"
style="@style/Zcash.TextView.Calculator"
style="@style/Zcash.TextView.NumberPad"
android:text="5"
app:layout_constraintBottom_toTopOf="@id/button_calculator_8"
app:layout_constraintBottom_toTopOf="@id/button_number_pad_8"
app:layout_constraintDimensionRatio="H,1:1"
app:layout_constraintEnd_toEndOf="@id/guide_keys"
app:layout_constraintStart_toStartOf="@id/guide_keys"
app:layout_constraintTop_toBottomOf="@id/button_calculator_2"
app:layout_constraintTop_toBottomOf="@id/button_number_pad_2"
app:layout_constraintWidth_percent="@dimen/calculator_button_width_percent" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/button_calculator_6"
android:id="@+id/button_number_pad_6"
android:layout_width="0dp"
android:layout_height="0dp"
style="@style/Zcash.TextView.Calculator"
style="@style/Zcash.TextView.NumberPad"
android:text="6"
app:layout_constraintBottom_toTopOf="@id/button_calculator_9"
app:layout_constraintBottom_toTopOf="@id/button_number_pad_9"
app:layout_constraintDimensionRatio="H,1:1"
app:layout_constraintEnd_toEndOf="@id/guide_keys"
app:layout_constraintTop_toBottomOf="@id/button_calculator_3"
app:layout_constraintTop_toBottomOf="@id/button_number_pad_3"
app:layout_constraintWidth_percent="@dimen/calculator_button_width_percent" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/button_calculator_7"
android:id="@+id/button_number_pad_7"
android:layout_width="0dp"
android:layout_height="0dp"
style="@style/Zcash.TextView.Calculator"
style="@style/Zcash.TextView.NumberPad"
android:text="7"
app:layout_constraintBottom_toTopOf="@id/button_calculator_decimal"
app:layout_constraintBottom_toTopOf="@id/button_number_pad_decimal"
app:layout_constraintDimensionRatio="H,1:1"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="@id/guide_keys"
app:layout_constraintTop_toBottomOf="@id/button_calculator_4"
app:layout_constraintTop_toBottomOf="@id/button_number_pad_4"
app:layout_constraintWidth_percent="@dimen/calculator_button_width_percent" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/button_calculator_8"
android:id="@+id/button_number_pad_8"
android:layout_width="0dp"
android:layout_height="0dp"
style="@style/Zcash.TextView.Calculator"
style="@style/Zcash.TextView.NumberPad"
android:text="8"
app:layout_constraintBottom_toTopOf="@id/button_calculator_0"
app:layout_constraintBottom_toTopOf="@id/button_number_pad_0"
app:layout_constraintDimensionRatio="H,1:1"
app:layout_constraintEnd_toEndOf="@id/guide_keys"
app:layout_constraintStart_toStartOf="@id/guide_keys"
app:layout_constraintTop_toBottomOf="@id/button_calculator_5"
app:layout_constraintTop_toBottomOf="@id/button_number_pad_5"
app:layout_constraintWidth_percent="@dimen/calculator_button_width_percent" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/button_calculator_9"
android:id="@+id/button_number_pad_9"
android:layout_width="0dp"
android:layout_height="0dp"
style="@style/Zcash.TextView.Calculator"
style="@style/Zcash.TextView.NumberPad"
android:text="9"
app:layout_constraintBottom_toTopOf="@id/button_calculator_back"
app:layout_constraintBottom_toTopOf="@id/button_number_pad_back"
app:layout_constraintDimensionRatio="H,1:1"
app:layout_constraintEnd_toEndOf="@id/guide_keys"
app:layout_constraintTop_toBottomOf="@id/button_calculator_6"
app:layout_constraintTop_toBottomOf="@id/button_number_pad_6"
app:layout_constraintWidth_percent="@dimen/calculator_button_width_percent" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/button_calculator_decimal"
android:id="@+id/button_number_pad_decimal"
android:layout_width="0dp"
android:layout_height="0dp"
style="@style/Zcash.TextView.Calculator"
style="@style/Zcash.TextView.NumberPad"
android:paddingBottom="2dp"
android:text="."
app:layout_constraintBottom_toBottomOf="@id/guide_keys"
app:layout_constraintDimensionRatio="H,1:1"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="@id/guide_keys"
app:layout_constraintTop_toBottomOf="@id/button_calculator_7"
app:layout_constraintTop_toBottomOf="@id/button_number_pad_7"
app:layout_constraintWidth_percent="@dimen/calculator_button_width_percent" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/button_calculator_0"
android:id="@+id/button_number_pad_0"
android:layout_width="0dp"
android:layout_height="0dp"
style="@style/Zcash.TextView.Calculator"
style="@style/Zcash.TextView.NumberPad"
android:text="0"
app:layout_constraintBottom_toBottomOf="@id/guide_keys"
app:layout_constraintDimensionRatio="H,1:1"
app:layout_constraintEnd_toEndOf="@id/guide_keys"
app:layout_constraintStart_toStartOf="@id/guide_keys"
app:layout_constraintTop_toBottomOf="@id/button_calculator_8"
app:layout_constraintTop_toBottomOf="@id/button_number_pad_8"
app:layout_constraintWidth_percent="@dimen/calculator_button_width_percent" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/button_calculator_back"
android:id="@+id/button_number_pad_back"
android:layout_width="0dp"
android:layout_height="0dp"
style="@style/Zcash.TextView.Calculator"
style="@style/Zcash.TextView.NumberPad"
android:text="&lt;"
app:layout_constraintBottom_toBottomOf="@id/guide_keys"
app:layout_constraintDimensionRatio="H,1:1"
app:layout_constraintEnd_toEndOf="@id/guide_keys"
app:layout_constraintTop_toBottomOf="@id/button_calculator_9"
app:layout_constraintTop_toBottomOf="@id/button_number_pad_9"
app:layout_constraintWidth_percent="@dimen/calculator_button_width_percent" />
<!-- TODO: properly style this as a button with ripples -->
@ -232,6 +232,7 @@
android:id="@+id/layer_lock"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:background="#D0000000"
android:elevation="5dp" />
@ -327,6 +328,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:tint="@color/colorAccent"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="@id/text_send_amount"
app:layout_constraintEnd_toStartOf="@id/text_send_amount"
app:layout_constraintHeight_percent="0.052"
@ -342,9 +344,8 @@
android:layout_height="wrap_content"
android:gravity="center"
android:includeFontPadding="false"
android:text="0"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
android:textColor="@color/text_light"
android:text="$0"
android:textAppearance="@style/Zcash.TextAppearance.Zec"
android:textSize="72dp"
app:layout_constraintBottom_toTopOf="@id/guide_keys"
app:layout_constraintEnd_toEndOf="parent"

6
app/src/main/res/values/styles.xml
View File

@ -21,8 +21,8 @@
<!-- Text Styles -->
<style name="Zcash.TextView.Calculator" parent="Widget.AppCompat.TextView">
<item name="android:textAppearance">@style/Zcash.TextAppearance.Calculator</item>
<style name="Zcash.TextView.NumberPad" parent="Widget.AppCompat.TextView">
<item name="android:textAppearance">@style/Zcash.TextAppearance.NumberPad</item>
<item name="android:background">@drawable/selector_pressed_ripple_circle</item>
</style>
@ -32,7 +32,7 @@
<!-- Text Appearances -->
<style name="Zcash.TextAppearance.Calculator" parent="TextAppearance.MaterialComponents.Body1">
<style name="Zcash.TextAppearance.NumberPad" parent="TextAppearance.MaterialComponents.Body1">
<item name="android:textSize">30dp</item>
<item name="android:textColor">@color/selector_button_text</item>
</style>