diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index 9dac553eb..4507b2487 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -582,6 +582,7 @@ public class MainActivity extends BaseMvpActivity @Subscribe(threadMode = ThreadMode.MAIN) public void onAreaChangeEvent(AreaChangeEvent event) { + toast(getString(R.string.succeeded_in_switching_the_partition)); start(this); if (mMainTabLayout != null) { mMainTabLayout.select(MainTabType.TAB_TYPE_HOME); diff --git a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java index 102c33c7f..e63bc16ef 100644 --- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java +++ b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java @@ -397,7 +397,6 @@ public class XChatApplication extends BaseApp { httpParams.put("deviceId", DeviceUuidFactory.getDeviceId(context)); httpParams.put("androidId", MD5Utils.getMD5String(Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID))); httpParams.put("channel", AppMetaDataUtil.getChannelID()); - httpParams.put("Accept-Language", Locale.getDefault().getLanguage()); RxNet.init(context) .debug(BuildConfig.DEBUG) .setBaseUrl(url) diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt index 4e443417a..435512eda 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/setting/AreaSelectActivity.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.Intent import androidx.activity.viewModels import com.netease.nim.uikit.StatusBarUtil +import com.yizhuan.erban.R import com.yizhuan.erban.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.ActivityAreaSelectBinding import com.yizhuan.erban.event.AreaChangeEvent @@ -28,7 +29,7 @@ class AreaSelectActivity : BaseViewBindingActivity() } override fun init() { - initWhiteTitleBar("分区") + initWhiteTitleBar(getString(R.string.switching_partition)) binding.recyclerView.adapter = mPartitionAdapter diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/all_service_gift_give_level_1.png b/app/src/main/res/drawable-en-rUS-xhdpi/all_service_gift_give_level_1.png new file mode 100644 index 000000000..f090d74f4 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/all_service_gift_give_level_1.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/all_service_gift_level_one_background.png b/app/src/main/res/drawable-en-rUS-xhdpi/all_service_gift_level_one_background.png new file mode 100644 index 000000000..a61ca32da Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/all_service_gift_level_one_background.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/all_service_gift_level_three_background.png b/app/src/main/res/drawable-en-rUS-xhdpi/all_service_gift_level_three_background.png new file mode 100644 index 000000000..e933cabf4 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/all_service_gift_level_three_background.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/all_service_gift_level_two_background.png b/app/src/main/res/drawable-en-rUS-xhdpi/all_service_gift_level_two_background.png new file mode 100644 index 000000000..e877ffa06 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/all_service_gift_level_two_background.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_btn_invite_now.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_btn_invite_now.png new file mode 100644 index 000000000..d9e689ee6 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_btn_invite_now.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_charm_level_up.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_charm_level_up.png new file mode 100644 index 000000000..5227b6320 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_charm_level_up.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_cp_btn_visit_dialog.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_cp_btn_visit_dialog.png new file mode 100644 index 000000000..60f09f9c5 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_cp_btn_visit_dialog.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_dating_vip_rule.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_dating_vip_rule.png new file mode 100644 index 000000000..14e7cb1a7 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_dating_vip_rule.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_first_charge.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_first_charge.png new file mode 100644 index 000000000..a35d7a14d Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_first_charge.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_first_charge_prize.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_first_charge_prize.png new file mode 100644 index 000000000..afa622f2e Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_first_charge_prize.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_first_charge_prize_ok.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_first_charge_prize_ok.png new file mode 100644 index 000000000..4cb61d094 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_first_charge_prize_ok.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_follow.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_follow.png new file mode 100644 index 000000000..6b5f78cbd Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_follow.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_level_up.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_level_up.png new file mode 100644 index 000000000..5e2b8b0e8 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_level_up.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_new_user_charge_prize.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_new_user_charge_prize.png new file mode 100644 index 000000000..653b46827 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_new_user_charge_prize.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_new_user_charge_prize_ok.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_new_user_charge_prize_ok.png new file mode 100644 index 000000000..78a8f7e58 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_new_user_charge_prize_ok.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_game_checked.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_game_checked.png new file mode 100644 index 000000000..3530cb3ea Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_game_checked.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_game_unchecked.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_game_unchecked.png new file mode 100644 index 000000000..2d8a80e53 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_game_unchecked.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_party_checked.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_party_checked.png new file mode 100644 index 000000000..50ea02e35 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_party_checked.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_party_unchecked.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_party_unchecked.png new file mode 100644 index 000000000..f7e8ab16b Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_party_unchecked.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_pk_finish_deuce.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_pk_finish_deuce.png new file mode 100644 index 000000000..476ae3f09 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_pk_finish_deuce.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_pk_finish_failed.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_pk_finish_failed.png new file mode 100644 index 000000000..a60d069af Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_pk_finish_failed.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_pk_finish_win.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_pk_finish_win.png new file mode 100644 index 000000000..c4af41609 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_room_pk_finish_win.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_user_card_wear_mask.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_user_card_wear_mask.png new file mode 100644 index 000000000..a7738d830 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_user_card_wear_mask.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_vip_main_bottom.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_vip_main_bottom.png new file mode 100644 index 000000000..6d23ae041 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_vip_main_bottom.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/bg_vip_my_level.png b/app/src/main/res/drawable-en-rUS-xhdpi/bg_vip_my_level.png new file mode 100644 index 000000000..8dca3c486 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/bg_vip_my_level.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/dragon_cancel.png b/app/src/main/res/drawable-en-rUS-xhdpi/dragon_cancel.png new file mode 100644 index 000000000..5e337a54f Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/dragon_cancel.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/dragon_three.png b/app/src/main/res/drawable-en-rUS-xhdpi/dragon_three.png new file mode 100644 index 000000000..a5ea69bc9 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/dragon_three.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/fans_team_bg_privilege.png b/app/src/main/res/drawable-en-rUS-xhdpi/fans_team_bg_privilege.png new file mode 100644 index 000000000..022b7714f Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/fans_team_bg_privilege.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/fans_team_bg_task_title.png b/app/src/main/res/drawable-en-rUS-xhdpi/fans_team_bg_task_title.png new file mode 100644 index 000000000..9f2fbc6e3 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/fans_team_bg_task_title.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_album_auditing.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_album_auditing.png new file mode 100644 index 000000000..e54dfe84c Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_album_auditing.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_attention_more.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_attention_more.png new file mode 100644 index 000000000..7f6c4806b Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_attention_more.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_card_has_used.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_card_has_used.png new file mode 100644 index 000000000..c8a10579a Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_card_has_used.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_card_invalid.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_card_invalid.png new file mode 100644 index 000000000..1a9dcb92b Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_card_invalid.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_dating_queuing_micro.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_dating_queuing_micro.png new file mode 100644 index 000000000..94cba5db9 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_dating_queuing_micro.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_dating_spot.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_dating_spot.png new file mode 100644 index 000000000..3a4cf43ba Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_dating_spot.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_fairy_entrance.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_fairy_entrance.png new file mode 100644 index 000000000..0730a9637 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_fairy_entrance.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_female_normal.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_female_normal.png new file mode 100644 index 000000000..89d54b513 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_female_normal.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_female_press.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_female_press.png new file mode 100644 index 000000000..4984b6d02 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_female_press.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_home_game_go_room.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_home_game_go_room.png new file mode 100644 index 000000000..719512a00 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_home_game_go_room.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_male_normal.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_male_normal.png new file mode 100644 index 000000000..1b9011a6b Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_male_normal.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_male_press.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_male_press.png new file mode 100644 index 000000000..5070f0ba2 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_male_press.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_mark_discount.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_mark_discount.png new file mode 100644 index 000000000..963743e3f Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_mark_discount.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_mark_exclusive.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_mark_exclusive.png new file mode 100644 index 000000000..dd7674895 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_mark_exclusive.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_mark_limit.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_mark_limit.png new file mode 100644 index 000000000..ffedb19b4 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_mark_limit.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_mark_new.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_mark_new.png new file mode 100644 index 000000000..0a05d0158 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_mark_new.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_open_noble_btn.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_open_noble_btn.png new file mode 100644 index 000000000..c6fe47504 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_open_noble_btn.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_patriarch_tag.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_patriarch_tag.png new file mode 100644 index 000000000..fca2807fb Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_patriarch_tag.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_pretty_account_13dp.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_pretty_account_13dp.png new file mode 100644 index 000000000..5c8916c6d Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_pretty_account_13dp.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_room_leave.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_room_leave.png new file mode 100644 index 000000000..25a276f8b Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_room_leave.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_room_super_admin.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_room_super_admin.png new file mode 100644 index 000000000..5bf607ac7 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_room_super_admin.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_send_tag.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_send_tag.png new file mode 100644 index 000000000..fe9f4984b Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_send_tag.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_system_notification.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_system_notification.png new file mode 100644 index 000000000..d0224e968 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_system_notification.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_vip_auth_text.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_vip_auth_text.png new file mode 100644 index 000000000..a768a00bd Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_vip_auth_text.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_vip_broadcast_send.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_vip_broadcast_send.png new file mode 100644 index 000000000..2e63bf378 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_vip_broadcast_send.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_vip_gift_dialog.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_vip_gift_dialog.png new file mode 100644 index 000000000..686910132 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_vip_gift_dialog.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/ic_week_star.png b/app/src/main/res/drawable-en-rUS-xhdpi/ic_week_star.png new file mode 100644 index 000000000..f8d0bdc4d Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/ic_week_star.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/icon_admin_logo.png b/app/src/main/res/drawable-en-rUS-xhdpi/icon_admin_logo.png new file mode 100644 index 000000000..aa918a2ac Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/icon_admin_logo.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/icon_gift_all_mic_ture.png b/app/src/main/res/drawable-en-rUS-xhdpi/icon_gift_all_mic_ture.png new file mode 100644 index 000000000..1f06706f4 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/icon_gift_all_mic_ture.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/icon_gift_effect.png b/app/src/main/res/drawable-en-rUS-xhdpi/icon_gift_effect.png new file mode 100644 index 000000000..c41113540 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/icon_gift_effect.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/icon_gift_exclusive.png b/app/src/main/res/drawable-en-rUS-xhdpi/icon_gift_exclusive.png new file mode 100644 index 000000000..fa5e8ddc8 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/icon_gift_exclusive.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/icon_gift_limit_time.png b/app/src/main/res/drawable-en-rUS-xhdpi/icon_gift_limit_time.png new file mode 100644 index 000000000..ffedb19b4 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/icon_gift_limit_time.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/icon_gift_new.png b/app/src/main/res/drawable-en-rUS-xhdpi/icon_gift_new.png new file mode 100644 index 000000000..9a81d648f Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/icon_gift_new.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/icon_go_right_now.png b/app/src/main/res/drawable-en-rUS-xhdpi/icon_go_right_now.png new file mode 100644 index 000000000..3f705ab13 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/icon_go_right_now.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/icon_record_save.png b/app/src/main/res/drawable-en-rUS-xhdpi/icon_record_save.png new file mode 100644 index 000000000..efb883e3e Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/icon_record_save.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/icon_room_attent.png b/app/src/main/res/drawable-en-rUS-xhdpi/icon_room_attent.png new file mode 100644 index 000000000..20befa45c Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/icon_room_attent.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/icon_room_attent_gray.png b/app/src/main/res/drawable-en-rUS-xhdpi/icon_room_attent_gray.png new file mode 100644 index 000000000..a6d976e85 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/icon_room_attent_gray.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/icon_room_mic_queue.png b/app/src/main/res/drawable-en-rUS-xhdpi/icon_room_mic_queue.png new file mode 100644 index 000000000..c555129c6 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/icon_room_mic_queue.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/icon_room_mic_queue_not_empty.png b/app/src/main/res/drawable-en-rUS-xhdpi/icon_room_mic_queue_not_empty.png new file mode 100644 index 000000000..e5fb0e10d Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/icon_room_mic_queue_not_empty.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/icon_room_welcome.png b/app/src/main/res/drawable-en-rUS-xhdpi/icon_room_welcome.png new file mode 100644 index 000000000..e375050f3 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/icon_room_welcome.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/icon_user_list_room_ownner.png b/app/src/main/res/drawable-en-rUS-xhdpi/icon_user_list_room_ownner.png new file mode 100644 index 000000000..0d2a72361 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/icon_user_list_room_ownner.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/icon_user_list_up_mic.png b/app/src/main/res/drawable-en-rUS-xhdpi/icon_user_list_up_mic.png new file mode 100644 index 000000000..4b4043b48 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/icon_user_list_up_mic.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/room_bg_rank_go_room.png b/app/src/main/res/drawable-en-rUS-xhdpi/room_bg_rank_go_room.png new file mode 100644 index 000000000..382cf810e Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/room_bg_rank_go_room.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/room_red_package_bg.png b/app/src/main/res/drawable-en-rUS-xhdpi/room_red_package_bg.png new file mode 100644 index 000000000..884f624c4 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/room_red_package_bg.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/room_red_package_go_room_btn.png b/app/src/main/res/drawable-en-rUS-xhdpi/room_red_package_go_room_btn.png new file mode 100644 index 000000000..d5c778282 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/room_red_package_go_room_btn.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/room_red_package_open_btn.png b/app/src/main/res/drawable-en-rUS-xhdpi/room_red_package_open_btn.png new file mode 100644 index 000000000..d0a1efed4 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/room_red_package_open_btn.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/room_red_package_send.png b/app/src/main/res/drawable-en-rUS-xhdpi/room_red_package_send.png new file mode 100644 index 000000000..19084da9c Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/room_red_package_send.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/single_room_pk_bg_finish_deuce_avatar.png b/app/src/main/res/drawable-en-rUS-xhdpi/single_room_pk_bg_finish_deuce_avatar.png new file mode 100644 index 000000000..30f44a4db Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/single_room_pk_bg_finish_deuce_avatar.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/single_room_pk_bg_finish_failed_avatar.png b/app/src/main/res/drawable-en-rUS-xhdpi/single_room_pk_bg_finish_failed_avatar.png new file mode 100644 index 000000000..8fa5071af Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/single_room_pk_bg_finish_failed_avatar.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/single_room_pk_bg_finish_win_avatar.png b/app/src/main/res/drawable-en-rUS-xhdpi/single_room_pk_bg_finish_win_avatar.png new file mode 100644 index 000000000..58d626808 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/single_room_pk_bg_finish_win_avatar.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/single_room_pk_ic_result_deuce.png b/app/src/main/res/drawable-en-rUS-xhdpi/single_room_pk_ic_result_deuce.png new file mode 100644 index 000000000..35da0e279 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/single_room_pk_ic_result_deuce.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/single_room_pk_ic_result_failed.png b/app/src/main/res/drawable-en-rUS-xhdpi/single_room_pk_ic_result_failed.png new file mode 100644 index 000000000..5650a3417 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/single_room_pk_ic_result_failed.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/single_room_pk_ic_result_win.png b/app/src/main/res/drawable-en-rUS-xhdpi/single_room_pk_ic_result_win.png new file mode 100644 index 000000000..cd704740f Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/single_room_pk_ic_result_win.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/splash_logo.png b/app/src/main/res/drawable-en-rUS-xhdpi/splash_logo.png new file mode 100644 index 000000000..87d0685ba Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/splash_logo.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_exchange_title.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_exchange_title.png new file mode 100644 index 000000000..499c78a78 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_exchange_title.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_exchange_title_debris_checked.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_exchange_title_debris_checked.png new file mode 100644 index 000000000..1ac638fc5 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_exchange_title_debris_checked.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_exchange_title_debris_unchecked.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_exchange_title_debris_unchecked.png new file mode 100644 index 000000000..ac3a4d455 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_exchange_title_debris_unchecked.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_exchange_title_fairy_checked.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_exchange_title_fairy_checked.png new file mode 100644 index 000000000..0458814f4 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_exchange_title_fairy_checked.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_exchange_title_fairy_unchecked.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_exchange_title_fairy_unchecked.png new file mode 100644 index 000000000..771ca1b1a Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_exchange_title_fairy_unchecked.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_base.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_base.png new file mode 100644 index 000000000..3bedf7046 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_base.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_epic.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_epic.png new file mode 100644 index 000000000..7d3b73656 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_epic.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_legend.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_legend.png new file mode 100644 index 000000000..abef1d368 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_legend.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_test.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_test.png new file mode 100644 index 000000000..76535598e Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_test.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_title_prize_checked.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_title_prize_checked.png new file mode 100644 index 000000000..e9021923a Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_title_prize_checked.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_title_prize_unchecked.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_title_prize_unchecked.png new file mode 100644 index 000000000..d34562bc1 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_title_prize_unchecked.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_title_record_checked.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_title_record_checked.png new file mode 100644 index 000000000..e8736888f Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_title_record_checked.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_title_record_unchecked.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_title_record_unchecked.png new file mode 100644 index 000000000..debc59386 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_forest_title_record_unchecked.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_home_prize.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_home_prize.png new file mode 100644 index 000000000..620f713e4 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_home_prize.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_key_number.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_key_number.png new file mode 100644 index 000000000..23c06b03e Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_key_number.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_my_fairy_friend_title.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_my_fairy_friend_title.png new file mode 100644 index 000000000..5c29ead81 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_my_fairy_friend_title.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_my_fairy_tip_text.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_my_fairy_tip_text.png new file mode 100644 index 000000000..8b0403194 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_my_fairy_tip_text.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_notify.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_notify.png new file mode 100644 index 000000000..51ed7fa31 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_notify.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_open_1.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_open_1.png new file mode 100644 index 000000000..5c2276118 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_open_1.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_open_10.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_open_10.png new file mode 100644 index 000000000..ba134d333 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_open_10.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_open_100.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_open_100.png new file mode 100644 index 000000000..9d031d81c Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_open_100.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_test_fairy_begin.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_test_fairy_begin.png new file mode 100644 index 000000000..b36a5646c Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_bg_test_fairy_begin.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_compound.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_compound.png new file mode 100644 index 000000000..ccebad302 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_compound.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_compound_disable.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_compound_disable.png new file mode 100644 index 000000000..a95279903 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_compound_disable.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_debris_select.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_debris_select.png new file mode 100644 index 000000000..b265bc42a Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_debris_select.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_debris_unselect.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_debris_unselect.png new file mode 100644 index 000000000..b604e807f Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_debris_unselect.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_fairy_base.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_fairy_base.png new file mode 100644 index 000000000..ff43ccbd9 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_fairy_base.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_fairy_epic.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_fairy_epic.png new file mode 100644 index 000000000..85ed9bb8f Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_fairy_epic.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_fairy_legend.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_fairy_legend.png new file mode 100644 index 000000000..18c0ce51a Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_fairy_legend.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_fairy_select.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_fairy_select.png new file mode 100644 index 000000000..9c142a1d6 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_fairy_select.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_fairy_unselect.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_fairy_unselect.png new file mode 100644 index 000000000..39453c730 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_exchange_fairy_unselect.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_fairy_treasure.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_fairy_treasure.png new file mode 100644 index 000000000..afcba9563 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_fairy_treasure.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_forest_record.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_forest_record.png new file mode 100644 index 000000000..c7245ad38 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_forest_record.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_forest_store.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_forest_store.png new file mode 100644 index 000000000..d6273426d Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_forest_store.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_forest_title.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_forest_title.png new file mode 100644 index 000000000..a22173d98 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_forest_title.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_home_title.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_home_title.png new file mode 100644 index 000000000..dcce1e583 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_home_title.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy.png new file mode 100644 index 000000000..2f6af3638 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_base_select.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_base_select.png new file mode 100644 index 000000000..5d9a5c9f7 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_base_select.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_base_unselect.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_base_unselect.png new file mode 100644 index 000000000..a060d6ee0 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_base_unselect.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_empty.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_empty.png new file mode 100644 index 000000000..f5c780e89 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_empty.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_epic_select.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_epic_select.png new file mode 100644 index 000000000..b97d2d341 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_epic_select.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_epic_unselect.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_epic_unselect.png new file mode 100644 index 000000000..7a25342af Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_epic_unselect.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_get.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_get.png new file mode 100644 index 000000000..996a1cced Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_get.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_legend_select.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_legend_select.png new file mode 100644 index 000000000..7130c1d93 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_legend_select.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_legend_unselect.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_legend_unselect.png new file mode 100644 index 000000000..7b8157ef0 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_legend_unselect.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_record.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_record.png new file mode 100644 index 000000000..d9d9b600e Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_record.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_send.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_send.png new file mode 100644 index 000000000..4de765a32 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_send.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_title.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_title.png new file mode 100644 index 000000000..cd428a82d Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_my_fairy_title.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_test_fairy_epic_select.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_test_fairy_epic_select.png new file mode 100644 index 000000000..819d2a048 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_test_fairy_epic_select.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_test_fairy_epic_unselect.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_test_fairy_epic_unselect.png new file mode 100644 index 000000000..96a9a6a28 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_test_fairy_epic_unselect.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_test_fairy_legend_select.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_test_fairy_legend_select.png new file mode 100644 index 000000000..f35496cc1 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_test_fairy_legend_select.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_test_fairy_legend_unselect.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_test_fairy_legend_unselect.png new file mode 100644 index 000000000..1646126ea Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_test_fairy_legend_unselect.png differ diff --git a/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_test_fairy_title.png b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_test_fairy_title.png new file mode 100644 index 000000000..f2b2a0193 Binary files /dev/null and b/app/src/main/res/drawable-en-rUS-xhdpi/treasure_fairy_ic_test_fairy_title.png differ diff --git a/app/src/main/res/drawable-v23/anim_list_common_loading.xml b/app/src/main/res/drawable-v23/anim_list_common_loading.xml deleted file mode 100644 index 1c86494c3..000000000 --- a/app/src/main/res/drawable-v23/anim_list_common_loading.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-xxhdpi/bg_charm_level_up.webp b/app/src/main/res/drawable-xhdpi/bg_charm_level_up.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/bg_charm_level_up.webp rename to app/src/main/res/drawable-xhdpi/bg_charm_level_up.webp diff --git a/app/src/main/res/drawable/bg_common_translate_rectangle.webp b/app/src/main/res/drawable-xhdpi/bg_common_translate_rectangle.webp similarity index 100% rename from app/src/main/res/drawable/bg_common_translate_rectangle.webp rename to app/src/main/res/drawable-xhdpi/bg_common_translate_rectangle.webp diff --git a/app/src/main/res/drawable-xxhdpi/bg_level_up.webp b/app/src/main/res/drawable-xhdpi/bg_level_up.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/bg_level_up.webp rename to app/src/main/res/drawable-xhdpi/bg_level_up.webp diff --git a/app/src/main/res/drawable/ic_game_guide.webp b/app/src/main/res/drawable-xhdpi/ic_game_guide.webp similarity index 100% rename from app/src/main/res/drawable/ic_game_guide.webp rename to app/src/main/res/drawable-xhdpi/ic_game_guide.webp diff --git a/app/src/main/res/drawable/ic_give_gold_success.png b/app/src/main/res/drawable-xhdpi/ic_give_gold_success.png similarity index 100% rename from app/src/main/res/drawable/ic_give_gold_success.png rename to app/src/main/res/drawable-xhdpi/ic_give_gold_success.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_open_noble_btn.webp b/app/src/main/res/drawable-xhdpi/ic_open_noble_btn.webp similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_open_noble_btn.webp rename to app/src/main/res/drawable-xhdpi/ic_open_noble_btn.webp diff --git a/app/src/main/res/mipmap-xhdpi/ic_pretty_account_13dp.webp b/app/src/main/res/drawable-xhdpi/ic_pretty_account_13dp.webp similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_pretty_account_13dp.webp rename to app/src/main/res/drawable-xhdpi/ic_pretty_account_13dp.webp diff --git a/app/src/main/res/drawable-xxhdpi/bg_home_search.xml b/app/src/main/res/drawable/bg_home_search.xml similarity index 100% rename from app/src/main/res/drawable-xxhdpi/bg_home_search.xml rename to app/src/main/res/drawable/bg_home_search.xml diff --git a/app/src/main/res/drawable-xxhdpi/selector_filtrate_mid.xml b/app/src/main/res/drawable/selector_filtrate_mid.xml similarity index 100% rename from app/src/main/res/drawable-xxhdpi/selector_filtrate_mid.xml rename to app/src/main/res/drawable/selector_filtrate_mid.xml diff --git a/app/src/main/res/drawable-xhdpi/selector_lucky_money_sender.xml b/app/src/main/res/drawable/selector_lucky_money_sender.xml similarity index 100% rename from app/src/main/res/drawable-xhdpi/selector_lucky_money_sender.xml rename to app/src/main/res/drawable/selector_lucky_money_sender.xml diff --git a/app/src/main/res/drawable-xxhdpi/shape_filtrate_left_noselect.xml b/app/src/main/res/drawable/shape_filtrate_left_noselect.xml similarity index 100% rename from app/src/main/res/drawable-xxhdpi/shape_filtrate_left_noselect.xml rename to app/src/main/res/drawable/shape_filtrate_left_noselect.xml diff --git a/app/src/main/res/drawable-xxhdpi/shape_filtrate_mid.xml b/app/src/main/res/drawable/shape_filtrate_mid.xml similarity index 100% rename from app/src/main/res/drawable-xxhdpi/shape_filtrate_mid.xml rename to app/src/main/res/drawable/shape_filtrate_mid.xml diff --git a/app/src/main/res/drawable-xxhdpi/shape_gray_5dp.xml b/app/src/main/res/drawable/shape_gray_5dp.xml similarity index 100% rename from app/src/main/res/drawable-xxhdpi/shape_gray_5dp.xml rename to app/src/main/res/drawable/shape_gray_5dp.xml diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index 11461f0e0..f5a658c68 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -433,7 +433,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginStart="@dimen/dp_15" - android:text="分区" + android:text="@string/switching_partition" android:textColor="@color/text_title_color" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/fragment_dialog_open_noble.xml b/app/src/main/res/layout/fragment_dialog_open_noble.xml index e2cfa5850..82046dd07 100644 --- a/app/src/main/res/layout/fragment_dialog_open_noble.xml +++ b/app/src/main/res/layout/fragment_dialog_open_noble.xml @@ -49,7 +49,7 @@ android:layout_height="38dp" android:layout_marginTop="110dp" android:layout_marginBottom="12dp" - android:background="@mipmap/ic_open_noble_btn" + android:background="@drawable/ic_open_noble_btn" android:minWidth="218dp" /> diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index 35c20e3e1..a61a1791c 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -193,6 +193,7 @@ android:layout_height="14dp" android:layout_marginEnd="5dp" android:visibility="gone" + tools:visibility="visible" tools:src="@mipmap/ic_user_level_king" /> diff --git a/app/src/main/res/layout/item_home_hall_left.xml b/app/src/main/res/layout/item_home_hall_left.xml index a56d168f7..6a92d70ed 100644 --- a/app/src/main/res/layout/item_home_hall_left.xml +++ b/app/src/main/res/layout/item_home_hall_left.xml @@ -49,7 +49,7 @@ android:layout_width="@dimen/dp_13" android:layout_height="@dimen/dp_13" android:layout_marginEnd="3dp" - android:src="@mipmap/ic_pretty_account_13dp" + android:src="@drawable/ic_pretty_account_13dp" android:visibility="gone" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/item_home_hall_right.xml b/app/src/main/res/layout/item_home_hall_right.xml index f87ffd5f4..452619818 100644 --- a/app/src/main/res/layout/item_home_hall_right.xml +++ b/app/src/main/res/layout/item_home_hall_right.xml @@ -44,7 +44,7 @@ android:layout_width="@dimen/dp_13" android:layout_height="@dimen/dp_13" android:layout_marginEnd="3dp" - android:src="@mipmap/ic_pretty_account_13dp" + android:src="@drawable/ic_pretty_account_13dp" android:visibility="gone" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/treasure_fairy_dialog_home.xml b/app/src/main/res/layout/treasure_fairy_dialog_home.xml index 1d607f4ee..b9b3d33ac 100644 --- a/app/src/main/res/layout/treasure_fairy_dialog_home.xml +++ b/app/src/main/res/layout/treasure_fairy_dialog_home.xml @@ -269,15 +269,18 @@ + app:layout_constraintEnd_toStartOf="@+id/fairy_item_5" + app:layout_constraintStart_toEndOf="@+id/fairy_item_10" + tools:text="幸運值達到X后,下次奪寶獲贈精靈球啊发撒法沙发沙发飞洒飞洒发生飞洒发生1阿德撒旦" /> ذكر الله إلهة قليل + تبديل منطقة + تبديل منطقة بنجاح~ diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 4519d0b0b..a5d5ca5fa 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -5210,5 +5210,7 @@ Male god Goddess Bit + Change region + Change region successfully~ diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 49a84a3f5..5bd0775d1 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -5237,5 +5237,7 @@ Dewa Dewi orang + Ubah server + Ubah server berhasil~ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 6b2a17cbd..a4c47c8fb 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -5243,5 +5243,7 @@ Erkek Tanrı tanrıça biraz + Bölge değiştir + Bölümü başarıyla değiştir~ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c9745929b..6bc79ec20 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5239,5 +5239,7 @@ 男神 女神 + 切换分区 + 切换分区成功~ \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 0cb627f05..73d6ccecc 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -61,13 +61,6 @@ #00ffffff - -