X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FTransactionListItem.java;h=084eaad8e8151d00af628dffcff82234fb684a2e;hb=2c14b80572cc9199f7ed0171786a04931075b50d;hp=ca777f66389273af4fc224f7d2399aaa61d15e44;hpb=998dd32a089d199a2569069415755eb3169b35b0;p=mobile-ledger-staging.git diff --git a/app/src/main/java/net/ktnx/mobileledger/model/TransactionListItem.java b/app/src/main/java/net/ktnx/mobileledger/model/TransactionListItem.java index ca777f66..084eaad8 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/TransactionListItem.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/TransactionListItem.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,20 +17,17 @@ package net.ktnx.mobileledger.model; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; -import java.util.Date; +import net.ktnx.mobileledger.utils.SimpleDate; public class TransactionListItem { private Type type; - private Date date; + private SimpleDate date; private boolean monthShown; private LedgerTransaction transaction; private boolean odd; - public TransactionListItem() { - this.type = Type.TRAILER; - } - public TransactionListItem(Date date, boolean monthShown) { + public TransactionListItem(SimpleDate date, boolean monthShown) { this.type = Type.DELIMITER; this.date = date; this.monthShown = monthShown; @@ -44,8 +41,9 @@ public class TransactionListItem { public Type getType() { return type; } - public Date getDate() { - return date; + @NonNull + public SimpleDate getDate() { + return (date != null) ? date : transaction.getDate(); } public boolean isMonthShown() { return monthShown; @@ -56,5 +54,5 @@ public class TransactionListItem { public boolean isOdd() { return odd; } - public enum Type {TRANSACTION, DELIMITER, TRAILER} + public enum Type {TRANSACTION, DELIMITER} }