From 99f4f376bd0645f647cb562e4b78ef9e5f1e0b84 Mon Sep 17 00:00:00 2001
From: JohnKal <jkalimer13@gmail.com>
Date: Fri, 27 Oct 2017 21:24:47 +0300
Subject: [PATCH 1/3] fix for issue #719

---
 .../commons/theme/NavigationBaseActivity.java | 19 ++++++++++++++++
 app/src/main/res/layout/drawer_header.xml     | 22 ++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
index 3537e4a1d..ac8fdcd0e 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
@@ -1,5 +1,7 @@
 package fr.free.nrw.commons.theme;
 
+import android.accounts.Account;
+import android.accounts.AccountManager;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.support.annotation.NonNull;
@@ -9,7 +11,9 @@ import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
+import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import butterknife.BindView;
@@ -18,6 +22,7 @@ import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.WelcomeActivity;
+import fr.free.nrw.commons.auth.AccountUtil;
 import fr.free.nrw.commons.auth.LoginActivity;
 import fr.free.nrw.commons.contributions.ContributionsActivity;
 import fr.free.nrw.commons.nearby.NearbyActivity;
@@ -34,6 +39,8 @@ public abstract class NavigationBaseActivity extends BaseActivity
     @BindView(R.id.drawer_layout)
     DrawerLayout drawerLayout;
 
+    TextView username;
+
     private ActionBarDrawerToggle toggle;
 
     public void initDrawer() {
@@ -47,6 +54,18 @@ public abstract class NavigationBaseActivity extends BaseActivity
         toggle.setDrawerIndicatorEnabled(true);
         toggle.syncState();
         setDrawerPaneWidth();
+
+        View navHeaderView= navigationView.getHeaderView(0);
+        username = (TextView) navHeaderView.findViewById(R.id.username);
+        setUserName();
+    }
+
+    public void setUserName() {
+        AccountManager accountManager = AccountManager.get(this);
+        Account[] allAccounts = accountManager.getAccountsByType(AccountUtil.accountType());
+        if (allAccounts.length != 0) {
+            username.setText(allAccounts[0].name);
+        }
     }
 
     public void initBackButton() {
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index 5ea1160d9..c27cab1ba 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -1,8 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:background="@android:color/darker_gray">
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/pictureOfTheDay"
     android:layout_width="match_parent"
     android:layout_height="172dp"
     android:background="@android:color/darker_gray"
-    android:padding="16dp"
+    android:paddingLeft="16dp"
+    android:paddingTop="16dp"
+    android:paddingRight="16dp"
+    android:paddingBottom="5dp"
     android:src="@drawable/commons_logo_large"/>
+
+    <TextView
+        android:id="@+id/username"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextView"
+        android:textColor="@color/item_white_background"
+        android:textSize="22sp"
+        android:layout_below="@+id/pictureOfTheDay"
+        android:layout_centerHorizontal="true"
+        android:paddingBottom="5dp"/>
+
+</RelativeLayout>
\ No newline at end of file

From dd8f9a487355f1894473185f867ca1e7c092e453 Mon Sep 17 00:00:00 2001
From: JohnKal <jkalimer13@gmail.com>
Date: Sat, 28 Oct 2017 16:05:33 +0300
Subject: [PATCH 2/3] fixed issues with code quality.

---
 .../nrw/commons/theme/NavigationBaseActivity.java  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
index ac8fdcd0e..0eb6d9e6f 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
@@ -39,8 +39,6 @@ public abstract class NavigationBaseActivity extends BaseActivity
     @BindView(R.id.drawer_layout)
     DrawerLayout drawerLayout;
 
-    TextView username;
-
     private ActionBarDrawerToggle toggle;
 
     public void initDrawer() {
@@ -54,13 +52,17 @@ public abstract class NavigationBaseActivity extends BaseActivity
         toggle.setDrawerIndicatorEnabled(true);
         toggle.syncState();
         setDrawerPaneWidth();
-
-        View navHeaderView= navigationView.getHeaderView(0);
-        username = (TextView) navHeaderView.findViewById(R.id.username);
         setUserName();
     }
 
-    public void setUserName() {
+    /**
+     * Set the username in navigationHeader
+     */
+    private void setUserName() {
+
+        View navHeaderView = navigationView.getHeaderView(0);
+        TextView username = (TextView) navHeaderView.findViewById(R.id.username);
+
         AccountManager accountManager = AccountManager.get(this);
         Account[] allAccounts = accountManager.getAccountsByType(AccountUtil.accountType());
         if (allAccounts.length != 0) {

From aab792f75b75d3a6a3f9c6f643629f15a7072a39 Mon Sep 17 00:00:00 2001
From: JohnKal <jkalimer13@gmail.com>
Date: Sat, 28 Oct 2017 16:45:05 +0300
Subject: [PATCH 3/3] Add period to Javadoc comment.

---
 .../java/fr/free/nrw/commons/theme/NavigationBaseActivity.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
index 0eb6d9e6f..e1a6c5905 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
@@ -56,7 +56,7 @@ public abstract class NavigationBaseActivity extends BaseActivity
     }
 
     /**
-     * Set the username in navigationHeader
+     * Set the username in navigationHeader.
      */
     private void setUserName() {