diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java index 62e55f3d0..760605a44 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java @@ -1074,17 +1074,6 @@ public class MessageView extends FrameLayout { } }, new ForegroundColorSpan(roomTipNickColor)) .append("关注房主不迷路哦") -// .append("关注", new RoundBackgroundSpan(tvContent.getContext(), ContextCompat.getColor(tvContent.getContext(), R.color.appColor), Color.WHITE, SizeUtils.dp2px(tvContent.getContext(), 8))) -// .append(follow ? "已关注" : "关注", -// new TagSpan(Color.WHITE, ContextCompat.getColor(tvContent.getContext(), follow ? R.color.gray7 : R.color.appColor), (int) tvContent.getTextSize(), SizeUtils.dp2px(tvContent.getContext(), 8)), -// follow ? null : new OriginalDrawStatusClickSpan() { -// @Override -// public void onClick(@NonNull View widget) { -// if (onClick != null) { -// onClick.onFollowClick(position); -// } -// } -// }); .append(follow ? "已关注" : "关注", new RadiusBackgroundSpan(follow ? Color.parseColor("#4cFFFFFF") : ContextCompat.getColor(tvContent.getContext(), R.color.appColor), SizeUtils.dp2px(tvContent.getContext(), 8), follow ? Color.parseColor("#D8FFFFFF") : Color.WHITE, (int) (tvContent.getTextSize() - SizeUtils.sp2px(tvContent.getContext(), 2) - .5f), SizeUtils.dp2px(tvContent.getContext(), 8), SizeUtils.dp2px(tvContent.getContext(), 4)), follow ? null : new OriginalDrawStatusClickSpan() { diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/BannerAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/BannerAdapter.java index d8f285495..daa77406d 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/BannerAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/BannerAdapter.java @@ -39,6 +39,10 @@ public class BannerAdapter extends StaticPagerAdapter { mInflater = LayoutInflater.from(context); } + public void setBannerInfoList(List bannerInfoList) { + this.bannerInfoList = bannerInfoList; + } + public void setHomeGame(boolean homeGame) { isHomeGame = homeGame; } diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.java index 94023d91a..56d6b75de 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.java @@ -143,6 +143,8 @@ public class HomeFragment extends BaseMvpFragment diff --git a/app/src/main/res/layout/nim_recent_contact_list_item_new.xml b/app/src/main/res/layout/nim_recent_contact_list_item_new.xml index ab581dad9..1645286a6 100644 --- a/app/src/main/res/layout/nim_recent_contact_list_item_new.xml +++ b/app/src/main/res/layout/nim_recent_contact_list_item_new.xml @@ -187,7 +187,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical|right" - android:layout_marginTop="2dp" + android:layout_marginTop="6dp" android:textColor="@color/text_secondary_4f516a" android:textSize="11dp" tools:text="just now" /> diff --git a/app/src/main/res/layout/user_info_bottom_layout.xml b/app/src/main/res/layout/user_info_bottom_layout.xml index aa3b299e1..6e1c98aaa 100644 --- a/app/src/main/res/layout/user_info_bottom_layout.xml +++ b/app/src/main/res/layout/user_info_bottom_layout.xml @@ -3,49 +3,47 @@ android:id="@+id/bottom_view_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:gravity="center" android:background="@color/transparent" + android:gravity="center" android:orientation="horizontal"> + android:orientation="vertical"> + android:textSize="15sp" /> + android:orientation="vertical"> + android:textSize="15sp" /> diff --git a/nim_uikit/res/drawable-hdpi/ic_chat_close.png b/nim_uikit/res/drawable-hdpi/ic_chat_close.png deleted file mode 100644 index ff104924b..000000000 Binary files a/nim_uikit/res/drawable-hdpi/ic_chat_close.png and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_actionbar_dark_back_icon.webp b/nim_uikit/res/drawable-hdpi/nim_actionbar_dark_back_icon.webp deleted file mode 100644 index 24514f1e3..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_actionbar_dark_back_icon.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_actionbar_dark_logo_icon.webp b/nim_uikit/res/drawable-hdpi/nim_actionbar_dark_logo_icon.webp deleted file mode 100644 index 10f6e56b0..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_actionbar_dark_logo_icon.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_actionbar_search_dark_icon.webp b/nim_uikit/res/drawable-hdpi/nim_actionbar_search_dark_icon.webp deleted file mode 100644 index d4029aca3..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_actionbar_search_dark_icon.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_actionbar_white_back_icon.webp b/nim_uikit/res/drawable-hdpi/nim_actionbar_white_back_icon.webp deleted file mode 100644 index 0793ae359..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_actionbar_white_back_icon.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_audio_animation_list_left_1.webp b/nim_uikit/res/drawable-hdpi/nim_audio_animation_list_left_1.webp deleted file mode 100644 index c4acedafc..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_audio_animation_list_left_1.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_audio_animation_list_left_2.webp b/nim_uikit/res/drawable-hdpi/nim_audio_animation_list_left_2.webp deleted file mode 100644 index f5d8bbd9d..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_audio_animation_list_left_2.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_audio_animation_list_left_3.webp b/nim_uikit/res/drawable-hdpi/nim_audio_animation_list_left_3.webp deleted file mode 100644 index 187b40e25..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_audio_animation_list_left_3.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_audio_animation_list_right_1.webp b/nim_uikit/res/drawable-hdpi/nim_audio_animation_list_right_1.webp deleted file mode 100644 index 6b151dbd5..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_audio_animation_list_right_1.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_audio_animation_list_right_2.webp b/nim_uikit/res/drawable-hdpi/nim_audio_animation_list_right_2.webp deleted file mode 100644 index a0770c8bd..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_audio_animation_list_right_2.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_audio_animation_list_right_3.webp b/nim_uikit/res/drawable-hdpi/nim_audio_animation_list_right_3.webp deleted file mode 100644 index 0612cef10..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_audio_animation_list_right_3.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_avatar_group.webp b/nim_uikit/res/drawable-hdpi/nim_avatar_group.webp deleted file mode 100644 index f1487e2b9..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_avatar_group.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_cameras.webp b/nim_uikit/res/drawable-hdpi/nim_cameras.webp deleted file mode 100644 index 1be819b96..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_cameras.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_cameras_hover.webp b/nim_uikit/res/drawable-hdpi/nim_cameras_hover.webp deleted file mode 100644 index 83d404fe0..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_cameras_hover.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_contact_checkbox_checked_green.webp b/nim_uikit/res/drawable-hdpi/nim_contact_checkbox_checked_green.webp deleted file mode 100644 index d7927c9d0..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_contact_checkbox_checked_green.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_contact_checkbox_unchecked.webp b/nim_uikit/res/drawable-hdpi/nim_contact_checkbox_unchecked.webp deleted file mode 100644 index 5d5efd562..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_contact_checkbox_unchecked.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_contact_select_dot_avatar.webp b/nim_uikit/res/drawable-hdpi/nim_contact_select_dot_avatar.webp deleted file mode 100644 index 359e23db1..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_contact_select_dot_avatar.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_g_ic_failed_small.webp b/nim_uikit/res/drawable-hdpi/nim_g_ic_failed_small.webp deleted file mode 100644 index 8f0f8c3d0..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_g_ic_failed_small.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_ic_menu_normal.webp b/nim_uikit/res/drawable-hdpi/nim_ic_menu_normal.webp deleted file mode 100644 index b4eba6f71..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_ic_menu_normal.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_ic_menu_pressed.webp b/nim_uikit/res/drawable-hdpi/nim_ic_menu_pressed.webp deleted file mode 100644 index 6d9b03393..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_ic_menu_pressed.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_ic_trans_fail.webp b/nim_uikit/res/drawable-hdpi/nim_ic_trans_fail.webp deleted file mode 100644 index f912735db..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_ic_trans_fail.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_icon_edit_delete.webp b/nim_uikit/res/drawable-hdpi/nim_icon_edit_delete.webp deleted file mode 100644 index 18af1e408..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_icon_edit_delete.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_image_default.webp b/nim_uikit/res/drawable-hdpi/nim_image_default.webp deleted file mode 100644 index 440fa0af9..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_image_default.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_message_input_keyboard_pressed.webp b/nim_uikit/res/drawable-hdpi/nim_message_input_keyboard_pressed.webp deleted file mode 100644 index 2a7f12362..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_message_input_keyboard_pressed.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_message_input_voice_normal.webp b/nim_uikit/res/drawable-hdpi/nim_message_input_voice_normal.webp deleted file mode 100644 index 60836547d..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_message_input_voice_normal.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_message_left_white_bg.9.png b/nim_uikit/res/drawable-hdpi/nim_message_left_white_bg.9.png deleted file mode 100644 index 93f1d2aab..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_message_left_white_bg.9.png and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_message_left_white_bg_pressed.9.png b/nim_uikit/res/drawable-hdpi/nim_message_left_white_bg_pressed.9.png deleted file mode 100644 index 487b5220c..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_message_left_white_bg_pressed.9.png and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_message_plus_photo_normal.webp b/nim_uikit/res/drawable-hdpi/nim_message_plus_photo_normal.webp deleted file mode 100644 index a1ab45507..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_message_plus_photo_normal.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_message_plus_photo_pressed.webp b/nim_uikit/res/drawable-hdpi/nim_message_plus_photo_pressed.webp deleted file mode 100644 index a1ab45507..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_message_plus_photo_pressed.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_message_right_blue_bg.9.png b/nim_uikit/res/drawable-hdpi/nim_message_right_blue_bg.9.png deleted file mode 100644 index 4ab1a305b..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_message_right_blue_bg.9.png and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_message_right_blue_bg_pressed.9.png b/nim_uikit/res/drawable-hdpi/nim_message_right_blue_bg_pressed.9.png deleted file mode 100644 index 727e3ed7d..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_message_right_blue_bg_pressed.9.png and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_moon_page_selected.webp b/nim_uikit/res/drawable-hdpi/nim_moon_page_selected.webp deleted file mode 100644 index f8dffad61..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_moon_page_selected.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_moon_page_unselected.webp b/nim_uikit/res/drawable-hdpi/nim_moon_page_unselected.webp deleted file mode 100644 index b767db3d8..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_moon_page_unselected.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_music_icon_play.webp b/nim_uikit/res/drawable-hdpi/nim_music_icon_play.webp deleted file mode 100644 index 2633e740d..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_music_icon_play.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_new_message_notify.webp b/nim_uikit/res/drawable-hdpi/nim_new_message_notify.webp deleted file mode 100644 index cb432edf7..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_new_message_notify.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_picker_image_normal.webp b/nim_uikit/res/drawable-hdpi/nim_picker_image_normal.webp deleted file mode 100644 index a7334980b..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_picker_image_normal.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_picker_image_selected.webp b/nim_uikit/res/drawable-hdpi/nim_picker_image_selected.webp deleted file mode 100644 index 2ed6ad871..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_picker_image_selected.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_picker_orignal_checked.webp b/nim_uikit/res/drawable-hdpi/nim_picker_orignal_checked.webp deleted file mode 100644 index 1d9545e17..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_picker_orignal_checked.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_picker_orignal_normal.webp b/nim_uikit/res/drawable-hdpi/nim_picker_orignal_normal.webp deleted file mode 100644 index dfb2a16cf..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_picker_orignal_normal.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_picker_preview_disable.webp b/nim_uikit/res/drawable-hdpi/nim_picker_preview_disable.webp deleted file mode 100644 index 9184e9d16..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_picker_preview_disable.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_picker_preview_normal.webp b/nim_uikit/res/drawable-hdpi/nim_picker_preview_normal.webp deleted file mode 100644 index 9b4c973c4..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_picker_preview_normal.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_picker_preview_pressed.webp b/nim_uikit/res/drawable-hdpi/nim_picker_preview_pressed.webp deleted file mode 100644 index c8be34da9..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_picker_preview_pressed.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_picker_preview_unselected.webp b/nim_uikit/res/drawable-hdpi/nim_picker_preview_unselected.webp deleted file mode 100644 index efef3181f..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_picker_preview_unselected.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_team_admin_icon.webp b/nim_uikit/res/drawable-hdpi/nim_team_admin_icon.webp deleted file mode 100644 index 6863f2a47..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_team_admin_icon.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_team_member_add_normal.webp b/nim_uikit/res/drawable-hdpi/nim_team_member_add_normal.webp deleted file mode 100644 index 46ab01e76..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_team_member_add_normal.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_team_member_add_pressed.webp b/nim_uikit/res/drawable-hdpi/nim_team_member_add_pressed.webp deleted file mode 100644 index 4c4c041cb..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_team_member_add_pressed.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_team_member_delete_normal.webp b/nim_uikit/res/drawable-hdpi/nim_team_member_delete_normal.webp deleted file mode 100644 index 98275b422..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_team_member_delete_normal.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_team_member_delete_pressed.webp b/nim_uikit/res/drawable-hdpi/nim_team_member_delete_pressed.webp deleted file mode 100644 index b3b4ef9f8..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_team_member_delete_pressed.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_team_owner_icon.webp b/nim_uikit/res/drawable-hdpi/nim_team_owner_icon.webp deleted file mode 100644 index 545792e4c..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_team_owner_icon.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_video_capture_start_btn.webp b/nim_uikit/res/drawable-hdpi/nim_video_capture_start_btn.webp deleted file mode 100644 index 7a5034760..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_video_capture_start_btn.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_video_capture_stop_btn.webp b/nim_uikit/res/drawable-hdpi/nim_video_capture_stop_btn.webp deleted file mode 100644 index 2fdb463d2..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_video_capture_stop_btn.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_video_play_icon.webp b/nim_uikit/res/drawable-hdpi/nim_video_play_icon.webp deleted file mode 100644 index 491e5da16..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_video_play_icon.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_video_play_icon_pressed.webp b/nim_uikit/res/drawable-hdpi/nim_video_play_icon_pressed.webp deleted file mode 100644 index 6595b859e..000000000 Binary files a/nim_uikit/res/drawable-hdpi/nim_video_play_icon_pressed.webp and /dev/null differ diff --git a/nim_uikit/res/drawable-hdpi/nim_admin_icon.webp b/nim_uikit/res/drawable-xhdpi/nim_admin_icon.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_admin_icon.webp rename to nim_uikit/res/drawable-xhdpi/nim_admin_icon.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_arrow_right.webp b/nim_uikit/res/drawable-xhdpi/nim_arrow_right.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_arrow_right.webp rename to nim_uikit/res/drawable-xhdpi/nim_arrow_right.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_avatar_default.webp b/nim_uikit/res/drawable-xhdpi/nim_avatar_default.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_avatar_default.webp rename to nim_uikit/res/drawable-xhdpi/nim_avatar_default.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_contact_checkbox_checked_grey.webp b/nim_uikit/res/drawable-xhdpi/nim_contact_checkbox_checked_grey.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_contact_checkbox_checked_grey.webp rename to nim_uikit/res/drawable-xhdpi/nim_contact_checkbox_checked_grey.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_contact_hit_letter_bg.webp b/nim_uikit/res/drawable-xhdpi/nim_contact_hit_letter_bg.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_contact_hit_letter_bg.webp rename to nim_uikit/res/drawable-xhdpi/nim_contact_hit_letter_bg.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_contact_letter_view_hit_point.webp b/nim_uikit/res/drawable-xhdpi/nim_contact_letter_view_hit_point.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_contact_letter_view_hit_point.webp rename to nim_uikit/res/drawable-xhdpi/nim_contact_letter_view_hit_point.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_default_img.webp b/nim_uikit/res/drawable-xhdpi/nim_default_img.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_default_img.webp rename to nim_uikit/res/drawable-xhdpi/nim_default_img.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_default_img_failed.webp b/nim_uikit/res/drawable-xhdpi/nim_default_img_failed.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_default_img_failed.webp rename to nim_uikit/res/drawable-xhdpi/nim_default_img_failed.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_dialog_toast_bg.webp b/nim_uikit/res/drawable-xhdpi/nim_dialog_toast_bg.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_dialog_toast_bg.webp rename to nim_uikit/res/drawable-xhdpi/nim_dialog_toast_bg.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_emoji_ck_bg.9.png b/nim_uikit/res/drawable-xhdpi/nim_emoji_ck_bg.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_emoji_ck_bg.9.png rename to nim_uikit/res/drawable-xhdpi/nim_emoji_ck_bg.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_emoji_del.webp b/nim_uikit/res/drawable-xhdpi/nim_emoji_del.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_emoji_del.webp rename to nim_uikit/res/drawable-xhdpi/nim_emoji_del.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_emoji_icon.webp b/nim_uikit/res/drawable-xhdpi/nim_emoji_icon.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_emoji_icon.webp rename to nim_uikit/res/drawable-xhdpi/nim_emoji_icon.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_emoji_icon_inactive.webp b/nim_uikit/res/drawable-xhdpi/nim_emoji_icon_inactive.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_emoji_icon_inactive.webp rename to nim_uikit/res/drawable-xhdpi/nim_emoji_icon_inactive.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_explosion_five.png b/nim_uikit/res/drawable-xhdpi/nim_explosion_five.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_explosion_five.png rename to nim_uikit/res/drawable-xhdpi/nim_explosion_five.png diff --git a/nim_uikit/res/drawable-hdpi/nim_explosion_four.png b/nim_uikit/res/drawable-xhdpi/nim_explosion_four.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_explosion_four.png rename to nim_uikit/res/drawable-xhdpi/nim_explosion_four.png diff --git a/nim_uikit/res/drawable-hdpi/nim_explosion_one.png b/nim_uikit/res/drawable-xhdpi/nim_explosion_one.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_explosion_one.png rename to nim_uikit/res/drawable-xhdpi/nim_explosion_one.png diff --git a/nim_uikit/res/drawable-hdpi/nim_explosion_three.png b/nim_uikit/res/drawable-xhdpi/nim_explosion_three.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_explosion_three.png rename to nim_uikit/res/drawable-xhdpi/nim_explosion_three.png diff --git a/nim_uikit/res/drawable-hdpi/nim_explosion_two.png b/nim_uikit/res/drawable-xhdpi/nim_explosion_two.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_explosion_two.png rename to nim_uikit/res/drawable-xhdpi/nim_explosion_two.png diff --git a/nim_uikit/res/drawable-hdpi/nim_g_download_progress_bar.9.png b/nim_uikit/res/drawable-xhdpi/nim_g_download_progress_bar.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_g_download_progress_bar.9.png rename to nim_uikit/res/drawable-xhdpi/nim_g_download_progress_bar.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_g_download_progress_bar_bg.9.png b/nim_uikit/res/drawable-xhdpi/nim_g_download_progress_bar_bg.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_g_download_progress_bar_bg.9.png rename to nim_uikit/res/drawable-xhdpi/nim_g_download_progress_bar_bg.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_g_unread_badge.9.png b/nim_uikit/res/drawable-xhdpi/nim_g_unread_badge.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_g_unread_badge.9.png rename to nim_uikit/res/drawable-xhdpi/nim_g_unread_badge.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_grey_delete_icon.webp b/nim_uikit/res/drawable-xhdpi/nim_grey_delete_icon.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_grey_delete_icon.webp rename to nim_uikit/res/drawable-xhdpi/nim_grey_delete_icon.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_ic_failed.webp b/nim_uikit/res/drawable-xhdpi/nim_ic_failed.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_ic_failed.webp rename to nim_uikit/res/drawable-xhdpi/nim_ic_failed.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_ic_message_actionbar_team.webp b/nim_uikit/res/drawable-xhdpi/nim_ic_message_actionbar_team.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_ic_message_actionbar_team.webp rename to nim_uikit/res/drawable-xhdpi/nim_ic_message_actionbar_team.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_icon_download_pause.webp b/nim_uikit/res/drawable-xhdpi/nim_icon_download_pause.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_icon_download_pause.webp rename to nim_uikit/res/drawable-xhdpi/nim_icon_download_pause.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_icon_download_resume.webp b/nim_uikit/res/drawable-xhdpi/nim_icon_download_resume.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_icon_download_resume.webp rename to nim_uikit/res/drawable-xhdpi/nim_icon_download_resume.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_icon_reddot.webp b/nim_uikit/res/drawable-xhdpi/nim_icon_reddot.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_icon_reddot.webp rename to nim_uikit/res/drawable-xhdpi/nim_icon_reddot.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_image_download_failed.webp b/nim_uikit/res/drawable-xhdpi/nim_image_download_failed.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_image_download_failed.webp rename to nim_uikit/res/drawable-xhdpi/nim_image_download_failed.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_loading_small_white.webp b/nim_uikit/res/drawable-xhdpi/nim_loading_small_white.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_loading_small_white.webp rename to nim_uikit/res/drawable-xhdpi/nim_loading_small_white.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_master_icon.webp b/nim_uikit/res/drawable-xhdpi/nim_master_icon.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_master_icon.webp rename to nim_uikit/res/drawable-xhdpi/nim_master_icon.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_message_activity_top_tip.9.png b/nim_uikit/res/drawable-xhdpi/nim_message_activity_top_tip.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_message_activity_top_tip.9.png rename to nim_uikit/res/drawable-xhdpi/nim_message_activity_top_tip.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_message_audio_playing_left_blue_bg.9.png b/nim_uikit/res/drawable-xhdpi/nim_message_audio_playing_left_blue_bg.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_message_audio_playing_left_blue_bg.9.png rename to nim_uikit/res/drawable-xhdpi/nim_message_audio_playing_left_blue_bg.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_message_audio_playing_right_blue_bg.9.png b/nim_uikit/res/drawable-xhdpi/nim_message_audio_playing_right_blue_bg.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_message_audio_playing_right_blue_bg.9.png rename to nim_uikit/res/drawable-xhdpi/nim_message_audio_playing_right_blue_bg.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_message_input_edittext_box.9.png b/nim_uikit/res/drawable-xhdpi/nim_message_input_edittext_box.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_message_input_edittext_box.9.png rename to nim_uikit/res/drawable-xhdpi/nim_message_input_edittext_box.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_message_input_edittext_box_pressed.9.png b/nim_uikit/res/drawable-xhdpi/nim_message_input_edittext_box_pressed.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_message_input_edittext_box_pressed.9.png rename to nim_uikit/res/drawable-xhdpi/nim_message_input_edittext_box_pressed.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_message_input_send_normal.9.png b/nim_uikit/res/drawable-xhdpi/nim_message_input_send_normal.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_message_input_send_normal.9.png rename to nim_uikit/res/drawable-xhdpi/nim_message_input_send_normal.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_message_input_send_pressed.9.png b/nim_uikit/res/drawable-xhdpi/nim_message_input_send_pressed.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_message_input_send_pressed.9.png rename to nim_uikit/res/drawable-xhdpi/nim_message_input_send_pressed.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_message_plus_location_normal.webp b/nim_uikit/res/drawable-xhdpi/nim_message_plus_location_normal.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_message_plus_location_normal.webp rename to nim_uikit/res/drawable-xhdpi/nim_message_plus_location_normal.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_message_plus_location_pressed.webp b/nim_uikit/res/drawable-xhdpi/nim_message_plus_location_pressed.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_message_plus_location_pressed.webp rename to nim_uikit/res/drawable-xhdpi/nim_message_plus_location_pressed.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_message_plus_video_normal.webp b/nim_uikit/res/drawable-xhdpi/nim_message_plus_video_normal.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_message_plus_video_normal.webp rename to nim_uikit/res/drawable-xhdpi/nim_message_plus_video_normal.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_message_plus_video_pressed.webp b/nim_uikit/res/drawable-xhdpi/nim_message_plus_video_pressed.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_message_plus_video_pressed.webp rename to nim_uikit/res/drawable-xhdpi/nim_message_plus_video_pressed.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_message_unread_news_icon_pressed.webp b/nim_uikit/res/drawable-xhdpi/nim_message_unread_news_icon_pressed.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_message_unread_news_icon_pressed.webp rename to nim_uikit/res/drawable-xhdpi/nim_message_unread_news_icon_pressed.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_messages_list_empty_bg.webp b/nim_uikit/res/drawable-xhdpi/nim_messages_list_empty_bg.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_messages_list_empty_bg.webp rename to nim_uikit/res/drawable-xhdpi/nim_messages_list_empty_bg.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_popup_menu_bg.9.png b/nim_uikit/res/drawable-xhdpi/nim_popup_menu_bg.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_popup_menu_bg.9.png rename to nim_uikit/res/drawable-xhdpi/nim_popup_menu_bg.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_recent_contact_ic_sending.webp b/nim_uikit/res/drawable-xhdpi/nim_recent_contact_ic_sending.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_recent_contact_ic_sending.webp rename to nim_uikit/res/drawable-xhdpi/nim_recent_contact_ic_sending.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_red_round_button.9.png b/nim_uikit/res/drawable-xhdpi/nim_red_round_button.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_red_round_button.9.png rename to nim_uikit/res/drawable-xhdpi/nim_red_round_button.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_red_round_button_pressed.9.png b/nim_uikit/res/drawable-xhdpi/nim_red_round_button_pressed.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_red_round_button_pressed.9.png rename to nim_uikit/res/drawable-xhdpi/nim_red_round_button_pressed.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_robot_link_view_bg.9.png b/nim_uikit/res/drawable-xhdpi/nim_robot_link_view_bg.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_robot_link_view_bg.9.png rename to nim_uikit/res/drawable-xhdpi/nim_robot_link_view_bg.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_robot_link_view_press_bg.9.png b/nim_uikit/res/drawable-xhdpi/nim_robot_link_view_press_bg.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_robot_link_view_press_bg.9.png rename to nim_uikit/res/drawable-xhdpi/nim_robot_link_view_press_bg.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_sample_footer_loading.webp b/nim_uikit/res/drawable-xhdpi/nim_sample_footer_loading.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_sample_footer_loading.webp rename to nim_uikit/res/drawable-xhdpi/nim_sample_footer_loading.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_scrollbar_handle_holo_dark.9.png b/nim_uikit/res/drawable-xhdpi/nim_scrollbar_handle_holo_dark.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_scrollbar_handle_holo_dark.9.png rename to nim_uikit/res/drawable-xhdpi/nim_scrollbar_handle_holo_dark.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_slide_toggle.webp b/nim_uikit/res/drawable-xhdpi/nim_slide_toggle.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_slide_toggle.webp rename to nim_uikit/res/drawable-xhdpi/nim_slide_toggle.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_slide_toggle_off.webp b/nim_uikit/res/drawable-xhdpi/nim_slide_toggle_off.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_slide_toggle_off.webp rename to nim_uikit/res/drawable-xhdpi/nim_slide_toggle_off.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_slide_toggle_on.webp b/nim_uikit/res/drawable-xhdpi/nim_slide_toggle_on.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_slide_toggle_on.webp rename to nim_uikit/res/drawable-xhdpi/nim_slide_toggle_on.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_team_create_btn.9.png b/nim_uikit/res/drawable-xhdpi/nim_team_create_btn.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_team_create_btn.9.png rename to nim_uikit/res/drawable-xhdpi/nim_team_create_btn.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_team_create_btn_pressed.9.png b/nim_uikit/res/drawable-xhdpi/nim_team_create_btn_pressed.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_team_create_btn_pressed.9.png rename to nim_uikit/res/drawable-xhdpi/nim_team_create_btn_pressed.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_team_member_item_delete_icon.webp b/nim_uikit/res/drawable-xhdpi/nim_team_member_item_delete_icon.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_team_member_item_delete_icon.webp rename to nim_uikit/res/drawable-xhdpi/nim_team_member_item_delete_icon.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_unsupport_mime_type.webp b/nim_uikit/res/drawable-xhdpi/nim_unsupport_mime_type.webp similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_unsupport_mime_type.webp rename to nim_uikit/res/drawable-xhdpi/nim_unsupport_mime_type.webp diff --git a/nim_uikit/res/drawable-hdpi/nim_watch_video_download_progress_background.9.png b/nim_uikit/res/drawable-xhdpi/nim_watch_video_download_progress_background.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_watch_video_download_progress_background.9.png rename to nim_uikit/res/drawable-xhdpi/nim_watch_video_download_progress_background.9.png diff --git a/nim_uikit/res/drawable-hdpi/nim_watch_video_download_progress_foreground.9.png b/nim_uikit/res/drawable-xhdpi/nim_watch_video_download_progress_foreground.9.png similarity index 100% rename from nim_uikit/res/drawable-hdpi/nim_watch_video_download_progress_foreground.9.png rename to nim_uikit/res/drawable-xhdpi/nim_watch_video_download_progress_foreground.9.png diff --git a/nim_uikit/res/drawable/bg_message_voice.xml b/nim_uikit/res/drawable/bg_message_voice.xml new file mode 100644 index 000000000..5040d8388 --- /dev/null +++ b/nim_uikit/res/drawable/bg_message_voice.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/nim_uikit/res/drawable/bg_message_pressed.xml b/nim_uikit/res/drawable/bg_message_voice_pressed.xml similarity index 80% rename from nim_uikit/res/drawable/bg_message_pressed.xml rename to nim_uikit/res/drawable/bg_message_voice_pressed.xml index 7e37d6274..352cd26ad 100644 --- a/nim_uikit/res/drawable/bg_message_pressed.xml +++ b/nim_uikit/res/drawable/bg_message_voice_pressed.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nim_uikit/res/layout/nim_message_activity_text_layout.xml b/nim_uikit/res/layout/nim_message_activity_text_layout.xml index ecf09fc82..0eab72541 100644 --- a/nim_uikit/res/layout/nim_message_activity_text_layout.xml +++ b/nim_uikit/res/layout/nim_message_activity_text_layout.xml @@ -42,15 +42,14 @@ android:layout_toStartOf="@+id/emoji_button" android:layout_toEndOf="@+id/switchLayout"> -