X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;ds=inline;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerAccount.java;h=f632bba94311d97485e6f98584776c9176095bd6;hb=c040f83305fb25dfe9a7c088683926b7d101c373;hp=532642acddaf238e4393498539080ba966d33071;hpb=bde37d0aa472d31606b53491240c79af3374f09b;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 532642ac..f632bba9 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerAccount.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerAccount.java
@@ -1,64 +1,80 @@
/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * 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
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.model;
-import android.support.annotation.NonNull;
-
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import androidx.annotation.NonNull;
+
public class LedgerAccount {
+ static Pattern reHigherAccount = Pattern.compile("^[^:]+:");
private String name;
private String shortName;
private int level;
private String parentName;
- private boolean hidden;
- private boolean hiddenToBe;
+ private boolean hiddenByStar;
+ private boolean hiddenByStarToBe;
+ private boolean expanded;
private List amounts;
- static Pattern reHigherAccount = Pattern.compile("^[^:]+:");
+ private boolean hasSubAccounts;
public LedgerAccount(String name) {
this.setName(name);
- hidden = false;
- }
-
- public boolean isHidden() {
- return hidden;
- }
-
- public void setHidden(boolean hidden) {
- this.hidden = hidden;
+ hiddenByStar = false;
}
public LedgerAccount(String name, float amount) {
this.setName(name);
- this.hidden = false;
+ this.hiddenByStar = false;
+ this.expanded = true;
this.amounts = new ArrayList();
this.addAmount(amount);
}
+ // 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;
- public void setName(String name) {
- this.name = name;
- stripName();
- }
+ if (level == 0) return true;
+ return isVisible(Data.accounts.get());
+ }
+ public boolean isVisible(ArrayList list) {
+ for (LedgerAccount acc : list) {
+ if (acc.isParentOf(this)) {
+ if (!acc.isExpanded()) return false;
+ }
+ }
+ return true;
+ }
+ 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;
@@ -76,13 +92,15 @@ public class LedgerAccount {
parentName = parentBuilder.substring(0, parentBuilder.length() - 1);
else parentName = null;
}
-
public String getName() {
return name;
}
-
+ public void setName(String name) {
+ this.name = name;
+ stripName();
+ }
public void addAmount(float amount, String currency) {
- if (amounts == null ) amounts = new ArrayList<>();
+ if (amounts == null) amounts = new ArrayList<>();
amounts.add(new LedgerAmount(amount, currency));
}
public void addAmount(float amount) {
@@ -93,7 +111,7 @@ public class LedgerAccount {
if ((amounts == null) || amounts.isEmpty()) return "";
StringBuilder builder = new StringBuilder();
- for( LedgerAmount amount : amounts ) {
+ for (LedgerAmount amount : amounts) {
String amt = amount.toString();
if (builder.length() > 0) builder.append('\n');
builder.append(amt);
@@ -115,16 +133,34 @@ public class LedgerAccount {
return parentName;
}
public void togglehidden() {
- hidden = !hidden;
+ hiddenByStar = !hiddenByStar;
}
- public boolean isHiddenToBe() {
- return hiddenToBe;
+ public boolean isHiddenByStarToBe() {
+ return hiddenByStarToBe;
}
- public void setHiddenToBe(boolean hiddenToBe) {
- this.hiddenToBe = hiddenToBe;
+ public void setHiddenByStarToBe(boolean hiddenByStarToBe) {
+ this.hiddenByStarToBe = hiddenByStarToBe;
}
public void toggleHiddenToBe() {
- setHiddenToBe(!hiddenToBe);
+ setHiddenByStarToBe(!hiddenByStarToBe);
+ }
+ public boolean hasSubAccounts() {
+ return hasSubAccounts;
+ }
+ public void setHasSubAccounts(boolean hasSubAccounts) {
+ this.hasSubAccounts = hasSubAccounts;
+ }
+ public boolean isExpanded() {
+ return expanded;
+ }
+ public void setExpanded(boolean expanded) {
+ this.expanded = expanded;
+ }
+ public void toggleExpanded() {
+ expanded = !expanded;
+ }
+ public void removeAmounts() {
+ if (amounts != null) amounts.clear();
}
}