klaus
/
sodalive-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

라이브방 

- 룰렛설정, 룰렛, 후원 버튼 터치시 키보드가 내려가도록 설정
This commit is contained in:
klaus 2024-10-30 15:21:59 +09:00
parent 37d47efe2c
commit 5a37ba8be0
2 changed files with 62 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -35,8 +35,8 @@ android {
applicationId "kr.co.vividnext.sodalive" applicationId "kr.co.vividnext.sodalive"
minSdk 23 minSdk 23
targetSdk 34 targetSdk 34
versionCode 120 versionCode 122
versionName "1.22.2" versionName "1.22.3"
} }
buildTypes { buildTypes {

112
app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomActivity.kt
View File

@ -509,19 +509,21 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
} }
binding.ivSend.setOnClickListener { inputChat() } binding.ivSend.setOnClickListener { inputChat() }
binding.flDonation.setOnClickListener { binding.flDonation.setOnClickListener {
val dialog = LiveRoomDonationDialog( hideKeyboard {
this, val dialog = LiveRoomDonationDialog(
LayoutInflater.from(this), this,
isLiveDonation = true LayoutInflater.from(this),
) { can, message, isSecret -> isLiveDonation = true
if (can > 0) { ) { can, message, isSecret ->
donation(can, message, isSecret) if (can > 0) {
} else { donation(can, message, isSecret)
showToast("1캔 이상 후원하실 수 있습니다.") } else {
showToast("1캔 이상 후원하실 수 있습니다.")
}
} }
}
dialog.show(screenWidth) dialog.show(screenWidth)
}
} }
binding.tvNotification.setOnClickListener { viewModel.toggleShowNotice() } binding.tvNotification.setOnClickListener { viewModel.toggleShowNotice() }
binding.tvMenuPan.setOnClickListener { viewModel.toggleShowMenuPan() } binding.tvMenuPan.setOnClickListener { viewModel.toggleShowMenuPan() }
@ -892,34 +894,36 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
} }
binding.flDonationMessageList.setOnClickListener { binding.flDonationMessageList.setOnClickListener {
LiveRoomDonationMessageDialog( hideKeyboard {
layoutInflater = LayoutInflater.from(this), LiveRoomDonationMessageDialog(
creatorId = response.creatorId, layoutInflater = LayoutInflater.from(this),
activity = this, creatorId = response.creatorId,
donationMessageListLiveData = donationMessageViewModel activity = this,
.donationMessageListLiveData, donationMessageListLiveData = donationMessageViewModel
donationMessageCountLiveData = donationMessageViewModel .donationMessageListLiveData,
.donationMessageCountLiveData, donationMessageCountLiveData = donationMessageViewModel
getDonationMessageList = { .donationMessageCountLiveData,
donationMessageViewModel.getDonationMessageList(roomId = roomId) getDonationMessageList = {
}, donationMessageViewModel.getDonationMessageList(roomId = roomId)
deleteDonationMessage = { },
if ( deleteDonationMessage = {
response.creatorId == SharedPreferenceManager.userId && if (
SharedPreferenceManager.role == MemberRole.CREATOR.name response.creatorId == SharedPreferenceManager.userId &&
) { SharedPreferenceManager.role == MemberRole.CREATOR.name
donationMessageViewModel.deleteDonationMessage( ) {
roomId = roomId, donationMessageViewModel.deleteDonationMessage(
uuid = it roomId = roomId,
) uuid = it
)
}
},
copyMessage = {
val clipboard = getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
clipboard.setPrimaryClip(ClipData.newPlainText(it, it))
showToast("후원 히스토리가 복사되었습니다.")
} }
}, ).show()
copyMessage = { }
val clipboard = getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
clipboard.setPrimaryClip(ClipData.newPlainText(it, it))
showToast("후원 히스토리가 복사되었습니다.")
}
).show()
} }
speakerListAdapter.managerId = response.creatorId speakerListAdapter.managerId = response.creatorId
@ -1200,12 +1204,14 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
if (isHost) { if (isHost) {
binding.flRouletteSettings.visibility = View.VISIBLE binding.flRouletteSettings.visibility = View.VISIBLE
binding.flRouletteSettings.setOnClickListener { binding.flRouletteSettings.setOnClickListener {
rouletteConfigResult.launch( hideKeyboard {
Intent( rouletteConfigResult.launch(
applicationContext, Intent(
RouletteConfigActivity::class.java applicationContext,
RouletteConfigActivity::class.java
)
) )
) }
} }
} else { } else {
binding.flRouletteSettings.visibility = View.GONE binding.flRouletteSettings.visibility = View.GONE
@ -1218,15 +1224,17 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
if (!isHost && isActiveRoulette) { if (!isHost && isActiveRoulette) {
binding.flRoulette.visibility = View.VISIBLE binding.flRoulette.visibility = View.VISIBLE
binding.flRoulette.setOnClickListener { binding.flRoulette.setOnClickListener {
viewModel.showRoulette { hideKeyboard {
RoulettePreviewDialog( viewModel.showRoulette {
activity = this, RoulettePreviewDialog(
previewList = it, activity = this,
onClickSpin = { rouletteId -> previewList = it,
spinRoulette(rouletteId = rouletteId) onClickSpin = { rouletteId ->
}, spinRoulette(rouletteId = rouletteId)
layoutInflater = layoutInflater },
).show() layoutInflater = layoutInflater
).show()
}
} }
} }