summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2019-12-20 01:52:22 +0100
committerFlorian Dold <florian.dold@gmail.com>2019-12-20 01:52:22 +0100
commitab6effe9e2fb7fab1f310689ca5ae3ae7b7099ca (patch)
tree8b22d6a2092a4c637eba3f96e66399fb4ec8b264 /app/src/main/res
parent47b7eab07140dd20710e84b47b43da1de8123fb4 (diff)
downloadwallet-android-ab6effe9e2fb7fab1f310689ca5ae3ae7b7099ca.tar.gz
wallet-android-ab6effe9e2fb7fab1f310689ca5ae3ae7b7099ca.tar.bz2
wallet-android-ab6effe9e2fb7fab1f310689ca5ae3ae7b7099ca.zip
UI tweaks in progress
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/drawable/pending_border.xml21
-rw-r--r--app/src/main/res/layout/fragment_settings.xml33
-rw-r--r--app/src/main/res/layout/fragment_show_balance.xml6
-rw-r--r--app/src/main/res/layout/pending_row.xml42
4 files changed, 79 insertions, 23 deletions
diff --git a/app/src/main/res/drawable/pending_border.xml b/app/src/main/res/drawable/pending_border.xml
new file mode 100644
index 0000000..d003891
--- /dev/null
+++ b/app/src/main/res/drawable/pending_border.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+
+ <!-- View background color -->
+ <solid
+ android:color="@android:color/transparent" >
+ </solid>
+
+ <!-- View border color and width -->
+ <stroke
+ android:width="1dp"
+ android:color="@color/colorPrimary" >
+ </stroke>
+
+ <!-- The radius makes the corners rounded -->
+ <corners
+ android:radius="2dp" >
+ </corners>
+
+</shape> \ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index ed144e4..6873ff4 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -11,13 +11,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <EditText
+ <TextView
android:id="@+id/editText2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textPersonName"
- android:text="Version Information" />
+ android:text="Version Information"
+ android:textSize="18sp" />
<LinearLayout
@@ -63,14 +64,32 @@
</LinearLayout>
- <EditText
- android:id="@+id/editText"
+ <TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
- android:inputType="textPersonName"
- android:text="Developer Settings (be careful!)" />
-
+ android:text="Backups"
+ android:textSize="18sp" />
+
+ <Button
+ android:text="Export wallet to file"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/button_backup_export"/>
+
+ <Button
+ android:text="Import from file"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/button_backup_import"/>
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ems="10"
+ android:text="Developer Settings (be careful!)"
+ android:textSize="18sp" />
+
<Button
android:text="Withdraw TESTKUDOS"
android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_show_balance.xml b/app/src/main/res/layout/fragment_show_balance.xml
index a5fb26f..21a1fe9 100644
--- a/app/src/main/res/layout/fragment_show_balance.xml
+++ b/app/src/main/res/layout/fragment_show_balance.xml
@@ -33,6 +33,12 @@
<Space android:layout_width="match_parent" android:layout_height="20dp"/>
<Button
+ android:text="Withdraw TESTKUDOS"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/button_withdraw_testkudos"/>
+
+ <Button
android:text="Scan Taler QR Code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/pending_row.xml b/app/src/main/res/layout/pending_row.xml
index ec5aa2c..79d7250 100644
--- a/app/src/main/res/layout/pending_row.xml
+++ b/app/src/main/res/layout/pending_row.xml
@@ -1,22 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/pending_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="3dp"
+ android:padding="3dp"
+ android:background="@drawable/pending_border"
+ android:orientation="vertical">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/pending_text"
- android:textSize="24sp" tools:text="My Pending Operation">
- </TextView>
+ <TextView
+ android:id="@+id/pending_text"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="24sp"
+ tools:text="My Pending Operation" />
- <TextView
- android:id="@+id/pending_subtext"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="14sp"
- tools:text="My further details" />
+ <Button
+ android:id="@+id/button_pending_action_1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ tools:text="Cancel Operation" />
+
+ <TextView
+ android:id="@+id/pending_subtext"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="14sp"
+ tools:text="My further details" />
</LinearLayout> \ No newline at end of file