diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListViewModel.kt index 8b16310..80f7115 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListViewModel.kt @@ -52,6 +52,7 @@ class AudioContentOrderListViewModel( page += 1 _orderList.postValue(it.data.items) } else { + _orderList.postValue(listOf()) isLast = true } } else { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AlarmListActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AlarmListActivity.kt index d4de90a..5bd255a 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AlarmListActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AlarmListActivity.kt @@ -40,7 +40,7 @@ class AlarmListActivity : BaseActivity( override fun setupView() { loadingDialog = LoadingDialog(this, layoutInflater) - binding.tvBack.text = "알람" + binding.tvBack.text = "소다로 살다 (알람 등록)" binding.tvBack.setOnClickListener { finish() } binding.ivPlus.setOnClickListener { startActivity( diff --git a/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/select_audio_content/AlarmSelectAudioContentActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/select_audio_content/AlarmSelectAudioContentActivity.kt index c44e194..4da1c34 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/select_audio_content/AlarmSelectAudioContentActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/select_audio_content/AlarmSelectAudioContentActivity.kt @@ -118,14 +118,22 @@ class AlarmSelectAudioContentActivity : BaseActivity + val keepItems = items.filter { it.orderType == OrderType.KEEP } + if (viewModel.page == 2) { adapter.items.clear() } - adapter.items.addAll( - items.filter { it.orderType == OrderType.KEEP } - ) + adapter.items.addAll(keepItems) adapter.notifyDataSetChanged() + + if (adapter.items.count() + keepItems.size > 0) { + binding.rvOrderList.visibility = View.VISIBLE + binding.tvEmptyOrderList.visibility = View.GONE + } else { + binding.rvOrderList.visibility = View.GONE + binding.tvEmptyOrderList.visibility = View.VISIBLE + } } } } diff --git a/app/src/main/res/layout/activity_alarm_list.xml b/app/src/main/res/layout/activity_alarm_list.xml index c2e99a4..f8902af 100644 --- a/app/src/main/res/layout/activity_alarm_list.xml +++ b/app/src/main/res/layout/activity_alarm_list.xml @@ -48,9 +48,9 @@ android:layout_marginVertical="10dp" android:fontFamily="@font/gmarket_sans_medium" android:lineSpacingExtra="4sp" - android:text="※ 소장중인 콘텐츠만 알람 콘텐츠로 설정할 수 있습니다. 알람 설정 전 콘텐츠 마켓에서 마음에 드는 콘텐츠를 소장하세요." + android:text="※ 소장중인 콘텐츠만 알람 콘텐츠로 설정할 수 있습니다. 알람 설정 전 콘텐츠 마켓에서 원하는 콘텐츠를 먼저 구매(소장)하세요. " android:textColor="@android:color/darker_gray" - android:textSize="13sp" /> + android:textSize="13.5sp" /> + android:paddingVertical="13.3dp" + android:visibility="gone" /> + + diff --git a/app/src/main/res/layout/fragment_my.xml b/app/src/main/res/layout/fragment_my.xml index d06a13b..974c3ba 100644 --- a/app/src/main/res/layout/fragment_my.xml +++ b/app/src/main/res/layout/fragment_my.xml @@ -220,6 +220,43 @@ app:drawableStartCompat="@drawable/ic_coin_w" /> + + + + + + + + + - - - - - - - - -