X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2FTransactionListAdapter.java;h=96cbfba856cc010b80d8b94c95198b2a797a9825;hp=65ef6db63b7da1fd4d5df2bbfa3b3a9716fa40d3;hb=0c437b5ed0d9da7e9340cb247d036cd141598065;hpb=ce0474c601e863d54b5d1554ac44282f905f7856

diff --git a/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java b/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java
index 65ef6db6..96cbfba8 100644
--- a/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java
+++ b/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java
@@ -21,6 +21,7 @@ import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.support.annotation.NonNull;
 import android.support.constraint.ConstraintLayout;
+import android.support.v7.widget.AppCompatTextView;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.Gravity;
@@ -48,13 +49,19 @@ class TransactionListAdapter
     }
 
     public void onBindViewHolder(@NonNull TransactionRowHolder holder, int position) {
+        // in a race when transaction list is reduced, but the model hasn't been notified yet
+        // the view will disappear when the notifications reaches the model, so by simply omitting
+        // the out-of-range get() call nothing bad happens - just a to-be-deleted view remains
+        // a bit longer
+        if (position >= transactions.size()) return;
+
         LedgerTransaction tr = transactions.get(position);
         Context ctx = holder.row.getContext();
 
         try (SQLiteDatabase db = MLDB.getReadableDatabase(ctx)) {
             tr.loadData(db);
-            holder.tvDescription
-                    .setText(String.format("%s\t%s", tr.getDescription(), tr.getDate()));
+            holder.tvDescription.setText(tr.getDescription());
+            holder.tvDate.setText(tr.getDate());
 
             int rowIndex = 0;
             for (LedgerTransactionAccount acc : tr.getAccounts()) {
@@ -67,17 +74,16 @@ class TransactionListAdapter
                                     LinearLayout.LayoutParams.WRAP_CONTENT));
                     row.setGravity(Gravity.CENTER_VERTICAL);
                     row.setOrientation(LinearLayout.HORIZONTAL);
-                    row.setPaddingRelative(dp2px(ctx, 8), 0, dp2px(ctx, 8), 0);
-                    accName = new TextView(ctx);
-                    accName.setLayoutParams(
-                            new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
+                    row.setPaddingRelative(dp2px(ctx, 8), 0, 0, 0);
+                    accName = new AppCompatTextView(ctx);
+                    accName.setLayoutParams(new LinearLayout.LayoutParams(0,
                                     LinearLayout.LayoutParams.WRAP_CONTENT, 5f));
                     accName.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
                     row.addView(accName);
-                    accAmount = new TextView(ctx);
+                    accAmount = new AppCompatTextView(ctx);
                     LinearLayout.LayoutParams llp =
                             new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
-                                    LinearLayout.LayoutParams.WRAP_CONTENT, 1f);
+                                    LinearLayout.LayoutParams.WRAP_CONTENT);
                     llp.setMarginEnd(0);
                     accAmount.setLayoutParams(llp);
                     accAmount.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END);
@@ -120,13 +126,14 @@ class TransactionListAdapter
         return transactions.size();
     }
     class TransactionRowHolder extends RecyclerView.ViewHolder {
-        TextView tvDescription;
+        TextView tvDescription, tvDate;
         LinearLayout tableAccounts;
         ConstraintLayout row;
         public TransactionRowHolder(@NonNull View itemView) {
             super(itemView);
-            this.row = (ConstraintLayout) itemView;
+            this.row = itemView.findViewById(R.id.transaction_row);
             this.tvDescription = itemView.findViewById(R.id.transaction_row_description);
+            this.tvDate = itemView.findViewById(R.id.transaction_row_date);
             this.tableAccounts = itemView.findViewById(R.id.transaction_row_acc_amounts);
         }
     }