From 2a457a1c46a5da4985035d8bff1db914de161049 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Thu, 22 Aug 2019 23:37:54 +0200
Subject: UX improvements / prototype support for NFC tunneling

---
 .../java/net/taler/merchantpos/CreatePayment.kt    | 65 ++--------------------
 1 file changed, 6 insertions(+), 59 deletions(-)

(limited to 'app/src/main/java/net/taler/merchantpos/CreatePayment.kt')

diff --git a/app/src/main/java/net/taler/merchantpos/CreatePayment.kt b/app/src/main/java/net/taler/merchantpos/CreatePayment.kt
index 330b9e8..e07802f 100644
--- a/app/src/main/java/net/taler/merchantpos/CreatePayment.kt
+++ b/app/src/main/java/net/taler/merchantpos/CreatePayment.kt
@@ -8,6 +8,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
+import android.widget.EditText
 import androidx.lifecycle.ViewModelProviders
 import androidx.navigation.fragment.findNavController
 import com.android.volley.Request
@@ -34,19 +35,11 @@ private const val ARG_PARAM2 = "param2"
  *
  */
 class CreatePayment : Fragment() {
-    // TODO: Rename and change types of parameters
-    private var param1: String? = null
-    private var param2: String? = null
-    private var listener: OnFragmentInteractionListener? = null
     private lateinit var queue: RequestQueue
     private lateinit var model: PosTerminalViewModel
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        arguments?.let {
-            param1 = it.getString(ARG_PARAM1)
-            param2 = it.getString(ARG_PARAM2)
-        }
 
         model = activity?.run {
             ViewModelProviders.of(this)[PosTerminalViewModel::class.java]
@@ -56,11 +49,14 @@ class CreatePayment : Fragment() {
     }
 
     private fun onRequestPayment() {
-        val amount = "TESTKUDOS:10.00"
+        val amountValStr = activity!!.findViewById<EditText>(R.id.edit_payment_amount).text
+        val amount = "TESTKUDOS:${amountValStr}"
         model.activeAmount = amount
+        model.activeSubject = activity!!.findViewById<EditText>(R.id.edit_payment_subject).text
+
         var order = JSONObject().also {
             it.put("amount", amount)
-            it.put("summary", "hello world")
+            it.put("summary", model.activeSubject!!)
             it.put("fulfillment_url", "https://example.com")
             it.put("instance", "default")
         }
@@ -119,53 +115,4 @@ class CreatePayment : Fragment() {
         return view
     }
 
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        if (context is OnFragmentInteractionListener) {
-            listener = context
-        } else {
-            throw RuntimeException(context.toString() + " must implement OnFragmentInteractionListener")
-        }
-    }
-
-    override fun onDetach() {
-        super.onDetach()
-        listener = null
-    }
-
-    /**
-     * This interface must be implemented by activities that contain this
-     * fragment to allow an interaction in this fragment to be communicated
-     * to the activity and potentially other fragments contained in that
-     * activity.
-     *
-     *
-     * See the Android Training lesson [Communicating with Other Fragments]
-     * (http://developer.android.com/training/basics/fragments/communicating.html)
-     * for more information.
-     */
-    interface OnFragmentInteractionListener {
-        // TODO: Update argument type and name
-        fun onFragmentInteraction(uri: Uri)
-    }
-
-    companion object {
-        /**
-         * Use this factory method to create a new instance of
-         * this fragment using the provided parameters.
-         *
-         * @param param1 Parameter 1.
-         * @param param2 Parameter 2.
-         * @return A new instance of fragment CreatePayment.
-         */
-        // TODO: Rename and change types and number of parameters
-        @JvmStatic
-        fun newInstance(param1: String, param2: String) =
-            CreatePayment().apply {
-                arguments = Bundle().apply {
-                    putString(ARG_PARAM1, param1)
-                    putString(ARG_PARAM2, param2)
-                }
-            }
-    }
 }
-- 
cgit v1.2.3