알람

- 추가 슬롯 구매하기 기능 추가

app/src/main/java/kr/co/vividnext/sodalive/di/AppDI.kt

@@ -75,6 +75,9 @@ import kr.co.vividnext.sodalive.message.text.TextMessageWriteViewModel
 import kr.co.vividnext.sodalive.message.voice.VoiceMessageViewModel
 import kr.co.vividnext.sodalive.message.voice.VoiceMessageWriteViewModel
 import kr.co.vividnext.sodalive.mypage.MyPageViewModel
+import kr.co.vividnext.sodalive.mypage.alarm.AlarmListApi
+import kr.co.vividnext.sodalive.mypage.alarm.AlarmListRepository
+import kr.co.vividnext.sodalive.mypage.alarm.AlarmListViewModel
 import kr.co.vividnext.sodalive.mypage.auth.AuthApi
 import kr.co.vividnext.sodalive.mypage.auth.AuthRepository
 import kr.co.vividnext.sodalive.mypage.can.CanApi
@@ -162,6 +165,7 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
                 .build()
         }
 
+        single { ApiBuilder().build(get(), AlarmListApi::class.java) }
         single { ApiBuilder().build(get(), CanApi::class.java) }
         single { ApiBuilder().build(get(), CanTempApi::class.java) }
         single { ApiBuilder().build(get(), AuthApi::class.java) }
@@ -251,6 +255,7 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
         viewModel { CreatorCommunityModifyViewModel(get()) }
         viewModel { CanCouponViewModel(get()) }
         viewModel { CanChargeIapViewModel(get()) }
