parent
37d47efe2c
commit
5a37ba8be0
|
@ -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 {
|
||||||
|
|
|
@ -509,6 +509,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
|
||||||
}
|
}
|
||||||
binding.ivSend.setOnClickListener { inputChat() }
|
binding.ivSend.setOnClickListener { inputChat() }
|
||||||
binding.flDonation.setOnClickListener {
|
binding.flDonation.setOnClickListener {
|
||||||
|
hideKeyboard {
|
||||||
val dialog = LiveRoomDonationDialog(
|
val dialog = LiveRoomDonationDialog(
|
||||||
this,
|
this,
|
||||||
LayoutInflater.from(this),
|
LayoutInflater.from(this),
|
||||||
|
@ -523,6 +524,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
|
||||||
|
|
||||||
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,6 +894,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.flDonationMessageList.setOnClickListener {
|
binding.flDonationMessageList.setOnClickListener {
|
||||||
|
hideKeyboard {
|
||||||
LiveRoomDonationMessageDialog(
|
LiveRoomDonationMessageDialog(
|
||||||
layoutInflater = LayoutInflater.from(this),
|
layoutInflater = LayoutInflater.from(this),
|
||||||
creatorId = response.creatorId,
|
creatorId = response.creatorId,
|
||||||
|
@ -921,6 +924,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
|
||||||
}
|
}
|
||||||
).show()
|
).show()
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
speakerListAdapter.managerId = response.creatorId
|
speakerListAdapter.managerId = response.creatorId
|
||||||
speakerListAdapter.updateList(
|
speakerListAdapter.updateList(
|
||||||
|
@ -1200,6 +1204,7 @@ 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 {
|
||||||
|
hideKeyboard {
|
||||||
rouletteConfigResult.launch(
|
rouletteConfigResult.launch(
|
||||||
Intent(
|
Intent(
|
||||||
applicationContext,
|
applicationContext,
|
||||||
|
@ -1207,6 +1212,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
binding.flRouletteSettings.visibility = View.GONE
|
binding.flRouletteSettings.visibility = View.GONE
|
||||||
}
|
}
|
||||||
|
@ -1218,6 +1224,7 @@ 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 {
|
||||||
|
hideKeyboard {
|
||||||
viewModel.showRoulette {
|
viewModel.showRoulette {
|
||||||
RoulettePreviewDialog(
|
RoulettePreviewDialog(
|
||||||
activity = this,
|
activity = this,
|
||||||
|
@ -1229,6 +1236,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
|
||||||
).show()
|
).show()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
binding.flRoulette.visibility = View.GONE
|
binding.flRoulette.visibility = View.GONE
|
||||||
|
|
Loading…
Reference in New Issue