diff --git a/app/src/main/java/com/keylesspalace/tusky/BlocksAdapter.java b/app/src/main/java/com/keylesspalace/tusky/BlocksAdapter.java
index 52f64a52e..6bd00803c 100644
--- a/app/src/main/java/com/keylesspalace/tusky/BlocksAdapter.java
+++ b/app/src/main/java/com/keylesspalace/tusky/BlocksAdapter.java
@@ -20,15 +20,20 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
+import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
import com.keylesspalace.tusky.entity.Account;
+import com.pkmmte.view.CircularImageView;
import com.squareup.picasso.Picasso;
import java.util.HashSet;
import java.util.Set;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
class BlocksAdapter extends AccountAdapter {
private static final int VIEW_TYPE_BLOCKED_USER = 0;
private static final int VIEW_TYPE_FOOTER = 1;
@@ -88,19 +93,17 @@ class BlocksAdapter extends AccountAdapter {
notifyItemChanged(position);
}
- private static class BlockedUserViewHolder extends RecyclerView.ViewHolder {
- private ImageView avatar;
- private TextView username;
- private TextView displayName;
- private Button unblock;
+ static class BlockedUserViewHolder extends RecyclerView.ViewHolder {
+ @BindView(R.id.blocked_user_avatar) CircularImageView avatar;
+ @BindView(R.id.blocked_user_username) TextView username;
+ @BindView(R.id.blocked_user_display_name) TextView displayName;
+ @BindView(R.id.blocked_user_unblock) ImageButton unblock;
+
private String id;
BlockedUserViewHolder(View itemView) {
super(itemView);
- avatar = (ImageView) itemView.findViewById(R.id.blocked_user_avatar);
- displayName = (TextView) itemView.findViewById(R.id.blocked_user_display_name);
- username = (TextView) itemView.findViewById(R.id.blocked_user_username);
- unblock = (Button) itemView.findViewById(R.id.blocked_user_unblock);
+ ButterKnife.bind(this, itemView);
}
void setupWithAccount(Account account) {
@@ -118,13 +121,6 @@ class BlocksAdapter extends AccountAdapter {
void setupActionListener(final AccountActionListener listener, final boolean blocked,
final int position) {
- int unblockTextId;
- if (blocked) {
- unblockTextId = R.string.action_unblock;
- } else {
- unblockTextId = R.string.action_block;
- }
- unblock.setText(unblock.getContext().getString(unblockTextId));
unblock.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/app/src/main/res/drawable/ic_clear_24dp.xml b/app/src/main/res/drawable/ic_clear_24dp.xml
new file mode 100644
index 000000000..72af13013
--- /dev/null
+++ b/app/src/main/res/drawable/ic_clear_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/item_blocked_user.xml b/app/src/main/res/layout/item_blocked_user.xml
index 1d2a4a44d..b1d2b4d5b 100644
--- a/app/src/main/res/layout/item_blocked_user.xml
+++ b/app/src/main/res/layout/item_blocked_user.xml
@@ -1,60 +1,57 @@
+ android:layout_height="72dp"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
+ android:gravity="center_vertical">
-
+ android:layout_alignParentLeft="true"
+ android:layout_marginRight="24dp"
+ android:layout_centerVertical="true"/>
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1bf06fc56..65166c0e3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -34,7 +34,7 @@
Follows
Followers
Favourites
- Blocked Users
+ Blocked users
\@%s
%s boosted