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=7fa85d3a6c98b277350126403798588e985833bd;hp=267b759e38889104f3011f127953e9ff0bac6b42;hb=a5971dd3588704cc5c8dd9077d4d74860c5a06a9;hpb=b78adb39561c840d31f537d5516040352671a805 diff --git a/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java b/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java index 267b759e..7fa85d3a 100644 --- a/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java +++ b/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java @@ -18,93 +18,122 @@ package net.ktnx.mobileledger; import android.content.Context; -import android.content.res.Resources; import android.database.sqlite.SQLiteDatabase; -import android.os.Build; 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; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; -import android.widget.TableLayout; -import android.widget.TableRow; import android.widget.TextView; import net.ktnx.mobileledger.model.LedgerTransaction; -import net.ktnx.mobileledger.model.LedgerTransactionItem; +import net.ktnx.mobileledger.model.LedgerTransactionAccount; +import net.ktnx.mobileledger.ui.transaction_list.TransactionListViewModel; +import net.ktnx.mobileledger.utils.Globals; import net.ktnx.mobileledger.utils.MLDB; -import java.util.Iterator; -import java.util.List; +import static net.ktnx.mobileledger.utils.DimensionUtils.dp2px; class TransactionListAdapter extends RecyclerView.Adapter { - private List transactions; - - TransactionListAdapter(List transactions) { - this.transactions = transactions; + TransactionListViewModel model; + public TransactionListAdapter(TransactionListViewModel model) { + this.model = model; } - public void onBindViewHolder(@NonNull TransactionRowHolder holder, int position) { - LedgerTransaction tr = transactions.get(position); + LedgerTransaction tr = model.getTransaction(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 (tr == null) return; + Context ctx = holder.row.getContext(); - Resources rm = ctx.getResources(); - try (SQLiteDatabase db = MLDB.getReadableDatabase(ctx.getApplicationContext())) { + + try (SQLiteDatabase db = MLDB.getReadableDatabase(ctx)) { tr.loadData(db); + holder.tvDescription.setText(tr.getDescription()); + holder.tvDate.setText(tr.getDate()); - holder.tvDescription - .setText(String.format("%s\n%s", tr.getDescription(), tr.getDate())); - TableLayout tbl = holder.row.findViewById(R.id.transaction_row_acc_amounts); - tbl.removeAllViews(); - for (Iterator it = tr.getItemsIterator(); it.hasNext(); ) { - LedgerTransactionItem acc = it.next(); - TableRow row = new TableRow(holder.row.getContext()); - TextView child = new TextView(ctx); - child.setText(acc.getShortAccountName()); - row.addView(child); - child = new TextView(ctx); - child.setText(acc.toString()); - row.addView(child); - tbl.addView(row); + 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 (holder.tableAccounts.getChildCount() > rowIndex) { + holder.tableAccounts + .removeViews(rowIndex, holder.tableAccounts.getChildCount() - rowIndex); } if (position % 2 == 0) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) holder.row - .setBackgroundColor(rm.getColor(R.color.table_row_even_bg, ctx.getTheme())); - else holder.row.setBackgroundColor(rm.getColor(R.color.table_row_even_bg)); + holder.row.setBackgroundColor(Globals.table_row_even_bg); } else { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) holder.row - .setBackgroundColor(rm.getColor(R.color.table_row_odd_bg, ctx - .getTheme())); - else holder.row.setBackgroundColor(rm.getColor(R.color.table_row_odd_bg)); + holder.row.setBackgroundColor(Globals.table_row_odd_bg); } - holder.row.setTag(R.id.POS, position); + Log.d("transactions", String.format("Filled position %d", position)); } } @NonNull @Override public TransactionRowHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + Log.d("perf", "onCreateViewHolder called"); View row = LayoutInflater.from(parent.getContext()) .inflate(R.layout.transaction_list_row, parent, false); return new TransactionRowHolder(row); } @Override - public int getItemCount() { - return transactions.size(); + public int getItemCount() + { + return model.getTransactionCount(); } class TransactionRowHolder extends RecyclerView.ViewHolder { - TextView tvDescription; - TableLayout tableAccounts; - LinearLayout row; + TextView tvDescription, tvDate; + LinearLayout tableAccounts; + ConstraintLayout row; public TransactionRowHolder(@NonNull View itemView) { super(itemView); - this.row = (LinearLayout) 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); } }