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

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8a380b0e..d9f604b8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -52,16 +52,16 @@
                     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:srcCompat="@drawable/svg_thick_plus_white" />
+                    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">
@@ -89,12 +89,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"
@@ -178,138 +180,7 @@
             <include layout="@layout/no_profiles" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <com.google.android.material.navigation.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">
-
-
-            <androidx.constraintlayout.widget.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>
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-        </com.google.android.material.navigation.NavigationView>
+        <include layout="@layout/main_navigation" />
 
     </androidx.drawerlayout.widget.DrawerLayout>
 </LinearLayout>