Merge pull request #372 from connyduck/avatar-placeholder-improvement

rounded corners for avatar placeholder
main
Konrad Pozniak 7 years ago committed by GitHub
commit 28831956ff
  1. 1
      app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
  2. 1
      app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
  3. 1
      app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.java
  4. 1
      app/src/main/java/com/keylesspalace/tusky/adapter/AccountViewHolder.java
  5. 1
      app/src/main/java/com/keylesspalace/tusky/adapter/BlocksAdapter.java
  6. 1
      app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestsAdapter.java
  7. 1
      app/src/main/java/com/keylesspalace/tusky/adapter/MutesAdapter.java
  8. 2
      app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
  9. 1
      app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
  10. BIN
      app/src/main/res/drawable/avatar_default.png
  11. BIN
      app/src/main/res/drawable/avatar_error.png

@ -296,7 +296,6 @@ public class AccountActivity extends BaseActivity implements ActionButtonActivit
Picasso.with(this) Picasso.with(this)
.load(account.avatar) .load(account.avatar)
.placeholder(R.drawable.avatar_default) .placeholder(R.drawable.avatar_default)
.error(R.drawable.avatar_error)
.into(avatar); .into(avatar);
Picasso.with(this) Picasso.with(this)
.load(account.header) .load(account.header)

@ -1715,7 +1715,6 @@ public class ComposeActivity extends BaseActivity implements ComposeOptionsFragm
Picasso.with(context) Picasso.with(context)
.load(account.avatar) .load(account.avatar)
.placeholder(R.drawable.avatar_default) .placeholder(R.drawable.avatar_default)
.error(R.drawable.avatar_error)
.transform(new RoundedTransformation(7, 0)) .transform(new RoundedTransformation(7, 0))
.into(avatar); .into(avatar);
} }

@ -179,7 +179,6 @@ public class EditProfileActivity extends BaseActivity {
Picasso.with(avatar.getContext()) Picasso.with(avatar.getContext())
.load(me.avatar) .load(me.avatar)
.placeholder(R.drawable.avatar_default) .placeholder(R.drawable.avatar_default)
.error(R.drawable.avatar_error)
.into(avatar); .into(avatar);
Picasso.with(header.getContext()) Picasso.with(header.getContext())
.load(me.header) .load(me.header)

@ -37,7 +37,6 @@ class AccountViewHolder extends RecyclerView.ViewHolder {
Picasso.with(context) Picasso.with(context)
.load(account.avatar) .load(account.avatar)
.placeholder(R.drawable.avatar_default) .placeholder(R.drawable.avatar_default)
.error(R.drawable.avatar_error)
.into(avatar); .into(avatar);
} }

@ -97,7 +97,6 @@ public class BlocksAdapter extends AccountAdapter {
username.setText(formattedUsername); username.setText(formattedUsername);
Picasso.with(avatar.getContext()) Picasso.with(avatar.getContext())
.load(account.avatar) .load(account.avatar)
.error(R.drawable.avatar_error)
.placeholder(R.drawable.avatar_default) .placeholder(R.drawable.avatar_default)
.into(avatar); .into(avatar);
} }

@ -99,7 +99,6 @@ public class FollowRequestsAdapter extends AccountAdapter {
username.setText(formattedUsername); username.setText(formattedUsername);
Picasso.with(avatar.getContext()) Picasso.with(avatar.getContext())
.load(account.avatar) .load(account.avatar)
.error(R.drawable.avatar_error)
.placeholder(R.drawable.avatar_default) .placeholder(R.drawable.avatar_default)
.into(avatar); .into(avatar);
} }

@ -82,7 +82,6 @@ public class MutesAdapter extends AccountAdapter {
username.setText(formattedUsername); username.setText(formattedUsername);
Picasso.with(avatar.getContext()) Picasso.with(avatar.getContext())
.load(account.avatar) .load(account.avatar)
.error(R.drawable.avatar_error)
.placeholder(R.drawable.avatar_default) .placeholder(R.drawable.avatar_default)
.into(avatar); .into(avatar);
} }

@ -224,7 +224,6 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
.fit() .fit()
.transform(new RoundedTransformation(7, 0)) .transform(new RoundedTransformation(7, 0))
.placeholder(R.drawable.avatar_default) .placeholder(R.drawable.avatar_default)
.error(R.drawable.avatar_error)
.into(avatar); .into(avatar);
} }
@ -306,7 +305,6 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
Picasso.with(context) Picasso.with(context)
.load(statusAvatarUrl) .load(statusAvatarUrl)
.placeholder(R.drawable.avatar_default) .placeholder(R.drawable.avatar_default)
.error(R.drawable.avatar_error)
.transform(new RoundedTransformation(7, 0)) .transform(new RoundedTransformation(7, 0))
.into(statusAvatar); .into(statusAvatar);
} }

@ -111,7 +111,6 @@ class StatusBaseViewHolder extends RecyclerView.ViewHolder {
Picasso.with(avatar.getContext()) Picasso.with(avatar.getContext())
.load(url) .load(url)
.placeholder(R.drawable.avatar_default) .placeholder(R.drawable.avatar_default)
.error(R.drawable.avatar_error)
.transform(new RoundedTransformation(7, 0)) .transform(new RoundedTransformation(7, 0))
.into(avatar); .into(avatar);
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Loading…
Cancel
Save