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=3283a2ed148668af54bf9e73497ff009f084a2a7;hpb=7bfd85e40b6fb441937c055ea0da2aeb5b00f1f6;p=mobile-ledger-staging.git

diff --git a/app/src/main/res/layout/account_summary_row.xml b/app/src/main/res/layout/account_summary_row.xml
index 3283a2ed..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,118 +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/>.
   -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
     >
-
-    <androidx.constraintlayout.widget.ConstraintLayout 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"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/account_name_layout"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:longClickable="true"
-        android:minHeight="@dimen/thumb_row_height"
+        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"
         >
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/account_name_layout"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            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="wrap_content"
-                android:layout_marginStart="8dp"
-                android:gravity="center_vertical"
-                android:longClickable="true"
-                android:onClick="onAccountSummaryRowViewClicked"
-                android:paddingStart="8dp"
-                android:text="AccountNameALongOne"
-                android:textAppearance="@android:style/TextAppearance.Material.Medium"
-                app:layout_constrainedWidth="true"
-                app:layout_constraintBottom_toBottomOf="parent"
-                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"
-                />
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                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="@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:clickable="true"
-                    android:onClick="onAccountSummaryRowViewClicked"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
         <TextView
-            android:id="@+id/account_row_acc_amounts"
-            style="@style/account_summary_amounts"
-            android:layout_width="0dp"
+            android:id="@+id/account_row_acc_name"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="8dp"
+            android:layout_marginStart="8dp"
             android:gravity="center_vertical"
-            android:onClick="onAccountSummaryRowViewClicked"
-            android:text="USD 123,45\n678,90\nIRAUSD -17 000.00"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            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_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_weight="2"
-            app:layout_constraintStart_toEndOf="@id/account_name_layout"
+            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_min="90sp"
+            app:layout_constraintWidth_max="wrap"
+            app:layout_constraintWidth_percent=".67"
             tools:ignore="HardcodedText"
             />
 
-        <FrameLayout
-            android:id="@+id/account_row_amounts_expander_container"
-            android:layout_width="0dp"
-            android:layout_height="18sp"
-            android:background="@drawable/fade_down_white"
-            app:layout_constraintBottom_toBottomOf="@id/account_row_acc_amounts"
-            app:layout_constraintEnd_toEndOf="@id/account_row_acc_amounts"
-            app:layout_constraintStart_toStartOf="@id/account_row_acc_amounts"
+        <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"
             >
 
-        </FrameLayout>
-
+            <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>
-    <View
-        android:id="@+id/account_summary_trailer"
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
+    <TextView
+        android:id="@+id/account_row_acc_amounts"
+        style="@style/account_summary_amounts"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="8dp"
+        android:gravity="center_vertical"
+        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"
+        app:layout_constraintWidth_min="90sp"
+        tools:ignore="HardcodedText"
         />
-</FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/account_row_amounts_expander_container"
+        android:layout_width="0dp"
+        android:layout_height="18sp"
+        android:background="@drawable/fade_down_white"
+        app:layout_constraintBottom_toBottomOf="@id/account_row_acc_amounts"
+        app:layout_constraintEnd_toEndOf="@id/account_row_acc_amounts"
+        app:layout_constraintStart_toStartOf="@id/account_row_acc_amounts"
+        >
+
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file