more material transaction list layout

[mobile-ledger-staging.git] / app / src / main / java / net / ktnx / mobileledger / ui / transaction_list / TransactionListAdapter.java

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 38d73fda4d88f6c5aa5b96777384bd52e715b478..35e68e59d733fa5062fe702333b23f216448dd20 100644 (file)
--- 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
@@ -17,6 +17,7 @@
 
 package net.ktnx.mobileledger.ui.transaction_list;
 
+import android.app.Activity;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Typeface;
@@ -24,7 +25,6 @@ import android.os.AsyncTask;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.style.StyleSpan;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -32,7 +32,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.widget.AppCompatTextView;
 import androidx.recyclerview.widget.RecyclerView;
 
 import net.ktnx.mobileledger.App;
@@ -43,14 +42,13 @@ import net.ktnx.mobileledger.model.LedgerTransactionAccount;
 import net.ktnx.mobileledger.model.TransactionListItem;
 import net.ktnx.mobileledger.utils.Colors;
 import net.ktnx.mobileledger.utils.Globals;
+import net.ktnx.mobileledger.utils.Misc;
 
 import java.text.DateFormat;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
-import static net.ktnx.mobileledger.utils.DimensionUtils.dp2px;
-
 public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowHolder> {
     public void onBindViewHolder(@NonNull TransactionRowHolder holder, int position) {
         TransactionListItem item = TransactionListViewModel.getTransactionListItem(position);
@@ -99,14 +97,12 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
                     holder.tvDelimiterMonth.setVisibility(View.VISIBLE);
                     //                holder.vDelimiterLine.setBackgroundResource(R.drawable
                     //                .dashed_border_8dp);
-                    holder.vDelimiterLine.setVisibility(View.GONE);
                     holder.vDelimiterThick.setVisibility(View.VISIBLE);
                 }
                 else {
                     holder.tvDelimiterMonth.setVisibility(View.GONE);
                     //                holder.vDelimiterLine.setBackgroundResource(R.drawable
                     //                .dashed_border_1dp);
-                    holder.vDelimiterLine.setVisibility(View.VISIBLE);
                     holder.vDelimiterThick.setVisibility(View.GONE);
                 }
                 break;
@@ -162,11 +158,19 @@ public class TransactionListAdapter extends RecyclerView.Adapter<TransactionRowH
                 case HEAD:
                     holder.tvDescription.setText(step.getTransaction()
                                                      .getDescription());
+                    String trComment = Misc.emptyIsNull(step.getTransaction()
+                                                            .getComment());
+                    if (trComment == null)
+                        holder.tvComment.setVisibility(View.GONE);
+                    else {
+                        holder.tvComment.setText(trComment);
+                        holder.tvComment.setVisibility(View.VISIBLE);
+                    }
 
-                    if (step.isOdd())
-                        holder.row.setBackgroundColor(Colors.tableRowDarkBG);
-                    else
-                        holder.row.setBackgroundColor(Colors.tableRowLightBG);
+//                    if (step.isOdd())
+//                        holder.row.setBackgroundColor(Colors.tableRowDarkBG);
+//                    else
+//                        holder.row.setBackgroundColor(Colors.tableRowLightBG);
 
                     break;
                 case ACCOUNTS: