diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2c509b3..e2bf998 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -7,19 +7,19 @@ plugins { } android { - namespace = "com.player.musicoo" + namespace = "relax.offline.music" compileSdk = 34 defaultConfig { - applicationId = "com.player.musicoo" + applicationId = "relax.offline.mp3.music" minSdk = 24 targetSdk = 34 versionCode = 1 - versionName = "1.0.2" + versionName = "1.0.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - setProperty("archivesBaseName", "Musicoo_${defaultConfig.versionName}(${defaultConfig.versionCode})") + setProperty("archivesBaseName", "Musiclax_${defaultConfig.versionName}(${defaultConfig.versionCode})") } buildTypes { diff --git a/app/src/androidTest/java/com/player/musicoo/ExampleInstrumentedTest.kt b/app/src/androidTest/java/relax/offline/music/ExampleInstrumentedTest.kt similarity index 85% rename from app/src/androidTest/java/com/player/musicoo/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/relax/offline/music/ExampleInstrumentedTest.kt index 1bb5a7b..9f2eeb6 100644 --- a/app/src/androidTest/java/com/player/musicoo/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/relax/offline/music/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.player.musicoo +package relax.offline.music import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.player.musicoo", appContext.packageName) + assertEquals("relax.offline.music", appContext.packageName) } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cb0defa..f04ecef 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,15 +16,15 @@ android:maxSdkVersion="32" /> ${offline.videoId}") diff --git a/app/src/main/java/com/player/musicoo/activity/MoPlayDetailsActivity.kt b/app/src/main/java/relax/offline/music/activity/MoPlayDetailsActivity.kt similarity index 96% rename from app/src/main/java/com/player/musicoo/activity/MoPlayDetailsActivity.kt rename to app/src/main/java/relax/offline/music/activity/MoPlayDetailsActivity.kt index c41ecde..6fa9678 100644 --- a/app/src/main/java/com/player/musicoo/activity/MoPlayDetailsActivity.kt +++ b/app/src/main/java/relax/offline/music/activity/MoPlayDetailsActivity.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.activity +package relax.offline.music.activity import android.annotation.SuppressLint import android.graphics.Bitmap @@ -10,7 +10,6 @@ import android.view.View import android.view.animation.AnimationUtils import androidx.annotation.OptIn import androidx.core.net.toUri -import androidx.lifecycle.LifecycleOwner import androidx.media3.common.MediaItem import androidx.media3.common.PlaybackException import androidx.media3.common.Player @@ -24,25 +23,20 @@ import com.bumptech.glide.Glide import com.bumptech.glide.request.target.CustomTarget import com.bumptech.glide.request.transition.Transition import com.gyf.immersionbar.ktx.immersionBar -import com.player.musicoo.App -import com.player.musicoo.R -import com.player.musicoo.adapter.PlayListAdapter -import com.player.musicoo.bean.OfflineBean -import com.player.musicoo.databinding.ActivityMoPlayDetailsBinding -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.media.MediaControllerManager -import com.player.musicoo.media.SongRadio -import com.player.musicoo.service.MyDownloadService -import com.player.musicoo.service.ViewModelMain -import com.player.musicoo.sp.AppStore -import com.player.musicoo.util.DownloadUtil -import com.player.musicoo.util.FileSizeConverter -import com.player.musicoo.util.LogTag -import com.player.musicoo.util.LogTag.LogD -import com.player.musicoo.util.PlayMode -import com.player.musicoo.util.asMediaItem -import com.player.musicoo.util.convertMillisToMinutesAndSecondsString -import kotlinx.coroutines.CoroutineScope +import relax.offline.music.R +import relax.offline.music.adapter.PlayListAdapter +import relax.offline.music.databinding.ActivityMoPlayDetailsBinding +import relax.offline.music.innertube.Innertube +import relax.offline.music.media.MediaControllerManager +import relax.offline.music.media.SongRadio +import relax.offline.music.service.MyDownloadService +import relax.offline.music.service.ViewModelMain +import relax.offline.music.sp.AppStore +import relax.offline.music.util.DownloadUtil +import relax.offline.music.util.LogTag.LogD +import relax.offline.music.util.PlayMode +import relax.offline.music.util.asMediaItem +import relax.offline.music.util.convertMillisToMinutesAndSecondsString import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.isActive import kotlinx.coroutines.launch @@ -590,7 +584,7 @@ class MoPlayDetailsActivity : MoBaseActivity(), Player.Listener { Glide.with(this) .asBitmap() .load(mediaItem.mediaMetadata.artworkUri) - .placeholder(R.mipmap.musicoo_logo_img) + .placeholder(R.mipmap.app_logo) .into(object : CustomTarget() { override fun onResourceReady(resource: Bitmap, transition: Transition?) { binding.thumbnail.setImageBitmap(resource) diff --git a/app/src/main/java/com/player/musicoo/activity/MoSearchMoreActivity.kt b/app/src/main/java/relax/offline/music/activity/MoSearchMoreActivity.kt similarity index 81% rename from app/src/main/java/com/player/musicoo/activity/MoSearchMoreActivity.kt rename to app/src/main/java/relax/offline/music/activity/MoSearchMoreActivity.kt index b39c748..4d06e66 100644 --- a/app/src/main/java/com/player/musicoo/activity/MoSearchMoreActivity.kt +++ b/app/src/main/java/relax/offline/music/activity/MoSearchMoreActivity.kt @@ -1,32 +1,15 @@ -package com.player.musicoo.activity +package relax.offline.music.activity import android.annotation.SuppressLint import android.view.View import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide import com.gyf.immersionbar.ktx.immersionBar -import com.player.musicoo.R -import com.player.musicoo.adapter.DetailsListAdapter -import com.player.musicoo.adapter.SearchResultOtherAdapter -import com.player.musicoo.databinding.ActivityDetailsBinding -import com.player.musicoo.databinding.ActivitySearchMoreBinding -import com.player.musicoo.databinding.ActivitySingerDetailsBinding -import com.player.musicoo.fragment.MoHomeFragment -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.bodies.ContinuationBody -import com.player.musicoo.innertube.models.bodies.SearchBody -import com.player.musicoo.innertube.requests.moPlaylistPage -import com.player.musicoo.innertube.requests.moSearchPage -import com.player.musicoo.innertube.requests.moSingerListPage -import com.player.musicoo.util.LogTag -import com.player.musicoo.util.LogTag.LogD -import com.player.musicoo.view.SearchResultOptimalView -import com.player.musicoo.view.SearchResultOtherView -import com.player.musicoo.view.SingerDetailsOtherView -import com.player.musicoo.view.SingerDetailsSongView -import com.scwang.smart.refresh.layout.api.RefreshLayout -import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener +import relax.offline.music.adapter.SearchResultOtherAdapter +import relax.offline.music.databinding.ActivitySearchMoreBinding +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.bodies.ContinuationBody +import relax.offline.music.innertube.models.bodies.SearchBody +import relax.offline.music.innertube.requests.moSearchPage import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.isActive import kotlinx.coroutines.selects.select diff --git a/app/src/main/java/com/player/musicoo/activity/MoSingerDetailsActivity.kt b/app/src/main/java/relax/offline/music/activity/MoSingerDetailsActivity.kt similarity index 92% rename from app/src/main/java/com/player/musicoo/activity/MoSingerDetailsActivity.kt rename to app/src/main/java/relax/offline/music/activity/MoSingerDetailsActivity.kt index dabc0cc..49bb684 100644 --- a/app/src/main/java/com/player/musicoo/activity/MoSingerDetailsActivity.kt +++ b/app/src/main/java/relax/offline/music/activity/MoSingerDetailsActivity.kt @@ -1,14 +1,14 @@ -package com.player.musicoo.activity +package relax.offline.music.activity import android.view.View import com.bumptech.glide.Glide import com.gyf.immersionbar.ktx.immersionBar -import com.player.musicoo.databinding.ActivitySingerDetailsBinding -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.requests.moSingerListPage -import com.player.musicoo.util.LogTag.LogD -import com.player.musicoo.view.SingerDetailsOtherView -import com.player.musicoo.view.SingerDetailsSongView +import relax.offline.music.databinding.ActivitySingerDetailsBinding +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.requests.moSingerListPage +import relax.offline.music.util.LogTag.LogD +import relax.offline.music.view.SingerDetailsOtherView +import relax.offline.music.view.SingerDetailsSongView import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.isActive import kotlinx.coroutines.selects.select diff --git a/app/src/main/java/com/player/musicoo/activity/MoSingerMoreSongActivity.kt b/app/src/main/java/relax/offline/music/activity/MoSingerMoreSongActivity.kt similarity index 92% rename from app/src/main/java/com/player/musicoo/activity/MoSingerMoreSongActivity.kt rename to app/src/main/java/relax/offline/music/activity/MoSingerMoreSongActivity.kt index f9d762a..274a99e 100644 --- a/app/src/main/java/com/player/musicoo/activity/MoSingerMoreSongActivity.kt +++ b/app/src/main/java/relax/offline/music/activity/MoSingerMoreSongActivity.kt @@ -1,17 +1,17 @@ -package com.player.musicoo.activity +package relax.offline.music.activity import android.annotation.SuppressLint import android.view.View import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import com.gyf.immersionbar.ktx.immersionBar -import com.player.musicoo.adapter.SingerMoreSongAdapter -import com.player.musicoo.databinding.ActivitySearchMoreBinding -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.bodies.BrowseBody -import com.player.musicoo.innertube.models.bodies.ContinuationBody -import com.player.musicoo.innertube.requests.moSingerDetailsMoreLoadMorePage -import com.player.musicoo.innertube.requests.moSingerDetailsMorePage +import relax.offline.music.adapter.SingerMoreSongAdapter +import relax.offline.music.databinding.ActivitySearchMoreBinding +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.bodies.BrowseBody +import relax.offline.music.innertube.models.bodies.ContinuationBody +import relax.offline.music.innertube.requests.moSingerDetailsMoreLoadMorePage +import relax.offline.music.innertube.requests.moSingerDetailsMorePage import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.isActive import kotlinx.coroutines.selects.select diff --git a/app/src/main/java/com/player/musicoo/activity/PlayDetailsActivity.kt b/app/src/main/java/relax/offline/music/activity/PlayDetailsActivity.kt similarity index 94% rename from app/src/main/java/com/player/musicoo/activity/PlayDetailsActivity.kt rename to app/src/main/java/relax/offline/music/activity/PlayDetailsActivity.kt index 1e3d636..a644fed 100644 --- a/app/src/main/java/com/player/musicoo/activity/PlayDetailsActivity.kt +++ b/app/src/main/java/relax/offline/music/activity/PlayDetailsActivity.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.activity +package relax.offline.music.activity import android.animation.ValueAnimator import android.annotation.SuppressLint @@ -21,14 +21,14 @@ import androidx.media3.common.util.UnstableApi import com.bumptech.glide.Glide import com.google.android.material.slider.Slider.OnChangeListener import com.gyf.immersionbar.ktx.immersionBar -import com.player.musicoo.R -import com.player.musicoo.bean.Audio -import com.player.musicoo.databinding.ActivityPlayDetailsBinding -import com.player.musicoo.media.LocalMediaControllerManager -import com.player.musicoo.util.LogTag -import com.player.musicoo.util.containsContent -import com.player.musicoo.util.convertMillisToMinutesAndSecondsString -import com.player.musicoo.util.getAudioDurationFromAssets +import relax.offline.music.R +import relax.offline.music.bean.Audio +import relax.offline.music.databinding.ActivityPlayDetailsBinding +import relax.offline.music.media.LocalMediaControllerManager +import relax.offline.music.util.LogTag +import relax.offline.music.util.containsContent +import relax.offline.music.util.convertMillisToMinutesAndSecondsString +import relax.offline.music.util.getAudioDurationFromAssets import java.io.IOException import java.io.InputStream @@ -75,8 +75,8 @@ class PlayDetailsActivity : BaseActivity() { binding.imageView.setImageBitmap(blurredBitmap) } else { - binding.image.setImageResource(R.mipmap.musicoo_logo_img) - val bitmap = loadBitmapFromAsset(R.mipmap.musicoo_logo_img) + binding.image.setImageResource(R.mipmap.app_logo) + val bitmap = loadBitmapFromAsset(R.mipmap.app_logo) val blurredBitmap = applyGaussianBlur(bitmap, 25f, this) binding.imageView.setImageBitmap(blurredBitmap) } diff --git a/app/src/main/java/com/player/musicoo/activity/PrimaryActivity.kt b/app/src/main/java/relax/offline/music/activity/PrimaryActivity.kt similarity index 87% rename from app/src/main/java/com/player/musicoo/activity/PrimaryActivity.kt rename to app/src/main/java/relax/offline/music/activity/PrimaryActivity.kt index c35ee17..eb68318 100644 --- a/app/src/main/java/com/player/musicoo/activity/PrimaryActivity.kt +++ b/app/src/main/java/relax/offline/music/activity/PrimaryActivity.kt @@ -1,24 +1,14 @@ -package com.player.musicoo.activity +package relax.offline.music.activity -import android.content.Intent -import android.os.Handler -import android.os.Looper -import android.os.Message import android.view.View import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentTransaction -import androidx.media3.common.MediaItem -import androidx.media3.common.Player -import com.bumptech.glide.Glide -import com.player.musicoo.R -import com.player.musicoo.databinding.ActivityPrimaryBinding -import com.player.musicoo.fragment.ImportFragment -import com.player.musicoo.fragment.MoHomeFragment -import com.player.musicoo.fragment.MoMeFragment -import com.player.musicoo.fragment.SearchFragment -import com.player.musicoo.media.MediaControllerManager -import com.player.musicoo.util.LogTag.LogD +import relax.offline.music.R +import relax.offline.music.databinding.ActivityPrimaryBinding +import relax.offline.music.fragment.MoHomeFragment +import relax.offline.music.fragment.MoMeFragment +import relax.offline.music.fragment.SearchFragment import kotlinx.coroutines.isActive import kotlinx.coroutines.selects.select diff --git a/app/src/main/java/com/player/musicoo/activity/SettingsActivity.kt b/app/src/main/java/relax/offline/music/activity/SettingsActivity.kt similarity index 76% rename from app/src/main/java/com/player/musicoo/activity/SettingsActivity.kt rename to app/src/main/java/relax/offline/music/activity/SettingsActivity.kt index 6dcae0c..4cd4070 100644 --- a/app/src/main/java/com/player/musicoo/activity/SettingsActivity.kt +++ b/app/src/main/java/relax/offline/music/activity/SettingsActivity.kt @@ -1,17 +1,17 @@ -package com.player.musicoo.activity +package relax.offline.music.activity import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import com.gyf.immersionbar.ktx.immersionBar -import com.player.musicoo.R -import com.player.musicoo.databinding.ActivitySettingsBinding -import com.player.musicoo.util.PRIVACY_POLICY_URL -import com.player.musicoo.util.TERMS_OF_SERVICE_URL -import com.player.musicoo.util.openPrivacyPolicy -import com.player.musicoo.util.openTermsOfService -import com.player.musicoo.util.sendFeedback -import com.player.musicoo.util.shareApp +import relax.offline.music.R +import relax.offline.music.databinding.ActivitySettingsBinding +import relax.offline.music.util.PRIVACY_POLICY_URL +import relax.offline.music.util.TERMS_OF_SERVICE_URL +import relax.offline.music.util.openPrivacyPolicy +import relax.offline.music.util.openTermsOfService +import relax.offline.music.util.sendFeedback +import relax.offline.music.util.shareApp class SettingsActivity : AppCompatActivity() { private lateinit var binding: ActivitySettingsBinding diff --git a/app/src/main/java/com/player/musicoo/adapter/DetailsListAdapter.kt b/app/src/main/java/relax/offline/music/adapter/DetailsListAdapter.kt similarity index 83% rename from app/src/main/java/com/player/musicoo/adapter/DetailsListAdapter.kt rename to app/src/main/java/relax/offline/music/adapter/DetailsListAdapter.kt index 82ffa17..1579404 100644 --- a/app/src/main/java/com/player/musicoo/adapter/DetailsListAdapter.kt +++ b/app/src/main/java/relax/offline/music/adapter/DetailsListAdapter.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.adapter +package relax.offline.music.adapter import android.annotation.SuppressLint import android.content.Context @@ -6,23 +6,13 @@ import android.content.Intent import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.compose.ui.graphics.Color import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.player.musicoo.App -import com.player.musicoo.R -import com.player.musicoo.activity.MoPlayDetailsActivity -import com.player.musicoo.activity.PlayDetailsActivity -import com.player.musicoo.bean.Audio -import com.player.musicoo.databinding.DetailsListItemBinding -import com.player.musicoo.databinding.MusicResponsiveItemBinding -import com.player.musicoo.databinding.SoundsOfAppliancesLayoutBinding -import com.player.musicoo.databinding.SoundsOfNatureLayoutBinding -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.MusicCarouselShelfRenderer -import com.player.musicoo.media.MediaControllerManager -import com.player.musicoo.util.convertMillisToMinutesAndSecondsString -import com.player.musicoo.util.getAudioDurationFromAssets +import relax.offline.music.R +import relax.offline.music.activity.MoPlayDetailsActivity +import relax.offline.music.databinding.DetailsListItemBinding +import relax.offline.music.innertube.Innertube +import relax.offline.music.media.MediaControllerManager class DetailsListAdapter( private val context: Context, diff --git a/app/src/main/java/com/player/musicoo/adapter/OfflineSongsAdapter.kt b/app/src/main/java/relax/offline/music/adapter/OfflineSongsAdapter.kt similarity index 89% rename from app/src/main/java/com/player/musicoo/adapter/OfflineSongsAdapter.kt rename to app/src/main/java/relax/offline/music/adapter/OfflineSongsAdapter.kt index 1decd0e..b77cd0c 100644 --- a/app/src/main/java/com/player/musicoo/adapter/OfflineSongsAdapter.kt +++ b/app/src/main/java/relax/offline/music/adapter/OfflineSongsAdapter.kt @@ -1,20 +1,16 @@ -package com.player.musicoo.adapter +package relax.offline.music.adapter import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.media3.common.C -import androidx.media3.common.MediaItem -import androidx.media3.common.Player import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.player.musicoo.R -import com.player.musicoo.bean.OfflineBean -import com.player.musicoo.databinding.OfflineListItemBinding -import com.player.musicoo.databinding.PlayListItemBinding -import com.player.musicoo.media.MediaControllerManager +import relax.offline.music.R +import relax.offline.music.bean.OfflineBean +import relax.offline.music.databinding.OfflineListItemBinding +import relax.offline.music.media.MediaControllerManager class OfflineSongsAdapter( private val context: Context, diff --git a/app/src/main/java/com/player/musicoo/adapter/ParentsVoiceAdapter.kt b/app/src/main/java/relax/offline/music/adapter/ParentsVoiceAdapter.kt similarity index 79% rename from app/src/main/java/com/player/musicoo/adapter/ParentsVoiceAdapter.kt rename to app/src/main/java/relax/offline/music/adapter/ParentsVoiceAdapter.kt index d387425..2d5a96c 100644 --- a/app/src/main/java/com/player/musicoo/adapter/ParentsVoiceAdapter.kt +++ b/app/src/main/java/relax/offline/music/adapter/ParentsVoiceAdapter.kt @@ -1,20 +1,18 @@ -package com.player.musicoo.adapter +package relax.offline.music.adapter import android.content.Context import android.content.Intent -import android.net.Uri import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.player.musicoo.App -import com.player.musicoo.R -import com.player.musicoo.activity.PlayDetailsActivity -import com.player.musicoo.bean.Audio -import com.player.musicoo.databinding.ParentsVoiceLayoutBinding -import com.player.musicoo.util.containsContent -import com.player.musicoo.util.convertMillisToMinutesAndSecondsString -import com.player.musicoo.util.getAudioDurationFromAssets +import relax.offline.music.R +import relax.offline.music.activity.PlayDetailsActivity +import relax.offline.music.bean.Audio +import relax.offline.music.databinding.ParentsVoiceLayoutBinding +import relax.offline.music.util.containsContent +import relax.offline.music.util.convertMillisToMinutesAndSecondsString +import relax.offline.music.util.getAudioDurationFromAssets class ParentsVoiceAdapter( private val context: Context, @@ -44,7 +42,7 @@ class ParentsVoiceAdapter( fun bind(audio: Audio) { binding.apply { - image.setImageResource(R.mipmap.musicoo_logo_img) + image.setImageResource(R.mipmap.app_logo) name.text = audio.name name.requestFocus() if (containsContent(audio.file)) { @@ -54,8 +52,8 @@ class ParentsVoiceAdapter( desc.text = convertMillisToMinutesAndSecondsString(s) } - if (App.currentPlayingAudio != null) { - if (App.currentPlayingAudio?.file == audio.file) { + if (relax.offline.music.App.currentPlayingAudio != null) { + if (relax.offline.music.App.currentPlayingAudio?.file == audio.file) { playingLayout.visibility = View.VISIBLE name.setTextColor(context.getColor(R.color.green)) desc.setTextColor(context.getColor(R.color.green)) diff --git a/app/src/main/java/com/player/musicoo/adapter/PlayListAdapter.kt b/app/src/main/java/relax/offline/music/adapter/PlayListAdapter.kt similarity index 93% rename from app/src/main/java/com/player/musicoo/adapter/PlayListAdapter.kt rename to app/src/main/java/relax/offline/music/adapter/PlayListAdapter.kt index 07cdaf2..cfb56ad 100644 --- a/app/src/main/java/com/player/musicoo/adapter/PlayListAdapter.kt +++ b/app/src/main/java/relax/offline/music/adapter/PlayListAdapter.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.adapter +package relax.offline.music.adapter import android.annotation.SuppressLint import android.content.Context @@ -7,12 +7,11 @@ import android.view.View import android.view.ViewGroup import androidx.media3.common.C import androidx.media3.common.MediaItem -import androidx.media3.common.Player import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.player.musicoo.R -import com.player.musicoo.databinding.PlayListItemBinding -import com.player.musicoo.media.MediaControllerManager +import relax.offline.music.R +import relax.offline.music.databinding.PlayListItemBinding +import relax.offline.music.media.MediaControllerManager class PlayListAdapter( private val context: Context, diff --git a/app/src/main/java/com/player/musicoo/adapter/RealHumanVoiceAdapter.kt b/app/src/main/java/relax/offline/music/adapter/RealHumanVoiceAdapter.kt similarity index 81% rename from app/src/main/java/com/player/musicoo/adapter/RealHumanVoiceAdapter.kt rename to app/src/main/java/relax/offline/music/adapter/RealHumanVoiceAdapter.kt index 808ebe4..24dd1fc 100644 --- a/app/src/main/java/com/player/musicoo/adapter/RealHumanVoiceAdapter.kt +++ b/app/src/main/java/relax/offline/music/adapter/RealHumanVoiceAdapter.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.adapter +package relax.offline.music.adapter import android.content.Context import android.content.Intent @@ -6,13 +6,12 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.player.musicoo.App -import com.player.musicoo.R -import com.player.musicoo.activity.PlayDetailsActivity -import com.player.musicoo.bean.Audio -import com.player.musicoo.databinding.RealHumanVoiceLayoutBinding -import com.player.musicoo.util.convertMillisToMinutesAndSecondsString -import com.player.musicoo.util.getAudioDurationFromAssets +import relax.offline.music.R +import relax.offline.music.activity.PlayDetailsActivity +import relax.offline.music.bean.Audio +import relax.offline.music.databinding.RealHumanVoiceLayoutBinding +import relax.offline.music.util.convertMillisToMinutesAndSecondsString +import relax.offline.music.util.getAudioDurationFromAssets class RealHumanVoiceAdapter( private val context: Context, @@ -50,8 +49,8 @@ class RealHumanVoiceAdapter( val s = getAudioDurationFromAssets(context, audio.file) desc.text = convertMillisToMinutesAndSecondsString(s) - if (App.currentPlayingAudio != null) { - if (App.currentPlayingAudio?.file == audio.file) { + if (relax.offline.music.App.currentPlayingAudio != null) { + if (relax.offline.music.App.currentPlayingAudio?.file == audio.file) { name.setTextColor(context.getColor(R.color.green)) desc.setTextColor(context.getColor(R.color.green)) } else { diff --git a/app/src/main/java/com/player/musicoo/adapter/ResponsiveListAdapter.kt b/app/src/main/java/relax/offline/music/adapter/ResponsiveListAdapter.kt similarity index 92% rename from app/src/main/java/com/player/musicoo/adapter/ResponsiveListAdapter.kt rename to app/src/main/java/relax/offline/music/adapter/ResponsiveListAdapter.kt index 5841846..a182967 100644 --- a/app/src/main/java/com/player/musicoo/adapter/ResponsiveListAdapter.kt +++ b/app/src/main/java/relax/offline/music/adapter/ResponsiveListAdapter.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.adapter +package relax.offline.music.adapter import android.content.Context import android.content.Intent @@ -7,12 +7,11 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.player.musicoo.R -import com.player.musicoo.activity.MoPlayDetailsActivity -import com.player.musicoo.databinding.MusicResponsiveItemBinding -import com.player.musicoo.innertube.models.MusicCarouselShelfRenderer -import com.player.musicoo.innertube.models.bodies.NextBody -import com.player.musicoo.media.MediaControllerManager +import relax.offline.music.R +import relax.offline.music.activity.MoPlayDetailsActivity +import relax.offline.music.databinding.MusicResponsiveItemBinding +import relax.offline.music.innertube.models.MusicCarouselShelfRenderer +import relax.offline.music.media.MediaControllerManager class ResponsiveListAdapter( private val context: Context, diff --git a/app/src/main/java/com/player/musicoo/adapter/SearchHistoryAdapter.kt b/app/src/main/java/relax/offline/music/adapter/SearchHistoryAdapter.kt similarity index 93% rename from app/src/main/java/com/player/musicoo/adapter/SearchHistoryAdapter.kt rename to app/src/main/java/relax/offline/music/adapter/SearchHistoryAdapter.kt index 578d08c..d8f3752 100644 --- a/app/src/main/java/com/player/musicoo/adapter/SearchHistoryAdapter.kt +++ b/app/src/main/java/relax/offline/music/adapter/SearchHistoryAdapter.kt @@ -1,10 +1,10 @@ -package com.player.musicoo.adapter +package relax.offline.music.adapter import android.content.Context import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.player.musicoo.databinding.SearchHistoryAdapterItemBinding +import relax.offline.music.databinding.SearchHistoryAdapterItemBinding class SearchHistoryAdapter( private val context: Context, diff --git a/app/src/main/java/com/player/musicoo/adapter/SearchResultOtherAdapter.kt b/app/src/main/java/relax/offline/music/adapter/SearchResultOtherAdapter.kt similarity index 82% rename from app/src/main/java/com/player/musicoo/adapter/SearchResultOtherAdapter.kt rename to app/src/main/java/relax/offline/music/adapter/SearchResultOtherAdapter.kt index 13e1488..5f6cd42 100644 --- a/app/src/main/java/com/player/musicoo/adapter/SearchResultOtherAdapter.kt +++ b/app/src/main/java/relax/offline/music/adapter/SearchResultOtherAdapter.kt @@ -1,26 +1,18 @@ -package com.player.musicoo.adapter +package relax.offline.music.adapter import android.annotation.SuppressLint import android.content.Context import android.content.Intent import android.view.LayoutInflater -import android.view.View import android.view.ViewGroup -import androidx.media3.common.C -import androidx.media3.common.MediaItem -import androidx.media3.common.Player import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.player.musicoo.R -import com.player.musicoo.activity.MoListDetailsActivity -import com.player.musicoo.activity.MoPlayDetailsActivity -import com.player.musicoo.activity.MoSingerDetailsActivity -import com.player.musicoo.databinding.PlayListItemBinding -import com.player.musicoo.databinding.SearchResultOtherItemBinding -import com.player.musicoo.databinding.SearchResultOtherLayoutBinding -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.media.MediaControllerManager -import com.player.musicoo.util.LogTag +import relax.offline.music.activity.MoListDetailsActivity +import relax.offline.music.activity.MoPlayDetailsActivity +import relax.offline.music.activity.MoSingerDetailsActivity +import relax.offline.music.databinding.SearchResultOtherItemBinding +import relax.offline.music.innertube.Innertube +import relax.offline.music.util.LogTag class SearchResultOtherAdapter( private val context: Context, diff --git a/app/src/main/java/com/player/musicoo/adapter/SearchSuggestionsAdapter.kt b/app/src/main/java/relax/offline/music/adapter/SearchSuggestionsAdapter.kt similarity index 92% rename from app/src/main/java/com/player/musicoo/adapter/SearchSuggestionsAdapter.kt rename to app/src/main/java/relax/offline/music/adapter/SearchSuggestionsAdapter.kt index 57f30ce..d6ccbc1 100644 --- a/app/src/main/java/com/player/musicoo/adapter/SearchSuggestionsAdapter.kt +++ b/app/src/main/java/relax/offline/music/adapter/SearchSuggestionsAdapter.kt @@ -1,10 +1,10 @@ -package com.player.musicoo.adapter +package relax.offline.music.adapter import android.content.Context import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.player.musicoo.databinding.SearchSuggestionsAdapterItemBinding +import relax.offline.music.databinding.SearchSuggestionsAdapterItemBinding class SearchSuggestionsAdapter( private val context: Context, diff --git a/app/src/main/java/com/player/musicoo/adapter/SingerDetailsSongListAdapter.kt b/app/src/main/java/relax/offline/music/adapter/SingerDetailsSongListAdapter.kt similarity index 84% rename from app/src/main/java/com/player/musicoo/adapter/SingerDetailsSongListAdapter.kt rename to app/src/main/java/relax/offline/music/adapter/SingerDetailsSongListAdapter.kt index 39c509b..4ecbbf0 100644 --- a/app/src/main/java/com/player/musicoo/adapter/SingerDetailsSongListAdapter.kt +++ b/app/src/main/java/relax/offline/music/adapter/SingerDetailsSongListAdapter.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.adapter +package relax.offline.music.adapter import android.annotation.SuppressLint import android.content.Context @@ -8,20 +8,9 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.player.musicoo.App -import com.player.musicoo.R -import com.player.musicoo.activity.MoPlayDetailsActivity -import com.player.musicoo.activity.PlayDetailsActivity -import com.player.musicoo.bean.Audio -import com.player.musicoo.databinding.DetailsListItemBinding -import com.player.musicoo.databinding.MusicResponsiveItemBinding -import com.player.musicoo.databinding.SoundsOfAppliancesLayoutBinding -import com.player.musicoo.databinding.SoundsOfNatureLayoutBinding -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.MusicCarouselShelfRenderer -import com.player.musicoo.innertube.models.MusicShelfRenderer -import com.player.musicoo.util.convertMillisToMinutesAndSecondsString -import com.player.musicoo.util.getAudioDurationFromAssets +import relax.offline.music.activity.MoPlayDetailsActivity +import relax.offline.music.databinding.DetailsListItemBinding +import relax.offline.music.innertube.models.MusicShelfRenderer class SingerDetailsSongListAdapter( private val context: Context, diff --git a/app/src/main/java/com/player/musicoo/adapter/SingerMoreSongAdapter.kt b/app/src/main/java/relax/offline/music/adapter/SingerMoreSongAdapter.kt similarity index 85% rename from app/src/main/java/com/player/musicoo/adapter/SingerMoreSongAdapter.kt rename to app/src/main/java/relax/offline/music/adapter/SingerMoreSongAdapter.kt index 4b1588a..43618fe 100644 --- a/app/src/main/java/com/player/musicoo/adapter/SingerMoreSongAdapter.kt +++ b/app/src/main/java/relax/offline/music/adapter/SingerMoreSongAdapter.kt @@ -1,27 +1,17 @@ -package com.player.musicoo.adapter +package relax.offline.music.adapter import android.annotation.SuppressLint import android.content.Context import android.content.Intent import android.view.LayoutInflater -import android.view.View import android.view.ViewGroup -import androidx.media3.common.C -import androidx.media3.common.MediaItem -import androidx.media3.common.Player import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.player.musicoo.R -import com.player.musicoo.activity.MoListDetailsActivity -import com.player.musicoo.activity.MoPlayDetailsActivity -import com.player.musicoo.activity.MoSingerDetailsActivity -import com.player.musicoo.databinding.MusicTowRowItemBinding -import com.player.musicoo.databinding.PlayListItemBinding -import com.player.musicoo.databinding.SearchResultOtherItemBinding -import com.player.musicoo.databinding.SearchResultOtherLayoutBinding -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.media.MediaControllerManager -import com.player.musicoo.util.LogTag +import relax.offline.music.activity.MoListDetailsActivity +import relax.offline.music.activity.MoPlayDetailsActivity +import relax.offline.music.databinding.MusicTowRowItemBinding +import relax.offline.music.databinding.SearchResultOtherItemBinding +import relax.offline.music.innertube.Innertube class SingerMoreSongAdapter( private val context: Context, diff --git a/app/src/main/java/com/player/musicoo/adapter/SoundsOfAppliancesAdapter.kt b/app/src/main/java/relax/offline/music/adapter/SoundsOfAppliancesAdapter.kt similarity index 82% rename from app/src/main/java/com/player/musicoo/adapter/SoundsOfAppliancesAdapter.kt rename to app/src/main/java/relax/offline/music/adapter/SoundsOfAppliancesAdapter.kt index 9cc5189..2fe3c62 100644 --- a/app/src/main/java/com/player/musicoo/adapter/SoundsOfAppliancesAdapter.kt +++ b/app/src/main/java/relax/offline/music/adapter/SoundsOfAppliancesAdapter.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.adapter +package relax.offline.music.adapter import android.content.Context import android.content.Intent @@ -7,13 +7,12 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.player.musicoo.App -import com.player.musicoo.R -import com.player.musicoo.activity.PlayDetailsActivity -import com.player.musicoo.bean.Audio -import com.player.musicoo.databinding.SoundsOfAppliancesLayoutBinding -import com.player.musicoo.util.convertMillisToMinutesAndSecondsString -import com.player.musicoo.util.getAudioDurationFromAssets +import relax.offline.music.R +import relax.offline.music.activity.PlayDetailsActivity +import relax.offline.music.bean.Audio +import relax.offline.music.databinding.SoundsOfAppliancesLayoutBinding +import relax.offline.music.util.convertMillisToMinutesAndSecondsString +import relax.offline.music.util.getAudioDurationFromAssets class SoundsOfAppliancesAdapter( private val context: Context, @@ -52,8 +51,8 @@ class SoundsOfAppliancesAdapter( val s = getAudioDurationFromAssets(context, audio.file) desc.text = convertMillisToMinutesAndSecondsString(s) - if (App.currentPlayingAudio != null) { - if (App.currentPlayingAudio?.file == audio.file) { + if (relax.offline.music.App.currentPlayingAudio != null) { + if (relax.offline.music.App.currentPlayingAudio?.file == audio.file) { playingLayout.visibility = View.VISIBLE name.setTextColor(context.getColor(R.color.green)) desc.setTextColor(context.getColor(R.color.green)) diff --git a/app/src/main/java/com/player/musicoo/adapter/SoundsOfNatureAdapter.kt b/app/src/main/java/relax/offline/music/adapter/SoundsOfNatureAdapter.kt similarity index 81% rename from app/src/main/java/com/player/musicoo/adapter/SoundsOfNatureAdapter.kt rename to app/src/main/java/relax/offline/music/adapter/SoundsOfNatureAdapter.kt index 2851ad6..9e19a26 100644 --- a/app/src/main/java/com/player/musicoo/adapter/SoundsOfNatureAdapter.kt +++ b/app/src/main/java/relax/offline/music/adapter/SoundsOfNatureAdapter.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.adapter +package relax.offline.music.adapter import android.content.Context import android.content.Intent @@ -7,14 +7,12 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.player.musicoo.App -import com.player.musicoo.R -import com.player.musicoo.activity.PlayDetailsActivity -import com.player.musicoo.bean.Audio -import com.player.musicoo.databinding.SoundsOfAppliancesLayoutBinding -import com.player.musicoo.databinding.SoundsOfNatureLayoutBinding -import com.player.musicoo.util.convertMillisToMinutesAndSecondsString -import com.player.musicoo.util.getAudioDurationFromAssets +import relax.offline.music.R +import relax.offline.music.activity.PlayDetailsActivity +import relax.offline.music.bean.Audio +import relax.offline.music.databinding.SoundsOfNatureLayoutBinding +import relax.offline.music.util.convertMillisToMinutesAndSecondsString +import relax.offline.music.util.getAudioDurationFromAssets class SoundsOfNatureAdapter( private val context: Context, @@ -53,8 +51,8 @@ class SoundsOfNatureAdapter( val s = getAudioDurationFromAssets(context, audio.file) desc.text = convertMillisToMinutesAndSecondsString(s) - if (App.currentPlayingAudio != null) { - if (App.currentPlayingAudio?.file == audio.file) { + if (relax.offline.music.App.currentPlayingAudio != null) { + if (relax.offline.music.App.currentPlayingAudio?.file == audio.file) { playingLayout.visibility = View.VISIBLE name.setTextColor(context.getColor(R.color.green)) desc.setTextColor(context.getColor(R.color.green)) diff --git a/app/src/main/java/com/player/musicoo/adapter/TowRowListAdapter.kt b/app/src/main/java/relax/offline/music/adapter/TowRowListAdapter.kt similarity index 92% rename from app/src/main/java/com/player/musicoo/adapter/TowRowListAdapter.kt rename to app/src/main/java/relax/offline/music/adapter/TowRowListAdapter.kt index fafc948..8de5f26 100644 --- a/app/src/main/java/com/player/musicoo/adapter/TowRowListAdapter.kt +++ b/app/src/main/java/relax/offline/music/adapter/TowRowListAdapter.kt @@ -1,17 +1,16 @@ -package com.player.musicoo.adapter +package relax.offline.music.adapter import android.app.Activity -import android.content.Context import android.content.Intent import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import com.player.musicoo.activity.MoListDetailsActivity -import com.player.musicoo.activity.MoPlayDetailsActivity -import com.player.musicoo.activity.MoSingerDetailsActivity -import com.player.musicoo.databinding.MusicTowRowItemBinding -import com.player.musicoo.innertube.models.MusicCarouselShelfRenderer +import relax.offline.music.activity.MoListDetailsActivity +import relax.offline.music.activity.MoPlayDetailsActivity +import relax.offline.music.activity.MoSingerDetailsActivity +import relax.offline.music.databinding.MusicTowRowItemBinding +import relax.offline.music.innertube.models.MusicCarouselShelfRenderer class TowRowListAdapter( private val context: Activity, diff --git a/app/src/main/java/com/player/musicoo/bean/Audio.kt b/app/src/main/java/relax/offline/music/bean/Audio.kt similarity index 94% rename from app/src/main/java/com/player/musicoo/bean/Audio.kt rename to app/src/main/java/relax/offline/music/bean/Audio.kt index 4001afe..27ae89b 100644 --- a/app/src/main/java/com/player/musicoo/bean/Audio.kt +++ b/app/src/main/java/relax/offline/music/bean/Audio.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.bean +package relax.offline.music.bean import androidx.annotation.Keep import androidx.room.ColumnInfo diff --git a/app/src/main/java/com/player/musicoo/bean/Category.kt b/app/src/main/java/relax/offline/music/bean/Category.kt similarity index 78% rename from app/src/main/java/com/player/musicoo/bean/Category.kt rename to app/src/main/java/relax/offline/music/bean/Category.kt index f457867..c6d3c17 100644 --- a/app/src/main/java/com/player/musicoo/bean/Category.kt +++ b/app/src/main/java/relax/offline/music/bean/Category.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.bean +package relax.offline.music.bean import java.io.Serializable diff --git a/app/src/main/java/com/player/musicoo/bean/CurrentPlayingAudio.kt b/app/src/main/java/relax/offline/music/bean/CurrentPlayingAudio.kt similarity index 93% rename from app/src/main/java/com/player/musicoo/bean/CurrentPlayingAudio.kt rename to app/src/main/java/relax/offline/music/bean/CurrentPlayingAudio.kt index 0c05042..fda5dd1 100644 --- a/app/src/main/java/com/player/musicoo/bean/CurrentPlayingAudio.kt +++ b/app/src/main/java/relax/offline/music/bean/CurrentPlayingAudio.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.bean +package relax.offline.music.bean import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/com/player/musicoo/bean/OfflineBean.kt b/app/src/main/java/relax/offline/music/bean/OfflineBean.kt similarity index 91% rename from app/src/main/java/com/player/musicoo/bean/OfflineBean.kt rename to app/src/main/java/relax/offline/music/bean/OfflineBean.kt index 5d3646f..2993838 100644 --- a/app/src/main/java/com/player/musicoo/bean/OfflineBean.kt +++ b/app/src/main/java/relax/offline/music/bean/OfflineBean.kt @@ -1,6 +1,5 @@ -package com.player.musicoo.bean +package relax.offline.music.bean -import android.net.Uri import androidx.annotation.Keep import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/com/player/musicoo/bean/ResourcesList.kt b/app/src/main/java/relax/offline/music/bean/ResourcesList.kt similarity index 76% rename from app/src/main/java/com/player/musicoo/bean/ResourcesList.kt rename to app/src/main/java/relax/offline/music/bean/ResourcesList.kt index 735e3dc..e6114ff 100644 --- a/app/src/main/java/com/player/musicoo/bean/ResourcesList.kt +++ b/app/src/main/java/relax/offline/music/bean/ResourcesList.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.bean +package relax.offline.music.bean import java.io.Serializable diff --git a/app/src/main/java/com/player/musicoo/database/AppDatabase.kt b/app/src/main/java/relax/offline/music/database/AppDatabase.kt similarity index 75% rename from app/src/main/java/com/player/musicoo/database/AppDatabase.kt rename to app/src/main/java/relax/offline/music/database/AppDatabase.kt index 85b00e8..004f3e2 100644 --- a/app/src/main/java/com/player/musicoo/database/AppDatabase.kt +++ b/app/src/main/java/relax/offline/music/database/AppDatabase.kt @@ -1,9 +1,9 @@ -package com.player.musicoo.database +package relax.offline.music.database import androidx.room.Database import androidx.room.RoomDatabase -import com.player.musicoo.bean.Audio +import relax.offline.music.bean.Audio @Database(entities = [Audio::class], version = 1, exportSchema = false) abstract class AppDatabase : RoomDatabase() { diff --git a/app/src/main/java/com/player/musicoo/database/AppOfflineDBManager.kt b/app/src/main/java/relax/offline/music/database/AppOfflineDBManager.kt similarity index 95% rename from app/src/main/java/com/player/musicoo/database/AppOfflineDBManager.kt rename to app/src/main/java/relax/offline/music/database/AppOfflineDBManager.kt index 075f74b..2fd3705 100644 --- a/app/src/main/java/com/player/musicoo/database/AppOfflineDBManager.kt +++ b/app/src/main/java/relax/offline/music/database/AppOfflineDBManager.kt @@ -1,9 +1,9 @@ -package com.player.musicoo.database +package relax.offline.music.database import android.content.Context import androidx.room.Room -import com.player.musicoo.bean.OfflineBean -import com.player.musicoo.util.LogTag +import relax.offline.music.bean.OfflineBean +import relax.offline.music.util.LogTag import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/java/com/player/musicoo/database/AppOfflineDatabase.kt b/app/src/main/java/relax/offline/music/database/AppOfflineDatabase.kt similarity index 75% rename from app/src/main/java/com/player/musicoo/database/AppOfflineDatabase.kt rename to app/src/main/java/relax/offline/music/database/AppOfflineDatabase.kt index 23f633e..2ea9029 100644 --- a/app/src/main/java/com/player/musicoo/database/AppOfflineDatabase.kt +++ b/app/src/main/java/relax/offline/music/database/AppOfflineDatabase.kt @@ -1,9 +1,9 @@ -package com.player.musicoo.database +package relax.offline.music.database import androidx.room.Database import androidx.room.RoomDatabase -import com.player.musicoo.bean.OfflineBean +import relax.offline.music.bean.OfflineBean @Database(entities = [OfflineBean::class], version = 1, exportSchema = false) abstract class AppOfflineDatabase : RoomDatabase() { diff --git a/app/src/main/java/com/player/musicoo/database/CurrentAudioDatabase.kt b/app/src/main/java/relax/offline/music/database/CurrentAudioDatabase.kt similarity index 75% rename from app/src/main/java/com/player/musicoo/database/CurrentAudioDatabase.kt rename to app/src/main/java/relax/offline/music/database/CurrentAudioDatabase.kt index 21ac1f9..29f10c7 100644 --- a/app/src/main/java/com/player/musicoo/database/CurrentAudioDatabase.kt +++ b/app/src/main/java/relax/offline/music/database/CurrentAudioDatabase.kt @@ -1,9 +1,9 @@ -package com.player.musicoo.database +package relax.offline.music.database import androidx.room.Database import androidx.room.RoomDatabase -import com.player.musicoo.bean.CurrentPlayingAudio +import relax.offline.music.bean.CurrentPlayingAudio @Database(entities = [CurrentPlayingAudio::class], version = 1, exportSchema = false) abstract class CurrentAudioDatabase : RoomDatabase() { diff --git a/app/src/main/java/com/player/musicoo/database/CurrentAudioManager.kt b/app/src/main/java/relax/offline/music/database/CurrentAudioManager.kt similarity index 93% rename from app/src/main/java/com/player/musicoo/database/CurrentAudioManager.kt rename to app/src/main/java/relax/offline/music/database/CurrentAudioManager.kt index 3ae129b..a47f5cf 100644 --- a/app/src/main/java/com/player/musicoo/database/CurrentAudioManager.kt +++ b/app/src/main/java/relax/offline/music/database/CurrentAudioManager.kt @@ -1,8 +1,8 @@ -package com.player.musicoo.database +package relax.offline.music.database import android.content.Context import androidx.room.Room -import com.player.musicoo.bean.CurrentPlayingAudio +import relax.offline.music.bean.CurrentPlayingAudio class CurrentAudioManager private constructor(context: Context) { private val database: CurrentAudioDatabase = Room.databaseBuilder( diff --git a/app/src/main/java/com/player/musicoo/database/CurrentPlayingAudioDao.kt b/app/src/main/java/relax/offline/music/database/CurrentPlayingAudioDao.kt similarity index 87% rename from app/src/main/java/com/player/musicoo/database/CurrentPlayingAudioDao.kt rename to app/src/main/java/relax/offline/music/database/CurrentPlayingAudioDao.kt index bf49571..dbf6ee7 100644 --- a/app/src/main/java/com/player/musicoo/database/CurrentPlayingAudioDao.kt +++ b/app/src/main/java/relax/offline/music/database/CurrentPlayingAudioDao.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.database +package relax.offline.music.database import androidx.room.Dao import androidx.room.Delete @@ -6,7 +6,7 @@ import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query import androidx.room.Update -import com.player.musicoo.bean.CurrentPlayingAudio +import relax.offline.music.bean.CurrentPlayingAudio @Dao interface CurrentPlayingAudioDao { diff --git a/app/src/main/java/com/player/musicoo/database/DatabaseManager.kt b/app/src/main/java/relax/offline/music/database/DatabaseManager.kt similarity index 96% rename from app/src/main/java/com/player/musicoo/database/DatabaseManager.kt rename to app/src/main/java/relax/offline/music/database/DatabaseManager.kt index 4daba41..134c040 100644 --- a/app/src/main/java/com/player/musicoo/database/DatabaseManager.kt +++ b/app/src/main/java/relax/offline/music/database/DatabaseManager.kt @@ -1,8 +1,8 @@ -package com.player.musicoo.database +package relax.offline.music.database import android.content.Context import androidx.room.Room -import com.player.musicoo.bean.Audio +import relax.offline.music.bean.Audio import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/java/com/player/musicoo/database/LocalAudioDao.kt b/app/src/main/java/relax/offline/music/database/LocalAudioDao.kt similarity index 91% rename from app/src/main/java/com/player/musicoo/database/LocalAudioDao.kt rename to app/src/main/java/relax/offline/music/database/LocalAudioDao.kt index e113d5e..de08264 100644 --- a/app/src/main/java/com/player/musicoo/database/LocalAudioDao.kt +++ b/app/src/main/java/relax/offline/music/database/LocalAudioDao.kt @@ -1,9 +1,9 @@ -package com.player.musicoo.database +package relax.offline.music.database import androidx.room.* -import com.player.musicoo.bean.Audio +import relax.offline.music.bean.Audio @Dao interface LocalAudioDao { diff --git a/app/src/main/java/com/player/musicoo/database/OfflineDao.kt b/app/src/main/java/relax/offline/music/database/OfflineDao.kt similarity index 91% rename from app/src/main/java/com/player/musicoo/database/OfflineDao.kt rename to app/src/main/java/relax/offline/music/database/OfflineDao.kt index 4aee0b7..444d98a 100644 --- a/app/src/main/java/com/player/musicoo/database/OfflineDao.kt +++ b/app/src/main/java/relax/offline/music/database/OfflineDao.kt @@ -1,7 +1,7 @@ -package com.player.musicoo.database +package relax.offline.music.database import androidx.room.* -import com.player.musicoo.bean.OfflineBean +import relax.offline.music.bean.OfflineBean @Dao interface OfflineDao { diff --git a/app/src/main/java/com/player/musicoo/fragment/HomeFragment.kt b/app/src/main/java/relax/offline/music/fragment/HomeFragment.kt similarity index 61% rename from app/src/main/java/com/player/musicoo/fragment/HomeFragment.kt rename to app/src/main/java/relax/offline/music/fragment/HomeFragment.kt index 6baef2e..4f9f9ee 100644 --- a/app/src/main/java/com/player/musicoo/fragment/HomeFragment.kt +++ b/app/src/main/java/relax/offline/music/fragment/HomeFragment.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.fragment +package relax.offline.music.fragment import android.annotation.SuppressLint import android.os.Bundle @@ -9,14 +9,11 @@ import androidx.fragment.app.Fragment import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import com.gyf.immersionbar.ktx.immersionBar -import com.player.musicoo.App -import com.player.musicoo.R -import com.player.musicoo.adapter.RealHumanVoiceAdapter -import com.player.musicoo.adapter.SoundsOfAppliancesAdapter -import com.player.musicoo.adapter.SoundsOfNatureAdapter -import com.player.musicoo.databinding.FragmentHomeBinding -import com.player.musicoo.util.GridSpacingItemDecoration -import com.player.musicoo.util.HorizontalSpaceItemDecoration +import relax.offline.music.adapter.RealHumanVoiceAdapter +import relax.offline.music.adapter.SoundsOfAppliancesAdapter +import relax.offline.music.adapter.SoundsOfNatureAdapter +import relax.offline.music.databinding.FragmentHomeBinding +import relax.offline.music.util.GridSpacingItemDecoration class HomeFragment : Fragment() { private lateinit var binding: FragmentHomeBinding @@ -45,28 +42,28 @@ class HomeFragment : Fragment() { } private fun initView() { - if (App.resourcesList.categories.isNotEmpty()) { - binding.soundsName.text = App.resourcesList.categories[1].name - binding.natureName.text = App.resourcesList.categories[2].name + if (relax.offline.music.App.resourcesList.categories.isNotEmpty()) { + binding.soundsName.text = relax.offline.music.App.resourcesList.categories[1].name + binding.natureName.text = relax.offline.music.App.resourcesList.categories[2].name } - if (App.realHumanVoiceList.isNotEmpty()) { - realHumanVoiceAdapter = RealHumanVoiceAdapter(requireActivity(), App.realHumanVoiceList) + if (relax.offline.music.App.realHumanVoiceList.isNotEmpty()) { + realHumanVoiceAdapter = RealHumanVoiceAdapter(requireActivity(), relax.offline.music.App.realHumanVoiceList) binding.realRv.layoutManager = GridLayoutManager(requireActivity(), 2, GridLayoutManager.VERTICAL, false) binding.realRv.addItemDecoration(GridSpacingItemDecoration(requireActivity(), 20, 2)) binding.realRv.adapter = realHumanVoiceAdapter } - if (App.soundsOfAppliancesList.isNotEmpty()) { + if (relax.offline.music.App.soundsOfAppliancesList.isNotEmpty()) { soundsOfAppliancesAdapter = - SoundsOfAppliancesAdapter(requireActivity(), App.soundsOfAppliancesList) + SoundsOfAppliancesAdapter(requireActivity(), relax.offline.music.App.soundsOfAppliancesList) binding.soundsRv.layoutManager = GridLayoutManager(requireActivity(), 2, GridLayoutManager.VERTICAL, false) binding.soundsRv.addItemDecoration(GridSpacingItemDecoration(requireActivity(), 20, 2)) binding.soundsRv.adapter = soundsOfAppliancesAdapter } - if (App.soundsOfNatureList.isNotEmpty()) { + if (relax.offline.music.App.soundsOfNatureList.isNotEmpty()) { soundsOfNatureAdapter = - SoundsOfNatureAdapter(requireActivity(), App.soundsOfNatureList) + SoundsOfNatureAdapter(requireActivity(), relax.offline.music.App.soundsOfNatureList) binding.natureRv.layoutManager = LinearLayoutManager(requireActivity(), LinearLayoutManager.VERTICAL, false) binding.natureRv.adapter = soundsOfNatureAdapter @@ -76,26 +73,26 @@ class HomeFragment : Fragment() { @SuppressLint("NotifyDataSetChanged") override fun onResume() { super.onResume() - if (App.currentPlayingAudio != null) { - if (App.realHumanVoiceList.isNotEmpty()) { - for ((index, audio) in App.realHumanVoiceList.withIndex()) { - if (audio.file == App.currentPlayingAudio?.file) { + if (relax.offline.music.App.currentPlayingAudio != null) { + if (relax.offline.music.App.realHumanVoiceList.isNotEmpty()) { + for ((index, audio) in relax.offline.music.App.realHumanVoiceList.withIndex()) { + if (audio.file == relax.offline.music.App.currentPlayingAudio?.file) { notifyDataSetChanged() break } } } - if (App.soundsOfAppliancesList.isNotEmpty()) { - for ((index, audio) in App.soundsOfAppliancesList.withIndex()) { - if (audio.file == App.currentPlayingAudio?.file) { + if (relax.offline.music.App.soundsOfAppliancesList.isNotEmpty()) { + for ((index, audio) in relax.offline.music.App.soundsOfAppliancesList.withIndex()) { + if (audio.file == relax.offline.music.App.currentPlayingAudio?.file) { notifyDataSetChanged() break } } } - if (App.soundsOfNatureList.isNotEmpty()) { - for ((index, audio) in App.soundsOfNatureList.withIndex()) { - if (audio.file == App.currentPlayingAudio?.file) { + if (relax.offline.music.App.soundsOfNatureList.isNotEmpty()) { + for ((index, audio) in relax.offline.music.App.soundsOfNatureList.withIndex()) { + if (audio.file == relax.offline.music.App.currentPlayingAudio?.file) { notifyDataSetChanged() break } diff --git a/app/src/main/java/com/player/musicoo/fragment/ImportFragment.kt b/app/src/main/java/relax/offline/music/fragment/ImportFragment.kt similarity index 89% rename from app/src/main/java/com/player/musicoo/fragment/ImportFragment.kt rename to app/src/main/java/relax/offline/music/fragment/ImportFragment.kt index a134feb..facfbdb 100644 --- a/app/src/main/java/com/player/musicoo/fragment/ImportFragment.kt +++ b/app/src/main/java/relax/offline/music/fragment/ImportFragment.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.fragment +package relax.offline.music.fragment import android.Manifest import android.annotation.SuppressLint @@ -12,23 +12,19 @@ import android.media.MediaPlayer import android.net.Uri import android.os.Bundle import android.provider.MediaStore -import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager import com.gyf.immersionbar.ktx.immersionBar -import com.player.musicoo.App -import com.player.musicoo.R -import com.player.musicoo.activity.SettingsActivity -import com.player.musicoo.adapter.ParentsVoiceAdapter -import com.player.musicoo.bean.Audio -import com.player.musicoo.databinding.FragmentImportBinding -import com.player.musicoo.util.uriToFile +import relax.offline.music.R +import relax.offline.music.activity.SettingsActivity +import relax.offline.music.adapter.ParentsVoiceAdapter +import relax.offline.music.bean.Audio +import relax.offline.music.databinding.FragmentImportBinding import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -70,7 +66,7 @@ class ImportFragment : Fragment() { } } importAdapterList.clear() - importAdapterList.addAll(App.importList) + importAdapterList.addAll(relax.offline.music.App.importList) parentsVoiceAdapter = ParentsVoiceAdapter(requireActivity(), importAdapterList) binding.importRv.layoutManager = LinearLayoutManager(requireActivity(), LinearLayoutManager.VERTICAL, false) @@ -116,12 +112,12 @@ class ImportFragment : Fragment() { binding.noContentLayout.visibility = View.VISIBLE } - if (App.currentPlayingAudio != null) { - if (App.importList.isNotEmpty()) { + if (relax.offline.music.App.currentPlayingAudio != null) { + if (relax.offline.music.App.importList.isNotEmpty()) { importAdapterList.clear() - importAdapterList.addAll(App.importList) + importAdapterList.addAll(relax.offline.music.App.importList) for ((index, audio) in importAdapterList.withIndex()) { - if (audio.file == App.currentPlayingAudio?.file) { + if (audio.file == relax.offline.music.App.currentPlayingAudio?.file) { parentsVoiceAdapter?.notifyDataSetChanged() break } @@ -203,12 +199,12 @@ class ImportFragment : Fragment() { CoroutineScope(Dispatchers.IO).launch { if (audio.duration > 0) { - App.databaseManager.insertAudioFile(audio) + relax.offline.music.App.databaseManager.insertAudioFile(audio) } withContext(Dispatchers.Main) { - App.initImportAudio { + relax.offline.music.App.initImportAudio { importAdapterList.clear() - importAdapterList.addAll(App.importList) + importAdapterList.addAll(relax.offline.music.App.importList) parentsVoiceAdapter?.notifyDataSetChanged() if (importAdapterList.isNotEmpty()) { binding.noContentLayout.visibility = View.GONE diff --git a/app/src/main/java/com/player/musicoo/fragment/MoBaseFragment.kt b/app/src/main/java/relax/offline/music/fragment/MoBaseFragment.kt similarity index 90% rename from app/src/main/java/com/player/musicoo/fragment/MoBaseFragment.kt rename to app/src/main/java/relax/offline/music/fragment/MoBaseFragment.kt index f2038d6..136b834 100644 --- a/app/src/main/java/com/player/musicoo/fragment/MoBaseFragment.kt +++ b/app/src/main/java/relax/offline/music/fragment/MoBaseFragment.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.fragment +package relax.offline.music.fragment import android.os.Bundle import android.view.LayoutInflater @@ -6,9 +6,8 @@ import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment import androidx.viewbinding.ViewBinding -import com.player.musicoo.activity.MoBaseActivity -import com.player.musicoo.sp.AppStore -import com.player.musicoo.util.LogTag +import relax.offline.music.sp.AppStore +import relax.offline.music.util.LogTag import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.MainScope import kotlinx.coroutines.cancel diff --git a/app/src/main/java/com/player/musicoo/fragment/MoHomeFragment.kt b/app/src/main/java/relax/offline/music/fragment/MoHomeFragment.kt similarity index 91% rename from app/src/main/java/com/player/musicoo/fragment/MoHomeFragment.kt rename to app/src/main/java/relax/offline/music/fragment/MoHomeFragment.kt index bc611dd..a110bf3 100644 --- a/app/src/main/java/com/player/musicoo/fragment/MoHomeFragment.kt +++ b/app/src/main/java/relax/offline/music/fragment/MoHomeFragment.kt @@ -1,18 +1,17 @@ -package com.player.musicoo.fragment +package relax.offline.music.fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.core.view.allViews import com.gyf.immersionbar.ktx.immersionBar -import com.player.musicoo.databinding.FragmentMoHomeBinding -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.MusicCarouselShelfRenderer -import com.player.musicoo.innertube.requests.homePage -import com.player.musicoo.innertube.requests.homePageMore -import com.player.musicoo.util.LogTag.LogD -import com.player.musicoo.view.MusicResponsiveListView -import com.player.musicoo.view.MusicTowRowListView +import relax.offline.music.databinding.FragmentMoHomeBinding +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.MusicCarouselShelfRenderer +import relax.offline.music.innertube.requests.homePage +import relax.offline.music.innertube.requests.homePageMore +import relax.offline.music.util.LogTag.LogD +import relax.offline.music.view.MusicResponsiveListView +import relax.offline.music.view.MusicTowRowListView import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.isActive import kotlinx.coroutines.selects.select diff --git a/app/src/main/java/com/player/musicoo/fragment/MoMeFragment.kt b/app/src/main/java/relax/offline/music/fragment/MoMeFragment.kt similarity index 88% rename from app/src/main/java/com/player/musicoo/fragment/MoMeFragment.kt rename to app/src/main/java/relax/offline/music/fragment/MoMeFragment.kt index 57f18c8..aba6f9d 100644 --- a/app/src/main/java/com/player/musicoo/fragment/MoMeFragment.kt +++ b/app/src/main/java/relax/offline/music/fragment/MoMeFragment.kt @@ -1,15 +1,14 @@ -package com.player.musicoo.fragment +package relax.offline.music.fragment import android.content.Intent import android.view.LayoutInflater import android.view.ViewGroup import android.widget.Toast import com.gyf.immersionbar.ktx.immersionBar -import com.player.musicoo.R -import com.player.musicoo.activity.MoOfflineSongsActivity -import com.player.musicoo.databinding.FragmentMoMeBinding -import com.player.musicoo.innertube.utils.BrotliEncoder.decode -import com.player.musicoo.util.DownloadUtil +import relax.offline.music.R +import relax.offline.music.activity.MoOfflineSongsActivity +import relax.offline.music.databinding.FragmentMoMeBinding +import relax.offline.music.util.DownloadUtil import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.isActive import kotlinx.coroutines.selects.select diff --git a/app/src/main/java/com/player/musicoo/fragment/SearchFragment.kt b/app/src/main/java/relax/offline/music/fragment/SearchFragment.kt similarity index 95% rename from app/src/main/java/com/player/musicoo/fragment/SearchFragment.kt rename to app/src/main/java/relax/offline/music/fragment/SearchFragment.kt index e77cbcb..68d9886 100644 --- a/app/src/main/java/com/player/musicoo/fragment/SearchFragment.kt +++ b/app/src/main/java/relax/offline/music/fragment/SearchFragment.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.fragment +package relax.offline.music.fragment import android.annotation.SuppressLint import android.content.Context @@ -20,17 +20,17 @@ import com.google.android.flexbox.FlexWrap import com.google.android.flexbox.FlexboxLayoutManager import com.google.android.flexbox.JustifyContent import com.gyf.immersionbar.ktx.immersionBar -import com.player.musicoo.adapter.SearchHistoryAdapter -import com.player.musicoo.adapter.SearchSuggestionsAdapter -import com.player.musicoo.databinding.FragmentSearchBinding -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.bodies.SearchBody -import com.player.musicoo.innertube.models.bodies.SearchSuggestionsBody -import com.player.musicoo.innertube.requests.moSearchPage -import com.player.musicoo.innertube.requests.searchSuggestions -import com.player.musicoo.util.LogTag -import com.player.musicoo.view.SearchResultOptimalView -import com.player.musicoo.view.SearchResultOtherView +import relax.offline.music.adapter.SearchHistoryAdapter +import relax.offline.music.adapter.SearchSuggestionsAdapter +import relax.offline.music.databinding.FragmentSearchBinding +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.bodies.SearchBody +import relax.offline.music.innertube.models.bodies.SearchSuggestionsBody +import relax.offline.music.innertube.requests.moSearchPage +import relax.offline.music.innertube.requests.searchSuggestions +import relax.offline.music.util.LogTag +import relax.offline.music.view.SearchResultOptimalView +import relax.offline.music.view.SearchResultOtherView import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.isActive import kotlinx.coroutines.selects.select diff --git a/app/src/main/java/com/player/musicoo/innertube/Innertube.kt b/app/src/main/java/relax/offline/music/innertube/Innertube.kt similarity index 95% rename from app/src/main/java/com/player/musicoo/innertube/Innertube.kt rename to app/src/main/java/relax/offline/music/innertube/Innertube.kt index 4b5e1e5..b4444ac 100644 --- a/app/src/main/java/com/player/musicoo/innertube/Innertube.kt +++ b/app/src/main/java/relax/offline/music/innertube/Innertube.kt @@ -1,12 +1,12 @@ -package com.player.musicoo.innertube +package relax.offline.music.innertube -import com.player.musicoo.innertube.models.MusicCarouselShelfRenderer -import com.player.musicoo.innertube.models.MusicShelfRenderer -import com.player.musicoo.innertube.models.NavigationEndpoint -import com.player.musicoo.innertube.models.Runs -import com.player.musicoo.innertube.models.Thumbnail -import com.player.musicoo.innertube.utils.brotli -import com.player.musicoo.util.LogTag +import relax.offline.music.innertube.models.MusicCarouselShelfRenderer +import relax.offline.music.innertube.models.MusicShelfRenderer +import relax.offline.music.innertube.models.NavigationEndpoint +import relax.offline.music.innertube.models.Runs +import relax.offline.music.innertube.models.Thumbnail +import relax.offline.music.innertube.utils.brotli +import relax.offline.music.util.LogTag import io.ktor.client.HttpClient import io.ktor.client.engine.okhttp.OkHttp import io.ktor.client.plugins.BrowserUserAgent diff --git a/app/src/main/java/com/player/musicoo/innertube/models/BrowseResponse.kt b/app/src/main/java/relax/offline/music/innertube/models/BrowseResponse.kt similarity index 98% rename from app/src/main/java/com/player/musicoo/innertube/models/BrowseResponse.kt rename to app/src/main/java/relax/offline/music/innertube/models/BrowseResponse.kt index 7fbd014..cdc0dc7 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/BrowseResponse.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/BrowseResponse.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/ButtonRenderer.kt b/app/src/main/java/relax/offline/music/innertube/models/ButtonRenderer.kt similarity index 75% rename from app/src/main/java/com/player/musicoo/innertube/models/ButtonRenderer.kt rename to app/src/main/java/relax/offline/music/innertube/models/ButtonRenderer.kt index 6ae0f91..4b40f7d 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/ButtonRenderer.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/ButtonRenderer.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/Context.kt b/app/src/main/java/relax/offline/music/innertube/models/Context.kt similarity index 97% rename from app/src/main/java/com/player/musicoo/innertube/models/Context.kt rename to app/src/main/java/relax/offline/music/innertube/models/Context.kt index 8de5d06..4b7e9d5 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/Context.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/Context.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.Serializable import java.util.Locale diff --git a/app/src/main/java/com/player/musicoo/innertube/models/Continuation.kt b/app/src/main/java/relax/offline/music/innertube/models/Continuation.kt similarity index 91% rename from app/src/main/java/com/player/musicoo/innertube/models/Continuation.kt rename to app/src/main/java/relax/offline/music/innertube/models/Continuation.kt index 9b03e9d..d8b7281 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/Continuation.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/Continuation.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/ContinuationResponse.kt b/app/src/main/java/relax/offline/music/innertube/models/ContinuationResponse.kt similarity index 92% rename from app/src/main/java/com/player/musicoo/innertube/models/ContinuationResponse.kt rename to app/src/main/java/relax/offline/music/innertube/models/ContinuationResponse.kt index 6fb2141..7cd7c13 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/ContinuationResponse.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/ContinuationResponse.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/GetQueueResponse.kt b/app/src/main/java/relax/offline/music/innertube/models/GetQueueResponse.kt similarity index 85% rename from app/src/main/java/com/player/musicoo/innertube/models/GetQueueResponse.kt rename to app/src/main/java/relax/offline/music/innertube/models/GetQueueResponse.kt index e84b3d3..953d431 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/GetQueueResponse.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/GetQueueResponse.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/GridRenderer.kt b/app/src/main/java/relax/offline/music/innertube/models/GridRenderer.kt similarity index 83% rename from app/src/main/java/com/player/musicoo/innertube/models/GridRenderer.kt rename to app/src/main/java/relax/offline/music/innertube/models/GridRenderer.kt index ea769ce..5a6e85e 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/GridRenderer.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/GridRenderer.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/MusicCardShelfRenderer.kt b/app/src/main/java/relax/offline/music/innertube/models/MusicCardShelfRenderer.kt similarity index 85% rename from app/src/main/java/com/player/musicoo/innertube/models/MusicCardShelfRenderer.kt rename to app/src/main/java/relax/offline/music/innertube/models/MusicCardShelfRenderer.kt index e2d4b78..894ac67 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/MusicCardShelfRenderer.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/MusicCardShelfRenderer.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.Serializable @@ -19,7 +19,7 @@ data class MusicCardShelfRenderer( ) { @Serializable data class Thumbnail( - val thumbnails: List? + val thumbnails: List? ) } } diff --git a/app/src/main/java/com/player/musicoo/innertube/models/MusicCarouselShelfRenderer.kt b/app/src/main/java/relax/offline/music/innertube/models/MusicCarouselShelfRenderer.kt similarity index 95% rename from app/src/main/java/com/player/musicoo/innertube/models/MusicCarouselShelfRenderer.kt rename to app/src/main/java/relax/offline/music/innertube/models/MusicCarouselShelfRenderer.kt index 86ef678..9961099 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/MusicCarouselShelfRenderer.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/MusicCarouselShelfRenderer.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/MusicResponsiveListItemRenderer.kt b/app/src/main/java/relax/offline/music/innertube/models/MusicResponsiveListItemRenderer.kt similarity index 94% rename from app/src/main/java/com/player/musicoo/innertube/models/MusicResponsiveListItemRenderer.kt rename to app/src/main/java/relax/offline/music/innertube/models/MusicResponsiveListItemRenderer.kt index 90b964d..94cb6a2 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/MusicResponsiveListItemRenderer.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/MusicResponsiveListItemRenderer.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/MusicShelfRenderer.kt b/app/src/main/java/relax/offline/music/innertube/models/MusicShelfRenderer.kt similarity index 96% rename from app/src/main/java/com/player/musicoo/innertube/models/MusicShelfRenderer.kt rename to app/src/main/java/relax/offline/music/innertube/models/MusicShelfRenderer.kt index ac864ef..da1653b 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/MusicShelfRenderer.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/MusicShelfRenderer.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/MusicTwoRowItemRenderer.kt b/app/src/main/java/relax/offline/music/innertube/models/MusicTwoRowItemRenderer.kt similarity index 84% rename from app/src/main/java/com/player/musicoo/innertube/models/MusicTwoRowItemRenderer.kt rename to app/src/main/java/relax/offline/music/innertube/models/MusicTwoRowItemRenderer.kt index 2d6ea15..2ad50a2 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/MusicTwoRowItemRenderer.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/MusicTwoRowItemRenderer.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/NavigationEndpoint.kt b/app/src/main/java/relax/offline/music/innertube/models/NavigationEndpoint.kt similarity index 99% rename from app/src/main/java/com/player/musicoo/innertube/models/NavigationEndpoint.kt rename to app/src/main/java/relax/offline/music/innertube/models/NavigationEndpoint.kt index 1ef7fbd..21c1094 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/NavigationEndpoint.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/NavigationEndpoint.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/NextResponse.kt b/app/src/main/java/relax/offline/music/innertube/models/NextResponse.kt similarity index 98% rename from app/src/main/java/com/player/musicoo/innertube/models/NextResponse.kt rename to app/src/main/java/relax/offline/music/innertube/models/NextResponse.kt index 70062b2..d95a976 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/NextResponse.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/NextResponse.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/PlayerResponse.kt b/app/src/main/java/relax/offline/music/innertube/models/PlayerResponse.kt similarity index 97% rename from app/src/main/java/com/player/musicoo/innertube/models/PlayerResponse.kt rename to app/src/main/java/relax/offline/music/innertube/models/PlayerResponse.kt index 336e391..35e34ad 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/PlayerResponse.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/PlayerResponse.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/PlaylistPanelVideoRenderer.kt b/app/src/main/java/relax/offline/music/innertube/models/PlaylistPanelVideoRenderer.kt similarity index 88% rename from app/src/main/java/com/player/musicoo/innertube/models/PlaylistPanelVideoRenderer.kt rename to app/src/main/java/relax/offline/music/innertube/models/PlaylistPanelVideoRenderer.kt index b9dcaff..805311d 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/PlaylistPanelVideoRenderer.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/PlaylistPanelVideoRenderer.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/Runs.kt b/app/src/main/java/relax/offline/music/innertube/models/Runs.kt similarity index 94% rename from app/src/main/java/com/player/musicoo/innertube/models/Runs.kt rename to app/src/main/java/relax/offline/music/innertube/models/Runs.kt index 7996287..7408516 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/Runs.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/Runs.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/SearchResponse.kt b/app/src/main/java/relax/offline/music/innertube/models/SearchResponse.kt similarity index 67% rename from app/src/main/java/com/player/musicoo/innertube/models/SearchResponse.kt rename to app/src/main/java/relax/offline/music/innertube/models/SearchResponse.kt index e650209..8dc3ec2 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/SearchResponse.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/SearchResponse.kt @@ -1,6 +1,5 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models -import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable @Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/SearchSuggestionsResponse.kt b/app/src/main/java/relax/offline/music/innertube/models/SearchSuggestionsResponse.kt similarity index 94% rename from app/src/main/java/com/player/musicoo/innertube/models/SearchSuggestionsResponse.kt rename to app/src/main/java/relax/offline/music/innertube/models/SearchSuggestionsResponse.kt index 9ceff22..05b1460 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/SearchSuggestionsResponse.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/SearchSuggestionsResponse.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/SectionListContinuation.kt b/app/src/main/java/relax/offline/music/innertube/models/SectionListContinuation.kt similarity index 94% rename from app/src/main/java/com/player/musicoo/innertube/models/SectionListContinuation.kt rename to app/src/main/java/relax/offline/music/innertube/models/SectionListContinuation.kt index f463a0b..c9585c7 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/SectionListContinuation.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/SectionListContinuation.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/SectionListRenderer.kt b/app/src/main/java/relax/offline/music/innertube/models/SectionListRenderer.kt similarity index 95% rename from app/src/main/java/com/player/musicoo/innertube/models/SectionListRenderer.kt rename to app/src/main/java/relax/offline/music/innertube/models/SectionListRenderer.kt index 0cc95b0..8045b9e 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/SectionListRenderer.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/SectionListRenderer.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/Tabs.kt b/app/src/main/java/relax/offline/music/innertube/models/Tabs.kt similarity index 91% rename from app/src/main/java/com/player/musicoo/innertube/models/Tabs.kt rename to app/src/main/java/relax/offline/music/innertube/models/Tabs.kt index 0d98941..ba600ee 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/Tabs.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/Tabs.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/Thumbnail.kt b/app/src/main/java/relax/offline/music/innertube/models/Thumbnail.kt similarity index 91% rename from app/src/main/java/com/player/musicoo/innertube/models/Thumbnail.kt rename to app/src/main/java/relax/offline/music/innertube/models/Thumbnail.kt index e39b936..bf7dc80 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/Thumbnail.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/Thumbnail.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/ThumbnailRenderer.kt b/app/src/main/java/relax/offline/music/innertube/models/ThumbnailRenderer.kt similarity index 80% rename from app/src/main/java/com/player/musicoo/innertube/models/ThumbnailRenderer.kt rename to app/src/main/java/relax/offline/music/innertube/models/ThumbnailRenderer.kt index 73f2f1d..b66f47b 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/ThumbnailRenderer.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/ThumbnailRenderer.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.models +package relax.offline.music.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable @@ -16,7 +16,7 @@ data class ThumbnailRenderer( ) { @Serializable data class Thumbnail( - val thumbnails: List? + val thumbnails: List? ) } } diff --git a/app/src/main/java/com/player/musicoo/innertube/models/bodies/BrowseBody.kt b/app/src/main/java/relax/offline/music/innertube/models/bodies/BrowseBody.kt similarity index 64% rename from app/src/main/java/com/player/musicoo/innertube/models/bodies/BrowseBody.kt rename to app/src/main/java/relax/offline/music/innertube/models/bodies/BrowseBody.kt index 09e5760..4605406 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/bodies/BrowseBody.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/bodies/BrowseBody.kt @@ -1,6 +1,6 @@ -package com.player.musicoo.innertube.models.bodies +package relax.offline.music.innertube.models.bodies -import com.player.musicoo.innertube.models.Context +import relax.offline.music.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/bodies/BrowseMoreBody.kt b/app/src/main/java/relax/offline/music/innertube/models/bodies/BrowseMoreBody.kt similarity index 56% rename from app/src/main/java/com/player/musicoo/innertube/models/bodies/BrowseMoreBody.kt rename to app/src/main/java/relax/offline/music/innertube/models/bodies/BrowseMoreBody.kt index 7f67e9d..d610c0f 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/bodies/BrowseMoreBody.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/bodies/BrowseMoreBody.kt @@ -1,6 +1,6 @@ -package com.player.musicoo.innertube.models.bodies +package relax.offline.music.innertube.models.bodies -import com.player.musicoo.innertube.models.Context +import relax.offline.music.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/bodies/ContinuationBody.kt b/app/src/main/java/relax/offline/music/innertube/models/bodies/ContinuationBody.kt similarity index 61% rename from app/src/main/java/com/player/musicoo/innertube/models/bodies/ContinuationBody.kt rename to app/src/main/java/relax/offline/music/innertube/models/bodies/ContinuationBody.kt index 8350ccd..28e5c52 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/bodies/ContinuationBody.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/bodies/ContinuationBody.kt @@ -1,6 +1,6 @@ -package com.player.musicoo.innertube.models.bodies +package relax.offline.music.innertube.models.bodies -import com.player.musicoo.innertube.models.Context +import relax.offline.music.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/bodies/NextBody.kt b/app/src/main/java/relax/offline/music/innertube/models/bodies/NextBody.kt similarity index 86% rename from app/src/main/java/com/player/musicoo/innertube/models/bodies/NextBody.kt rename to app/src/main/java/relax/offline/music/innertube/models/bodies/NextBody.kt index 14d490a..10630a7 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/bodies/NextBody.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/bodies/NextBody.kt @@ -1,6 +1,6 @@ -package com.player.musicoo.innertube.models.bodies +package relax.offline.music.innertube.models.bodies -import com.player.musicoo.innertube.models.Context +import relax.offline.music.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/bodies/PlayerBody.kt b/app/src/main/java/relax/offline/music/innertube/models/bodies/PlayerBody.kt similarity index 65% rename from app/src/main/java/com/player/musicoo/innertube/models/bodies/PlayerBody.kt rename to app/src/main/java/relax/offline/music/innertube/models/bodies/PlayerBody.kt index 4b1ab33..b290af5 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/bodies/PlayerBody.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/bodies/PlayerBody.kt @@ -1,6 +1,6 @@ -package com.player.musicoo.innertube.models.bodies +package relax.offline.music.innertube.models.bodies -import com.player.musicoo.innertube.models.Context +import relax.offline.music.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/bodies/QueueBody.kt b/app/src/main/java/relax/offline/music/innertube/models/bodies/QueueBody.kt similarity index 66% rename from app/src/main/java/com/player/musicoo/innertube/models/bodies/QueueBody.kt rename to app/src/main/java/relax/offline/music/innertube/models/bodies/QueueBody.kt index a04b24a..c620132 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/bodies/QueueBody.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/bodies/QueueBody.kt @@ -1,6 +1,6 @@ -package com.player.musicoo.innertube.models.bodies +package relax.offline.music.innertube.models.bodies -import com.player.musicoo.innertube.models.Context +import relax.offline.music.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/bodies/SearchBody.kt b/app/src/main/java/relax/offline/music/innertube/models/bodies/SearchBody.kt similarity index 63% rename from app/src/main/java/com/player/musicoo/innertube/models/bodies/SearchBody.kt rename to app/src/main/java/relax/offline/music/innertube/models/bodies/SearchBody.kt index d9f1588..fe9a9a2 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/bodies/SearchBody.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/bodies/SearchBody.kt @@ -1,6 +1,6 @@ -package com.player.musicoo.innertube.models.bodies +package relax.offline.music.innertube.models.bodies -import com.player.musicoo.innertube.models.Context +import relax.offline.music.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/models/bodies/SearchSuggestionsBody.kt b/app/src/main/java/relax/offline/music/innertube/models/bodies/SearchSuggestionsBody.kt similarity index 61% rename from app/src/main/java/com/player/musicoo/innertube/models/bodies/SearchSuggestionsBody.kt rename to app/src/main/java/relax/offline/music/innertube/models/bodies/SearchSuggestionsBody.kt index 9868ca5..b2aee71 100644 --- a/app/src/main/java/com/player/musicoo/innertube/models/bodies/SearchSuggestionsBody.kt +++ b/app/src/main/java/relax/offline/music/innertube/models/bodies/SearchSuggestionsBody.kt @@ -1,6 +1,6 @@ -package com.player.musicoo.innertube.models.bodies +package relax.offline.music.innertube.models.bodies -import com.player.musicoo.innertube.models.Context +import relax.offline.music.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/app/src/main/java/com/player/musicoo/innertube/requests/AlbumPage.kt b/app/src/main/java/relax/offline/music/innertube/requests/AlbumPage.kt similarity index 83% rename from app/src/main/java/com/player/musicoo/innertube/requests/AlbumPage.kt rename to app/src/main/java/relax/offline/music/innertube/requests/AlbumPage.kt index 0b72749..b89ca94 100644 --- a/app/src/main/java/com/player/musicoo/innertube/requests/AlbumPage.kt +++ b/app/src/main/java/relax/offline/music/innertube/requests/AlbumPage.kt @@ -1,9 +1,9 @@ -package com.player.musicoo.innertube.requests +package relax.offline.music.innertube.requests import io.ktor.http.Url -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.NavigationEndpoint -import com.player.musicoo.innertube.models.bodies.BrowseBody +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.NavigationEndpoint +import relax.offline.music.innertube.models.bodies.BrowseBody suspend fun Innertube.albumPage(body: BrowseBody): Result? { return playlistPage(body)?.map { album -> diff --git a/app/src/main/java/com/player/musicoo/innertube/requests/ArtistPage.kt b/app/src/main/java/relax/offline/music/innertube/requests/ArtistPage.kt similarity index 85% rename from app/src/main/java/com/player/musicoo/innertube/requests/ArtistPage.kt rename to app/src/main/java/relax/offline/music/innertube/requests/ArtistPage.kt index 5e678a0..ef390a1 100644 --- a/app/src/main/java/com/player/musicoo/innertube/requests/ArtistPage.kt +++ b/app/src/main/java/relax/offline/music/innertube/requests/ArtistPage.kt @@ -1,17 +1,17 @@ -package com.player.musicoo.innertube.requests +package relax.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.BrowseResponse -import com.player.musicoo.innertube.models.MusicCarouselShelfRenderer -import com.player.musicoo.innertube.models.MusicShelfRenderer -import com.player.musicoo.innertube.models.SectionListRenderer -import com.player.musicoo.innertube.models.bodies.BrowseBody -import com.player.musicoo.innertube.utils.findSectionByTitle -import com.player.musicoo.innertube.utils.from -import com.player.musicoo.innertube.utils.runCatchingNonCancellable +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.BrowseResponse +import relax.offline.music.innertube.models.MusicCarouselShelfRenderer +import relax.offline.music.innertube.models.MusicShelfRenderer +import relax.offline.music.innertube.models.SectionListRenderer +import relax.offline.music.innertube.models.bodies.BrowseBody +import relax.offline.music.innertube.utils.findSectionByTitle +import relax.offline.music.innertube.utils.from +import relax.offline.music.innertube.utils.runCatchingNonCancellable suspend fun Innertube.artistPage(body: BrowseBody): Result? = runCatchingNonCancellable { diff --git a/app/src/main/java/com/player/musicoo/innertube/requests/HomePage.kt b/app/src/main/java/relax/offline/music/innertube/requests/HomePage.kt similarity index 83% rename from app/src/main/java/com/player/musicoo/innertube/requests/HomePage.kt rename to app/src/main/java/relax/offline/music/innertube/requests/HomePage.kt index 28e453f..f786cfb 100644 --- a/app/src/main/java/com/player/musicoo/innertube/requests/HomePage.kt +++ b/app/src/main/java/relax/offline/music/innertube/requests/HomePage.kt @@ -1,14 +1,12 @@ -package com.player.musicoo.innertube.requests +package relax.offline.music.innertube.requests -import com.player.musicoo.App -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.BrowseResponse -import com.player.musicoo.innertube.models.Context -import com.player.musicoo.innertube.models.SectionListRenderer -import com.player.musicoo.innertube.models.bodies.BrowseBody -import com.player.musicoo.innertube.utils.runCatchingNonCancellable -import com.player.musicoo.sp.AppStore -import com.player.musicoo.util.LogTag +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.BrowseResponse +import relax.offline.music.innertube.models.Context +import relax.offline.music.innertube.models.SectionListRenderer +import relax.offline.music.innertube.models.bodies.BrowseBody +import relax.offline.music.innertube.utils.runCatchingNonCancellable +import relax.offline.music.util.LogTag import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody diff --git a/app/src/main/java/com/player/musicoo/innertube/requests/HomePageMore.kt b/app/src/main/java/relax/offline/music/innertube/requests/HomePageMore.kt similarity index 83% rename from app/src/main/java/com/player/musicoo/innertube/requests/HomePageMore.kt rename to app/src/main/java/relax/offline/music/innertube/requests/HomePageMore.kt index 98e5c26..13d2b56 100644 --- a/app/src/main/java/com/player/musicoo/innertube/requests/HomePageMore.kt +++ b/app/src/main/java/relax/offline/music/innertube/requests/HomePageMore.kt @@ -1,13 +1,11 @@ -package com.player.musicoo.innertube.requests +package relax.offline.music.innertube.requests -import com.player.musicoo.App -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.BrowseResponse -import com.player.musicoo.innertube.models.Context -import com.player.musicoo.innertube.models.SectionListContinuation -import com.player.musicoo.innertube.models.bodies.BrowseMoreBody -import com.player.musicoo.innertube.utils.runCatchingNonCancellable -import com.player.musicoo.sp.AppStore +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.BrowseResponse +import relax.offline.music.innertube.models.Context +import relax.offline.music.innertube.models.SectionListContinuation +import relax.offline.music.innertube.models.bodies.BrowseMoreBody +import relax.offline.music.innertube.utils.runCatchingNonCancellable import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody diff --git a/app/src/main/java/com/player/musicoo/innertube/requests/ItemsPage.kt b/app/src/main/java/relax/offline/music/innertube/requests/ItemsPage.kt similarity index 83% rename from app/src/main/java/com/player/musicoo/innertube/requests/ItemsPage.kt rename to app/src/main/java/relax/offline/music/innertube/requests/ItemsPage.kt index 6a0973c..72fd634 100644 --- a/app/src/main/java/com/player/musicoo/innertube/requests/ItemsPage.kt +++ b/app/src/main/java/relax/offline/music/innertube/requests/ItemsPage.kt @@ -1,18 +1,18 @@ -package com.player.musicoo.innertube.requests +package relax.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.BrowseResponse -import com.player.musicoo.innertube.models.ContinuationResponse -import com.player.musicoo.innertube.models.GridRenderer -import com.player.musicoo.innertube.models.MusicResponsiveListItemRenderer -import com.player.musicoo.innertube.models.MusicShelfRenderer -import com.player.musicoo.innertube.models.MusicTwoRowItemRenderer -import com.player.musicoo.innertube.models.bodies.BrowseBody -import com.player.musicoo.innertube.models.bodies.ContinuationBody -import com.player.musicoo.innertube.utils.runCatchingNonCancellable +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.BrowseResponse +import relax.offline.music.innertube.models.ContinuationResponse +import relax.offline.music.innertube.models.GridRenderer +import relax.offline.music.innertube.models.MusicResponsiveListItemRenderer +import relax.offline.music.innertube.models.MusicShelfRenderer +import relax.offline.music.innertube.models.MusicTwoRowItemRenderer +import relax.offline.music.innertube.models.bodies.BrowseBody +import relax.offline.music.innertube.models.bodies.ContinuationBody +import relax.offline.music.innertube.utils.runCatchingNonCancellable suspend fun Innertube.itemsPage( body: BrowseBody, diff --git a/app/src/main/java/com/player/musicoo/innertube/requests/Lyrics.kt b/app/src/main/java/relax/offline/music/innertube/requests/Lyrics.kt similarity index 74% rename from app/src/main/java/com/player/musicoo/innertube/requests/Lyrics.kt rename to app/src/main/java/relax/offline/music/innertube/requests/Lyrics.kt index 8c7f036..4509390 100644 --- a/app/src/main/java/com/player/musicoo/innertube/requests/Lyrics.kt +++ b/app/src/main/java/relax/offline/music/innertube/requests/Lyrics.kt @@ -1,14 +1,14 @@ -package com.player.musicoo.innertube.requests +package relax.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.BrowseResponse -import com.player.musicoo.innertube.models.NextResponse -import com.player.musicoo.innertube.models.bodies.BrowseBody -import com.player.musicoo.innertube.models.bodies.NextBody -import com.player.musicoo.innertube.utils.runCatchingNonCancellable +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.BrowseResponse +import relax.offline.music.innertube.models.NextResponse +import relax.offline.music.innertube.models.bodies.BrowseBody +import relax.offline.music.innertube.models.bodies.NextBody +import relax.offline.music.innertube.utils.runCatchingNonCancellable suspend fun Innertube.lyrics(body: NextBody): Result? = runCatchingNonCancellable { val nextResponse = client.post(next) { diff --git a/app/src/main/java/com/player/musicoo/innertube/requests/MoNextPage.kt b/app/src/main/java/relax/offline/music/innertube/requests/MoNextPage.kt similarity index 74% rename from app/src/main/java/com/player/musicoo/innertube/requests/MoNextPage.kt rename to app/src/main/java/relax/offline/music/innertube/requests/MoNextPage.kt index 3187ea3..98ef879 100644 --- a/app/src/main/java/com/player/musicoo/innertube/requests/MoNextPage.kt +++ b/app/src/main/java/relax/offline/music/innertube/requests/MoNextPage.kt @@ -1,15 +1,12 @@ -package com.player.musicoo.innertube.requests +package relax.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.ContinuationResponse -import com.player.musicoo.innertube.models.NextResponse -import com.player.musicoo.innertube.models.bodies.ContinuationBody -import com.player.musicoo.innertube.models.bodies.NextBody -import com.player.musicoo.innertube.utils.from -import com.player.musicoo.innertube.utils.runCatchingNonCancellable +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.NextResponse +import relax.offline.music.innertube.models.bodies.NextBody +import relax.offline.music.innertube.utils.runCatchingNonCancellable suspend fun Innertube.moNextPage( diff --git a/app/src/main/java/com/player/musicoo/innertube/requests/MoPlaylistPage.kt b/app/src/main/java/relax/offline/music/innertube/requests/MoPlaylistPage.kt similarity index 91% rename from app/src/main/java/com/player/musicoo/innertube/requests/MoPlaylistPage.kt rename to app/src/main/java/relax/offline/music/innertube/requests/MoPlaylistPage.kt index c1ab6cf..1766834 100644 --- a/app/src/main/java/com/player/musicoo/innertube/requests/MoPlaylistPage.kt +++ b/app/src/main/java/relax/offline/music/innertube/requests/MoPlaylistPage.kt @@ -1,13 +1,10 @@ -package com.player.musicoo.innertube.requests +package relax.offline.music.innertube.requests -import com.player.musicoo.App -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.BrowseResponse -import com.player.musicoo.innertube.models.MusicShelfRenderer -import com.player.musicoo.innertube.models.bodies.BrowseBody -import com.player.musicoo.innertube.utils.runCatchingNonCancellable -import com.player.musicoo.sp.AppStore -import com.player.musicoo.util.LogTag +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.BrowseResponse +import relax.offline.music.innertube.models.MusicShelfRenderer +import relax.offline.music.innertube.models.bodies.BrowseBody +import relax.offline.music.innertube.utils.runCatchingNonCancellable import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody diff --git a/app/src/main/java/com/player/musicoo/innertube/requests/MoSearchPage.kt b/app/src/main/java/relax/offline/music/innertube/requests/MoSearchPage.kt similarity index 94% rename from app/src/main/java/com/player/musicoo/innertube/requests/MoSearchPage.kt rename to app/src/main/java/relax/offline/music/innertube/requests/MoSearchPage.kt index 530e1ad..9399063 100644 --- a/app/src/main/java/com/player/musicoo/innertube/requests/MoSearchPage.kt +++ b/app/src/main/java/relax/offline/music/innertube/requests/MoSearchPage.kt @@ -1,16 +1,13 @@ -package com.player.musicoo.innertube.requests +package relax.offline.music.innertube.requests -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.BrowseResponse -import com.player.musicoo.innertube.models.ContinuationResponse -import com.player.musicoo.innertube.models.MusicShelfRenderer -import com.player.musicoo.innertube.models.SearchResponse -import com.player.musicoo.innertube.models.SectionListRenderer -import com.player.musicoo.innertube.models.bodies.BrowseBody -import com.player.musicoo.innertube.models.bodies.ContinuationBody -import com.player.musicoo.innertube.models.bodies.SearchBody -import com.player.musicoo.innertube.utils.runCatchingNonCancellable -import com.player.musicoo.util.LogTag +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.ContinuationResponse +import relax.offline.music.innertube.models.MusicShelfRenderer +import relax.offline.music.innertube.models.SearchResponse +import relax.offline.music.innertube.models.SectionListRenderer +import relax.offline.music.innertube.models.bodies.ContinuationBody +import relax.offline.music.innertube.models.bodies.SearchBody +import relax.offline.music.innertube.utils.runCatchingNonCancellable import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody diff --git a/app/src/main/java/com/player/musicoo/innertube/requests/MoSingerlistPage.kt b/app/src/main/java/relax/offline/music/innertube/requests/MoSingerlistPage.kt similarity index 93% rename from app/src/main/java/com/player/musicoo/innertube/requests/MoSingerlistPage.kt rename to app/src/main/java/relax/offline/music/innertube/requests/MoSingerlistPage.kt index f5319c6..a29916a 100644 --- a/app/src/main/java/com/player/musicoo/innertube/requests/MoSingerlistPage.kt +++ b/app/src/main/java/relax/offline/music/innertube/requests/MoSingerlistPage.kt @@ -1,18 +1,15 @@ -package com.player.musicoo.innertube.requests +package relax.offline.music.innertube.requests -import com.player.musicoo.App -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.BrowseResponse -import com.player.musicoo.innertube.models.ContinuationResponse -import com.player.musicoo.innertube.models.GridRenderer -import com.player.musicoo.innertube.models.MusicCarouselShelfRenderer -import com.player.musicoo.innertube.models.MusicShelfRenderer -import com.player.musicoo.innertube.models.SectionListRenderer -import com.player.musicoo.innertube.models.bodies.BrowseBody -import com.player.musicoo.innertube.models.bodies.ContinuationBody -import com.player.musicoo.innertube.utils.runCatchingNonCancellable -import com.player.musicoo.sp.AppStore -import com.player.musicoo.util.LogTag +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.BrowseResponse +import relax.offline.music.innertube.models.ContinuationResponse +import relax.offline.music.innertube.models.GridRenderer +import relax.offline.music.innertube.models.MusicCarouselShelfRenderer +import relax.offline.music.innertube.models.MusicShelfRenderer +import relax.offline.music.innertube.models.SectionListRenderer +import relax.offline.music.innertube.models.bodies.BrowseBody +import relax.offline.music.innertube.models.bodies.ContinuationBody +import relax.offline.music.innertube.utils.runCatchingNonCancellable import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody diff --git a/app/src/main/java/com/player/musicoo/innertube/requests/NextPage.kt b/app/src/main/java/relax/offline/music/innertube/requests/NextPage.kt similarity index 85% rename from app/src/main/java/com/player/musicoo/innertube/requests/NextPage.kt rename to app/src/main/java/relax/offline/music/innertube/requests/NextPage.kt index 0ee99ba..eba519e 100644 --- a/app/src/main/java/com/player/musicoo/innertube/requests/NextPage.kt +++ b/app/src/main/java/relax/offline/music/innertube/requests/NextPage.kt @@ -1,15 +1,15 @@ -package com.player.musicoo.innertube.requests +package relax.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.ContinuationResponse -import com.player.musicoo.innertube.models.NextResponse -import com.player.musicoo.innertube.models.bodies.ContinuationBody -import com.player.musicoo.innertube.models.bodies.NextBody -import com.player.musicoo.innertube.utils.from -import com.player.musicoo.innertube.utils.runCatchingNonCancellable +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.ContinuationResponse +import relax.offline.music.innertube.models.NextResponse +import relax.offline.music.innertube.models.bodies.ContinuationBody +import relax.offline.music.innertube.models.bodies.NextBody +import relax.offline.music.innertube.utils.from +import relax.offline.music.innertube.utils.runCatchingNonCancellable diff --git a/app/src/main/java/com/player/musicoo/innertube/requests/Player.kt b/app/src/main/java/relax/offline/music/innertube/requests/Player.kt similarity index 86% rename from app/src/main/java/com/player/musicoo/innertube/requests/Player.kt rename to app/src/main/java/relax/offline/music/innertube/requests/Player.kt index 5d7f153..07bc0ac 100644 --- a/app/src/main/java/com/player/musicoo/innertube/requests/Player.kt +++ b/app/src/main/java/relax/offline/music/innertube/requests/Player.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.requests +package relax.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.get @@ -6,11 +6,11 @@ import io.ktor.client.request.post import io.ktor.client.request.setBody import io.ktor.http.ContentType import io.ktor.http.contentType -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.Context -import com.player.musicoo.innertube.models.PlayerResponse -import com.player.musicoo.innertube.models.bodies.PlayerBody -import com.player.musicoo.innertube.utils.runCatchingNonCancellable +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.Context +import relax.offline.music.innertube.models.PlayerResponse +import relax.offline.music.innertube.models.bodies.PlayerBody +import relax.offline.music.innertube.utils.runCatchingNonCancellable import kotlinx.serialization.Serializable suspend fun Innertube.player(body: PlayerBody) = runCatchingNonCancellable { diff --git a/app/src/main/java/com/player/musicoo/innertube/requests/PlaylistPage.kt b/app/src/main/java/relax/offline/music/innertube/requests/PlaylistPage.kt similarity index 83% rename from app/src/main/java/com/player/musicoo/innertube/requests/PlaylistPage.kt rename to app/src/main/java/relax/offline/music/innertube/requests/PlaylistPage.kt index bd8c699..ed44ee8 100644 --- a/app/src/main/java/com/player/musicoo/innertube/requests/PlaylistPage.kt +++ b/app/src/main/java/relax/offline/music/innertube/requests/PlaylistPage.kt @@ -1,17 +1,17 @@ -package com.player.musicoo.innertube.requests +package relax.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.BrowseResponse -import com.player.musicoo.innertube.models.ContinuationResponse -import com.player.musicoo.innertube.models.MusicCarouselShelfRenderer -import com.player.musicoo.innertube.models.MusicShelfRenderer -import com.player.musicoo.innertube.models.bodies.BrowseBody -import com.player.musicoo.innertube.models.bodies.ContinuationBody -import com.player.musicoo.innertube.utils.from -import com.player.musicoo.innertube.utils.runCatchingNonCancellable +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.BrowseResponse +import relax.offline.music.innertube.models.ContinuationResponse +import relax.offline.music.innertube.models.MusicCarouselShelfRenderer +import relax.offline.music.innertube.models.MusicShelfRenderer +import relax.offline.music.innertube.models.bodies.BrowseBody +import relax.offline.music.innertube.models.bodies.ContinuationBody +import relax.offline.music.innertube.utils.from +import relax.offline.music.innertube.utils.runCatchingNonCancellable suspend fun Innertube.playlistPage(body: BrowseBody) = runCatchingNonCancellable { val response = client.post(browse) { diff --git a/app/src/main/java/com/player/musicoo/innertube/requests/Queue.kt b/app/src/main/java/relax/offline/music/innertube/requests/Queue.kt similarity index 68% rename from app/src/main/java/com/player/musicoo/innertube/requests/Queue.kt rename to app/src/main/java/relax/offline/music/innertube/requests/Queue.kt index 470cb28..badd14a 100644 --- a/app/src/main/java/com/player/musicoo/innertube/requests/Queue.kt +++ b/app/src/main/java/relax/offline/music/innertube/requests/Queue.kt @@ -1,13 +1,13 @@ -package com.player.musicoo.innertube.requests +package relax.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.GetQueueResponse -import com.player.musicoo.innertube.models.bodies.QueueBody -import com.player.musicoo.innertube.utils.from -import com.player.musicoo.innertube.utils.runCatchingNonCancellable +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.GetQueueResponse +import relax.offline.music.innertube.models.bodies.QueueBody +import relax.offline.music.innertube.utils.from +import relax.offline.music.innertube.utils.runCatchingNonCancellable suspend fun Innertube.queue(body: QueueBody) = runCatchingNonCancellable { val response = client.post(queue) { diff --git a/app/src/main/java/com/player/musicoo/innertube/requests/RelatedPage.kt b/app/src/main/java/relax/offline/music/innertube/requests/RelatedPage.kt similarity index 79% rename from app/src/main/java/com/player/musicoo/innertube/requests/RelatedPage.kt rename to app/src/main/java/relax/offline/music/innertube/requests/RelatedPage.kt index 6273a38..e0a11ae 100644 --- a/app/src/main/java/com/player/musicoo/innertube/requests/RelatedPage.kt +++ b/app/src/main/java/relax/offline/music/innertube/requests/RelatedPage.kt @@ -1,18 +1,18 @@ -package com.player.musicoo.innertube.requests +package relax.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.BrowseResponse -import com.player.musicoo.innertube.models.MusicCarouselShelfRenderer -import com.player.musicoo.innertube.models.NextResponse -import com.player.musicoo.innertube.models.bodies.BrowseBody -import com.player.musicoo.innertube.models.bodies.NextBody -import com.player.musicoo.innertube.utils.findSectionByStrapline -import com.player.musicoo.innertube.utils.findSectionByTitle -import com.player.musicoo.innertube.utils.from -import com.player.musicoo.innertube.utils.runCatchingNonCancellable +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.BrowseResponse +import relax.offline.music.innertube.models.MusicCarouselShelfRenderer +import relax.offline.music.innertube.models.NextResponse +import relax.offline.music.innertube.models.bodies.BrowseBody +import relax.offline.music.innertube.models.bodies.NextBody +import relax.offline.music.innertube.utils.findSectionByStrapline +import relax.offline.music.innertube.utils.findSectionByTitle +import relax.offline.music.innertube.utils.from +import relax.offline.music.innertube.utils.runCatchingNonCancellable suspend fun Innertube.relatedPage(body: NextBody) = runCatchingNonCancellable { val nextResponse = client.post(next) { diff --git a/app/src/main/java/com/player/musicoo/innertube/requests/SearchPage.kt b/app/src/main/java/relax/offline/music/innertube/requests/SearchPage.kt similarity index 78% rename from app/src/main/java/com/player/musicoo/innertube/requests/SearchPage.kt rename to app/src/main/java/relax/offline/music/innertube/requests/SearchPage.kt index 3498983..53e94ea 100644 --- a/app/src/main/java/com/player/musicoo/innertube/requests/SearchPage.kt +++ b/app/src/main/java/relax/offline/music/innertube/requests/SearchPage.kt @@ -1,15 +1,15 @@ -package com.player.musicoo.innertube.requests +package relax.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.ContinuationResponse -import com.player.musicoo.innertube.models.MusicShelfRenderer -import com.player.musicoo.innertube.models.SearchResponse -import com.player.musicoo.innertube.models.bodies.ContinuationBody -import com.player.musicoo.innertube.models.bodies.SearchBody -import com.player.musicoo.innertube.utils.runCatchingNonCancellable +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.ContinuationResponse +import relax.offline.music.innertube.models.MusicShelfRenderer +import relax.offline.music.innertube.models.SearchResponse +import relax.offline.music.innertube.models.bodies.ContinuationBody +import relax.offline.music.innertube.models.bodies.SearchBody +import relax.offline.music.innertube.utils.runCatchingNonCancellable suspend fun Innertube.searchPage( body: SearchBody, diff --git a/app/src/main/java/com/player/musicoo/innertube/requests/SearchSuggestions.kt b/app/src/main/java/relax/offline/music/innertube/requests/SearchSuggestions.kt similarity index 71% rename from app/src/main/java/com/player/musicoo/innertube/requests/SearchSuggestions.kt rename to app/src/main/java/relax/offline/music/innertube/requests/SearchSuggestions.kt index 79ce129..6271983 100644 --- a/app/src/main/java/com/player/musicoo/innertube/requests/SearchSuggestions.kt +++ b/app/src/main/java/relax/offline/music/innertube/requests/SearchSuggestions.kt @@ -1,12 +1,12 @@ -package com.player.musicoo.innertube.requests +package relax.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.SearchSuggestionsResponse -import com.player.musicoo.innertube.models.bodies.SearchSuggestionsBody -import com.player.musicoo.innertube.utils.runCatchingNonCancellable +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.SearchSuggestionsResponse +import relax.offline.music.innertube.models.bodies.SearchSuggestionsBody +import relax.offline.music.innertube.utils.runCatchingNonCancellable suspend fun Innertube.searchSuggestions(body: SearchSuggestionsBody) = runCatchingNonCancellable { val response = client.post(searchSuggestions) { diff --git a/app/src/main/java/com/player/musicoo/innertube/utils/BrotliEncoder.kt b/app/src/main/java/relax/offline/music/innertube/utils/BrotliEncoder.kt similarity index 93% rename from app/src/main/java/com/player/musicoo/innertube/utils/BrotliEncoder.kt rename to app/src/main/java/relax/offline/music/innertube/utils/BrotliEncoder.kt index ce217a7..c1a4cb2 100644 --- a/app/src/main/java/com/player/musicoo/innertube/utils/BrotliEncoder.kt +++ b/app/src/main/java/relax/offline/music/innertube/utils/BrotliEncoder.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.utils +package relax.offline.music.innertube.utils import io.ktor.client.plugins.compression.ContentEncoder import io.ktor.utils.io.ByteReadChannel diff --git a/app/src/main/java/com/player/musicoo/innertube/utils/FromMusicResponsiveListItemRenderer.kt b/app/src/main/java/relax/offline/music/innertube/utils/FromMusicResponsiveListItemRenderer.kt similarity index 85% rename from app/src/main/java/com/player/musicoo/innertube/utils/FromMusicResponsiveListItemRenderer.kt rename to app/src/main/java/relax/offline/music/innertube/utils/FromMusicResponsiveListItemRenderer.kt index 743d6a0..30a5ba2 100644 --- a/app/src/main/java/com/player/musicoo/innertube/utils/FromMusicResponsiveListItemRenderer.kt +++ b/app/src/main/java/relax/offline/music/innertube/utils/FromMusicResponsiveListItemRenderer.kt @@ -1,9 +1,9 @@ -package com.player.musicoo.innertube.utils +package relax.offline.music.innertube.utils -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.MusicResponsiveListItemRenderer -import com.player.musicoo.innertube.models.NavigationEndpoint -import com.player.musicoo.innertube.models.Runs +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.MusicResponsiveListItemRenderer +import relax.offline.music.innertube.models.NavigationEndpoint +import relax.offline.music.innertube.models.Runs fun Innertube.SongItem.Companion.from(renderer: MusicResponsiveListItemRenderer): Innertube.SongItem? { return Innertube.SongItem( diff --git a/app/src/main/java/com/player/musicoo/innertube/utils/FromMusicShelfRendererContent.kt b/app/src/main/java/relax/offline/music/innertube/utils/FromMusicShelfRendererContent.kt similarity index 95% rename from app/src/main/java/com/player/musicoo/innertube/utils/FromMusicShelfRendererContent.kt rename to app/src/main/java/relax/offline/music/innertube/utils/FromMusicShelfRendererContent.kt index 0b74b0d..b3e31dc 100644 --- a/app/src/main/java/com/player/musicoo/innertube/utils/FromMusicShelfRendererContent.kt +++ b/app/src/main/java/relax/offline/music/innertube/utils/FromMusicShelfRendererContent.kt @@ -1,8 +1,8 @@ -package com.player.musicoo.innertube.utils +package relax.offline.music.innertube.utils -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.MusicShelfRenderer -import com.player.musicoo.innertube.models.NavigationEndpoint +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.MusicShelfRenderer +import relax.offline.music.innertube.models.NavigationEndpoint fun Innertube.SongItem.Companion.from(content: MusicShelfRenderer.Content): Innertube.SongItem? { val (mainRuns, otherRuns) = content.runs diff --git a/app/src/main/java/com/player/musicoo/innertube/utils/FromMusicTwoRowItemRenderer.kt b/app/src/main/java/relax/offline/music/innertube/utils/FromMusicTwoRowItemRenderer.kt similarity index 92% rename from app/src/main/java/com/player/musicoo/innertube/utils/FromMusicTwoRowItemRenderer.kt rename to app/src/main/java/relax/offline/music/innertube/utils/FromMusicTwoRowItemRenderer.kt index 0e1cf77..26dfedf 100644 --- a/app/src/main/java/com/player/musicoo/innertube/utils/FromMusicTwoRowItemRenderer.kt +++ b/app/src/main/java/relax/offline/music/innertube/utils/FromMusicTwoRowItemRenderer.kt @@ -1,7 +1,7 @@ -package com.player.musicoo.innertube.utils +package relax.offline.music.innertube.utils -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.MusicTwoRowItemRenderer +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.MusicTwoRowItemRenderer fun Innertube.AlbumItem.Companion.from(renderer: MusicTwoRowItemRenderer): Innertube.AlbumItem? { return Innertube.AlbumItem( diff --git a/app/src/main/java/com/player/musicoo/innertube/utils/FromPlaylistPanelVideoRenderer.kt b/app/src/main/java/relax/offline/music/innertube/utils/FromPlaylistPanelVideoRenderer.kt similarity index 87% rename from app/src/main/java/com/player/musicoo/innertube/utils/FromPlaylistPanelVideoRenderer.kt rename to app/src/main/java/relax/offline/music/innertube/utils/FromPlaylistPanelVideoRenderer.kt index c8016f6..11724a1 100644 --- a/app/src/main/java/com/player/musicoo/innertube/utils/FromPlaylistPanelVideoRenderer.kt +++ b/app/src/main/java/relax/offline/music/innertube/utils/FromPlaylistPanelVideoRenderer.kt @@ -1,7 +1,7 @@ -package com.player.musicoo.innertube.utils +package relax.offline.music.innertube.utils -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.PlaylistPanelVideoRenderer +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.PlaylistPanelVideoRenderer fun Innertube.SongItem.Companion.from(renderer: PlaylistPanelVideoRenderer): Innertube.SongItem? { return Innertube.SongItem( diff --git a/app/src/main/java/com/player/musicoo/innertube/utils/Utils.kt b/app/src/main/java/relax/offline/music/innertube/utils/Utils.kt similarity index 89% rename from app/src/main/java/com/player/musicoo/innertube/utils/Utils.kt rename to app/src/main/java/relax/offline/music/innertube/utils/Utils.kt index 7ce5fc7..8f7c9c0 100644 --- a/app/src/main/java/com/player/musicoo/innertube/utils/Utils.kt +++ b/app/src/main/java/relax/offline/music/innertube/utils/Utils.kt @@ -1,8 +1,8 @@ -package com.player.musicoo.innertube.utils +package relax.offline.music.innertube.utils import io.ktor.utils.io.CancellationException -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.SectionListRenderer +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.SectionListRenderer internal fun SectionListRenderer.findSectionByTitle(text: String): SectionListRenderer.Content? { return contents?.find { content -> diff --git a/app/src/main/java/com/player/musicoo/innertube/utils/brotli.kt b/app/src/main/java/relax/offline/music/innertube/utils/brotli.kt similarity index 78% rename from app/src/main/java/com/player/musicoo/innertube/utils/brotli.kt rename to app/src/main/java/relax/offline/music/innertube/utils/brotli.kt index 14d8212..a8b5d76 100644 --- a/app/src/main/java/com/player/musicoo/innertube/utils/brotli.kt +++ b/app/src/main/java/relax/offline/music/innertube/utils/brotli.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.innertube.utils +package relax.offline.music.innertube.utils import io.ktor.client.plugins.compression.ContentEncoding diff --git a/app/src/main/java/com/player/musicoo/media/DefaultMediaNotificationProvider.kt b/app/src/main/java/relax/offline/music/media/DefaultMediaNotificationProvider.kt similarity index 87% rename from app/src/main/java/com/player/musicoo/media/DefaultMediaNotificationProvider.kt rename to app/src/main/java/relax/offline/music/media/DefaultMediaNotificationProvider.kt index bfb7a52..890bf46 100644 --- a/app/src/main/java/com/player/musicoo/media/DefaultMediaNotificationProvider.kt +++ b/app/src/main/java/relax/offline/music/media/DefaultMediaNotificationProvider.kt @@ -1,21 +1,20 @@ -package com.player.musicoo.media +package relax.offline.music.media import android.content.Context import android.os.Bundle import android.widget.RemoteViews import androidx.core.app.NotificationCompat -import androidx.media3.common.Player import androidx.media3.common.util.UnstableApi import androidx.media3.session.CommandButton import androidx.media3.session.MediaNotification import androidx.media3.session.MediaSession import com.google.common.collect.ImmutableList -import com.player.musicoo.R +import relax.offline.music.R @UnstableApi class MyMediaNotificationProvider(val context: Context) : MediaNotification.Provider { companion object { - private const val CHANNEL_ID = "musicoo_notification_channel" + private const val CHANNEL_ID = "musiclax_notification_channel" private const val NOTIFICATION_ID = 1231 } @@ -32,7 +31,7 @@ class MyMediaNotificationProvider(val context: Context) : MediaNotification.Prov val notification = NotificationCompat.Builder(context, CHANNEL_ID) .setContentTitle("Custom Notification Title") .setContentText("Custom Notification Text") - .setSmallIcon(R.mipmap.musicoo_logo_img) + .setSmallIcon(R.mipmap.app_logo) .setCustomContentView(customLayoutView) .build() diff --git a/app/src/main/java/com/player/musicoo/media/LocalMediaControllerManager.kt b/app/src/main/java/relax/offline/music/media/LocalMediaControllerManager.kt similarity index 87% rename from app/src/main/java/com/player/musicoo/media/LocalMediaControllerManager.kt rename to app/src/main/java/relax/offline/music/media/LocalMediaControllerManager.kt index 6c1b89f..3fe88b9 100644 --- a/app/src/main/java/com/player/musicoo/media/LocalMediaControllerManager.kt +++ b/app/src/main/java/relax/offline/music/media/LocalMediaControllerManager.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.media +package relax.offline.music.media import android.content.ComponentName import android.content.Context @@ -11,12 +11,11 @@ import androidx.media3.session.MediaController import androidx.media3.session.SessionToken import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.MoreExecutors -import com.player.musicoo.App -import com.player.musicoo.R -import com.player.musicoo.bean.Audio -import com.player.musicoo.bean.CurrentPlayingAudio -import com.player.musicoo.service.LocalPlaybackService -import com.player.musicoo.util.containsContent +import relax.offline.music.R +import relax.offline.music.bean.Audio +import relax.offline.music.bean.CurrentPlayingAudio +import relax.offline.music.service.LocalPlaybackService +import relax.offline.music.util.containsContent import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -55,7 +54,7 @@ object LocalMediaControllerManager { } - val resourceId = R.mipmap.musicoo_logo_img + val resourceId = R.mipmap.app_logo val imgUri: Uri? = if (audio.image.isNotEmpty()) { Uri.parse("file:///android_asset/${audio.image}") } else { @@ -90,9 +89,9 @@ object LocalMediaControllerManager { false ) CoroutineScope(Dispatchers.IO).launch { - App.currentAudioManager.setCurrentPlayingAudio(currentPlayingAudio) + relax.offline.music.App.currentAudioManager.setCurrentPlayingAudio(currentPlayingAudio) withContext(Dispatchers.Main) { - App.initCurrentPlayingAudio()//更新到入口变量中 + relax.offline.music.App.initCurrentPlayingAudio()//更新到入口变量中 } } } @@ -111,7 +110,7 @@ object LocalMediaControllerManager { } - val resourceId = R.mipmap.musicoo_logo_img + val resourceId = R.mipmap.app_logo val imgUri: Uri? = if (audio.image.isNotEmpty()) { Uri.parse("file:///android_asset/${audio.image}") } else { @@ -149,9 +148,9 @@ object LocalMediaControllerManager { false ) CoroutineScope(Dispatchers.IO).launch { - App.currentAudioManager.setCurrentPlayingAudio(currentPlayingAudio) + relax.offline.music.App.currentAudioManager.setCurrentPlayingAudio(currentPlayingAudio) withContext(Dispatchers.Main) { - App.initCurrentPlayingAudio()//更新到入口变量中 + relax.offline.music.App.initCurrentPlayingAudio()//更新到入口变量中 } } diff --git a/app/src/main/java/com/player/musicoo/media/MediaControllerManager.kt b/app/src/main/java/relax/offline/music/media/MediaControllerManager.kt similarity index 75% rename from app/src/main/java/com/player/musicoo/media/MediaControllerManager.kt rename to app/src/main/java/relax/offline/music/media/MediaControllerManager.kt index 417004f..3fe0c21 100644 --- a/app/src/main/java/com/player/musicoo/media/MediaControllerManager.kt +++ b/app/src/main/java/relax/offline/music/media/MediaControllerManager.kt @@ -1,27 +1,13 @@ -package com.player.musicoo.media +package relax.offline.music.media import android.content.ComponentName import android.content.Context -import android.net.Uri -import android.os.Binder -import androidx.media3.common.MediaItem -import androidx.media3.common.MediaMetadata -import androidx.media3.common.Player import androidx.media3.common.util.UnstableApi import androidx.media3.session.MediaController import androidx.media3.session.SessionToken import com.google.common.util.concurrent.ListenableFuture import com.google.common.util.concurrent.MoreExecutors -import com.player.musicoo.App -import com.player.musicoo.R -import com.player.musicoo.bean.Audio -import com.player.musicoo.bean.CurrentPlayingAudio -import com.player.musicoo.service.PlaybackService -import com.player.musicoo.util.containsContent -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext +import relax.offline.music.service.PlaybackService @UnstableApi object MediaControllerManager { diff --git a/app/src/main/java/com/player/musicoo/media/MediaControllerUtils.kt b/app/src/main/java/relax/offline/music/media/MediaControllerUtils.kt similarity index 85% rename from app/src/main/java/com/player/musicoo/media/MediaControllerUtils.kt rename to app/src/main/java/relax/offline/music/media/MediaControllerUtils.kt index f072b24..a0c9db1 100644 --- a/app/src/main/java/com/player/musicoo/media/MediaControllerUtils.kt +++ b/app/src/main/java/relax/offline/music/media/MediaControllerUtils.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.media +package relax.offline.music.media import androidx.media3.common.MediaItem import androidx.media3.session.MediaController diff --git a/app/src/main/java/com/player/musicoo/media/SongRadio.kt b/app/src/main/java/relax/offline/music/media/SongRadio.kt similarity index 85% rename from app/src/main/java/com/player/musicoo/media/SongRadio.kt rename to app/src/main/java/relax/offline/music/media/SongRadio.kt index 9465462..16d921d 100644 --- a/app/src/main/java/com/player/musicoo/media/SongRadio.kt +++ b/app/src/main/java/relax/offline/music/media/SongRadio.kt @@ -1,9 +1,9 @@ -package com.player.musicoo.media +package relax.offline.music.media -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.bodies.ContinuationBody -import com.player.musicoo.innertube.models.bodies.NextBody -import com.player.musicoo.innertube.requests.nextPage +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.bodies.ContinuationBody +import relax.offline.music.innertube.models.bodies.NextBody +import relax.offline.music.innertube.requests.nextPage import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/java/com/player/musicoo/service/CustomMediaNotificationProvider.kt b/app/src/main/java/relax/offline/music/service/CustomMediaNotificationProvider.kt similarity index 92% rename from app/src/main/java/com/player/musicoo/service/CustomMediaNotificationProvider.kt rename to app/src/main/java/relax/offline/music/service/CustomMediaNotificationProvider.kt index acc956d..49df5f3 100644 --- a/app/src/main/java/com/player/musicoo/service/CustomMediaNotificationProvider.kt +++ b/app/src/main/java/relax/offline/music/service/CustomMediaNotificationProvider.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.service +package relax.offline.music.service import android.content.Context import androidx.core.app.NotificationCompat @@ -8,8 +8,8 @@ import androidx.media3.session.DefaultMediaNotificationProvider import androidx.media3.session.MediaNotification import androidx.media3.session.MediaSession import com.google.common.collect.ImmutableList -import com.player.musicoo.util.LogTag -import com.player.musicoo.util.LogTag.LogD +import relax.offline.music.util.LogTag +import relax.offline.music.util.LogTag.LogD @UnstableApi class CustomMediaNotificationProvider(context: Context) : diff --git a/app/src/main/java/com/player/musicoo/service/LocalPlaybackService.kt b/app/src/main/java/relax/offline/music/service/LocalPlaybackService.kt similarity index 93% rename from app/src/main/java/com/player/musicoo/service/LocalPlaybackService.kt rename to app/src/main/java/relax/offline/music/service/LocalPlaybackService.kt index c359dc9..ea70849 100644 --- a/app/src/main/java/com/player/musicoo/service/LocalPlaybackService.kt +++ b/app/src/main/java/relax/offline/music/service/LocalPlaybackService.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.service +package relax.offline.music.service import android.content.Intent import androidx.media3.common.Player @@ -6,7 +6,7 @@ import androidx.media3.common.util.UnstableApi import androidx.media3.exoplayer.ExoPlayer import androidx.media3.session.MediaSession import androidx.media3.session.MediaSessionService -import com.player.musicoo.R +import relax.offline.music.R @UnstableApi diff --git a/app/src/main/java/com/player/musicoo/service/MyDownloadService.kt b/app/src/main/java/relax/offline/music/service/MyDownloadService.kt similarity index 84% rename from app/src/main/java/com/player/musicoo/service/MyDownloadService.kt rename to app/src/main/java/relax/offline/music/service/MyDownloadService.kt index 0b746f9..eb00759 100644 --- a/app/src/main/java/com/player/musicoo/service/MyDownloadService.kt +++ b/app/src/main/java/relax/offline/music/service/MyDownloadService.kt @@ -1,10 +1,8 @@ -package com.player.musicoo.service +package relax.offline.music.service import android.annotation.SuppressLint import android.app.Notification -import android.content.Context import androidx.annotation.OptIn -import androidx.media3.common.util.NotificationUtil import androidx.media3.common.util.UnstableApi import androidx.media3.common.util.Util import androidx.media3.exoplayer.offline.Download @@ -12,13 +10,8 @@ import androidx.media3.exoplayer.offline.DownloadManager import androidx.media3.exoplayer.offline.DownloadNotificationHelper import androidx.media3.exoplayer.offline.DownloadService import androidx.media3.exoplayer.scheduler.PlatformScheduler -import com.player.musicoo.App -import com.player.musicoo.R -import com.player.musicoo.bean.OfflineBean -import com.player.musicoo.util.DownloadUtil -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch +import relax.offline.music.R +import relax.offline.music.util.DownloadUtil @OptIn(UnstableApi::class) diff --git a/app/src/main/java/com/player/musicoo/service/NotificationCustomButton.kt b/app/src/main/java/relax/offline/music/service/NotificationCustomButton.kt similarity index 94% rename from app/src/main/java/com/player/musicoo/service/NotificationCustomButton.kt rename to app/src/main/java/relax/offline/music/service/NotificationCustomButton.kt index 2be702d..2f29ca7 100644 --- a/app/src/main/java/com/player/musicoo/service/NotificationCustomButton.kt +++ b/app/src/main/java/relax/offline/music/service/NotificationCustomButton.kt @@ -1,9 +1,9 @@ -package com.player.musicoo.service +package relax.offline.music.service import android.os.Bundle import androidx.media3.session.CommandButton import androidx.media3.session.SessionCommand -import com.player.musicoo.R +import relax.offline.music.R private const val CUSTOM_COMMAND_SKIP_BACK_ACTION_ID = "Skip_back" private const val CUSTOM_COMMAND_SKIP_FORWARD_ACTION_ID = "Skip_Forward" diff --git a/app/src/main/java/com/player/musicoo/service/PlaybackExceptions.kt b/app/src/main/java/relax/offline/music/service/PlaybackExceptions.kt similarity index 94% rename from app/src/main/java/com/player/musicoo/service/PlaybackExceptions.kt rename to app/src/main/java/relax/offline/music/service/PlaybackExceptions.kt index 007a69e..2630023 100644 --- a/app/src/main/java/com/player/musicoo/service/PlaybackExceptions.kt +++ b/app/src/main/java/relax/offline/music/service/PlaybackExceptions.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.service +package relax.offline.music.service import androidx.annotation.OptIn import androidx.media3.common.PlaybackException diff --git a/app/src/main/java/com/player/musicoo/service/PlaybackService.kt b/app/src/main/java/relax/offline/music/service/PlaybackService.kt similarity index 93% rename from app/src/main/java/com/player/musicoo/service/PlaybackService.kt rename to app/src/main/java/relax/offline/music/service/PlaybackService.kt index b1437fb..9f15552 100644 --- a/app/src/main/java/com/player/musicoo/service/PlaybackService.kt +++ b/app/src/main/java/relax/offline/music/service/PlaybackService.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.service +package relax.offline.music.service import android.content.Intent import android.net.Uri @@ -13,7 +13,6 @@ import androidx.media3.datasource.DataSource import androidx.media3.datasource.DefaultHttpDataSource import androidx.media3.datasource.ResolvingDataSource import androidx.media3.datasource.cache.CacheDataSource -import androidx.media3.datasource.cache.SimpleCache import androidx.media3.exoplayer.ExoPlayer import androidx.media3.exoplayer.RenderersFactory import androidx.media3.exoplayer.audio.AudioRendererEventListener @@ -30,19 +29,18 @@ import androidx.media3.extractor.mp4.FragmentedMp4Extractor import androidx.media3.session.DefaultMediaNotificationProvider import androidx.media3.session.MediaSession import androidx.media3.session.MediaSessionService -import com.player.musicoo.R -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.bodies.PlayerBody -import com.player.musicoo.innertube.requests.player -import com.player.musicoo.sp.AppStore -import com.player.musicoo.util.CacheManager -import com.player.musicoo.util.DownloadUtil -import com.player.musicoo.util.LogTag -import com.player.musicoo.util.LogTag.LogD -import com.player.musicoo.util.PlayMode -import com.player.musicoo.util.RingBuffer +import relax.offline.music.R +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.bodies.PlayerBody +import relax.offline.music.innertube.requests.player +import relax.offline.music.sp.AppStore +import relax.offline.music.util.CacheManager +import relax.offline.music.util.LogTag +import relax.offline.music.util.LogTag.LogD +import relax.offline.music.util.PlayMode import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking +import relax.offline.music.util.RingBuffer @UnstableApi @@ -97,10 +95,10 @@ class PlaybackService : MediaSessionService(), Player.Listener { // val customMediaNotificationProvider = CustomMediaNotificationProvider(this).apply { -// setSmallIcon(R.mipmap.musicoo_logo_img) +// setSmallIcon(R.mipmap.app_logo_img) // } setMediaNotificationProvider(DefaultMediaNotificationProvider(this).apply { - setSmallIcon(R.mipmap.musicoo_logo_img) + setSmallIcon(R.mipmap.app_logo) }) } diff --git a/app/src/main/java/com/player/musicoo/service/ViewModelMain.kt b/app/src/main/java/relax/offline/music/service/ViewModelMain.kt similarity index 86% rename from app/src/main/java/com/player/musicoo/service/ViewModelMain.kt rename to app/src/main/java/relax/offline/music/service/ViewModelMain.kt index 4d1ad74..dce373c 100644 --- a/app/src/main/java/com/player/musicoo/service/ViewModelMain.kt +++ b/app/src/main/java/relax/offline/music/service/ViewModelMain.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.service +package relax.offline.music.service import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/com/player/musicoo/sp/AppStore.kt b/app/src/main/java/relax/offline/music/sp/AppStore.kt similarity index 83% rename from app/src/main/java/com/player/musicoo/sp/AppStore.kt rename to app/src/main/java/relax/offline/music/sp/AppStore.kt index 65a5de2..d4c8292 100644 --- a/app/src/main/java/com/player/musicoo/sp/AppStore.kt +++ b/app/src/main/java/relax/offline/music/sp/AppStore.kt @@ -1,9 +1,9 @@ -package com.player.musicoo.sp +package relax.offline.music.sp import android.content.Context -import com.player.musicoo.sp.store.Store -import com.player.musicoo.sp.store.asStoreProvider -import com.player.musicoo.util.PlayMode +import relax.offline.music.sp.store.Store +import relax.offline.music.sp.store.asStoreProvider +import relax.offline.music.util.PlayMode class AppStore(context: Context) { private val store = Store( diff --git a/app/src/main/java/com/player/musicoo/sp/SharedPreferencesHelper.kt b/app/src/main/java/relax/offline/music/sp/SharedPreferencesHelper.kt similarity index 98% rename from app/src/main/java/com/player/musicoo/sp/SharedPreferencesHelper.kt rename to app/src/main/java/relax/offline/music/sp/SharedPreferencesHelper.kt index 0025458..0821250 100644 --- a/app/src/main/java/com/player/musicoo/sp/SharedPreferencesHelper.kt +++ b/app/src/main/java/relax/offline/music/sp/SharedPreferencesHelper.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.sp +package relax.offline.music.sp import android.content.Context import android.content.SharedPreferences diff --git a/app/src/main/java/com/player/musicoo/sp/store/Providers.kt b/app/src/main/java/relax/offline/music/sp/store/Providers.kt similarity index 97% rename from app/src/main/java/com/player/musicoo/sp/store/Providers.kt rename to app/src/main/java/relax/offline/music/sp/store/Providers.kt index 9749ecc..99424e4 100644 --- a/app/src/main/java/com/player/musicoo/sp/store/Providers.kt +++ b/app/src/main/java/relax/offline/music/sp/store/Providers.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.sp.store +package relax.offline.music.sp.store import android.content.SharedPreferences import androidx.core.content.edit diff --git a/app/src/main/java/com/player/musicoo/sp/store/Store.kt b/app/src/main/java/relax/offline/music/sp/store/Store.kt similarity index 98% rename from app/src/main/java/com/player/musicoo/sp/store/Store.kt rename to app/src/main/java/relax/offline/music/sp/store/Store.kt index 6fe63a1..c9a88fa 100644 --- a/app/src/main/java/com/player/musicoo/sp/store/Store.kt +++ b/app/src/main/java/relax/offline/music/sp/store/Store.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.sp.store +package relax.offline.music.sp.store import kotlin.reflect.KProperty diff --git a/app/src/main/java/com/player/musicoo/sp/store/StoreProvider.kt b/app/src/main/java/relax/offline/music/sp/store/StoreProvider.kt similarity index 93% rename from app/src/main/java/com/player/musicoo/sp/store/StoreProvider.kt rename to app/src/main/java/relax/offline/music/sp/store/StoreProvider.kt index d33c2b4..821c588 100644 --- a/app/src/main/java/com/player/musicoo/sp/store/StoreProvider.kt +++ b/app/src/main/java/relax/offline/music/sp/store/StoreProvider.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.sp.store +package relax.offline.music.sp.store interface StoreProvider { fun getInt(key: String, defaultValue: Int): Int diff --git a/app/src/main/java/com/player/musicoo/util/AudioPlayer.kt b/app/src/main/java/relax/offline/music/util/AudioPlayer.kt similarity index 98% rename from app/src/main/java/com/player/musicoo/util/AudioPlayer.kt rename to app/src/main/java/relax/offline/music/util/AudioPlayer.kt index 63bd948..60fb0c5 100644 --- a/app/src/main/java/com/player/musicoo/util/AudioPlayer.kt +++ b/app/src/main/java/relax/offline/music/util/AudioPlayer.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.util +package relax.offline.music.util import android.content.Context import android.media.AudioAttributes diff --git a/app/src/main/java/com/player/musicoo/util/CacheManager.kt b/app/src/main/java/relax/offline/music/util/CacheManager.kt similarity index 98% rename from app/src/main/java/com/player/musicoo/util/CacheManager.kt rename to app/src/main/java/relax/offline/music/util/CacheManager.kt index f902695..93ad5c3 100644 --- a/app/src/main/java/com/player/musicoo/util/CacheManager.kt +++ b/app/src/main/java/relax/offline/music/util/CacheManager.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.util +package relax.offline.music.util import android.content.Context import androidx.annotation.OptIn diff --git a/app/src/main/java/com/player/musicoo/util/ConvertUtil.kt b/app/src/main/java/relax/offline/music/util/ConvertUtil.kt similarity index 94% rename from app/src/main/java/com/player/musicoo/util/ConvertUtil.kt rename to app/src/main/java/relax/offline/music/util/ConvertUtil.kt index 3a8ff41..1acd114 100644 --- a/app/src/main/java/com/player/musicoo/util/ConvertUtil.kt +++ b/app/src/main/java/relax/offline/music/util/ConvertUtil.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.util +package relax.offline.music.util import android.content.Context import android.content.pm.PackageManager diff --git a/app/src/main/java/com/player/musicoo/util/DownloadUtil.kt b/app/src/main/java/relax/offline/music/util/DownloadUtil.kt similarity index 88% rename from app/src/main/java/com/player/musicoo/util/DownloadUtil.kt rename to app/src/main/java/relax/offline/music/util/DownloadUtil.kt index 419d16c..7b309c0 100644 --- a/app/src/main/java/com/player/musicoo/util/DownloadUtil.kt +++ b/app/src/main/java/relax/offline/music/util/DownloadUtil.kt @@ -1,12 +1,10 @@ -package com.player.musicoo.util +package relax.offline.music.util import android.app.Notification import android.content.Context import android.net.Uri -import android.util.Log import androidx.annotation.OptIn import androidx.core.net.toUri -import androidx.lifecycle.MutableLiveData import androidx.media3.common.PlaybackException import androidx.media3.common.util.NotificationUtil import androidx.media3.common.util.UnstableApi @@ -17,38 +15,26 @@ import androidx.media3.datasource.DataSource import androidx.media3.datasource.DefaultDataSource import androidx.media3.datasource.DefaultHttpDataSource import androidx.media3.datasource.ResolvingDataSource -import androidx.media3.datasource.cache.Cache import androidx.media3.datasource.cache.CacheDataSource -import androidx.media3.datasource.cache.CacheEvictor -import androidx.media3.datasource.cache.LeastRecentlyUsedCacheEvictor -import androidx.media3.datasource.cache.NoOpCacheEvictor -import androidx.media3.datasource.cache.SimpleCache import androidx.media3.datasource.cronet.CronetDataSource import androidx.media3.datasource.cronet.CronetUtil import androidx.media3.exoplayer.offline.Download import androidx.media3.exoplayer.offline.DownloadManager import androidx.media3.exoplayer.offline.DownloadNotificationHelper -import com.player.musicoo.App -import com.player.musicoo.R -import com.player.musicoo.bean.OfflineBean -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.Innertube.TAG -import com.player.musicoo.innertube.models.bodies.PlayerBody -import com.player.musicoo.innertube.requests.player -import com.player.musicoo.media.MediaControllerManager -import com.player.musicoo.service.LoginRequiredException -import com.player.musicoo.service.PlayableFormatNotFoundException -import com.player.musicoo.service.UnplayableException -import com.player.musicoo.service.VideoIdMismatchException -import com.player.musicoo.service.ViewModelMain +import relax.offline.music.R +import relax.offline.music.bean.OfflineBean +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.Innertube.TAG +import relax.offline.music.innertube.models.bodies.PlayerBody +import relax.offline.music.innertube.requests.player +import relax.offline.music.media.MediaControllerManager +import relax.offline.music.service.LoginRequiredException +import relax.offline.music.service.PlayableFormatNotFoundException +import relax.offline.music.service.UnplayableException +import relax.offline.music.service.VideoIdMismatchException +import relax.offline.music.service.ViewModelMain import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.asSharedFlow -import kotlinx.coroutines.flow.map -import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import java.net.CookieHandler @@ -301,7 +287,7 @@ object DownloadUtil { isOffline = true ) LogTag.LogD(TAG, "insertOfflineBean bean->${bean}") - App.appOfflineDBManager.insertOfflineBean(bean) + relax.offline.music.App.appOfflineDBManager.insertOfflineBean(bean) } } } diff --git a/app/src/main/java/com/player/musicoo/util/ExoPlayerDiskCacheMaxSize.kt b/app/src/main/java/relax/offline/music/util/ExoPlayerDiskCacheMaxSize.kt similarity index 92% rename from app/src/main/java/com/player/musicoo/util/ExoPlayerDiskCacheMaxSize.kt rename to app/src/main/java/relax/offline/music/util/ExoPlayerDiskCacheMaxSize.kt index 40e4546..40c8138 100644 --- a/app/src/main/java/com/player/musicoo/util/ExoPlayerDiskCacheMaxSize.kt +++ b/app/src/main/java/relax/offline/music/util/ExoPlayerDiskCacheMaxSize.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.util +package relax.offline.music.util enum class ExoPlayerDiskCacheMaxSize { `32MB`, diff --git a/app/src/main/java/com/player/musicoo/util/FileSizeConverter.kt b/app/src/main/java/relax/offline/music/util/FileSizeConverter.kt similarity index 97% rename from app/src/main/java/com/player/musicoo/util/FileSizeConverter.kt rename to app/src/main/java/relax/offline/music/util/FileSizeConverter.kt index cd3dea4..13f7456 100644 --- a/app/src/main/java/com/player/musicoo/util/FileSizeConverter.kt +++ b/app/src/main/java/relax/offline/music/util/FileSizeConverter.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.util +package relax.offline.music.util class FileSizeConverter(private val sizeInBytes: Long) { diff --git a/app/src/main/java/com/player/musicoo/util/GridSpacingItemDecoration.kt b/app/src/main/java/relax/offline/music/util/GridSpacingItemDecoration.kt similarity index 96% rename from app/src/main/java/com/player/musicoo/util/GridSpacingItemDecoration.kt rename to app/src/main/java/relax/offline/music/util/GridSpacingItemDecoration.kt index bff81c2..2b8e753 100644 --- a/app/src/main/java/com/player/musicoo/util/GridSpacingItemDecoration.kt +++ b/app/src/main/java/relax/offline/music/util/GridSpacingItemDecoration.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.util +package relax.offline.music.util import android.content.Context import android.graphics.Rect diff --git a/app/src/main/java/com/player/musicoo/util/HorizontalSpaceItemDecoration.kt b/app/src/main/java/relax/offline/music/util/HorizontalSpaceItemDecoration.kt similarity index 96% rename from app/src/main/java/com/player/musicoo/util/HorizontalSpaceItemDecoration.kt rename to app/src/main/java/relax/offline/music/util/HorizontalSpaceItemDecoration.kt index e5e85d3..1ef0b42 100644 --- a/app/src/main/java/com/player/musicoo/util/HorizontalSpaceItemDecoration.kt +++ b/app/src/main/java/relax/offline/music/util/HorizontalSpaceItemDecoration.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.util +package relax.offline.music.util import android.content.Context import android.graphics.Rect diff --git a/app/src/main/java/com/player/musicoo/util/LogTag.kt b/app/src/main/java/relax/offline/music/util/LogTag.kt similarity index 93% rename from app/src/main/java/com/player/musicoo/util/LogTag.kt rename to app/src/main/java/relax/offline/music/util/LogTag.kt index 60e83c9..ec7da78 100644 --- a/app/src/main/java/com/player/musicoo/util/LogTag.kt +++ b/app/src/main/java/relax/offline/music/util/LogTag.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.util +package relax.offline.music.util import android.util.Log diff --git a/app/src/main/java/com/player/musicoo/util/OpenUrlUtil.kt b/app/src/main/java/relax/offline/music/util/OpenUrlUtil.kt similarity index 96% rename from app/src/main/java/com/player/musicoo/util/OpenUrlUtil.kt rename to app/src/main/java/relax/offline/music/util/OpenUrlUtil.kt index efc9e12..cc12dd7 100644 --- a/app/src/main/java/com/player/musicoo/util/OpenUrlUtil.kt +++ b/app/src/main/java/relax/offline/music/util/OpenUrlUtil.kt @@ -1,10 +1,9 @@ -package com.player.musicoo.util +package relax.offline.music.util import android.content.Context import android.content.Intent import android.net.Uri import android.widget.Toast -import com.player.musicoo.R const val PRIVACY_POLICY_URL = "https://sites.google.com/view/musiclax-privacy/home" const val TERMS_OF_SERVICE_URL = "https://sites.google.com/view/musiclax-terms/home" diff --git a/app/src/main/java/com/player/musicoo/util/PlayMode.kt b/app/src/main/java/relax/offline/music/util/PlayMode.kt similarity index 88% rename from app/src/main/java/com/player/musicoo/util/PlayMode.kt rename to app/src/main/java/relax/offline/music/util/PlayMode.kt index e211d1f..4115bfd 100644 --- a/app/src/main/java/com/player/musicoo/util/PlayMode.kt +++ b/app/src/main/java/relax/offline/music/util/PlayMode.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.util +package relax.offline.music.util enum class PlayMode(val value: Int) { LIST_LOOP(0), // 列表循环 diff --git a/app/src/main/java/com/player/musicoo/util/ResourcesMusicUtil.kt b/app/src/main/java/relax/offline/music/util/ResourcesMusicUtil.kt similarity index 92% rename from app/src/main/java/com/player/musicoo/util/ResourcesMusicUtil.kt rename to app/src/main/java/relax/offline/music/util/ResourcesMusicUtil.kt index 0056744..a9644c8 100644 --- a/app/src/main/java/com/player/musicoo/util/ResourcesMusicUtil.kt +++ b/app/src/main/java/relax/offline/music/util/ResourcesMusicUtil.kt @@ -1,15 +1,13 @@ -package com.player.musicoo.util +package relax.offline.music.util -import android.content.ContentResolver import android.content.Context import android.database.Cursor import android.media.MediaMetadataRetriever -import android.media.MediaPlayer import android.net.Uri import android.provider.MediaStore -import com.player.musicoo.bean.Audio -import com.player.musicoo.bean.Category -import com.player.musicoo.bean.ResourcesList +import relax.offline.music.bean.Audio +import relax.offline.music.bean.Category +import relax.offline.music.bean.ResourcesList import org.json.JSONObject import java.io.File import java.io.InputStream diff --git a/app/src/main/java/com/player/musicoo/util/RingBuffer.kt b/app/src/main/java/relax/offline/music/util/RingBuffer.kt similarity index 88% rename from app/src/main/java/com/player/musicoo/util/RingBuffer.kt rename to app/src/main/java/relax/offline/music/util/RingBuffer.kt index 63cea4d..2b48b25 100644 --- a/app/src/main/java/com/player/musicoo/util/RingBuffer.kt +++ b/app/src/main/java/relax/offline/music/util/RingBuffer.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.util +package relax.offline.music.util class RingBuffer(val size: Int, init: (index: Int) -> T) { private val list = MutableList(size, init) diff --git a/app/src/main/java/com/player/musicoo/util/Utils.kt b/app/src/main/java/relax/offline/music/util/Utils.kt similarity index 91% rename from app/src/main/java/com/player/musicoo/util/Utils.kt rename to app/src/main/java/relax/offline/music/util/Utils.kt index f5041b7..744300b 100644 --- a/app/src/main/java/com/player/musicoo/util/Utils.kt +++ b/app/src/main/java/relax/offline/music/util/Utils.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.util +package relax.offline.music.util import android.net.Uri import android.os.Build @@ -8,10 +8,10 @@ import androidx.core.os.bundleOf import androidx.media3.common.MediaItem import androidx.media3.common.MediaMetadata import androidx.media3.common.util.UnstableApi -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.innertube.models.bodies.ContinuationBody -import com.player.musicoo.innertube.requests.playlistPage -import com.player.musicoo.innertube.utils.plus +import relax.offline.music.innertube.Innertube +import relax.offline.music.innertube.models.bodies.ContinuationBody +import relax.offline.music.innertube.requests.playlistPage +import relax.offline.music.innertube.utils.plus val Innertube.SongItem.asMediaItem: MediaItem @UnstableApi diff --git a/app/src/main/java/com/player/musicoo/view/BlurLayout.kt b/app/src/main/java/relax/offline/music/view/BlurLayout.kt similarity index 99% rename from app/src/main/java/com/player/musicoo/view/BlurLayout.kt rename to app/src/main/java/relax/offline/music/view/BlurLayout.kt index 9be1371..43f5fc7 100644 --- a/app/src/main/java/com/player/musicoo/view/BlurLayout.kt +++ b/app/src/main/java/relax/offline/music/view/BlurLayout.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.view +package relax.offline.music.view import android.content.Context import android.graphics.* diff --git a/app/src/main/java/com/player/musicoo/view/CircularProgressBar.kt b/app/src/main/java/relax/offline/music/view/CircularProgressBar.kt similarity index 98% rename from app/src/main/java/com/player/musicoo/view/CircularProgressBar.kt rename to app/src/main/java/relax/offline/music/view/CircularProgressBar.kt index da1d0f0..3a92a41 100644 --- a/app/src/main/java/com/player/musicoo/view/CircularProgressBar.kt +++ b/app/src/main/java/relax/offline/music/view/CircularProgressBar.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.view +package relax.offline.music.view import android.content.Context import android.graphics.Canvas diff --git a/app/src/main/java/com/player/musicoo/view/CustomProgressBar.kt b/app/src/main/java/relax/offline/music/view/CustomProgressBar.kt similarity index 98% rename from app/src/main/java/com/player/musicoo/view/CustomProgressBar.kt rename to app/src/main/java/relax/offline/music/view/CustomProgressBar.kt index f35f6dd..74978aa 100644 --- a/app/src/main/java/com/player/musicoo/view/CustomProgressBar.kt +++ b/app/src/main/java/relax/offline/music/view/CustomProgressBar.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.view +package relax.offline.music.view import android.content.Context import android.graphics.Canvas diff --git a/app/src/main/java/com/player/musicoo/view/MarqueeTextView.java b/app/src/main/java/relax/offline/music/view/MarqueeTextView.java similarity index 96% rename from app/src/main/java/com/player/musicoo/view/MarqueeTextView.java rename to app/src/main/java/relax/offline/music/view/MarqueeTextView.java index 2fd471f..69ecc09 100644 --- a/app/src/main/java/com/player/musicoo/view/MarqueeTextView.java +++ b/app/src/main/java/relax/offline/music/view/MarqueeTextView.java @@ -1,4 +1,4 @@ -package com.player.musicoo.view; +package relax.offline.music.view; import android.content.Context; import android.text.TextUtils; diff --git a/app/src/main/java/com/player/musicoo/view/ModuleView.kt b/app/src/main/java/relax/offline/music/view/ModuleView.kt similarity index 93% rename from app/src/main/java/com/player/musicoo/view/ModuleView.kt rename to app/src/main/java/relax/offline/music/view/ModuleView.kt index 0de72b7..c3076fe 100644 --- a/app/src/main/java/com/player/musicoo/view/ModuleView.kt +++ b/app/src/main/java/relax/offline/music/view/ModuleView.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.view +package relax.offline.music.view import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/com/player/musicoo/view/MusicBarsView.kt b/app/src/main/java/relax/offline/music/view/MusicBarsView.kt similarity index 98% rename from app/src/main/java/com/player/musicoo/view/MusicBarsView.kt rename to app/src/main/java/relax/offline/music/view/MusicBarsView.kt index 39311be..c0583ce 100644 --- a/app/src/main/java/com/player/musicoo/view/MusicBarsView.kt +++ b/app/src/main/java/relax/offline/music/view/MusicBarsView.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.view +package relax.offline.music.view import android.animation.ValueAnimator import android.content.Context diff --git a/app/src/main/java/com/player/musicoo/view/MusicPlayerView.kt b/app/src/main/java/relax/offline/music/view/MusicPlayerView.kt similarity index 92% rename from app/src/main/java/com/player/musicoo/view/MusicPlayerView.kt rename to app/src/main/java/relax/offline/music/view/MusicPlayerView.kt index ac64c75..c528a92 100644 --- a/app/src/main/java/com/player/musicoo/view/MusicPlayerView.kt +++ b/app/src/main/java/relax/offline/music/view/MusicPlayerView.kt @@ -1,8 +1,7 @@ -package com.player.musicoo.view +package relax.offline.music.view import android.annotation.SuppressLint import android.app.Activity -import android.content.Context import android.content.Intent import android.os.Handler import android.os.Looper @@ -16,12 +15,10 @@ import androidx.media3.common.MediaItem import androidx.media3.common.Player import androidx.media3.session.MediaController import com.bumptech.glide.Glide -import com.player.musicoo.R -import com.player.musicoo.activity.MoPlayDetailsActivity -import com.player.musicoo.activity.PrimaryActivity -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.media.MediaControllerManager -import com.player.musicoo.util.LogTag +import relax.offline.music.R +import relax.offline.music.activity.MoPlayDetailsActivity +import relax.offline.music.activity.PrimaryActivity +import relax.offline.music.media.MediaControllerManager @SuppressLint("ViewConstructor") class MusicPlayerView( diff --git a/app/src/main/java/com/player/musicoo/view/MusicResponsiveListView.kt b/app/src/main/java/relax/offline/music/view/MusicResponsiveListView.kt similarity index 74% rename from app/src/main/java/com/player/musicoo/view/MusicResponsiveListView.kt rename to app/src/main/java/relax/offline/music/view/MusicResponsiveListView.kt index 6e3b29a..0e3d2dd 100644 --- a/app/src/main/java/com/player/musicoo/view/MusicResponsiveListView.kt +++ b/app/src/main/java/relax/offline/music/view/MusicResponsiveListView.kt @@ -1,17 +1,13 @@ -package com.player.musicoo.view +package relax.offline.music.view import android.annotation.SuppressLint import android.content.Context import android.widget.TextView import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.player.musicoo.App -import com.player.musicoo.R -import com.player.musicoo.adapter.ResponsiveListAdapter -import com.player.musicoo.adapter.SoundsOfNatureAdapter -import com.player.musicoo.innertube.Innertube -import com.player.musicoo.util.GridSpacingItemDecoration -import com.player.musicoo.util.LogTag +import relax.offline.music.R +import relax.offline.music.adapter.ResponsiveListAdapter +import relax.offline.music.innertube.Innertube @SuppressLint("ViewConstructor") class MusicResponsiveListView(context: Context, homePage: Innertube.HomePage) : diff --git a/app/src/main/java/com/player/musicoo/view/MusicTowRowListView.kt b/app/src/main/java/relax/offline/music/view/MusicTowRowListView.kt similarity index 72% rename from app/src/main/java/com/player/musicoo/view/MusicTowRowListView.kt rename to app/src/main/java/relax/offline/music/view/MusicTowRowListView.kt index 5817ea9..7daa4db 100644 --- a/app/src/main/java/com/player/musicoo/view/MusicTowRowListView.kt +++ b/app/src/main/java/relax/offline/music/view/MusicTowRowListView.kt @@ -1,16 +1,13 @@ -package com.player.musicoo.view +package relax.offline.music.view import android.annotation.SuppressLint import android.app.Activity -import android.content.Context import android.widget.TextView -import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.player.musicoo.R -import com.player.musicoo.adapter.ResponsiveListAdapter -import com.player.musicoo.adapter.TowRowListAdapter -import com.player.musicoo.innertube.Innertube +import relax.offline.music.R +import relax.offline.music.adapter.TowRowListAdapter +import relax.offline.music.innertube.Innertube @SuppressLint("ViewConstructor") class MusicTowRowListView(context: Activity, homePage: Innertube.HomePage) : ModuleView(context) { diff --git a/app/src/main/java/com/player/musicoo/view/RadiusLayout.kt b/app/src/main/java/relax/offline/music/view/RadiusLayout.kt similarity index 94% rename from app/src/main/java/com/player/musicoo/view/RadiusLayout.kt rename to app/src/main/java/relax/offline/music/view/RadiusLayout.kt index 501cbbd..16c3b34 100644 --- a/app/src/main/java/com/player/musicoo/view/RadiusLayout.kt +++ b/app/src/main/java/relax/offline/music/view/RadiusLayout.kt @@ -1,10 +1,8 @@ -package com.player.musicoo.view +package relax.offline.music.view import android.content.Context import android.graphics.* -import android.renderscript.* import android.util.AttributeSet -import android.widget.FrameLayout import android.widget.RelativeLayout class RadiusLayout : RelativeLayout { diff --git a/app/src/main/java/com/player/musicoo/view/SearchResultOptimalView.kt b/app/src/main/java/relax/offline/music/view/SearchResultOptimalView.kt similarity index 90% rename from app/src/main/java/com/player/musicoo/view/SearchResultOptimalView.kt rename to app/src/main/java/relax/offline/music/view/SearchResultOptimalView.kt index 61dcea2..757b857 100644 --- a/app/src/main/java/com/player/musicoo/view/SearchResultOptimalView.kt +++ b/app/src/main/java/relax/offline/music/view/SearchResultOptimalView.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.view +package relax.offline.music.view import android.annotation.SuppressLint import android.content.Context @@ -7,11 +7,11 @@ import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView import com.bumptech.glide.Glide -import com.player.musicoo.R -import com.player.musicoo.activity.MoListDetailsActivity -import com.player.musicoo.activity.MoPlayDetailsActivity -import com.player.musicoo.activity.MoSingerDetailsActivity -import com.player.musicoo.innertube.Innertube +import relax.offline.music.R +import relax.offline.music.activity.MoListDetailsActivity +import relax.offline.music.activity.MoPlayDetailsActivity +import relax.offline.music.activity.MoSingerDetailsActivity +import relax.offline.music.innertube.Innertube @SuppressLint("ViewConstructor") class SearchResultOptimalView(context: Context, data: Innertube.SearchDataPage) : diff --git a/app/src/main/java/com/player/musicoo/view/SearchResultOtherView.kt b/app/src/main/java/relax/offline/music/view/SearchResultOtherView.kt similarity index 85% rename from app/src/main/java/com/player/musicoo/view/SearchResultOtherView.kt rename to app/src/main/java/relax/offline/music/view/SearchResultOtherView.kt index d5fc19d..9267245 100644 --- a/app/src/main/java/com/player/musicoo/view/SearchResultOtherView.kt +++ b/app/src/main/java/relax/offline/music/view/SearchResultOtherView.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.view +package relax.offline.music.view import android.annotation.SuppressLint import android.content.Context @@ -7,10 +7,10 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.player.musicoo.R -import com.player.musicoo.activity.MoSearchMoreActivity -import com.player.musicoo.adapter.SearchResultOtherAdapter -import com.player.musicoo.innertube.Innertube +import relax.offline.music.R +import relax.offline.music.activity.MoSearchMoreActivity +import relax.offline.music.adapter.SearchResultOtherAdapter +import relax.offline.music.innertube.Innertube @SuppressLint("ViewConstructor") class SearchResultOtherView(context: Context, data: Innertube.SearchDataPage) : diff --git a/app/src/main/java/com/player/musicoo/view/SingerDetailsOtherView.kt b/app/src/main/java/relax/offline/music/view/SingerDetailsOtherView.kt similarity index 85% rename from app/src/main/java/com/player/musicoo/view/SingerDetailsOtherView.kt rename to app/src/main/java/relax/offline/music/view/SingerDetailsOtherView.kt index 93554e4..f5319ae 100644 --- a/app/src/main/java/com/player/musicoo/view/SingerDetailsOtherView.kt +++ b/app/src/main/java/relax/offline/music/view/SingerDetailsOtherView.kt @@ -1,18 +1,16 @@ -package com.player.musicoo.view +package relax.offline.music.view import android.annotation.SuppressLint import android.app.Activity -import android.content.Context import android.content.Intent import android.widget.LinearLayout import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.player.musicoo.R -import com.player.musicoo.activity.MoSearchMoreActivity -import com.player.musicoo.activity.MoSingerMoreSongActivity -import com.player.musicoo.adapter.TowRowListAdapter -import com.player.musicoo.innertube.Innertube +import relax.offline.music.R +import relax.offline.music.activity.MoSingerMoreSongActivity +import relax.offline.music.adapter.TowRowListAdapter +import relax.offline.music.innertube.Innertube @SuppressLint("ViewConstructor") class SingerDetailsOtherView(context: Activity, bean: Innertube.SingerDetailsListPage) : diff --git a/app/src/main/java/com/player/musicoo/view/SingerDetailsSongView.kt b/app/src/main/java/relax/offline/music/view/SingerDetailsSongView.kt similarity index 85% rename from app/src/main/java/com/player/musicoo/view/SingerDetailsSongView.kt rename to app/src/main/java/relax/offline/music/view/SingerDetailsSongView.kt index 8c4e0c6..b31678a 100644 --- a/app/src/main/java/com/player/musicoo/view/SingerDetailsSongView.kt +++ b/app/src/main/java/relax/offline/music/view/SingerDetailsSongView.kt @@ -1,4 +1,4 @@ -package com.player.musicoo.view +package relax.offline.music.view import android.annotation.SuppressLint import android.content.Context @@ -8,10 +8,10 @@ import android.widget.TextView import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.player.musicoo.R -import com.player.musicoo.activity.MoSingerMoreSongActivity -import com.player.musicoo.adapter.SingerDetailsSongListAdapter -import com.player.musicoo.innertube.Innertube +import relax.offline.music.R +import relax.offline.music.activity.MoSingerMoreSongActivity +import relax.offline.music.adapter.SingerDetailsSongListAdapter +import relax.offline.music.innertube.Innertube @SuppressLint("ViewConstructor") class SingerDetailsSongView(context: Context, bean: Innertube.SingerDetailsListPage) : diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index d82f951..725a07d 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -60,7 +60,7 @@ android:layout_height="80dp" android:layout_gravity="center_horizontal" android:layout_marginTop="80dp" - android:src="@mipmap/musicoo_logo_img" /> + android:src="@mipmap/app_logo" /> + android:src="@mipmap/app_logo" /> diff --git a/app/src/main/res/layout/activity_launch.xml b/app/src/main/res/layout/activity_launch.xml index 3a58741..58d8c6d 100644 --- a/app/src/main/res/layout/activity_launch.xml +++ b/app/src/main/res/layout/activity_launch.xml @@ -43,7 +43,7 @@ android:textColor="#CCFFFFFF" android:textSize="16dp" /> - - - - - - + android:src="@mipmap/app_logo" /> @@ -53,7 +53,7 @@ android:layout_height="match_parent" android:visibility="gone"> - @@ -69,7 +69,7 @@ android:gravity="center_vertical" android:orientation="vertical"> - - + android:src="@mipmap/app_logo" /> + android:src="@mipmap/app_logo" /> - - - + android:src="@mipmap/app_logo" /> @@ -40,7 +40,7 @@ android:background="@color/black_60" android:visibility="gone"> - @@ -55,7 +55,7 @@ android:gravity="center_vertical" android:orientation="vertical"> - - + android:src="@mipmap/app_logo" /> @@ -35,7 +35,7 @@ android:gravity="center" android:orientation="vertical"> - - + android:src="@mipmap/app_logo" /> - @@ -64,7 +64,7 @@ android:gravity="center_vertical" android:orientation="vertical"> - - - + android:src="@mipmap/app_logo" /> - @@ -63,7 +63,7 @@ android:gravity="center_vertical" android:orientation="vertical"> - - - @@ -24,7 +24,7 @@ android:layout_height="match_parent" android:scaleType="centerCrop" /> - + + android:src="@mipmap/app_logo" /> - - + android:src="@mipmap/app_logo" /> - - - diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 5c07101..4af2abe 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,10 +1,10 @@ - -