use standard height toolbars in main activity and new transaction act.

[mobile-ledger.git] / app / src / main / res / layout / activity_main.xml

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0ef2dd98f6707f4a2c1069fbfbf4a1d1fb22eacd..fcbafd50713054c77454a04a1d4f900733bcce4c 100644 (file)
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2020 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
@@ -105,7 +105,7 @@
         android:layout_height="match_parent"
         android:background="?android:attr/colorBackground"
         android:orientation="vertical"
-        android:visibility="gone"
+        android:visibility="visible"
         >
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -138,60 +138,54 @@
                 <androidx.appcompat.widget.Toolbar
                     android:id="@+id/toolbar"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/toolbar_height"
+                    android:layout_height="wrap_content"
                     android:background="?colorPrimary"
                     android:theme="@style/AppTheme.AppBarOverlay"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:popupTheme="@style/AppTheme.PopupOverlay"
+                    app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle"
+                    app:titleTextAppearance="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
                     />
 
+
                 <LinearLayout
-                    android:id="@+id/main_header"
+                    android:id="@+id/transaction_progress_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:visibility="gone"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/toolbar"
                     >
 
-                    <LinearLayout
-                        android:id="@+id/transaction_progress_layout"
-                        android:layout_width="match_parent"
+                    <ProgressBar
+                        android:id="@+id/transaction_list_progress_bar"
+                        style="?android:attr/progressBarStyleHorizontal"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:visibility="gone"
-                        >
-
-                        <ProgressBar
-                            android:id="@+id/transaction_list_progress_bar"
-                            style="?android:attr/progressBarStyleHorizontal"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="-8dp"
-                            android:layout_marginBottom="-7dp"
-                            android:layout_weight="1"
-                            android:indeterminate="true"
-                            android:min="0"
-                            android:padding="0dp"
-                            android:progressTint="?colorPrimary"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            />
-
-                        <TextView
-                            android:id="@+id/transaction_list_cancel_download"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/ic_clear_accent_24dp"
-                            android:clickable="true"
-                            android:focusable="true"
-                            />
-                    </LinearLayout>
+                        android:layout_marginTop="-8dp"
+                        android:layout_marginBottom="-7dp"
+                        android:layout_weight="1"
+                        android:indeterminate="true"
+                        android:min="0"
+                        android:padding="0dp"
+                        android:progressTint="?colorPrimary"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        />
 
+                    <TextView
+                        android:id="@+id/transaction_list_cancel_download"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/ic_clear_accent_24dp"
+                        android:clickable="true"
+                        android:focusable="true"
+                        />
                 </LinearLayout>
 
                 <androidx.viewpager2.widget.ViewPager2
@@ -201,7 +195,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/main_header"
+                    app:layout_constraintTop_toBottomOf="@id/transaction_progress_layout"
                     >
 
                 </androidx.viewpager2.widget.ViewPager2>
@@ -212,7 +206,7 @@
                     android:background="@drawable/drop_shadow"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/main_header"
+                    app:layout_constraintTop_toBottomOf="@id/transaction_progress_layout"
                     />
 
 
@@ -411,6 +405,12 @@
                                 </LinearLayout>
 
                             </LinearLayout>
+                            <TextView
+                                android:id="@+id/nav_patterns"
+                                style="@style/nav_button"
+                                android:text="@string/nav_templates"
+                                app:drawableStartCompat="@drawable/ic_baseline_auto_graph_24"
+                                />
 
                         </LinearLayout>
                     </ScrollView>