X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Ftransaction_list_row.xml;h=6cfe719de829c2927e960f154ba4dfa7ed3dc7cc;hb=b59786713721fa7d02cf1b4368231ec507e4e28a;hp=6fd70e349db795b634d5ef1c4e63590a37308b25;hpb=09e26d2279484b4dfe0de218b05f075362fff4b5;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 6fd70e34..6cfe719d 100644
--- a/app/src/main/res/layout/transaction_list_row.xml
+++ b/app/src/main/res/layout/transaction_list_row.xml
@@ -17,24 +17,26 @@
   ~ along with MoLe. If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<androidx.appcompat.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"
+    >
 
-    <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:visibility="gone"
-        app:cardCornerRadius="16dp"
-        app:cardElevation="4dp"
+        android:layout_marginHorizontal="@dimen/activity_horizontal_margin"
+        android:layout_marginVertical="1dp"
+        android:visibility="visible"
+        app:cardCornerRadius="4dp"
+        app:cardElevation="2dp"
         app:cardUseCompatPadding="false"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_goneMarginBottom="8dp">
+        >
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/transaction_row"
@@ -43,106 +45,58 @@
             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:textStyle="bold"
-                    tools:ignore="HardcodedText" />
-
+                    android:textAppearance="@android:style/TextAppearance.Material.Medium"
+                    tools:ignore="HardcodedText"
+                    />
+                <TextView
+                    android:id="@+id/transaction_comment"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:text="Comment text"
+                    android:textStyle="italic"
+                    tools:ignore="HardcodedText"
+                    />
             </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:alpha="0.3"
-                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_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" />
 
-                <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>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.cardview.widget.CardView>
+    </com.google.android.material.card.MaterialCardView>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/transaction_delimiter"
@@ -151,64 +105,44 @@
         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="?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="?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"
-            android:alpha="0.3"
-            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: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>
 
-    <view
-        android:id="@+id/transaction_list_trailer"
-        class="androidx.constraintlayout.widget.Placeholder"
-        id="@+id/view"
-        android:layout_width="match_parent"
-        android:layout_height="80dp" />
-</androidx.appcompat.widget.ContentFrameLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file