diff --git a/app/src/main/java/com/woka/advertisements/models/ForPage.kt b/app/src/main/java/com/woka/advertisements/models/ForPage.kt index 279d09d..d5f0b20 100644 --- a/app/src/main/java/com/woka/advertisements/models/ForPage.kt +++ b/app/src/main/java/com/woka/advertisements/models/ForPage.kt @@ -12,5 +12,10 @@ enum class ForPage(val value: String) { FM("fm"), GAME_INTERSTITIAL("game-interestial"), GAME_PLAYER("game-web-view"), - KARAOKE_PLAYER("karaoke-player"); + KARAOKE_PLAYER("karaoke-player"), + + MY_LIST_AND_NOTIFICATION("my-list"), + MORE("more"), + LIVE_TV_ADS("live-tv-ad"), + WEB_SERIES_VIDEO_ADS("web-series-video-ad"); } \ No newline at end of file diff --git a/app/src/main/java/com/woka/home/fragments/MyListFragment.kt b/app/src/main/java/com/woka/home/fragments/MyListFragment.kt index 449c529..674e9e8 100644 --- a/app/src/main/java/com/woka/home/fragments/MyListFragment.kt +++ b/app/src/main/java/com/woka/home/fragments/MyListFragment.kt @@ -329,7 +329,7 @@ class MyListFragment : Fragment() { private fun loadGoogleAds() { lifecycleScope.launch { AdsRepository.getADs()?.let { ads -> - val fmAds = ads.filter { it.slug == ForPage.FM.value } + val fmAds = ads.filter { it.slug == ForPage.MY_LIST_AND_NOTIFICATION.value } if (fmAds.isNotEmpty()){ fmAds.first().google_ad?.let { diff --git a/app/src/main/java/com/woka/home/notifications/NotificationsActivity.kt b/app/src/main/java/com/woka/home/notifications/NotificationsActivity.kt index 155a9b9..6d4eaa4 100644 --- a/app/src/main/java/com/woka/home/notifications/NotificationsActivity.kt +++ b/app/src/main/java/com/woka/home/notifications/NotificationsActivity.kt @@ -5,11 +5,18 @@ import android.os.Bundle import androidx.activity.enableEdgeToEdge import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat +import androidx.lifecycle.lifecycleScope +import com.google.android.gms.ads.AdRequest +import com.google.android.gms.ads.AdSize +import com.google.android.gms.ads.AdView import com.woka.R +import com.woka.advertisements.AdsRepository +import com.woka.advertisements.models.ForPage import com.woka.audiobooks.views.AudioBooksActivity import com.woka.database.helpers.ClicksHelper import com.woka.database.models.ContentType import com.woka.databinding.ActivityNotificationsBinding +import com.woka.googleads.FM import com.woka.karaoke.views.KaraokeActivity import com.woka.networking.ApiResult import com.woka.shop.views.ShopActivity @@ -19,6 +26,7 @@ import com.woka.utils.lightStatusBar import com.woka.utils.show import com.woka.webseries.views.WebSeriesActivity import com.woka.wokagames.views.GamesActivity +import kotlinx.coroutines.launch class NotificationsActivity : WokaBaseActivity() { @@ -49,6 +57,7 @@ class NotificationsActivity : WokaBaseActivity() { NotificationRepository.loadNotifications() + loadGoogleAds() } private fun initViews() { @@ -128,4 +137,29 @@ class NotificationsActivity : WokaBaseActivity() { } } } + + private fun loadGoogleAds() { + lifecycleScope.launch { + AdsRepository.getADs()?.let { ads -> + val fmAds = ads.filter { it.slug == ForPage.MY_LIST_AND_NOTIFICATION.value } + + if (fmAds.isNotEmpty()){ + fmAds.first().google_ad?.let { + val adView = AdView(this@NotificationsActivity) + + adView.adUnitId = FM + adView.setAdSize(AdSize(AdSize.FULL_WIDTH, 60)) + + binding.adsContainer.removeAllViews() + binding.adsContainer.addView(adView) + + adView.loadAd( + AdRequest.Builder() + .build() + ) + } + } + } + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/woka/home/views/MoreHomeActivity.kt b/app/src/main/java/com/woka/home/views/MoreHomeActivity.kt index 662080f..9d5e0ab 100644 --- a/app/src/main/java/com/woka/home/views/MoreHomeActivity.kt +++ b/app/src/main/java/com/woka/home/views/MoreHomeActivity.kt @@ -11,6 +11,7 @@ import android.view.WindowManager import androidx.activity.enableEdgeToEdge import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat +import androidx.lifecycle.lifecycleScope import androidx.media3.common.MediaItem import androidx.recyclerview.widget.SimpleItemAnimator import com.google.android.gms.ads.AdRequest @@ -19,10 +20,13 @@ import com.google.android.gms.ads.AdView import com.jwplayer.pub.api.media.playlists.PlaylistItem import com.woka.R import com.woka.WokaApp.Companion.userPrefs +import com.woka.advertisements.AdsRepository +import com.woka.advertisements.models.ForPage import com.woka.database.helpers.ClicksHelper import com.woka.database.models.ContentType import com.woka.databinding.ActivityMoreHomeBinding import com.woka.databinding.DialogBlogsBinding +import com.woka.googleads.FM import com.woka.googleads.MORE_ACTIVITY import com.woka.modules.blogs.BlogsAdapter import com.woka.modules.blogs.BlogsRepository @@ -37,6 +41,7 @@ import com.woka.utils.WokaBaseActivity import com.woka.utils.hide import com.woka.utils.lightStatusBar import com.woka.utils.show +import kotlinx.coroutines.launch class MoreHomeActivity : WokaBaseActivity() { @@ -92,18 +97,32 @@ class MoreHomeActivity : WokaBaseActivity() { } private fun loadGoogleAds() { - // ad container 1 - val adView1 = AdView(this) - adView1.adUnitId = MORE_ACTIVITY - adView1.setAdSize(AdSize(AdSize.FULL_WIDTH, 200)) + lifecycleScope.launch { + AdsRepository.getADs()?.let { ads -> + val fmAds = ads.filter { it.slug == ForPage.MORE.value } - binding.adsContainer.removeAllViews() - binding.adsContainer.addView(adView1) + if (fmAds.isNotEmpty()){ + fmAds.first().google_ad?.let { + val adView1 = AdView(this@MoreHomeActivity) + adView1.adUnitId = MORE_ACTIVITY + adView1.setAdSize(AdSize(AdSize.FULL_WIDTH, 200)) - adView1.loadAd( - AdRequest.Builder() - .build() - ) + binding.adsContainer.removeAllViews() + binding.adsContainer.addView(adView1) + + adView1.loadAd( + AdRequest.Builder() + .build() + ) + + return@launch + } + } + } + + binding.comingSoonCard.show() + binding.comingSoonTxt.show() + } } private fun initBlogDialog(){ diff --git a/app/src/main/java/com/woka/players/views/PlayerActivity.kt b/app/src/main/java/com/woka/players/views/PlayerActivity.kt index d4bf150..d16200b 100644 --- a/app/src/main/java/com/woka/players/views/PlayerActivity.kt +++ b/app/src/main/java/com/woka/players/views/PlayerActivity.kt @@ -12,6 +12,7 @@ import androidx.activity.enableEdgeToEdge import androidx.core.view.ViewCompat import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat +import androidx.lifecycle.lifecycleScope import com.jwplayer.pub.api.JWPlayer import com.jwplayer.pub.api.PauseReason import com.jwplayer.pub.api.PlayReason @@ -32,6 +33,9 @@ import com.woka.userdata.userDataModels.VideoViewRequestData import com.woka.utils.WokaBaseActivity import com.woka.utils.hide import com.woka.utils.show +import com.woka.utils.toast +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch private const val TAG = "PlayerActivity_TAG" @@ -177,17 +181,17 @@ class PlayerActivity : WokaBaseActivity(), FullscreenHandler { adSchedule.add( AdBreak.Builder() - .tag("https://pubads.g.doubleclick.net/gampad/ads?iu=/23204950200/VideoAd&description_url=https%3A%2F%2Fwokaland.com%2F&tfcd=0&npa=0&ad_type=audio_video&sz=640x480%7C1280x720&gdfp_req=1&unviewed_position_start=1&output=vast&env=vp&impl=s&correlator=") + .tag("https://pubads.g.doubleclick.net/gampad/ads?iu=/23204950200/testingvideo&description_url=https%3A%2F%2Fwokaland.com&tfcd=0&npa=0&sz=640x180%7C1280x720%7C1280x720&min_ad_duration=0&max_ad_duration=30000&gdfp_req=1&unviewed_position_start=1&output=vast&env=vp&impl=s&correlator=&vad_type=linear") .offset("pre") .build() ) - adSchedule.add( - AdBreak.Builder() - .tag("https://pubads.g.doubleclick.net/gampad/live/ads?iu=/23204950200/VideoAd&description_url=https%3A%2F%2Fwokaland.com%2F&tfcd=0&npa=0&ad_type=audio_video&sz=640x480%7C1280x720&gdfp_req=1&unviewed_position_start=1&output=vast&env=vp&impl=s&correlator=&nofb=1") - .offset("25%") - .build() - ) +// adSchedule.add( +// AdBreak.Builder() +// .tag("https://pubads.g.doubleclick.net/gampad/live/ads?iu=/23204950200/testingvideo&description_url=https%3A%2F%2Fwokaland.com&tfcd=0&npa=0&sz=640x180%7C1280x720%7C1280x720&gdfp_req=1&unviewed_position_start=1&output=vast&env=vp&impl=s&correlator=") +// .offset("25%") +// .build() +// ) val imaAdvertising = ImaAdvertisingConfig.Builder() .schedule(adSchedule) diff --git a/app/src/main/java/com/woka/shop/views/ShopActivity.kt b/app/src/main/java/com/woka/shop/views/ShopActivity.kt index 44547c4..5f6cc9d 100644 --- a/app/src/main/java/com/woka/shop/views/ShopActivity.kt +++ b/app/src/main/java/com/woka/shop/views/ShopActivity.kt @@ -127,7 +127,7 @@ class ShopActivity : WokaBaseActivity() { private fun loadGoogleAds() { lifecycleScope.launch { AdsRepository.getADs()?.let { ads -> - val fmAds = ads.filter { it.slug == ForPage.FM.value } + val fmAds = ads.filter { it.slug == ForPage.SHOP_SUPER_CATEGORY.value } if (fmAds.isNotEmpty()){ fmAds.first().google_ad?.let { diff --git a/app/src/main/res/layout/activity_more_home.xml b/app/src/main/res/layout/activity_more_home.xml index 940ee19..a2855d2 100644 --- a/app/src/main/res/layout/activity_more_home.xml +++ b/app/src/main/res/layout/activity_more_home.xml @@ -67,6 +67,7 @@ /> @@ -174,4 +174,13 @@ /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_my_list.xml b/app/src/main/res/layout/fragment_my_list.xml index 5161478..33fa9cd 100644 --- a/app/src/main/res/layout/fragment_my_list.xml +++ b/app/src/main/res/layout/fragment_my_list.xml @@ -49,7 +49,7 @@ android:layout_height="0dp" android:background="#D3EFF8" app:layout_constraintTop_toBottomOf="@id/toolbar" - app:layout_constraintBottom_toTopOf="@id/ads_container" + app:layout_constraintBottom_toBottomOf="parent" > + + - - \ No newline at end of file