chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Merge pull request #270 from connyduck/profile-header

Browse source 
remove account_header_default.png
This commit is contained in:
Vavassor 2017-05-07 17:44:26 -04:00 • committed by GitHub
commit d658e6e7a3
6 changed files with 57 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
View file

@ -165,9 +165,6 @@ public class AccountActivity extends BaseActivity implements SFragment.OnUserRem
// Initialise the default UI states.
floatingBtn.hide();
avatar.setImageResource(R.drawable.avatar_default);
header.setImageResource(R.drawable.account_header_default);
// Obtain information to fill out the profile.
obtainAccount();
if (!accountId.equals(loggedInAccountId)) {
@ -277,7 +274,7 @@ public class AccountActivity extends BaseActivity implements SFragment.OnUserRem
.into(avatar);
Picasso.with(this)
.load(account.header)
.placeholder(R.drawable.account_header_missing)
.placeholder(R.drawable.account_header_default)
.into(header);
NumberFormat nf = NumberFormat.getInstance();

2
app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.java
View file

@ -179,7 +179,7 @@ public class EditProfileActivity extends BaseActivity {
.into(avatar);
Picasso.with(header.getContext())
.load(me.header)
.placeholder(R.drawable.account_header_missing)
.placeholder(R.drawable.account_header_default)
.into(header);
}

2
app/src/main/java/com/keylesspalace/tusky/MainActivity.java
View file

@ -496,7 +496,7 @@ public class MainActivity extends BaseActivity implements SFragment.OnUserRemove
Picasso.with(MainActivity.this)
.load(me.header)
.placeholder(R.drawable.account_header_missing)
.placeholder(R.drawable.account_header_default)
.resize(backgroundWidth, backgroundHeight)
.centerCrop()
.into(background);