diff --git a/app/src/main/java/cash/z/ecc/android/ui/profile/ProfileFragment.kt b/app/src/main/java/cash/z/ecc/android/ui/profile/ProfileFragment.kt index f352751..5ee6ea8 100644 --- a/app/src/main/java/cash/z/ecc/android/ui/profile/ProfileFragment.kt +++ b/app/src/main/java/cash/z/ecc/android/ui/profile/ProfileFragment.kt @@ -56,6 +56,8 @@ class ProfileFragment : BaseFragment() { onRescanWallet() } binding.textVersion.text = BuildConfig.VERSION_NAME + + /* onClick(binding.buttonLogs) { tapped(PROFILE_VIEW_USER_LOGS) onViewLogs() @@ -64,7 +66,8 @@ class ProfileFragment : BaseFragment() { tapped(PROFILE_VIEW_DEV_LOGS) onViewDevLogs() true - } + }*/ + binding.iconProfile.setOnLongClickListener { tapped(AWESOME_OPEN) onEnterAwesomeMode() diff --git a/app/src/main/java/cash/z/ecc/android/ui/setup/LandingFragment.kt b/app/src/main/java/cash/z/ecc/android/ui/setup/LandingFragment.kt index ea61697..fd42124 100644 --- a/app/src/main/java/cash/z/ecc/android/ui/setup/LandingFragment.kt +++ b/app/src/main/java/cash/z/ecc/android/ui/setup/LandingFragment.kt @@ -57,7 +57,7 @@ class LandingFragment : BaseFragment() { 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() { 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 = diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index fb02445..23f44fe 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/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" /> - - @@ -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" /> + app:layout_constraintEnd_toEndOf="@id/text_banner_message" + tools:text="v1.0.0-alpha05" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_restore.xml b/app/src/main/res/layout/fragment_restore.xml index c021f44..559c47f 100644 --- a/app/src/main/res/layout/fragment_restore.xml +++ b/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" diff --git a/app/src/main/res/values/missing_translation.xml b/app/src/main/res/values/missing_translation.xml index 1b27e54..7eb3849 100644 --- a/app/src/main/res/values/missing_translation.xml +++ b/app/src/main/res/values/missing_translation.xml @@ -80,7 +80,7 @@ Your transaction is shielded but your address will be sent to the recipient via the memo Cancel This address appears to be invalid - Please go back and enter at least 1 Zatoshi. + Please go back and enter at least 1 Puposhi. Insufficient funds to cover miner\'s fee. Memo must be less than %1$d in length. Please go back and enter no more than %1$s %2$s.