From 16e1a4ea0c132edcebb799bba437be8c264ffd1f Mon Sep 17 00:00:00 2001
From: vanitasvitae <vanitasvitae@riseup.net>
Date: Wed, 10 Aug 2016 17:28:54 +0200
Subject: [PATCH] Made navdrawer header section with profile image and name
 clickable as replacement for removed profile navdrawer item

---
 .../activity/MainActivity.java                | 21 +++++++++++--------
 app/src/main/res/layout/main__nav_header.xml  |  4 +++-
 app/src/main/res/menu/main__navdrawer.xml     |  5 -----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
index 70cfb3f5..bdbcff41 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
@@ -378,6 +378,18 @@ public class MainActivity extends AppCompatActivity
         navView.setNavigationItemSelectedListener(this);
 
         View navHeader = navView.getHeaderView(0);
+        LinearLayout navheaderProfileSection = ButterKnife.findById(navHeader, R.id.nav_profile_picture);
+        navheaderProfileSection.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                navDrawer.closeDrawer(GravityCompat.START);
+                if (WebHelper.isOnline(MainActivity.this)) {
+                    webView.loadUrl(urls.getProfileUrl());
+                } else {
+                    snackbarNoInternet.show();
+                }
+            }
+        });
         navheaderTitle = ButterKnife.findById(navHeader, R.id.navheader_title);
         navheaderDescription = ButterKnife.findById(navHeader, R.id.podselection__podupti_notice);
         navheaderImage = ButterKnife.findById(navHeader, R.id.navheader_user_image);
@@ -939,15 +951,6 @@ public class MainActivity extends AppCompatActivity
             }
             break;
 
-            case R.id.nav_profile: {
-                if (WebHelper.isOnline(MainActivity.this)) {
-                    webView.loadUrl(urls.getProfileUrl());
-                } else {
-                    snackbarNoInternet.show();
-                }
-            }
-            break;
-
             case R.id.nav_followed_tags: {
                 if (WebHelper.isOnline(MainActivity.this)) {
                     WebHelper.showFollowedTagsList(webView, app);
diff --git a/app/src/main/res/layout/main__nav_header.xml b/app/src/main/res/layout/main__nav_header.xml
index 9c9e9d85..46506a78 100644
--- a/app/src/main/res/layout/main__nav_header.xml
+++ b/app/src/main/res/layout/main__nav_header.xml
@@ -13,6 +13,7 @@
         android:src="@drawable/header" />
 
     <LinearLayout
+        android:id="@+id/nav_profile_picture"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_alignParentBottom="true"
@@ -20,7 +21,8 @@
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
         android:layout_marginTop="24dp"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:clickable="true">
 
         <ImageView
             android:id="@+id/navheader_user_image"
diff --git a/app/src/main/res/menu/main__navdrawer.xml b/app/src/main/res/menu/main__navdrawer.xml
index 14cb764f..61151627 100644
--- a/app/src/main/res/menu/main__navdrawer.xml
+++ b/app/src/main/res/menu/main__navdrawer.xml
@@ -7,11 +7,6 @@
             android:icon="@drawable/jb_stream"
             android:title="@string/nav_stream" />
 
-        <item
-            android:id="@+id/nav_profile"
-            android:icon="@drawable/ic_person_black_48px"
-            android:title="@string/nav_profile" />
-
         <item
             android:id="@+id/nav_followed_tags"
             android:icon="@drawable/ic_local_offer_black_48px"