diff --git a/app/src/main/java/com/woka/home/fragments/Home1Fragment.kt b/app/src/main/java/com/woka/home/fragments/Home1Fragment.kt index 19bc243..657db1b 100644 --- a/app/src/main/java/com/woka/home/fragments/Home1Fragment.kt +++ b/app/src/main/java/com/woka/home/fragments/Home1Fragment.kt @@ -310,7 +310,7 @@ class Home1Fragment : Fragment() { liveTv.performClick() } - more.setOnClickListener { + moreLl.setOnClickListener { activity?.let { startActivity( Intent(it, MoreHomeActivity::class.java) diff --git a/app/src/main/java/com/woka/home/fragments/Home2Fragment.kt b/app/src/main/java/com/woka/home/fragments/Home2Fragment.kt index d6b4386..ee7f525 100644 --- a/app/src/main/java/com/woka/home/fragments/Home2Fragment.kt +++ b/app/src/main/java/com/woka/home/fragments/Home2Fragment.kt @@ -90,7 +90,7 @@ class Home2Fragment : Fragment() { val adView = AdView(requireContext()) adView.adUnitId = HOME_THEME_2_BANNER_AD - adView.setAdSize(AdSize(AdSize.FULL_WIDTH, AdSize.AUTO_HEIGHT)) + adView.setAdSize(AdSize.LARGE_BANNER) binding.adsContainer.removeAllViews() binding.adsContainer.addView(adView) 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 319beef..086e896 100644 --- a/app/src/main/java/com/woka/home/fragments/MyListFragment.kt +++ b/app/src/main/java/com/woka/home/fragments/MyListFragment.kt @@ -499,6 +499,8 @@ class MyListFragment : Fragment() { private fun setObservers() { binding.apply { viewModel.localeChangeLiveData.observe(viewLifecycleOwner) { + binding.title.text = getString(R.string.favorites) + webSeriesEngTxt.text = getString(R.string.web_series_english) webSeriesHinTxt.text = getString(R.string.web_series_hindi) audioBooksTxt.text = getString(R.string.audio_books) 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 6c55e62..267169f 100644 --- a/app/src/main/java/com/woka/home/views/MoreHomeActivity.kt +++ b/app/src/main/java/com/woka/home/views/MoreHomeActivity.kt @@ -173,7 +173,7 @@ class MoreHomeActivity : WokaBaseActivity() { private fun clickEvents() { binding.apply { - more.setOnClickListener { + home.setOnClickListener { onBackPressedDispatcher.onBackPressed() clickHelper.upsertClickEvent(ContentType.OTHERS) diff --git a/app/src/main/java/com/woka/players/views/LiveStreamPlayerActivity.kt b/app/src/main/java/com/woka/players/views/LiveStreamPlayerActivity.kt index d85d109..2dfca8c 100644 --- a/app/src/main/java/com/woka/players/views/LiveStreamPlayerActivity.kt +++ b/app/src/main/java/com/woka/players/views/LiveStreamPlayerActivity.kt @@ -11,10 +11,6 @@ import androidx.activity.enableEdgeToEdge import androidx.core.view.ViewCompat import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat -import com.google.android.gms.ads.AdRequest -import com.google.android.gms.ads.LoadAdError -import com.google.android.gms.ads.interstitial.InterstitialAd -import com.google.android.gms.ads.interstitial.InterstitialAdLoadCallback import com.jwplayer.pub.api.JWPlayer import com.jwplayer.pub.api.configuration.PlayerConfig import com.jwplayer.pub.api.events.EventType @@ -24,7 +20,6 @@ import com.jwplayer.pub.api.media.playlists.PlaylistItem import com.woka.database.helpers.ClicksHelper import com.woka.database.models.ContentType import com.woka.databinding.ActivityLiveStreamPlayerBinding -import com.woka.googleads.LIVE_STREAM_VIDEO import com.woka.players.KeepScreenOnHandler import com.woka.players.models.PlayBackState import com.woka.userdata.UserRepository @@ -62,9 +57,6 @@ class LiveStreamPlayerActivity : WokaBaseActivity(), FullscreenHandler { private var playbackStartTime: Long = 0 private var totalPlaybackDuration: Long = 0 - // make false to make ads working - private var initialAdLoaded = true - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) enableEdgeToEdge() @@ -168,21 +160,22 @@ class LiveStreamPlayerActivity : WokaBaseActivity(), FullscreenHandler { } private fun addListeners() { - player.addListener(EventType.READY, VideoPlayerEvents.OnReadyListener { - if (initialAdLoaded.not()){ - InterstitialAd.load(this@LiveStreamPlayerActivity, LIVE_STREAM_VIDEO, - AdRequest.Builder().build(), object : InterstitialAdLoadCallback() { - override fun onAdFailedToLoad(adError: LoadAdError) { - - } - - override fun onAdLoaded(interstitialAd: InterstitialAd) { - interstitialAd.show(this@LiveStreamPlayerActivity) - initialAdLoaded = true - } - }) - } - }) + // to load interstitial ads at the start of the player +// player.addListener(EventType.READY, VideoPlayerEvents.OnReadyListener { +// if (initialAdLoaded.not()){ +// InterstitialAd.load(this@LiveStreamPlayerActivity, LIVE_STREAM_VIDEO, +// AdRequest.Builder().build(), object : InterstitialAdLoadCallback() { +// override fun onAdFailedToLoad(adError: LoadAdError) { +// +// } +// +// override fun onAdLoaded(interstitialAd: InterstitialAd) { +// interstitialAd.show(this@LiveStreamPlayerActivity) +// initialAdLoaded = true +// } +// }) +// } +// }) player.addListener(EventType.PLAY, VideoPlayerEvents.OnPlayListener { playbackState = PlayBackState.PLAY 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 c49d208..5819f1b 100644 --- a/app/src/main/java/com/woka/players/views/PlayerActivity.kt +++ b/app/src/main/java/com/woka/players/views/PlayerActivity.kt @@ -16,11 +16,9 @@ import com.jwplayer.pub.api.JWPlayer import com.jwplayer.pub.api.PauseReason import com.jwplayer.pub.api.PlayReason import com.jwplayer.pub.api.configuration.PlayerConfig -import com.jwplayer.pub.api.configuration.ads.ima.ImaAdvertisingConfig import com.jwplayer.pub.api.events.EventType import com.jwplayer.pub.api.events.listeners.VideoPlayerEvents import com.jwplayer.pub.api.fullscreen.FullscreenHandler -import com.jwplayer.pub.api.media.ads.AdBreak import com.woka.database.helpers.ClicksHelper import com.woka.database.models.ContentType import com.woka.databinding.ActivityPlayerBinding @@ -33,7 +31,6 @@ import com.woka.utils.WokaBaseActivity import com.woka.utils.hide import com.woka.utils.show - private const val TAG = "PlayerActivity_TAG" class PlayerActivity : WokaBaseActivity(), FullscreenHandler { @@ -173,29 +170,22 @@ class PlayerActivity : WokaBaseActivity(), FullscreenHandler { private fun setUpPlayer() { player = binding.playerView.getPlayer(this) - val adSchedule = mutableListOf() - - adSchedule.add( - AdBreak.Builder() - .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=1000&max_ad_duration=30000&gdfp_req=1&unviewed_position_start=1&output=vast&env=vp&impl=s&correlator=") - .offset("pre") - .build() - ) - + // creating ad schedule +// val adSchedule = mutableListOf() +// // 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%") +// .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=1000&max_ad_duration=30000&gdfp_req=1&unviewed_position_start=1&output=vast&env=vp&impl=s&correlator=") +// .offset("pre") // .build() // ) - - val imaAdvertising = ImaAdvertisingConfig.Builder() - .schedule(adSchedule) - .build() +// +// val imaAdvertising = ImaAdvertisingConfig.Builder() +// .schedule(adSchedule) +// .build() config = PlayerConfig.Builder() .playlist(videoPlayList?.playlist) -// .advertisingConfig(imaAdvertising) .build() // to keep up the screen om when video is being played diff --git a/app/src/main/res/layout/activity_more_home.xml b/app/src/main/res/layout/activity_more_home.xml index 66c2b6f..08628ef 100644 --- a/app/src/main/res/layout/activity_more_home.xml +++ b/app/src/main/res/layout/activity_more_home.xml @@ -25,28 +25,41 @@ android:orientation="vertical" android:translationZ="1dp"> - - - - /> + + + + + - थीम नमस्ते वेब सीरीज - सुनें + ऑडियो पुस्तकें खेल कराओके दुकान @@ -114,13 +114,13 @@ लॉगइन / रजिस्टर करें लॉग आउट कर रहे हैं क्या आप Woka ऐप से लॉग आउट करना चाहते हैं? - वोका एफएम + WOKA एफएम खेल जल्द ही Woka पर आ रहा है - वोका लाइव टीवी + लाइव टीवी ब्लॉग मासिला - ट्रेलर चलाएं + प्ले ट्रेलर प्रोफ़ाइल अपडेट करें पूरा नाम आपकी जन्म तिथि @@ -128,7 +128,7 @@ बच्चे का खाता जोड़ें बच्चे का नाम अपने बच्चे का नाम दर्ज करें - वोका गाने + WOKA गाने क्या आप WOKA ऐप से बाहर निकलना चाहते हैं? पुन: प्रयास करें वेब सीरीज (हिन्दी) @@ -139,6 +139,7 @@ देखना जारी रखें देखें अप्रिय + प्रिय पसंदीदा शेयर वीडियो नहीं चलाया जा सका @@ -154,4 +155,11 @@ उपयोक्तानाम मिले आपके खाते से जुड़े उपयोगकर्ता नाम ब्लॉग + पसंदीदा + और देखें + फिर से गाएं + साथ गाओ और नाचो + आनंद करने का समय + और लोड करें + सूचनाएं \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bdd6c1b..f8bbe78 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -137,7 +137,7 @@ WOKA FM GAMES Coming soon on Woka - WOKA LIVE TV + LIVE TV Blogs MASILA PLAY TRAILER @@ -168,11 +168,11 @@ Do you want to exit from the WOKA app? 00:00 / - Notifications + Notifications Retry Retry No notifications found - Favorites + FAVORITES WEB SERIES (HINDI) WEB SERIES (ENGLISH) No favorites added