Update paid invoices and payment list

clightning4j · Mar 26, 2020 · 3b79e4e · 3b79e4e
1 parent 74c818a
commit 3b79e4e
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 23 deletions.
diff --git a/app/src/main/java/com/lvaccaro/lamp/HistoryFragment.kt b/app/src/main/java/com/lvaccaro/lamp/HistoryFragment.kt
@@ -35,18 +35,21 @@ class ListAdapter(val list: ArrayList<Item>)
 }
 class ItemViewHolder(inflater: LayoutInflater, parent: ViewGroup) :
     RecyclerView.ViewHolder(inflater.inflate(R.layout.list_tx, parent, false)) {
-    private var mTitleView: TextView? = null
-    private var mDescriptionView: TextView? = null
+    private var mDateView: TextView? = null
+    private var mAmountView: TextView? = null
+    private var mLabelView: TextView? = null
 
     init {
-        mTitleView = itemView.findViewById(R.id.text1)
-        mDescriptionView = itemView.findViewById(R.id.text2)
+        mDateView = itemView.findViewById(R.id.date)
+        mAmountView = itemView.findViewById(R.id.amount)
+        mLabelView = itemView.findViewById(R.id.label)
     }
 
     fun bind(item: Item) {
         val date = Date(item.time * 1000L)
-        mDescriptionView?.text = String.format("%s %dmsat", if (item.incoming) "+" else "-", item.amount)
-        mTitleView?.text = SimpleDateFormat("dd MMM yyyy, HH:mm:ss").format(date)
+        mAmountView?.text = String.format("%s %dmsat", if (item.incoming) "+" else "-", item.amount)
+        mDateView?.text = SimpleDateFormat("dd MMM yyyy, HH:mm:ss").format(date)
+        mLabelView?.text = item.label
     }
 }
 
@@ -102,8 +105,8 @@ class HistoryFragment: BottomSheetDialogFragment() {
             if (status.equals("complete")) {
                 val createdAt = payment["created_at"] as Int
                 val msatoshi = payment["msatoshi"] as Int
-                val id = payment["id"] as String
-                payments.add(Item(msatoshi, createdAt, id, false))
+                val id = payment["id"] as Int
+                payments.add(Item(msatoshi, createdAt, "Payment ID ${id.toString()}", false))
             }
         }
         return payments

diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml
@@ -6,7 +6,7 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/id_transactions"
+        android:text="@string/id_history"
         android:textStyle="bold"
         android:padding="8dp" />
 

diff --git a/app/src/main/res/layout/list_tx.xml b/app/src/main/res/layout/list_tx.xml
@@ -1,25 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?attr/listPreferredItemHeight"
-    android:mode="twoLine"
     android:paddingStart="?attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?attr/listPreferredItemPaddingEnd">
+    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
+     android:orientation="vertical">
 
-    <TextView android:id="@+id/text1"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:textAppearance="?attr/textAppearanceListItemSecondary"/>
+        android:orientation="horizontal">
+
+        <TextView android:id="@+id/date"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginTop="8dp"
+            android:textAppearance="?attr/textAppearanceListItemSecondary"/>
+
+        <TextView
+            android:id="@+id/amount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:textAppearance="?attr/textAppearanceListItem" />
+
+    </LinearLayout>
 
     <TextView
-        android:id="@+id/text2"
-        android:layout_width="wrap_content"
+        android:id="@+id/label"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignEnd="@id/text1"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="8dp"
-        android:textAppearance="?attr/textAppearanceListItem" />
+        android:layout_marginTop="4dp" />
 
-</TwoLineListItem>
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -48,4 +48,5 @@
     <string name="id_using_esplora_plugin">Using Esplora plugin as bitcoind backend</string>
     <string name="action_settings">Settings</string>
     <string name="id_channels">Channels</string>
+    <string name="id_history">History</string>
 </resources>