Browse Source

Puposhis

pull/18/head
fekt 1 year ago
parent
commit
27bb4632a0
  1. 5
      app/src/main/java/cash/z/ecc/android/ui/profile/ProfileFragment.kt
  2. 4
      app/src/main/java/cash/z/ecc/android/ui/setup/LandingFragment.kt
  3. 24
      app/src/main/res/layout/fragment_profile.xml
  4. 2
      app/src/main/res/layout/fragment_restore.xml
  5. 2
      app/src/main/res/values/missing_translation.xml

5
app/src/main/java/cash/z/ecc/android/ui/profile/ProfileFragment.kt

@ -56,6 +56,8 @@ class ProfileFragment : BaseFragment<FragmentProfileBinding>() {
onRescanWallet()
}
binding.textVersion.text = BuildConfig.VERSION_NAME
/*
onClick(binding.buttonLogs) {
tapped(PROFILE_VIEW_USER_LOGS)
onViewLogs()
@ -64,7 +66,8 @@ class ProfileFragment : BaseFragment<FragmentProfileBinding>() {
tapped(PROFILE_VIEW_DEV_LOGS)
onViewDevLogs()
true
}
}*/
binding.iconProfile.setOnLongClickListener {
tapped(AWESOME_OPEN)
onEnterAwesomeMode()

4
app/src/main/java/cash/z/ecc/android/ui/setup/LandingFragment.kt

@ -57,7 +57,7 @@ class LandingFragment : BaseFragment<FragmentLandingBinding>() {
tapped(DEVELOPER_WALLET_PROMPT)
if (binding.buttonNegative.text.toString().toLowerCase(locale()) == "restore") {
MaterialAlertDialogBuilder(requireContext())
.setMessage("Would you like to import the dev wallet?\n\nIf so, please only send 1000 zatoshis at a time and return some later so that the account remains funded.")
.setMessage("Would you like to import the dev wallet?\n\nIf so, please only send 1000 puposhis at a time and return some later so that the account remains funded. Or be greedy and steal it all. Nobody will know it was you :)")
.setTitle("Import Dev Wallet?")
.setCancelable(true)
.setPositiveButton("Import") { dialog, _ ->
@ -142,7 +142,7 @@ class LandingFragment : BaseFragment<FragmentLandingBinding>() {
ZcashNetwork.Mainnet -> {
seedPhrase =
"still champion voice habit trend flight survey between bitter process artefact blind carbon truly provide dizzy crush flush breeze blouse charge solid fish spread"
birthday = BlockHeight.new(ZcashNetwork.Mainnet, 991645) // 663174
birthday = BlockHeight.new(ZcashNetwork.Mainnet, 1170000) // 663174
}
ZcashNetwork.Testnet -> {
seedPhrase =

24
app/src/main/res/layout/fragment_profile.xml

@ -202,19 +202,6 @@
app:layout_constraintStart_toStartOf="@id/guideline_content_start"
app:layout_constraintTop_toBottomOf="@id/button_backup" />
<TextView
android:id="@+id/button_logs"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
style="@style/TextAppearance.AppCompat.Body1"
android:text="@string/profile_see_application_logs"
android:textColor="@color/selector_button_text_light_dimmed"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/button_rescan" />
<!-- -->
<!-- Banner -->
<!-- -->
@ -223,18 +210,19 @@
android:id="@+id/text_banner_message"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="64dp"
android:background="@drawable/background_banner"
android:elevation="6dp"
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/profile_ecc_wallet"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:textColor="@color/selector_button_text_light"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/guideline_content_end"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="@id/guideline_content_start"
app:layout_constraintTop_toBottomOf="@id/button_logs"
app:layout_constraintBottom_toBottomOf="parent"
tools:ignore="RtlSymmetry" />
<TextView
@ -243,10 +231,10 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:elevation="6dp"
tools:text="v1.0.0-alpha05"
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
android:textColor="@color/text_light_dimmed"
app:layout_constraintBaseline_toBaselineOf="@id/text_banner_message"
app:layout_constraintEnd_toEndOf="@id/text_banner_message" />
app:layout_constraintEnd_toEndOf="@id/text_banner_message"
tools:text="v1.0.0-alpha05" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/fragment_restore.xml

@ -81,7 +81,7 @@
android:layout_marginTop="16dp"
android:hint="Enter wallet birthday height (recommended)"
android:theme="@style/Zcash.Overlay.TextInputLayout"
app:helperText="e.g. 419,200. This determines where to start scanning for transactions. Leave it blank to scan from the beginning, which takes a while."
app:helperText="e.g. 1,170,000. This determines where to start scanning for transactions. Leave it blank to scan from the beginning, which takes a while."
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/divider_bottom"

2
app/src/main/res/values/missing_translation.xml

@ -80,7 +80,7 @@
<string name="missing_send_memo_included_message">Your transaction is shielded but your address will be sent to the recipient via the memo</string>
<string name="missing_send_pending_button_text">Cancel</string>
<string name="missing_send_validation_address_invalid">This address appears to be invalid</string>
<string name="missing_send_validation_error_amount_minimum">Please go back and enter at least 1 Zatoshi.</string>
<string name="missing_send_validation_error_amount_minimum">Please go back and enter at least 1 Puposhi.</string>
<string name="missing_send_validation_error_dust">Insufficient funds to cover miner\'s fee.</string>
<string name="missing_send_validation_error_memo_length">Memo must be less than %1$d in length.</string>
<string name="missing_send_validation_error_too_much">Please go back and enter no more than %1$s %2$s.</string>

Loading…
Cancel
Save