X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Ftransaction_list_row.xml;h=e34444a984d637837f212719f502f29d134e7101;hb=4f910919819fbe8db070847cfbfba493a62c7c58;hp=16bab0699b2a0d45ff1311632f8ac9eee37260b7;hpb=998dd32a089d199a2569069415755eb3169b35b0;p=mobile-ledger.git

diff --git a/app/src/main/res/layout/transaction_list_row.xml b/app/src/main/res/layout/transaction_list_row.xml
index 16bab069..e34444a9 100644
--- a/app/src/main/res/layout/transaction_list_row.xml
+++ b/app/src/main/res/layout/transaction_list_row.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ Copyright © 2019 Damyan Ivanov.
+  ~ Copyright © 2020 Damyan Ivanov.
   ~ This file is part of MoLe.
   ~ MoLe is free software: you can distribute it and/or modify it
   ~ under the term of the GNU General Public License as published by
@@ -17,196 +17,130 @@
   ~ along with MoLe. If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<android.support.v7.widget.ContentFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:measureAllChildren="false"
+    >
 
-    <android.support.v7.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:visibility="gone"
-        app:cardCornerRadius="16dp"
-        app:cardElevation="4dp"
+        android:visibility="visible"
+        app:cardBackgroundColor="?table_row_light_bg"
         app:cardUseCompatPadding="false"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_goneMarginBottom="8dp">
+        app:cardCornerRadius="0dp"
+        >
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/transaction_row"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:minHeight="36dp"
-            android:orientation="horizontal"
-            android:padding="8dp">
+            android:padding="8dp"
+            >
 
             <LinearLayout
                 android:id="@+id/transaction_row_head"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
+                android:orientation="vertical"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
+                app:layout_constraintTop_toTopOf="parent"
+                >
 
                 <TextView
                     android:id="@+id/transaction_row_description"
-                    style="@style/account_summary_account_name"
-                    android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="5"
                     android:text="---."
+                    android:textAppearance="@android:style/TextAppearance.Material.Medium"
                     android:textStyle="bold"
-                    tools:ignore="HardcodedText" />
-
+                    tools:ignore="HardcodedText"
+                    />
+                <TextView
+                    android:id="@+id/transaction_comment"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="0dp"
+                    android:text="Comment text"
+                    tools:ignore="HardcodedText"
+                    style="@style/transaction_list_comment"
+                    />
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/transaction_row_header_border"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/dashed_border_1dp"
-                android:minHeight="2dp"
-                android:orientation="horizontal"
-                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_weight="5"
+                android:layout_marginTop="8dp"
                 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" />
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal"
-                    android:paddingStart="8dp"
-                    android:paddingEnd="0dp">
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="5"
-                        android:text="---"
-                        android:textAlignment="viewStart"
-                        tools:ignore="HardcodedText" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="0dp"
-                        android:minWidth="60dp"
-                        android:text="€ --,--"
-                        android:textAlignment="viewEnd"
-                        tools:ignore="HardcodedText" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal"
-                    android:paddingStart="8dp"
-                    android:paddingEnd="0dp">
-
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="5"
-                        android:text="---"
-                        android:textAlignment="viewStart"
-                        tools:ignore="HardcodedText" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginEnd="0dp"
-                        android:minWidth="60dp"
-                        android:text="---,--"
-                        android:textAlignment="viewEnd"
-                        tools:ignore="HardcodedText" />
-                </LinearLayout>
             </LinearLayout>
 
-        </android.support.constraint.ConstraintLayout>
-    </android.support.v7.widget.CardView>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </com.google.android.material.card.MaterialCardView>
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/transaction_delimiter"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="8dp"
-        android:foregroundGravity="center_vertical"
-        android:orientation="horizontal">
+        >
 
         <TextView
             android:id="@+id/transaction_delimiter_month"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
-            android:paddingStart="4dp"
-            android:paddingEnd="4dp"
+            android:layout_marginHorizontal="4dp"
             android:text="---------"
-            android:textColor="@android:color/white"
+            android:textColor="?colorPrimary"
             android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:ignore="HardcodedText" />
+            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="@color/colorPrimary"
-            android:paddingStart="4dp"
-            android:paddingEnd="4dp"
+            android:layout_marginHorizontal="4dp"
             android:text="--.--.----"
-            android:textColor="@android:color/white"
+            android:textColor="?colorPrimary"
             android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="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: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" />
+            app:layout_constraintStart_toStartOf="parent"
+            tools:ignore="HardcodedText"
+            />
 
         <View
             android:id="@+id/transaction_delimiter_thick"
             android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@color/colorPrimary"
+            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"
+            />
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <view
-        android:id="@+id/transaction_list_trailer"
-        class="android.support.constraint.Placeholder"
-        id="@+id/view"
-        android:layout_width="match_parent"
-        android:layout_height="80dp" />
-</android.support.v7.widget.ContentFrameLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file