From dc2cda58b2ed05ac53207f3d3eb423cd559e0b38 Mon Sep 17 00:00:00 2001
From: klaus <klaus@vividnext.co.kr>
Date: Tue, 29 Oct 2024 13:54:36 +0900
Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20-=20=EC=9A=B0?=
 =?UTF-8?q?=EC=B8=A1=20=ED=95=98=EB=8B=A8=20=EC=98=B5=EC=85=98=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=EC=88=9C=EC=84=9C=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/LiveRoomActivity.kt    | 16 ++-----
 .../main/res/layout/activity_live_room.xml    | 46 +++++++++----------
 2 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt
index 891bd89..1671fa4 100644
--- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt
+++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt
@@ -173,7 +173,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
 
     private var isShowSignatureImage = false
     private var isAvailableLikeHeart = false
-    private var originalButtonPosition: IntArray? = null
+    private var buttonPosition = IntArray(2)
 
     private val countDownTimer = object : CountDownTimer(remainingNoChattingTime * 1000, 1000) {
         override fun onTick(millisUntilFinished: Long) {
@@ -561,8 +561,8 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
                 } else {
                     binding.flLikeHeart
                 }
-                originalButtonPosition = IntArray(2)
-                button.getLocationInWindow(originalButtonPosition)
+                buttonPosition = IntArray(2)
+                button.getLocationInWindow(buttonPosition)
             },
             500
         )
@@ -578,12 +578,6 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
         } else {
             binding.flLikeHeart
         }
-        var buttonPosition = originalButtonPosition
-
-        if (buttonPosition == null) {
-            buttonPosition = IntArray(2)
-            button.getLocationInWindow(buttonPosition)
-        }
 
         // 하트 이미지뷰 생성
         val heart = ImageView(this).apply {
@@ -1219,7 +1213,6 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
     }
 
     private fun activatingRouletteButton(isActiveRoulette: Boolean) {
-        hideKeyboard { setHeartButtonPosition() }
         handler.postDelayed(
             {
                 if (!isHost && isActiveRoulette) {
@@ -1394,7 +1387,6 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
             binding.ivNotiMicrophoneMute.visibility = View.GONE
             speakerListAdapter.muteSpeakers.remove(SharedPreferenceManager.userId.toInt())
         }, 100)
-        hideKeyboard { setHeartButtonPosition() }
     }
 
     private fun setBroadcaster() {
@@ -1406,7 +1398,6 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
             binding.flMicrophoneMute.visibility = View.VISIBLE
             binding.ivNotiMicrophoneMute.visibility = View.GONE
         }, 100)
-        hideKeyboard { setHeartButtonPosition() }
     }
 
     private fun changeListenerMessage(peerId: Long, isFromManager: Boolean = false) {
@@ -1868,6 +1859,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
                 if (containNoChatRoom()) {
                     startNoChatting()
                 }
+                setHeartButtonPosition()
             },
             rtmChannelJoinFail = {
                 agoraConnectFail()
diff --git a/app/src/main/res/layout/activity_live_room.xml b/app/src/main/res/layout/activity_live_room.xml
index ea82b87..827321c 100644
--- a/app/src/main/res/layout/activity_live_room.xml
+++ b/app/src/main/res/layout/activity_live_room.xml
@@ -583,7 +583,7 @@
             </FrameLayout>
 
             <FrameLayout
-                android:id="@+id/fl_like_heart"
+                android:id="@+id/fl_microphone_mute"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="13.3dp"
@@ -592,12 +592,29 @@
                 android:visibility="gone">
 
                 <ImageView
-                    android:id="@+id/iv_like_heart"
+                    android:id="@+id/iv_microphone_mute"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_gravity="center"
                     android:contentDescription="@null"
-                    android:src="@drawable/ic_heart_pink" />
+                    android:src="@drawable/ic_mic_on" />
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/fl_donation_message_list"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="13.3dp"
+                android:background="@drawable/bg_round_corner_10_99525252"
+                android:padding="10dp">
+
+                <ImageView
+                    android:id="@+id/iv_donation_message_list"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_gravity="center"
+                    android:contentDescription="@null"
+                    android:src="@drawable/ic_donation_message_list" />
             </FrameLayout>
 
             <FrameLayout
@@ -634,23 +651,6 @@
                     android:src="@drawable/ic_roulette_settings" />
             </FrameLayout>
 
-            <FrameLayout
-                android:id="@+id/fl_donation_message_list"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="13.3dp"
-                android:background="@drawable/bg_round_corner_10_99525252"
-                android:padding="10dp">
-
-                <ImageView
-                    android:id="@+id/iv_donation_message_list"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_gravity="center"
-                    android:contentDescription="@null"
-                    android:src="@drawable/ic_donation_message_list" />
-            </FrameLayout>
-
             <FrameLayout
                 android:id="@+id/fl_donation"
                 android:layout_width="wrap_content"
@@ -669,7 +669,7 @@
             </FrameLayout>
 
             <FrameLayout
-                android:id="@+id/fl_microphone_mute"
+                android:id="@+id/fl_like_heart"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="13.3dp"
@@ -678,12 +678,12 @@
                 android:visibility="gone">
 
                 <ImageView
-                    android:id="@+id/iv_microphone_mute"
+                    android:id="@+id/iv_like_heart"
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_gravity="center"
                     android:contentDescription="@null"
-                    android:src="@drawable/ic_mic_on" />
+                    android:src="@drawable/ic_heart_pink" />
             </FrameLayout>
         </LinearLayout>