refactor(creator): 진행 중 라이브 컴포넌트를 공통화한다
This commit is contained in:
@@ -5,8 +5,8 @@ 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.R
|
||||
import kr.co.vividnext.sodalive.base.BaseViewModel
|
||||
import kr.co.vividnext.sodalive.common.ApiResponse
|
||||
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
||||
import kr.co.vividnext.sodalive.common.ToastMessage
|
||||
import kr.co.vividnext.sodalive.mypage.auth.AuthRepository
|
||||
@@ -15,7 +15,6 @@ import kr.co.vividnext.sodalive.settings.ContentType
|
||||
import kr.co.vividnext.sodalive.settings.notice.NoticeItem
|
||||
import kr.co.vividnext.sodalive.settings.notice.NoticeRepository
|
||||
import kr.co.vividnext.sodalive.user.UserRepository
|
||||
import kr.co.vividnext.sodalive.R
|
||||
|
||||
class MyPageViewModel(
|
||||
private val userRepository: UserRepository,
|
||||
|
||||
@@ -11,7 +11,6 @@ import android.widget.Toast
|
||||
import androidx.activity.result.ActivityResultLauncher
|
||||
import androidx.activity.result.contract.ActivityResultContracts
|
||||
import androidx.activity.viewModels
|
||||
import com.orhanobut.logger.Logger
|
||||
import kr.co.vividnext.sodalive.R
|
||||
import kr.co.vividnext.sodalive.base.BaseActivity
|
||||
import kr.co.vividnext.sodalive.common.Constants
|
||||
@@ -211,7 +210,7 @@ class AddAlarmActivity : BaseActivity<ActivityAddAlarmBinding>(
|
||||
contentTitle = selectedContentTitle,
|
||||
contentCreatorNickname = selectedContentCreatorNickname,
|
||||
volume = binding.sbVolume.progress,
|
||||
days = selectedDays.toList(),
|
||||
days = selectedDays.toList()
|
||||
)
|
||||
|
||||
if (alarmId > 0) {
|
||||
|
||||
@@ -95,7 +95,7 @@ class AlarmActivity : BaseActivity<ActivityAlarmBinding>(
|
||||
}
|
||||
|
||||
private fun getContent(contentId: Long) {
|
||||
contentViewModel.getAudioContentDetail(contentId, {},)
|
||||
contentViewModel.getAudioContentDetail(contentId) {}
|
||||
}
|
||||
|
||||
private fun bindData() {
|
||||
|
||||
@@ -5,7 +5,6 @@ import android.annotation.SuppressLint
|
||||
import android.app.AlarmManager
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
import android.os.Bundle
|
||||
import android.provider.Settings
|
||||
@@ -15,7 +14,7 @@ import androidx.activity.result.ActivityResultLauncher
|
||||
import androidx.activity.result.contract.ActivityResultContracts
|
||||
import androidx.activity.viewModels
|
||||
import androidx.annotation.RequiresApi
|
||||
import androidx.core.app.NotificationManagerCompat
|
||||
import androidx.core.net.toUri
|
||||
import androidx.recyclerview.widget.LinearLayoutManager
|
||||
import com.gun0912.tedpermission.PermissionListener
|
||||
import com.gun0912.tedpermission.normal.TedPermission
|
||||
@@ -28,7 +27,6 @@ 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
|
||||
import androidx.core.net.toUri
|
||||
|
||||
class AlarmListActivity : BaseActivity<ActivityAlarmListBinding>(
|
||||
ActivityAlarmListBinding::inflate
|
||||
@@ -156,7 +154,6 @@ class AlarmListActivity : BaseActivity<ActivityAlarmListBinding>(
|
||||
binding.tvEmptyAlarms.visibility =
|
||||
if (it.isEmpty()) View.VISIBLE else View.GONE
|
||||
|
||||
|
||||
viewModel.getSlotQuantityAndPrice()
|
||||
}
|
||||
}
|
||||
@@ -236,7 +233,7 @@ class AlarmListActivity : BaseActivity<ActivityAlarmListBinding>(
|
||||
).show()
|
||||
adapterRefresh()
|
||||
},
|
||||
cancelButtonTitle = getString(R.string.cancel),
|
||||
cancelButtonTitle = getString(R.string.cancel)
|
||||
).show(screenWidth)
|
||||
}
|
||||
|
||||
@@ -248,7 +245,7 @@ class AlarmListActivity : BaseActivity<ActivityAlarmListBinding>(
|
||||
desc = getString(R.string.alarm_list_buy_desc),
|
||||
confirmButtonTitle = getString(R.string.alarm_list_buy_confirm),
|
||||
confirmButtonClick = { viewModel.buyExtraSlot() },
|
||||
cancelButtonTitle = getString(R.string.cancel),
|
||||
cancelButtonTitle = getString(R.string.cancel)
|
||||
).show(screenWidth)
|
||||
}
|
||||
}
|
||||
|
||||
-2
@@ -1,14 +1,12 @@
|
||||
package kr.co.vividnext.sodalive.mypage.alarm.select_audio_content
|
||||
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import androidx.recyclerview.widget.RecyclerView
|
||||
import coil.load
|
||||
import coil.transform.RoundedCornersTransformation
|
||||
import kr.co.vividnext.sodalive.R
|
||||
import kr.co.vividnext.sodalive.audio_content.order.GetAudioContentOrderListItem
|
||||
import kr.co.vividnext.sodalive.audio_content.order.OrderType
|
||||
import kr.co.vividnext.sodalive.databinding.ItemAudioContentOrderListBinding
|
||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||
import kr.co.vividnext.sodalive.extensions.moneyFormat
|
||||
|
||||
@@ -15,6 +15,6 @@ data class BootpayResponse(
|
||||
@SerializedName("receipt_id")
|
||||
val receiptId: String,
|
||||
@SerializedName("order_id")
|
||||
val orderId: String,
|
||||
val orderId: String
|
||||
)
|
||||
}
|
||||
|
||||
@@ -98,12 +98,10 @@ class BlockMemberActivity : BaseActivity<ActivityBlockMemberBinding>(
|
||||
}
|
||||
|
||||
viewModel.blockedMemberTotalCountLiveData.observe(this) {
|
||||
binding.tvTotalCount.text = " ${
|
||||
getString(
|
||||
R.string.screen_block_member_total_count,
|
||||
it
|
||||
)
|
||||
} "
|
||||
binding.tvTotalCount.text = getString(
|
||||
R.string.screen_block_member_total_count,
|
||||
it
|
||||
)
|
||||
|
||||
if (it > 0) {
|
||||
binding.tvNone.visibility = View.GONE
|
||||
|
||||
+5
-5
@@ -7,10 +7,10 @@ import com.android.billingclient.api.Purchase
|
||||
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.ToastMessage
|
||||
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
||||
import kr.co.vividnext.sodalive.R
|
||||
import kr.co.vividnext.sodalive.base.BaseViewModel
|
||||
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
||||
import kr.co.vividnext.sodalive.common.ToastMessage
|
||||
import kr.co.vividnext.sodalive.mypage.can.CanRepository
|
||||
|
||||
class CanChargeIapViewModel(private val repository: CanRepository) : BaseViewModel() {
|
||||
@@ -38,8 +38,8 @@ class CanChargeIapViewModel(private val repository: CanRepository) : BaseViewMod
|
||||
title = title,
|
||||
chargeCan = selectedProductDetails.description.toInt(),
|
||||
price = (
|
||||
selectedProductDetails.oneTimePurchaseOfferDetails?.priceAmountMicros
|
||||
?: 0L).toDouble() / 1000000,
|
||||
selectedProductDetails.oneTimePurchaseOfferDetails?.priceAmountMicros ?: 0L
|
||||
).toDouble() / 1000000,
|
||||
currencyCode = selectedProductDetails.oneTimePurchaseOfferDetails?.priceCurrencyCode
|
||||
?: "KRW",
|
||||
productId = purchase.products[0],
|
||||
|
||||
@@ -3,13 +3,12 @@ package kr.co.vividnext.sodalive.mypage.can.coupon
|
||||
import android.os.Bundle
|
||||
import android.text.InputFilter
|
||||
import android.widget.Toast
|
||||
import kr.co.vividnext.sodalive.base.BaseActivity
|
||||
import kr.co.vividnext.sodalive.R
|
||||
import kr.co.vividnext.sodalive.base.BaseActivity
|
||||
import kr.co.vividnext.sodalive.common.LoadingDialog
|
||||
import kr.co.vividnext.sodalive.databinding.ActivityCanCouponBinding
|
||||
import org.koin.android.ext.android.inject
|
||||
|
||||
|
||||
class CanCouponActivity : BaseActivity<ActivityCanCouponBinding>(
|
||||
ActivityCanCouponBinding::inflate
|
||||
) {
|
||||
|
||||
@@ -5,10 +5,10 @@ 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.ToastMessage
|
||||
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
||||
import kr.co.vividnext.sodalive.R
|
||||
import kr.co.vividnext.sodalive.base.BaseViewModel
|
||||
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
||||
import kr.co.vividnext.sodalive.common.ToastMessage
|
||||
import kr.co.vividnext.sodalive.mypage.can.CanRepository
|
||||
|
||||
class CanCouponViewModel(private val repository: CanRepository) : BaseViewModel() {
|
||||
@@ -49,7 +49,6 @@ class CanCouponViewModel(private val repository: CanRepository) : BaseViewModel(
|
||||
_toastLiveData.value = it.message?.let { message ->
|
||||
ToastMessage(message = message)
|
||||
} ?: ToastMessage(resId = R.string.msg_can_coupon_unknown_error)
|
||||
|
||||
}
|
||||
)
|
||||
)
|
||||
|
||||
@@ -3,6 +3,9 @@ package kr.co.vividnext.sodalive.mypage.can.payment
|
||||
import com.google.gson.annotations.SerializedName
|
||||
|
||||
enum class PaymentGateway {
|
||||
@SerializedName("PG") PG,
|
||||
@SerializedName("GOOGLE_IAP") GOOGLE_IAP
|
||||
@SerializedName("PG")
|
||||
PG,
|
||||
|
||||
@SerializedName("GOOGLE_IAP")
|
||||
GOOGLE_IAP
|
||||
}
|
||||
|
||||
@@ -220,7 +220,8 @@ class ProfileUpdateActivity : BaseActivity<ActivityProfileUpdateBinding>(
|
||||
excludeGif = true,
|
||||
isEnabledFreeStyleCrop = false,
|
||||
config = ImagePickerCropper.Config(
|
||||
aspectX = 1f, aspectY = 1f,
|
||||
aspectX = 1f,
|
||||
aspectY = 1f,
|
||||
compressFormat = Bitmap.CompressFormat.JPEG,
|
||||
compressQuality = 90
|
||||
),
|
||||
|
||||
@@ -212,8 +212,10 @@ class ProfileUpdateViewModel(private val repository: UserRepository) : BaseViewM
|
||||
}
|
||||
)
|
||||
)
|
||||
} else run {
|
||||
onSuccess()
|
||||
} else {
|
||||
run {
|
||||
onSuccess()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+43
-43
@@ -68,28 +68,28 @@ class NicknameUpdateViewModel(private val repository: UserRepository) : BaseView
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(
|
||||
{
|
||||
_isLoading.value = false
|
||||
if (it.success) {
|
||||
isCheckedNickname = true
|
||||
_toastLiveData.postValue(
|
||||
ToastMessage(resId = R.string.msg_nickname_update_available)
|
||||
)
|
||||
} else {
|
||||
_toastLiveData.postValue(
|
||||
it.message?.let { message ->
|
||||
ToastMessage(message = message)
|
||||
} ?: ToastMessage(resId = R.string.common_error_unknown)
|
||||
)
|
||||
_isLoading.value = false
|
||||
if (it.success) {
|
||||
isCheckedNickname = true
|
||||
_toastLiveData.postValue(
|
||||
ToastMessage(resId = R.string.msg_nickname_update_available)
|
||||
)
|
||||
} else {
|
||||
_toastLiveData.postValue(
|
||||
it.message?.let { message ->
|
||||
ToastMessage(message = message)
|
||||
} ?: ToastMessage(resId = R.string.common_error_unknown)
|
||||
)
|
||||
}
|
||||
},
|
||||
{
|
||||
_isLoading.value = false
|
||||
it.message?.let { message -> Logger.e(message) }
|
||||
_toastLiveData.postValue(ToastMessage(resId = R.string.common_error_unknown))
|
||||
}
|
||||
},
|
||||
{
|
||||
_isLoading.value = false
|
||||
it.message?.let { message -> Logger.e(message) }
|
||||
_toastLiveData.postValue(ToastMessage(resId = R.string.common_error_unknown))
|
||||
}
|
||||
)
|
||||
)
|
||||
} else {
|
||||
)
|
||||
)
|
||||
} else {
|
||||
_toastLiveData.postValue(
|
||||
ToastMessage(resId = R.string.msg_nickname_update_input_required)
|
||||
)
|
||||
@@ -111,29 +111,29 @@ class NicknameUpdateViewModel(private val repository: UserRepository) : BaseView
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribe(
|
||||
{
|
||||
_isLoading.value = false
|
||||
if (it.success) {
|
||||
_toastLiveData.postValue(
|
||||
ToastMessage(resId = R.string.msg_nickname_update_success)
|
||||
)
|
||||
SharedPreferenceManager.nickname = nickname
|
||||
onSuccess()
|
||||
} else {
|
||||
_toastLiveData.postValue(
|
||||
it.message?.let { message ->
|
||||
ToastMessage(message = message)
|
||||
} ?: ToastMessage(resId = R.string.common_error_unknown)
|
||||
)
|
||||
_isLoading.value = false
|
||||
if (it.success) {
|
||||
_toastLiveData.postValue(
|
||||
ToastMessage(resId = R.string.msg_nickname_update_success)
|
||||
)
|
||||
SharedPreferenceManager.nickname = nickname
|
||||
onSuccess()
|
||||
} else {
|
||||
_toastLiveData.postValue(
|
||||
it.message?.let { message ->
|
||||
ToastMessage(message = message)
|
||||
} ?: ToastMessage(resId = R.string.common_error_unknown)
|
||||
)
|
||||
}
|
||||
},
|
||||
{
|
||||
_isLoading.value = false
|
||||
it.message?.let { message -> Logger.e(message) }
|
||||
_toastLiveData.postValue(ToastMessage(resId = R.string.common_error_unknown))
|
||||
}
|
||||
},
|
||||
{
|
||||
_isLoading.value = false
|
||||
it.message?.let { message -> Logger.e(message) }
|
||||
_toastLiveData.postValue(ToastMessage(resId = R.string.common_error_unknown))
|
||||
}
|
||||
)
|
||||
)
|
||||
} else {
|
||||
)
|
||||
)
|
||||
} else {
|
||||
_toastLiveData.postValue(
|
||||
ToastMessage(resId = R.string.msg_nickname_update_check_required)
|
||||
)
|
||||
|
||||
@@ -20,7 +20,9 @@ interface RecentContentDao {
|
||||
@Query("SELECT COUNT(*) FROM recent_contents")
|
||||
fun getCount(): Flow<Int>
|
||||
|
||||
@Query("DELETE FROM recent_contents WHERE contentId NOT IN (SELECT contentId FROM recent_contents ORDER BY listenedAt DESC LIMIT :limit)")
|
||||
@Query(
|
||||
"DELETE FROM recent_contents WHERE contentId NOT IN (SELECT contentId FROM recent_contents ORDER BY listenedAt DESC LIMIT :limit)"
|
||||
)
|
||||
suspend fun keepMostRecent(limit: Int)
|
||||
|
||||
@Query("DELETE FROM recent_contents")
|
||||
|
||||
Reference in New Issue
Block a user