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"
minSdk 23
targetSdk 34
versionCode 120
versionName "1.22.2"
versionCode 122
versionName "1.22.3"
}
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.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<ActivityLiveRoomBinding>(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<ActivityLiveRoomBinding>(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<ActivityLiveRoomBinding>(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()
}
}
}