From 4223f0bc5d590ac8a0cf9f8d67084e13b0488cd8 Mon Sep 17 00:00:00 2001 From: klaus Date: Tue, 16 Jan 2024 21:34:48 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20-=20=ED=9B=84?= =?UTF-8?q?=EC=9B=90,=20=EC=9E=85=EC=9E=A5,=20=EB=A3=B0=EB=A0=9B=20?= =?UTF-8?q?=EA=B2=B0=EA=B3=BC=20=EC=B1=84=ED=8C=85=20=EB=B0=B0=EA=B2=BD?= =?UTF-8?q?=EC=83=89=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/live/room/chat/LiveRoomChat.kt | 16 ++++++++-------- ...2a6c.xml => bg_round_corner_4_7_cc004462.xml} | 4 ++-- ...8f7d.xml => bg_round_corner_6_7_cc2d7390.xml} | 4 ++-- ...5264.xml => bg_round_corner_6_7_cc4d6aa4.xml} | 4 ++-- ...7390.xml => bg_round_corner_6_7_cc548f7d.xml} | 4 ++-- ...6aa4.xml => bg_round_corner_6_7_cc59548f.xml} | 4 ++-- .../drawable/bg_round_corner_6_7_ccc25264.xml | 8 ++++++++ .../drawable/bg_round_corner_6_7_ccd38c38.xml | 8 ++++++++ .../drawable/bg_round_corner_6_7_ccd85e37.xml | 8 ++++++++ .../drawable/bg_round_corner_6_7_e659548f.xml | 8 -------- .../drawable/bg_round_corner_6_7_e6d38c38.xml | 8 -------- .../drawable/bg_round_corner_6_7_e6d85e37.xml | 8 -------- .../main/res/layout/item_live_room_join_chat.xml | 2 +- app/src/main/res/values/colors.xml | 15 ++++++++------- 14 files changed, 51 insertions(+), 50 deletions(-) rename app/src/main/res/drawable/{bg_round_corner_4_7_3d2a6c.xml => bg_round_corner_4_7_cc004462.xml} (65%) rename app/src/main/res/drawable/{bg_round_corner_6_7_e6548f7d.xml => bg_round_corner_6_7_cc2d7390.xml} (65%) rename app/src/main/res/drawable/{bg_round_corner_6_7_c25264.xml => bg_round_corner_6_7_cc4d6aa4.xml} (65%) rename app/src/main/res/drawable/{bg_round_corner_6_7_e62d7390.xml => bg_round_corner_6_7_cc548f7d.xml} (65%) rename app/src/main/res/drawable/{bg_round_corner_6_7_e64d6aa4.xml => bg_round_corner_6_7_cc59548f.xml} (65%) create mode 100644 app/src/main/res/drawable/bg_round_corner_6_7_ccc25264.xml create mode 100644 app/src/main/res/drawable/bg_round_corner_6_7_ccd38c38.xml create mode 100644 app/src/main/res/drawable/bg_round_corner_6_7_ccd85e37.xml delete mode 100644 app/src/main/res/drawable/bg_round_corner_6_7_e659548f.xml delete mode 100644 app/src/main/res/drawable/bg_round_corner_6_7_e6d38c38.xml delete mode 100644 app/src/main/res/drawable/bg_round_corner_6_7_e6d85e37.xml diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt index f6f9340..b6d01e4 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/chat/LiveRoomChat.kt @@ -302,31 +302,31 @@ data class LiveRoomDonationChat( itemBinding.root.setBackgroundResource( when { can >= 10000 -> { - R.drawable.bg_round_corner_6_7_c25264 + R.drawable.bg_round_corner_6_7_ccc25264 } can >= 5000 -> { - R.drawable.bg_round_corner_6_7_e6d85e37 + R.drawable.bg_round_corner_6_7_ccd85e37 } can >= 1000 -> { - R.drawable.bg_round_corner_6_7_e6d38c38 + R.drawable.bg_round_corner_6_7_ccd38c38 } can >= 500 -> { - R.drawable.bg_round_corner_6_7_e659548f + R.drawable.bg_round_corner_6_7_cc59548f } can >= 100 -> { - R.drawable.bg_round_corner_6_7_e64d6aa4 + R.drawable.bg_round_corner_6_7_cc4d6aa4 } can >= 50 -> { - R.drawable.bg_round_corner_6_7_e62d7390 + R.drawable.bg_round_corner_6_7_cc2d7390 } else -> { - R.drawable.bg_round_corner_6_7_e6548f7d + R.drawable.bg_round_corner_6_7_cc548f7d } } ) @@ -383,7 +383,7 @@ data class LiveRoomRouletteDonationChat( itemBinding.llMessageBg.setPadding(0) itemBinding.llMessageBg.background = null - itemBinding.root.setBackgroundResource(R.drawable.bg_round_corner_6_7_c25264) + itemBinding.root.setBackgroundResource(R.drawable.bg_round_corner_6_7_ccc25264) itemBinding.root.setPadding(33) } } diff --git a/app/src/main/res/drawable/bg_round_corner_4_7_3d2a6c.xml b/app/src/main/res/drawable/bg_round_corner_4_7_cc004462.xml similarity index 65% rename from app/src/main/res/drawable/bg_round_corner_4_7_3d2a6c.xml rename to app/src/main/res/drawable/bg_round_corner_4_7_cc004462.xml index 5331f73..fb1c98e 100644 --- a/app/src/main/res/drawable/bg_round_corner_4_7_3d2a6c.xml +++ b/app/src/main/res/drawable/bg_round_corner_4_7_cc004462.xml @@ -1,8 +1,8 @@ - + + android:color="@color/color_cc004462" /> diff --git a/app/src/main/res/drawable/bg_round_corner_6_7_e6548f7d.xml b/app/src/main/res/drawable/bg_round_corner_6_7_cc2d7390.xml similarity index 65% rename from app/src/main/res/drawable/bg_round_corner_6_7_e6548f7d.xml rename to app/src/main/res/drawable/bg_round_corner_6_7_cc2d7390.xml index e5a67df..408a779 100644 --- a/app/src/main/res/drawable/bg_round_corner_6_7_e6548f7d.xml +++ b/app/src/main/res/drawable/bg_round_corner_6_7_cc2d7390.xml @@ -1,8 +1,8 @@ - + + android:color="@color/color_cc2d7390" /> diff --git a/app/src/main/res/drawable/bg_round_corner_6_7_c25264.xml b/app/src/main/res/drawable/bg_round_corner_6_7_cc4d6aa4.xml similarity index 65% rename from app/src/main/res/drawable/bg_round_corner_6_7_c25264.xml rename to app/src/main/res/drawable/bg_round_corner_6_7_cc4d6aa4.xml index 0c6c674..8ff13c6 100644 --- a/app/src/main/res/drawable/bg_round_corner_6_7_c25264.xml +++ b/app/src/main/res/drawable/bg_round_corner_6_7_cc4d6aa4.xml @@ -1,8 +1,8 @@ - + + android:color="@color/color_cc4d6aa4" /> diff --git a/app/src/main/res/drawable/bg_round_corner_6_7_e62d7390.xml b/app/src/main/res/drawable/bg_round_corner_6_7_cc548f7d.xml similarity index 65% rename from app/src/main/res/drawable/bg_round_corner_6_7_e62d7390.xml rename to app/src/main/res/drawable/bg_round_corner_6_7_cc548f7d.xml index bd801e8..dc87d5a 100644 --- a/app/src/main/res/drawable/bg_round_corner_6_7_e62d7390.xml +++ b/app/src/main/res/drawable/bg_round_corner_6_7_cc548f7d.xml @@ -1,8 +1,8 @@ - + + android:color="@color/color_cc548f7d" /> diff --git a/app/src/main/res/drawable/bg_round_corner_6_7_e64d6aa4.xml b/app/src/main/res/drawable/bg_round_corner_6_7_cc59548f.xml similarity index 65% rename from app/src/main/res/drawable/bg_round_corner_6_7_e64d6aa4.xml rename to app/src/main/res/drawable/bg_round_corner_6_7_cc59548f.xml index c8dc3b5..bc90c48 100644 --- a/app/src/main/res/drawable/bg_round_corner_6_7_e64d6aa4.xml +++ b/app/src/main/res/drawable/bg_round_corner_6_7_cc59548f.xml @@ -1,8 +1,8 @@ - + + android:color="@color/color_cc59548f" /> diff --git a/app/src/main/res/drawable/bg_round_corner_6_7_ccc25264.xml b/app/src/main/res/drawable/bg_round_corner_6_7_ccc25264.xml new file mode 100644 index 0000000..445426d --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_6_7_ccc25264.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_round_corner_6_7_ccd38c38.xml b/app/src/main/res/drawable/bg_round_corner_6_7_ccd38c38.xml new file mode 100644 index 0000000..044fa45 --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_6_7_ccd38c38.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_round_corner_6_7_ccd85e37.xml b/app/src/main/res/drawable/bg_round_corner_6_7_ccd85e37.xml new file mode 100644 index 0000000..25e3cc5 --- /dev/null +++ b/app/src/main/res/drawable/bg_round_corner_6_7_ccd85e37.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/drawable/bg_round_corner_6_7_e659548f.xml b/app/src/main/res/drawable/bg_round_corner_6_7_e659548f.xml deleted file mode 100644 index 2a8089c..0000000 --- a/app/src/main/res/drawable/bg_round_corner_6_7_e659548f.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/bg_round_corner_6_7_e6d38c38.xml b/app/src/main/res/drawable/bg_round_corner_6_7_e6d38c38.xml deleted file mode 100644 index a7fe57d..0000000 --- a/app/src/main/res/drawable/bg_round_corner_6_7_e6d38c38.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/bg_round_corner_6_7_e6d85e37.xml b/app/src/main/res/drawable/bg_round_corner_6_7_e6d85e37.xml deleted file mode 100644 index fc00014..0000000 --- a/app/src/main/res/drawable/bg_round_corner_6_7_e6d85e37.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout/item_live_room_join_chat.xml b/app/src/main/res/layout/item_live_room_join_chat.xml index a5f52b7..758a950 100644 --- a/app/src/main/res/layout/item_live_room_join_chat.xml +++ b/app/src/main/res/layout/item_live_room_join_chat.xml @@ -2,7 +2,7 @@ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index fa41a56..cb8ec3e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -34,7 +34,7 @@ #3D2A6C #FFDC00 #4999E3 - #C25264 + #CCC25264 #B3909090 #88909090 @@ -46,12 +46,12 @@ #99525252 #CC555555 #999970ff - #E6548F7D - #E62D7390 - #E64D6AA4 - #E659548F - #E6D38C38 - #E6D85E37 + #CC548F7D + #CC2D7390 + #CC4D6AA4 + #CC59548F + #CCD38C38 + #CCD85E37 #33FFFFFF #303030 #555555 @@ -107,4 +107,5 @@ #003851 #553bb9f1 #EA3A25 + #CC004462