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=7004dd7d8d026aa1446bf6b64a51bc692460730b;hp=807c04f119b08729b9906eb36a9884f3f5194619;hb=bde37d0aa472d31606b53491240c79af3374f09b;hpb=a1d55154e1c9fb72fcd60de31d6e64e8d046f96d

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 807c04f1..7004dd7d 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,5 +1,5 @@
 /*
- * Copyright © 2018 Damyan Ivanov.
+ * Copyright © 2019 Damyan Ivanov.
  * This file is part of Mobile-Ledger.
  * Mobile-Ledger is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -24,7 +24,6 @@ import android.os.AsyncTask;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.AppCompatTextView;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -50,7 +49,8 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
         // a bit longer
         if (tr == null) return;
 
-        Log.d("transactions", String.format("Filling position %d", position));
+//        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));
@@ -59,7 +59,7 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
     @NonNull
     @Override
     public TransactionRowHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        Log.d("perf", "onCreateViewHolder called");
+//        Log.d("perf", "onCreateViewHolder called");
         View row = LayoutInflater.from(parent.getContext())
                 .inflate(R.layout.transaction_list_row, parent, false);
         return new TransactionRowHolder(row);
@@ -84,19 +84,20 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
         protected Void doInBackground(TransactionLoaderParams... p) {
             LedgerTransaction tr = p[0].transaction;
 
-            try (SQLiteDatabase db = MLDB.getReadableDatabase()) {
-                tr.loadData(db);
+            SQLiteDatabase db = MLDB.getReadableDatabase();
+            tr.loadData(db);
 
-                publishProgress(new TransactionLoaderStep(p[0].holder, p[0].position, tr));
+            publishProgress(new TransactionLoaderStep(p[0].holder, p[0].position, tr));
 
-                int rowIndex = 0;
-                for (LedgerTransactionAccount acc : tr.getAccounts()) {
-                    publishProgress(new TransactionLoaderStep(p[0].holder, acc, rowIndex++,
-                            p[0].boldAccountName));
-                }
-
-                publishProgress(new TransactionLoaderStep(p[0].holder, p[0].position, rowIndex));
+            int rowIndex = 0;
+            for (LedgerTransactionAccount acc : tr.getAccounts()) {
+//                Log.d(c.getAccountName(), acc.getAmount()));
+                publishProgress(new TransactionLoaderStep(p[0].holder, acc, rowIndex++,
+                        p[0].boldAccountName));
             }
+
+            publishProgress(new TransactionLoaderStep(p[0].holder, p[0].position, rowIndex));
+
             return null;
         }
         @Override
@@ -111,10 +112,10 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
                     holder.tvDate.setText(step.getTransaction().getDate());
 
                     if (step.getPosition() % 2 == 0) {
-                        holder.row.setBackgroundColor(Globals.table_row_even_bg);
+                        holder.row.setBackgroundColor(Globals.tableRowEvenBG);
                     }
                     else {
-                        holder.row.setBackgroundColor(Globals.table_row_odd_bg);
+                        holder.row.setBackgroundColor(Globals.tableRowOddBG);
                     }
 
                     break;
@@ -156,6 +157,9 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
                     accName.setText(acc.getAccountName());
                     accAmount.setText(acc.toString());
 
+//                    Log.d("tmp", String.format("showing acc row %d: %s %1.2f", rowIndex,
+//                            acc.getAccountName(), acc.getAmount()));
+
                     String boldAccountName = step.getBoldAccountName();
                     if ((boldAccountName != null) && boldAccountName.equals(acc.getAccountName())) {
                         accName.setTypeface(null, Typeface.BOLD);
@@ -178,8 +182,8 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
                                 holder.tableAccounts.getChildCount() - accCount);
                     }
 
-                    Log.d("transactions",
-                            String.format("Position %d fill done", step.getPosition()));
+//                    Log.d("transactions",
+//                            String.format("Position %d fill done", step.getPosition()));
             }
         }
     }