X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerAccount.java;h=7510576a81a65fdd31792158514f40c474f8c8ef;hb=e68ef282087f2512d5be09eb8533f662d1b27224;hp=c2ad2c2f63f460e5988fcfed3509b24134e72de1;hpb=f782210abf37116018833b1d9858e087f497f59e;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 c2ad2c2f..7510576a 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerAccount.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerAccount.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019 Damyan Ivanov.
+ * Copyright © 2020 Damyan Ivanov.
  * This file is part of MoLe.
  * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -17,34 +17,32 @@
 
 package net.ktnx.mobileledger.model;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.util.ArrayList;
 import java.util.List;
 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("^[^:]+:");
     private String name;
     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);
@@ -64,13 +62,11 @@ public class LedgerAccount {
     //  - 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;
@@ -81,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;
@@ -118,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 "";
 
@@ -131,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;
     }
@@ -144,10 +148,6 @@ public class LedgerAccount {
     public String getParentName() {
         return parentName;
     }
-    public void togglehidden() {
-        hiddenByStar = !hiddenByStar;
-    }
-
     public boolean isHiddenByStarToBe() {
         return hiddenByStarToBe;
     }
@@ -175,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; }
+
 }