diff --git a/app/src/main/java/com/yizhuan/erban/avroom/adapter/AuctionListHeaderItem.java b/app/src/main/java/com/yizhuan/erban/avroom/adapter/AuctionListHeaderItem.java deleted file mode 100644 index b4bd0d880..000000000 --- a/app/src/main/java/com/yizhuan/erban/avroom/adapter/AuctionListHeaderItem.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.yizhuan.erban.avroom.adapter; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.list.BaseGroupItem; -import com.yizhuan.xchat_android_library.list.ViewHolder; - -/** - * Created by chenran on 2017/8/9. - */ - -public class AuctionListHeaderItem extends BaseGroupItem{ - public AuctionListHeaderItem(Context context, int viewType) { - super(context, viewType); - } - - @Override - public ViewHolder createViewHolder(ViewGroup group) { - View view = LayoutInflater.from(getContext()).inflate(R.layout.list_item_auction_header, null); - AuctionListHeaderItem.AuctionListHeaderHolder holder = new AuctionListHeaderItem.AuctionListHeaderHolder(view); - return holder; - } - - @Override - public void updateHolder(ViewHolder holder, int groupPos, int childPos) { - AuctionListHeaderItem.AuctionListHeaderHolder auctionListHolder = (AuctionListHeaderItem.AuctionListHeaderHolder) holder; - if (auctionListHolder != null) { - if (getViewType() == AuctionListAdapter.VIEW_TYPE_WEEK_HEADER) { - auctionListHolder.image.setImageResource(R.drawable.icon_week_auction_list); - } else { - auctionListHolder.image.setImageResource(R.drawable.icon_total_auction_list); - } - } - } - - private static class AuctionListHeaderHolder extends ViewHolder { - private ImageView image; - public AuctionListHeaderHolder(View itemView) { - super(itemView); - image = (ImageView) itemView.findViewById(R.id.auction_list_header); - } - } -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java b/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java index 7dbac923b..2a46ac761 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java +++ b/app/src/main/java/com/yizhuan/erban/ui/gift/dialog/GiftInfoVm.java @@ -30,8 +30,6 @@ public class GiftInfoVm extends BaseItem { public final ObservableField countDownText = new ObservableField<>(); - public Drawable nobleDrawable = null; - public Drawable radishDrawable = null; public Drawable radishDrawableSelected = null; @@ -83,16 +81,6 @@ public class GiftInfoVm extends BaseItem { } this.isKnap.set(isKnap); updateCount(); - int nobleId = data.getLevel(); - if (nobleId == 0) { - // 普通表情 - nobleDrawable = null; - } else { - int drawableId = nobleId == 1 ? R.drawable.ic_tag_1 : nobleId == 2 ? R.drawable.ic_tag_2 : nobleId == 3 ? - R.drawable.ic_tag_3 : nobleId == 4 ? R.drawable.ic_tag_4 : nobleId == 5 ? R.drawable.ic_tag_5 : nobleId == 6 ? - R.drawable.ic_tag_6 : nobleId == 7 ? R.drawable.ic_tag_7 : 0; - nobleDrawable = context.getResources().getDrawable(drawableId); - } isShowNew = data.isHasLatest(); isShowLimit = data.isHasTimeLimit(); isShowEffect = data.isHasEffect(); diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java index 3af609bbb..5d812d72e 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/friend/FriendListAdapter.java @@ -58,7 +58,7 @@ public class FriendListAdapter extends BaseQuickAdapter { if (type == AbstractSelectFriendAction.TYPE_NORMAL diff --git a/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java index 691560971..9f4fcea3c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/AttentionListAdapter.java @@ -95,7 +95,7 @@ public class AttentionListAdapter extends BaseQuickAdapter baseViewHolder.getView(R.id.iv_user_official).setVisibility(fansInfo.isOfficial() ? View.VISIBLE : View.GONE); NobleAvatarView nobleAvatarView = baseViewHolder.getView(R.id.noble_avatar_view); - nobleAvatarView.setSize(55, 75, 15); + nobleAvatarView.setSize(54, 70, 15); nobleAvatarView.setData(fansInfo.getAvatar(), fansInfo.getNobleUsers()); AppCompatImageView ivUserLevel = baseViewHolder.getView(R.id.iv_user_level); diff --git a/app/src/main/res/drawable-xhdpi/ic_tag_1.webp b/app/src/main/res/drawable-xhdpi/ic_tag_1.webp deleted file mode 100644 index efd2db1ac..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_tag_1.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_tag_2.webp b/app/src/main/res/drawable-xhdpi/ic_tag_2.webp deleted file mode 100644 index 639b08e1e..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_tag_2.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_tag_3.webp b/app/src/main/res/drawable-xhdpi/ic_tag_3.webp deleted file mode 100644 index cc361837d..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_tag_3.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_tag_4.webp b/app/src/main/res/drawable-xhdpi/ic_tag_4.webp deleted file mode 100644 index 88b424727..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_tag_4.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_tag_5.webp b/app/src/main/res/drawable-xhdpi/ic_tag_5.webp deleted file mode 100644 index bad42fde1..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_tag_5.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_tag_6.webp b/app/src/main/res/drawable-xhdpi/ic_tag_6.webp deleted file mode 100644 index 82aa3ee39..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_tag_6.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_tag_7.webp b/app/src/main/res/drawable-xhdpi/ic_tag_7.webp deleted file mode 100644 index c617d8304..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_tag_7.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_attention_flag_auction.webp b/app/src/main/res/drawable-xhdpi/icon_attention_flag_auction.webp deleted file mode 100644 index 2294d181c..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_attention_flag_auction.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_auction_finish_bg.webp b/app/src/main/res/drawable-xhdpi/icon_auction_finish_bg.webp deleted file mode 100644 index efe268e29..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_auction_finish_bg.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_auction_wing.webp b/app/src/main/res/drawable-xhdpi/icon_auction_wing.webp deleted file mode 100644 index 369f79c78..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_auction_wing.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_be_acution.webp b/app/src/main/res/drawable-xhdpi/icon_be_acution.webp deleted file mode 100644 index f967b4bb3..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_be_acution.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_big_reward.webp b/app/src/main/res/drawable-xhdpi/icon_big_reward.webp deleted file mode 100644 index dd35588ff..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_big_reward.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_current_auction_list.webp b/app/src/main/res/drawable-xhdpi/icon_current_auction_list.webp deleted file mode 100644 index ac20792ec..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_current_auction_list.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_current_list_first.webp b/app/src/main/res/drawable-xhdpi/icon_current_list_first.webp deleted file mode 100644 index c58fa7f96..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_current_list_first.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_current_list_second.webp b/app/src/main/res/drawable-xhdpi/icon_current_list_second.webp deleted file mode 100644 index f6996cf11..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_current_list_second.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_current_list_third.webp b/app/src/main/res/drawable-xhdpi/icon_current_list_third.webp deleted file mode 100644 index 475b8b971..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_current_list_third.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_finish_first.webp b/app/src/main/res/drawable-xhdpi/icon_finish_first.webp deleted file mode 100644 index ad0a16baf..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_finish_first.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_hammer.webp b/app/src/main/res/drawable-xhdpi/icon_hammer.webp deleted file mode 100644 index d626f2909..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_hammer.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_hammer_tip.webp b/app/src/main/res/drawable-xhdpi/icon_hammer_tip.webp deleted file mode 100644 index dcb507f63..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_hammer_tip.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_total_auction_list.webp b/app/src/main/res/drawable-xhdpi/icon_total_auction_list.webp deleted file mode 100644 index b2520c9c4..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_total_auction_list.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_week_auction_list.webp b/app/src/main/res/drawable-xhdpi/icon_week_auction_list.webp deleted file mode 100644 index 14cc2b6c7..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_week_auction_list.webp and /dev/null differ diff --git a/app/src/main/res/layout/attention_item_new.xml b/app/src/main/res/layout/attention_item_new.xml index d5b2d77d3..4a602758f 100644 --- a/app/src/main/res/layout/attention_item_new.xml +++ b/app/src/main/res/layout/attention_item_new.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/rly" android:layout_width="match_parent" - android:layout_height="71dp" + android:layout_height="70dp" android:orientation="horizontal"> + android:layout_marginStart="@dimen/dp_8" /> @@ -46,7 +45,7 @@ android:ellipsize="end" android:lines="1" android:textColor="@color/text_title_color" - android:textSize="15sp" + android:textSize="@dimen/sp_14" app:layout_flexShrink="1" tools:text="@string/layout_attention_item_new_01" /> @@ -90,7 +89,7 @@ @@ -117,7 +115,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginStart="10dp" android:layout_marginEnd="15dp"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fans_list_item_new.xml b/app/src/main/res/layout/fans_list_item_new.xml index dc76e7d71..36809afe4 100644 --- a/app/src/main/res/layout/fans_list_item_new.xml +++ b/app/src/main/res/layout/fans_list_item_new.xml @@ -3,23 +3,22 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/rly" - android:gravity="center_vertical" android:layout_width="match_parent" android:layout_height="70dp" android:orientation="horizontal"> @@ -41,15 +40,14 @@ + android:textSize="@dimen/sp_14" + tools:text="@string/layout_attention_item_new_01" /> @@ -118,7 +115,6 @@ android:layout_width="68dp" android:layout_height="30dp" android:layout_gravity="center_vertical" - android:layout_marginStart="@dimen/dp_26" android:layout_marginEnd="@dimen/dp_15" android:background="@drawable/selector_common_confirm" android:gravity="center" diff --git a/app/src/main/res/layout/item_erban_grid_2_empty.xml b/app/src/main/res/layout/item_erban_grid_2_empty.xml deleted file mode 100644 index f520169a0..000000000 --- a/app/src/main/res/layout/item_erban_grid_2_empty.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_reward_first.xml b/app/src/main/res/layout/item_reward_first.xml index 3b3bab498..1a274967a 100644 --- a/app/src/main/res/layout/item_reward_first.xml +++ b/app/src/main/res/layout/item_reward_first.xml @@ -35,7 +35,7 @@ android:id="@+id/tv_reward" android:layout_marginTop="@dimen/dp_5" tools:text="@string/layout_item_reward_first_01" - tools:textColor="@color/red" + tools:textColor="@color/color_red" android:gravity="center" android:textSize="@dimen/sp_12" android:textColor="@color/white" diff --git a/app/src/main/res/layout/item_reward_fourth.xml b/app/src/main/res/layout/item_reward_fourth.xml deleted file mode 100644 index 3d08cfa94..000000000 --- a/app/src/main/res/layout/item_reward_fourth.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/item_reward_second.xml b/app/src/main/res/layout/item_reward_second.xml index 3b0ddc6d1..e04f03ba3 100644 --- a/app/src/main/res/layout/item_reward_second.xml +++ b/app/src/main/res/layout/item_reward_second.xml @@ -36,7 +36,7 @@ android:id="@+id/tv_reward" android:layout_marginTop="@dimen/dp_5" tools:text="@string/layout_item_reward_second_01" - tools:textColor="@color/red" + tools:textColor="@color/color_red" android:gravity="center" android:textSize="@dimen/sp_12" android:textColor="@color/white" diff --git a/app/src/main/res/layout/item_reward_third.xml b/app/src/main/res/layout/item_reward_third.xml index b7c2df836..fda75b967 100644 --- a/app/src/main/res/layout/item_reward_third.xml +++ b/app/src/main/res/layout/item_reward_third.xml @@ -34,7 +34,7 @@ android:id="@+id/tv_reward" android:layout_marginTop="@dimen/dp_5" tools:text="@string/layout_item_reward_third_01" - tools:textColor="@color/red" + tools:textColor="@color/color_red" android:gravity="center" android:textSize="@dimen/sp_12" android:textColor="@color/white" diff --git a/app/src/main/res/layout/layout_auction_view.xml b/app/src/main/res/layout/layout_auction_view.xml deleted file mode 100644 index fbfa36554..000000000 --- a/app/src/main/res/layout/layout_auction_view.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/layout_bill_date.xml b/app/src/main/res/layout/layout_bill_date.xml deleted file mode 100644 index febe11ad9..000000000 --- a/app/src/main/res/layout/layout_bill_date.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_attention_user_live.xml b/app/src/main/res/layout/list_item_attention_user_live.xml deleted file mode 100644 index b7ffb2c89..000000000 --- a/app/src/main/res/layout/list_item_attention_user_live.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_auction_header.xml b/app/src/main/res/layout/list_item_auction_header.xml deleted file mode 100644 index fad2b3d00..000000000 --- a/app/src/main/res/layout/list_item_auction_header.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_friend_new.xml b/app/src/main/res/layout/list_item_friend_new.xml index 511d3e03b..b7499f390 100644 --- a/app/src/main/res/layout/list_item_friend_new.xml +++ b/app/src/main/res/layout/list_item_friend_new.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/container" android:layout_width="match_parent" - android:layout_height="71dp" + android:layout_height="70dp" android:orientation="horizontal"> + android:layout_marginStart="@dimen/dp_8" /> @@ -106,10 +105,9 @@ android:id="@+id/tv_user_desc" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="8dp" android:ellipsize="end" android:lines="1" - android:textColor="@color/text_normal_c6c6e9" + android:textColor="@color/color_B3B3C3" android:textSize="12sp" tools:text="1234568940" /> @@ -120,7 +118,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginStart="10dp" android:layout_marginEnd="15dp"> + tools:src="@drawable/default_avatar" + tools:layout_width="54dp" + tools:layout_height="54dp"/> + android:visibility="visible" /> + android:layout_alignBottom="@+id/iv_avatar" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/red_packet_dialog.xml b/app/src/main/res/layout/red_packet_dialog.xml deleted file mode 100644 index 7965506f9..000000000 --- a/app/src/main/res/layout/red_packet_dialog.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/mipmap-xhdpi/bg_open_redpacket.webp b/app/src/main/res/mipmap-xhdpi/bg_open_redpacket.webp deleted file mode 100644 index 07f8e811a..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/bg_open_redpacket.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/bg_view_redpacket.webp b/app/src/main/res/mipmap-xhdpi/bg_view_redpacket.webp deleted file mode 100644 index dc4366090..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/bg_view_redpacket.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_open_redpacket.webp b/app/src/main/res/mipmap-xhdpi/ic_open_redpacket.webp deleted file mode 100644 index d249ee281..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_open_redpacket.webp and /dev/null differ diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index d955cfdd0..0ea4b8922 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -3341,8 +3341,6 @@ مِلكِي مِلكِي مِلكِي - بلدي بلدي بلدي بلدي بلدي - بلدي بلدي بلدي بلدي بلدي إيريس ميازاوا إيريس ميازاوا يسجل كنية