Mastodon/Shitter-android-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replaced adapter compound drawables, layout fix

Browse Source
This commit is contained in:
nuclearfog 2021-02-01 17:16:49 +01:00
parent 2e91eabb20
commit ce4d24e3b1
No known key found for this signature in database
GPG Key ID: D5490E4A81F97B14
8 changed files with 171 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
app/src/main/java/org/nuclearfog/twidda/adapter/MessageAdapter.java
View File

@ -1,8 +1,6 @@
package org.nuclearfog.twidda.adapter;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.text.Spanned;
import android.text.method.LinkMovementMethod;
import android.view.LayoutInflater;
@ -14,8 +12,6 @@ import android.widget.TextView;
import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.cardview.widget.CardView;
import androidx.recyclerview.widget.RecyclerView.Adapter;
import androidx.recyclerview.widget.RecyclerView.ViewHolder;
@ -35,6 +31,8 @@ import java.util.List;
import jp.wasabeef.picasso.transformations.RoundedCornersTransformation;
import static android.graphics.PorterDuff.Mode.SRC_IN;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
import static org.nuclearfog.twidda.backend.utils.StringTools.getTimeString;
@ -48,7 +46,6 @@ public class MessageAdapter extends Adapter<ViewHolder> {
private OnItemSelected itemClickListener;
private GlobalSettings settings;
private Drawable[] icons;
private List<Message> messages = new ArrayList<>();
@ -56,17 +53,6 @@ public class MessageAdapter extends Adapter<ViewHolder> {
public MessageAdapter(Context context, OnItemSelected itemClickListener) {
this.itemClickListener = itemClickListener;
settings = GlobalSettings.getInstance(context);
TypedArray drawables = context.getResources().obtainTypedArray(R.array.dm_item_icons);
icons = new Drawable[drawables.length()];
for (int index = 0; index < drawables.length(); index++) {
int resId = drawables.getResourceId(index, 0);
icons[index] = AppCompatResources.getDrawable(context, resId);
if (icons[index] != null) {
icons[index].setColorFilter(settings.getIconColor(), SRC_IN);
}
}
drawables.recycle();
}
/**
@ -162,16 +148,15 @@ public class MessageAdapter extends Adapter<ViewHolder> {
holder.textViews[2].setText(message.getReceiver().getScreenname());
holder.textViews[3].setText(getTimeString(message.getTime()));
holder.textViews[4].setText(text);
if (sender.isVerified()) {
setIcon(holder.textViews[0], icons[0]);
holder.verifiedIcon.setVisibility(VISIBLE);
} else {
setIcon(holder.textViews[0], null);
holder.verifiedIcon.setVisibility(GONE);
}
if (sender.isLocked()) {
setIcon(holder.textViews[1], icons[1]);
holder.lockedIcon.setVisibility(VISIBLE);
} else {
setIcon(holder.textViews[1], null);
holder.lockedIcon.setVisibility(GONE);
}
if (settings.getImageLoad() && sender.hasProfileImage()) {
String pbLink = sender.getImageLink();
@ -184,18 +169,6 @@ public class MessageAdapter extends Adapter<ViewHolder> {
}
}
/**
* sets an icon to a TextView
*
* @param tv TextView to set an icon
* @param icon icon drawable
*/
private void setIcon(TextView tv, @Nullable Drawable icon) {
if (icon != null)
icon = icon.mutate();
tv.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
}
/**
* Holder class for a message view
*/
@ -203,13 +176,15 @@ public class MessageAdapter extends Adapter<ViewHolder> {
final TextView[] textViews = new TextView[5];
final Button[] buttons = new Button[2];
final ImageView profile_img, receiver_icon;
final ImageView profile_img, verifiedIcon, lockedIcon;
MessageHolder(View v, GlobalSettings settings) {
super(v);
CardView background = (CardView) v;
ImageView receiver_icon = v.findViewById(R.id.dm_receiver_icon);
profile_img = v.findViewById(R.id.dm_profile_img);
receiver_icon = v.findViewById(R.id.dm_receiver_icon);
verifiedIcon = v.findViewById(R.id.dm_user_verified);
lockedIcon = v.findViewById(R.id.dm_user_locked);
textViews[0] = v.findViewById(R.id.dm_username);
textViews[1] = v.findViewById(R.id.dm_screenname);
textViews[2] = v.findViewById(R.id.dm_receiver);
@ -226,7 +201,12 @@ public class MessageAdapter extends Adapter<ViewHolder> {
button.setTextColor(settings.getFontColor());
button.setTypeface(settings.getFontFace());
}
receiver_icon.setImageDrawable(icons[2]);
receiver_icon.setImageResource(R.drawable.right);
verifiedIcon.setImageResource(R.drawable.verify);
lockedIcon.setImageResource(R.drawable.lock);
verifiedIcon.setColorFilter(settings.getIconColor(), SRC_IN);
lockedIcon.setColorFilter(settings.getIconColor(), SRC_IN);
receiver_icon.setColorFilter(settings.getIconColor(), SRC_IN);
background.setCardBackgroundColor(settings.getCardColor());
textViews[4].setMovementMethod(LinkMovementMethod.getInstance());
}

93
app/src/main/java/org/nuclearfog/twidda/adapter/UserAdapter.java
View File

@ -1,8 +1,6 @@
package org.nuclearfog.twidda.adapter;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
@ -15,8 +13,6 @@ import android.widget.TextView;
import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.cardview.widget.CardView;
import androidx.recyclerview.widget.RecyclerView.Adapter;
import androidx.recyclerview.widget.RecyclerView.ViewHolder;
@ -65,7 +61,6 @@ public class UserAdapter extends Adapter<ViewHolder> {
private UserClickListener itemClickListener;
private GlobalSettings settings;
private Drawable[] icons;
private TwitterUserList items = new TwitterUserList();
private NumberFormat formatter = NumberFormat.getIntegerInstance();
@ -79,15 +74,6 @@ public class UserAdapter extends Adapter<ViewHolder> {
public UserAdapter(Context context, UserClickListener itemClickListener) {
this.itemClickListener = itemClickListener;
settings = GlobalSettings.getInstance(context);
TypedArray drawables = context.getResources().obtainTypedArray(R.array.user_item_icons);
icons = new Drawable[drawables.length()];
for (int index = 0; index < drawables.length(); index++) {
int resId = drawables.getResourceId(index, 0);
icons[index] = AppCompatResources.getDrawable(context, resId);
}
drawables.recycle();
setIconColor();
}
/**
@ -232,19 +218,19 @@ public class UserAdapter extends Adapter<ViewHolder> {
User user = items.get(index);
if (holder instanceof ItemHolder && user != null) {
ItemHolder vh = (ItemHolder) holder;
vh.textViews[0].setText(user.getUsername());
vh.textViews[1].setText(user.getScreenname());
vh.textViews[2].setText(formatter.format(user.getFollowing()));
vh.textViews[3].setText(formatter.format(user.getFollower()));
vh.username.setText(user.getUsername());
vh.screenname.setText(user.getScreenname());
vh.following.setText(formatter.format(user.getFollowing()));
vh.follower.setText(formatter.format(user.getFollower()));
if (user.isVerified()) {
setIcon(vh.textViews[0], icons[0]);
vh.verifyIcon.setVisibility(VISIBLE);
} else {
setIcon(vh.textViews[0], null);
vh.verifyIcon.setVisibility(GONE);
}
if (user.isLocked()) {
setIcon(vh.textViews[1], icons[1]);
vh.lockedIcon.setVisibility(VISIBLE);
} else {
setIcon(vh.textViews[1], null);
vh.lockedIcon.setVisibility(GONE);
}
if (settings.getImageLoad() && user.hasProfileImage()) {
String pbLink = user.getImageLink();
@ -287,54 +273,49 @@ public class UserAdapter extends Adapter<ViewHolder> {
userRemovable = enable;
}
/**
* sets the TextView icons
*
* @param tv TextView to add an icon
* @param icon icon drawable
*/
private void setIcon(TextView tv, @Nullable Drawable icon) {
if (icon != null)
icon = icon.mutate();
tv.setCompoundDrawablesWithIntrinsicBounds(icon, null, null, null);
}
/**
* color icon drawables
*/
private void setIconColor() {
for (Drawable icon : icons) {
icon.setColorFilter(settings.getIconColor(), SRC_IN);
}
}
/**
* Holder for an user view item
*/
private final class ItemHolder extends ViewHolder {
final TextView[] textViews = new TextView[4];
final ImageView profileImg;
final TextView username, screenname, following, follower;
final ImageView profileImg, verifyIcon, lockedIcon;
final ImageButton delete;
ItemHolder(View v, GlobalSettings settings) {
super(v);
CardView background = (CardView) v;
textViews[0] = v.findViewById(R.id.username_detail);
textViews[1] = v.findViewById(R.id.screenname_detail);
textViews[2] = v.findViewById(R.id.item_user_friends);
textViews[3] = v.findViewById(R.id.item_user_follower);
ImageView followingIcon = v.findViewById(R.id.following_icon);
ImageView followerIcon = v.findViewById(R.id.follower_icon);
username = v.findViewById(R.id.username_detail);
screenname = v.findViewById(R.id.screenname_detail);
following = v.findViewById(R.id.item_user_friends);
follower = v.findViewById(R.id.item_user_follower);
profileImg = v.findViewById(R.id.user_profileimg);
verifyIcon = v.findViewById(R.id.useritem_verified);
lockedIcon = v.findViewById(R.id.useritem_locked);
delete = v.findViewById(R.id.useritem_del_user);
for (TextView tv : textViews) {
tv.setTextColor(settings.getFontColor());
tv.setTypeface(settings.getFontFace());
}
background.setCardBackgroundColor(settings.getCardColor());
textViews[2].setCompoundDrawablesWithIntrinsicBounds(icons[2], null, null, null);
textViews[3].setCompoundDrawablesWithIntrinsicBounds(icons[3], null, null, null);
followerIcon.setImageResource(R.drawable.follower);
followingIcon.setImageResource(R.drawable.following);
verifyIcon.setImageResource(R.drawable.verify);
lockedIcon.setImageResource(R.drawable.lock);
delete.setImageResource(R.drawable.cross);
background.setCardBackgroundColor(settings.getCardColor());
followerIcon.setColorFilter(settings.getIconColor(), SRC_IN);
followingIcon.setColorFilter(settings.getIconColor(), SRC_IN);
verifyIcon.setColorFilter(settings.getIconColor(), SRC_IN);
lockedIcon.setColorFilter(settings.getIconColor(), SRC_IN);
delete.setColorFilter(settings.getIconColor(), SRC_IN);
username.setTextColor(settings.getFontColor());
username.setTypeface(settings.getFontFace());
screenname.setTextColor(settings.getFontColor());
screenname.setTypeface(settings.getFontFace());
following.setTextColor(settings.getFontColor());
following.setTypeface(settings.getFontFace());
follower.setTextColor(settings.getFontColor());
follower.setTypeface(settings.getFontFace());
}
}

2
app/src/main/java/org/nuclearfog/twidda/backend/items/User.java
View File

@ -8,6 +8,8 @@ import twitter4j.URLEntity;
/**
* Container class for a twitter user
*
* @author nuclearfog
*/
public class User implements Serializable {

51
app/src/main/res/layout/item_dm.xml
View File

@ -19,21 +19,31 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/dm_user_verified"
android:layout_width="@dimen/dmitem_icon_size"
android:layout_height="@dimen/dmitem_icon_size"
android:layout_marginStart="@dimen/dmitem_padding_drawable"
android:layout_marginLeft="@dimen/dmitem_padding_drawable"
app:layout_constraintBottom_toBottomOf="@id/dm_username"
app:layout_constraintEnd_toStartOf="@id/dm_username"
app:layout_constraintStart_toEndOf="@+id/dm_profile_img"
app:layout_constraintTop_toTopOf="@id/dm_username"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/dm_username"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dmitem_text_margin"
android:layout_marginLeft="@dimen/dmitem_text_margin"
android:layout_marginEnd="@dimen/dmitem_text_margin"
android:layout_marginRight="@dimen/dmitem_text_margin"
android:drawablePadding="@dimen/dmitem_padding_drawable"
android:singleLine="true"
android:textSize="@dimen/dmitem_textsize_name"
app:layout_constraintBottom_toTopOf="@+id/dm_screenname"
app:layout_constraintEnd_toStartOf="@id/dm_time"
app:layout_constraintStart_toEndOf="@+id/dm_profile_img"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/dm_screenname" />
app:layout_constraintStart_toEndOf="@+id/dm_user_verified"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/dm_time"
@ -47,6 +57,21 @@
app:layout_constraintTop_toTopOf="@+id/dm_username"
app:layout_constraintBottom_toBottomOf="@+id/dm_username" />
<ImageView
android:id="@+id/dm_user_locked"
android:layout_width="@dimen/dmitem_icon_size"
android:layout_height="@dimen/dmitem_icon_size"
android:layout_marginStart="@dimen/dmitem_padding_drawable"
android:layout_marginLeft="@dimen/dmitem_padding_drawable"
app:layout_constraintBottom_toBottomOf="@id/dm_screenname"
app:layout_constraintEnd_toStartOf="@id/dm_screenname"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@+id/dm_profile_img"
app:layout_constraintTop_toTopOf="@id/dm_screenname"
app:layout_constraintVertical_bias="1.0"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/dm_screenname"
android:layout_width="wrap_content"
@ -59,10 +84,10 @@
android:textSize="@dimen/dmitem_textsize_name"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@+id/dm_profile_img"
app:layout_constraintStart_toEndOf="@+id/dm_user_locked"
app:layout_constraintTop_toBottomOf="@+id/dm_username"
app:layout_constraintBottom_toBottomOf="@id/dm_profile_img"
app:layout_constraintEnd_toStartOf="@+id/dm_receiver" />
app:layout_constraintEnd_toStartOf="@+id/dm_receiver_icon" />
<ImageView
android:id="@+id/dm_receiver_icon"
@ -82,10 +107,8 @@
<TextView
android:id="@+id/dm_receiver"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dmitem_text_margin"
android:layout_marginRight="@dimen/dmitem_text_margin"
android:drawablePadding="@dimen/dmitem_padding_drawable"
android:singleLine="true"
android:textSize="@dimen/dmitem_textsize_name"
@ -106,6 +129,7 @@
android:id="@+id/dm_message"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dmitem_text_margin"
android:linksClickable="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -118,17 +142,17 @@
android:layout_height="@dimen/dmitem_button_height"
android:layout_marginStart="@dimen/dmitem_button_margin"
android:layout_marginLeft="@dimen/dmitem_button_margin"
android:layout_marginTop="@dimen/dmitem_button_margin"
android:layout_marginEnd="@dimen/dmitem_button_margin"
android:layout_marginRight="@dimen/dmitem_button_margin"
android:singleLine="true"
android:text="@string/dm_answer"
android:textSize="@dimen/dmitem_textsize_button"
app:layout_constraintEnd_toStartOf="@+id/dm_delete"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/dm_message"
app:layout_constraintEnd_toStartOf="@+id/dm_delete" />
app:layout_constraintTop_toBottomOf="@+id/dm_message" />
<Button
android:id="@+id/dm_delete"
@ -137,6 +161,7 @@
android:layout_height="@dimen/dmitem_button_height"
android:layout_marginStart="@dimen/dmitem_button_margin"
android:layout_marginLeft="@dimen/dmitem_button_margin"
android:layout_marginTop="@dimen/dmitem_button_margin"
android:singleLine="true"
android:text="@string/delete_dm"
android:textSize="@dimen/dmitem_textsize_button"

92
app/src/main/res/layout/item_user.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/CardViewStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -20,17 +21,44 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
<ImageView
android:id="@+id/useritem_verified"
android:layout_width="@dimen/useritem_icon_size"
android:layout_height="@dimen/useritem_icon_size"
android:layout_marginStart="@dimen/useritem_drawable_margin"
android:layout_marginLeft="@dimen/useritem_drawable_margin"
app:layout_constraintStart_toEndOf="@id/user_profileimg"
app:layout_constraintTop_toTopOf="@id/username_detail"
app:layout_constraintBottom_toBottomOf="@id/username_detail"
app:layout_constraintEnd_toStartOf="@id/username_detail"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/username_detail"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/useritem_textview_padding"
android:layout_marginLeft="@dimen/useritem_textview_padding"
android:drawablePadding="@dimen/useritem_padding_drawable"
android:layout_marginEnd="@dimen/useritem_textview_padding"
android:layout_marginRight="@dimen/useritem_textview_padding"
android:drawablePadding="@dimen/useritem_drawable_margin"
android:singleLine="true"
app:layout_constraintStart_toEndOf="@+id/user_profileimg"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/useritem_del_user" />
app:layout_constraintEnd_toStartOf="@id/useritem_del_user"
app:layout_constraintStart_toEndOf="@+id/useritem_verified"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/useritem_locked"
android:layout_width="@dimen/useritem_icon_size"
android:layout_height="@dimen/useritem_icon_size"
android:layout_marginStart="@dimen/useritem_drawable_margin"
android:layout_marginLeft="@dimen/useritem_drawable_margin"
app:layout_constraintStart_toEndOf="@id/user_profileimg"
app:layout_constraintTop_toTopOf="@id/screenname_detail"
app:layout_constraintBottom_toBottomOf="@id/screenname_detail"
app:layout_constraintEnd_toEndOf="@id/screenname_detail"
app:layout_constraintHorizontal_bias="0.0"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/screenname_detail"
@ -38,37 +66,67 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/useritem_textview_padding"
android:layout_marginLeft="@dimen/useritem_textview_padding"
android:drawablePadding="@dimen/useritem_padding_drawable"
android:layout_marginEnd="@dimen/useritem_textview_padding"
android:layout_marginRight="@dimen/useritem_textview_padding"
android:drawablePadding="@dimen/useritem_drawable_margin"
android:singleLine="true"
app:layout_constraintEnd_toStartOf="@id/useritem_del_user"
app:layout_constraintStart_toEndOf="@id/user_profileimg"
app:layout_constraintStart_toEndOf="@id/useritem_locked"
app:layout_constraintTop_toBottomOf="@+id/username_detail" />
<ImageView
android:id="@+id/following_icon"
android:layout_width="@dimen/useritem_icon_size"
android:layout_height="@dimen/useritem_icon_size"
android:layout_marginStart="@dimen/useritem_drawable_margin"
android:layout_marginLeft="@dimen/useritem_drawable_margin"
android:layout_marginEnd="@dimen/useritem_drawable_margin"
android:layout_marginRight="@dimen/useritem_drawable_margin"
app:layout_constraintStart_toEndOf="@+id/user_profileimg"
app:layout_constraintTop_toBottomOf="@id/screenname_detail"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/item_user_friends"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/item_user_friends"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/useritem_textview_padding"
android:layout_marginLeft="@dimen/useritem_textview_padding"
android:drawablePadding="@dimen/useritem_padding_drawable"
android:drawablePadding="@dimen/useritem_drawable_margin"
android:singleLine="true"
android:textSize="@dimen/useritem_textsize_small"
app:layout_constraintEnd_toStartOf="@+id/item_user_follower"
app:layout_constraintStart_toEndOf="@+id/user_profileimg"
app:layout_constraintTop_toBottomOf="@+id/screenname_detail" />
app:layout_constraintStart_toEndOf="@+id/following_icon"
app:layout_constraintTop_toTopOf="@+id/following_icon"
app:layout_constraintBottom_toBottomOf="@+id/following_icon"
app:layout_constraintEnd_toStartOf="@+id/follower_icon" />
<ImageView
android:id="@+id/follower_icon"
android:layout_width="@dimen/useritem_icon_size"
android:layout_height="@dimen/useritem_icon_size"
android:layout_marginStart="@dimen/useritem_drawable_margin"
android:layout_marginLeft="@dimen/useritem_drawable_margin"
android:layout_marginEnd="@dimen/useritem_drawable_margin"
android:layout_marginRight="@dimen/useritem_drawable_margin"
app:layout_constraintStart_toEndOf="@id/item_user_friends"
app:layout_constraintTop_toBottomOf="@id/screenname_detail"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/item_user_follower"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/item_user_follower"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/useritem_textview_padding"
android:layout_marginLeft="@dimen/useritem_textview_padding"
android:drawablePadding="@dimen/useritem_padding_drawable"
android:layout_marginEnd="@dimen/useritem_textview_padding"
android:layout_marginRight="@dimen/useritem_textview_padding"
android:drawablePadding="@dimen/useritem_drawable_margin"
android:singleLine="true"
android:textSize="@dimen/useritem_textsize_small"
app:layout_constraintBottom_toBottomOf="@+id/follower_icon"
app:layout_constraintEnd_toStartOf="@id/useritem_del_user"
app:layout_constraintStart_toEndOf="@+id/item_user_friends"
app:layout_constraintTop_toBottomOf="@+id/screenname_detail" />
app:layout_constraintStart_toEndOf="@+id/follower_icon"
app:layout_constraintTop_toTopOf="@id/follower_icon" />
<ImageButton
android:id="@+id/useritem_del_user"

3
app/src/main/res/layout/tabitem.xml
View File

@ -4,8 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
tools:ignore="UseCompoundDrawables">
android:gravity="center_horizontal">
<ImageView
android:id="@+id/tab_icon"

13
app/src/main/res/values/arrays.xml
View File

@ -37,17 +37,4 @@
<item>@id/color_icon</item>
</integer-array>
<integer-array name="user_item_icons">
<item>@drawable/verify</item>
<item>@drawable/lock</item>
<item>@drawable/following</item>
<item>@drawable/follower</item>
</integer-array>
<integer-array name="dm_item_icons">
<item>@drawable/verify</item>
<item>@drawable/lock</item>
<item>@drawable/right</item>
</integer-array>
</resources>

3
app/src/main/res/values/dimens.xml
View File

@ -85,9 +85,10 @@
<dimen name="useritem_image_size">56sp</dimen>
<dimen name="useritem_layout_padding">5dp</dimen>
<dimen name="useritem_textview_padding">5dp</dimen>
<dimen name="useritem_padding_drawable">5dp</dimen>
<dimen name="useritem_drawable_margin">5dp</dimen>
<dimen name="useritem_button_size">36dp</dimen>
<dimen name="useritem_textsize_small">12sp</dimen>
<dimen name="useritem_icon_size">14sp</dimen>
<!--dimens of item_list.xml-->
<dimen name="listitem_padding">5dp</dimen>