diff --git a/app/build.gradle b/app/build.gradle index 5aa88dd..cbf3717 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -40,8 +40,8 @@ android { applicationId "kr.co.vividnext.sodalive" minSdk 23 targetSdk 33 - versionCode 69 - versionName "1.11.0" + versionCode 71 + versionName "1.11.1" } buildTypes { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/CreateLiveRoomRequest.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/CreateLiveRoomRequest.kt index fb15fda..1ddbd39 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/CreateLiveRoomRequest.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/CreateLiveRoomRequest.kt @@ -17,5 +17,6 @@ data class CreateLiveRoomRequest( @SerializedName("password") val password: String? = null, @SerializedName("menuPanId") val menuPanId: Long = 0, @SerializedName("menuPan") val menuPan: String = "", - @SerializedName("isActiveMenuPan") val isActiveMenuPan: Boolean = false + @SerializedName("isActiveMenuPan") val isActiveMenuPan: Boolean = false, + @SerializedName("isAvailableJoinCreator") val isAvailableJoinCreator: Boolean = true ) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/LiveRoomCreateActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/LiveRoomCreateActivity.kt index 7fa98a8..2cdb31b 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/LiveRoomCreateActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/LiveRoomCreateActivity.kt @@ -322,6 +322,14 @@ class LiveRoomCreateActivity : BaseActivity( binding.llSelectMenu3.setOnClickListener { viewModel.selectMenuPreset(LiveRoomCreateViewModel.SelectedMenu.MENU_3) } + + binding.llAvailableJoinCreatorY.setOnClickListener { + viewModel.setAvailableJoinCreator(true) + } + + binding.llAvailableJoinCreatorN.setOnClickListener { + viewModel.setAvailableJoinCreator(false) + } } @SuppressLint("SetTextI18n") @@ -647,6 +655,46 @@ class LiveRoomCreateActivity : BaseActivity( viewModel.menuLiveData.observe(this) { binding.etMenu.setText(it) } + + viewModel.isAvailableJoinCreatorLiveData.observe(this) { + if (it) { + binding.ivAvailableJoinCreatorN.visibility = View.GONE + binding.llAvailableJoinCreatorN.setBackgroundResource(R.drawable.bg_round_corner_6_7_13181b) + binding.tvAvailableJoinCreatorN.setTextColor( + ContextCompat.getColor( + applicationContext, + R.color.color_3bb9f1 + ) + ) + + binding.ivAvailableJoinCreatorY.visibility = View.VISIBLE + binding.llAvailableJoinCreatorY.setBackgroundResource(R.drawable.bg_round_corner_6_7_3bb9f1) + binding.tvAvailableJoinCreatorY.setTextColor( + ContextCompat.getColor( + applicationContext, + R.color.color_eeeeee + ) + ) + } else { + binding.ivAvailableJoinCreatorY.visibility = View.GONE + binding.llAvailableJoinCreatorY.setBackgroundResource(R.drawable.bg_round_corner_6_7_13181b) + binding.tvAvailableJoinCreatorY.setTextColor( + ContextCompat.getColor( + applicationContext, + R.color.color_3bb9f1 + ) + ) + + binding.ivAvailableJoinCreatorN.visibility = View.VISIBLE + binding.llAvailableJoinCreatorN.setBackgroundResource(R.drawable.bg_round_corner_6_7_3bb9f1) + binding.tvAvailableJoinCreatorN.setTextColor( + ContextCompat.getColor( + applicationContext, + R.color.color_eeeeee + ) + ) + } + } } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/LiveRoomCreateViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/LiveRoomCreateViewModel.kt index f9b36ce..cba79db 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/LiveRoomCreateViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/create/LiveRoomCreateViewModel.kt @@ -71,6 +71,10 @@ class LiveRoomCreateViewModel( val isActivateMenuLiveData: LiveData get() = _isActivateMenuLiveData + private val _isAvailableJoinCreatorLiveData = MutableLiveData(true) + val isAvailableJoinCreatorLiveData: LiveData + get() = _isAvailableJoinCreatorLiveData + private val _menuLiveData = MutableLiveData("") val menuLiveData: LiveData get() = _menuLiveData @@ -147,7 +151,8 @@ class LiveRoomCreateViewModel( } else { "" }, - isActiveMenuPan = _isActivateMenuLiveData.value!! + isActiveMenuPan = _isActivateMenuLiveData.value!!, + isAvailableJoinCreator = _isAvailableJoinCreatorLiveData.value!! ) val requestJson = Gson().toJson(request) @@ -255,6 +260,10 @@ class LiveRoomCreateViewModel( _isAdultLiveData.value = isAdult } + fun setAvailableJoinCreator(isAvailableJoinCreator: Boolean) { + _isAvailableJoinCreatorLiveData.value = isAvailableJoinCreator + } + fun getRecentInfo(onSuccess: (GetRecentRoomInfoResponse) -> Unit) { _isLoading.value = true compositeDisposable.add( diff --git a/app/src/main/res/layout/activity_live_room_create.xml b/app/src/main/res/layout/activity_live_room_create.xml index 23d9030..70a5706 100644 --- a/app/src/main/res/layout/activity_live_room_create.xml +++ b/app/src/main/res/layout/activity_live_room_create.xml @@ -685,6 +685,82 @@ tools:ignore="LabelFor,TextFields" /> + + + + + + + + + + + + + + + + + + +