X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Faccount_summary_row.xml;h=2ff3b4e6621b25d77d28f4c92f1e1fcf41f67ec3;hb=c6fe580ac5a93cff593d95a0fe34bd6c2c7bddfc;hp=daa033df0375c7045bd8da455e28d0ccb57428de;hpb=b5ce02c84db901506139f9e0aaab3c56e394a6e3;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 daa033df..2ff3b4e6 100644
--- a/app/src/main/res/layout/account_summary_row.xml
+++ b/app/src/main/res/layout/account_summary_row.xml
@@ -3,60 +3,95 @@
 
 <!--
   ~ Copyright © 2019 Damyan Ivanov.
-  ~ This file is part of Mobile-Ledger.
-  ~ Mobile-Ledger is free software: you can distribute it and/or modify it
+  ~ 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
   ~ the Free Software Foundation, either version 3 of the License, or
   ~ (at your opinion), any later version.
   ~
-  ~ Mobile-Ledger is distributed in the hope that it will be useful,
+  ~ MoLe is distributed in the hope that it will be useful,
   ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
   ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
   ~ GNU General Public License terms for details.
   ~
   ~ You should have received a copy of the GNU General Public License
-  ~ along with Mobile-Ledger. If not, see <https://www.gnu.org/licenses/>.
+  ~ along with MoLe. If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<android.support.constraint.ConstraintLayout 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"
-    tools:showIn="@id/account_root">
+    android:layout_height="wrap_content">
 
-    <LinearLayout
-        android:id="@+id/account_summary_row"
-        android:layout_width="match_parent"
-        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"
+        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:minHeight="?attr/android:actionBarSize"
-        android:orientation="horizontal"
+        android:onClick="onAccountSummaryRowViewClicked"
         android:paddingStart="8dp"
-        android:paddingEnd="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_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="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">
 
-        <CheckBox
-            android:id="@+id/account_row_check"
-            android:layout_width="wrap_content"
+        <ImageView
+            android:id="@+id/account_expander"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:button="@drawable/checkbox_star_black" />
+            android:layout_margin="8dp"
+            android:background="@drawable/ic_expand_less_black_24dp" />
+    </FrameLayout>
 
-        <TextView
-            android:id="@+id/account_row_acc_name"
-            style="@style/account_summary_account_name"
-            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."
-            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" />
 
-        <TextView
-            android:id="@+id/account_row_acc_amounts"
-            style="@style/account_summary_amounts"
-            android:text="123,45\n678,90"
-            tools:ignore="HardcodedText" />
-    </LinearLayout>
+    <TextView
+        android:id="@+id/account_row_acc_amounts"
+        style="@style/account_summary_amounts"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:layout_weight="0"
+        android:gravity="center_vertical"
+        android:onClick="onAccountSummaryRowViewClicked"
+        android:text="123,45\n678,90"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="HardcodedText" />
 
     <View
         android:id="@+id/account_summary_trailer"
@@ -66,4 +101,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file