From d3ce751f597dd66d55c0dff37cb8311d9fa5d9ed Mon Sep 17 00:00:00 2001 From: Bruce Nishimura Date: Mon, 31 Jul 2017 17:08:47 -0400 Subject: [PATCH 1/6] 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 { 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 @@ - + android:layout_height="172dp"> + + + + \ No newline at end of file From fba9bf0327eb6f7e93d553c4adaa02ac6f648354 Mon Sep 17 00:00:00 2001 From: Bruce Nishimura Date: Mon, 31 Jul 2017 17:12:25 -0400 Subject: [PATCH 2/6] Clean up extra imports --- .../java/fr/free/nrw/commons/theme/NavigationBaseActivity.java | 2 -- 1 file changed, 2 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 06cc79c23..07e12ace4 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,10 +1,8 @@ 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; From 2764bc4dd8b717dc6c31f11fc68d3fb4887fa5f1 Mon Sep 17 00:00:00 2001 From: Bruce Nishimura Date: Mon, 31 Jul 2017 20:47:55 -0400 Subject: [PATCH 3/6] Using general preferences instead, splitting long lines. --- app/src/main/java/fr/free/nrw/commons/auth/LoginTask.java | 3 ++- .../fr/free/nrw/commons/theme/NavigationBaseActivity.java | 6 ++++-- 2 files changed, 6 insertions(+), 3 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 d4218916a..09170fd60 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,8 @@ class LoginTask extends AsyncTask { 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(); + 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 07e12ace4..bcc29d51f 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 @@ -43,7 +43,8 @@ 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", "")); + ((TextView) navigationView.getHeaderView(0).findViewById(R.id.userNameText)) + .setText(getSharedPreferences("prefs", MODE_PRIVATE).getString("username", "")); setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); toggle = new ActionBarDrawerToggle(this, drawerLayout, toolbar, @@ -126,7 +127,8 @@ 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(); + getSharedPreferences("prefs", MODE_PRIVATE) + .edit().remove("username").apply(); Intent nearbyIntent = new Intent( NavigationBaseActivity.this, LoginActivity.class); nearbyIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); From a014900e375e1d6e4df4ff976ea28bdd55913921 Mon Sep 17 00:00:00 2001 From: Bruce Nishimura Date: Wed, 2 Aug 2017 00:38:34 -0400 Subject: [PATCH 4/6] 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 { @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" /> + + android:textColor="@android:color/white" /> \ No newline at end of file From 06efa26f5ebc336f972f58e5fbbe8bb161806222 Mon Sep 17 00:00:00 2001 From: Bruce Nishimura Date: Wed, 2 Aug 2017 00:44:27 -0400 Subject: [PATCH 5/6] Readding log that I accidently deleted --- app/src/main/java/fr/free/nrw/commons/auth/LoginTask.java | 1 + 1 file changed, 1 insertion(+) 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 5f40a0876..b841f7945 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,6 +57,7 @@ class LoginTask extends AsyncTask { @Override protected void onPostExecute(String result) { super.onPostExecute(result); + Timber.d("Login done!"); EventLog.schema(CommonsApplication.EVENT_LOGIN_ATTEMPT) .param("username", username) .param("result", result) From 1622f67a4bb626d7aaed9d7ea401638e788bea28 Mon Sep 17 00:00:00 2001 From: Bruce Nishimura Date: Tue, 8 Aug 2017 18:58:45 -0400 Subject: [PATCH 6/6] Made layout actually look good. Hopefully fixed codeacities complaints. --- .../commons/theme/NavigationBaseActivity.java | 3 ++- app/src/main/res/layout/drawer_header.xml | 21 ++++++++++--------- 2 files changed, 13 insertions(+), 11 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 53b178f38..c7949f793 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 @@ -49,7 +49,8 @@ public class NavigationBaseActivity extends BaseActivity public void initDrawer() { navigationView.setNavigationItemSelectedListener(this); username = CommonsApplication.getInstance().getCurrentAccount().name; - usernameTextView = ((TextView) navigationView.getHeaderView(0).findViewById(R.id.userNameText)); + usernameTextView = ((TextView) navigationView.getHeaderView(0) + .findViewById(R.id.userNameText)); usernameTextView.setText(username != null ? username : ""); setSupportActionBar(toolbar); diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml index 2a1747c0f..4b2232d90 100644 --- a/app/src/main/res/layout/drawer_header.xml +++ b/app/src/main/res/layout/drawer_header.xml @@ -1,26 +1,27 @@ - - \ No newline at end of file + \ No newline at end of file