From dca3e6872d7fb00185a454a383ba6688945ba500 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Thu, 6 Dec 2018 19:09:36 -0600
Subject: [PATCH] Create ReceiveTransactionFragment layout.

---
 .../fragments/ReceiveTransactionFragment.kt   | 10 ++-
 .../fragments/SendTransactionFragment.kt      |  5 +-
 .../layout/fragment_receive_transaction.xml   | 83 ++++++++++++++++++-
 .../res/layout/fragment_send_transaction.xml  |  9 +-
 app/src/main/res/values/strings.xml           |  7 ++
 5 files changed, 101 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ReceiveTransactionFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ReceiveTransactionFragment.kt
index d981593..41eb511 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ReceiveTransactionFragment.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/ReceiveTransactionFragment.kt
@@ -9,11 +9,13 @@ import cy.agorise.bitsybitshareswallet.R
 
 class ReceiveTransactionFragment : Fragment() {
 
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_receive_transaction, container, false)
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
index cb56809..691bdc5 100644
--- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
+++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/SendTransactionFragment.kt
@@ -254,8 +254,9 @@ class SendTransactionFragment : Fragment(), ZXingScannerView.ResultHandler, Serv
     }
 
     private fun handleRequiredFees(result: Any?) {
-        if (result is GetRequiredFees) {
-            Log.d(TAG, "GetRequiredFees: " + result.toString())
+        if (result is List<*> && result[0] is AssetAmount) {
+            Log.d(TAG, "GetRequiredFees: " + transaction.toString())
+            transaction!!.setFees(result as List<AssetAmount>) // TODO find how to remove this warning
         } else {
             // TODO unableToSendTransactionError()
         }
diff --git a/app/src/main/res/layout/fragment_receive_transaction.xml b/app/src/main/res/layout/fragment_receive_transaction.xml
index 91f8797..b6a8957 100644
--- a/app/src/main/res/layout/fragment_receive_transaction.xml
+++ b/app/src/main/res/layout/fragment_receive_transaction.xml
@@ -5,11 +5,90 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingStart="@dimen/activity_horizontal_margin"
+    android:paddingEnd="@dimen/activity_horizontal_margin"
     tools:context=".fragments.ReceiveTransactionFragment">
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/centeredVerticalGuideline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.5"/>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/tilAmount"
+        style="@style/Widget.Bitsy.TextInputLayout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:hint="@string/text__amount"
+        android:layout_marginEnd="12dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/centeredVerticalGuideline">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/tietAmount"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:inputType="numberDecimal"/>
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <Spinner
+        android:id="@+id/spAsset"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginStart="12dp"
+        app:layout_constraintTop_toTopOf="@+id/tilAmount"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/centeredVerticalGuideline"/>
+
+    <View
+        android:id="@+id/vSpinner"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        android:layout_marginTop="12dp"
+        android:background="@color/darkGray"
+        app:layout_constraintTop_toBottomOf="@+id/spAsset"
+        app:layout_constraintEnd_toEndOf="@+id/spAsset"
+        app:layout_constraintStart_toStartOf="@+id/spAsset" />
+
+    <ImageView
+        android:id="@+id/ivQR"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="@dimen/spacing_different_topic"
+        android:layout_marginBottom="@dimen/spacing_different_topic"
+        android:background="@drawable/camera_view_background"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintTop_toBottomOf="@id/tilAmount"
+        app:layout_constraintBottom_toTopOf="@id/tvPleasePay"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"/>
+
     <TextView
+        android:id="@+id/tvPleasePay"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/title_receive"/>
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        android:text="Please Pay: 12.25316 BTS"
+        android:textAppearance="@style/TextAppearance.Bitsy.Body1"
+        android:textAlignment="center"
+        app:layout_constraintBottom_toTopOf="@id/tvTo"/>
+
+    <TextView
+        android:id="@+id/tvTo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        android:text="To: seventest-3"
+        android:textAppearance="@style/TextAppearance.Bitsy.Body1"
+        android:textAlignment="center"
+        app:layout_constraintBottom_toBottomOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_send_transaction.xml b/app/src/main/res/layout/fragment_send_transaction.xml
index 66d8e71..73f1b78 100644
--- a/app/src/main/res/layout/fragment_send_transaction.xml
+++ b/app/src/main/res/layout/fragment_send_transaction.xml
@@ -32,10 +32,9 @@
             style="@style/Widget.Bitsy.TextInputLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
             android:layout_marginStart="@dimen/activity_horizontal_margin"
             android:layout_marginEnd="@dimen/activity_horizontal_margin"
-            android:hint="To"
+            android:hint="@string/text__to"
             app:layout_constraintTop_toTopOf="parent">
 
             <com.google.android.material.textfield.TextInputEditText
@@ -54,7 +53,7 @@
             style="@style/Widget.Bitsy.TextInputLayout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:hint="Amount"
+            android:hint="@string/text__amount"
             android:layout_marginTop="@dimen/spacing_same_topic"
             android:layout_marginStart="@dimen/activity_horizontal_margin"
             android:layout_marginEnd="12dp"
@@ -111,7 +110,7 @@
             android:layout_marginTop="@dimen/spacing_same_topic"
             android:layout_marginStart="@dimen/activity_horizontal_margin"
             android:layout_marginEnd="@dimen/activity_horizontal_margin"
-            android:hint="Memo"
+            android:hint="@string/text__memo"
             app:layout_constraintTop_toBottomOf="@id/tilAmount">
 
             <com.google.android.material.textfield.TextInputEditText
@@ -129,7 +128,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/spacing_same_topic"
             android:layout_marginStart="@dimen/activity_horizontal_margin"
-            android:text="Scan QR"
+            android:text="@string/text__scan_qr"
             android:textAppearance="@style/TextAppearance.Bitsy.Body1"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tilMemo" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 119a29a..add9b01 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,8 +41,15 @@
     <!-- Balances -->
     <string name="title_transactions">Transactions</string>
 
+    <!-- Send Transaction Fragment -->
+    <string name="text__to">To</string>
+
     <!-- Settings -->
     <string name="title_settings">Settings</string>
     <string name="night_mode">Night mode</string>
+    <string name="text__amount">Amount</string>
+    <string name="text__memo">Memo</string>
+    <string name="text__scan_qr">Scan QR</string>
+
 
 </resources>