X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fmain_navigation.xml;h=f634eebcf94f7c11f5bc374f2f235d566d45eb49;hb=64a9a261dacaa681086cd9d5ad8bcdf26ebce3ac;hp=14c2eccd4e9c2185a74ba358843a4a57d13ba71b;hpb=42a7a36fcd870c6bd22d1a407f51ff0ea3ca5260;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 14c2eccd..f634eebc 100644
--- a/app/src/main/res/layout/main_navigation.xml
+++ b/app/src/main/res/layout/main_navigation.xml
@@ -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
@@ -50,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>
@@ -69,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"
@@ -157,8 +119,7 @@
                             android:layout_height="wrap_content"
                             android:isScrollContainer="false"
                             android:nestedScrollingEnabled="false"
-                            android:orientation="vertical"
-                            android:paddingStart="0dp">
+                            android:orientation="vertical">
 
                         </androidx.recyclerview.widget.RecyclerView>