X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerAccount.java;h=081b7bc94f35fe9d2d23a4d58a42da43d7ff7532;hp=f632bba94311d97485e6f98584776c9176095bd6;hb=99c9595cb7bff9a8af5bc5370bda873286bde29b;hpb=c040f83305fb25dfe9a7c088683926b7d101c373 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..081b7bc9 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("^[^:]+:"); @@ -35,6 +36,7 @@ public class LedgerAccount { private boolean expanded; private List amounts; private boolean hasSubAccounts; + private boolean amountsExpanded; public LedgerAccount(String name) { this.setName(name); @@ -48,6 +50,17 @@ public class LedgerAccount { this.amounts = new ArrayList(); 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 @@ -56,9 +69,9 @@ public class LedgerAccount { if (level == 0) return true; - return isVisible(Data.accounts.get()); + return isVisible(Data.accounts); } - public boolean isVisible(ArrayList list) { + public boolean isVisible(List list) { for (LedgerAccount acc : list) { if (acc.isParentOf(this)) { if (!acc.isExpanded()) return false; @@ -163,4 +176,7 @@ 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; } }