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..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 @@ -58,7 +58,6 @@ class LoginTask extends AsyncTask { protected void onPostExecute(String result) { super.onPostExecute(result); Timber.d("Login done!"); - 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 6710b6367..7c7917965 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,9 +12,11 @@ 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; +import android.widget.TextView; import android.widget.Toast; import butterknife.BindView; @@ -39,9 +43,15 @@ public class NavigationBaseActivity extends BaseActivity DrawerLayout drawerLayout; private ActionBarDrawerToggle toggle; + private String username; + private TextView usernameTextView; public void initDrawer() { navigationView.setNavigationItemSelectedListener(this); + username = CommonsApplication.getInstance().getCurrentAccount().name; + usernameTextView = ((TextView) navigationView.getHeaderView(0) + .findViewById(R.id.userNameText)); + usernameTextView.setText(username != null ? username : ""); setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml index 5ea1160d9..4b2232d90 100644 --- a/app/src/main/res/layout/drawer_header.xml +++ b/app/src/main/res/layout/drawer_header.xml @@ -1,8 +1,27 @@ - + android:layout_height="172dp"> + + + + + \ No newline at end of file