X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListAdapter.java;h=6cf729dc9d4bcfe977f2c9284b3ea35906cce967;hp=b6e7057d1aab08e39982e25cd72490a22fc4a700;hb=254ccdbeec488fb1309513a3ff9be28f9b06855c;hpb=7e9a2984323226af349df0f5c16ad52da5af5358

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListAdapter.java b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListAdapter.java
index b6e7057d..6cf729dc 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListAdapter.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListAdapter.java
@@ -1,18 +1,18 @@
 /*
  * 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 <https://www.gnu.org/licenses/>.
+ * along with MoLe. If not, see <https://www.gnu.org/licenses/>.
  */
 
 package net.ktnx.mobileledger.ui.transaction_list;
@@ -38,6 +38,7 @@ import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.model.LedgerTransaction;
 import net.ktnx.mobileledger.model.LedgerTransactionAccount;
 import net.ktnx.mobileledger.model.TransactionListItem;
+import net.ktnx.mobileledger.utils.Colors;
 import net.ktnx.mobileledger.utils.Globals;
 import net.ktnx.mobileledger.utils.MLDB;
 
@@ -57,43 +58,53 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
         // a bit longer
         if (item == null) return;
 
-        if (item.getType() == TransactionListItem.Type.TRANSACTION) {
-            holder.vTransaction.setVisibility(View.VISIBLE);
-            holder.vDelimiter.setVisibility(View.GONE);
-            LedgerTransaction tr = item.getTransaction();
+        switch (item.getType()) {
+            case TRANSACTION:
+                holder.vTransaction.setVisibility(View.VISIBLE);
+                holder.vDelimiter.setVisibility(View.GONE);
+                holder.vTrailer.setVisibility(View.GONE);
+                LedgerTransaction tr = item.getTransaction();
 
-//        Log.d("transactions", String.format("Filling position %d with %d accounts", position,
-//                tr.getAccounts().size()));
+                //        Log.d("transactions", String.format("Filling position %d with %d accounts", position,
+                //                tr.getAccounts().size()));
 
-            TransactionLoader loader = new TransactionLoader();
-            loader.execute(new TransactionLoaderParams(tr, holder, position, boldAccountName,
-                    item.isOdd()));
+                TransactionLoader loader = new TransactionLoader();
+                loader.execute(new TransactionLoaderParams(tr, holder, position, boldAccountName,
+                        item.isOdd()));
 
-            // WORKAROUND what seems to be a bug in CardHolder somewhere
-            // when a view that was previously holding a delimiter is re-purposed
-            // occasionally it stays too short (not high enough)
-            holder.vTransaction.measure(View.MeasureSpec
-                            .makeMeasureSpec(holder.itemView.getWidth(), View.MeasureSpec.EXACTLY),
-                    View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
-        }
-        else {
-            Date date = item.getDate();
-            holder.vTransaction.setVisibility(View.GONE);
-            holder.vDelimiter.setVisibility(View.VISIBLE);
-            holder.tvDelimiterDate.setText(DateFormat.getDateInstance().format(date));
-            if (item.isMonthShown()) {
-                holder.tvDelimiterMonth.setText(Globals.monthNames[date.getMonth()]);
-                holder.tvDelimiterMonth.setVisibility(View.VISIBLE);
-//                holder.vDelimiterLine.setBackgroundResource(R.drawable.dashed_border_8dp);
-                holder.vDelimiterLine.setVisibility(View.GONE);
-                holder.vDelimiterThick.setVisibility(View.VISIBLE);
-            }
-            else {
-                holder.tvDelimiterMonth.setVisibility(View.GONE);
-//                holder.vDelimiterLine.setBackgroundResource(R.drawable.dashed_border_1dp);
-                holder.vDelimiterLine.setVisibility(View.VISIBLE);
-                holder.vDelimiterThick.setVisibility(View.GONE);
-            }
+                // WORKAROUND what seems to be a bug in CardHolder somewhere
+                // when a view that was previously holding a delimiter is re-purposed
+                // occasionally it stays too short (not high enough)
+                holder.vTransaction.measure(View.MeasureSpec
+                                .makeMeasureSpec(holder.itemView.getWidth(), View.MeasureSpec.EXACTLY),
+                        View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
+                break;
+            case DELIMITER:
+                Date date = item.getDate();
+                holder.vTransaction.setVisibility(View.GONE);
+                holder.vTrailer.setVisibility(View.GONE);
+                holder.vDelimiter.setVisibility(View.VISIBLE);
+                holder.tvDelimiterDate.setText(DateFormat.getDateInstance().format(date));
+                if (item.isMonthShown()) {
+                    holder.tvDelimiterMonth.setText(Globals.monthNames[date.getMonth()]);
+                    holder.tvDelimiterMonth.setVisibility(View.VISIBLE);
+                    //                holder.vDelimiterLine.setBackgroundResource(R.drawable.dashed_border_8dp);
+                    holder.vDelimiterLine.setVisibility(View.GONE);
+                    holder.vDelimiterThick.setVisibility(View.VISIBLE);
+                }
+                else {
+                    holder.tvDelimiterMonth.setVisibility(View.GONE);
+                    //                holder.vDelimiterLine.setBackgroundResource(R.drawable.dashed_border_1dp);
+                    holder.vDelimiterLine.setVisibility(View.VISIBLE);
+                    holder.vDelimiterThick.setVisibility(View.GONE);
+                }
+                break;
+            case TRAILER:
+                holder.vTransaction.setVisibility(View.GONE);
+                holder.vTrailer.setVisibility(View.VISIBLE);
+                holder.vDelimiter.setVisibility(View.GONE);
+
+                break;
         }
     }
 
@@ -108,7 +119,7 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
 
     @Override
     public int getItemCount() {
-        return TransactionListViewModel.getTransactionCount();
+        return TransactionListViewModel.getTransactionCount() + 1;
     }
     public void setBoldAccountName(String boldAccountName) {
         this.boldAccountName = boldAccountName;
@@ -152,8 +163,8 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
                 case HEAD:
                     holder.tvDescription.setText(step.getTransaction().getDescription());
 
-                    if (step.isOdd()) holder.row.setBackgroundColor(Globals.tableRowDarkBG);
-                    else holder.row.setBackgroundColor(Globals.tableRowLightBG);
+                    if (step.isOdd()) holder.row.setBackgroundColor(Colors.tableRowDarkBG);
+                    else holder.row.setBackgroundColor(Colors.tableRowLightBG);
 
                     break;
                 case ACCOUNTS:
@@ -199,8 +210,8 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
                     if ((boldAccountName != null) &&
                         acc.getAccountName().startsWith(boldAccountName))
                     {
-                        accName.setTextColor(Globals.primaryDark);
-                        accAmount.setTextColor(Globals.primaryDark);
+                        accName.setTextColor(Colors.accent);
+                        accAmount.setTextColor(Colors.accent);
 
                         SpannableString ss = new SpannableString(acc.getAccountName());
                         ss.setSpan(new StyleSpan(Typeface.BOLD), 0, boldAccountName.length(),
@@ -208,8 +219,8 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
                         accName.setText(ss);
                     }
                     else {
-                        accName.setTextColor(Globals.defaultTextColor);
-                        accAmount.setTextColor(Globals.defaultTextColor);
+                        accName.setTextColor(Colors.defaultTextColor);
+                        accAmount.setTextColor(Colors.defaultTextColor);
                         accName.setText(acc.getAccountName());
                     }
                     accAmount.setText(acc.toString());