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

Add RoundedImageView for avatars (#739)

Browse source 
* Add RoundedImageView for avatars

* RoundedImageView: Remove unused things, fix touchable area
This commit is contained in:
Ivan Kupalov 2018-07-30 15:36:22 +02:00 • committed by Konrad Pozniak
commit 133808891d
26 changed files with 367 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/keylesspalace/tusky/adapter/AccountViewHolder.java
View file

@ -3,6 +3,7 @@ package com.keylesspalace.tusky.adapter;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.keylesspalace.tusky.R;
@ -10,14 +11,13 @@ import com.keylesspalace.tusky.entity.Account;
import com.keylesspalace.tusky.interfaces.AccountActionListener;
import com.keylesspalace.tusky.interfaces.LinkListener;
import com.keylesspalace.tusky.util.CustomEmojiHelper;
import com.pkmmte.view.CircularImageView;
import com.squareup.picasso.Picasso;
class AccountViewHolder extends RecyclerView.ViewHolder {
private View container;
private TextView username;
private TextView displayName;
private CircularImageView avatar;
private ImageView avatar;
private String accountId;
AccountViewHolder(View itemView) {

4
app/src/main/java/com/keylesspalace/tusky/adapter/BlocksAdapter.java
View file

@ -21,13 +21,13 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
import com.keylesspalace.tusky.R;
import com.keylesspalace.tusky.entity.Account;
import com.keylesspalace.tusky.interfaces.AccountActionListener;
import com.keylesspalace.tusky.util.CustomEmojiHelper;
import com.pkmmte.view.CircularImageView;
import com.squareup.picasso.Picasso;
public class BlocksAdapter extends AccountAdapter {
@ -78,7 +78,7 @@ public class BlocksAdapter extends AccountAdapter {
}
static class BlockedUserViewHolder extends RecyclerView.ViewHolder {
private CircularImageView avatar;
private ImageView avatar;
private TextView username;
private TextView displayName;
private ImageButton unblock;

6
app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestsAdapter.java
View file

@ -21,13 +21,13 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
import com.keylesspalace.tusky.interfaces.AccountActionListener;
import com.keylesspalace.tusky.R;
import com.keylesspalace.tusky.entity.Account;
import com.keylesspalace.tusky.interfaces.AccountActionListener;
import com.keylesspalace.tusky.util.CustomEmojiHelper;
import com.pkmmte.view.CircularImageView;
import com.squareup.picasso.Picasso;
public class FollowRequestsAdapter extends AccountAdapter {
@ -78,7 +78,7 @@ public class FollowRequestsAdapter extends AccountAdapter {
}
static class FollowRequestViewHolder extends RecyclerView.ViewHolder {
private CircularImageView avatar;
private ImageView avatar;
private TextView username;
private TextView displayName;
private ImageButton accept;

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

@ -31,7 +31,6 @@ import android.widget.TextView;
import com.keylesspalace.tusky.R;
import com.keylesspalace.tusky.entity.Account;
import com.keylesspalace.tusky.util.CustomEmojiHelper;
import com.keylesspalace.tusky.view.RoundedTransformation;
import com.squareup.picasso.Picasso;
import java.util.ArrayList;
@ -131,7 +130,6 @@ public class MentionAutoCompleteAdapter extends ArrayAdapter<Account>
Picasso.with(context)
.load(account.getAvatar())
.placeholder(R.drawable.avatar_default)
.transform(new RoundedTransformation(25))
.into(avatar);
}
}

4
app/src/main/java/com/keylesspalace/tusky/adapter/MutesAdapter.java
View file

@ -6,13 +6,13 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
import com.keylesspalace.tusky.R;
import com.keylesspalace.tusky.entity.Account;
import com.keylesspalace.tusky.interfaces.AccountActionListener;
import com.keylesspalace.tusky.util.CustomEmojiHelper;
import com.pkmmte.view.CircularImageView;
import com.squareup.picasso.Picasso;
public class MutesAdapter extends AccountAdapter {
@ -63,7 +63,7 @@ public class MutesAdapter extends AccountAdapter {
}
static class MutedUserViewHolder extends RecyclerView.ViewHolder {
private CircularImageView avatar;
private ImageView avatar;
private TextView username;
private TextView displayName;
private ImageButton unmute;

6
app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
View file

@ -23,8 +23,8 @@ import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.RecyclerView;
import android.support.v4.text.BidiFormatter;
import android.support.v7.widget.RecyclerView;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils;
@ -46,7 +46,6 @@ import com.keylesspalace.tusky.interfaces.StatusActionListener;
import com.keylesspalace.tusky.util.CustomEmojiHelper;
import com.keylesspalace.tusky.util.DateUtils;
import com.keylesspalace.tusky.util.LinkHelper;
import com.keylesspalace.tusky.view.RoundedTransformation;
import com.keylesspalace.tusky.viewdata.NotificationViewData;
import com.keylesspalace.tusky.viewdata.StatusViewData;
import com.squareup.picasso.Picasso;
@ -291,7 +290,6 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
Picasso.with(context)
.load(account.getAvatar())
.fit()
.transform(new RoundedTransformation(25))
.placeholder(R.drawable.avatar_default)
.into(avatar);
}
@ -454,7 +452,6 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
Picasso.with(context)
.load(statusAvatarUrl)
.placeholder(R.drawable.avatar_default)
.transform(new RoundedTransformation(25))
.into(statusAvatar);
}
@ -465,7 +462,6 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
.load(notificationAvatarUrl)
.placeholder(R.drawable.avatar_default)
.fit()
.transform(new RoundedTransformation(25))
.into(notificationAvatar);
}
}

8
app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
View file

@ -26,17 +26,16 @@ import com.keylesspalace.tusky.util.DateUtils;
import com.keylesspalace.tusky.util.HtmlUtils;
import com.keylesspalace.tusky.util.LinkHelper;
import com.keylesspalace.tusky.util.ThemeUtils;
import com.keylesspalace.tusky.view.RoundedTransformation;
import com.keylesspalace.tusky.viewdata.StatusViewData;
import com.mikepenz.iconics.utils.Utils;
import com.squareup.picasso.Picasso;
import at.connyduck.sparkbutton.SparkButton;
import at.connyduck.sparkbutton.SparkEventListener;
import java.util.Date;
import java.util.List;
import at.connyduck.sparkbutton.SparkButton;
import at.connyduck.sparkbutton.SparkEventListener;
abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
private View container;
private TextView displayName;
@ -122,7 +121,6 @@ abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
Picasso.with(avatar.getContext())
.load(url)
.placeholder(R.drawable.avatar_default)
.transform(new RoundedTransformation(25))
.into(avatar);
}
}

3
app/src/main/java/com/keylesspalace/tusky/adapter/StatusViewHolder.java
View file

@ -25,9 +25,9 @@ import android.widget.TextView;
import com.keylesspalace.tusky.R;
import com.keylesspalace.tusky.interfaces.StatusActionListener;
import com.keylesspalace.tusky.util.ThemeUtils;
import com.keylesspalace.tusky.view.RoundedTransformation;
import com.keylesspalace.tusky.viewdata.StatusViewData;
import com.squareup.picasso.Picasso;
import at.connyduck.sparkbutton.helpers.Utils;
public class StatusViewHolder extends StatusBaseViewHolder {
@ -59,7 +59,6 @@ public class StatusViewHolder extends StatusBaseViewHolder {
Picasso.with(context)
.load(rebloggedUrl)
.placeholder(R.drawable.avatar_default)
.transform(new RoundedTransformation(25))
.into(avatarReblog);
} else {
avatarReblog.setVisibility(View.GONE);