diff --git a/app/src/main/assets/svga/room_menu_gift.svga b/app/src/main/assets/svga/room_menu_gift.svga new file mode 100644 index 000000000..513380f46 Binary files /dev/null and b/app/src/main/assets/svga/room_menu_gift.svga differ diff --git a/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java b/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java index 67afad247..59a80a9bb 100644 --- a/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/BottomView.java @@ -155,9 +155,9 @@ public class BottomView extends LinearLayout implements View.OnClickListener { int newOption = (int) SharedPreferenceUtils.get(SH_NEW_OPTION, 0); if (newOption == NEW_OPTION) { - sendMagic.setImageResource(R.drawable.icon_send_magic); + sendMagic.setImageResource(R.drawable.room_menu_ic_more); } else { - sendMagic.setImageResource(R.drawable.icon_send_magic); + sendMagic.setImageResource(R.drawable.room_menu_ic_more); } sendMagic.setClickable(true); sendMagic.setOnClickListener(this); @@ -178,11 +178,11 @@ public class BottomView extends LinearLayout implements View.OnClickListener { @Subscribe(threadMode = ThreadMode.MAIN) public void onFirstRechargeEvent(FirstChargeEvent event) { - sendGift.setImageResource(R.drawable.icon_room_send_gift); +// sendGift.setImageResource(R.drawable.icon_room_send_gift); } public void setRoomMessageUnread(int count) { - iconRoomMsg.setImageResource(count > 0 ? R.drawable.icon_room_send_msg_point : R.drawable.icon_room_send_msg); + iconRoomMsg.setImageResource(count > 0 ? R.drawable.room_menu_ic_message_new : R.drawable.room_menu_ic_message); } public void setBottomViewListener(BottomViewListenerWrapper wrapper) { @@ -201,17 +201,17 @@ public class BottomView extends LinearLayout implements View.OnClickListener { public void setMicBtnOpen(boolean isOpen) { if (isOpen) { - openMic.setImageResource(R.drawable.icon_room_open_mic); + openMic.setImageResource(R.drawable.room_menu_ic_mic_open); } else { - openMic.setImageResource(R.drawable.icon_room_close_mic); + openMic.setImageResource(R.drawable.room_menu_ic_mic_close); } } public void setRemoteMuteOpen(boolean isOpen) { if (isOpen) { - remoteMute.setImageResource(R.drawable.icon_remote_mute_close); + remoteMute.setImageResource(R.drawable.room_menu_ic_vocality_open); } else { - remoteMute.setImageResource(R.drawable.icon_remote_mute_open); + remoteMute.setImageResource(R.drawable.room_menu_ic_vocality_close); } } @@ -254,8 +254,8 @@ public class BottomView extends LinearLayout implements View.OnClickListener { } public void setQueuingMicButtonBackground(boolean isEmpty) { - iconMicQueue.setImageResource(isEmpty ? R.drawable.icon_room_mic_queue : - R.drawable.icon_room_mic_queue_not_empty); + iconMicQueue.setImageResource(isEmpty ? R.drawable.room_menu_ic_mic_queue : + R.drawable.room_menu_ic_mic_queue_new); } diff --git a/app/src/main/res/drawable-ar-xhdpi/icon_room_mic_queue.png b/app/src/main/res/drawable-ar-xhdpi/icon_room_mic_queue.png deleted file mode 100644 index 33c317c25..000000000 Binary files a/app/src/main/res/drawable-ar-xhdpi/icon_room_mic_queue.png and /dev/null differ diff --git a/app/src/main/res/drawable-ar-xhdpi/icon_room_mic_queue_not_empty.png b/app/src/main/res/drawable-ar-xhdpi/icon_room_mic_queue_not_empty.png deleted file mode 100644 index b3a8da64b..000000000 Binary files a/app/src/main/res/drawable-ar-xhdpi/icon_room_mic_queue_not_empty.png and /dev/null differ diff --git a/app/src/main/res/drawable-en-xhdpi/icon_room_mic_queue.png b/app/src/main/res/drawable-en-xhdpi/icon_room_mic_queue.png deleted file mode 100644 index c555129c6..000000000 Binary files a/app/src/main/res/drawable-en-xhdpi/icon_room_mic_queue.png and /dev/null differ diff --git a/app/src/main/res/drawable-en-xhdpi/icon_room_mic_queue_not_empty.png b/app/src/main/res/drawable-en-xhdpi/icon_room_mic_queue_not_empty.png deleted file mode 100644 index e5fb0e10d..000000000 Binary files a/app/src/main/res/drawable-en-xhdpi/icon_room_mic_queue_not_empty.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/bg_say_something.webp b/app/src/main/res/drawable-xhdpi/bg_say_something.webp deleted file mode 100644 index 16e1bae01..000000000 Binary files a/app/src/main/res/drawable-xhdpi/bg_say_something.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_face_btn.webp b/app/src/main/res/drawable-xhdpi/icon_face_btn.webp deleted file mode 100644 index 728221387..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_face_btn.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_remote_mute_close.webp b/app/src/main/res/drawable-xhdpi/icon_remote_mute_close.webp deleted file mode 100644 index cb78b9cec..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_remote_mute_close.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_remote_mute_open.webp b/app/src/main/res/drawable-xhdpi/icon_remote_mute_open.webp deleted file mode 100644 index 4c53f8f34..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_remote_mute_open.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_room_close_mic.webp b/app/src/main/res/drawable-xhdpi/icon_room_close_mic.webp deleted file mode 100644 index 261045136..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_room_close_mic.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_room_mic_queue.webp b/app/src/main/res/drawable-xhdpi/icon_room_mic_queue.webp deleted file mode 100644 index 1b9dbe0ea..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_room_mic_queue.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_room_mic_queue_not_empty.webp b/app/src/main/res/drawable-xhdpi/icon_room_mic_queue_not_empty.webp deleted file mode 100644 index 24c70d8b4..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_room_mic_queue_not_empty.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_room_open_mic.webp b/app/src/main/res/drawable-xhdpi/icon_room_open_mic.webp deleted file mode 100644 index 3e33dbf2d..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_room_open_mic.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_room_send_gift.webp b/app/src/main/res/drawable-xhdpi/icon_room_send_gift.webp deleted file mode 100644 index 9dc5b8105..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_room_send_gift.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_room_send_msg.webp b/app/src/main/res/drawable-xhdpi/icon_room_send_msg.webp deleted file mode 100644 index ce50e2d8f..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_room_send_msg.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_room_send_msg_point.webp b/app/src/main/res/drawable-xhdpi/icon_room_send_msg_point.webp deleted file mode 100644 index 868f7ad52..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_room_send_msg_point.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_send_magic.webp b/app/src/main/res/drawable-xhdpi/icon_send_magic.webp deleted file mode 100644 index 8017e793f..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_send_magic.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_send_magic_new.webp b/app/src/main/res/drawable-xhdpi/icon_send_magic_new.webp deleted file mode 100644 index 54b99850c..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_send_magic_new.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/room_bottom_ic_game.png b/app/src/main/res/drawable-xxhdpi/room_bottom_ic_game.png deleted file mode 100644 index a17b46cee..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/room_bottom_ic_game.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/room_menu_ic_emoji.png b/app/src/main/res/drawable-xxhdpi/room_menu_ic_emoji.png new file mode 100644 index 000000000..e8c8313aa Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/room_menu_ic_emoji.png differ diff --git a/app/src/main/res/drawable-xxhdpi/room_menu_ic_message.png b/app/src/main/res/drawable-xxhdpi/room_menu_ic_message.png new file mode 100644 index 000000000..639df9ae8 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/room_menu_ic_message.png differ diff --git a/app/src/main/res/drawable-xxhdpi/room_menu_ic_message_new.png b/app/src/main/res/drawable-xxhdpi/room_menu_ic_message_new.png new file mode 100644 index 000000000..a0ea0813a Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/room_menu_ic_message_new.png differ diff --git a/app/src/main/res/drawable-xxhdpi/room_menu_ic_mic_close.png b/app/src/main/res/drawable-xxhdpi/room_menu_ic_mic_close.png new file mode 100644 index 000000000..c82a64bae Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/room_menu_ic_mic_close.png differ diff --git a/app/src/main/res/drawable-xxhdpi/room_menu_ic_mic_open.png b/app/src/main/res/drawable-xxhdpi/room_menu_ic_mic_open.png new file mode 100644 index 000000000..b68e80827 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/room_menu_ic_mic_open.png differ diff --git a/app/src/main/res/drawable-xxhdpi/room_menu_ic_mic_queue.png b/app/src/main/res/drawable-xxhdpi/room_menu_ic_mic_queue.png new file mode 100644 index 000000000..877798c09 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/room_menu_ic_mic_queue.png differ diff --git a/app/src/main/res/drawable-xxhdpi/room_menu_ic_mic_queue_new.png b/app/src/main/res/drawable-xxhdpi/room_menu_ic_mic_queue_new.png new file mode 100644 index 000000000..730b8e4db Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/room_menu_ic_mic_queue_new.png differ diff --git a/app/src/main/res/drawable-xxhdpi/room_menu_ic_more.png b/app/src/main/res/drawable-xxhdpi/room_menu_ic_more.png new file mode 100644 index 000000000..67fba3735 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/room_menu_ic_more.png differ diff --git a/app/src/main/res/drawable-xxhdpi/room_menu_ic_playlist.png b/app/src/main/res/drawable-xxhdpi/room_menu_ic_playlist.png new file mode 100644 index 000000000..6a213ca16 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/room_menu_ic_playlist.png differ diff --git a/app/src/main/res/drawable-xxhdpi/room_menu_ic_vocality_close.png b/app/src/main/res/drawable-xxhdpi/room_menu_ic_vocality_close.png new file mode 100644 index 000000000..d204e6c03 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/room_menu_ic_vocality_close.png differ diff --git a/app/src/main/res/drawable-xxhdpi/room_menu_ic_vocality_open.png b/app/src/main/res/drawable-xxhdpi/room_menu_ic_vocality_open.png new file mode 100644 index 000000000..f6b38e741 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/room_menu_ic_vocality_open.png differ diff --git a/app/src/main/res/drawable/bg_room_bottom.xml b/app/src/main/res/drawable/bg_room_bottom.xml index aecc24eca..8b807d66d 100644 --- a/app/src/main/res/drawable/bg_room_bottom.xml +++ b/app/src/main/res/drawable/bg_room_bottom.xml @@ -2,11 +2,11 @@ - + + android:topLeftRadius="@dimen/dp_23" + android:topRightRadius="@dimen/dp_23" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_190b032d_14dp.xml b/app/src/main/res/drawable/shape_190b032d_14dp.xml new file mode 100644 index 000000000..04d034393 --- /dev/null +++ b/app/src/main/res/drawable/shape_190b032d_14dp.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_bottom_view.xml b/app/src/main/res/layout/layout_bottom_view.xml index f8f94d3d7..d6ff11326 100644 --- a/app/src/main/res/layout/layout_bottom_view.xml +++ b/app/src/main/res/layout/layout_bottom_view.xml @@ -1,144 +1,150 @@ - + android:layout_height="@dimen/dp_61" + android:background="@drawable/bg_room_bottom"> - + - - - - - + android:overScrollMode="never" + android:scrollbars="none" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@id/icon_room_send_gift" + app:layout_constraintHorizontal_bias="0" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintWidth_default="wrap"> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + + + + + + + + + + + + + + - - - + android:src="@drawable/room_menu_ic_mic_queue" /> - - - - + android:src="@drawable/room_menu_ic_message" /> + android:src="@drawable/room_menu_ic_more" /> + + - + - + - - - - - - - - - - - + +