X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Ftransaction_list_row.xml;h=a91456ccc7c27c061cfc71a0a60b026810b29101;hb=22c8a6178c635a9f53823c3942974f577225cdf6;hp=e2d0013287a2782bbd9a32089acac8b2de0f9ef8;hpb=08f302d24aa8324a9ea7c32734938069794398b8;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 e2d00132..a91456cc 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 © 2021 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
@@ -20,19 +20,18 @@
 <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:measureAllChildren="false"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    >
 
     <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_marginHorizontal="@dimen/activity_horizontal_margin"
-        android:layout_marginVertical="1dp"
+        android:layout_margin="8dp"
         android:visibility="visible"
-        app:cardCornerRadius="4dp"
+        app:cardCornerRadius="0dp"
         app:cardElevation="2dp"
         app:cardUseCompatPadding="false"
         >
@@ -43,100 +42,91 @@
             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_width="0dp"
                 android:layout_height="wrap_content"
                 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="match_parent"
                     android:layout_height="wrap_content"
                     android:text="---."
                     android:textAppearance="@android:style/TextAppearance.Material.Medium"
+                    android:textStyle="bold"
                     tools:ignore="HardcodedText"
                     />
                 <TextView
                     android:id="@+id/transaction_comment"
+                    style="@style/transaction_list_comment"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginTop="0dp"
                     android:text="Comment text"
-                    android:textStyle="italic"
                     tools:ignore="HardcodedText"
                     />
             </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/transaction_row_acc_amounts"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:layout_weight="5"
                 android:orientation="vertical"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/transaction_running_total"
                 app:layout_constraintStart_toStartOf="parent"
                 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"/>
+                <include layout="@layout/transaction_list_row_accounts_table_row" />
+                <include layout="@layout/transaction_list_row_accounts_table_row" />
 
             </LinearLayout>
+            <androidx.constraintlayout.widget.Barrier
+                android:id="@+id/barrier"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:barrierDirection="top"
+                app:constraint_referenced_ids="transaction_row_acc_amounts,transaction_running_total"
+                />
+
+            <TextView
+                android:id="@+id/transaction_running_total"
+                style="@style/transaction_list_comment"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/half_text_margin"
+                android:gravity="bottom|end"
+                android:text="one two"
+                android:visibility="visible"
+                app:layout_constraintBottom_toBottomOf="@id/transaction_row_acc_amounts"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/transaction_row_acc_amounts"
+                app:layout_goneMarginStart="0dp"
+                />
+            <View
+                android:id="@+id/transaction_running_total_divider"
+                android:layout_width="1dp"
+                android:layout_height="0dp"
+                android:layout_marginStart="@dimen/quarter_text_margin"
+                android:background="?commentColor"
+                app:layout_constraintBottom_toBottomOf="@id/transaction_running_total"
+                app:layout_constraintStart_toEndOf="@id/transaction_row_acc_amounts"
+                app:layout_constraintTop_toBottomOf="@id/barrier"
+                app:layout_goneMarginStart="0dp"
+                />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
 
-    <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">
-
-        <TextView
-            android:id="@+id/transaction_delimiter_month"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginHorizontal="4dp"
-            android:text="---------"
-            android:textColor="?colorPrimary"
-            android:textStyle="bold"
-            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:layout_marginHorizontal="4dp"
-            android:text="--.--.----"
-            android:textColor="?colorPrimary"
-            android:textStyle="bold"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:ignore="HardcodedText" />
-
-        <View
-            android:id="@+id/transaction_delimiter_thick"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginHorizontal="16dp"
-            android:background="?colorPrimary"
-            app:layout_constraintBottom_toBottomOf="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>
 
 </FrameLayout>
\ No newline at end of file