From a014900e375e1d6e4df4ff976ea28bdd55913921 Mon Sep 17 00:00:00 2001
From: Bruce Nishimura <bruceninga@gmail.com>
Date: Wed, 2 Aug 2017 00:38:34 -0400
Subject: [PATCH] Removed username from preferences, now uses current account.
 Improved text positioning/styling slightly.

---
 .../fr/free/nrw/commons/auth/LoginTask.java   |  3 ---
 .../commons/theme/NavigationBaseActivity.java | 13 +++++++----
 app/src/main/res/layout/drawer_header.xml     | 22 +++++++------------
 3 files changed, 17 insertions(+), 21 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 09170fd60..5f40a0876 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
@@ -57,9 +57,6 @@ class LoginTask extends AsyncTask<String, String, String> {
     @Override
     protected void onPostExecute(String result) {
         super.onPostExecute(result);
-        Timber.d("Login done!");
-        loginActivity.getSharedPreferences("prefs", 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 bcc29d51f..53b178f38 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.DialogInterface;
 import android.content.Intent;
@@ -10,6 +12,7 @@ import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
+import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -40,11 +43,15 @@ public class NavigationBaseActivity extends BaseActivity
     DrawerLayout drawerLayout;
 
     private ActionBarDrawerToggle toggle;
+    private String username;
+    private TextView usernameTextView;
 
     public void initDrawer() {
         navigationView.setNavigationItemSelectedListener(this);
-        ((TextView) navigationView.getHeaderView(0).findViewById(R.id.userNameText))
-                .setText(getSharedPreferences("prefs", MODE_PRIVATE).getString("username", ""));
+        username = CommonsApplication.getInstance().getCurrentAccount().name;
+        usernameTextView = ((TextView) navigationView.getHeaderView(0).findViewById(R.id.userNameText));
+        usernameTextView.setText(username != null ? username : "");
+
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         toggle = new ActionBarDrawerToggle(this, drawerLayout, toolbar,
@@ -127,8 +134,6 @@ public class NavigationBaseActivity extends BaseActivity
                         .setPositiveButton(R.string.yes, (dialog, which) -> {
                             ((CommonsApplication) getApplicationContext())
                                     .clearApplicationData(NavigationBaseActivity.this);
-                            getSharedPreferences("prefs", 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 6fd72b5f8..2a1747c0f 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -9,24 +9,18 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@android:color/darker_gray"
-        android:padding="16dp"
+        android:padding="20dp"
         android:src="@drawable/commons_logo_large" />
+
     <TextView
         android:id="@+id/userNameText"
+        style="?android:textAppearanceLargeInverse"
         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:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:ellipsize="none"
+        android:maxLines="1"
         android:text="@string/placeholder_place_name"
-        android:textSize="40sp"
-        android:textColor="#fff" />
+        android:textColor="@android:color/white" />
 </RelativeLayout>
\ No newline at end of file