X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fmain_navigation.xml;h=fb30743c8420a1711e2d20247499b911d995d352;hb=a5a04fc34d4c885730ecf7a11f77b16055f3491e;hp=25a8f93f5f0f06f502c4b8fe6de01343a89dafed;hpb=be059c23add27687c505446764f47a0c061a1373;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 25a8f93f..fb30743c 100644
--- a/app/src/main/res/layout/main_navigation.xml
+++ b/app/src/main/res/layout/main_navigation.xml
@@ -50,7 +50,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>
@@ -75,42 +74,7 @@
                 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"
@@ -149,8 +113,7 @@
                         android:layout_height="wrap_content"
                         android:animateLayoutChanges="true"
                         android:nestedScrollingEnabled="false"
-                        android:orientation="vertical"
-                        android:visibility="gone">
+                        android:orientation="vertical">
 
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/nav_profile_list"
@@ -163,7 +126,6 @@
 
                         </androidx.recyclerview.widget.RecyclerView>
 
-                        <include layout="@layout/nav_profile_list_new_profile_row" />
                     </LinearLayout>
 
                 </LinearLayout>