From d3ce751f597dd66d55c0dff37cb8311d9fa5d9ed Mon Sep 17 00:00:00 2001
From: Bruce Nishimura <bruceninga@gmail.com>
Date: Mon, 31 Jul 2017 17:08:47 -0400
Subject: [PATCH] Added username to picture of the day icon.

---
 .../fr/free/nrw/commons/auth/LoginTask.java   |  2 +-
 .../commons/theme/NavigationBaseActivity.java |  6 +++-
 app/src/main/res/layout/drawer_header.xml     | 36 +++++++++++++++----
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginTask.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginTask.java
index dd4f1c4e7..d4218916a 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/LoginTask.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginTask.java
@@ -58,7 +58,7 @@ class LoginTask extends AsyncTask<String, String, String> {
     protected void onPostExecute(String result) {
         super.onPostExecute(result);
         Timber.d("Login done!");
-
+        loginActivity.getSharedPreferences("fr.free.nrw.commons", LoginActivity.MODE_PRIVATE).edit().putString("username", username).apply();
         EventLog.schema(CommonsApplication.EVENT_LOGIN_ATTEMPT)
                 .param("username", username)
                 .param("result", result)
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 af0d38243..06cc79c23 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,8 +1,10 @@
 package fr.free.nrw.commons.theme;
 
+import android.accounts.AccountManager;
 import android.content.ActivityNotFoundException;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.design.widget.NavigationView;
@@ -13,6 +15,7 @@ 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;
@@ -42,7 +45,7 @@ public class NavigationBaseActivity extends BaseActivity
 
     public void initDrawer() {
         navigationView.setNavigationItemSelectedListener(this);
-
+        ((TextView) navigationView.getHeaderView(0).findViewById(R.id.userNameText)).setText(getSharedPreferences("fr.free.nrw.commons", MODE_PRIVATE).getString("username", ""));
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         toggle = new ActionBarDrawerToggle(this, drawerLayout, toolbar,
@@ -125,6 +128,7 @@ public class NavigationBaseActivity extends BaseActivity
                         .setPositiveButton(R.string.yes, (dialog, which) -> {
                             ((CommonsApplication) getApplicationContext())
                                     .clearApplicationData(NavigationBaseActivity.this);
+                            getSharedPreferences("fr.free.nrw.commons", MODE_PRIVATE).edit().remove("username").apply();
                             Intent nearbyIntent = new Intent(
                                     NavigationBaseActivity.this, LoginActivity.class);
                             nearbyIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index 5ea1160d9..6fd72b5f8 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -1,8 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/pictureOfTheDay"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="172dp"
-    android:background="@android:color/darker_gray"
-    android:padding="16dp"
-    android:src="@drawable/commons_logo_large"/>
+    android:layout_height="172dp">
+
+    <ImageView
+        android:id="@+id/pictureOfTheDay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/darker_gray"
+        android:padding="16dp"
+        android:src="@drawable/commons_logo_large" />
+    <TextView
+        android:id="@+id/userNameText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@id/pictureOfTheDay"
+        android:layout_alignStart="@id/pictureOfTheDay"
+        android:layout_alignTop="@id/pictureOfTheDay"
+        android:layout_alignRight="@id/pictureOfTheDay"
+        android:layout_alignEnd="@id/pictureOfTheDay"
+        android:layout_alignBottom="@id/pictureOfTheDay"
+        android:layout_margin="5dp"
+        android:gravity="center"
+        android:maxLines="2"
+        android:ellipsize="end"
+        style="?android:textAppearanceMedium"
+        android:text="@string/placeholder_place_name"
+        android:textSize="40sp"
+        android:textColor="#fff" />
+</RelativeLayout>
\ No newline at end of file