X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Factivity_main.xml;h=61592e84179582ccd098b586877a2fff38862271;hp=d9f604b81ce1eae4b92925ba5a011886c7b552f6;hb=33163715e6f9dae7c7fb9e4a446309ec50124894;hpb=18da610bd4e67f9d891a2511a6ae74708921afd9

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d9f604b8..61592e84 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -40,7 +40,10 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
+            <include layout="@layout/loading" />
+
             <androidx.constraintlayout.widget.ConstraintLayout
+                android:visibility="gone"
                 android:id="@+id/pager_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
@@ -52,9 +55,9 @@
                     android:layout_gravity="bottom|end"
                     android:layout_margin="@dimen/fab_margin"
                     app:backgroundTint="?colorAccent"
-                    app:maxImageSize="36dp"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
+                    app:maxImageSize="36dp"
                     app:srcCompat="@drawable/ic_add_white_24dp" />
 
                 <LinearLayout
@@ -66,35 +69,6 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent">
 
-                    <LinearLayout
-                        android:id="@+id/transaction_list_account_name_filter"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:orientation="horizontal"
-                        android:visibility="gone">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/ic_filter_list_black_24dp" />
-
-                        <AutoCompleteTextView
-                            android:id="@+id/transaction_filter_account_name"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1" />
-
-                        <TextView
-                            android:id="@+id/clearAccountNameFilter"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/ic_clear_black_24dp"
-                            android:backgroundTint="?colorAccent"
-                            android:clickable="true"
-                            android:focusable="true" />
-
-                    </LinearLayout>
-
                     <LinearLayout
                         android:id="@+id/transactions_last_update_layout"
                         android:layout_width="match_parent"
@@ -160,8 +134,9 @@
                     android:id="@+id/root_frame"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    app:layout_behavior="@string/appbar_scrolling_view_behavior"
                     app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/main_header">
 
                 </androidx.viewpager.widget.ViewPager>