From 08f302d24aa8324a9ea7c32734938069794398b8 Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Sun, 14 Jun 2020 14:38:40 +0300
Subject: [PATCH] more material transaction list layout

card views no longer use alternate background color

day/month indicators are less intrusive while still visible enough
---
 .../TransactionListAdapter.java               |  2 -
 .../TransactionRowHolder.java                 |  3 +-
 .../main/res/layout/transaction_list_row.xml  | 69 +++++++------------
 3 files changed, 25 insertions(+), 49 deletions(-)

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 3946474f..35e68e59 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
@@ -97,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;
diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionRowHolder.java b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionRowHolder.java
index 1bd6fd36..93ff0edc 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionRowHolder.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionRowHolder.java
@@ -36,7 +36,7 @@ class TransactionRowHolder extends RecyclerView.ViewHolder {
     ConstraintLayout vDelimiter;
     CardView vTransaction;
     TextView tvDelimiterMonth, tvDelimiterDate;
-    View vDelimiterLine, vDelimiterThick;
+    View vDelimiterThick;
     public TransactionRowHolder(@NonNull View itemView) {
         super(itemView);
         this.row = itemView.findViewById(R.id.transaction_row);
@@ -47,7 +47,6 @@ class TransactionRowHolder extends RecyclerView.ViewHolder {
         this.vTransaction = itemView.findViewById(R.id.transaction_card_view);
         this.tvDelimiterDate = itemView.findViewById(R.id.transaction_delimiter_date);
         this.tvDelimiterMonth = itemView.findViewById(R.id.transaction_delimiter_month);
-        this.vDelimiterLine = itemView.findViewById(R.id.transaction_delimiter_line);
         this.vDelimiterThick = itemView.findViewById(R.id.transaction_delimiter_thick);
     }
 }
diff --git a/app/src/main/res/layout/transaction_list_row.xml b/app/src/main/res/layout/transaction_list_row.xml
index 95201210..e2d00132 100644
--- a/app/src/main/res/layout/transaction_list_row.xml
+++ b/app/src/main/res/layout/transaction_list_row.xml
@@ -24,15 +24,18 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <androidx.cardview.widget.CardView
+    <com.google.android.material.card.MaterialCardView
         android:id="@+id/transaction_card_view"
+        style="@style/Widget.MaterialComponents.CardView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:layout_marginVertical="1dp"
         android:visibility="visible"
-        app:cardCornerRadius="16dp"
-        app:cardElevation="4dp"
-        app:cardUseCompatPadding="false">
+        app:cardCornerRadius="4dp"
+        app:cardElevation="2dp"
+        app:cardUseCompatPadding="false"
+        >
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/transaction_row"
@@ -72,26 +75,17 @@
                     />
             </LinearLayout>
 
-            <View
-                android:id="@+id/transaction_row_header_border"
-                android:layout_width="match_parent"
-                android:layout_height="2dp"
-                android:alpha="0.3"
-                android:background="@drawable/dashed_border_1dp"
-                android:height="2dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/transaction_row_head" />
-
             <LinearLayout
                 android:id="@+id/transaction_row_acc_amounts"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
                 android:layout_weight="5"
                 android:orientation="vertical"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/transaction_row_header_border">
+                app:layout_constraintTop_toBottomOf="@+id/transaction_row_head"
+                >
 
                 <include layout="@layout/transaction_list_row_accounts_table_row"/>
                 <include layout="@layout/transaction_list_row_accounts_table_row"/>
@@ -99,7 +93,7 @@
             </LinearLayout>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/transaction_delimiter"
@@ -113,50 +107,35 @@
             android:id="@+id/transaction_delimiter_month"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:background="?colorPrimary"
-            android:paddingStart="4dp"
-            android:paddingEnd="4dp"
+            android:layout_marginHorizontal="4dp"
             android:text="---------"
-            android:textColor="?android:attr/colorBackground"
+            android:textColor="?colorPrimary"
             android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             tools:ignore="HardcodedText" />
 
         <TextView
             android:id="@+id/transaction_delimiter_date"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:background="?colorPrimary"
-            android:paddingStart="4dp"
-            android:paddingEnd="4dp"
+            android:layout_marginHorizontal="4dp"
             android:text="--.--.----"
-            android:textColor="?android:attr/colorBackground"
+            android:textColor="?colorPrimary"
             android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             tools:ignore="HardcodedText" />
 
-        <View
-            android:id="@+id/transaction_delimiter_line"
-            android:layout_width="0dp"
-            android:layout_height="16dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:alpha="0.3"
-            android:background="@drawable/dashed_border_1dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/transaction_delimiter_date"
-            app:layout_constraintStart_toEndOf="@id/transaction_delimiter_month"
-            app:layout_constraintTop_toTopOf="parent" />
-
         <View
             android:id="@+id/transaction_delimiter_thick"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="1dp"
+            android:layout_marginHorizontal="16dp"
             android:background="?colorPrimary"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/transaction_delimiter_date"
-            app:layout_constraintStart_toEndOf="@id/transaction_delimiter_month"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintEnd_toStartOf="@id/transaction_delimiter_month"
+            app:layout_constraintStart_toEndOf="@id/transaction_delimiter_date"
+            app:layout_constraintTop_toTopOf="parent"
+            />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-- 
2.39.5