agorise/bitsy-wallet
agorise/bitsy-wallet
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Change brainkey error description and create and import button labels in ImportBrainkeyFragment. Also added an 'Or' string between the import and create buttons.

Browse source
This commit is contained in:
Severiano Jaramillo 2019-01-10 15:57:53 -06:00
parent 8a02ab43df
commit 67ad71ff88
2 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/res/layout/fragment_import_brainkey.xml
View file

@ -79,24 +79,40 @@
android:layout_marginTop="@dimen/spacing_different_topic" android:layout_marginTop="@dimen/spacing_different_topic"
android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginEnd="@dimen/activity_horizontal_margin" android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:text="@string/button__import"/> android:text="@string/button__import_existing_account"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/activity_horizontal_margin">
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="@dimen/spacing_different_topic" android:layout_centerVertical="true"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:background="@color/black"/> android:background="@color/black"/>
<TextView
android:id="@+id/tvOR"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:background="?android:colorBackground"
android:layout_centerHorizontal="true"
android:text="@string/text__or"
android:textAllCaps="true"
android:textAppearance="@style/TextAppearance.Bitsy.Body1"/>
</RelativeLayout>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/btnCreate" android:id="@+id/btnCreate"
style="@style/Widget.Bitsy.Button" style="@style/Widget.Bitsy.Button"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_different_topic"
android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginEnd="@dimen/activity_horizontal_margin" android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:text="@string/button__create"/> android:text="@string/button__create_new_account"/>
</LinearLayout> </LinearLayout>

10
app/src/main/res/values/strings.xml
View file

@ -12,11 +12,10 @@
<string name="text_field__confirm_pin">Confirm PIN</string> <string name="text_field__confirm_pin">Confirm PIN</string>
<string name="error__pin_mismatch">PIN mismatch</string> <string name="error__pin_mismatch">PIN mismatch</string>
<string name="text__brain_key">BrainKey</string> <string name="text__brain_key">BrainKey</string>
<string name="error__enter_correct_brainkey">Please enter correct brainkey, it should have between 12 and 16 <string name="error__enter_correct_brainkey">Please enter correct brainkey, it should have 12 or 16 words.</string>
words. <string name="button__import_existing_account">Import existing account</string>
</string> <string name="text__or">Or</string>
<string name="button__import">Import</string> <string name="button__create_new_account">Create new account</string>
<string name="button__create">Create</string>
<!-- TODO improve below error explanation --> <!-- TODO improve below error explanation -->
<string name="error__invalid_brainkey">Invalid account, please check your brainkey for typing errors</string> <string name="error__invalid_brainkey">Invalid account, please check your brainkey for typing errors</string>
<string name="error__try_again">Please try again after 5 minutes</string> <string name="error__try_again">Please try again after 5 minutes</string>
@ -36,6 +35,7 @@
<string name="error__faucet">The server returned an error. This might be due to a limitation purposefully set in place to disallow frequent requests coming from the same IP address in a short time lapse. Please wait 5 minutes and try again, or switch to a different network, for example from wifi to cell.</string> <string name="error__faucet">The server returned an error. This might be due to a limitation purposefully set in place to disallow frequent requests coming from the same IP address in a short time lapse. Please wait 5 minutes and try again, or switch to a different network, for example from wifi to cell.</string>
<string name="error__faucet_template">The faucet returned an error. Msg: %1$s</string> <string name="error__faucet_template">The faucet returned an error. Msg: %1$s</string>
<string name="error__created_account_not_found">The app could not retrieve information about the newly created account</string> <string name="error__created_account_not_found">The app could not retrieve information about the newly created account</string>
<string name="button__create">Create</string>
<!-- Home --> <!-- Home -->
<string name="title_transactions">Transactions</string> <string name="title_transactions">Transactions</string>