refactor(ads): Yandex 광고와 관련 설정을 제거한다
This commit is contained in:
@@ -113,19 +113,6 @@ android {
|
|||||||
minifyEnabled true
|
minifyEnabled true
|
||||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
|
|
||||||
// release용 ad unit id는 배포 전 실제 값으로 교체한다.
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_LIVE_TAB_AD_UNIT_ID', '"R-M-19140295-3"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_LIVE_ROOM_DETAIL_AD_UNIT_ID', '"R-M-19140295-4"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_CREATOR_COMMUNITY_ALL_AD_UNIT_ID', '"R-M-19140295-7"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_SERIES_MAIN_HOME_AD_UNIT_ID', '"R-M-19140295-8"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_SERIES_MAIN_DAY_OF_WEEK_AD_UNIT_ID', '"R-M-19140295-9"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_SERIES_MAIN_BY_GENRE_AD_UNIT_ID', '"R-M-19140295-10"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_PUSH_NOTIFICATION_LIST_AD_UNIT_ID', '"R-M-19140295-11"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_NOTIFICATION_RECEIVE_SETTINGS_AD_UNIT_ID', '"R-M-19140295-12"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_CHARACTER_TAB_AD_UNIT_ID', '"R-M-19140295-13"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_ORIGINAL_TAB_AD_UNIT_ID', '"R-M-19140295-14"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_TALK_TAB_AD_UNIT_ID', '"R-M-19140295-15"'
|
|
||||||
buildConfigField 'String', 'YANDEX_REWARDED_CHAT_QUOTA_AD_UNIT_ID', '"R-M-19140295-16"'
|
|
||||||
buildConfigField 'String', 'BASE_URL', '"https://api.sodalive.net"'
|
buildConfigField 'String', 'BASE_URL', '"https://api.sodalive.net"'
|
||||||
buildConfigField 'String', 'AGORA_API_BASE_URL', '"https://api.agora.io/api/speech-to-speech-translation/v2/"'
|
buildConfigField 'String', 'AGORA_API_BASE_URL', '"https://api.agora.io/api/speech-to-speech-translation/v2/"'
|
||||||
buildConfigField 'String', 'AGORA_CUSTOMER_ID', '"de5dd9ea151f4a43ba1ad8411817b169"'
|
buildConfigField 'String', 'AGORA_CUSTOMER_ID', '"de5dd9ea151f4a43ba1ad8411817b169"'
|
||||||
@@ -133,7 +120,6 @@ android {
|
|||||||
buildConfigField 'String', 'BOOTPAY_APP_ID', '"64c35be1d25985001dc50c87"'
|
buildConfigField 'String', 'BOOTPAY_APP_ID', '"64c35be1d25985001dc50c87"'
|
||||||
buildConfigField 'String', 'BOOTPAY_APP_HECTO_ID', '"664c1707b18b225deca4b429"'
|
buildConfigField 'String', 'BOOTPAY_APP_HECTO_ID', '"664c1707b18b225deca4b429"'
|
||||||
buildConfigField 'String', 'AGORA_APP_ID', '"e34e40046e9847baba3adfe2b8ffb4f6"'
|
buildConfigField 'String', 'AGORA_APP_ID', '"e34e40046e9847baba3adfe2b8ffb4f6"'
|
||||||
buildConfigField 'String', 'AGORA_APP_CERTIFICATE', '"15cadeea4ba94ff7b091c9a10f4bf4a6"'
|
|
||||||
buildConfigField 'String', 'NOTIFLY_PROJECT_ID', '"765102ec85855aa680da35f1b0f55712"'
|
buildConfigField 'String', 'NOTIFLY_PROJECT_ID', '"765102ec85855aa680da35f1b0f55712"'
|
||||||
buildConfigField 'String', 'NOTIFLY_USERNAME', '"voiceon"'
|
buildConfigField 'String', 'NOTIFLY_USERNAME', '"voiceon"'
|
||||||
buildConfigField 'String', 'NOTIFLY_PASSWORD', '"c6c585db0aaa4189be44d0467c7d66b6@A"'
|
buildConfigField 'String', 'NOTIFLY_PASSWORD', '"c6c585db0aaa4189be44d0467c7d66b6@A"'
|
||||||
@@ -156,18 +142,6 @@ android {
|
|||||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
applicationIdSuffix '.debug'
|
applicationIdSuffix '.debug'
|
||||||
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_LIVE_TAB_AD_UNIT_ID', '"R-M-19140297-3"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_LIVE_ROOM_DETAIL_AD_UNIT_ID', '"R-M-19140297-4"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_CREATOR_COMMUNITY_ALL_AD_UNIT_ID', '"R-M-19140297-7"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_SERIES_MAIN_HOME_AD_UNIT_ID', '"R-M-19140297-8"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_SERIES_MAIN_DAY_OF_WEEK_AD_UNIT_ID', '"R-M-19140297-9"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_SERIES_MAIN_BY_GENRE_AD_UNIT_ID', '"R-M-19140297-10"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_PUSH_NOTIFICATION_LIST_AD_UNIT_ID', '"R-M-19140297-11"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_NOTIFICATION_RECEIVE_SETTINGS_AD_UNIT_ID', '"R-M-19140297-12"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_CHARACTER_TAB_AD_UNIT_ID', '"R-M-19140297-13"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_ORIGINAL_TAB_AD_UNIT_ID', '"R-M-19140297-14"'
|
|
||||||
buildConfigField 'String', 'YANDEX_INLINE_BANNER_TALK_TAB_AD_UNIT_ID', '"R-M-19140297-15"'
|
|
||||||
buildConfigField 'String', 'YANDEX_REWARDED_CHAT_QUOTA_AD_UNIT_ID', '"R-M-19140297-16"'
|
|
||||||
buildConfigField 'String', 'BASE_URL', '"https://test-api.sodalive.net"'
|
buildConfigField 'String', 'BASE_URL', '"https://test-api.sodalive.net"'
|
||||||
buildConfigField 'String', 'AGORA_API_BASE_URL', '"https://api.agora.io/api/speech-to-speech-translation/v2/"'
|
buildConfigField 'String', 'AGORA_API_BASE_URL', '"https://api.agora.io/api/speech-to-speech-translation/v2/"'
|
||||||
buildConfigField 'String', 'AGORA_CUSTOMER_ID', '"de5dd9ea151f4a43ba1ad8411817b169"'
|
buildConfigField 'String', 'AGORA_CUSTOMER_ID', '"de5dd9ea151f4a43ba1ad8411817b169"'
|
||||||
@@ -175,7 +149,6 @@ android {
|
|||||||
buildConfigField 'String', 'BOOTPAY_APP_ID', '"6242a7772701800023f68b2e"'
|
buildConfigField 'String', 'BOOTPAY_APP_ID', '"6242a7772701800023f68b2e"'
|
||||||
buildConfigField 'String', 'BOOTPAY_APP_HECTO_ID', '"667fca5d3bab7404f831c3e4"'
|
buildConfigField 'String', 'BOOTPAY_APP_HECTO_ID', '"667fca5d3bab7404f831c3e4"'
|
||||||
buildConfigField 'String', 'AGORA_APP_ID', '"b96574e191a9430fa54c605528aa3ef7"'
|
buildConfigField 'String', 'AGORA_APP_ID', '"b96574e191a9430fa54c605528aa3ef7"'
|
||||||
buildConfigField 'String', 'AGORA_APP_CERTIFICATE', '"ae18ade3afcf4086bd4397726eb0654c"'
|
|
||||||
buildConfigField 'String', 'NOTIFLY_PROJECT_ID', '"5f7ebe90d1ce5f0392164b8a53a662bc"'
|
buildConfigField 'String', 'NOTIFLY_PROJECT_ID', '"5f7ebe90d1ce5f0392164b8a53a662bc"'
|
||||||
buildConfigField 'String', 'NOTIFLY_USERNAME', '"voiceon"'
|
buildConfigField 'String', 'NOTIFLY_USERNAME', '"voiceon"'
|
||||||
buildConfigField 'String', 'NOTIFLY_PASSWORD', '"c6c585db0aaa4189be44d0467c7d66b6@A"'
|
buildConfigField 'String', 'NOTIFLY_PASSWORD', '"c6c585db0aaa4189be44d0467c7d66b6@A"'
|
||||||
@@ -333,9 +306,6 @@ dependencies {
|
|||||||
// Appsflyer
|
// Appsflyer
|
||||||
implementation 'com.appsflyer:af-android-sdk:6.17.4'
|
implementation 'com.appsflyer:af-android-sdk:6.17.4'
|
||||||
|
|
||||||
// Yandex Mobile Ads
|
|
||||||
implementation 'com.yandex.android:mobileads:7.18.5'
|
|
||||||
|
|
||||||
// 노티플라이
|
// 노티플라이
|
||||||
implementation 'com.github.team-michael:notifly-android-sdk:1.12.0'
|
implementation 'com.github.team-michael:notifly-android-sdk:1.12.0'
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ import com.facebook.FacebookSdk
|
|||||||
import com.kakao.sdk.common.KakaoSdk
|
import com.kakao.sdk.common.KakaoSdk
|
||||||
import com.orhanobut.logger.AndroidLogAdapter
|
import com.orhanobut.logger.AndroidLogAdapter
|
||||||
import com.orhanobut.logger.Logger
|
import com.orhanobut.logger.Logger
|
||||||
import com.yandex.mobile.ads.common.MobileAds
|
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
import kr.co.vividnext.sodalive.BuildConfig
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.chat.talk.room.ChatRoomPreferenceManager
|
import kr.co.vividnext.sodalive.chat.talk.room.ChatRoomPreferenceManager
|
||||||
@@ -54,7 +53,6 @@ class SodaLiveApp : Application(), DefaultLifecycleObserver {
|
|||||||
|
|
||||||
setupNotifly()
|
setupNotifly()
|
||||||
|
|
||||||
setupYandexAd()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun isDebuggable(): Boolean {
|
private fun isDebuggable(): Boolean {
|
||||||
@@ -140,10 +138,6 @@ class SodaLiveApp : Application(), DefaultLifecycleObserver {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupYandexAd() {
|
|
||||||
MobileAds.enableDebugErrorIndicator(BuildConfig.DEBUG && isDebuggable())
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onStart(owner: LifecycleOwner) {
|
override fun onStart(owner: LifecycleOwner) {
|
||||||
super.onStart(owner)
|
super.onStart(owner)
|
||||||
isAppInForeground = true
|
isAppInForeground = true
|
||||||
|
|||||||
-30
@@ -8,9 +8,6 @@ import android.widget.Toast
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
|
import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
|
||||||
import kr.co.vividnext.sodalive.base.BaseFragment
|
import kr.co.vividnext.sodalive.base.BaseFragment
|
||||||
import kr.co.vividnext.sodalive.common.Constants
|
import kr.co.vividnext.sodalive.common.Constants
|
||||||
@@ -41,36 +38,9 @@ class SeriesMainByGenreFragment : BaseFragment<FragmentSeriesMainByGenreBinding>
|
|||||||
private fun setupView() {
|
private fun setupView() {
|
||||||
loadingDialog = LoadingDialog(requireActivity(), layoutInflater)
|
loadingDialog = LoadingDialog(requireActivity(), layoutInflater)
|
||||||
setupGenreView()
|
setupGenreView()
|
||||||
setupInlineBanner()
|
|
||||||
setupSeriesView()
|
setupSeriesView()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
|
||||||
binding.yandexInlineBannerView.destroy()
|
|
||||||
super.onDestroyView()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupInlineBanner() {
|
|
||||||
binding.yandexInlineBannerView.post {
|
|
||||||
val density = resources.displayMetrics.density
|
|
||||||
val adWidthPixels = binding.yandexInlineBannerView.width.takeIf { it > 0 } ?: screenWidth
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt()
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
binding.yandexInlineBannerView.apply {
|
|
||||||
setAdUnitId(BuildConfig.YANDEX_INLINE_BANNER_SERIES_MAIN_BY_GENRE_AD_UNIT_ID)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
requireContext(),
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupGenreView() {
|
private fun setupGenreView() {
|
||||||
genreAdapter = GenreAdapter { genre ->
|
genreAdapter = GenreAdapter { genre ->
|
||||||
seriesAdapter.clear()
|
seriesAdapter.clear()
|
||||||
|
|||||||
-30
@@ -8,9 +8,6 @@ import android.widget.Toast
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
|
import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
|
||||||
import kr.co.vividnext.sodalive.base.BaseFragment
|
import kr.co.vividnext.sodalive.base.BaseFragment
|
||||||
import kr.co.vividnext.sodalive.common.Constants
|
import kr.co.vividnext.sodalive.common.Constants
|
||||||
@@ -43,7 +40,6 @@ class SeriesMainDayOfWeekFragment : BaseFragment<FragmentSeriesMainDayOfWeekBind
|
|||||||
loadingDialog = LoadingDialog(requireActivity(), layoutInflater)
|
loadingDialog = LoadingDialog(requireActivity(), layoutInflater)
|
||||||
|
|
||||||
setupDayOfWeekDay()
|
setupDayOfWeekDay()
|
||||||
setupInlineBanner()
|
|
||||||
setupSeriesView()
|
setupSeriesView()
|
||||||
|
|
||||||
val dayOfWeeks = listOf(
|
val dayOfWeeks = listOf(
|
||||||
@@ -63,32 +59,6 @@ class SeriesMainDayOfWeekFragment : BaseFragment<FragmentSeriesMainDayOfWeekBind
|
|||||||
viewModel.dayOfWeek = dayOfWeeks[dayIndex]
|
viewModel.dayOfWeek = dayOfWeeks[dayIndex]
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
|
||||||
binding.yandexInlineBannerView.destroy()
|
|
||||||
super.onDestroyView()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupInlineBanner() {
|
|
||||||
binding.yandexInlineBannerView.post {
|
|
||||||
val density = resources.displayMetrics.density
|
|
||||||
val adWidthPixels = binding.yandexInlineBannerView.width.takeIf { it > 0 } ?: screenWidth
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt()
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
binding.yandexInlineBannerView.apply {
|
|
||||||
setAdUnitId(BuildConfig.YANDEX_INLINE_BANNER_SERIES_MAIN_DAY_OF_WEEK_AD_UNIT_ID)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
requireContext(),
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupDayOfWeekDay() {
|
private fun setupDayOfWeekDay() {
|
||||||
val dayOfWeekAdapter = DayOfWeekAdapter(requireContext()) {
|
val dayOfWeekAdapter = DayOfWeekAdapter(requireContext()) {
|
||||||
adapter.clear()
|
adapter.clear()
|
||||||
|
|||||||
-30
@@ -12,12 +12,9 @@ import androidx.media3.common.util.UnstableApi
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import com.zhpan.bannerview.BaseBannerAdapter
|
import com.zhpan.bannerview.BaseBannerAdapter
|
||||||
import com.zhpan.indicator.enums.IndicatorSlideMode
|
import com.zhpan.indicator.enums.IndicatorSlideMode
|
||||||
import com.zhpan.indicator.enums.IndicatorStyle
|
import com.zhpan.indicator.enums.IndicatorStyle
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.audio_content.series.SeriesListAllActivity
|
import kr.co.vividnext.sodalive.audio_content.series.SeriesListAllActivity
|
||||||
import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
|
import kr.co.vividnext.sodalive.audio_content.series.detail.SeriesDetailActivity
|
||||||
@@ -57,36 +54,9 @@ class SeriesMainHomeFragment : BaseFragment<FragmentSeriesMainHomeBinding>(
|
|||||||
|
|
||||||
setupBanner()
|
setupBanner()
|
||||||
setupCompletedSeriesView()
|
setupCompletedSeriesView()
|
||||||
setupInlineBanner()
|
|
||||||
setupRecommendSeriesView()
|
setupRecommendSeriesView()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
|
||||||
binding.yandexInlineBannerView.destroy()
|
|
||||||
super.onDestroyView()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupInlineBanner() {
|
|
||||||
binding.yandexInlineBannerView.post {
|
|
||||||
val density = resources.displayMetrics.density
|
|
||||||
val adWidthPixels = binding.yandexInlineBannerView.width.takeIf { it > 0 } ?: screenWidth
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt()
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
binding.yandexInlineBannerView.apply {
|
|
||||||
setAdUnitId(BuildConfig.YANDEX_INLINE_BANNER_SERIES_MAIN_HOME_AD_UNIT_ID)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
requireContext(),
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupBanner() {
|
private fun setupBanner() {
|
||||||
val layoutParams = binding
|
val layoutParams = binding
|
||||||
.bannerSlider
|
.bannerSlider
|
||||||
|
|||||||
@@ -13,12 +13,9 @@ import androidx.media3.common.util.UnstableApi
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import com.zhpan.bannerview.BaseBannerAdapter
|
import com.zhpan.bannerview.BaseBannerAdapter
|
||||||
import com.zhpan.indicator.enums.IndicatorSlideMode
|
import com.zhpan.indicator.enums.IndicatorSlideMode
|
||||||
import com.zhpan.indicator.enums.IndicatorStyle
|
import com.zhpan.indicator.enums.IndicatorStyle
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.base.BaseFragment
|
import kr.co.vividnext.sodalive.base.BaseFragment
|
||||||
import kr.co.vividnext.sodalive.base.SodaDialog
|
import kr.co.vividnext.sodalive.base.SodaDialog
|
||||||
@@ -36,7 +33,6 @@ import kr.co.vividnext.sodalive.main.MainActivity
|
|||||||
import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow
|
import kr.co.vividnext.sodalive.v2.auth.V2AuthFlow
|
||||||
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
import kotlin.math.roundToInt
|
|
||||||
|
|
||||||
// 캐릭터 탭 프래그먼트
|
// 캐릭터 탭 프래그먼트
|
||||||
@OptIn(UnstableApi::class)
|
@OptIn(UnstableApi::class)
|
||||||
@@ -60,43 +56,16 @@ class CharacterTabFragment : BaseFragment<FragmentCharacterTabBinding>(
|
|||||||
viewModel.fetchData()
|
viewModel.fetchData()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
|
||||||
binding.yandexInlineBannerView.destroy()
|
|
||||||
super.onDestroyView()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupView() {
|
private fun setupView() {
|
||||||
loadingDialog = LoadingDialog(requireActivity(), layoutInflater)
|
loadingDialog = LoadingDialog(requireActivity(), layoutInflater)
|
||||||
|
|
||||||
setupBanner()
|
setupBanner()
|
||||||
setupRecentCharactersRecyclerView()
|
setupRecentCharactersRecyclerView()
|
||||||
setupCharacterTabInlineBanner()
|
|
||||||
setupPopularCharactersRecyclerView()
|
setupPopularCharactersRecyclerView()
|
||||||
setupNewCharactersRecyclerView()
|
setupNewCharactersRecyclerView()
|
||||||
setupRecommendCharactersRecyclerView()
|
setupRecommendCharactersRecyclerView()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupCharacterTabInlineBanner() {
|
|
||||||
binding.yandexInlineBannerView.post {
|
|
||||||
val density = resources.displayMetrics.density
|
|
||||||
val adWidthPixels = binding.yandexInlineBannerView.width.takeIf { it > 0 } ?: screenWidth
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt()
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
binding.yandexInlineBannerView.apply {
|
|
||||||
setAdUnitId(BuildConfig.YANDEX_INLINE_BANNER_CHARACTER_TAB_AD_UNIT_ID)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
requireContext(),
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupBanner() {
|
private fun setupBanner() {
|
||||||
val layoutParams = binding
|
val layoutParams = binding
|
||||||
.bannerSlider
|
.bannerSlider
|
||||||
|
|||||||
@@ -10,8 +10,6 @@ import androidx.media3.common.util.UnstableApi
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import androidx.recyclerview.widget.ConcatAdapter
|
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.base.BaseFragment
|
import kr.co.vividnext.sodalive.base.BaseFragment
|
||||||
import kr.co.vividnext.sodalive.base.SodaDialog
|
import kr.co.vividnext.sodalive.base.SodaDialog
|
||||||
@@ -19,7 +17,6 @@ import kr.co.vividnext.sodalive.chat.original.detail.OriginalWorkDetailActivity
|
|||||||
import kr.co.vividnext.sodalive.common.GridSpacingItemDecoration
|
import kr.co.vividnext.sodalive.common.GridSpacingItemDecoration
|
||||||
import kr.co.vividnext.sodalive.common.LoadingDialog
|
import kr.co.vividnext.sodalive.common.LoadingDialog
|
||||||
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
||||||
import kr.co.vividnext.sodalive.common.YandexInlineBannerHeaderAdapter
|
|
||||||
import kr.co.vividnext.sodalive.databinding.FragmentOriginalTabBinding
|
import kr.co.vividnext.sodalive.databinding.FragmentOriginalTabBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
import kr.co.vividnext.sodalive.main.MainActivity
|
import kr.co.vividnext.sodalive.main.MainActivity
|
||||||
@@ -33,7 +30,6 @@ class OriginalTabFragment :
|
|||||||
private val viewModel: OriginalWorkViewModel by inject()
|
private val viewModel: OriginalWorkViewModel by inject()
|
||||||
|
|
||||||
private lateinit var adapter: OriginalWorkListAdapter
|
private lateinit var adapter: OriginalWorkListAdapter
|
||||||
private lateinit var bannerAdapter: YandexInlineBannerHeaderAdapter
|
|
||||||
|
|
||||||
private lateinit var loadingDialog: LoadingDialog
|
private lateinit var loadingDialog: LoadingDialog
|
||||||
|
|
||||||
@@ -47,19 +43,9 @@ class OriginalTabFragment :
|
|||||||
viewModel.loadMore()
|
viewModel.loadMore()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
|
||||||
bannerAdapter.destroy()
|
|
||||||
super.onDestroyView()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupRecycler() {
|
private fun setupRecycler() {
|
||||||
val spanCount = 3
|
val spanCount = 3
|
||||||
val spacingPx = 16f.dpToPx().toInt()
|
val spacingPx = 16f.dpToPx().toInt()
|
||||||
val headerCount = 1
|
|
||||||
bannerAdapter = YandexInlineBannerHeaderAdapter(
|
|
||||||
adUnitId = BuildConfig.YANDEX_INLINE_BANNER_ORIGINAL_TAB_AD_UNIT_ID,
|
|
||||||
screenWidth = screenWidth
|
|
||||||
)
|
|
||||||
adapter = OriginalWorkListAdapter { id ->
|
adapter = OriginalWorkListAdapter { id ->
|
||||||
ensureLoginAndAuth {
|
ensureLoginAndAuth {
|
||||||
startActivity(
|
startActivity(
|
||||||
@@ -73,19 +59,12 @@ class OriginalTabFragment :
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
binding.rvOriginal.setPadding(0, 0, 0, 8f.dpToPx().toInt())
|
binding.rvOriginal.setPadding(0, 0, 0, 8f.dpToPx().toInt())
|
||||||
binding.rvOriginal.layoutManager = GridLayoutManager(requireContext(), spanCount).apply {
|
binding.rvOriginal.layoutManager = GridLayoutManager(requireContext(), spanCount)
|
||||||
spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
|
|
||||||
override fun getSpanSize(position: Int): Int {
|
|
||||||
return if (position < headerCount) spanCount else 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
binding.rvOriginal.addItemDecoration(
|
binding.rvOriginal.addItemDecoration(
|
||||||
GridSpacingItemDecoration(
|
GridSpacingItemDecoration(
|
||||||
spanCount,
|
spanCount,
|
||||||
spacingPx,
|
spacingPx,
|
||||||
true,
|
true
|
||||||
headerCount
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
binding.rvOriginal.addOnScrollListener(object : RecyclerView.OnScrollListener() {
|
binding.rvOriginal.addOnScrollListener(object : RecyclerView.OnScrollListener() {
|
||||||
@@ -99,7 +78,7 @@ class OriginalTabFragment :
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
binding.rvOriginal.adapter = ConcatAdapter(bannerAdapter, adapter)
|
binding.rvOriginal.adapter = adapter
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun bind() {
|
private fun bind() {
|
||||||
|
|||||||
@@ -4,15 +4,12 @@ import android.graphics.Rect
|
|||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.recyclerview.widget.ConcatAdapter
|
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.base.BaseFragment
|
import kr.co.vividnext.sodalive.base.BaseFragment
|
||||||
import kr.co.vividnext.sodalive.chat.talk.room.ChatRoomActivity
|
import kr.co.vividnext.sodalive.chat.talk.room.ChatRoomActivity
|
||||||
import kr.co.vividnext.sodalive.common.LoadingDialog
|
import kr.co.vividnext.sodalive.common.LoadingDialog
|
||||||
import kr.co.vividnext.sodalive.common.YandexInlineBannerHeaderAdapter
|
|
||||||
import kr.co.vividnext.sodalive.databinding.FragmentTalkTabBinding
|
import kr.co.vividnext.sodalive.databinding.FragmentTalkTabBinding
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
@@ -23,7 +20,6 @@ class TalkTabFragment : BaseFragment<FragmentTalkTabBinding>(
|
|||||||
private val viewModel: TalkTabViewModel by inject()
|
private val viewModel: TalkTabViewModel by inject()
|
||||||
|
|
||||||
private lateinit var adapter: TalkTabAdapter
|
private lateinit var adapter: TalkTabAdapter
|
||||||
private lateinit var bannerAdapter: YandexInlineBannerHeaderAdapter
|
|
||||||
|
|
||||||
private lateinit var loadingDialog: LoadingDialog
|
private lateinit var loadingDialog: LoadingDialog
|
||||||
|
|
||||||
@@ -38,17 +34,7 @@ class TalkTabFragment : BaseFragment<FragmentTalkTabBinding>(
|
|||||||
viewModel.refreshTalkRooms()
|
viewModel.refreshTalkRooms()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
|
||||||
bannerAdapter.destroy()
|
|
||||||
super.onDestroyView()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupRecyclerView() {
|
private fun setupRecyclerView() {
|
||||||
val headerCount = 1
|
|
||||||
bannerAdapter = YandexInlineBannerHeaderAdapter(
|
|
||||||
adUnitId = BuildConfig.YANDEX_INLINE_BANNER_TALK_TAB_AD_UNIT_ID,
|
|
||||||
screenWidth = screenWidth
|
|
||||||
)
|
|
||||||
adapter = TalkTabAdapter {
|
adapter = TalkTabAdapter {
|
||||||
startActivity(
|
startActivity(
|
||||||
ChatRoomActivity.newIntent(
|
ChatRoomActivity.newIntent(
|
||||||
@@ -71,20 +57,19 @@ class TalkTabFragment : BaseFragment<FragmentTalkTabBinding>(
|
|||||||
super.getItemOffsets(outRect, view, parent, state)
|
super.getItemOffsets(outRect, view, parent, state)
|
||||||
|
|
||||||
val position = parent.getChildAdapterPosition(view)
|
val position = parent.getChildAdapterPosition(view)
|
||||||
if (position < headerCount) {
|
if (position == RecyclerView.NO_POSITION) {
|
||||||
outRect.set(0, 0, 0, 0)
|
outRect.set(0, 0, 0, 0)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
val adjustedPosition = position - headerCount
|
|
||||||
val lastItemPosition = adapter.itemCount - 1
|
val lastItemPosition = adapter.itemCount - 1
|
||||||
|
|
||||||
outRect.left = 24f.dpToPx().toInt()
|
outRect.left = 24f.dpToPx().toInt()
|
||||||
outRect.right = 24f.dpToPx().toInt()
|
outRect.right = 24f.dpToPx().toInt()
|
||||||
|
|
||||||
when (adjustedPosition) {
|
when (position) {
|
||||||
0 -> {
|
0 -> {
|
||||||
outRect.bottom = if (adjustedPosition == lastItemPosition) {
|
outRect.bottom = if (position == lastItemPosition) {
|
||||||
24f.dpToPx().toInt()
|
24f.dpToPx().toInt()
|
||||||
} else {
|
} else {
|
||||||
12f.dpToPx().toInt()
|
12f.dpToPx().toInt()
|
||||||
@@ -107,7 +92,7 @@ class TalkTabFragment : BaseFragment<FragmentTalkTabBinding>(
|
|||||||
recyclerView.apply {
|
recyclerView.apply {
|
||||||
val lm = LinearLayoutManager(requireContext())
|
val lm = LinearLayoutManager(requireContext())
|
||||||
layoutManager = lm
|
layoutManager = lm
|
||||||
adapter = ConcatAdapter(bannerAdapter, this@TalkTabFragment.adapter)
|
adapter = this@TalkTabFragment.adapter
|
||||||
|
|
||||||
// 스크롤 로딩 리스너: 끝에 도달하면 다음 페이지 로드
|
// 스크롤 로딩 리스너: 끝에 도달하면 다음 페이지 로드
|
||||||
addOnScrollListener(object : RecyclerView.OnScrollListener() {
|
addOnScrollListener(object : RecyclerView.OnScrollListener() {
|
||||||
|
|||||||
@@ -41,7 +41,6 @@ sealed class ChatListItem {
|
|||||||
}
|
}
|
||||||
|
|
||||||
enum class ChatQuotaNoticeAction {
|
enum class ChatQuotaNoticeAction {
|
||||||
REWARDED_AD,
|
|
||||||
PURCHASE_10_CAN,
|
PURCHASE_10_CAN,
|
||||||
PURCHASE_20_CAN
|
PURCHASE_20_CAN
|
||||||
}
|
}
|
||||||
@@ -69,10 +68,7 @@ class ChatMessageAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
|
|||||||
fun onRetrySend(localId: String)
|
fun onRetrySend(localId: String)
|
||||||
fun onPurchaseMessage(message: ChatMessage)
|
fun onPurchaseMessage(message: ChatMessage)
|
||||||
fun onOpenPurchasedImage(message: ChatMessage)
|
fun onOpenPurchasedImage(message: ChatMessage)
|
||||||
fun onPurchaseQuota()
|
fun onQuotaNoticeAction(action: ChatQuotaNoticeAction)
|
||||||
fun onQuotaNoticeAction(action: ChatQuotaNoticeAction) {
|
|
||||||
onPurchaseQuota()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private var callback: Callback? = null
|
private var callback: Callback? = null
|
||||||
|
|||||||
@@ -14,18 +14,8 @@ import androidx.recyclerview.widget.LinearLayoutManager
|
|||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import androidx.recyclerview.widget.SimpleItemAnimator
|
import androidx.recyclerview.widget.SimpleItemAnimator
|
||||||
import coil.load
|
import coil.load
|
||||||
import com.yandex.mobile.ads.common.AdError
|
|
||||||
import com.yandex.mobile.ads.common.AdRequestConfiguration
|
|
||||||
import com.yandex.mobile.ads.common.AdRequestError
|
|
||||||
import com.yandex.mobile.ads.common.ImpressionData
|
|
||||||
import com.yandex.mobile.ads.rewarded.Reward
|
|
||||||
import com.yandex.mobile.ads.rewarded.RewardedAd
|
|
||||||
import com.yandex.mobile.ads.rewarded.RewardedAdEventListener
|
|
||||||
import com.yandex.mobile.ads.rewarded.RewardedAdLoadListener
|
|
||||||
import com.yandex.mobile.ads.rewarded.RewardedAdLoader
|
|
||||||
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
|
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
|
||||||
import io.reactivex.rxjava3.schedulers.Schedulers
|
import io.reactivex.rxjava3.schedulers.Schedulers
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.base.BaseActivity
|
import kr.co.vividnext.sodalive.base.BaseActivity
|
||||||
import kr.co.vividnext.sodalive.base.SodaDialog
|
import kr.co.vividnext.sodalive.base.SodaDialog
|
||||||
@@ -58,13 +48,7 @@ class ChatRoomActivity : BaseActivity<ActivityChatRoomBinding>(
|
|||||||
private var hasMoreMessages: Boolean = true // Repository 연동 시 서버 값으로 갱신 예정
|
private var hasMoreMessages: Boolean = true // Repository 연동 시 서버 값으로 갱신 예정
|
||||||
private var nextCursor: Long? = null // 가장 오래된 메시지의 timestamp 등
|
private var nextCursor: Long? = null // 가장 오래된 메시지의 timestamp 등
|
||||||
|
|
||||||
// 쿼터/광고 상태
|
|
||||||
private var currentTotalRemaining: Int = Int.MAX_VALUE
|
|
||||||
private var chatQuotaRewardedAdLoader: RewardedAdLoader? = null
|
|
||||||
private var chatQuotaRewardedAd: RewardedAd? = null
|
|
||||||
private var hasRewardHandledForCurrentAd: Boolean = false
|
|
||||||
private var isQuotaPurchaseInFlight: Boolean = false
|
private var isQuotaPurchaseInFlight: Boolean = false
|
||||||
private var isChatQuotaRewardedAdShowing: Boolean = false
|
|
||||||
|
|
||||||
// 5.3 헤더 데이터 (7.x 연동 전까지는 nullable 보관)
|
// 5.3 헤더 데이터 (7.x 연동 전까지는 nullable 보관)
|
||||||
private var characterInfo: CharacterInfo? = null
|
private var characterInfo: CharacterInfo? = null
|
||||||
@@ -214,10 +198,6 @@ class ChatRoomActivity : BaseActivity<ActivityChatRoomBinding>(
|
|||||||
openPurchasedImageCarousel(message)
|
openPurchasedImageCarousel(message)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onPurchaseQuota() {
|
|
||||||
onQuotaNoticeAction(ChatQuotaNoticeAction.REWARDED_AD)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onQuotaNoticeAction(action: ChatQuotaNoticeAction) {
|
override fun onQuotaNoticeAction(action: ChatQuotaNoticeAction) {
|
||||||
this@ChatRoomActivity.onQuotaNoticeAction(action)
|
this@ChatRoomActivity.onQuotaNoticeAction(action)
|
||||||
}
|
}
|
||||||
@@ -486,7 +466,6 @@ class ChatRoomActivity : BaseActivity<ActivityChatRoomBinding>(
|
|||||||
if (isQuotaPurchaseInFlight) return
|
if (isQuotaPurchaseInFlight) return
|
||||||
|
|
||||||
when (action) {
|
when (action) {
|
||||||
ChatQuotaNoticeAction.REWARDED_AD -> showChatQuotaRewardedAd()
|
|
||||||
ChatQuotaNoticeAction.PURCHASE_10_CAN -> purchaseChatQuota(ChatRoomQuotaCanOption.CAN_10)
|
ChatQuotaNoticeAction.PURCHASE_10_CAN -> purchaseChatQuota(ChatRoomQuotaCanOption.CAN_10)
|
||||||
ChatQuotaNoticeAction.PURCHASE_20_CAN -> purchaseChatQuota(ChatRoomQuotaCanOption.CAN_20)
|
ChatQuotaNoticeAction.PURCHASE_20_CAN -> purchaseChatQuota(ChatRoomQuotaCanOption.CAN_20)
|
||||||
}
|
}
|
||||||
@@ -518,30 +497,7 @@ class ChatRoomActivity : BaseActivity<ActivityChatRoomBinding>(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun purchaseRewardedChatQuota() {
|
|
||||||
if (isQuotaPurchaseInFlight) return
|
|
||||||
|
|
||||||
val token = "Bearer ${SharedPreferenceManager.token}"
|
|
||||||
isQuotaPurchaseInFlight = true
|
|
||||||
compositeDisposable.add(
|
|
||||||
chatRepository.purchaseChatQuota(
|
|
||||||
roomId = roomId,
|
|
||||||
token = token,
|
|
||||||
chargeType = ChatRoomQuotaChargeType.AD
|
|
||||||
)
|
|
||||||
.doFinally { isQuotaPurchaseInFlight = false }
|
|
||||||
.observeOn(AndroidSchedulers.mainThread())
|
|
||||||
.subscribe({ resp ->
|
|
||||||
updateQuotaUi(resp.totalRemaining)
|
|
||||||
}, { err ->
|
|
||||||
showToast(err.message ?: getString(R.string.chat_quota_purchase_failed))
|
|
||||||
})
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun updateQuotaUi(totalRemaining: Int) {
|
private fun updateQuotaUi(totalRemaining: Int) {
|
||||||
currentTotalRemaining = totalRemaining
|
|
||||||
|
|
||||||
if (totalRemaining <= 0) {
|
if (totalRemaining <= 0) {
|
||||||
binding.inputContainer.isVisible = false
|
binding.inputContainer.isVisible = false
|
||||||
ensureQuotaNoticeShown()
|
ensureQuotaNoticeShown()
|
||||||
@@ -549,10 +505,6 @@ class ChatRoomActivity : BaseActivity<ActivityChatRoomBinding>(
|
|||||||
binding.inputContainer.isVisible = true
|
binding.inputContainer.isVisible = true
|
||||||
ensureQuotaNoticeRemoved()
|
ensureQuotaNoticeRemoved()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (totalRemaining <= 1) {
|
|
||||||
preloadChatQuotaRewardedAd()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun ensureQuotaNoticeShown() {
|
private fun ensureQuotaNoticeShown() {
|
||||||
@@ -569,105 +521,6 @@ class ChatRoomActivity : BaseActivity<ActivityChatRoomBinding>(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private val chatQuotaRewardedAdLoadListener = object : RewardedAdLoadListener {
|
|
||||||
override fun onAdLoaded(rewardedAd: RewardedAd) {
|
|
||||||
chatQuotaRewardedAdLoader = null
|
|
||||||
clearChatQuotaRewardedAd()
|
|
||||||
chatQuotaRewardedAd = rewardedAd
|
|
||||||
hasRewardHandledForCurrentAd = false
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onAdFailedToLoad(adRequestError: AdRequestError) {
|
|
||||||
chatQuotaRewardedAdLoader = null
|
|
||||||
chatQuotaRewardedAd = null
|
|
||||||
hasRewardHandledForCurrentAd = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private val chatQuotaRewardedAdEventListener = object : RewardedAdEventListener {
|
|
||||||
override fun onAdShown() {
|
|
||||||
isChatQuotaRewardedAdShowing = true
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onAdFailedToShow(adError: AdError) {
|
|
||||||
isChatQuotaRewardedAdShowing = false
|
|
||||||
clearChatQuotaRewardedAd()
|
|
||||||
preloadChatQuotaRewardedAd(force = true)
|
|
||||||
showToast(getString(R.string.chat_quota_rewarded_ad_unavailable))
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onAdDismissed() {
|
|
||||||
isChatQuotaRewardedAdShowing = false
|
|
||||||
val rewardHandled = hasRewardHandledForCurrentAd
|
|
||||||
clearChatQuotaRewardedAd()
|
|
||||||
if (!rewardHandled && currentTotalRemaining <= 1) {
|
|
||||||
preloadChatQuotaRewardedAd(force = true)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onAdClicked() = Unit
|
|
||||||
|
|
||||||
override fun onAdImpression(impressionData: ImpressionData?) = Unit
|
|
||||||
|
|
||||||
override fun onRewarded(reward: Reward) {
|
|
||||||
if (hasRewardHandledForCurrentAd) return
|
|
||||||
hasRewardHandledForCurrentAd = true
|
|
||||||
purchaseRewardedChatQuota()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun preloadChatQuotaRewardedAd(force: Boolean = false) {
|
|
||||||
if (!force && (chatQuotaRewardedAd != null || chatQuotaRewardedAdLoader != null)) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
val adUnitId = BuildConfig.YANDEX_REWARDED_CHAT_QUOTA_AD_UNIT_ID
|
|
||||||
if (adUnitId.isBlank()) return
|
|
||||||
|
|
||||||
chatQuotaRewardedAdLoader?.setAdLoadListener(null)
|
|
||||||
chatQuotaRewardedAdLoader = RewardedAdLoader(this).apply {
|
|
||||||
setAdLoadListener(chatQuotaRewardedAdLoadListener)
|
|
||||||
}
|
|
||||||
chatQuotaRewardedAdLoader?.loadAd(
|
|
||||||
AdRequestConfiguration.Builder(adUnitId).build()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun showChatQuotaRewardedAd() {
|
|
||||||
if (isQuotaPurchaseInFlight || isChatQuotaRewardedAdShowing) return
|
|
||||||
|
|
||||||
val rewardedAd = chatQuotaRewardedAd
|
|
||||||
if (rewardedAd == null) {
|
|
||||||
preloadChatQuotaRewardedAd(force = true)
|
|
||||||
showToast(getString(R.string.chat_quota_rewarded_ad_unavailable))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
hasRewardHandledForCurrentAd = false
|
|
||||||
isChatQuotaRewardedAdShowing = true
|
|
||||||
rewardedAd.setAdEventListener(chatQuotaRewardedAdEventListener)
|
|
||||||
runCatching {
|
|
||||||
rewardedAd.show(this)
|
|
||||||
}.onFailure {
|
|
||||||
isChatQuotaRewardedAdShowing = false
|
|
||||||
clearChatQuotaRewardedAd()
|
|
||||||
preloadChatQuotaRewardedAd(force = true)
|
|
||||||
showToast(getString(R.string.chat_quota_rewarded_ad_unavailable))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun clearChatQuotaRewardedAd() {
|
|
||||||
chatQuotaRewardedAd?.setAdEventListener(null)
|
|
||||||
chatQuotaRewardedAd = null
|
|
||||||
hasRewardHandledForCurrentAd = false
|
|
||||||
isChatQuotaRewardedAdShowing = false
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun releaseChatQuotaRewardedAd() {
|
|
||||||
chatQuotaRewardedAdLoader?.setAdLoadListener(null)
|
|
||||||
chatQuotaRewardedAdLoader = null
|
|
||||||
clearChatQuotaRewardedAd()
|
|
||||||
}
|
|
||||||
// endregion Quota handling
|
// endregion Quota handling
|
||||||
|
|
||||||
private fun loadInitialMessages() {
|
private fun loadInitialMessages() {
|
||||||
@@ -1039,11 +892,6 @@ class ChatRoomActivity : BaseActivity<ActivityChatRoomBinding>(
|
|||||||
).show(resources.displayMetrics.widthPixels)
|
).show(resources.displayMetrics.widthPixels)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroy() {
|
|
||||||
releaseChatQuotaRewardedAd()
|
|
||||||
super.onDestroy()
|
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
const val EXTRA_ROOM_ID: String = "extra_room_id"
|
const val EXTRA_ROOM_ID: String = "extra_room_id"
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -12,8 +12,7 @@ data class ChatQuotaPurchaseRequest(
|
|||||||
|
|
||||||
@Keep
|
@Keep
|
||||||
enum class ChatRoomQuotaChargeType {
|
enum class ChatRoomQuotaChargeType {
|
||||||
CAN,
|
CAN
|
||||||
AD
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Keep
|
@Keep
|
||||||
|
|||||||
@@ -1,75 +0,0 @@
|
|||||||
package kr.co.vividnext.sodalive.common
|
|
||||||
|
|
||||||
import android.view.ViewGroup
|
|
||||||
import android.widget.FrameLayout
|
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.banner.BannerAdView
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
|
||||||
import kotlin.math.roundToInt
|
|
||||||
|
|
||||||
class YandexInlineBannerHeaderAdapter(
|
|
||||||
private val adUnitId: String,
|
|
||||||
private val screenWidth: Int
|
|
||||||
) : RecyclerView.Adapter<YandexInlineBannerHeaderAdapter.BannerViewHolder>() {
|
|
||||||
|
|
||||||
private var bannerAdView: BannerAdView? = null
|
|
||||||
|
|
||||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BannerViewHolder {
|
|
||||||
val horizontalPadding = 24f.dpToPx().toInt()
|
|
||||||
val verticalPadding = 24f.dpToPx().toInt()
|
|
||||||
val container = FrameLayout(parent.context).apply {
|
|
||||||
layoutParams = ViewGroup.LayoutParams(
|
|
||||||
ViewGroup.LayoutParams.MATCH_PARENT,
|
|
||||||
ViewGroup.LayoutParams.WRAP_CONTENT
|
|
||||||
)
|
|
||||||
setPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding)
|
|
||||||
}
|
|
||||||
val bannerView = BannerAdView(parent.context).apply {
|
|
||||||
layoutParams = FrameLayout.LayoutParams(
|
|
||||||
FrameLayout.LayoutParams.MATCH_PARENT,
|
|
||||||
FrameLayout.LayoutParams.WRAP_CONTENT
|
|
||||||
)
|
|
||||||
}
|
|
||||||
container.addView(bannerView)
|
|
||||||
return BannerViewHolder(container, bannerView).apply {
|
|
||||||
setIsRecyclable(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getItemCount(): Int = 1
|
|
||||||
|
|
||||||
override fun onBindViewHolder(holder: BannerViewHolder, position: Int) {
|
|
||||||
bannerAdView = holder.bannerView
|
|
||||||
holder.bannerView.post {
|
|
||||||
val density = holder.bannerView.resources.displayMetrics.density
|
|
||||||
val adWidthPixels = holder.bannerView.width.takeIf { it > 0 }
|
|
||||||
?: (screenWidth - 48f.dpToPx().toInt())
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt().coerceAtLeast(1)
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
holder.bannerView.apply {
|
|
||||||
setAdUnitId(adUnitId)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
context,
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun destroy() {
|
|
||||||
bannerAdView?.destroy()
|
|
||||||
bannerAdView = null
|
|
||||||
}
|
|
||||||
|
|
||||||
class BannerViewHolder(
|
|
||||||
container: FrameLayout,
|
|
||||||
val bannerView: BannerAdView
|
|
||||||
) : RecyclerView.ViewHolder(container)
|
|
||||||
}
|
|
||||||
-27
@@ -14,9 +14,6 @@ import androidx.activity.result.contract.ActivityResultContracts
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.base.BaseActivity
|
import kr.co.vividnext.sodalive.base.BaseActivity
|
||||||
import kr.co.vividnext.sodalive.base.SodaDialog
|
import kr.co.vividnext.sodalive.base.SodaDialog
|
||||||
@@ -31,7 +28,6 @@ import kr.co.vividnext.sodalive.explorer.profile.creator_community.all.player.Cr
|
|||||||
import kr.co.vividnext.sodalive.explorer.profile.creator_community.modify.CreatorCommunityModifyActivity
|
import kr.co.vividnext.sodalive.explorer.profile.creator_community.modify.CreatorCommunityModifyActivity
|
||||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
import kotlin.math.roundToInt
|
|
||||||
|
|
||||||
class CreatorCommunityAllActivity : BaseActivity<ActivityCreatorCommunityAllBinding>(
|
class CreatorCommunityAllActivity : BaseActivity<ActivityCreatorCommunityAllBinding>(
|
||||||
ActivityCreatorCommunityAllBinding::inflate
|
ActivityCreatorCommunityAllBinding::inflate
|
||||||
@@ -146,7 +142,6 @@ class CreatorCommunityAllActivity : BaseActivity<ActivityCreatorCommunityAllBind
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroy() {
|
override fun onDestroy() {
|
||||||
binding.yandexInlineBannerView.destroy()
|
|
||||||
mediaPlayerManager.stopContent()
|
mediaPlayerManager.stopContent()
|
||||||
super.onDestroy()
|
super.onDestroy()
|
||||||
}
|
}
|
||||||
@@ -262,32 +257,10 @@ class CreatorCommunityAllActivity : BaseActivity<ActivityCreatorCommunityAllBind
|
|||||||
)
|
)
|
||||||
|
|
||||||
setupRecyclerViews()
|
setupRecyclerViews()
|
||||||
setupInlineBanner()
|
|
||||||
|
|
||||||
switchToListMode(0, fromGridItemClick = false)
|
switchToListMode(0, fromGridItemClick = false)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupInlineBanner() {
|
|
||||||
binding.yandexInlineBannerView.post {
|
|
||||||
val density = resources.displayMetrics.density
|
|
||||||
val adWidthPixels = binding.yandexInlineBannerView.width.takeIf { it > 0 } ?: screenWidth
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt()
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
binding.yandexInlineBannerView.apply {
|
|
||||||
setAdUnitId(BuildConfig.YANDEX_INLINE_BANNER_CREATOR_COMMUNITY_ALL_AD_UNIT_ID)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
this@CreatorCommunityAllActivity,
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressLint("NotifyDataSetChanged")
|
@SuppressLint("NotifyDataSetChanged")
|
||||||
private fun bindData() {
|
private fun bindData() {
|
||||||
viewModel.toastLiveData.observe(this) {
|
viewModel.toastLiveData.observe(this) {
|
||||||
|
|||||||
-31
@@ -8,9 +8,6 @@ import android.view.View
|
|||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.base.BaseActivity
|
import kr.co.vividnext.sodalive.base.BaseActivity
|
||||||
import kr.co.vividnext.sodalive.common.LoadingDialog
|
import kr.co.vividnext.sodalive.common.LoadingDialog
|
||||||
@@ -19,7 +16,6 @@ import kr.co.vividnext.sodalive.extensions.dpToPx
|
|||||||
import kr.co.vividnext.sodalive.home.HomeContentThemeAdapter
|
import kr.co.vividnext.sodalive.home.HomeContentThemeAdapter
|
||||||
import kr.co.vividnext.sodalive.settings.notification.NotificationReceiveSettingsActivity
|
import kr.co.vividnext.sodalive.settings.notification.NotificationReceiveSettingsActivity
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
import kotlin.math.roundToInt
|
|
||||||
|
|
||||||
class PushNotificationListActivity : BaseActivity<ActivityPushNotificationListBinding>(
|
class PushNotificationListActivity : BaseActivity<ActivityPushNotificationListBinding>(
|
||||||
ActivityPushNotificationListBinding::inflate
|
ActivityPushNotificationListBinding::inflate
|
||||||
@@ -47,36 +43,9 @@ class PushNotificationListActivity : BaseActivity<ActivityPushNotificationListBi
|
|||||||
}
|
}
|
||||||
|
|
||||||
setupCategoryList()
|
setupCategoryList()
|
||||||
setupInlineBanner()
|
|
||||||
setupNotificationList()
|
setupNotificationList()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroy() {
|
|
||||||
binding.yandexInlineBannerView.destroy()
|
|
||||||
super.onDestroy()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupInlineBanner() {
|
|
||||||
binding.yandexInlineBannerView.post {
|
|
||||||
val density = resources.displayMetrics.density
|
|
||||||
val adWidthPixels = binding.yandexInlineBannerView.width.takeIf { it > 0 } ?: screenWidth
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt()
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
binding.yandexInlineBannerView.apply {
|
|
||||||
setAdUnitId(BuildConfig.YANDEX_INLINE_BANNER_PUSH_NOTIFICATION_LIST_AD_UNIT_ID)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
this@PushNotificationListActivity,
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupCategoryList() {
|
private fun setupCategoryList() {
|
||||||
categoryAdapter = HomeContentThemeAdapter("") { selectedCategory ->
|
categoryAdapter = HomeContentThemeAdapter("") { selectedCategory ->
|
||||||
viewModel.selectCategory(selectedCategory)
|
viewModel.selectCategory(selectedCategory)
|
||||||
|
|||||||
@@ -21,12 +21,9 @@ import androidx.media3.common.util.UnstableApi
|
|||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import com.zhpan.bannerview.BaseBannerAdapter
|
import com.zhpan.bannerview.BaseBannerAdapter
|
||||||
import com.zhpan.indicator.enums.IndicatorSlideMode
|
import com.zhpan.indicator.enums.IndicatorSlideMode
|
||||||
import com.zhpan.indicator.enums.IndicatorStyle
|
import com.zhpan.indicator.enums.IndicatorStyle
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService
|
import kr.co.vividnext.sodalive.audio_content.AudioContentPlayService
|
||||||
import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity
|
import kr.co.vividnext.sodalive.audio_content.detail.AudioContentDetailActivity
|
||||||
@@ -127,11 +124,6 @@ class LiveFragment : BaseFragment<FragmentLiveBinding>(FragmentLiveBinding::infl
|
|||||||
viewModel.getLiveMain()
|
viewModel.getLiveMain()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
|
||||||
binding.yandexInlineBannerView.destroy()
|
|
||||||
super.onDestroyView()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupView() {
|
private fun setupView() {
|
||||||
loadingDialog = LoadingDialog(requireActivity(), layoutInflater)
|
loadingDialog = LoadingDialog(requireActivity(), layoutInflater)
|
||||||
|
|
||||||
@@ -156,31 +148,9 @@ class LiveFragment : BaseFragment<FragmentLiveBinding>(FragmentLiveBinding::infl
|
|||||||
setupRecommendChannel()
|
setupRecommendChannel()
|
||||||
setupLatestFinishedLiveChannel()
|
setupLatestFinishedLiveChannel()
|
||||||
setupLiveReplay()
|
setupLiveReplay()
|
||||||
setupLiveTabInlineBanner()
|
|
||||||
setupLiveReservation()
|
setupLiveReservation()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupLiveTabInlineBanner() {
|
|
||||||
binding.yandexInlineBannerView.post {
|
|
||||||
val density = resources.displayMetrics.density
|
|
||||||
val adWidthPixels = binding.yandexInlineBannerView.width.takeIf { it > 0 } ?: screenWidth
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt()
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
binding.yandexInlineBannerView.apply {
|
|
||||||
setAdUnitId(BuildConfig.YANDEX_INLINE_BANNER_LIVE_TAB_AD_UNIT_ID)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
requireContext(),
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun renderMakeLiveByRole(role: String) {
|
private fun renderMakeLiveByRole(role: String) {
|
||||||
if (role == MemberRole.CREATOR.name) {
|
if (role == MemberRole.CREATOR.name) {
|
||||||
binding.llMakeLive.visibility = View.VISIBLE
|
binding.llMakeLive.visibility = View.VISIBLE
|
||||||
|
|||||||
@@ -19,9 +19,6 @@ import coil.transform.CircleCropTransformation
|
|||||||
import coil.transform.RoundedCornersTransformation
|
import coil.transform.RoundedCornersTransformation
|
||||||
import com.google.android.material.bottomsheet.BottomSheetBehavior
|
import com.google.android.material.bottomsheet.BottomSheetBehavior
|
||||||
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
|
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.common.LoadingDialog
|
import kr.co.vividnext.sodalive.common.LoadingDialog
|
||||||
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
import kr.co.vividnext.sodalive.common.SharedPreferenceManager
|
||||||
@@ -36,7 +33,6 @@ import org.koin.android.ext.android.inject
|
|||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
import java.util.TimeZone
|
import java.util.TimeZone
|
||||||
import androidx.core.net.toUri
|
import androidx.core.net.toUri
|
||||||
import kotlin.math.roundToInt
|
|
||||||
|
|
||||||
class LiveRoomDetailFragment(
|
class LiveRoomDetailFragment(
|
||||||
private val roomId: Long,
|
private val roomId: Long,
|
||||||
@@ -81,39 +77,11 @@ class LiveRoomDetailFragment(
|
|||||||
behavior.state = BottomSheetBehavior.STATE_EXPANDED
|
behavior.state = BottomSheetBehavior.STATE_EXPANDED
|
||||||
|
|
||||||
setupAdapter()
|
setupAdapter()
|
||||||
setupLiveRoomDetailInlineBanner()
|
|
||||||
bindData()
|
bindData()
|
||||||
binding.ivClose.setOnClickListener { dismiss() }
|
binding.ivClose.setOnClickListener { dismiss() }
|
||||||
viewModel.getDetail(roomId) { dismiss() }
|
viewModel.getDetail(roomId) { dismiss() }
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroyView() {
|
|
||||||
binding.yandexInlineBannerView.destroy()
|
|
||||||
super.onDestroyView()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupLiveRoomDetailInlineBanner() {
|
|
||||||
binding.yandexInlineBannerView.post {
|
|
||||||
val density = resources.displayMetrics.density
|
|
||||||
val screenWidth = resources.displayMetrics.widthPixels
|
|
||||||
val adWidthPixels = binding.yandexInlineBannerView.width.takeIf { it > 0 } ?: screenWidth
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt()
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
binding.yandexInlineBannerView.apply {
|
|
||||||
setAdUnitId(BuildConfig.YANDEX_INLINE_BANNER_LIVE_ROOM_DETAIL_AD_UNIT_ID)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
requireContext(),
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupAdapter() {
|
private fun setupAdapter() {
|
||||||
val recyclerView = binding.rvParticipate
|
val recyclerView = binding.rvParticipate
|
||||||
adapter = LiveRoomDetailAdapter {}
|
adapter = LiveRoomDetailAdapter {}
|
||||||
|
|||||||
-31
@@ -7,9 +7,6 @@ import android.view.View
|
|||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import com.yandex.mobile.ads.banner.BannerAdSize
|
|
||||||
import com.yandex.mobile.ads.common.AdRequest
|
|
||||||
import kr.co.vividnext.sodalive.BuildConfig
|
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.base.BaseActivity
|
import kr.co.vividnext.sodalive.base.BaseActivity
|
||||||
import kr.co.vividnext.sodalive.common.LoadingDialog
|
import kr.co.vividnext.sodalive.common.LoadingDialog
|
||||||
@@ -19,7 +16,6 @@ import kr.co.vividnext.sodalive.extensions.dpToPx
|
|||||||
import kr.co.vividnext.sodalive.following.FollowingCreatorAdapter
|
import kr.co.vividnext.sodalive.following.FollowingCreatorAdapter
|
||||||
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelActivity
|
import kr.co.vividnext.sodalive.v2.creator.channel.CreatorChannelActivity
|
||||||
import org.koin.android.ext.android.inject
|
import org.koin.android.ext.android.inject
|
||||||
import kotlin.math.roundToInt
|
|
||||||
|
|
||||||
class NotificationReceiveSettingsActivity : BaseActivity<ActivityNotificationReceiveSettingsBinding>(
|
class NotificationReceiveSettingsActivity : BaseActivity<ActivityNotificationReceiveSettingsBinding>(
|
||||||
ActivityNotificationReceiveSettingsBinding::inflate
|
ActivityNotificationReceiveSettingsBinding::inflate
|
||||||
@@ -55,33 +51,6 @@ class NotificationReceiveSettingsActivity : BaseActivity<ActivityNotificationRec
|
|||||||
binding.ivMessage.setOnClickListener { viewModel.toggleMessage() }
|
binding.ivMessage.setOnClickListener { viewModel.toggleMessage() }
|
||||||
|
|
||||||
setupFollowingChannels()
|
setupFollowingChannels()
|
||||||
setupInlineBanner()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onDestroy() {
|
|
||||||
binding.yandexInlineBannerView.destroy()
|
|
||||||
super.onDestroy()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupInlineBanner() {
|
|
||||||
binding.yandexInlineBannerView.post {
|
|
||||||
val density = resources.displayMetrics.density
|
|
||||||
val adWidthPixels = binding.yandexInlineBannerView.width.takeIf { it > 0 } ?: screenWidth
|
|
||||||
val adWidthDp = (adWidthPixels / density).roundToInt()
|
|
||||||
val maxAdHeightDp = 90
|
|
||||||
|
|
||||||
binding.yandexInlineBannerView.apply {
|
|
||||||
setAdUnitId(BuildConfig.YANDEX_INLINE_BANNER_NOTIFICATION_RECEIVE_SETTINGS_AD_UNIT_ID)
|
|
||||||
setAdSize(
|
|
||||||
BannerAdSize.inlineSize(
|
|
||||||
this@NotificationReceiveSettingsActivity,
|
|
||||||
adWidthDp,
|
|
||||||
maxAdHeightDp
|
|
||||||
)
|
|
||||||
)
|
|
||||||
loadAd(AdRequest.Builder().build())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupFollowingChannels() {
|
private fun setupFollowingChannels() {
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
|
|
||||||
<solid android:color="#FEF8E3" />
|
|
||||||
<corners android:radius="30dp" />
|
|
||||||
<stroke android:width="1dp" android:color="#F7CB50" />
|
|
||||||
</shape>
|
|
||||||
@@ -80,15 +80,6 @@
|
|||||||
android:layout_height="1dp"
|
android:layout_height="1dp"
|
||||||
android:background="#909090" />
|
android:background="#909090" />
|
||||||
|
|
||||||
<com.yandex.mobile.ads.banner.BannerAdView
|
|
||||||
android:id="@+id/yandex_inline_banner_view"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginHorizontal="13.3dp"
|
|
||||||
android:layout_marginTop="13.3dp"
|
|
||||||
android:layout_marginBottom="13.3dp"
|
|
||||||
android:maxHeight="90dp" />
|
|
||||||
|
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
|
|||||||
@@ -133,14 +133,6 @@
|
|||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<com.yandex.mobile.ads.banner.BannerAdView
|
|
||||||
android:id="@+id/yandex_inline_banner_view"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginHorizontal="13.3dp"
|
|
||||||
android:layout_marginTop="26.7dp"
|
|
||||||
android:maxHeight="90dp" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
|||||||
@@ -49,14 +49,6 @@
|
|||||||
android:clipToPadding="false"
|
android:clipToPadding="false"
|
||||||
android:paddingHorizontal="13.3dp" />
|
android:paddingHorizontal="13.3dp" />
|
||||||
|
|
||||||
<com.yandex.mobile.ads.banner.BannerAdView
|
|
||||||
android:id="@+id/yandex_inline_banner_view"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginHorizontal="13.3dp"
|
|
||||||
android:layout_marginTop="8dp"
|
|
||||||
android:maxHeight="90dp" />
|
|
||||||
|
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
|
|||||||
@@ -82,14 +82,6 @@
|
|||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<com.yandex.mobile.ads.banner.BannerAdView
|
|
||||||
android:id="@+id/yandex_inline_banner_view"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginHorizontal="24dp"
|
|
||||||
android:layout_marginBottom="24dp"
|
|
||||||
android:maxHeight="90dp" />
|
|
||||||
|
|
||||||
<!-- 인기 캐릭터 섹션 -->
|
<!-- 인기 캐릭터 섹션 -->
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/ll_popular_characters"
|
android:id="@+id/ll_popular_characters"
|
||||||
|
|||||||
@@ -148,14 +148,6 @@
|
|||||||
android:paddingHorizontal="24dp"
|
android:paddingHorizontal="24dp"
|
||||||
android:visibility="gone" />
|
android:visibility="gone" />
|
||||||
|
|
||||||
<com.yandex.mobile.ads.banner.BannerAdView
|
|
||||||
android:id="@+id/yandex_inline_banner_view"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginHorizontal="24dp"
|
|
||||||
android:layout_marginBottom="24dp"
|
|
||||||
android:maxHeight="90dp" />
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/ll_replay_live"
|
android:id="@+id/ll_replay_live"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|||||||
@@ -187,14 +187,6 @@
|
|||||||
app:drawableStartCompat="@drawable/ic_live_detail_bottom" />
|
app:drawableStartCompat="@drawable/ic_live_detail_bottom" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<com.yandex.mobile.ads.banner.BannerAdView
|
|
||||||
android:id="@+id/yandex_inline_banner_view"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:maxHeight="90dp"
|
|
||||||
android:layout_marginHorizontal="13.3dp"
|
|
||||||
android:layout_marginTop="13.3dp" />
|
|
||||||
|
|
||||||
<View
|
<View
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="1dp"
|
android:layout_height="1dp"
|
||||||
|
|||||||
@@ -13,14 +13,6 @@
|
|||||||
android:nestedScrollingEnabled="false"
|
android:nestedScrollingEnabled="false"
|
||||||
android:paddingHorizontal="24dp" />
|
android:paddingHorizontal="24dp" />
|
||||||
|
|
||||||
<com.yandex.mobile.ads.banner.BannerAdView
|
|
||||||
android:id="@+id/yandex_inline_banner_view"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginHorizontal="24dp"
|
|
||||||
android:layout_marginTop="24dp"
|
|
||||||
android:maxHeight="90dp" />
|
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
android:id="@+id/rv_series_by_genre"
|
android:id="@+id/rv_series_by_genre"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|||||||
@@ -13,14 +13,6 @@
|
|||||||
android:nestedScrollingEnabled="false"
|
android:nestedScrollingEnabled="false"
|
||||||
android:paddingHorizontal="24dp" />
|
android:paddingHorizontal="24dp" />
|
||||||
|
|
||||||
<com.yandex.mobile.ads.banner.BannerAdView
|
|
||||||
android:id="@+id/yandex_inline_banner_view"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginHorizontal="24dp"
|
|
||||||
android:layout_marginTop="24dp"
|
|
||||||
android:maxHeight="90dp" />
|
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
android:id="@+id/rv_series_day_of_week"
|
android:id="@+id/rv_series_day_of_week"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|||||||
@@ -79,14 +79,6 @@
|
|||||||
android:paddingHorizontal="24dp" />
|
android:paddingHorizontal="24dp" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<com.yandex.mobile.ads.banner.BannerAdView
|
|
||||||
android:id="@+id/yandex_inline_banner_view"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginHorizontal="24dp"
|
|
||||||
android:layout_marginTop="48dp"
|
|
||||||
android:maxHeight="90dp" />
|
|
||||||
|
|
||||||
<!-- 추천 시리즈 섹션 -->
|
<!-- 추천 시리즈 섹션 -->
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/ll_recommend_series"
|
android:id="@+id/ll_recommend_series"
|
||||||
|
|||||||
@@ -197,14 +197,11 @@
|
|||||||
<string name="chat_background_picker_title">Select background image</string>
|
<string name="chat_background_picker_title">Select background image</string>
|
||||||
<string name="chat_background_current_label">Current</string>
|
<string name="chat_background_current_label">Current</string>
|
||||||
<string name="chat_unlock_image_hint">Tap to unlock</string>
|
<string name="chat_unlock_image_hint">Tap to unlock</string>
|
||||||
<string name="chat_quota_rewarded_ad_label">Ad</string>
|
|
||||||
<string name="chat_quota_rewarded_ad_chat_count">5 chats</string>
|
|
||||||
<string name="chat_quota_10_can">10</string>
|
<string name="chat_quota_10_can">10</string>
|
||||||
<string name="chat_quota_10_can_chat_count">15 chats</string>
|
<string name="chat_quota_10_can_chat_count">15 chats</string>
|
||||||
<string name="chat_quota_20_can">20</string>
|
<string name="chat_quota_20_can">20</string>
|
||||||
<string name="chat_quota_20_can_chat_count">40 chats</string>
|
<string name="chat_quota_20_can_chat_count">40 chats</string>
|
||||||
<string name="chat_quota_separator">/</string>
|
<string name="chat_quota_separator">/</string>
|
||||||
<string name="chat_quota_rewarded_ad_unavailable">Unable to load the ad.\nPlease try again in a moment.</string>
|
|
||||||
<string name="chat_more_title">Chat settings</string>
|
<string name="chat_more_title">Chat settings</string>
|
||||||
<string name="chat_more_background_label">Background image</string>
|
<string name="chat_more_background_label">Background image</string>
|
||||||
<string name="chat_more_background_change">Change background image</string>
|
<string name="chat_more_background_change">Change background image</string>
|
||||||
|
|||||||
@@ -197,14 +197,11 @@
|
|||||||
<string name="chat_background_picker_title">背景画像を選択</string>
|
<string name="chat_background_picker_title">背景画像を選択</string>
|
||||||
<string name="chat_background_current_label">現在の背景</string>
|
<string name="chat_background_current_label">現在の背景</string>
|
||||||
<string name="chat_unlock_image_hint">タップしてアンロック</string>
|
<string name="chat_unlock_image_hint">タップしてアンロック</string>
|
||||||
<string name="chat_quota_rewarded_ad_label">広告</string>
|
|
||||||
<string name="chat_quota_rewarded_ad_chat_count">5チャット</string>
|
|
||||||
<string name="chat_quota_10_can">10</string>
|
<string name="chat_quota_10_can">10</string>
|
||||||
<string name="chat_quota_10_can_chat_count">15チャット</string>
|
<string name="chat_quota_10_can_chat_count">15チャット</string>
|
||||||
<string name="chat_quota_20_can">20</string>
|
<string name="chat_quota_20_can">20</string>
|
||||||
<string name="chat_quota_20_can_chat_count">40チャット</string>
|
<string name="chat_quota_20_can_chat_count">40チャット</string>
|
||||||
<string name="chat_quota_separator">/</string>
|
<string name="chat_quota_separator">/</string>
|
||||||
<string name="chat_quota_rewarded_ad_unavailable">広告を読み込めませんでした。\nしばらくしてからもう一度お試しください。</string>
|
|
||||||
<string name="chat_more_title">トーク設定</string>
|
<string name="chat_more_title">トーク設定</string>
|
||||||
<string name="chat_more_background_label">背景画像</string>
|
<string name="chat_more_background_label">背景画像</string>
|
||||||
<string name="chat_more_background_change">背景画像の変更</string>
|
<string name="chat_more_background_change">背景画像の変更</string>
|
||||||
|
|||||||
@@ -197,14 +197,11 @@
|
|||||||
<string name="chat_background_picker_title">배경 이미지 선택</string>
|
<string name="chat_background_picker_title">배경 이미지 선택</string>
|
||||||
<string name="chat_background_current_label">현재 배경</string>
|
<string name="chat_background_current_label">현재 배경</string>
|
||||||
<string name="chat_unlock_image_hint">눌러서 잠금해제</string>
|
<string name="chat_unlock_image_hint">눌러서 잠금해제</string>
|
||||||
<string name="chat_quota_rewarded_ad_label">광고</string>
|
|
||||||
<string name="chat_quota_rewarded_ad_chat_count">5채팅</string>
|
|
||||||
<string name="chat_quota_10_can">10</string>
|
<string name="chat_quota_10_can">10</string>
|
||||||
<string name="chat_quota_10_can_chat_count">15채팅</string>
|
<string name="chat_quota_10_can_chat_count">15채팅</string>
|
||||||
<string name="chat_quota_20_can">20</string>
|
<string name="chat_quota_20_can">20</string>
|
||||||
<string name="chat_quota_20_can_chat_count">40채팅</string>
|
<string name="chat_quota_20_can_chat_count">40채팅</string>
|
||||||
<string name="chat_quota_separator">/</string>
|
<string name="chat_quota_separator">/</string>
|
||||||
<string name="chat_quota_rewarded_ad_unavailable">광고를 불러오지 못했어요\n잠시 후 다시 시도해 주세요.</string>
|
|
||||||
<string name="chat_more_title">대화 설정</string>
|
<string name="chat_more_title">대화 설정</string>
|
||||||
<string name="chat_more_background_label">배경 이미지</string>
|
<string name="chat_more_background_label">배경 이미지</string>
|
||||||
<string name="chat_more_background_change">배경 이미지 변경</string>
|
<string name="chat_more_background_change">배경 이미지 변경</string>
|
||||||
|
|||||||
@@ -5,6 +5,14 @@ import org.junit.Test
|
|||||||
|
|
||||||
class ChatMessageAdapterTest {
|
class ChatMessageAdapterTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `쿼터 안내 액션은 10캔과 20캔 구매만 제공한다`() {
|
||||||
|
assertEquals(
|
||||||
|
listOf(ChatQuotaNoticeAction.PURCHASE_10_CAN, ChatQuotaNoticeAction.PURCHASE_20_CAN),
|
||||||
|
ChatQuotaNoticeAction.values().toList()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `typing indicator shows only once and hides correctly`() {
|
fun `typing indicator shows only once and hides correctly`() {
|
||||||
val adapter = ChatMessageAdapter()
|
val adapter = ChatMessageAdapter()
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package kr.co.vividnext.sodalive.chat.talk.room
|
package kr.co.vividnext.sodalive.chat.talk.room
|
||||||
|
|
||||||
|
import com.google.gson.Gson
|
||||||
|
import com.google.gson.JsonParser
|
||||||
import io.mockk.coEvery
|
import io.mockk.coEvery
|
||||||
import io.mockk.coVerify
|
import io.mockk.coVerify
|
||||||
import io.mockk.every
|
import io.mockk.every
|
||||||
@@ -8,12 +10,87 @@ import io.reactivex.rxjava3.core.Single
|
|||||||
import kr.co.vividnext.sodalive.chat.character.detail.detail.CharacterType
|
import kr.co.vividnext.sodalive.chat.character.detail.detail.CharacterType
|
||||||
import kr.co.vividnext.sodalive.chat.talk.TalkApi
|
import kr.co.vividnext.sodalive.chat.talk.TalkApi
|
||||||
import kr.co.vividnext.sodalive.chat.talk.room.db.ChatMessageDao
|
import kr.co.vividnext.sodalive.chat.talk.room.db.ChatMessageDao
|
||||||
|
import kr.co.vividnext.sodalive.chat.talk.room.quota.ChatQuotaPurchaseRequest
|
||||||
|
import kr.co.vividnext.sodalive.chat.talk.room.quota.ChatQuotaStatusResponse
|
||||||
|
import kr.co.vividnext.sodalive.chat.talk.room.quota.ChatRoomQuotaCanOption
|
||||||
|
import kr.co.vividnext.sodalive.chat.talk.room.quota.ChatRoomQuotaChargeType
|
||||||
import kr.co.vividnext.sodalive.common.ApiResponse
|
import kr.co.vividnext.sodalive.common.ApiResponse
|
||||||
import org.junit.Assert.assertEquals
|
import org.junit.Assert.assertEquals
|
||||||
import org.junit.Test
|
import org.junit.Test
|
||||||
|
|
||||||
class ChatRepositoryTest {
|
class ChatRepositoryTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `쿼터 충전 타입은 캔 구매만 제공한다`() {
|
||||||
|
assertEquals(listOf(ChatRoomQuotaChargeType.CAN), ChatRoomQuotaChargeType.values().toList())
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `두 캔 구매는 기존 요청과 충전 수량을 유지하고 서버 잔여 횟수를 반환한다`() {
|
||||||
|
val api = mockk<TalkApi>()
|
||||||
|
val repo = ChatRepository(mockk<ChatMessageDao>(), api)
|
||||||
|
val requests = mutableListOf<ChatQuotaPurchaseRequest>()
|
||||||
|
every { api.purchaseChatQuota(99L, capture(requests), "Bearer test-token") } returnsMany listOf(
|
||||||
|
Single.just(ApiResponse(true, ChatQuotaStatusResponse(18, 1000L), null)),
|
||||||
|
Single.just(ApiResponse(true, ChatQuotaStatusResponse(43, 2000L), null))
|
||||||
|
)
|
||||||
|
|
||||||
|
val tenCanResult = repo.purchaseChatQuota(
|
||||||
|
99L, "Bearer test-token", ChatRoomQuotaChargeType.CAN, ChatRoomQuotaCanOption.CAN_10
|
||||||
|
).blockingGet()
|
||||||
|
val twentyCanResult = repo.purchaseChatQuota(
|
||||||
|
99L, "Bearer test-token", ChatRoomQuotaChargeType.CAN, ChatRoomQuotaCanOption.CAN_20
|
||||||
|
).blockingGet()
|
||||||
|
|
||||||
|
assertEquals(ChatQuotaStatusResponse(18, 1000L), tenCanResult)
|
||||||
|
assertEquals(ChatQuotaStatusResponse(43, 2000L), twentyCanResult)
|
||||||
|
assertEquals(2, requests.size)
|
||||||
|
assertEquals(
|
||||||
|
JsonParser.parseString("""{"container":"aos","chargeType":"CAN","canOption":"CAN_10"}"""),
|
||||||
|
Gson().toJsonTree(requests[0])
|
||||||
|
)
|
||||||
|
assertEquals(
|
||||||
|
JsonParser.parseString("""{"container":"aos","chargeType":"CAN","canOption":"CAN_20"}"""),
|
||||||
|
Gson().toJsonTree(requests[1])
|
||||||
|
)
|
||||||
|
assertEquals(10, requests[0].canOption!!.needCan)
|
||||||
|
assertEquals(15, requests[0].canOption!!.quota)
|
||||||
|
assertEquals(20, requests[1].canOption!!.needCan)
|
||||||
|
assertEquals(40, requests[1].canOption!!.quota)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `두 캔 구매의 서버 실패는 성공 값 없이 기존 오류 메시지를 전달한다`() {
|
||||||
|
val api = mockk<TalkApi>()
|
||||||
|
val repo = ChatRepository(mockk<ChatMessageDao>(), api)
|
||||||
|
every { api.purchaseChatQuota(any(), any(), any()) } returns
|
||||||
|
Single.just(ApiResponse<ChatQuotaStatusResponse>(false, null, "캔이 부족합니다"))
|
||||||
|
|
||||||
|
listOf(ChatRoomQuotaCanOption.CAN_10, ChatRoomQuotaCanOption.CAN_20).forEach { option ->
|
||||||
|
repo.purchaseChatQuota(99L, "Bearer test-token", ChatRoomQuotaChargeType.CAN, option)
|
||||||
|
.test()
|
||||||
|
.await()
|
||||||
|
.assertNoValues()
|
||||||
|
.assertError { it is IllegalStateException && it.message == "캔이 부족합니다" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `두 캔 구매의 통신 실패는 성공 값 없이 원래 오류를 전달한다`() {
|
||||||
|
val api = mockk<TalkApi>()
|
||||||
|
val repo = ChatRepository(mockk<ChatMessageDao>(), api)
|
||||||
|
val error = java.io.IOException("연결 실패")
|
||||||
|
every { api.purchaseChatQuota(any(), any(), any()) } returns Single.error(error)
|
||||||
|
|
||||||
|
listOf(ChatRoomQuotaCanOption.CAN_10, ChatRoomQuotaCanOption.CAN_20).forEach { option ->
|
||||||
|
repo.purchaseChatQuota(99L, "Bearer test-token", ChatRoomQuotaChargeType.CAN, option)
|
||||||
|
.test()
|
||||||
|
.await()
|
||||||
|
.assertNoValues()
|
||||||
|
.assertError(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `enterChatRoom inserts messages and returns response`() {
|
fun `enterChatRoom inserts messages and returns response`() {
|
||||||
val dao = mockk<ChatMessageDao>(relaxed = true)
|
val dao = mockk<ChatMessageDao>(relaxed = true)
|
||||||
|
|||||||
Reference in New Issue
Block a user