From 279594bf7d4167fd62f48552b3b47d64f486593c Mon Sep 17 00:00:00 2001
From: Caesar2011 <mail@sebse.de>
Date: Mon, 30 Jul 2018 22:54:42 +0200
Subject: [PATCH] Log in button in navigation menu implemented

---
 .../java/de/sebse/fuplanner/MainActivity.java |  5 +++--
 app/src/main/res/layout/nav_header_main.xml   | 22 ++++++++-----------
 app/src/main/res/values/dimens.xml            |  2 +-
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
index 5be7a41..8bf648a 100644
--- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java
+++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
@@ -324,7 +324,7 @@ public class MainActivity extends AppCompatActivity
         // switch to logout
         if ((fragmentPage != FRAGMENT_STARTUP && fragmentPage != FRAGMENT_LOGIN) && (newFragment == FRAGMENT_STARTUP || newFragment == FRAGMENT_LOGIN)) {
             View header = mNavigationView.getHeaderView(0);
-            header.findViewById(R.id.imageView).setVisibility(View.GONE);
+            //header.findViewById(R.id.imageView).setVisibility(View.GONE);
             header.findViewById(R.id.login_name).setVisibility(View.GONE);
             header.findViewById(R.id.login_mail).setVisibility(View.GONE);
             header.findViewById(R.id.btn_login_page).setVisibility(View.VISIBLE);
@@ -333,6 +333,7 @@ public class MainActivity extends AppCompatActivity
                 if (drawer.isDrawerOpen(GravityCompat.START)) {
                     drawer.closeDrawer(GravityCompat.START);
                 }
+                changeFragment(FRAGMENT_LOGIN);
             });
             mNavigationView.getMenu().clear();
             mNavigationView.inflateMenu(R.menu.activity_main_drawer);
@@ -340,7 +341,7 @@ public class MainActivity extends AppCompatActivity
         } // switch to login
         else if ((fragmentPage == FRAGMENT_STARTUP || fragmentPage == FRAGMENT_LOGIN || fragmentPage == FRAGMENT_NONE) && (newFragment != FRAGMENT_STARTUP && newFragment != FRAGMENT_LOGIN && newFragment != FRAGMENT_CANTEENS && newFragment != FRAGMENT_CANTEENS_DETAILS)) {
             View header = mNavigationView.getHeaderView(0);
-            header.findViewById(R.id.imageView).setVisibility(View.VISIBLE);
+            //header.findViewById(R.id.imageView).setVisibility(View.VISIBLE);
             header.findViewById(R.id.login_name).setVisibility(View.VISIBLE);
             header.findViewById(R.id.login_mail).setVisibility(View.VISIBLE);
             header.findViewById(R.id.btn_login_page).setVisibility(View.GONE);
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 2a943ce..62c60d3 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -13,14 +13,6 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:theme="@style/ThemeOverlay.AppCompat.Dark">
 
-    <Button
-        android:id="@+id/btn_login_page"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@style/Widget.AppCompat.Button.Colored"
-        android:text="@string/log_in"
-        android:visibility="gone"  />
-
 
 
     <ImageView
@@ -28,7 +20,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:srcCompat="@mipmap/ic_launcher"
-        android:visibility="gone"
         android:contentDescription="@string/cd_ic_launcher"/>
 
     <TextView
@@ -37,14 +28,19 @@
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
         tools:text="Android Studio"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        android:visibility="gone"  />
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
     <TextView
         android:id="@+id/login_mail"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         tools:text="Android Studio"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        android:visibility="gone"  />
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+
+    <Button
+        android:id="@+id/btn_login_page"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/Widget.AppCompat.Button.Colored"
+        android:text="@string/log_in" />
 </LinearLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index bcb7e20..640556d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,7 +3,7 @@
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="nav_header_vertical_spacing">16dp</dimen>
-    <dimen name="nav_header_height">160dp</dimen>
+    <dimen name="nav_header_height">170dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
     <dimen name="text_margin">16dp</dimen>
 </resources>