From d3beb7ca3f892135f2875ab01d86a9ac131076f6 Mon Sep 17 00:00:00 2001
From: m2049r <30435443+m2049r@users.noreply.github.com>
Date: Fri, 3 Nov 2017 10:14:19 +0100
Subject: [PATCH] exchange & toolbar layout (#111)
---
app/build.gradle | 4 +-
.../com/m2049r/xmrwallet/WalletFragment.java | 2 +-
.../res/drawable/backgound_spinner_gray.xml | 12 ++
app/src/main/res/layout/activity_login.xml | 2 +-
app/src/main/res/layout/activity_wallet.xml | 2 +-
app/src/main/res/layout/fragment_receive.xml | 8 +-
app/src/main/res/layout/fragment_send.xml | 13 +-
app/src/main/res/layout/fragment_wallet.xml | 2 +-
...m_spinner.xml => item_spinner_balance.xml} | 0
app/src/main/res/layout/view_exchange.xml | 145 ++++++++++--------
app/src/main/res/layout/view_toolbar.xml | 3 +-
app/src/main/res/values/styles.xml | 16 +-
12 files changed, 122 insertions(+), 87 deletions(-)
create mode 100644 app/src/main/res/drawable/backgound_spinner_gray.xml
rename app/src/main/res/layout/{item_spinner.xml => item_spinner_balance.xml} (100%)
diff --git a/app/build.gradle b/app/build.gradle
index ed1e82f..c4f0884 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
applicationId "com.m2049r.xmrwallet"
minSdkVersion 21
targetSdkVersion 25
- versionCode 31
- versionName "1.1.3-alpha"
+ versionCode 33
+ versionName "1.1.5-alpha"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
externalNativeBuild {
cmake {
diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java b/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java
index d72b3c3..ffa34e5 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java
@@ -96,7 +96,7 @@ public class WalletFragment extends Fragment
ivSynced = (ImageView) view.findViewById(R.id.ivSynced);
sCurrency = (Spinner) view.findViewById(R.id.sCurrency);
- sCurrency.setAdapter(ArrayAdapter.createFromResource(getContext(), R.array.currency, R.layout.item_spinner));
+ sCurrency.setAdapter(ArrayAdapter.createFromResource(getContext(), R.array.currency, R.layout.item_spinner_balance));
bSend = (Button) view.findViewById(R.id.bSend);
bReceive = (Button) view.findViewById(R.id.bReceive);
diff --git a/app/src/main/res/drawable/backgound_spinner_gray.xml b/app/src/main/res/drawable/backgound_spinner_gray.xml
new file mode 100644
index 0000000..0af81c0
--- /dev/null
+++ b/app/src/main/res/drawable/backgound_spinner_gray.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 7b15569..7bd1052 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -10,7 +10,7 @@
android:id="@+id/toolbar"
style="@style/ToolBarStyle.Event"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="?attr/actionBarSize"
android:background="@drawable/backgound_toolbar_mainnet"
android:minHeight="?attr/actionBarSize" />
diff --git a/app/src/main/res/layout/activity_wallet.xml b/app/src/main/res/layout/activity_wallet.xml
index 7b15569..7bd1052 100644
--- a/app/src/main/res/layout/activity_wallet.xml
+++ b/app/src/main/res/layout/activity_wallet.xml
@@ -10,7 +10,7 @@
android:id="@+id/toolbar"
style="@style/ToolBarStyle.Event"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="?attr/actionBarSize"
android:background="@drawable/backgound_toolbar_mainnet"
android:minHeight="?attr/actionBarSize" />
diff --git a/app/src/main/res/layout/fragment_receive.xml b/app/src/main/res/layout/fragment_receive.xml
index f884df6..36a9fb9 100644
--- a/app/src/main/res/layout/fragment_receive.xml
+++ b/app/src/main/res/layout/fragment_receive.xml
@@ -50,13 +50,15 @@
android:id="@+id/evAmount"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="16sp" />
+ android:layout_marginBottom="16sp"
+ android:layout_marginTop="16sp"
+ android:orientation="vertical"
+ android:paddingEnd="56dp"
+ android:paddingStart="56dp" />
diff --git a/app/src/main/res/layout/fragment_send.xml b/app/src/main/res/layout/fragment_send.xml
index 6572261..392c093 100644
--- a/app/src/main/res/layout/fragment_send.xml
+++ b/app/src/main/res/layout/fragment_send.xml
@@ -20,7 +20,6 @@
@@ -59,14 +58,16 @@
android:id="@+id/evAmount"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="4sp"
- android:layout_marginTop="4sp" />
+ android:layout_marginBottom="16sp"
+ android:layout_marginTop="16sp"
+ android:orientation="vertical"
+ android:paddingEnd="56dp"
+ android:paddingStart="56dp" />
@@ -109,7 +110,7 @@
android:orientation="horizontal">
+ tools:listitem="@layout/item_spinner_balance" />
-
+ android:layout_marginStart="4dp"
+ android:orientation="horizontal">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+ android:layout_marginEnd="0sp"
+ android:layout_marginStart="8sp">
-
-
+
-
+
+
-
+
diff --git a/app/src/main/res/layout/view_toolbar.xml b/app/src/main/res/layout/view_toolbar.xml
index e37e1a6..698d2bb 100644
--- a/app/src/main/res/layout/view_toolbar.xml
+++ b/app/src/main/res/layout/view_toolbar.xml
@@ -20,7 +20,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
- android:layout_marginTop="-4dp"
+ android:layout_marginTop="-8dp"
android:src="@drawable/ic_logo_horizontol_xmrujo"
android:visibility="visible" />
@@ -46,7 +46,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:layout_marginTop="-4dp"
android:visibility="invisible"
tools:text="monerujo" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5f2e658..37638ca 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -56,11 +56,7 @@
- @color/moneroGray
-
-
-
@@ -249,6 +245,16 @@
+
+
+
+