From 394d5471e34b1f5e7e995b5b9347d95d36a4835b Mon Sep 17 00:00:00 2001
From: m2049r <m2049r@monerujo.io>
Date: Sun, 18 Apr 2021 19:16:52 +0200
Subject: [PATCH] show total incoming amount (#745)

---
 .../m2049r/xmrwallet/SubaddressFragment.java  |  7 +++-
 .../com/m2049r/xmrwallet/data/Subaddress.java |  8 +++--
 .../layout/SubaddressInfoAdapter.java         |  9 +++++
 .../com/m2049r/xmrwallet/model/Wallet.java    | 11 +++++-
 app/src/main/res/layout/item_subaddress.xml   | 35 ++++++++++++++-----
 5 files changed, 57 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/m2049r/xmrwallet/SubaddressFragment.java b/app/src/main/java/com/m2049r/xmrwallet/SubaddressFragment.java
index 45c0678a..9c83f5c8 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/SubaddressFragment.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/SubaddressFragment.java
@@ -48,7 +48,7 @@ import lombok.RequiredArgsConstructor;
 import timber.log.Timber;
 
 public class SubaddressFragment extends Fragment implements SubaddressInfoAdapter.OnInteractionListener,
-        View.OnClickListener {
+        View.OnClickListener, OnBlockUpdateListener {
     static public final String KEY_MODE = "mode";
     static public final String MODE_MANAGER = "manager";
 
@@ -169,6 +169,11 @@ public class SubaddressFragment extends Fragment implements SubaddressInfoAdapte
         adapter.setInfos(list);
     }
 
+    @Override
+    public void onBlockUpdate(Wallet wallet) {
+        loadList();
+    }
+
     @Override
     public void onClick(View v) {
         int id = v.getId();
diff --git a/app/src/main/java/com/m2049r/xmrwallet/data/Subaddress.java b/app/src/main/java/com/m2049r/xmrwallet/data/Subaddress.java
index 6a79dfdb..582ce878 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/data/Subaddress.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/data/Subaddress.java
@@ -18,12 +18,13 @@ package com.m2049r.xmrwallet.data;
 
 import java.util.regex.Pattern;
 
-import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
 import lombok.ToString;
 
-@AllArgsConstructor
+@RequiredArgsConstructor
 @ToString
 @EqualsAndHashCode
 public class Subaddress implements Comparable<Subaddress> {
@@ -35,6 +36,9 @@ public class Subaddress implements Comparable<Subaddress> {
     final private String address;
     @Getter
     private final String label;
+    @Getter
+    @Setter
+    private long amount;
 
     @Override
     public int compareTo(Subaddress another) { // newer is <
diff --git a/app/src/main/java/com/m2049r/xmrwallet/layout/SubaddressInfoAdapter.java b/app/src/main/java/com/m2049r/xmrwallet/layout/SubaddressInfoAdapter.java
index 7edb2d59..6dab3490 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/layout/SubaddressInfoAdapter.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/layout/SubaddressInfoAdapter.java
@@ -28,6 +28,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.data.Subaddress;
+import com.m2049r.xmrwallet.util.Helper;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -110,12 +111,14 @@ public class SubaddressInfoAdapter extends RecyclerView.Adapter<SubaddressInfoAd
     class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
         final TextView tvName;
         final TextView tvAddress;
+        final TextView tvAmount;
         Subaddress item;
 
         ViewHolder(View itemView) {
             super(itemView);
             tvName = itemView.findViewById(R.id.tvName);
             tvAddress = itemView.findViewById(R.id.tvAddress);
+            tvAmount = itemView.findViewById(R.id.tx_amount);
             itemView.setOnClickListener(this);
             itemView.setOnLongClickListener(this);
         }
@@ -129,6 +132,12 @@ public class SubaddressInfoAdapter extends RecyclerView.Adapter<SubaddressInfoAd
                     item.getAddressIndex(), item.getSquashedAddress());
             tvName.setText(label.isEmpty() ? address : label);
             tvAddress.setText(address);
+            final long amount = item.getAmount();
+            if (amount > 0)
+                tvAmount.setText(context.getString(R.string.tx_list_amount_positive,
+                        Helper.getDisplayAmount(amount, Helper.DISPLAY_DIGITS_INFO)));
+            else
+                tvAmount.setText("");
         }
 
         @Override
diff --git a/app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java b/app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java
index 765ad731..103a50a3 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/model/Wallet.java
@@ -173,7 +173,16 @@ public class Wallet {
     }
 
     public Subaddress getSubaddressObject(int subAddressIndex) {
-        return getSubaddressObject(accountIndex, subAddressIndex);
+        Subaddress subaddress = getSubaddressObject(accountIndex, subAddressIndex);
+        long amount = 0;
+        for (TransactionInfo info : getHistory().getAll()) {
+            if ((info.addressIndex == subAddressIndex)
+                    && (info.direction == TransactionInfo.Direction.Direction_In)) {
+                amount += info.amount;
+            }
+        }
+        subaddress.setAmount(amount);
+        return subaddress;
     }
 
     public native String getPath();
diff --git a/app/src/main/res/layout/item_subaddress.xml b/app/src/main/res/layout/item_subaddress.xml
index 28374d1f..059f11dc 100644
--- a/app/src/main/res/layout/item_subaddress.xml
+++ b/app/src/main/res/layout/item_subaddress.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
     android:layout_margin="8dp">
 
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:orientation="vertical"
-        android:padding="8dp"
-        android:layout_height="wrap_content">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="8dp">
 
         <TextView
             android:id="@+id/tvName"
@@ -19,14 +19,31 @@
             android:layout_height="wrap_content"
             android:paddingStart="8dp"
             android:paddingEnd="8dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
             tools:text="My First Subaddress" />
 
         <TextView
             android:id="@+id/tvAddress"
             style="@style/MoneroText.Small"
-            android:layout_width="match_parent"
-            android:layout_marginTop="4dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tvName"
             tools:text="#1: 8AioXCmK...aGivEa7C" />
-    </LinearLayout>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+
+        <TextView
+            android:id="@+id/tx_amount"
+            style="@style/MoneroText.PosAmount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@id/tvAddress"
+            android:textColor="@color/tx_plus"
+            app:layout_constraintBottom_toBottomOf="@id/tvName"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="+ 999.999999" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.material.card.MaterialCardView>