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=807c04f119b08729b9906eb36a9884f3f5194619;hp=5b1e46f4b5ea3e05e3737c2a37457dca063c9e27;hb=a1d55154e1c9fb72fcd60de31d6e64e8d046f96d;hpb=b5a5d8a0367d42a72f5db81ef9f82b2973f67fcc 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 5b1e46f4..807c04f1 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 @@ -20,8 +20,8 @@ package net.ktnx.mobileledger.ui.transaction_list; import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.graphics.Typeface; +import android.os.AsyncTask; 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; @@ -40,92 +40,20 @@ import net.ktnx.mobileledger.utils.MLDB; import static net.ktnx.mobileledger.utils.DimensionUtils.dp2px; -public class TransactionListAdapter - extends RecyclerView.Adapter { - TransactionListViewModel model; +public class TransactionListAdapter extends RecyclerView.Adapter { private String boldAccountName; - public TransactionListAdapter(TransactionListViewModel model) { - this.model = model; - } public void onBindViewHolder(@NonNull TransactionRowHolder holder, int position) { - LedgerTransaction tr = model.getTransaction(position); - // in a race when transaction list is reduced, but the model hasn't been notified yet + LedgerTransaction tr = TransactionListViewModel.getTransaction(position); + // in a race when transaction value 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 (tr == null) return; - Context ctx = holder.row.getContext(); - - try (SQLiteDatabase db = MLDB.getReadableDatabase()) { - tr.loadData(db); - holder.tvDescription.setText(tr.getDescription()); - holder.tvDate.setText(tr.getDate()); - - int rowIndex = 0; - for (LedgerTransactionAccount acc : tr.getAccounts()) { - LinearLayout row = (LinearLayout) holder.tableAccounts.getChildAt(rowIndex++); - TextView accName, accAmount; - if (row == null) { - row = new LinearLayout(ctx); - row.setLayoutParams( - new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, - LinearLayout.LayoutParams.WRAP_CONTENT)); - row.setGravity(Gravity.CENTER_VERTICAL); - row.setOrientation(LinearLayout.HORIZONTAL); - 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 AppCompatTextView(ctx); - LinearLayout.LayoutParams llp = - new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, - LinearLayout.LayoutParams.WRAP_CONTENT); - llp.setMarginEnd(0); - accAmount.setLayoutParams(llp); - accAmount.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END); - accAmount.setMinWidth(dp2px(ctx, 60)); - row.addView(accAmount); - holder.tableAccounts.addView(row); - } - else { - accName = (TextView) row.getChildAt(0); - accAmount = (TextView) row.getChildAt(1); - } - accName.setText(acc.getAccountName()); - accAmount.setText(acc.toString()); - - if ((boldAccountName != null) && boldAccountName.equals(acc.getAccountName())) { - accName.setTypeface(null, Typeface.BOLD); - accAmount.setTypeface(null, Typeface.BOLD); - accName.setTextColor(Globals.primaryDark); - accAmount.setTextColor(Globals.primaryDark); - } - else { - accName.setTypeface(null, Typeface.NORMAL); - accAmount.setTypeface(null, Typeface.NORMAL); - accName.setTextColor(Globals.defaultTextColor); - accAmount.setTextColor(Globals.defaultTextColor); - } - - } - if (holder.tableAccounts.getChildCount() > rowIndex) { - holder.tableAccounts - .removeViews(rowIndex, holder.tableAccounts.getChildCount() - rowIndex); - } - - if (position % 2 == 0) { - holder.row.setBackgroundColor(Globals.table_row_even_bg); - } - else { - holder.row.setBackgroundColor(Globals.table_row_odd_bg); - } + Log.d("transactions", String.format("Filling position %d", position)); - Log.d("transactions", String.format("Filled position %d", position)); - } + TransactionLoader loader = new TransactionLoader(); + loader.execute(new TransactionLoaderParams(tr, holder, position, boldAccountName)); } @NonNull @@ -139,7 +67,7 @@ public class TransactionListAdapter @Override public int getItemCount() { - return model.getTransactionCount(); + return TransactionListViewModel.getTransactionCount(); } public void setBoldAccountName(String boldAccountName) { this.boldAccountName = boldAccountName; @@ -147,16 +75,126 @@ public class TransactionListAdapter public void resetBoldAccountName() { this.boldAccountName = null; } - class TransactionRowHolder extends RecyclerView.ViewHolder { - TextView tvDescription, tvDate; - LinearLayout tableAccounts; - ConstraintLayout row; - public TransactionRowHolder(@NonNull View itemView) { - super(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); + + enum LoaderStep {HEAD, ACCOUNTS, DONE} + + private static class TransactionLoader + extends AsyncTask { + @Override + protected Void doInBackground(TransactionLoaderParams... p) { + LedgerTransaction tr = p[0].transaction; + + try (SQLiteDatabase db = MLDB.getReadableDatabase()) { + tr.loadData(db); + + 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)); + } + return null; + } + @Override + protected void onProgressUpdate(TransactionLoaderStep... values) { + super.onProgressUpdate(values); + TransactionLoaderStep step = values[0]; + TransactionRowHolder holder = step.getHolder(); + + switch (step.getStep()) { + case HEAD: + holder.tvDescription.setText(step.getTransaction().getDescription()); + holder.tvDate.setText(step.getTransaction().getDate()); + + if (step.getPosition() % 2 == 0) { + holder.row.setBackgroundColor(Globals.table_row_even_bg); + } + else { + holder.row.setBackgroundColor(Globals.table_row_odd_bg); + } + + break; + case ACCOUNTS: + int rowIndex = step.getAccountPosition(); + Context ctx = holder.row.getContext(); + LinearLayout row = (LinearLayout) holder.tableAccounts.getChildAt(rowIndex); + TextView accName, accAmount; + if (row == null) { + row = new LinearLayout(ctx); + row.setLayoutParams(new LinearLayout.LayoutParams( + LinearLayout.LayoutParams.MATCH_PARENT, + LinearLayout.LayoutParams.WRAP_CONTENT)); + row.setGravity(Gravity.CENTER_VERTICAL); + row.setOrientation(LinearLayout.HORIZONTAL); + 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 AppCompatTextView(ctx); + LinearLayout.LayoutParams llp = new LinearLayout.LayoutParams( + LinearLayout.LayoutParams.WRAP_CONTENT, + LinearLayout.LayoutParams.WRAP_CONTENT); + llp.setMarginEnd(0); + accAmount.setLayoutParams(llp); + accAmount.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END); + accAmount.setMinWidth(dp2px(ctx, 60)); + row.addView(accAmount); + holder.tableAccounts.addView(row); + } + else { + accName = (TextView) row.getChildAt(0); + accAmount = (TextView) row.getChildAt(1); + } + LedgerTransactionAccount acc = step.getAccount(); + + accName.setText(acc.getAccountName()); + accAmount.setText(acc.toString()); + + String boldAccountName = step.getBoldAccountName(); + if ((boldAccountName != null) && boldAccountName.equals(acc.getAccountName())) { + accName.setTypeface(null, Typeface.BOLD); + accAmount.setTypeface(null, Typeface.BOLD); + accName.setTextColor(Globals.primaryDark); + accAmount.setTextColor(Globals.primaryDark); + } + else { + accName.setTypeface(null, Typeface.NORMAL); + accAmount.setTypeface(null, Typeface.NORMAL); + accName.setTextColor(Globals.defaultTextColor); + accAmount.setTextColor(Globals.defaultTextColor); + } + + break; + case DONE: + int accCount = step.getAccountCount(); + if (holder.tableAccounts.getChildCount() > accCount) { + holder.tableAccounts.removeViews(accCount, + holder.tableAccounts.getChildCount() - accCount); + } + + Log.d("transactions", + String.format("Position %d fill done", step.getPosition())); + } + } + } + + private class TransactionLoaderParams { + LedgerTransaction transaction; + TransactionRowHolder holder; + int position; + String boldAccountName; + TransactionLoaderParams(LedgerTransaction transaction, TransactionRowHolder holder, + int position, String boldAccountName) { + this.transaction = transaction; + this.holder = holder; + this.position = position; + this.boldAccountName = boldAccountName; } } } \ No newline at end of file