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

Added username to picture of the day icon.

Browse source
This commit is contained in:
Bruce Nishimura 2017-07-31 17:08:47 -04:00
parent da57ffeb2e
commit d3ce751f59
3 changed files with 36 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,7 @@ class LoginTask extends AsyncTask<String, String, String> {
protected void onPostExecute(String result) { protected void onPostExecute(String result) {
super.onPostExecute(result); super.onPostExecute(result);
Timber.d("Login done!"); Timber.d("Login done!");
loginActivity.getSharedPreferences("fr.free.nrw.commons", LoginActivity.MODE_PRIVATE).edit().putString("username", username).apply();
EventLog.schema(CommonsApplication.EVENT_LOGIN_ATTEMPT) EventLog.schema(CommonsApplication.EVENT_LOGIN_ATTEMPT)
.param("username", username) .param("username", username)
.param("result", result) .param("result", result)

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

@ -1,8 +1,10 @@
package fr.free.nrw.commons.theme; package fr.free.nrw.commons.theme;
import android.accounts.AccountManager;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri; import android.net.Uri;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.design.widget.NavigationView; import android.support.design.widget.NavigationView;
@ -13,6 +15,7 @@ import android.support.v7.widget.Toolbar;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import butterknife.BindView; import butterknife.BindView;
@ -42,7 +45,7 @@ public class NavigationBaseActivity extends BaseActivity
public void initDrawer() { public void initDrawer() {
navigationView.setNavigationItemSelectedListener(this); navigationView.setNavigationItemSelectedListener(this);
((TextView) navigationView.getHeaderView(0).findViewById(R.id.userNameText)).setText(getSharedPreferences("fr.free.nrw.commons", MODE_PRIVATE).getString("username", ""));
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
toggle = new ActionBarDrawerToggle(this, drawerLayout, toolbar, toggle = new ActionBarDrawerToggle(this, drawerLayout, toolbar,
@ -125,6 +128,7 @@ public class NavigationBaseActivity extends BaseActivity
.setPositiveButton(R.string.yes, (dialog, which) -> { .setPositiveButton(R.string.yes, (dialog, which) -> {
((CommonsApplication) getApplicationContext()) ((CommonsApplication) getApplicationContext())
.clearApplicationData(NavigationBaseActivity.this); .clearApplicationData(NavigationBaseActivity.this);
getSharedPreferences("fr.free.nrw.commons", MODE_PRIVATE).edit().remove("username").apply();
Intent nearbyIntent = new Intent( Intent nearbyIntent = new Intent(
NavigationBaseActivity.this, LoginActivity.class); NavigationBaseActivity.this, LoginActivity.class);
nearbyIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); nearbyIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);

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

@ -1,8 +1,32 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ImageView xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="172dp">
<ImageView
android:id="@+id/pictureOfTheDay" android:id="@+id/pictureOfTheDay"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="172dp" android:layout_height="match_parent"
android:background="@android:color/darker_gray" android:background="@android:color/darker_gray"
android:padding="16dp" android:padding="16dp"
android:src="@drawable/commons_logo_large" /> 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>