klaus
/
sodalive-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

label 수정 

알람 -> 소다로 살다
This commit is contained in:
klaus 2024-07-26 15:03:09 +09:00
parent 262f42c194
commit 7aa80154fa
6 changed files with 65 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/kr/co/vividnext/sodalive/audio_content/order/AudioContentOrderListViewModel.kt
View File

@ -52,6 +52,7 @@ class AudioContentOrderListViewModel(
page += 1
_orderList.postValue(it.data.items)
} else {
_orderList.postValue(listOf())
isLast = true
}
} else {

2
app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AlarmListActivity.kt
View File

@ -40,7 +40,7 @@ class AlarmListActivity : BaseActivity<ActivityAlarmListBinding>(
override fun setupView() {
loadingDialog = LoadingDialog(this, layoutInflater)
binding.tvBack.text = "알람"
binding.tvBack.text = "소다로 살다 (알람 등록)"
binding.tvBack.setOnClickListener { finish() }
binding.ivPlus.setOnClickListener {
startActivity(

14
app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/select_audio_content/AlarmSelectAudioContentActivity.kt
View File

@ -118,14 +118,22 @@ class AlarmSelectAudioContentActivity : BaseActivity<ActivityAlarmSelectAudioCon
}
viewModel.orderList.observe(this) { items ->
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
}
}
}
}

4
app/src/main/res/layout/activity_alarm_list.xml
View File

@ -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" />
<androidx.core.widget.NestedScrollView
android:id="@+id/scroll_view"

14
app/src/main/res/layout/activity_alarm_select_audio_content.xml
View File

@ -14,5 +14,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingVertical="13.3dp" />
android:paddingVertical="13.3dp"
android:visibility="gone" />
<TextView
android:id="@+id/tv_empty_order_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fontFamily="@font/gmarket_sans_medium"
android:gravity="center"
android:text="소장중인 콘텐츠가 없습니다.\n콘텐츠 마켓에서 원하는 알람 콘텐츠를 먼저 구매(소장)하세요."
android:textColor="@android:color/darker_gray"
android:textSize="18sp"
android:visibility="gone" />
</LinearLayout>

74
app/src/main/res/layout/fragment_my.xml
View File

@ -220,6 +220,43 @@
app:drawableStartCompat="@drawable/ic_coin_w" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_alarm"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="13.3dp"
android:background="@drawable/bg_round_corner_6_7_13181b"
android:paddingHorizontal="13.3dp"
android:paddingVertical="20dp">
<TextView
android:id="@+id/tv_alarm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginEnd="5.3dp"
android:fontFamily="@font/gmarket_sans_bold"
android:gravity="center"
android:text="소다로 살다"
android:textColor="@color/color_eeeeee"
android:textSize="16sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/tv_alarm"
android:contentDescription="@null"
android:src="@drawable/ic_alarm_clock" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:contentDescription="@null"
android:src="@drawable/ic_forward" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_coupon"
android:layout_width="match_parent"
@ -257,43 +294,6 @@
android:src="@drawable/ic_forward" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_alarm"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="13.3dp"
android:background="@drawable/bg_round_corner_6_7_13181b"
android:paddingHorizontal="13.3dp"
android:paddingVertical="20dp">
<TextView
android:id="@+id/tv_alarm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginEnd="5.3dp"
android:fontFamily="@font/gmarket_sans_bold"
android:gravity="center"
android:text="알람"
android:textColor="@color/color_eeeeee"
android:textSize="16sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/tv_alarm"
android:contentDescription="@null"
android:src="@drawable/ic_alarm_clock" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:contentDescription="@null"
android:src="@drawable/ic_forward" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"