mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Removed username from preferences, now uses current account.

Browse source 
Improved text positioning/styling slightly.
This commit is contained in:
Bruce Nishimura 2017-08-02 00:38:34 -04:00
parent 2764bc4dd8
commit a014900e37
3 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/fr/free/nrw/commons/auth/LoginTask.java
View file

@ -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)

13
app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
View file

@ -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);

22
app/src/main/res/layout/drawer_header.xml
View file

@ -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>