summaryrefslogtreecommitdiff
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2019-08-22 23:37:54 +0200
committerFlorian Dold <florian.dold@gmail.com>2019-08-22 23:38:08 +0200
commit2a457a1c46a5da4985035d8bff1db914de161049 (patch)
tree28a95fa5de18eeb4a8a46d8ee293dac0d50ed505 /app/src/main/res/layout
parenteb9594079589a0126c3fb5f9a2f6ecd56950eebc (diff)
downloadmerchant-terminal-android-2a457a1c46a5da4985035d8bff1db914de161049.tar.gz
merchant-terminal-android-2a457a1c46a5da4985035d8bff1db914de161049.tar.bz2
merchant-terminal-android-2a457a1c46a5da4985035d8bff1db914de161049.zip
UX improvements / prototype support for NFC tunneling
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/fragment_create_payment.xml7
-rw-r--r--app/src/main/res/layout/fragment_payment_success.xml38
-rw-r--r--app/src/main/res/layout/fragment_process_payment.xml3
3 files changed, 43 insertions, 5 deletions
diff --git a/app/src/main/res/layout/fragment_create_payment.xml b/app/src/main/res/layout/fragment_create_payment.xml
index 2549e91..f72f263 100644
--- a/app/src/main/res/layout/fragment_create_payment.xml
+++ b/app/src/main/res/layout/fragment_create_payment.xml
@@ -28,10 +28,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPersonName"
- android:text="Payment Subject"
+ android:text="Demo Payment"
android:ems="10"
android:layout_gravity="top"
- android:id="@+id/editText5"/>
+ android:id="@+id/edit_payment_subject"/>
<TextView
android:text="Amount (TESTKUDOS)"
android:layout_width="match_parent"
@@ -42,7 +42,8 @@
android:layout_height="wrap_content"
android:inputType="numberDecimal"
android:ems="10"
- android:id="@+id/editText6" android:layout_weight="0" android:text="10"/>
+ android:id="@+id/edit_payment_amount" android:layout_weight="0"
+ android:text="1"/>
<Space
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_payment_success.xml b/app/src/main/res/layout/fragment_payment_success.xml
new file mode 100644
index 0000000..8db64df
--- /dev/null
+++ b/app/src/main/res/layout/fragment_payment_success.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_margin="15dp"
+ tools:context=".PaymentSuccessful">
+
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <Space android:layout_width="match_parent" android:layout_height="0dp"
+ android:layout_weight="1"/>
+
+ <TextView
+ android:layout_gravity="center"
+ android:layout_width="match_parent"
+ android:textAlignment="center"
+ android:layout_height="50dp"
+ android:text="Payment Received"
+ android:autoSizeTextType="uniform"
+ android:textColor="@android:color/holo_green_dark"/>
+
+
+ <Space android:layout_width="match_parent" android:layout_height="0dp"
+ android:layout_weight="1"/>
+ <Button
+ android:text="Go Back"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/button_success_back"/>
+
+ </LinearLayout>
+
+</FrameLayout> \ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_process_payment.xml b/app/src/main/res/layout/fragment_process_payment.xml
index 0ff8257..3f1764e 100644
--- a/app/src/main/res/layout/fragment_process_payment.xml
+++ b/app/src/main/res/layout/fragment_process_payment.xml
@@ -23,8 +23,7 @@
android:layout_height="275dp" tools:src="@tools:sample/backgrounds/scenic[16]"
android:id="@+id/qrcode" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent" android:layout_marginTop="32dp"
- android:background="#CEC02424"/>
+ app:layout_constraintTop_toTopOf="parent" android:layout_marginTop="32dp" />
<TextView
android:text="Please scan QR Code or use NFC to pay"
android:layout_width="wrap_content"