From 5a37ba8be02264cbb4ff61123e89226158ba5a61 Mon Sep 17 00:00:00 2001 From: klaus Date: Wed, 30 Oct 2024 15:21:59 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=EB=B0=A9=20-=20?= =?UTF-8?q?=EB=A3=B0=EB=A0=9B=EC=84=A4=EC=A0=95,=20=EB=A3=B0=EB=A0=9B,=20?= =?UTF-8?q?=ED=9B=84=EC=9B=90=20=EB=B2=84=ED=8A=BC=20=ED=84=B0=EC=B9=98?= =?UTF-8?q?=EC=8B=9C=20=ED=82=A4=EB=B3=B4=EB=93=9C=EA=B0=80=20=EB=82=B4?= =?UTF-8?q?=EB=A0=A4=EA=B0=80=EB=8F=84=EB=A1=9D=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +- .../sodalive/live/room/LiveRoomActivity.kt | 112 ++++++++++-------- 2 files changed, 62 insertions(+), 54 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e8e0b4d..c6a6ad7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,8 +35,8 @@ android { applicationId "kr.co.vividnext.sodalive" minSdk 23 targetSdk 34 - versionCode 120 - versionName "1.22.2" + versionCode 122 + versionName "1.22.3" } buildTypes { 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 1671fa4..176c632 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 @@ -509,19 +509,21 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB } binding.ivSend.setOnClickListener { inputChat() } binding.flDonation.setOnClickListener { - val dialog = LiveRoomDonationDialog( - this, - LayoutInflater.from(this), - isLiveDonation = true - ) { can, message, isSecret -> - if (can > 0) { - donation(can, message, isSecret) - } else { - showToast("1캔 이상 후원하실 수 있습니다.") + hideKeyboard { + val dialog = LiveRoomDonationDialog( + this, + LayoutInflater.from(this), + isLiveDonation = true + ) { can, message, isSecret -> + if (can > 0) { + donation(can, message, isSecret) + } else { + showToast("1캔 이상 후원하실 수 있습니다.") + } } - } - dialog.show(screenWidth) + dialog.show(screenWidth) + } } binding.tvNotification.setOnClickListener { viewModel.toggleShowNotice() } binding.tvMenuPan.setOnClickListener { viewModel.toggleShowMenuPan() } @@ -892,34 +894,36 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB } binding.flDonationMessageList.setOnClickListener { - LiveRoomDonationMessageDialog( - layoutInflater = LayoutInflater.from(this), - creatorId = response.creatorId, - activity = this, - donationMessageListLiveData = donationMessageViewModel - .donationMessageListLiveData, - donationMessageCountLiveData = donationMessageViewModel - .donationMessageCountLiveData, - getDonationMessageList = { - donationMessageViewModel.getDonationMessageList(roomId = roomId) - }, - deleteDonationMessage = { - if ( - response.creatorId == SharedPreferenceManager.userId && - SharedPreferenceManager.role == MemberRole.CREATOR.name - ) { - donationMessageViewModel.deleteDonationMessage( - roomId = roomId, - uuid = it - ) + hideKeyboard { + LiveRoomDonationMessageDialog( + layoutInflater = LayoutInflater.from(this), + creatorId = response.creatorId, + activity = this, + donationMessageListLiveData = donationMessageViewModel + .donationMessageListLiveData, + donationMessageCountLiveData = donationMessageViewModel + .donationMessageCountLiveData, + getDonationMessageList = { + donationMessageViewModel.getDonationMessageList(roomId = roomId) + }, + deleteDonationMessage = { + if ( + response.creatorId == SharedPreferenceManager.userId && + SharedPreferenceManager.role == MemberRole.CREATOR.name + ) { + donationMessageViewModel.deleteDonationMessage( + roomId = roomId, + uuid = it + ) + } + }, + copyMessage = { + val clipboard = getSystemService(CLIPBOARD_SERVICE) as ClipboardManager + clipboard.setPrimaryClip(ClipData.newPlainText(it, it)) + showToast("후원 히스토리가 복사되었습니다.") } - }, - copyMessage = { - val clipboard = getSystemService(CLIPBOARD_SERVICE) as ClipboardManager - clipboard.setPrimaryClip(ClipData.newPlainText(it, it)) - showToast("후원 히스토리가 복사되었습니다.") - } - ).show() + ).show() + } } speakerListAdapter.managerId = response.creatorId @@ -1200,12 +1204,14 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB if (isHost) { binding.flRouletteSettings.visibility = View.VISIBLE binding.flRouletteSettings.setOnClickListener { - rouletteConfigResult.launch( - Intent( - applicationContext, - RouletteConfigActivity::class.java + hideKeyboard { + rouletteConfigResult.launch( + Intent( + applicationContext, + RouletteConfigActivity::class.java + ) ) - ) + } } } else { binding.flRouletteSettings.visibility = View.GONE @@ -1218,15 +1224,17 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB if (!isHost && isActiveRoulette) { binding.flRoulette.visibility = View.VISIBLE binding.flRoulette.setOnClickListener { - viewModel.showRoulette { - RoulettePreviewDialog( - activity = this, - previewList = it, - onClickSpin = { rouletteId -> - spinRoulette(rouletteId = rouletteId) - }, - layoutInflater = layoutInflater - ).show() + hideKeyboard { + viewModel.showRoulette { + RoulettePreviewDialog( + activity = this, + previewList = it, + onClickSpin = { rouletteId -> + spinRoulette(rouletteId = rouletteId) + }, + layoutInflater = layoutInflater + ).show() + } } }