X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Faccount_summary_row.xml;h=8112c2a72e6d27642c53a79f7c3728031b17ccbb;hb=1eb1a8f63e0536b089a624994c2bcf5f0b462580;hp=addf2a2a169a14beff63de29a96160e53fd6ab37;hpb=940c057386c5c9b39404d58a97d98c63182e58ff;p=mobile-ledger.git

diff --git a/app/src/main/res/layout/account_summary_row.xml b/app/src/main/res/layout/account_summary_row.xml
index addf2a2a..8112c2a7 100644
--- a/app/src/main/res/layout/account_summary_row.xml
+++ b/app/src/main/res/layout/account_summary_row.xml
@@ -2,7 +2,7 @@
 
 
 <!--
-  ~ 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,111 +17,106 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with MoLe. If not, see <https://www.gnu.org/licenses/>.
   -->
-
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/account_summary_row"
     android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:animateLayoutChanges="true"
     android:longClickable="true"
-    android:layout_height="wrap_content">
-
-    <CheckBox
-        android:id="@+id/account_row_check"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:button="@drawable/checkbox_star_black"
-        android:onClick="onAccountSummaryRowViewClicked"
-        app:layout_constraintBottom_toBottomOf="parent"
+    >
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/account_name_layout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toStartOf="@+id/account_row_acc_amounts"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
+        app:layout_constraintHorizontal_weight="3"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/account_row_acc_name"
-        style="@style/account_summary_account_name"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:gravity="center_vertical"
-        android:onClick="onAccountSummaryRowViewClicked"
-        android:longClickable="true"
-        android:paddingStart="8dp"
-        android:text="Account name, a really long one. A very very very long one. It may even spawn on more than two lines -- three, four or more."
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/account_row_check"
         app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="HardcodedText" />
-
-    <FrameLayout
-        android:id="@+id/account_expander_container"
-        android:layout_width="@dimen/thumb_row_height"
-        android:layout_height="@dimen/thumb_row_height"
-        android:foregroundGravity="center_vertical"
-        android:minHeight="@dimen/thumb_row_height"
-        android:onClick="onAccountSummaryRowViewClicked"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/account_row_acc_name"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/account_expander"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="8dp"
-            android:background="@drawable/ic_expand_less_black_24dp"
-            android:clickable="true"
-            android:onClick="onAccountSummaryRowViewClicked" />
-    </FrameLayout>
+        >
+        <TextView
+            android:id="@+id/account_row_acc_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:gravity="center_vertical"
+            android:longClickable="true"
+            android:minHeight="@dimen/default_account_row_height"
+            android:paddingStart="8dp"
+            android:text="AccountName"
+            android:textAppearance="@android:style/TextAppearance.Material.Medium"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toStartOf="@id/account_expander_container"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintWidth_max="wrap"
+            app:layout_constraintWidth_percent=".67"
+            tools:ignore="HardcodedText"
+            />
 
-    <TextView
-        android:id="@+id/account_row_filler1"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/account_row_acc_amounts"
-        app:layout_constraintStart_toEndOf="@id/account_expander_container"
-        app:layout_constraintTop_toTopOf="parent" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/account_expander_container"
+            android:layout_width="@dimen/thumb_row_height"
+            android:layout_height="@dimen/default_account_row_height"
+            android:foregroundGravity="center_vertical"
+            android:minHeight="@dimen/default_account_row_height"
+            app:layout_constraintBottom_toBottomOf="@id/account_row_acc_name"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/account_row_acc_name"
+            app:layout_constraintTop_toTopOf="@id/account_row_acc_name"
+            >
 
+            <ImageView
+                android:id="@+id/account_expander"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:background="@drawable/ic_expand_less_black_24dp"
+                android:backgroundTint="?colorPrimary"
+                android:clickable="true"
+                android:focusable="true"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:contentDescription="@string/sub_accounts_expand_collapse_trigger_description"
+                />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
     <TextView
         android:id="@+id/account_row_acc_amounts"
         style="@style/account_summary_amounts"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
         android:layout_marginEnd="8dp"
-        android:layout_weight="0"
         android:gravity="center_vertical"
-        android:minWidth="@dimen/thumb_row_height"
-        android:onClick="onAccountSummaryRowViewClicked"
-        android:text="123,45\n678,90"
+        android:minHeight="@dimen/default_account_row_height"
+        android:text="USD 123,45\n678,90\nIRAUSD -17 000.00"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_weight="2"
+        app:layout_constraintStart_toEndOf="@id/account_name_layout"
         app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="HardcodedText" />
+        app:layout_constraintWidth_min="90sp"
+        tools:ignore="HardcodedText"
+        />
 
     <FrameLayout
         android:id="@+id/account_row_amounts_expander_container"
         android:layout_width="0dp"
         android:layout_height="18sp"
-        app:layout_constraintStart_toStartOf="@id/account_row_acc_amounts"
-        app:layout_constraintEnd_toEndOf="@id/account_row_acc_amounts"
+        android:background="@drawable/fade_down_white"
         app:layout_constraintBottom_toBottomOf="@id/account_row_acc_amounts"
-        android:background="@drawable/fade_down_white">
-
-        <!--<ImageView-->
-        <!--android:layout_gravity="center_vertical|end"-->
-        <!--android:id="@+id/account_row_amounts_expander"-->
-        <!--android:layout_width="20dp"-->
-        <!--android:layout_height="20dp"-->
-        <!--android:background="@drawable/ic_expand_more_black_24dp" />-->
+        app:layout_constraintEnd_toEndOf="@id/account_row_acc_amounts"
+        app:layout_constraintStart_toStartOf="@id/account_row_acc_amounts"
+        >
 
     </FrameLayout>
 
-    <View
-        android:id="@+id/account_summary_trailer"
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file