Ads code cleaned up in PlayerActivity and LiveStreamPlayerActivity.

Hindi language text updates at some places. Other Ui changes. Ad updates
2024-10-03 19:56:55 +05:30
parent ffefede40c
commit 37846b8670
11 changed files with 82 additions and 72 deletions
--- 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)
--- 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)
--- 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)
--- 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)
--- 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
--- 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<AdBreak>()
-
-        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<AdBreak>()
+//
 //        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
--- 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">

-        <com.woka.utils.PressableImageView
-            android:id="@+id/more"
-            android:layout_width="25dp"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/more"
-            android:scaleType="fitXY"
-            android:src="@drawable/ic_more_up" />
-
-        <TextView
-            android:id="@+id/more_txt"
+        <LinearLayout
+            android:id="@+id/home"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
+            android:orientation="vertical"

-            android:layout_marginTop="5dp"
-            android:fontFamily="@font/exo_2_bold"
-            android:text="@string/home"
-            android:textAllCaps="true"
-            android:textAlignment="center"
+            android:paddingHorizontal="5dp"
+            android:paddingVertical="3dp"

-            android:textColor="@color/white"
+            android:gravity="center_horizontal"
+            >

-            />
+            <ImageView
+                android:layout_width="25dp"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/more"
+                android:scaleType="fitXY"
+                android:src="@drawable/ic_more_up" />
+
+            <TextView
+                android:id="@+id/more_txt"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
+                android:layout_marginTop="5dp"
+                android:fontFamily="@font/exo_2_bold"
+                android:text="@string/home"
+                android:textAllCaps="true"
+                android:textAlignment="center"
+
+                android:textColor="@color/white"
+
+                />
+
+        </LinearLayout>

        <TextView
            android:id="@+id/coming_soon_txt"
--- a/app/src/main/res/layout/fragment_home2.xml
+++ b/app/src/main/res/layout/fragment_home2.xml
@@ -538,6 +538,7 @@
                android:orientation="vertical"
                android:gravity="center"
                android:layout_marginTop="25dp"
+                android:layout_marginHorizontal="15dp"
                />

            <TextView
--- a/app/src/main/res/layout/fragment_home_1.xml
+++ b/app/src/main/res/layout/fragment_home_1.xml
@@ -553,12 +553,15 @@
    </LinearLayout>

    <LinearLayout
-        android:id="@+id/linearLayout7"
+        android:id="@+id/more_ll"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"

        android:translationZ="2dp"

+        android:paddingVertical="3dp"
+        android:paddingHorizontal="5dp"
+
        android:layout_marginBottom="@dimen/_20sdp"

        android:gravity="center_horizontal"
@@ -568,7 +571,7 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent">

-        <com.woka.utils.PressableImageView
+        <ImageView
            android:id="@+id/more"
            android:layout_width="25dp"
            android:layout_height="wrap_content"
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -104,7 +104,7 @@
    <string name="theme">थीम</string>
    <string name="hello">नमस्ते</string>
    <string name="web_series">वेब सीरीज</string>
-    <string name="audio_books">सुनें</string>
+    <string name="audio_books">ऑडियो पुस्तकें</string>
    <string name="play">खेल</string>
    <string name="karaoke">कराओके</string>
    <string name="shop">दुकान</string>
@@ -114,13 +114,13 @@
    <string name="login_register">लॉगइन / रजिस्टर करें</string>
    <string name="logging_you_out">लॉग आउट कर रहे हैं</string>
    <string name="do_you_want_to_log_out">क्या आप Woka ऐप से लॉग आउट करना चाहते हैं?</string>
-    <string name="woka_fm">वोका एफएम</string>
+    <string name="woka_fm">WOKA एफएम</string>
    <string name="games">खेल</string>
    <string name="coming_soonn_on_woka">जल्द ही Woka पर आ रहा है</string>
-    <string name="woka_live_tv">वोका लाइव टीवी</string>
+    <string name="woka_live_tv">लाइव टीवी</string>
    <string name="blogs">ब्लॉग</string>
    <string name="masila">मासिला</string>
-    <string name="play_trailer">ट्रेलर चलाएं</string>
+    <string name="play_trailer">प्ले ट्रेलर</string>
    <string name="update_profile">प्रोफ़ाइल अपडेट करें</string>
    <string name="full_name">पूरा नाम</string>
    <string name="your_birthdate">आपकी जन्म तिथि</string>
@@ -128,7 +128,7 @@
    <string name="add_child_account">बच्चे का खाता जोड़ें</string>
    <string name="child_name">बच्चे का नाम</string>
    <string name="enter_your_child_s_name">अपने बच्चे का नाम दर्ज करें</string>
-    <string name="woka_songs">वोका गाने</string>
+    <string name="woka_songs">WOKA गाने</string>
    <string name="do_you_want_to_exit_from_the_woka_app">क्या आप WOKA ऐप से बाहर निकलना चाहते हैं?</string>
    <string name="retry">पुन: प्रयास करें</string>
    <string name="web_series_hindi">वेब सीरीज (हिन्दी)</string>
@@ -139,6 +139,7 @@
    <string name="continue_watching">देखना जारी रखें</string>
    <string name="watch">देखें</string>
    <string name="add">अप्रिय</string>
+    <string name="added">प्रिय</string>
    <string name="rate">पसंदीदा</string>
    <string name="share">शेयर</string>
    <string name="couldnt_play_video">वीडियो नहीं चलाया जा सका</string>
@@ -154,4 +155,11 @@
    <string name="username_found">उपयोक्तानाम मिले</string>
    <string name="user_name_linked_to_your_account">आपके खाते से जुड़े उपयोगकर्ता नाम</string>
    <string name="blogs_all_caps">ब्लॉग</string>
+    <string name="favorites">पसंदीदा</string>
+    <string name="view_all">और देखें</string>
+    <string name="sing_again">फिर से गाएं</string>
+    <string name="sing_along_and_dance">साथ गाओ और नाचो</string>
+    <string name="have_a_fun_time">आनंद करने का समय</string>
+    <string name="load_more">और लोड करें</string>
+    <string name="notifications">सूचनाएं</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -137,7 +137,7 @@
    <string name="woka_fm">WOKA FM</string>
    <string name="games">GAMES</string>
    <string name="coming_soonn_on_woka">Coming soon on Woka</string>
-    <string name="woka_live_tv">WOKA LIVE TV</string>
+    <string name="woka_live_tv">LIVE TV</string>
    <string name="blogs">Blogs</string>
    <string name="masila">MASILA</string>
    <string name="play_trailer">PLAY TRAILER</string>
@@ -168,11 +168,11 @@
    <string name="do_you_want_to_exit_from_the_woka_app">Do you want to exit from the WOKA app?</string>
    <string name="_00_00" translatable="false">00:00</string>
    <string name="slash" translatable="false">/</string>
-    <string name="notifications" translatable="false">Notifications</string>
+    <string name="notifications">Notifications</string>
    <string name="retry">Retry</string>
    <string name="retry_underline" translatable="false"><u>Retry</u></string>
    <string name="no_notifications_found" translatable="false">No notifications found</string>
-    <string name="favorites" translatable="false">Favorites</string>
+    <string name="favorites">FAVORITES</string>
    <string name="web_series_hindi">WEB SERIES (HINDI)</string>
    <string name="web_series_english">WEB SERIES (ENGLISH)</string>
    <string name="no_favorites_added" translatable="false">No favorites added</string>