+        viewModel { AlarmListViewModel(get()) }
     }
 
     private val repositoryModule = module {
@@ -277,6 +282,7 @@ class AppDI(private val context: Context, isDebugMode: Boolean) {
         factory { UserProfileFantalkAllViewModel(get(), get()) }
         factory { RouletteRepository(get()) }
         factory { CreatorCommunityRepository(get()) }
+        factory { AlarmListRepository(get()) }
     }
 
     private val moduleList = listOf(

app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AddAlarmActivity.kt

@@ -10,7 +10,6 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import kr.co.vividnext.sodalive.base.BaseActivity
 import kr.co.vividnext.sodalive.common.Constants
-import kr.co.vividnext.sodalive.common.LoadingDialog
 import kr.co.vividnext.sodalive.databinding.ActivityAddAlarmBinding
 import kr.co.vividnext.sodalive.mypage.alarm.db.Alarm
 import kr.co.vividnext.sodalive.mypage.alarm.select_audio_content.AlarmSelectAudioContentActivity
@@ -21,7 +20,6 @@ class AddAlarmActivity : BaseActivity<ActivityAddAlarmBinding>(
 ) {
     private val alarmViewModel: AlarmViewModel by viewModels()
 
-    private lateinit var loadingDialog: LoadingDialog
     private lateinit var activityResultLauncher: ActivityResultLauncher<Intent>
     private lateinit var dayCheckBoxes: List<CheckBox>
 
@@ -54,13 +52,9 @@ class AddAlarmActivity : BaseActivity<ActivityAddAlarmBinding>(
 
         alarmId = intent.getIntExtra(Constants.EXTRA_ALARM_ID, -1)
         super.onCreate(savedInstanceState)
-
-        bindData()
     }
 
     override fun setupView() {
-        loadingDialog = LoadingDialog(this, layoutInflater)
-
         dayCheckBoxes = listOf(
             binding.chkSun,
             binding.chkMon,
@@ -152,16 +146,6 @@ class AddAlarmActivity : BaseActivity<ActivityAddAlarmBinding>(
         return calendar.timeInMillis
     }
 
-    private fun bindData() {
-        alarmViewModel.isLoading.observe(this) {
-            if (it) {
-                loadingDialog.show(screenWidth, "")
-            } else {
-                loadingDialog.dismiss()
-            }
-        }
-    }
-
     private fun validate(): Boolean {
         if (
             selectedContentId <= 0 ||

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

@@ -17,13 +17,16 @@ import kr.co.vividnext.sodalive.base.SodaDialog
 import kr.co.vividnext.sodalive.common.Constants
 import kr.co.vividnext.sodalive.common.LoadingDialog
 import kr.co.vividnext.sodalive.databinding.ActivityAlarmListBinding
+import kr.co.vividnext.sodalive.extensions.moneyFormat
 import kr.co.vividnext.sodalive.mypage.alarm.db.Alarm
+import org.koin.android.ext.android.inject
 
 class AlarmListActivity : BaseActivity<ActivityAlarmListBinding>(
     ActivityAlarmListBinding::inflate
 ) {
 
     private val alarmViewModel: AlarmViewModel by viewModels()
+    private val viewModel: AlarmListViewModel by inject()
 
     private lateinit var alarmAdapter: AlarmAdapter
     private lateinit var loadingDialog: LoadingDialog
@@ -68,24 +71,55 @@ class AlarmListActivity : BaseActivity<ActivityAlarmListBinding>(
 
     @SuppressLint("NotifyDataSetChanged")
     private fun adapterRefresh() {
-        alarmViewModel.refresh()
         alarmAdapter.notifyDataSetChanged()
     }
 
     private fun bindData() {
         alarmViewModel.allAlarms.observe(this) { alarms ->
             alarms?.let {
-                binding.ivPlus.visibility = if (it.size >= 3) {
+                alarmAdapter.submitList(it)
-                    View.GONE
+                binding.scrollView.visibility =
-                } else {
+                    if (it.isEmpty()) View.GONE else View.VISIBLE
+                binding.tvEmptyAlarms.visibility =
+                    if (it.isEmpty()) View.VISIBLE else View.GONE
+
+
+                viewModel.getSlotQuantityAndPrice()
+            }
+        }
+
+        viewModel.toastLiveData.observe(this) {
+            Toast.makeText(applicationContext, it, Toast.LENGTH_LONG).show()
+        }
+
+        viewModel.isLoading.observe(this) {
+            if (it) {
+                loadingDialog.show(screenWidth, "")
+            } else {
+                loadingDialog.dismiss()
+            }
+        }
+
+        viewModel.maxAlarmSlotLiveData.observe(this) {
+            if (it > 0 && alarmAdapter.itemCount >= it) {
+                binding.ivPlus.visibility = View.GONE
+                binding.llBuyExtraSlot.visibility = View.VISIBLE
+                binding.tvInfinity.visibility = if (it - 3 >= 2) {
                     View.VISIBLE
+                } else {
+                    View.GONE
                 }
 
-                alarmAdapter.submitList(it)
+                binding.llBuyExtraSlot.setOnClickListener { showBuyConfirm() }
-                binding.rvAlarm.visibility = if (it.isEmpty()) View.GONE else View.VISIBLE
+            } else {
-                binding.tvEmptyAlarms.visibility = if (it.isEmpty()) View.VISIBLE else View.GONE
+                binding.ivPlus.visibility = View.VISIBLE
+                binding.llBuyExtraSlot.visibility = View.GONE
             }
         }
+
+        viewModel.extraSlotPriceLiveData.observe(this) {
+            binding.tvPrice.text = it.moneyFormat()
+        }
     }
 
     private fun checkPermissions() {
@@ -135,14 +169,26 @@ class AlarmListActivity : BaseActivity<ActivityAlarmListBinding>(
             confirmButtonTitle = "삭제",
             confirmButtonClick = {
                 alarmViewModel.delete(alarm)
-                adapterRefresh()
                 Toast.makeText(
                     applicationContext,
                     "알람이 삭제되었습니다.",
                     Toast.LENGTH_SHORT
                 ).show()
+                adapterRefresh()
             },
             cancelButtonTitle = "취소",
         ).show(screenWidth)
     }
+
+    private fun showBuyConfirm() {
+        SodaDialog(
+            this,
+            layoutInflater,
+            title = "알림",
+            desc = "추가 슬롯을 구매하시겠습니까?",
+            confirmButtonTitle = "구매",
+            confirmButtonClick = { viewModel.buyExtraSlot() },
+            cancelButtonTitle = "취소",
+        ).show(screenWidth)
+    }
 }

app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AlarmListApi.kt

@@ -0,0 +1,17 @@
+package kr.co.vividnext.sodalive.mypage.alarm
+
+import io.reactivex.rxjava3.core.Single
+import kr.co.vividnext.sodalive.common.ApiResponse
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.POST
+
+interface AlarmListApi {
+    @GET("/alarm")
+    fun getSlotQuantityAndPrice(
+        @Header("Authorization") authHeader: String
+    ): Single<ApiResponse<GetSlotQuantityAndPriceResponse>>
+
+    @POST("/alarm/buy-slot/aos")
+    fun buyExtraSlot(@Header("Authorization") authHeader: String): Single<ApiResponse<Any>>
+}

app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AlarmListRepository.kt

@@ -0,0 +1,7 @@
+package kr.co.vividnext.sodalive.mypage.alarm
+
+class AlarmListRepository(private val api: AlarmListApi) {
+    fun getSlotQuantityAndPrice(token: String) = api.getSlotQuantityAndPrice(authHeader = token)
+
+    fun buyExtraSlot(token: String) = api.buyExtraSlot(authHeader = token)
+}

app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AlarmListViewModel.kt

@@ -0,0 +1,93 @@
+package kr.co.vividnext.sodalive.mypage.alarm
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.orhanobut.logger.Logger
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.schedulers.Schedulers
+import kr.co.vividnext.sodalive.base.BaseViewModel
+import kr.co.vividnext.sodalive.common.SharedPreferenceManager
+
+class AlarmListViewModel(private val repository: AlarmListRepository) : BaseViewModel() {
+    private val _toastLiveData = MutableLiveData<String?>()
+    val toastLiveData: LiveData<String?>
+        get() = _toastLiveData
+
+    private var _isLoading = MutableLiveData(false)
+    val isLoading: LiveData<Boolean>
+        get() = _isLoading
+
+    private var _maxAlarmSlotLiveData = MutableLiveData(3)
+    val maxAlarmSlotLiveData: LiveData<Int>
+        get() = _maxAlarmSlotLiveData
+
+    private var _extraSlotPriceLiveData = MutableLiveData(0)
+    val extraSlotPriceLiveData: LiveData<Int>
+        get() = _extraSlotPriceLiveData
+
+    fun getSlotQuantityAndPrice() {
+        _isLoading.value = true
+        compositeDisposable.add(
+            repository.getSlotQuantityAndPrice("Bearer ${SharedPreferenceManager.token}")
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                    {
+                        _isLoading.value = false
+                        if (it.success && it.data != null) {
+                            if (it.data.slotQuantity >= 3) {
+                                _maxAlarmSlotLiveData.value = 0
+                            } else {
+                                _maxAlarmSlotLiveData.value = 3 + it.data.slotQuantity
+                            }
+
+                            _extraSlotPriceLiveData.value = it.data.price
+                        } else {
+                            if (it.message != null) {
+                                _toastLiveData.postValue(it.message)
+                            } else {
+                                _toastLiveData.postValue(
+                                    "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요."
+                                )
+                            }
+                        }
+                    },
+                    {
+                        _isLoading.value = false
+                        it.message?.let { message -> Logger.e(message) }
+                        _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
+                    }
+                )
+        )
+    }
+
+    fun buyExtraSlot() {
+        _isLoading.value = true
+        compositeDisposable.add(
+            repository.buyExtraSlot("Bearer ${SharedPreferenceManager.token}")
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(
+                    {
+                        _isLoading.value = false
+                        if (it.success) {
+                            getSlotQuantityAndPrice()
+                        } else {
+                            if (it.message != null) {
+                                _toastLiveData.postValue(it.message)
+                            } else {
+                                _toastLiveData.postValue(
+                                    "알 수 없는 오류가 발생했습니다. 다시 시도해 주세요."
+                                )
+                            }
+                        }
+                    },
+                    {
+                        _isLoading.value = false
+                        it.message?.let { message -> Logger.e(message) }
+                        _toastLiveData.postValue("알 수 없는 오류가 발생했습니다. 다시 시도해 주세요.")
+                    }
+                )
+        )
+    }
+}

app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/AlarmViewModel.kt

@@ -3,7 +3,6 @@ package kr.co.vividnext.sodalive.mypage.alarm
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.launch
@@ -15,10 +14,6 @@ class AlarmViewModel(application: Application) : AndroidViewModel(application) {
     private val repository: AlarmRepository
     private val scheduler: AlarmScheduler
 
-    private var _isLoading = MutableLiveData(false)
-    val isLoading: LiveData<Boolean>
-        get() = _isLoading
-
     init {
         val alarmDao = AlarmDatabase.getDatabase(application).alarmDao()
         repository = AlarmRepository(alarmDao)
@@ -27,43 +22,25 @@ class AlarmViewModel(application: Application) : AndroidViewModel(application) {
 
     var allAlarms = repository.allAlarms.asLiveData()
 
-    fun refresh() = viewModelScope.launch {
-        _isLoading.value = true
-        repository.allAlarms.asLiveData()
-        _isLoading.value = false
-    }
-
     fun insert(alarm: Alarm) = viewModelScope.launch {
-        _isLoading.value = true
-
         repository.insert(alarm)
         if (alarm.isEnabled) {
             scheduler.setAlarm(alarm)
         }
-
-        _isLoading.value = false
     }
 
     fun update(alarm: Alarm) = viewModelScope.launch {
-        _isLoading.value = true
-
         repository.update(alarm)
         scheduler.cancelAlarm(alarm)
 
         if (alarm.isEnabled) {
             scheduler.setAlarm(alarm)
         }
-
-        _isLoading.value = false
     }
 
     fun delete(alarm: Alarm) = viewModelScope.launch {
-        _isLoading.value = true
-
         repository.delete(alarm)
         scheduler.cancelAlarm(alarm)
-
-        _isLoading.value = false
     }
 
     fun truncate() = viewModelScope.launch {
@@ -71,12 +48,6 @@ class AlarmViewModel(application: Application) : AndroidViewModel(application) {
     }
 
     fun getAlarmById(id: Int): LiveData<Alarm> {
-        _isLoading.value = true
+        return repository.getAlarmById(id)
-
-        val alarm = repository.getAlarmById(id)
-
-        _isLoading.value = false
-
-        return alarm
     }
 }

app/src/main/java/kr/co/vividnext/sodalive/mypage/alarm/GetSlotQuantityAndPriceResponse.kt

@@ -0,0 +1,8 @@
+package kr.co.vividnext.sodalive.mypage.alarm
+
+import com.google.gson.annotations.SerializedName
+
+data class GetSlotQuantityAndPriceResponse(
+    @SerializedName("slotQuantity") val slotQuantity: Int,
+    @SerializedName("price") val price: Int
+)

app/src/main/java/kr/co/vividnext/sodalive/settings/SettingsActivity.kt

@@ -5,6 +5,7 @@ import android.content.Intent
 import android.graphics.Paint
 import android.os.Bundle
 import android.widget.Toast
+import androidx.activity.viewModels
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 import kr.co.vividnext.sodalive.BuildConfig
 import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService
@@ -51,7 +52,7 @@ class SettingsActivity : BaseActivity<ActivitySettingsBinding>(ActivitySettingsB
     }
 
     private val viewModel: SettingsViewModel by inject()
-    private val alarmViewModel: AlarmViewModel by inject()
+    private val alarmViewModel: AlarmViewModel by viewModels()
 
     private lateinit var loadingDialog: LoadingDialog
 

app/src/main/res/layout/activity_alarm_list.xml

@@ -37,7 +37,8 @@
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:contentDescription="@null"
-            android:src="@drawable/ic_plus_no_bg" />
+            android:src="@drawable/ic_plus_no_bg"
+            android:visibility="gone" />
     </RelativeLayout>
 
     <TextView
@@ -49,15 +50,81 @@
         android:lineSpacingExtra="4sp"
         android:text="※ 소장중인 콘텐츠만 알람 콘텐츠로 설정할 수 있습니다. 알람 설정 전 콘텐츠 마켓에서 마음에 드는 콘텐츠를 소장하세요."
         android:textColor="@android:color/darker_gray"
-        android:textSize="14sp" />
+        android:textSize="13sp" />
 
-    <androidx.recyclerview.widget.RecyclerView
+    <androidx.core.widget.NestedScrollView
-        android:id="@+id/rv_alarm"
+        android:id="@+id/scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:clipToPadding="false"
+        android:visibility="gone">
-        android:paddingHorizontal="13.3dp"
+
-        android:visibility="gone" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_alarm"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:clipToPadding="false"
+                android:paddingHorizontal="13.3dp" />
+
+            <LinearLayout
+                android:id="@+id/ll_buy_extra_slot"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="13.3dp"
+                android:layout_marginVertical="26.7dp"
+                android:background="@drawable/bg_round_corner_5_3_222222"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingVertical="16dp"
+                android:visibility="gone">
+
+                <TextView
+                    android:id="@+id/tv_price"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawablePadding="3dp"
+                    android:fontFamily="@font/gmarket_sans_bold"
+                    android:gravity="center"
+                    android:textColor="@color/color_80d8ff"
+                    android:textSize="14.7sp"
+                    app:drawableRightCompat="@drawable/ic_can"
+                    tools:text="30" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/gmarket_sans_bold"
+                    android:gravity="center"
+                    android:text=" 으로"
+                    android:textColor="@color/color_eeeeee"
+                    android:textSize="14.7sp" />
+
+                <TextView
+                    android:id="@+id/tv_infinity"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/gmarket_sans_bold"
+                    android:gravity="center"
+                    android:text=" 무제한"
+                    android:textColor="@color/color_ff5c49"
+                    android:textSize="14.7sp"
+                    android:visibility="gone" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="@font/gmarket_sans_bold"
+                    android:gravity="center"
+                    android:text=" 슬롯 구매하기"
+                    android:textColor="@color/color_eeeeee"
+                    android:textSize="14.7sp" />
+            </LinearLayout>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
 
     <TextView
         android:id="@+id/tv_empty_alarms"
@@ -67,5 +134,6 @@
         android:gravity="center"
         android:text="알람이 없습니다"
         android:textColor="@android:color/darker_gray"
-        android:textSize="18sp" />
+        android:textSize="18sp"
+        android:visibility="gone" />
 </LinearLayout>

app/src/main/res/layout/item_alarm.xml

@@ -4,8 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/black"
-    android:orientation="vertical"
+    android:orientation="vertical">
-    android:paddingHorizontal="8dp">
 
     <TextView
         android:id="@+id/tv_title"
@@ -100,7 +99,7 @@
             android:layout_marginStart="16.7dp"
             android:ellipsize="end"
             android:fontFamily="@font/gmarket_sans_medium"
-            android:maxLines="2"
+            android:maxLines="1"
             android:textColor="@color/color_eeeeee"
             android:textSize="14.7sp"
             tools:text="[야함끝판왕/리얼플🔞] 강제로 절정까지 가버리는 연상녀💦" />