From afc45e1cbca6799cbe2060905bb7e977ad8a6ad4 Mon Sep 17 00:00:00 2001
From: m2049r <30435443+m2049r@users.noreply.github.com>
Date: Wed, 16 Aug 2017 20:59:55 +0200
Subject: [PATCH] UI tweaks
---
.../com/m2049r/xmrwallet/GenerateFragment.java | 1 +
app/src/main/res/layout/gen_fragment.xml | 10 ----------
app/src/main/res/layout/gen_review_fragment.xml | 16 +++++-----------
3 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java b/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java
index 56dfae2f..755b1ea2 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/GenerateFragment.java
@@ -20,6 +20,7 @@ import android.app.Fragment;
import android.content.Context;
import android.os.Bundle;
import android.text.Editable;
+import android.text.InputType;
import android.text.TextWatcher;
import android.util.Log;
import android.view.KeyEvent;
diff --git a/app/src/main/res/layout/gen_fragment.xml b/app/src/main/res/layout/gen_fragment.xml
index 2fcf1158..101e94e8 100644
--- a/app/src/main/res/layout/gen_fragment.xml
+++ b/app/src/main/res/layout/gen_fragment.xml
@@ -46,7 +46,6 @@
android:hint="@string/generate_mnemonic_hint"
android:imeOptions="actionNext"
android:inputType="text"
- android:scrollHorizontally="false"
android:textAlignment="center"
android:textSize="16sp" />
@@ -72,7 +71,6 @@
android:id="@+id/etWalletViewKey"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center"
android:hint="@string/generate_viewkey_hint"
android:imeOptions="actionNext"
android:inputType="text"
@@ -111,12 +109,4 @@
android:enabled="false"
android:text="@string/generate_buttonGenerate" />
- <!-- <Button
- android:id="@+id/bReset"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
- android:background="@color/colorPrimary"
- android:text="@string/generate_button_reset" />
- -->
</LinearLayout>
diff --git a/app/src/main/res/layout/gen_review_fragment.xml b/app/src/main/res/layout/gen_review_fragment.xml
index 816143ab..a41a8b7d 100644
--- a/app/src/main/res/layout/gen_review_fragment.xml
+++ b/app/src/main/res/layout/gen_review_fragment.xml
@@ -40,13 +40,13 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
+ android:layout_marginBottom="8dp"
android:weightSum="2">
<TextView
android:id="@+id/tvWalletName"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
android:layout_weight="1"
android:text="@string/generate_name_hint"
android:textAlignment="center"
@@ -57,7 +57,6 @@
android:id="@+id/tvWalletPassword"
android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
android:layout_weight="1"
android:text="@string/generate_password_hint"
android:textAlignment="center"
@@ -78,7 +77,6 @@
android:id="@+id/tvWalletMnemonic"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
android:text="@string/generate_mnemonic_placeholder"
android:textAlignment="center"
android:textColor="@color/colorPrimaryDark"
@@ -88,6 +86,7 @@
android:id="@+id/tvWalletAddressLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
android:text="@string/generate_address_label"
android:textAlignment="center"
android:textColor="@color/colorAccent"
@@ -97,8 +96,6 @@
android:id="@+id/tvWalletAddress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginTop="8dp"
android:selectAllOnFocus="true"
android:text="@string/generate_address_placeholder"
android:textAlignment="center"
@@ -110,6 +107,7 @@
android:id="@+id/tvWalletViewKeyLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
android:text="@string/generate_viewkey_label"
android:textAlignment="center"
android:textColor="@color/colorAccent"
@@ -119,8 +117,6 @@
android:id="@+id/tvWalletViewKey"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginTop="8dp"
android:selectAllOnFocus="true"
android:text="@string/generate_viewkey_placeholder"
android:textAlignment="center"
@@ -132,6 +128,7 @@
android:id="@+id/tvWalletSpendKeyLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
android:text="@string/generate_spendkey_label"
android:textAlignment="center"
android:textColor="@color/colorAccent"
@@ -141,8 +138,6 @@
android:id="@+id/tvWalletSpendKey"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginTop="8dp"
android:selectAllOnFocus="true"
android:text="@string/generate_spendkey_placeholder"
android:textAlignment="center"
@@ -154,8 +149,7 @@
android:id="@+id/bAccept"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="16dp"
android:background="@color/colorPrimary"
android:text="@string/generate_button_accept" />