From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Fri, 3 May 2019 16:11:38 +0000 (+0300)
Subject: drop remnants of hollow transaction list item
X-Git-Tag: v0.10.0~52
X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=commitdiff_plain;h=0fa224a099da7c2a0e2ad4cb7db8a7391de9be15

drop remnants of hollow transaction list item
---

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 75cae3be..e24647f2 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/TransactionListItem.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/TransactionListItem.java
@@ -27,9 +27,6 @@ public class TransactionListItem {
     private boolean monthShown;
     private LedgerTransaction transaction;
     private boolean odd;
-    public TransactionListItem() {
-        this.type = Type.TRAILER;
-    }
     public TransactionListItem(Date date, boolean monthShown) {
         this.type = Type.DELIMITER;
         this.date = date;
@@ -56,5 +53,5 @@ public class TransactionListItem {
     public boolean isOdd() {
         return odd;
     }
-    public enum Type {TRANSACTION, DELIMITER, TRAILER}
+    public enum Type {TRANSACTION, DELIMITER}
 }
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 a15ab0f6..49249686 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
@@ -65,7 +65,6 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
             case TRANSACTION:
                 holder.vTransaction.setVisibility(View.VISIBLE);
                 holder.vDelimiter.setVisibility(View.GONE);
-                holder.vTrailer.setVisibility(View.GONE);
                 LedgerTransaction tr = item.getTransaction();
 
                 //        debug("transactions", String.format("Filling position %d with %d accounts", position,
@@ -86,7 +85,6 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
             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()) {
@@ -105,12 +103,6 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
                     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;
         }
     }
diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java
index bd53c2d8..ef93d643 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java
@@ -41,8 +41,7 @@ public class TransactionListViewModel extends ViewModel {
     public static TransactionListItem getTransactionListItem(int position) {
         if (Data.transactions == null) return null;
         try(LockHolder lh = Data.transactions.lockForReading()) {
-            if (position >= Data.transactions.size() + 1) return null;
-            if (position == Data.transactions.size()) return new TransactionListItem();
+            if (position >= Data.transactions.size()) return null;
             return Data.transactions.get(position);
         }
     }
diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionRowHolder.java b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionRowHolder.java
index c6331a09..c76dbcc7 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionRowHolder.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionRowHolder.java
@@ -35,7 +35,6 @@ class TransactionRowHolder extends RecyclerView.ViewHolder {
     CardView vTransaction;
     TextView tvDelimiterMonth, tvDelimiterDate;
     View vDelimiterLine, vDelimiterThick;
-    View vTrailer;
     public TransactionRowHolder(@NonNull View itemView) {
         super(itemView);
         this.row = itemView.findViewById(R.id.transaction_row);
@@ -47,6 +46,5 @@ class TransactionRowHolder extends RecyclerView.ViewHolder {
         this.tvDelimiterMonth = itemView.findViewById(R.id.transaction_delimiter_month);
         this.vDelimiterLine = itemView.findViewById(R.id.transaction_delimiter_line);
         this.vDelimiterThick = itemView.findViewById(R.id.transaction_delimiter_thick);
-        this.vTrailer = itemView.findViewById(R.id.transaction_list_trailer);
     }
 }
diff --git a/app/src/main/res/layout/transaction_list_row.xml b/app/src/main/res/layout/transaction_list_row.xml
index 6fd70e34..5e398e7d 100644
--- a/app/src/main/res/layout/transaction_list_row.xml
+++ b/app/src/main/res/layout/transaction_list_row.xml
@@ -205,10 +205,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <view
-        android:id="@+id/transaction_list_trailer"
-        class="androidx.constraintlayout.widget.Placeholder"
-        id="@+id/view"
-        android:layout_width="match_parent"
-        android:layout_height="80dp" />
 </androidx.appcompat.widget.ContentFrameLayout>
\ No newline at end of file