From f72bcdbcc1a7dc203b947e1774cf1abf580c0eb4 Mon Sep 17 00:00:00 2001
From: AdityaGaikwad <adityagaikwad@wdimails.com>
Date: Thu, 10 Oct 2024 12:02:28 +0530
Subject: [PATCH] Karaoke url changed to download the audio.

---
 .idea/deploymentTargetDropDown.xml            | 34 +------------------
 .../com/woka/home/fragments/MyListFragment.kt |  2 ++
 .../view/fragments/FavKaraokeFragment.kt      |  6 ++--
 .../karaoke/player/KaraokePlayerActivity.kt   |  4 +--
 .../woka/karaoke/player/KaraokePlayerData.kt  |  1 +
 .../com/woka/karaoke/views/KaraokeActivity.kt |  7 ++--
 6 files changed, 15 insertions(+), 39 deletions(-)

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index e7cfdbf..0c0c338 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -3,39 +3,7 @@
   <component name="deploymentTargetDropDown">
     <value>
       <entry key="app">
-        <State>
-          <runningDeviceTargetsSelectedWithDialog>
-            <Target>
-              <type value="RUNNING_DEVICE_TARGET" />
-              <deviceKey>
-                <Key>
-                  <type value="SERIAL_NUMBER" />
-                  <value value="ebd2741f" />
-                </Key>
-              </deviceKey>
-            </Target>
-            <Target>
-              <type value="RUNNING_DEVICE_TARGET" />
-              <deviceKey>
-                <Key>
-                  <type value="SERIAL_NUMBER" />
-                  <value value="adb-RZCW41EJRPN-wiByj3._adb-tls-connect._tcp." />
-                </Key>
-              </deviceKey>
-            </Target>
-          </runningDeviceTargetsSelectedWithDialog>
-          <targetsSelectedWithDialog>
-            <Target>
-              <type value="QUICK_BOOT_TARGET" />
-              <deviceKey>
-                <Key>
-                  <type value="VIRTUAL_DEVICE_PATH" />
-                  <value value="$PROJECT_DIR$/../.android/avd/Small_Phone_API_34.avd" />
-                </Key>
-              </deviceKey>
-            </Target>
-          </targetsSelectedWithDialog>
-        </State>
+        <State />
       </entry>
     </value>
   </component>
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 086e896..550930f 100644
--- a/app/src/main/java/com/woka/home/fragments/MyListFragment.kt
+++ b/app/src/main/java/com/woka/home/fragments/MyListFragment.kt
@@ -1096,6 +1096,7 @@ class MyListFragment : Fragment() {
                                                 putExtra(
                                                     KaraokePlayerActivity.EXTRA_KARAOKE_DATA,
                                                     KaraokePlayerData(
+                                                        data.url?:it,
                                                         it,
                                                         karaokeData.title,
                                                         karaokeData.id
@@ -1131,6 +1132,7 @@ class MyListFragment : Fragment() {
                                                 putExtra(
                                                     KaraokePlayerActivity.EXTRA_KARAOKE_DATA,
                                                     KaraokePlayerData(
+                                                        data.url?:it,
                                                         it,
                                                         karaokeData.title,
                                                         karaokeData.id
diff --git a/app/src/main/java/com/woka/home/mylist/view/fragments/FavKaraokeFragment.kt b/app/src/main/java/com/woka/home/mylist/view/fragments/FavKaraokeFragment.kt
index 3077c76..1c32ad4 100644
--- a/app/src/main/java/com/woka/home/mylist/view/fragments/FavKaraokeFragment.kt
+++ b/app/src/main/java/com/woka/home/mylist/view/fragments/FavKaraokeFragment.kt
@@ -222,7 +222,8 @@ class FavKaraokeFragment : Fragment() {
                                             ).apply {
                                                 putExtra(
                                                     KaraokePlayerActivity.EXTRA_KARAOKE_DATA,
-                                                    KaraokePlayerData(it, karaokeData.title, karaokeData.id)
+                                                    KaraokePlayerData(data.url?:it,
+                                                        it, karaokeData.title, karaokeData.id)
                                                 )
                                             })
                                     }
@@ -250,7 +251,8 @@ class FavKaraokeFragment : Fragment() {
                                             ).apply {
                                                 putExtra(
                                                     KaraokePlayerActivity.EXTRA_KARAOKE_DATA,
-                                                    KaraokePlayerData(it, karaokeData.title, karaokeData.id)
+                                                    KaraokePlayerData(data.url?:it,
+                                                        it, karaokeData.title, karaokeData.id)
                                                 )
                                             })
                                     }
diff --git a/app/src/main/java/com/woka/karaoke/player/KaraokePlayerActivity.kt b/app/src/main/java/com/woka/karaoke/player/KaraokePlayerActivity.kt
index ff7d744..a34d878 100644
--- a/app/src/main/java/com/woka/karaoke/player/KaraokePlayerActivity.kt
+++ b/app/src/main/java/com/woka/karaoke/player/KaraokePlayerActivity.kt
@@ -460,7 +460,7 @@ class KaraokePlayerActivity : WokaBaseActivity() {
     }
 
     private fun loadAudioFromUrl() {
-        if (karaokePlayerData?.karaokeVideoUrl == null) {
+        if (karaokePlayerData?.karaokeAudioUrl == null) {
             binding.progressView.hide()
             toast(getString(R.string.canoot_load_karaoke))
             return
@@ -468,7 +468,7 @@ class KaraokePlayerActivity : WokaBaseActivity() {
 
         CoroutineScope(Dispatchers.IO).launch {
             try {
-                val url = URL(karaokePlayerData?.karaokeVideoUrl)
+                val url = URL(karaokePlayerData?.karaokeAudioUrl)
                 copyStreamToFile(url.openConnection().getInputStream(), File(karaokeMusicPath))
                 runOnUiThread {
                     binding.recorderView.show()
diff --git a/app/src/main/java/com/woka/karaoke/player/KaraokePlayerData.kt b/app/src/main/java/com/woka/karaoke/player/KaraokePlayerData.kt
index 43e5731..74681b4 100644
--- a/app/src/main/java/com/woka/karaoke/player/KaraokePlayerData.kt
+++ b/app/src/main/java/com/woka/karaoke/player/KaraokePlayerData.kt
@@ -6,6 +6,7 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 data class KaraokePlayerData(
     val karaokeVideoUrl: String,
+    val karaokeAudioUrl: String,
     val title: String?,
     val id: Int?
 ): Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/com/woka/karaoke/views/KaraokeActivity.kt b/app/src/main/java/com/woka/karaoke/views/KaraokeActivity.kt
index 86b61e4..bf89c7b 100644
--- a/app/src/main/java/com/woka/karaoke/views/KaraokeActivity.kt
+++ b/app/src/main/java/com/woka/karaoke/views/KaraokeActivity.kt
@@ -258,7 +258,10 @@ class KaraokeActivity : WokaBaseActivity() {
                                 ).apply {
                                     putExtra(
                                         EXTRA_KARAOKE_DATA,
-                                        KaraokePlayerData(it, karaokeData.title, karaokeData.id)
+                                        KaraokePlayerData(data.url?:it,
+                                            it,
+                                            karaokeData.title,
+                                            karaokeData.id)
                                     )
                                 })
                         }
@@ -273,7 +276,7 @@ class KaraokeActivity : WokaBaseActivity() {
                                 ).apply {
                                     putExtra(
                                         EXTRA_KARAOKE_DATA,
-                                        KaraokePlayerData(it, karaokeData.title, karaokeData.id)
+                                        KaraokePlayerData(data.url?:it, it, karaokeData.title, karaokeData.id)
                                     )
                                 }
                             )