X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fmain_navigation.xml;h=f634eebcf94f7c11f5bc374f2f235d566d45eb49;hb=64a9a261dacaa681086cd9d5ad8bcdf26ebce3ac;hp=4f4f5c50bbb142fb03afd7729d28fd7140395a44;hpb=59e1c221c18f8dfaf6394cdf0a29e4ba2319151d;p=mobile-ledger.git

diff --git a/app/src/main/res/layout/main_navigation.xml b/app/src/main/res/layout/main_navigation.xml
index 4f4f5c50..f634eebc 100644
--- a/app/src/main/res/layout/main_navigation.xml
+++ b/app/src/main/res/layout/main_navigation.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright © 2019 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
-  ~  the Free Software Foundation, either version 3 of the License, or
-  ~  (at your opinion), any later version.
+  ~ 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.
   ~
-  ~  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.
+  ~ 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/>.
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with MoLe. If not, see <https://www.gnu.org/licenses/>.
   -->
 
 <com.google.android.material.navigation.NavigationView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -23,8 +23,7 @@
     android:layout_height="match_parent"
     android:layout_gravity="start"
     android:fitsSystemWindows="true"
-    android:theme="@style/ThemeOverlay.AppCompat.Light"
-    tools:showIn="@layout/activity_main">
+    android:theme="@style/ThemeOverlay.AppCompat.Light">
 
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -42,6 +41,7 @@
             android:elevation="2dp"
             android:orientation="vertical"
             android:showDividers="beginning"
+            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent">
 
             <TextView
@@ -49,7 +49,6 @@
                 style="@style/nav_button"
                 android:layout_weight="1"
                 android:drawableStart="@drawable/ic_settings_black_24dp"
-                android:onClick="navSettingsClicked"
                 android:text="@string/action_settings" />
 
         </LinearLayout>
@@ -68,48 +67,12 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:animateLayoutChanges="true"
-                android:divider="@drawable/list_divider_inside_out"
                 android:orientation="vertical"
                 android:showDividers="beginning"
                 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>
+                <include layout="@layout/nav_header_layout" />
 
                 <LinearLayout
                     android:id="@+id/nav_actions"
@@ -129,34 +92,37 @@
                         style="@style/nav_button"
                         android:drawableStart="@drawable/ic_event_note_black_24dp"
                         android:onClick="onLatestTransactionsClicked"
-                        android:text="@string/nav_latest_transactions_title" />
+                        android:text="@string/nav_transactions_title" />
 
                     <TextView
                         android:id="@+id/textView5"
                         style="@style/nav_button"
                         android:drawableStart="@drawable/ic_assignment_black_24dp"
-                        android:text="@string/nav_reports_title" />
+                        android:text="@string/nav_reports_title"
+                        android:visibility="gone" />
 
-                    <include layout="@layout/nav_profile_list_head" />
+                    <include
+                        android:id="@+id/nav_profile_list_head_layout"
+                        layout="@layout/nav_profile_list_head" />
 
                     <LinearLayout
                         android:id="@+id/nav_profile_list_container"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:animateLayoutChanges="true"
-                        android:orientation="vertical"
-                        android:visibility="gone">
+                        android:nestedScrollingEnabled="false"
+                        android:orientation="vertical">
 
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/nav_profile_list"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            android:paddingStart="0dp">
+                            android:isScrollContainer="false"
+                            android:nestedScrollingEnabled="false"
+                            android:orientation="vertical">
 
                         </androidx.recyclerview.widget.RecyclerView>
 
-                        <include layout="@layout/nav_profile_list_new_profile_row" />
                     </LinearLayout>
 
                 </LinearLayout>