X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerAccount.java;h=a762e3a9dba1d8a3dc295d605b3ee73bb56fbec7;hb=29fa90b17cbb87f0b16f3607f0628fe0057d6560;hp=f632bba94311d97485e6f98584776c9176095bd6;hpb=c040f83305fb25dfe9a7c088683926b7d101c373;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/model/LedgerAccount.java b/app/src/main/java/net/ktnx/mobileledger/model/LedgerAccount.java
index f632bba9..a762e3a9 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerAccount.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerAccount.java
@@ -23,6 +23,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public class LedgerAccount {
     static Pattern reHigherAccount = Pattern.compile("^[^:]+:");
@@ -30,35 +31,42 @@ public class LedgerAccount {
     private String shortName;
     private int level;
     private String parentName;
-    private boolean hiddenByStar;
     private boolean hiddenByStarToBe;
     private boolean expanded;
     private List<LedgerAmount> amounts;
     private boolean hasSubAccounts;
+    private boolean amountsExpanded;
 
     public LedgerAccount(String name) {
         this.setName(name);
-        hiddenByStar = false;
     }
 
     public LedgerAccount(String name, float amount) {
         this.setName(name);
-        this.hiddenByStar = false;
         this.expanded = true;
         this.amounts = new ArrayList<LedgerAmount>();
         this.addAmount(amount);
     }
+    @Override
+    public int hashCode() {
+        return name.hashCode();
+    }
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (obj == null) return false;
+
+        return obj.getClass().equals(this.getClass()) &&
+               name.equals(((LedgerAccount) obj).getName());
+    }
     // an account is visible if:
     //  - it is starred (not hidden by a star)
     //  - and it has an expanded parent or is a top account
     public boolean isVisible() {
-        if (hiddenByStar) return false;
-
         if (level == 0) return true;
 
-        return isVisible(Data.accounts.get());
+        return isVisible(Data.accounts);
     }
-    public boolean isVisible(ArrayList<LedgerAccount> list) {
+    public boolean isVisible(List<LedgerAccount> list) {
         for (LedgerAccount acc : list) {
             if (acc.isParentOf(this)) {
                 if (!acc.isExpanded()) return false;
@@ -69,12 +77,6 @@ public class LedgerAccount {
     public boolean isParentOf(LedgerAccount potentialChild) {
         return potentialChild.getName().startsWith(name + ":");
     }
-    public boolean isHiddenByStar() {
-        return hiddenByStar;
-    }
-    public void setHiddenByStar(boolean hiddenByStar) {
-        this.hiddenByStar = hiddenByStar;
-    }
     private void stripName() {
         level = 0;
         shortName = name;
@@ -106,7 +108,7 @@ public class LedgerAccount {
     public void addAmount(float amount) {
         this.addAmount(amount, null);
     }
-
+    public int getAmountCount() { return (amounts != null) ? amounts.size() : 0; }
     public String getAmountsString() {
         if ((amounts == null) || amounts.isEmpty()) return "";
 
@@ -119,7 +121,21 @@ public class LedgerAccount {
 
         return builder.toString();
     }
+    public String getAmountsString(int limit) {
+        if ((amounts == null) || amounts.isEmpty()) return "";
+
+        int included = 0;
+        StringBuilder builder = new StringBuilder();
+        for (LedgerAmount amount : amounts) {
+            String amt = amount.toString();
+            if (builder.length() > 0) builder.append('\n');
+            builder.append(amt);
+            included++;
+            if (included == limit) break;
+        }
 
+        return builder.toString();
+    }
     public int getLevel() {
         return level;
     }
@@ -132,10 +148,6 @@ public class LedgerAccount {
     public String getParentName() {
         return parentName;
     }
-    public void togglehidden() {
-        hiddenByStar = !hiddenByStar;
-    }
-
     public boolean isHiddenByStarToBe() {
         return hiddenByStarToBe;
     }
@@ -163,4 +175,8 @@ public class LedgerAccount {
     public void removeAmounts() {
         if (amounts != null) amounts.clear();
     }
+    public boolean amountsExpanded() { return amountsExpanded; }
+    public void setAmountsExpanded(boolean flag) { amountsExpanded = flag; }
+    public void toggleAmountsExpanded() { amountsExpanded = !amountsExpanded; }
+
 }