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=4b8a87084fbd7eddfa6035ff57e092f235ee9b44;hb=0c437b5ed0d9da7e9340cb247d036cd141598065;hpb=dfe6ac5dc9a45dc987031d2e45a1fa044452e2dd diff --git a/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java b/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java index 4b8a8708..96cbfba8 100644 --- a/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java +++ b/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java @@ -18,21 +18,28 @@ package net.ktnx.mobileledger; import android.content.Context; -import android.content.res.Resources; -import android.os.Build; +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; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; -import android.widget.TableLayout; import android.widget.TextView; import net.ktnx.mobileledger.model.LedgerTransaction; +import net.ktnx.mobileledger.model.LedgerTransactionAccount; +import net.ktnx.mobileledger.utils.Globals; +import net.ktnx.mobileledger.utils.MLDB; import java.util.List; +import static net.ktnx.mobileledger.utils.DimensionUtils.dp2px; + class TransactionListAdapter extends RecyclerView.Adapter { private List transactions; @@ -42,42 +49,73 @@ 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(); - Resources rm = ctx.getResources(); - 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); - } + try (SQLiteDatabase db = MLDB.getReadableDatabase(ctx)) { + tr.loadData(db); + holder.tvDescription.setText(tr.getDescription()); + holder.tvDate.setText(tr.getDate()); - 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)); - } - else { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) holder.row - .setBackgroundColor(rm.getColor(R.color.drawer_background, ctx.getTheme())); - else holder.row.setBackgroundColor(rm.getColor(R.color.drawer_background)); - } + 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.getShortAccountName()); + accAmount.setText(acc.toString()); + } + if (holder.tableAccounts.getChildCount() > rowIndex) { + holder.tableAccounts + .removeViews(rowIndex, holder.tableAccounts.getChildCount() - rowIndex); + } - holder.row.setTag(R.id.POS, position); + if (position % 2 == 0) { + holder.row.setBackgroundColor(Globals.table_row_even_bg); + } + else { + holder.row.setBackgroundColor(Globals.table_row_odd_bg); + } + } } @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); @@ -88,13 +126,14 @@ class TransactionListAdapter return transactions.size(); } 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); } }