X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Factivity_main.xml;h=edd290f765299a8f186af6c3d66178935c50fc5b;hp=9c0fb62b26beae7b2365ccef7f83b58be00c3087;hb=8554828856aa059667eec5bd63631159e932ba2f;hpb=f308aff824a124e2dfbe890022d1a0ca2443754a

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9c0fb62b..edd290f7 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -23,29 +23,32 @@
     android:theme="@style/AppTheme.AppBarOverlay"
     tools:context=".ui.activity.MainActivity">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="?colorPrimary"
         app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-    <android.support.v4.widget.DrawerLayout
+    <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:openDrawer="start">
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <android.support.constraint.ConstraintLayout
+            <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">
 
-                <android.support.design.widget.FloatingActionButton
+                <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:id="@+id/btn_add_transaction"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -54,14 +57,14 @@
                     app:backgroundTint="?colorAccent"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:srcCompat="@drawable/svg_thick_plus_white" />
+                    app:maxImageSize="36dp"
+                    app:srcCompat="@drawable/ic_add_white_24dp" />
 
                 <LinearLayout
                     android:id="@+id/main_header"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:theme="@style/AppTheme"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent">
@@ -81,6 +84,7 @@
                         <AutoCompleteTextView
                             android:id="@+id/transaction_filter_account_name"
                             android:layout_width="0dp"
+                            android:textColor="?textColor"
                             android:layout_height="wrap_content"
                             android:layout_weight="1" />
 
@@ -89,12 +93,14 @@
                             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"
                         android:layout_height="wrap_content"
                         android:elevation="24dp"
@@ -154,7 +160,7 @@
 
                 </LinearLayout>
 
-                <android.support.v4.view.ViewPager
+                <androidx.viewpager.widget.ViewPager
                     android:id="@+id/root_frame"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
@@ -162,7 +168,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/main_header">
 
-                </android.support.v4.view.ViewPager>
+                </androidx.viewpager.widget.ViewPager>
 
                 <View
                     android:layout_width="0dp"
@@ -173,143 +179,12 @@
                     app:layout_constraintTop_toBottomOf="@id/main_header" />
 
 
-            </android.support.constraint.ConstraintLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
             <include layout="@layout/no_profiles" />
-        </android.support.constraint.ConstraintLayout>
-
-        <android.support.design.widget.NavigationView
-            android:id="@+id/nav_view"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="start"
-            android:fitsSystemWindows="true"
-            android:theme="@style/ThemeOverlay.AppCompat.Light">
-
-
-            <android.support.constraint.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginBottom="0dp"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:id="@+id/nav_fixed_items"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:divider="@drawable/list_divider"
-                    android:elevation="2dp"
-                    android:orientation="vertical"
-                    android:showDividers="beginning"
-                    app:layout_constraintBottom_toBottomOf="parent">
-
-                    <TextView
-                        android:id="@+id/nav_profiles"
-                        style="@style/nav_button"
-                        android:layout_width="match_parent"
-                        android:layout_weight="1"
-                        android:drawableStart="@drawable/ic_view_list_black_24dp"
-                        android:onClick="navProfilesClicked"
-                        android:text="@string/profiles" />
-
-                    <TextView
-                        android:id="@+id/textView2"
-                        style="@style/nav_button"
-                        android:layout_weight="1"
-                        android:drawableStart="@drawable/ic_settings_black_24dp"
-                        android:onClick="navSettingsClicked"
-                        android:text="@string/action_settings" />
-
-                </LinearLayout>
-
-                <ScrollView
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    app:layout_constraintBottom_toTopOf="@+id/nav_fixed_items"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <LinearLayout
-                        android:id="@+id/nav_upper"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        app:layout_constraintBottom_toTopOf="@+id/nav_fixed_items"
-                        app:layout_constraintTop_toBottomOf="@+id/nav_header">
-
-                        <LinearLayout
-                            android:id="@+id/nav_header"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/side_nav_bar"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal"
-                            android:padding="@dimen/activity_vertical_margin"
-                            android:theme="@style/ThemeOverlay.AppCompat.Dark"
-                            app:layout_constraintTop_toTopOf="parent">
-
-                            <include layout="@layout/nav_header_logo" />
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:layout_marginStart="@dimen/activity_horizontal_margin"
-                                android:layout_marginEnd="@dimen/activity_horizontal_margin"
-                                android:gravity="center_vertical"
-                                android:orientation="vertical">
-
-                                <TextView
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:text="@string/app_name"
-                                    android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
-
-                                <TextView
-                                    android:id="@+id/drawer_version_text"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="dummy version"
-                                    tools:ignore="HardcodedText" />
-                            </LinearLayout>
-
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:id="@+id/nav_actions"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:id="@+id/nav_account_summary"
-                                style="@style/nav_button"
-                                android:drawableStart="@drawable/ic_home_black_24dp"
-                                android:onClick="onAccountSummaryClicked"
-                                android:text="@string/account_summary_title" />
-
-                            <TextView
-                                android:id="@+id/nav_latest_transactions"
-                                style="@style/nav_button"
-                                android:drawableStart="@drawable/ic_event_note_black_24dp"
-                                android:onClick="onLatestTransactionsClicked"
-                                android:text="@string/nav_latest_transactions_title" />
-
-                            <TextView
-                                android:id="@+id/textView5"
-                                style="@style/nav_button"
-                                android:drawableStart="@drawable/ic_assignment_black_24dp"
-                                android:text="@string/nav_reports_title" />
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-                </ScrollView>
-
-            </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-        </android.support.design.widget.NavigationView>
+        <include layout="@layout/main_navigation" />
 
-    </android.support.v4.widget.DrawerLayout>
+    </androidx.drawerlayout.widget.DrawerLayout>
 </LinearLayout>