Mirrors
/
xmrwallet
mirror of https://github.com/m2049r/xmrwallet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

textfields are filled (#631)

This commit is contained in:
m2049r 2019-11-10 11:06:34 +01:00 committed by GitHub
parent c65508d288
commit 6d61841cf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 107 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/res/layout/fragment_generate.xml
View File

@ -18,11 +18,13 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/etWalletName" android:id="@+id/etWalletName"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
app:counterEnabled="true" app:counterEnabled="true"
app:counterMaxLength="20" app:counterMaxLength="20"
android:layout_marginEnd="4dp"
app:errorEnabled="true"> app:errorEnabled="true">
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
@ -39,7 +41,9 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/etWalletPassword" android:id="@+id/etWalletPassword"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_marginStart="4dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"> android:layout_weight="1">
@ -78,6 +82,7 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/etWalletMnemonic" android:id="@+id/etWalletMnemonic"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"
@ -95,6 +100,7 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/etWalletAddress" android:id="@+id/etWalletAddress"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"
@ -115,6 +121,7 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/etWalletViewKey" android:id="@+id/etWalletViewKey"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"
@ -134,6 +141,7 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/etWalletSpendKey" android:id="@+id/etWalletSpendKey"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"
@ -153,6 +161,7 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/etWalletRestoreHeight" android:id="@+id/etWalletRestoreHeight"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"

10
app/src/main/res/layout/fragment_receive.xml
View File

@ -84,16 +84,17 @@
android:id="@+id/evAmount" android:id="@+id/evAmount"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:orientation="vertical" /> android:orientation="vertical" />
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/etNotes" android:id="@+id/etNotes"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<EditText <android.support.design.widget.TextInputEditText
style="@style/MoneroEdit" style="@style/MoneroEdit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -101,7 +102,6 @@
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:inputType="textMultiLine" android:inputType="textMultiLine"
android:textAlignment="textStart" /> android:textAlignment="textStart" />
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
<RelativeLayout <RelativeLayout
@ -128,8 +128,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:drawablePadding="4dp"
android:drawableStart="@drawable/ic_info_outline_gray_24dp" android:drawableStart="@drawable/ic_info_outline_gray_24dp"
android:drawablePadding="4dp"
android:text="@string/label_receive_info_gen_qr_code" android:text="@string/label_receive_info_gen_qr_code"
android:textAlignment="center" android:textAlignment="center"
android:textSize="16sp" android:textSize="16sp"
@ -149,8 +149,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:drawablePadding="8dp"
android:drawableStart="@drawable/ic_nfc_black_24dp" android:drawableStart="@drawable/ic_nfc_black_24dp"
android:drawablePadding="8dp"
android:gravity="center" android:gravity="center"
android:text="@string/nfc_tag_tap" android:text="@string/nfc_tag_tap"
android:visibility="visible" /> android:visibility="visible" />

5
app/src/main/res/layout/fragment_send_address.xml
View File

@ -29,6 +29,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:id="@+id/etAddress" android:id="@+id/etAddress"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -118,6 +119,7 @@
android:visibility="visible"> android:visibility="visible">
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:id="@+id/etPaymentId" android:id="@+id/etPaymentId"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -153,11 +155,12 @@
</FrameLayout> </FrameLayout>
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:id="@+id/etNotes" android:id="@+id/etNotes"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<EditText <android.support.design.widget.TextInputEditText
style="@style/MoneroEdit" style="@style/MoneroEdit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

11
app/src/main/res/layout/fragment_tx_info.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -225,14 +226,20 @@
android:padding="8sp" android:padding="8sp"
android:text="@string/tx_notes" /> android:text="@string/tx_notes" />
<EditText <android.support.design.widget.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.design.widget.TextInputEditText
android:id="@+id/etTxNotes" android:id="@+id/etTxNotes"
style="@style/MoneroEdit" style="@style/MoneroEdit"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:backgroundTint="@color/moneroGray" android:backgroundTint="@color/moneroGray"
android:hint="@string/tx_notes_hint" android:hint="@string/tx_notes_hint"
android:inputType="textMultiLine" /> android:inputType="textMultiLine" />
</android.support.design.widget.TextInputLayout>
</TableRow> </TableRow>
<TableRow> <TableRow>

2
app/src/main/res/layout/prompt_changepw.xml
View File

@ -12,6 +12,7 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/etWalletPasswordA" android:id="@+id/etWalletPasswordA"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:errorEnabled="true"> app:errorEnabled="true">
@ -28,6 +29,7 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/etWalletPasswordB" android:id="@+id/etWalletPasswordB"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/section_top" android:layout_marginTop="@dimen/section_top"

9
app/src/main/res/layout/prompt_editnode.xml
View File

@ -8,8 +8,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:orientation="vertical"> android:orientation="vertical">
@ -22,6 +22,7 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/etNodeHost" android:id="@+id/etNodeHost"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="8" android:layout_weight="8"
@ -41,6 +42,7 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/etNodePort" android:id="@+id/etNodePort"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2" android:layout_weight="2"
@ -61,6 +63,7 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/etNodeName" android:id="@+id/etNodeName"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/data_top"> android:layout_marginTop="@dimen/data_top">
@ -85,6 +88,7 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/etNodeUser" android:id="@+id/etNodeUser"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"> android:layout_weight="1">
@ -103,6 +107,7 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/etNodePass" android:id="@+id/etNodePass"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"> android:layout_weight="1">
@ -142,8 +147,8 @@
style="@style/MoneroText.Medium" style="@style/MoneroText.Medium"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_alignBaseline="@+id/tvResultLabel" android:layout_alignBaseline="@+id/tvResultLabel"
android:layout_marginStart="4dp"
android:layout_toEndOf="@+id/tvResultLabel" android:layout_toEndOf="@+id/tvResultLabel"
android:textAlignment="textStart" android:textAlignment="textStart"
tools:text="Blockheight: 1710998 (v9), Ping: 187ms" /> tools:text="Blockheight: 1710998 (v9), Ping: 187ms" />

6
app/src/main/res/layout/prompt_ledger_seed.xml
View File

@ -20,12 +20,13 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:textColor="@color/colorAccent"
android:labelFor="@+id/etSeed" android:labelFor="@+id/etSeed"
android:text="@string/prompt_ledger_seed_warn" /> android:text="@string/prompt_ledger_seed_warn"
android:textColor="@color/colorAccent" />
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/etSeed" android:id="@+id/etSeed"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:errorEnabled="true"> app:errorEnabled="true">
@ -42,6 +43,7 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/etPassphrase" android:id="@+id/etPassphrase"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:errorEnabled="true"> app:errorEnabled="true">

5
app/src/main/res/layout/prompt_password.xml
View File

@ -8,10 +8,11 @@
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/etPassword" android:id="@+id/etPassword"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:passwordToggleEnabled="true" app:errorEnabled="true"
app:errorEnabled="true"> app:passwordToggleEnabled="true">
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
style="@style/MoneroEdit" style="@style/MoneroEdit"

13
app/src/main/res/layout/prompt_rename.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
@ -10,16 +11,22 @@
style="@style/MoneroLabel" style="@style/MoneroLabel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/prompt_rename"
android:labelFor="@+id/etRename" android:labelFor="@+id/etRename"
android:text="@string/prompt_rename"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textAppearance="?android:attr/textAppearanceLarge" />
<EditText <android.support.design.widget.TextInputLayout
android:id="@+id/etPassword"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.design.widget.TextInputEditText
android:id="@+id/etRename" android:id="@+id/etRename"
style="@style/MoneroEdit" style="@style/MoneroEdit"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:imeOptions="normal" android:imeOptions="normal"
android:inputType="text" /> android:inputType="text" />
</android.support.design.widget.TextInputLayout>
</LinearLayout> </LinearLayout>

1
app/src/main/res/layout/view_exchange.xml
View File

@ -21,6 +21,7 @@
<com.m2049r.xmrwallet.widget.CTextInputLayout <com.m2049r.xmrwallet.widget.CTextInputLayout
android:id="@+id/etAmount" android:id="@+id/etAmount"
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"

8
app/src/main/res/layout/view_exchange_btc_edit.xml
View File

@ -17,7 +17,12 @@
android:gravity="center" android:gravity="center"
android:textAlignment="center" /> android:textAlignment="center" />
<EditText <android.support.design.widget.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.design.widget.TextInputEditText
android:id="@+id/etAmountA" android:id="@+id/etAmountA"
style="@style/MoneroText.Balance.Orange" style="@style/MoneroText.Balance.Orange"
android:layout_width="0dp" android:layout_width="0dp"
@ -32,6 +37,7 @@
android:singleLine="true" android:singleLine="true"
android:textAlignment="textStart" android:textAlignment="textStart"
tools:text="87.00000" /> tools:text="87.00000" />
</android.support.design.widget.TextInputLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout

8
app/src/main/res/layout/view_exchange_edit.xml
View File

@ -18,7 +18,12 @@
android:gravity="center" android:gravity="center"
android:textAlignment="center" /> android:textAlignment="center" />
<EditText <android.support.design.widget.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.design.widget.TextInputEditText
android:id="@+id/etAmountA" android:id="@+id/etAmountA"
style="@style/MoneroText.Balance.Orange" style="@style/MoneroText.Balance.Orange"
android:layout_width="0dp" android:layout_width="0dp"
@ -33,6 +38,7 @@
android:singleLine="true" android:singleLine="true"
android:textAlignment="textStart" android:textAlignment="textStart"
tools:text="87.00000" /> tools:text="87.00000" />
</android.support.design.widget.TextInputLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout