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 8f538b3..ae63523 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 @@ -21,6 +21,7 @@ import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan import android.view.LayoutInflater import android.view.View +import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputMethodManager import android.widget.TextView import android.widget.Toast @@ -467,6 +468,15 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB binding.ivSpeakerMute.setImageResource(R.drawable.ic_speaker_on) } } + + binding.etChat.setOnEditorActionListener { _, actionId, _ -> + if (actionId == EditorInfo.IME_ACTION_DONE || actionId == EditorInfo.IME_ACTION_SEND) { + inputChat() + true + } else { + false + } + } binding.ivSend.setOnClickListener { inputChat() } binding.flDonation.setOnClickListener { val dialog = LiveRoomDonationDialog( @@ -894,6 +904,7 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB binding.ivCreatorFollow.visibility = View.GONE } + initLikeHeartButton(isHost = response.creatorId == SharedPreferenceManager.userId) initRouletteSettingButton(isHost = response.creatorId == SharedPreferenceManager.userId) activatingRouletteButton( isHost = response.creatorId == SharedPreferenceManager.userId, @@ -974,11 +985,24 @@ class LiveRoomActivity : BaseActivity(ActivityLiveRoomB binding.tvTotalCan.text = it.moneyFormat() } + viewModel.totalLikeHeart.observe(this) { + binding.tvTotalHeart.text = it.moneyFormat() + } + viewModel.coverImageUrlLiveData.observe(this) { binding.ivCover.loadUrl(it) } } + private fun initLikeHeartButton(isHost: Boolean) { + if (!isHost) { + binding.flLikeHeart.visibility = View.VISIBLE + binding.flLikeHeart.setOnClickListener { } + } else { + binding.flLikeHeart.visibility = View.GONE + } + } + private fun initRouletteSettingButton(isHost: Boolean) { if (isHost) { binding.flRouletteSettings.visibility = View.VISIBLE diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomViewModel.kt index 006238e..532ec7e 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/LiveRoomViewModel.kt @@ -64,6 +64,10 @@ class LiveRoomViewModel( val totalDonationCan: LiveData get() = _totalDonationCan + private val _totalLikeHeart = MutableLiveData(0) + val totalLikeHeart: LiveData + get() = _totalLikeHeart + private val _userProfileLiveData = MutableLiveData() val userProfileLiveData: LiveData get() = _userProfileLiveData diff --git a/app/src/main/res/drawable-xxhdpi/ic_heart_pink.png b/app/src/main/res/drawable-xxhdpi/ic_heart_pink.png new file mode 100644 index 0000000..5c165ad Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_heart_pink.png differ diff --git a/app/src/main/res/layout/activity_live_room.xml b/app/src/main/res/layout/activity_live_room.xml index d256418..6e828c7 100644 --- a/app/src/main/res/layout/activity_live_room.xml +++ b/app/src/main/res/layout/activity_live_room.xml @@ -403,7 +403,7 @@ android:paddingVertical="5.3dp" android:text="공지" android:textColor="@color/color_bbbbbb" - android:textSize="12sp" + android:textSize="11sp" tools:ignore="SmallSp" /> + + + + + + + @@ -454,9 +483,9 @@ android:fontFamily="@font/gmarket_sans_medium" android:gravity="center_vertical" android:textColor="@color/color_bbbbbb" - android:textSize="12sp" + android:textSize="11sp" tools:ignore="SmallSp" - tools:text="999,999,999,999" /> + tools:text="999,999" /> @@ -476,7 +505,7 @@ android:fontFamily="@font/gmarket_sans_medium" android:text="참여자" android:textColor="@color/color_bbbbbb" - android:textSize="12sp" + android:textSize="11sp" tools:ignore="SmallSp" /> + tools:text="777" /> @@ -512,7 +541,7 @@ android:layout_height="0dp" android:paddingStart="6.7dp" android:paddingEnd="13.3dp" - app:layout_constraintBottom_toTopOf="@+id/rl_input_chat" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/fl_margin"> @@ -539,6 +568,24 @@ android:src="@drawable/ic_speaker_on" /> + + + + + - - - - - + android:padding="10dp" + android:visibility="gone"> + + + + + @@ -650,7 +698,7 @@ android:layout_marginBottom="13.3dp" android:paddingHorizontal="13.3dp" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@+id/rl_option_buttons" app:layout_constraintStart_toStartOf="parent">