diff --git a/app/build.gradle.kts b/app/build.gradle.kts index aae6a07..97f57db 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -9,19 +9,19 @@ plugins { } android { - namespace = "relax.offline.music" + namespace = "melody.offline.music" compileSdk = 34 defaultConfig { - applicationId = "relax.offline.mp3.music" + applicationId = "com.hi.melody.music.noise" minSdk = 24 targetSdk = 34 - versionCode = 4 - versionName = "1.0.4" + versionCode = 1 + versionName = "1.0.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - setProperty("archivesBaseName", "Musiclax_${defaultConfig.versionName}(${defaultConfig.versionCode})") + setProperty("archivesBaseName", "HiMelody_${defaultConfig.versionName}(${defaultConfig.versionCode})") } buildTypes { diff --git a/app/google-services.json b/app/google-services.json index 51665d3..c5a9ca5 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -1,21 +1,21 @@ { "project_info": { - "project_number": "320083292372", - "project_id": "musiclax-and", - "storage_bucket": "musiclax-and.appspot.com" + "project_number": "550960818622", + "project_id": "himelody-and", + "storage_bucket": "himelody-and.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "1:320083292372:android:047dd51c4c373acf9a8b41", + "mobilesdk_app_id": "1:550960818622:android:96fd4141e43410fb24f1ef", "android_client_info": { - "package_name": "relax.offline.mp3.music" + "package_name": "com.hi.melody.music.noise" } }, "oauth_client": [], "api_key": [ { - "current_key": "AIzaSyCs8V_b7UYuUfcs_mAWIAbr06VZKBM-680" + "current_key": "AIzaSyCp3XR60onMqiGj9pD8ADmrDEOOn__sQDk" } ], "services": { diff --git a/app/src/androidTest/java/relax/offline/music/ExampleInstrumentedTest.kt b/app/src/androidTest/java/melody/offline/music/ExampleInstrumentedTest.kt similarity index 95% rename from app/src/androidTest/java/relax/offline/music/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/melody/offline/music/ExampleInstrumentedTest.kt index 9f2eeb6..0c5e014 100644 --- a/app/src/androidTest/java/relax/offline/music/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/melody/offline/music/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package relax.offline.music +package melody.offline.music import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f7e56fd..dccc7a3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,7 +19,7 @@ = Channel(Channel.UNLIMITED) diff --git a/app/src/main/java/relax/offline/music/activity/MoPlayDetailsActivity.kt b/app/src/main/java/melody/offline/music/activity/MoPlayDetailsActivity.kt similarity index 97% rename from app/src/main/java/relax/offline/music/activity/MoPlayDetailsActivity.kt rename to app/src/main/java/melody/offline/music/activity/MoPlayDetailsActivity.kt index acda377..e379551 100644 --- a/app/src/main/java/relax/offline/music/activity/MoPlayDetailsActivity.kt +++ b/app/src/main/java/melody/offline/music/activity/MoPlayDetailsActivity.kt @@ -1,4 +1,4 @@ -package relax.offline.music.activity +package melody.offline.music.activity import android.annotation.SuppressLint import android.graphics.Bitmap @@ -15,7 +15,6 @@ import androidx.media3.common.PlaybackException import androidx.media3.common.Player import androidx.media3.common.util.UnstableApi import androidx.media3.exoplayer.offline.Download -import androidx.media3.exoplayer.offline.DownloadManager import androidx.media3.exoplayer.offline.DownloadRequest import androidx.media3.exoplayer.offline.DownloadService import androidx.recyclerview.widget.LinearLayoutManager @@ -23,30 +22,28 @@ 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 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 melody.offline.music.R +import melody.offline.music.adapter.PlayListAdapter +import melody.offline.music.databinding.ActivityMoPlayDetailsBinding +import melody.offline.music.innertube.Innertube +import melody.offline.music.media.MediaControllerManager +import melody.offline.music.media.SongRadio +import melody.offline.music.service.MyDownloadService +import melody.offline.music.service.ViewModelMain +import melody.offline.music.sp.AppStore +import melody.offline.music.util.DownloadUtil +import melody.offline.music.util.LogTag.LogD +import melody.offline.music.util.PlayMode +import melody.offline.music.util.asMediaItem +import melody.offline.music.util.convertMillisToMinutesAndSecondsString import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.isActive import kotlinx.coroutines.launch import kotlinx.coroutines.selects.select import org.json.JSONObject -import relax.offline.music.App -import relax.offline.music.bean.FavoriteBean -import relax.offline.music.util.AnalysisUtil -import relax.offline.music.util.LogTag +import melody.offline.music.App +import melody.offline.music.util.AnalysisUtil @OptIn(UnstableApi::class) class MoPlayDetailsActivity : MoBaseActivity(), Player.Listener { diff --git a/app/src/main/java/relax/offline/music/activity/MoSearchMoreActivity.kt b/app/src/main/java/melody/offline/music/activity/MoSearchMoreActivity.kt similarity index 93% rename from app/src/main/java/relax/offline/music/activity/MoSearchMoreActivity.kt rename to app/src/main/java/melody/offline/music/activity/MoSearchMoreActivity.kt index 966b54d..376bc31 100644 --- a/app/src/main/java/relax/offline/music/activity/MoSearchMoreActivity.kt +++ b/app/src/main/java/melody/offline/music/activity/MoSearchMoreActivity.kt @@ -1,15 +1,15 @@ -package relax.offline.music.activity +package melody.offline.music.activity import android.annotation.SuppressLint import android.view.View import androidx.recyclerview.widget.LinearLayoutManager import com.gyf.immersionbar.ktx.immersionBar -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 melody.offline.music.adapter.SearchResultOtherAdapter +import melody.offline.music.databinding.ActivitySearchMoreBinding +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.bodies.ContinuationBody +import melody.offline.music.innertube.models.bodies.SearchBody +import melody.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/relax/offline/music/activity/MoSingerDetailsActivity.kt b/app/src/main/java/melody/offline/music/activity/MoSingerDetailsActivity.kt similarity index 92% rename from app/src/main/java/relax/offline/music/activity/MoSingerDetailsActivity.kt rename to app/src/main/java/melody/offline/music/activity/MoSingerDetailsActivity.kt index 49bb684..1f7a6be 100644 --- a/app/src/main/java/relax/offline/music/activity/MoSingerDetailsActivity.kt +++ b/app/src/main/java/melody/offline/music/activity/MoSingerDetailsActivity.kt @@ -1,14 +1,14 @@ -package relax.offline.music.activity +package melody.offline.music.activity import android.view.View import com.bumptech.glide.Glide import com.gyf.immersionbar.ktx.immersionBar -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 melody.offline.music.databinding.ActivitySingerDetailsBinding +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.requests.moSingerListPage +import melody.offline.music.util.LogTag.LogD +import melody.offline.music.view.SingerDetailsOtherView +import melody.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/relax/offline/music/activity/MoSingerMoreSongActivity.kt b/app/src/main/java/melody/offline/music/activity/MoSingerMoreSongActivity.kt similarity index 92% rename from app/src/main/java/relax/offline/music/activity/MoSingerMoreSongActivity.kt rename to app/src/main/java/melody/offline/music/activity/MoSingerMoreSongActivity.kt index 274a99e..da489b4 100644 --- a/app/src/main/java/relax/offline/music/activity/MoSingerMoreSongActivity.kt +++ b/app/src/main/java/melody/offline/music/activity/MoSingerMoreSongActivity.kt @@ -1,17 +1,17 @@ -package relax.offline.music.activity +package melody.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 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 melody.offline.music.adapter.SingerMoreSongAdapter +import melody.offline.music.databinding.ActivitySearchMoreBinding +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.bodies.BrowseBody +import melody.offline.music.innertube.models.bodies.ContinuationBody +import melody.offline.music.innertube.requests.moSingerDetailsMoreLoadMorePage +import melody.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/relax/offline/music/activity/PlayDetailsActivity.kt b/app/src/main/java/melody/offline/music/activity/PlayDetailsActivity.kt similarity index 95% rename from app/src/main/java/relax/offline/music/activity/PlayDetailsActivity.kt rename to app/src/main/java/melody/offline/music/activity/PlayDetailsActivity.kt index a644fed..a13efb1 100644 --- a/app/src/main/java/relax/offline/music/activity/PlayDetailsActivity.kt +++ b/app/src/main/java/melody/offline/music/activity/PlayDetailsActivity.kt @@ -1,4 +1,4 @@ -package relax.offline.music.activity +package melody.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 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 melody.offline.music.R +import melody.offline.music.bean.Audio +import melody.offline.music.databinding.ActivityPlayDetailsBinding +import melody.offline.music.media.LocalMediaControllerManager +import melody.offline.music.util.LogTag +import melody.offline.music.util.containsContent +import melody.offline.music.util.convertMillisToMinutesAndSecondsString +import melody.offline.music.util.getAudioDurationFromAssets import java.io.IOException import java.io.InputStream diff --git a/app/src/main/java/relax/offline/music/activity/PrimaryActivity.kt b/app/src/main/java/melody/offline/music/activity/PrimaryActivity.kt similarity index 93% rename from app/src/main/java/relax/offline/music/activity/PrimaryActivity.kt rename to app/src/main/java/melody/offline/music/activity/PrimaryActivity.kt index 3b6bbd3..1d0be29 100644 --- a/app/src/main/java/relax/offline/music/activity/PrimaryActivity.kt +++ b/app/src/main/java/melody/offline/music/activity/PrimaryActivity.kt @@ -1,17 +1,16 @@ -package relax.offline.music.activity +package melody.offline.music.activity import android.view.View import android.widget.Toast import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentTransaction -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 melody.offline.music.R +import melody.offline.music.databinding.ActivityPrimaryBinding +import melody.offline.music.fragment.MoHomeFragment +import melody.offline.music.fragment.MoMeFragment +import melody.offline.music.fragment.SearchFragment import kotlinx.coroutines.isActive import kotlinx.coroutines.selects.select -import relax.offline.music.util.AnalysisUtil class PrimaryActivity : MoBaseActivity(), SearchFragment.SearchFragmentCancelClickListener { /** diff --git a/app/src/main/java/relax/offline/music/activity/SettingsActivity.kt b/app/src/main/java/melody/offline/music/activity/SettingsActivity.kt similarity index 78% rename from app/src/main/java/relax/offline/music/activity/SettingsActivity.kt rename to app/src/main/java/melody/offline/music/activity/SettingsActivity.kt index 8b2b2b2..4af6b34 100644 --- a/app/src/main/java/relax/offline/music/activity/SettingsActivity.kt +++ b/app/src/main/java/melody/offline/music/activity/SettingsActivity.kt @@ -1,18 +1,18 @@ -package relax.offline.music.activity +package melody.offline.music.activity import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import com.gyf.immersionbar.ktx.immersionBar -import relax.offline.music.R -import relax.offline.music.databinding.ActivitySettingsBinding -import relax.offline.music.fragment.MoMeFragment -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 +import melody.offline.music.R +import melody.offline.music.databinding.ActivitySettingsBinding +import melody.offline.music.fragment.MoMeFragment +import melody.offline.music.util.PRIVACY_POLICY_URL +import melody.offline.music.util.TERMS_OF_SERVICE_URL +import melody.offline.music.util.openPrivacyPolicy +import melody.offline.music.util.openTermsOfService +import melody.offline.music.util.sendFeedback +import melody.offline.music.util.shareApp class SettingsActivity : AppCompatActivity() { diff --git a/app/src/main/java/relax/offline/music/adapter/DetailsListAdapter.kt b/app/src/main/java/melody/offline/music/adapter/DetailsListAdapter.kt similarity index 93% rename from app/src/main/java/relax/offline/music/adapter/DetailsListAdapter.kt rename to app/src/main/java/melody/offline/music/adapter/DetailsListAdapter.kt index 1579404..523ad07 100644 --- a/app/src/main/java/relax/offline/music/adapter/DetailsListAdapter.kt +++ b/app/src/main/java/melody/offline/music/adapter/DetailsListAdapter.kt @@ -1,4 +1,4 @@ -package relax.offline.music.adapter +package melody.offline.music.adapter import android.annotation.SuppressLint import android.content.Context @@ -8,11 +8,11 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -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 +import melody.offline.music.R +import melody.offline.music.activity.MoPlayDetailsActivity +import melody.offline.music.databinding.DetailsListItemBinding +import melody.offline.music.innertube.Innertube +import melody.offline.music.media.MediaControllerManager class DetailsListAdapter( private val context: Context, diff --git a/app/src/main/java/relax/offline/music/adapter/LikedSongsAdapter.kt b/app/src/main/java/melody/offline/music/adapter/LikedSongsAdapter.kt similarity index 91% rename from app/src/main/java/relax/offline/music/adapter/LikedSongsAdapter.kt rename to app/src/main/java/melody/offline/music/adapter/LikedSongsAdapter.kt index 419fcb5..55d47d0 100644 --- a/app/src/main/java/relax/offline/music/adapter/LikedSongsAdapter.kt +++ b/app/src/main/java/melody/offline/music/adapter/LikedSongsAdapter.kt @@ -1,4 +1,4 @@ -package relax.offline.music.adapter +package melody.offline.music.adapter import android.annotation.SuppressLint import android.content.Context @@ -8,12 +8,12 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import relax.offline.music.R -import relax.offline.music.activity.MoLikedSongsActivity -import relax.offline.music.activity.MoPlayDetailsActivity -import relax.offline.music.bean.FavoriteBean -import relax.offline.music.databinding.LikedListItemBinding -import relax.offline.music.media.MediaControllerManager +import melody.offline.music.R +import melody.offline.music.activity.MoLikedSongsActivity +import melody.offline.music.activity.MoPlayDetailsActivity +import melody.offline.music.bean.FavoriteBean +import melody.offline.music.databinding.LikedListItemBinding +import melody.offline.music.media.MediaControllerManager class LikedSongsAdapter( private val context: Context, diff --git a/app/src/main/java/relax/offline/music/adapter/OfflineSongsAdapter.kt b/app/src/main/java/melody/offline/music/adapter/OfflineSongsAdapter.kt similarity index 90% rename from app/src/main/java/relax/offline/music/adapter/OfflineSongsAdapter.kt rename to app/src/main/java/melody/offline/music/adapter/OfflineSongsAdapter.kt index d35dc56..7afa184 100644 --- a/app/src/main/java/relax/offline/music/adapter/OfflineSongsAdapter.kt +++ b/app/src/main/java/melody/offline/music/adapter/OfflineSongsAdapter.kt @@ -1,4 +1,4 @@ -package relax.offline.music.adapter +package melody.offline.music.adapter import android.annotation.SuppressLint import android.content.Context @@ -8,12 +8,12 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import relax.offline.music.R -import relax.offline.music.activity.MoOfflineSongsActivity -import relax.offline.music.activity.MoPlayDetailsActivity -import relax.offline.music.bean.OfflineBean -import relax.offline.music.databinding.OfflineListItemBinding -import relax.offline.music.media.MediaControllerManager +import melody.offline.music.R +import melody.offline.music.activity.MoOfflineSongsActivity +import melody.offline.music.activity.MoPlayDetailsActivity +import melody.offline.music.bean.OfflineBean +import melody.offline.music.databinding.OfflineListItemBinding +import melody.offline.music.media.MediaControllerManager class OfflineSongsAdapter( private val context: Context, diff --git a/app/src/main/java/relax/offline/music/adapter/ParentsVoiceAdapter.kt b/app/src/main/java/melody/offline/music/adapter/ParentsVoiceAdapter.kt similarity index 81% rename from app/src/main/java/relax/offline/music/adapter/ParentsVoiceAdapter.kt rename to app/src/main/java/melody/offline/music/adapter/ParentsVoiceAdapter.kt index 2d5a96c..d658e57 100644 --- a/app/src/main/java/relax/offline/music/adapter/ParentsVoiceAdapter.kt +++ b/app/src/main/java/melody/offline/music/adapter/ParentsVoiceAdapter.kt @@ -1,4 +1,4 @@ -package relax.offline.music.adapter +package melody.offline.music.adapter import android.content.Context import android.content.Intent @@ -6,13 +6,13 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -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 +import melody.offline.music.R +import melody.offline.music.activity.PlayDetailsActivity +import melody.offline.music.bean.Audio +import melody.offline.music.databinding.ParentsVoiceLayoutBinding +import melody.offline.music.util.containsContent +import melody.offline.music.util.convertMillisToMinutesAndSecondsString +import melody.offline.music.util.getAudioDurationFromAssets class ParentsVoiceAdapter( private val context: Context, @@ -52,8 +52,8 @@ class ParentsVoiceAdapter( desc.text = convertMillisToMinutesAndSecondsString(s) } - if (relax.offline.music.App.currentPlayingAudio != null) { - if (relax.offline.music.App.currentPlayingAudio?.file == audio.file) { + if (melody.offline.music.App.currentPlayingAudio != null) { + if (melody.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/relax/offline/music/adapter/PlayListAdapter.kt b/app/src/main/java/melody/offline/music/adapter/PlayListAdapter.kt similarity index 94% rename from app/src/main/java/relax/offline/music/adapter/PlayListAdapter.kt rename to app/src/main/java/melody/offline/music/adapter/PlayListAdapter.kt index cfb56ad..9795fa2 100644 --- a/app/src/main/java/relax/offline/music/adapter/PlayListAdapter.kt +++ b/app/src/main/java/melody/offline/music/adapter/PlayListAdapter.kt @@ -1,4 +1,4 @@ -package relax.offline.music.adapter +package melody.offline.music.adapter import android.annotation.SuppressLint import android.content.Context @@ -9,9 +9,9 @@ import androidx.media3.common.C import androidx.media3.common.MediaItem import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import relax.offline.music.R -import relax.offline.music.databinding.PlayListItemBinding -import relax.offline.music.media.MediaControllerManager +import melody.offline.music.R +import melody.offline.music.databinding.PlayListItemBinding +import melody.offline.music.media.MediaControllerManager class PlayListAdapter( private val context: Context, diff --git a/app/src/main/java/relax/offline/music/adapter/RealHumanVoiceAdapter.kt b/app/src/main/java/melody/offline/music/adapter/RealHumanVoiceAdapter.kt similarity index 79% rename from app/src/main/java/relax/offline/music/adapter/RealHumanVoiceAdapter.kt rename to app/src/main/java/melody/offline/music/adapter/RealHumanVoiceAdapter.kt index d46271c..70a2051 100644 --- a/app/src/main/java/relax/offline/music/adapter/RealHumanVoiceAdapter.kt +++ b/app/src/main/java/melody/offline/music/adapter/RealHumanVoiceAdapter.kt @@ -1,4 +1,4 @@ -package relax.offline.music.adapter +package melody.offline.music.adapter import android.content.Context import android.content.Intent @@ -6,13 +6,13 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -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.AnalysisUtil -import relax.offline.music.util.convertMillisToMinutesAndSecondsString -import relax.offline.music.util.getAudioDurationFromAssets +import melody.offline.music.R +import melody.offline.music.activity.PlayDetailsActivity +import melody.offline.music.bean.Audio +import melody.offline.music.databinding.RealHumanVoiceLayoutBinding +import melody.offline.music.util.AnalysisUtil +import melody.offline.music.util.convertMillisToMinutesAndSecondsString +import melody.offline.music.util.getAudioDurationFromAssets class RealHumanVoiceAdapter( private val context: Context, @@ -52,8 +52,8 @@ class RealHumanVoiceAdapter( val s = getAudioDurationFromAssets(context, audio.file) desc.text = convertMillisToMinutesAndSecondsString(s) - if (relax.offline.music.App.currentPlayingAudio != null) { - if (relax.offline.music.App.currentPlayingAudio?.file == audio.file) { + if (melody.offline.music.App.currentPlayingAudio != null) { + if (melody.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/relax/offline/music/adapter/ResponsiveListAdapter.kt b/app/src/main/java/melody/offline/music/adapter/ResponsiveListAdapter.kt similarity index 92% rename from app/src/main/java/relax/offline/music/adapter/ResponsiveListAdapter.kt rename to app/src/main/java/melody/offline/music/adapter/ResponsiveListAdapter.kt index 8fb63a7..fcacb50 100644 --- a/app/src/main/java/relax/offline/music/adapter/ResponsiveListAdapter.kt +++ b/app/src/main/java/melody/offline/music/adapter/ResponsiveListAdapter.kt @@ -1,4 +1,4 @@ -package relax.offline.music.adapter +package melody.offline.music.adapter import android.content.Context import android.content.Intent @@ -7,12 +7,12 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -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 -import relax.offline.music.util.AnalysisUtil +import melody.offline.music.R +import melody.offline.music.activity.MoPlayDetailsActivity +import melody.offline.music.databinding.MusicResponsiveItemBinding +import melody.offline.music.innertube.models.MusicCarouselShelfRenderer +import melody.offline.music.media.MediaControllerManager +import melody.offline.music.util.AnalysisUtil class ResponsiveListAdapter( private val context: Context, diff --git a/app/src/main/java/relax/offline/music/adapter/SearchHistoryAdapter.kt b/app/src/main/java/melody/offline/music/adapter/SearchHistoryAdapter.kt similarity index 93% rename from app/src/main/java/relax/offline/music/adapter/SearchHistoryAdapter.kt rename to app/src/main/java/melody/offline/music/adapter/SearchHistoryAdapter.kt index d8f3752..7132355 100644 --- a/app/src/main/java/relax/offline/music/adapter/SearchHistoryAdapter.kt +++ b/app/src/main/java/melody/offline/music/adapter/SearchHistoryAdapter.kt @@ -1,10 +1,10 @@ -package relax.offline.music.adapter +package melody.offline.music.adapter import android.content.Context import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import relax.offline.music.databinding.SearchHistoryAdapterItemBinding +import melody.offline.music.databinding.SearchHistoryAdapterItemBinding class SearchHistoryAdapter( private val context: Context, diff --git a/app/src/main/java/relax/offline/music/adapter/SearchResultOtherAdapter.kt b/app/src/main/java/melody/offline/music/adapter/SearchResultOtherAdapter.kt similarity index 89% rename from app/src/main/java/relax/offline/music/adapter/SearchResultOtherAdapter.kt rename to app/src/main/java/melody/offline/music/adapter/SearchResultOtherAdapter.kt index 2aa37b6..9e4f65a 100644 --- a/app/src/main/java/relax/offline/music/adapter/SearchResultOtherAdapter.kt +++ b/app/src/main/java/melody/offline/music/adapter/SearchResultOtherAdapter.kt @@ -1,4 +1,4 @@ -package relax.offline.music.adapter +package melody.offline.music.adapter import android.annotation.SuppressLint import android.content.Context @@ -7,12 +7,12 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -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 +import melody.offline.music.activity.MoListDetailsActivity +import melody.offline.music.activity.MoPlayDetailsActivity +import melody.offline.music.activity.MoSingerDetailsActivity +import melody.offline.music.databinding.SearchResultOtherItemBinding +import melody.offline.music.innertube.Innertube +import melody.offline.music.util.LogTag class SearchResultOtherAdapter( private val context: Context, diff --git a/app/src/main/java/relax/offline/music/adapter/SearchSuggestionsAdapter.kt b/app/src/main/java/melody/offline/music/adapter/SearchSuggestionsAdapter.kt similarity index 92% rename from app/src/main/java/relax/offline/music/adapter/SearchSuggestionsAdapter.kt rename to app/src/main/java/melody/offline/music/adapter/SearchSuggestionsAdapter.kt index d6ccbc1..5f229ba 100644 --- a/app/src/main/java/relax/offline/music/adapter/SearchSuggestionsAdapter.kt +++ b/app/src/main/java/melody/offline/music/adapter/SearchSuggestionsAdapter.kt @@ -1,10 +1,10 @@ -package relax.offline.music.adapter +package melody.offline.music.adapter import android.content.Context import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import relax.offline.music.databinding.SearchSuggestionsAdapterItemBinding +import melody.offline.music.databinding.SearchSuggestionsAdapterItemBinding class SearchSuggestionsAdapter( private val context: Context, diff --git a/app/src/main/java/relax/offline/music/adapter/SingerDetailsSongListAdapter.kt b/app/src/main/java/melody/offline/music/adapter/SingerDetailsSongListAdapter.kt similarity index 95% rename from app/src/main/java/relax/offline/music/adapter/SingerDetailsSongListAdapter.kt rename to app/src/main/java/melody/offline/music/adapter/SingerDetailsSongListAdapter.kt index 4ecbbf0..7c8988e 100644 --- a/app/src/main/java/relax/offline/music/adapter/SingerDetailsSongListAdapter.kt +++ b/app/src/main/java/melody/offline/music/adapter/SingerDetailsSongListAdapter.kt @@ -1,4 +1,4 @@ -package relax.offline.music.adapter +package melody.offline.music.adapter import android.annotation.SuppressLint import android.content.Context @@ -8,9 +8,9 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -import relax.offline.music.activity.MoPlayDetailsActivity -import relax.offline.music.databinding.DetailsListItemBinding -import relax.offline.music.innertube.models.MusicShelfRenderer +import melody.offline.music.activity.MoPlayDetailsActivity +import melody.offline.music.databinding.DetailsListItemBinding +import melody.offline.music.innertube.models.MusicShelfRenderer class SingerDetailsSongListAdapter( private val context: Context, diff --git a/app/src/main/java/relax/offline/music/adapter/SingerMoreSongAdapter.kt b/app/src/main/java/melody/offline/music/adapter/SingerMoreSongAdapter.kt similarity index 92% rename from app/src/main/java/relax/offline/music/adapter/SingerMoreSongAdapter.kt rename to app/src/main/java/melody/offline/music/adapter/SingerMoreSongAdapter.kt index 43618fe..fd1b4bf 100644 --- a/app/src/main/java/relax/offline/music/adapter/SingerMoreSongAdapter.kt +++ b/app/src/main/java/melody/offline/music/adapter/SingerMoreSongAdapter.kt @@ -1,4 +1,4 @@ -package relax.offline.music.adapter +package melody.offline.music.adapter import android.annotation.SuppressLint import android.content.Context @@ -7,11 +7,11 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -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 +import melody.offline.music.activity.MoListDetailsActivity +import melody.offline.music.activity.MoPlayDetailsActivity +import melody.offline.music.databinding.MusicTowRowItemBinding +import melody.offline.music.databinding.SearchResultOtherItemBinding +import melody.offline.music.innertube.Innertube class SingerMoreSongAdapter( private val context: Context, diff --git a/app/src/main/java/relax/offline/music/adapter/SoundsOfAppliancesAdapter.kt b/app/src/main/java/melody/offline/music/adapter/SoundsOfAppliancesAdapter.kt similarity index 81% rename from app/src/main/java/relax/offline/music/adapter/SoundsOfAppliancesAdapter.kt rename to app/src/main/java/melody/offline/music/adapter/SoundsOfAppliancesAdapter.kt index 365a78c..aa23f9a 100644 --- a/app/src/main/java/relax/offline/music/adapter/SoundsOfAppliancesAdapter.kt +++ b/app/src/main/java/melody/offline/music/adapter/SoundsOfAppliancesAdapter.kt @@ -1,4 +1,4 @@ -package relax.offline.music.adapter +package melody.offline.music.adapter import android.content.Context import android.content.Intent @@ -7,13 +7,13 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -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.AnalysisUtil -import relax.offline.music.util.convertMillisToMinutesAndSecondsString -import relax.offline.music.util.getAudioDurationFromAssets +import melody.offline.music.R +import melody.offline.music.activity.PlayDetailsActivity +import melody.offline.music.bean.Audio +import melody.offline.music.databinding.SoundsOfAppliancesLayoutBinding +import melody.offline.music.util.AnalysisUtil +import melody.offline.music.util.convertMillisToMinutesAndSecondsString +import melody.offline.music.util.getAudioDurationFromAssets class SoundsOfAppliancesAdapter( private val context: Context, @@ -54,8 +54,8 @@ class SoundsOfAppliancesAdapter( val s = getAudioDurationFromAssets(context, audio.file) desc.text = convertMillisToMinutesAndSecondsString(s) - if (relax.offline.music.App.currentPlayingAudio != null) { - if (relax.offline.music.App.currentPlayingAudio?.file == audio.file) { + if (melody.offline.music.App.currentPlayingAudio != null) { + if (melody.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/relax/offline/music/adapter/SoundsOfNatureAdapter.kt b/app/src/main/java/melody/offline/music/adapter/SoundsOfNatureAdapter.kt similarity index 81% rename from app/src/main/java/relax/offline/music/adapter/SoundsOfNatureAdapter.kt rename to app/src/main/java/melody/offline/music/adapter/SoundsOfNatureAdapter.kt index a72dde6..05b582d 100644 --- a/app/src/main/java/relax/offline/music/adapter/SoundsOfNatureAdapter.kt +++ b/app/src/main/java/melody/offline/music/adapter/SoundsOfNatureAdapter.kt @@ -1,4 +1,4 @@ -package relax.offline.music.adapter +package melody.offline.music.adapter import android.content.Context import android.content.Intent @@ -7,13 +7,13 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -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.AnalysisUtil -import relax.offline.music.util.convertMillisToMinutesAndSecondsString -import relax.offline.music.util.getAudioDurationFromAssets +import melody.offline.music.R +import melody.offline.music.activity.PlayDetailsActivity +import melody.offline.music.bean.Audio +import melody.offline.music.databinding.SoundsOfNatureLayoutBinding +import melody.offline.music.util.AnalysisUtil +import melody.offline.music.util.convertMillisToMinutesAndSecondsString +import melody.offline.music.util.getAudioDurationFromAssets class SoundsOfNatureAdapter( private val context: Context, @@ -54,8 +54,8 @@ class SoundsOfNatureAdapter( val s = getAudioDurationFromAssets(context, audio.file) desc.text = convertMillisToMinutesAndSecondsString(s) - if (relax.offline.music.App.currentPlayingAudio != null) { - if (relax.offline.music.App.currentPlayingAudio?.file == audio.file) { + if (melody.offline.music.App.currentPlayingAudio != null) { + if (melody.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/relax/offline/music/adapter/TowRowListAdapter.kt b/app/src/main/java/melody/offline/music/adapter/TowRowListAdapter.kt similarity index 92% rename from app/src/main/java/relax/offline/music/adapter/TowRowListAdapter.kt rename to app/src/main/java/melody/offline/music/adapter/TowRowListAdapter.kt index c939b92..3d167ce 100644 --- a/app/src/main/java/relax/offline/music/adapter/TowRowListAdapter.kt +++ b/app/src/main/java/melody/offline/music/adapter/TowRowListAdapter.kt @@ -1,4 +1,4 @@ -package relax.offline.music.adapter +package melody.offline.music.adapter import android.app.Activity import android.content.Intent @@ -6,12 +6,12 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide -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 -import relax.offline.music.util.AnalysisUtil +import melody.offline.music.activity.MoListDetailsActivity +import melody.offline.music.activity.MoPlayDetailsActivity +import melody.offline.music.activity.MoSingerDetailsActivity +import melody.offline.music.databinding.MusicTowRowItemBinding +import melody.offline.music.innertube.models.MusicCarouselShelfRenderer +import melody.offline.music.util.AnalysisUtil class TowRowListAdapter( private val context: Activity, diff --git a/app/src/main/java/relax/offline/music/bean/Audio.kt b/app/src/main/java/melody/offline/music/bean/Audio.kt similarity index 93% rename from app/src/main/java/relax/offline/music/bean/Audio.kt rename to app/src/main/java/melody/offline/music/bean/Audio.kt index 27ae89b..e0c004f 100644 --- a/app/src/main/java/relax/offline/music/bean/Audio.kt +++ b/app/src/main/java/melody/offline/music/bean/Audio.kt @@ -1,4 +1,4 @@ -package relax.offline.music.bean +package melody.offline.music.bean import androidx.annotation.Keep import androidx.room.ColumnInfo diff --git a/app/src/main/java/relax/offline/music/bean/Category.kt b/app/src/main/java/melody/offline/music/bean/Category.kt similarity index 77% rename from app/src/main/java/relax/offline/music/bean/Category.kt rename to app/src/main/java/melody/offline/music/bean/Category.kt index c6d3c17..bd89a6a 100644 --- a/app/src/main/java/relax/offline/music/bean/Category.kt +++ b/app/src/main/java/melody/offline/music/bean/Category.kt @@ -1,4 +1,4 @@ -package relax.offline.music.bean +package melody.offline.music.bean import java.io.Serializable diff --git a/app/src/main/java/relax/offline/music/bean/CurrentPlayingAudio.kt b/app/src/main/java/melody/offline/music/bean/CurrentPlayingAudio.kt similarity index 93% rename from app/src/main/java/relax/offline/music/bean/CurrentPlayingAudio.kt rename to app/src/main/java/melody/offline/music/bean/CurrentPlayingAudio.kt index fda5dd1..899bc14 100644 --- a/app/src/main/java/relax/offline/music/bean/CurrentPlayingAudio.kt +++ b/app/src/main/java/melody/offline/music/bean/CurrentPlayingAudio.kt @@ -1,4 +1,4 @@ -package relax.offline.music.bean +package melody.offline.music.bean import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/relax/offline/music/bean/FavoriteBean.kt b/app/src/main/java/melody/offline/music/bean/FavoriteBean.kt similarity index 94% rename from app/src/main/java/relax/offline/music/bean/FavoriteBean.kt rename to app/src/main/java/melody/offline/music/bean/FavoriteBean.kt index d0b5e1a..2ae50b9 100644 --- a/app/src/main/java/relax/offline/music/bean/FavoriteBean.kt +++ b/app/src/main/java/melody/offline/music/bean/FavoriteBean.kt @@ -1,4 +1,4 @@ -package relax.offline.music.bean +package melody.offline.music.bean import androidx.annotation.Keep import androidx.room.ColumnInfo diff --git a/app/src/main/java/relax/offline/music/bean/OfflineBean.kt b/app/src/main/java/melody/offline/music/bean/OfflineBean.kt similarity index 95% rename from app/src/main/java/relax/offline/music/bean/OfflineBean.kt rename to app/src/main/java/melody/offline/music/bean/OfflineBean.kt index 48b59a4..2088b03 100644 --- a/app/src/main/java/relax/offline/music/bean/OfflineBean.kt +++ b/app/src/main/java/melody/offline/music/bean/OfflineBean.kt @@ -1,4 +1,4 @@ -package relax.offline.music.bean +package melody.offline.music.bean import androidx.annotation.Keep import androidx.room.ColumnInfo diff --git a/app/src/main/java/relax/offline/music/bean/ResourcesList.kt b/app/src/main/java/melody/offline/music/bean/ResourcesList.kt similarity index 75% rename from app/src/main/java/relax/offline/music/bean/ResourcesList.kt rename to app/src/main/java/melody/offline/music/bean/ResourcesList.kt index e6114ff..c09a3f4 100644 --- a/app/src/main/java/relax/offline/music/bean/ResourcesList.kt +++ b/app/src/main/java/melody/offline/music/bean/ResourcesList.kt @@ -1,4 +1,4 @@ -package relax.offline.music.bean +package melody.offline.music.bean import java.io.Serializable diff --git a/app/src/main/java/relax/offline/music/database/AppDatabase.kt b/app/src/main/java/melody/offline/music/database/AppDatabase.kt similarity index 75% rename from app/src/main/java/relax/offline/music/database/AppDatabase.kt rename to app/src/main/java/melody/offline/music/database/AppDatabase.kt index 004f3e2..e3a09f3 100644 --- a/app/src/main/java/relax/offline/music/database/AppDatabase.kt +++ b/app/src/main/java/melody/offline/music/database/AppDatabase.kt @@ -1,9 +1,9 @@ -package relax.offline.music.database +package melody.offline.music.database import androidx.room.Database import androidx.room.RoomDatabase -import relax.offline.music.bean.Audio +import melody.offline.music.bean.Audio @Database(entities = [Audio::class], version = 1, exportSchema = false) abstract class AppDatabase : RoomDatabase() { diff --git a/app/src/main/java/relax/offline/music/database/AppFavoriteDBManager.kt b/app/src/main/java/melody/offline/music/database/AppFavoriteDBManager.kt similarity index 94% rename from app/src/main/java/relax/offline/music/database/AppFavoriteDBManager.kt rename to app/src/main/java/melody/offline/music/database/AppFavoriteDBManager.kt index 83985f9..5be2dee 100644 --- a/app/src/main/java/relax/offline/music/database/AppFavoriteDBManager.kt +++ b/app/src/main/java/melody/offline/music/database/AppFavoriteDBManager.kt @@ -1,11 +1,10 @@ -package relax.offline.music.database +package melody.offline.music.database import android.content.Context import androidx.room.Room import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import relax.offline.music.bean.FavoriteBean -import relax.offline.music.util.LogTag +import melody.offline.music.bean.FavoriteBean class AppFavoriteDBManager private constructor(context: Context) { diff --git a/app/src/main/java/relax/offline/music/database/AppFavoriteDatabase.kt b/app/src/main/java/melody/offline/music/database/AppFavoriteDatabase.kt similarity index 74% rename from app/src/main/java/relax/offline/music/database/AppFavoriteDatabase.kt rename to app/src/main/java/melody/offline/music/database/AppFavoriteDatabase.kt index 7627fe4..08a8721 100644 --- a/app/src/main/java/relax/offline/music/database/AppFavoriteDatabase.kt +++ b/app/src/main/java/melody/offline/music/database/AppFavoriteDatabase.kt @@ -1,8 +1,8 @@ -package relax.offline.music.database +package melody.offline.music.database import androidx.room.Database import androidx.room.RoomDatabase -import relax.offline.music.bean.FavoriteBean +import melody.offline.music.bean.FavoriteBean @Database(entities = [FavoriteBean::class], version = 1, exportSchema = false) abstract class AppFavoriteDatabase : RoomDatabase() { diff --git a/app/src/main/java/relax/offline/music/database/AppOfflineDBManager.kt b/app/src/main/java/melody/offline/music/database/AppOfflineDBManager.kt similarity index 94% rename from app/src/main/java/relax/offline/music/database/AppOfflineDBManager.kt rename to app/src/main/java/melody/offline/music/database/AppOfflineDBManager.kt index 00d571a..978906c 100644 --- a/app/src/main/java/relax/offline/music/database/AppOfflineDBManager.kt +++ b/app/src/main/java/melody/offline/music/database/AppOfflineDBManager.kt @@ -1,9 +1,8 @@ -package relax.offline.music.database +package melody.offline.music.database import android.content.Context import androidx.room.Room -import relax.offline.music.bean.OfflineBean -import relax.offline.music.util.LogTag +import melody.offline.music.bean.OfflineBean import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/java/relax/offline/music/database/AppOfflineDatabase.kt b/app/src/main/java/melody/offline/music/database/AppOfflineDatabase.kt similarity index 74% rename from app/src/main/java/relax/offline/music/database/AppOfflineDatabase.kt rename to app/src/main/java/melody/offline/music/database/AppOfflineDatabase.kt index 2ea9029..c795982 100644 --- a/app/src/main/java/relax/offline/music/database/AppOfflineDatabase.kt +++ b/app/src/main/java/melody/offline/music/database/AppOfflineDatabase.kt @@ -1,9 +1,9 @@ -package relax.offline.music.database +package melody.offline.music.database import androidx.room.Database import androidx.room.RoomDatabase -import relax.offline.music.bean.OfflineBean +import melody.offline.music.bean.OfflineBean @Database(entities = [OfflineBean::class], version = 1, exportSchema = false) abstract class AppOfflineDatabase : RoomDatabase() { diff --git a/app/src/main/java/relax/offline/music/database/CurrentAudioDatabase.kt b/app/src/main/java/melody/offline/music/database/CurrentAudioDatabase.kt similarity index 75% rename from app/src/main/java/relax/offline/music/database/CurrentAudioDatabase.kt rename to app/src/main/java/melody/offline/music/database/CurrentAudioDatabase.kt index 29f10c7..1f7c793 100644 --- a/app/src/main/java/relax/offline/music/database/CurrentAudioDatabase.kt +++ b/app/src/main/java/melody/offline/music/database/CurrentAudioDatabase.kt @@ -1,9 +1,9 @@ -package relax.offline.music.database +package melody.offline.music.database import androidx.room.Database import androidx.room.RoomDatabase -import relax.offline.music.bean.CurrentPlayingAudio +import melody.offline.music.bean.CurrentPlayingAudio @Database(entities = [CurrentPlayingAudio::class], version = 1, exportSchema = false) abstract class CurrentAudioDatabase : RoomDatabase() { diff --git a/app/src/main/java/relax/offline/music/database/CurrentAudioManager.kt b/app/src/main/java/melody/offline/music/database/CurrentAudioManager.kt similarity index 93% rename from app/src/main/java/relax/offline/music/database/CurrentAudioManager.kt rename to app/src/main/java/melody/offline/music/database/CurrentAudioManager.kt index a47f5cf..2052a6a 100644 --- a/app/src/main/java/relax/offline/music/database/CurrentAudioManager.kt +++ b/app/src/main/java/melody/offline/music/database/CurrentAudioManager.kt @@ -1,8 +1,8 @@ -package relax.offline.music.database +package melody.offline.music.database import android.content.Context import androidx.room.Room -import relax.offline.music.bean.CurrentPlayingAudio +import melody.offline.music.bean.CurrentPlayingAudio class CurrentAudioManager private constructor(context: Context) { private val database: CurrentAudioDatabase = Room.databaseBuilder( diff --git a/app/src/main/java/relax/offline/music/database/CurrentPlayingAudioDao.kt b/app/src/main/java/melody/offline/music/database/CurrentPlayingAudioDao.kt similarity index 87% rename from app/src/main/java/relax/offline/music/database/CurrentPlayingAudioDao.kt rename to app/src/main/java/melody/offline/music/database/CurrentPlayingAudioDao.kt index dbf6ee7..3608416 100644 --- a/app/src/main/java/relax/offline/music/database/CurrentPlayingAudioDao.kt +++ b/app/src/main/java/melody/offline/music/database/CurrentPlayingAudioDao.kt @@ -1,4 +1,4 @@ -package relax.offline.music.database +package melody.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 relax.offline.music.bean.CurrentPlayingAudio +import melody.offline.music.bean.CurrentPlayingAudio @Dao interface CurrentPlayingAudioDao { diff --git a/app/src/main/java/relax/offline/music/database/DatabaseManager.kt b/app/src/main/java/melody/offline/music/database/DatabaseManager.kt similarity index 96% rename from app/src/main/java/relax/offline/music/database/DatabaseManager.kt rename to app/src/main/java/melody/offline/music/database/DatabaseManager.kt index 134c040..b40bd81 100644 --- a/app/src/main/java/relax/offline/music/database/DatabaseManager.kt +++ b/app/src/main/java/melody/offline/music/database/DatabaseManager.kt @@ -1,8 +1,8 @@ -package relax.offline.music.database +package melody.offline.music.database import android.content.Context import androidx.room.Room -import relax.offline.music.bean.Audio +import melody.offline.music.bean.Audio import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/java/relax/offline/music/database/FavoriteDao.kt b/app/src/main/java/melody/offline/music/database/FavoriteDao.kt similarity index 89% rename from app/src/main/java/relax/offline/music/database/FavoriteDao.kt rename to app/src/main/java/melody/offline/music/database/FavoriteDao.kt index e6e7701..22c7cc2 100644 --- a/app/src/main/java/relax/offline/music/database/FavoriteDao.kt +++ b/app/src/main/java/melody/offline/music/database/FavoriteDao.kt @@ -1,7 +1,7 @@ -package relax.offline.music.database +package melody.offline.music.database import androidx.room.* -import relax.offline.music.bean.FavoriteBean +import melody.offline.music.bean.FavoriteBean @Dao interface FavoriteDao { diff --git a/app/src/main/java/relax/offline/music/database/LocalAudioDao.kt b/app/src/main/java/melody/offline/music/database/LocalAudioDao.kt similarity index 90% rename from app/src/main/java/relax/offline/music/database/LocalAudioDao.kt rename to app/src/main/java/melody/offline/music/database/LocalAudioDao.kt index de08264..cbca8c8 100644 --- a/app/src/main/java/relax/offline/music/database/LocalAudioDao.kt +++ b/app/src/main/java/melody/offline/music/database/LocalAudioDao.kt @@ -1,9 +1,9 @@ -package relax.offline.music.database +package melody.offline.music.database import androidx.room.* -import relax.offline.music.bean.Audio +import melody.offline.music.bean.Audio @Dao interface LocalAudioDao { diff --git a/app/src/main/java/relax/offline/music/database/OfflineDao.kt b/app/src/main/java/melody/offline/music/database/OfflineDao.kt similarity index 90% rename from app/src/main/java/relax/offline/music/database/OfflineDao.kt rename to app/src/main/java/melody/offline/music/database/OfflineDao.kt index 444d98a..5dc931f 100644 --- a/app/src/main/java/relax/offline/music/database/OfflineDao.kt +++ b/app/src/main/java/melody/offline/music/database/OfflineDao.kt @@ -1,7 +1,7 @@ -package relax.offline.music.database +package melody.offline.music.database import androidx.room.* -import relax.offline.music.bean.OfflineBean +import melody.offline.music.bean.OfflineBean @Dao interface OfflineDao { diff --git a/app/src/main/java/relax/offline/music/firebase/Constants.kt b/app/src/main/java/melody/offline/music/firebase/Constants.kt similarity index 75% rename from app/src/main/java/relax/offline/music/firebase/Constants.kt rename to app/src/main/java/melody/offline/music/firebase/Constants.kt index 7776231..62756d6 100644 --- a/app/src/main/java/relax/offline/music/firebase/Constants.kt +++ b/app/src/main/java/melody/offline/music/firebase/Constants.kt @@ -1,11 +1,11 @@ -package relax.offline.music.firebase +package melody.offline.music.firebase object Constants { const val KEY_SHOULD_ENTER_MUSIC_JSON = "key_should_enter_music_json" const val DEFAULT_SHOULD_ENTER_MUSIC_JSON = """ { - "versionCode": 4, + "versionCode": 1, "enter": false } """ diff --git a/app/src/main/java/relax/offline/music/firebase/RemoteConfig.kt b/app/src/main/java/melody/offline/music/firebase/RemoteConfig.kt similarity index 96% rename from app/src/main/java/relax/offline/music/firebase/RemoteConfig.kt rename to app/src/main/java/melody/offline/music/firebase/RemoteConfig.kt index 256a1cf..1a5ba5c 100644 --- a/app/src/main/java/relax/offline/music/firebase/RemoteConfig.kt +++ b/app/src/main/java/melody/offline/music/firebase/RemoteConfig.kt @@ -1,4 +1,4 @@ -package relax.offline.music.firebase +package melody.offline.music.firebase import android.annotation.SuppressLint import android.app.Application @@ -12,10 +12,10 @@ import com.google.firebase.remoteconfig.FirebaseRemoteConfig import com.google.firebase.remoteconfig.FirebaseRemoteConfigException import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings import com.google.firebase.remoteconfig.FirebaseRemoteConfigValue -import relax.offline.music.App -import relax.offline.music.BuildConfig -import relax.offline.music.sp.AppStore -import relax.offline.music.util.LogTag +import melody.offline.music.App +import melody.offline.music.BuildConfig +import melody.offline.music.sp.AppStore +import melody.offline.music.util.LogTag import java.lang.ref.WeakReference class RemoteConfig { diff --git a/app/src/main/java/relax/offline/music/fragment/HomeFragment.kt b/app/src/main/java/melody/offline/music/fragment/HomeFragment.kt similarity index 62% rename from app/src/main/java/relax/offline/music/fragment/HomeFragment.kt rename to app/src/main/java/melody/offline/music/fragment/HomeFragment.kt index 7084c5f..62b25e4 100644 --- a/app/src/main/java/relax/offline/music/fragment/HomeFragment.kt +++ b/app/src/main/java/melody/offline/music/fragment/HomeFragment.kt @@ -1,4 +1,4 @@ -package relax.offline.music.fragment +package melody.offline.music.fragment import android.annotation.SuppressLint import android.os.Bundle @@ -9,12 +9,12 @@ import androidx.fragment.app.Fragment import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import com.gyf.immersionbar.ktx.immersionBar -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.AnalysisUtil -import relax.offline.music.util.GridSpacingItemDecoration +import melody.offline.music.adapter.RealHumanVoiceAdapter +import melody.offline.music.adapter.SoundsOfAppliancesAdapter +import melody.offline.music.adapter.SoundsOfNatureAdapter +import melody.offline.music.databinding.FragmentHomeBinding +import melody.offline.music.util.AnalysisUtil +import melody.offline.music.util.GridSpacingItemDecoration class HomeFragment : Fragment() { private lateinit var binding: FragmentHomeBinding @@ -43,28 +43,28 @@ class HomeFragment : Fragment() { } private fun initView() { - 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 (melody.offline.music.App.resourcesList.categories.isNotEmpty()) { + binding.soundsName.text = melody.offline.music.App.resourcesList.categories[1].name + binding.natureName.text = melody.offline.music.App.resourcesList.categories[2].name } - if (relax.offline.music.App.realHumanVoiceList.isNotEmpty()) { - realHumanVoiceAdapter = RealHumanVoiceAdapter(requireActivity(), relax.offline.music.App.realHumanVoiceList) + if (melody.offline.music.App.realHumanVoiceList.isNotEmpty()) { + realHumanVoiceAdapter = RealHumanVoiceAdapter(requireActivity(), melody.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 (relax.offline.music.App.soundsOfAppliancesList.isNotEmpty()) { + if (melody.offline.music.App.soundsOfAppliancesList.isNotEmpty()) { soundsOfAppliancesAdapter = - SoundsOfAppliancesAdapter(requireActivity(), relax.offline.music.App.soundsOfAppliancesList) + SoundsOfAppliancesAdapter(requireActivity(), melody.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 (relax.offline.music.App.soundsOfNatureList.isNotEmpty()) { + if (melody.offline.music.App.soundsOfNatureList.isNotEmpty()) { soundsOfNatureAdapter = - SoundsOfNatureAdapter(requireActivity(), relax.offline.music.App.soundsOfNatureList) + SoundsOfNatureAdapter(requireActivity(), melody.offline.music.App.soundsOfNatureList) binding.natureRv.layoutManager = LinearLayoutManager(requireActivity(), LinearLayoutManager.VERTICAL, false) binding.natureRv.adapter = soundsOfNatureAdapter @@ -74,26 +74,26 @@ class HomeFragment : Fragment() { @SuppressLint("NotifyDataSetChanged") override fun onResume() { super.onResume() - 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) { + if (melody.offline.music.App.currentPlayingAudio != null) { + if (melody.offline.music.App.realHumanVoiceList.isNotEmpty()) { + for ((index, audio) in melody.offline.music.App.realHumanVoiceList.withIndex()) { + if (audio.file == melody.offline.music.App.currentPlayingAudio?.file) { notifyDataSetChanged() break } } } - 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) { + if (melody.offline.music.App.soundsOfAppliancesList.isNotEmpty()) { + for ((index, audio) in melody.offline.music.App.soundsOfAppliancesList.withIndex()) { + if (audio.file == melody.offline.music.App.currentPlayingAudio?.file) { notifyDataSetChanged() break } } } - 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) { + if (melody.offline.music.App.soundsOfNatureList.isNotEmpty()) { + for ((index, audio) in melody.offline.music.App.soundsOfNatureList.withIndex()) { + if (audio.file == melody.offline.music.App.currentPlayingAudio?.file) { notifyDataSetChanged() break } diff --git a/app/src/main/java/relax/offline/music/fragment/ImportFragment.kt b/app/src/main/java/melody/offline/music/fragment/ImportFragment.kt similarity index 91% rename from app/src/main/java/relax/offline/music/fragment/ImportFragment.kt rename to app/src/main/java/melody/offline/music/fragment/ImportFragment.kt index aeded3a..8eac746 100644 --- a/app/src/main/java/relax/offline/music/fragment/ImportFragment.kt +++ b/app/src/main/java/melody/offline/music/fragment/ImportFragment.kt @@ -1,4 +1,4 @@ -package relax.offline.music.fragment +package melody.offline.music.fragment import android.Manifest import android.annotation.SuppressLint @@ -21,11 +21,11 @@ import androidx.core.content.ContextCompat import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager import com.gyf.immersionbar.ktx.immersionBar -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 melody.offline.music.R +import melody.offline.music.activity.SettingsActivity +import melody.offline.music.adapter.ParentsVoiceAdapter +import melody.offline.music.bean.Audio +import melody.offline.music.databinding.FragmentImportBinding import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -59,7 +59,7 @@ class ImportFragment : Fragment() { checkAndRequestPermissions() } importAdapterList.clear() - importAdapterList.addAll(relax.offline.music.App.importList) + importAdapterList.addAll(melody.offline.music.App.importList) parentsVoiceAdapter = ParentsVoiceAdapter(requireActivity(), importAdapterList) binding.importRv.layoutManager = LinearLayoutManager(requireActivity(), LinearLayoutManager.VERTICAL, false) @@ -105,12 +105,12 @@ class ImportFragment : Fragment() { binding.noContentLayout.visibility = View.VISIBLE } - if (relax.offline.music.App.currentPlayingAudio != null) { - if (relax.offline.music.App.importList.isNotEmpty()) { + if (melody.offline.music.App.currentPlayingAudio != null) { + if (melody.offline.music.App.importList.isNotEmpty()) { importAdapterList.clear() - importAdapterList.addAll(relax.offline.music.App.importList) + importAdapterList.addAll(melody.offline.music.App.importList) for ((index, audio) in importAdapterList.withIndex()) { - if (audio.file == relax.offline.music.App.currentPlayingAudio?.file) { + if (audio.file == melody.offline.music.App.currentPlayingAudio?.file) { parentsVoiceAdapter?.notifyDataSetChanged() break } @@ -192,12 +192,12 @@ class ImportFragment : Fragment() { CoroutineScope(Dispatchers.IO).launch { if (audio.duration > 0) { - relax.offline.music.App.databaseManager.insertAudioFile(audio) + melody.offline.music.App.databaseManager.insertAudioFile(audio) } withContext(Dispatchers.Main) { - relax.offline.music.App.initImportAudio { + melody.offline.music.App.initImportAudio { importAdapterList.clear() - importAdapterList.addAll(relax.offline.music.App.importList) + importAdapterList.addAll(melody.offline.music.App.importList) parentsVoiceAdapter?.notifyDataSetChanged() if (importAdapterList.isNotEmpty()) { binding.noContentLayout.visibility = View.GONE diff --git a/app/src/main/java/relax/offline/music/fragment/MoBaseFragment.kt b/app/src/main/java/melody/offline/music/fragment/MoBaseFragment.kt similarity index 93% rename from app/src/main/java/relax/offline/music/fragment/MoBaseFragment.kt rename to app/src/main/java/melody/offline/music/fragment/MoBaseFragment.kt index 6d65f43..5011e6b 100644 --- a/app/src/main/java/relax/offline/music/fragment/MoBaseFragment.kt +++ b/app/src/main/java/melody/offline/music/fragment/MoBaseFragment.kt @@ -1,4 +1,4 @@ -package relax.offline.music.fragment +package melody.offline.music.fragment import android.os.Bundle import android.view.LayoutInflater @@ -8,8 +8,8 @@ import androidx.annotation.OptIn import androidx.fragment.app.Fragment import androidx.media3.common.util.UnstableApi import androidx.viewbinding.ViewBinding -import relax.offline.music.sp.AppStore -import relax.offline.music.util.LogTag +import melody.offline.music.sp.AppStore +import melody.offline.music.util.LogTag import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.MainScope import kotlinx.coroutines.cancel diff --git a/app/src/main/java/relax/offline/music/fragment/MoHomeFragment.kt b/app/src/main/java/melody/offline/music/fragment/MoHomeFragment.kt similarity index 91% rename from app/src/main/java/relax/offline/music/fragment/MoHomeFragment.kt rename to app/src/main/java/melody/offline/music/fragment/MoHomeFragment.kt index 6f3fbea..7e42841 100644 --- a/app/src/main/java/relax/offline/music/fragment/MoHomeFragment.kt +++ b/app/src/main/java/melody/offline/music/fragment/MoHomeFragment.kt @@ -1,21 +1,21 @@ -package relax.offline.music.fragment +package melody.offline.music.fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import com.gyf.immersionbar.ktx.immersionBar -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 melody.offline.music.databinding.FragmentMoHomeBinding +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.MusicCarouselShelfRenderer +import melody.offline.music.innertube.requests.homePage +import melody.offline.music.innertube.requests.homePageMore +import melody.offline.music.util.LogTag.LogD +import melody.offline.music.view.MusicResponsiveListView +import melody.offline.music.view.MusicTowRowListView import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.isActive import kotlinx.coroutines.selects.select -import relax.offline.music.util.AnalysisUtil +import melody.offline.music.util.AnalysisUtil class MoHomeFragment : MoBaseFragment() { diff --git a/app/src/main/java/relax/offline/music/fragment/MoMeFragment.kt b/app/src/main/java/melody/offline/music/fragment/MoMeFragment.kt similarity index 90% rename from app/src/main/java/relax/offline/music/fragment/MoMeFragment.kt rename to app/src/main/java/melody/offline/music/fragment/MoMeFragment.kt index 7e66452..2d320e8 100644 --- a/app/src/main/java/relax/offline/music/fragment/MoMeFragment.kt +++ b/app/src/main/java/melody/offline/music/fragment/MoMeFragment.kt @@ -1,4 +1,4 @@ -package relax.offline.music.fragment +package melody.offline.music.fragment import android.content.Intent import android.view.LayoutInflater @@ -8,13 +8,13 @@ import com.gyf.immersionbar.ktx.immersionBar import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.isActive import kotlinx.coroutines.selects.select -import relax.offline.music.App -import relax.offline.music.R -import relax.offline.music.activity.MoLikedSongsActivity -import relax.offline.music.activity.MoOfflineSongsActivity -import relax.offline.music.activity.SettingsActivity -import relax.offline.music.databinding.FragmentMoMeBinding -import relax.offline.music.util.AnalysisUtil +import melody.offline.music.App +import melody.offline.music.R +import melody.offline.music.activity.MoLikedSongsActivity +import melody.offline.music.activity.MoOfflineSongsActivity +import melody.offline.music.activity.SettingsActivity +import melody.offline.music.databinding.FragmentMoMeBinding +import melody.offline.music.util.AnalysisUtil class MoMeFragment : MoBaseFragment() { diff --git a/app/src/main/java/relax/offline/music/fragment/SearchFragment.kt b/app/src/main/java/melody/offline/music/fragment/SearchFragment.kt similarity index 95% rename from app/src/main/java/relax/offline/music/fragment/SearchFragment.kt rename to app/src/main/java/melody/offline/music/fragment/SearchFragment.kt index 228e268..bfab49a 100644 --- a/app/src/main/java/relax/offline/music/fragment/SearchFragment.kt +++ b/app/src/main/java/melody/offline/music/fragment/SearchFragment.kt @@ -1,4 +1,4 @@ -package relax.offline.music.fragment +package melody.offline.music.fragment import android.annotation.SuppressLint import android.content.Context @@ -20,22 +20,22 @@ 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 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 melody.offline.music.adapter.SearchHistoryAdapter +import melody.offline.music.adapter.SearchSuggestionsAdapter +import melody.offline.music.databinding.FragmentSearchBinding +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.bodies.SearchBody +import melody.offline.music.innertube.models.bodies.SearchSuggestionsBody +import melody.offline.music.innertube.requests.moSearchPage +import melody.offline.music.innertube.requests.searchSuggestions +import melody.offline.music.util.LogTag +import melody.offline.music.view.SearchResultOptimalView +import melody.offline.music.view.SearchResultOtherView import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.isActive import kotlinx.coroutines.selects.select import org.json.JSONObject -import relax.offline.music.util.AnalysisUtil +import melody.offline.music.util.AnalysisUtil class SearchFragment : MoBaseFragment(), TextWatcher, View.OnFocusChangeListener, SearchSuggestionsAdapter.OnItemClickListener, diff --git a/app/src/main/java/relax/offline/music/http/AppUtil.kt b/app/src/main/java/melody/offline/music/http/AppUtil.kt similarity index 98% rename from app/src/main/java/relax/offline/music/http/AppUtil.kt rename to app/src/main/java/melody/offline/music/http/AppUtil.kt index 922e7a2..3cedc3c 100644 --- a/app/src/main/java/relax/offline/music/http/AppUtil.kt +++ b/app/src/main/java/melody/offline/music/http/AppUtil.kt @@ -1,4 +1,4 @@ -package relax.offline.music.http +package melody.offline.music.http import android.content.Context import android.content.pm.PackageInfo @@ -7,8 +7,8 @@ import android.media.MediaDrm import android.os.Build import android.telephony.TelephonyManager import android.text.TextUtils -import relax.offline.music.App -import relax.offline.music.sp.AppStore +import melody.offline.music.App +import melody.offline.music.sp.AppStore import java.security.MessageDigest import java.security.NoSuchAlgorithmException import java.util.UUID diff --git a/app/src/main/java/relax/offline/music/http/BaseApiUtil.kt b/app/src/main/java/melody/offline/music/http/BaseApiUtil.kt similarity index 96% rename from app/src/main/java/relax/offline/music/http/BaseApiUtil.kt rename to app/src/main/java/melody/offline/music/http/BaseApiUtil.kt index dab962c..68d5ada 100644 --- a/app/src/main/java/relax/offline/music/http/BaseApiUtil.kt +++ b/app/src/main/java/melody/offline/music/http/BaseApiUtil.kt @@ -1,11 +1,11 @@ -package relax.offline.music.http +package melody.offline.music.http import android.content.Context import com.google.gson.Gson import org.json.JSONException import org.json.JSONObject -import relax.offline.music.App -import relax.offline.music.util.AesEncryptUtil +import melody.offline.music.App +import melody.offline.music.util.AesEncryptUtil import java.util.Locale import java.util.UUID diff --git a/app/src/main/java/relax/offline/music/http/CommonIpInfoUtil.kt b/app/src/main/java/melody/offline/music/http/CommonIpInfoUtil.kt similarity index 91% rename from app/src/main/java/relax/offline/music/http/CommonIpInfoUtil.kt rename to app/src/main/java/melody/offline/music/http/CommonIpInfoUtil.kt index 190fbf4..de50cfd 100644 --- a/app/src/main/java/relax/offline/music/http/CommonIpInfoUtil.kt +++ b/app/src/main/java/melody/offline/music/http/CommonIpInfoUtil.kt @@ -1,13 +1,13 @@ -package relax.offline.music.http +package melody.offline.music.http import okhttp3.Call import okhttp3.Callback import okhttp3.Response import org.json.JSONObject -import relax.offline.music.App -import relax.offline.music.sp.AppStore -import relax.offline.music.util.AesEncryptUtil -import relax.offline.music.util.LogTag +import melody.offline.music.App +import melody.offline.music.sp.AppStore +import melody.offline.music.util.AesEncryptUtil +import melody.offline.music.util.LogTag import java.io.IOException class CommonIpInfoUtil { diff --git a/app/src/main/java/relax/offline/music/http/MyCallback.kt b/app/src/main/java/melody/offline/music/http/MyCallback.kt similarity index 81% rename from app/src/main/java/relax/offline/music/http/MyCallback.kt rename to app/src/main/java/melody/offline/music/http/MyCallback.kt index 86e3835..4df8607 100644 --- a/app/src/main/java/relax/offline/music/http/MyCallback.kt +++ b/app/src/main/java/melody/offline/music/http/MyCallback.kt @@ -1,4 +1,4 @@ -package relax.offline.music.http +package melody.offline.music.http import java.io.IOException diff --git a/app/src/main/java/relax/offline/music/http/MyHttpUtil.kt b/app/src/main/java/melody/offline/music/http/MyHttpUtil.kt similarity index 98% rename from app/src/main/java/relax/offline/music/http/MyHttpUtil.kt rename to app/src/main/java/melody/offline/music/http/MyHttpUtil.kt index aef7c68..4894bf2 100644 --- a/app/src/main/java/relax/offline/music/http/MyHttpUtil.kt +++ b/app/src/main/java/melody/offline/music/http/MyHttpUtil.kt @@ -1,4 +1,4 @@ -package relax.offline.music.http +package melody.offline.music.http import android.content.Context import android.net.ConnectivityManager diff --git a/app/src/main/java/relax/offline/music/http/PostContentMessage.kt b/app/src/main/java/melody/offline/music/http/PostContentMessage.kt similarity index 93% rename from app/src/main/java/relax/offline/music/http/PostContentMessage.kt rename to app/src/main/java/melody/offline/music/http/PostContentMessage.kt index 49a46a7..5368b4e 100644 --- a/app/src/main/java/relax/offline/music/http/PostContentMessage.kt +++ b/app/src/main/java/melody/offline/music/http/PostContentMessage.kt @@ -1,4 +1,4 @@ -package relax.offline.music.http +package melody.offline.music.http import java.io.Serializable diff --git a/app/src/main/java/relax/offline/music/http/PostContentSecurityBody.kt b/app/src/main/java/melody/offline/music/http/PostContentSecurityBody.kt similarity index 78% rename from app/src/main/java/relax/offline/music/http/PostContentSecurityBody.kt rename to app/src/main/java/melody/offline/music/http/PostContentSecurityBody.kt index 5f46391..5551a14 100644 --- a/app/src/main/java/relax/offline/music/http/PostContentSecurityBody.kt +++ b/app/src/main/java/melody/offline/music/http/PostContentSecurityBody.kt @@ -1,4 +1,4 @@ -package relax.offline.music.http +package melody.offline.music.http import java.io.Serializable diff --git a/app/src/main/java/relax/offline/music/http/UploadEventName.kt b/app/src/main/java/melody/offline/music/http/UploadEventName.kt similarity index 97% rename from app/src/main/java/relax/offline/music/http/UploadEventName.kt rename to app/src/main/java/melody/offline/music/http/UploadEventName.kt index 28c2e3a..65783a0 100644 --- a/app/src/main/java/relax/offline/music/http/UploadEventName.kt +++ b/app/src/main/java/melody/offline/music/http/UploadEventName.kt @@ -1,11 +1,11 @@ -package relax.offline.music.http +package melody.offline.music.http import android.content.Context import okhttp3.Call import okhttp3.Response import org.json.JSONObject -import relax.offline.music.sp.AppStore -import relax.offline.music.util.LogTag +import melody.offline.music.sp.AppStore +import melody.offline.music.util.LogTag import java.io.IOException class UploadEventName { diff --git a/app/src/main/java/relax/offline/music/innertube/Innertube.kt b/app/src/main/java/melody/offline/music/innertube/Innertube.kt similarity index 95% rename from app/src/main/java/relax/offline/music/innertube/Innertube.kt rename to app/src/main/java/melody/offline/music/innertube/Innertube.kt index b4444ac..73e7c1d 100644 --- a/app/src/main/java/relax/offline/music/innertube/Innertube.kt +++ b/app/src/main/java/melody/offline/music/innertube/Innertube.kt @@ -1,12 +1,12 @@ -package relax.offline.music.innertube +package melody.offline.music.innertube -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 melody.offline.music.innertube.models.MusicCarouselShelfRenderer +import melody.offline.music.innertube.models.MusicShelfRenderer +import melody.offline.music.innertube.models.NavigationEndpoint +import melody.offline.music.innertube.models.Runs +import melody.offline.music.innertube.models.Thumbnail +import melody.offline.music.innertube.utils.brotli +import melody.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/relax/offline/music/innertube/models/BrowseResponse.kt b/app/src/main/java/melody/offline/music/innertube/models/BrowseResponse.kt similarity index 98% rename from app/src/main/java/relax/offline/music/innertube/models/BrowseResponse.kt rename to app/src/main/java/melody/offline/music/innertube/models/BrowseResponse.kt index cdc0dc7..8f32b0c 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/BrowseResponse.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/BrowseResponse.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/ButtonRenderer.kt b/app/src/main/java/melody/offline/music/innertube/models/ButtonRenderer.kt similarity index 74% rename from app/src/main/java/relax/offline/music/innertube/models/ButtonRenderer.kt rename to app/src/main/java/melody/offline/music/innertube/models/ButtonRenderer.kt index 4b40f7d..7884574 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/ButtonRenderer.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/ButtonRenderer.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/Context.kt b/app/src/main/java/melody/offline/music/innertube/models/Context.kt similarity index 96% rename from app/src/main/java/relax/offline/music/innertube/models/Context.kt rename to app/src/main/java/melody/offline/music/innertube/models/Context.kt index 4b7e9d5..edf83c2 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/Context.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/Context.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.Serializable import java.util.Locale diff --git a/app/src/main/java/relax/offline/music/innertube/models/Continuation.kt b/app/src/main/java/melody/offline/music/innertube/models/Continuation.kt similarity index 90% rename from app/src/main/java/relax/offline/music/innertube/models/Continuation.kt rename to app/src/main/java/melody/offline/music/innertube/models/Continuation.kt index d8b7281..705c53d 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/Continuation.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/Continuation.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/ContinuationResponse.kt b/app/src/main/java/melody/offline/music/innertube/models/ContinuationResponse.kt similarity index 92% rename from app/src/main/java/relax/offline/music/innertube/models/ContinuationResponse.kt rename to app/src/main/java/melody/offline/music/innertube/models/ContinuationResponse.kt index 7cd7c13..4892cac 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/ContinuationResponse.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/ContinuationResponse.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/GetQueueResponse.kt b/app/src/main/java/melody/offline/music/innertube/models/GetQueueResponse.kt similarity index 85% rename from app/src/main/java/relax/offline/music/innertube/models/GetQueueResponse.kt rename to app/src/main/java/melody/offline/music/innertube/models/GetQueueResponse.kt index 953d431..34c5c18 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/GetQueueResponse.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/GetQueueResponse.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/GridRenderer.kt b/app/src/main/java/melody/offline/music/innertube/models/GridRenderer.kt similarity index 82% rename from app/src/main/java/relax/offline/music/innertube/models/GridRenderer.kt rename to app/src/main/java/melody/offline/music/innertube/models/GridRenderer.kt index 5a6e85e..9660ada 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/GridRenderer.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/GridRenderer.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/MusicCardShelfRenderer.kt b/app/src/main/java/melody/offline/music/innertube/models/MusicCardShelfRenderer.kt similarity index 85% rename from app/src/main/java/relax/offline/music/innertube/models/MusicCardShelfRenderer.kt rename to app/src/main/java/melody/offline/music/innertube/models/MusicCardShelfRenderer.kt index 894ac67..2a343e6 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/MusicCardShelfRenderer.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/MusicCardShelfRenderer.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.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/relax/offline/music/innertube/models/MusicCarouselShelfRenderer.kt b/app/src/main/java/melody/offline/music/innertube/models/MusicCarouselShelfRenderer.kt similarity index 95% rename from app/src/main/java/relax/offline/music/innertube/models/MusicCarouselShelfRenderer.kt rename to app/src/main/java/melody/offline/music/innertube/models/MusicCarouselShelfRenderer.kt index 9961099..15405dc 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/MusicCarouselShelfRenderer.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/MusicCarouselShelfRenderer.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/MusicResponsiveListItemRenderer.kt b/app/src/main/java/melody/offline/music/innertube/models/MusicResponsiveListItemRenderer.kt similarity index 94% rename from app/src/main/java/relax/offline/music/innertube/models/MusicResponsiveListItemRenderer.kt rename to app/src/main/java/melody/offline/music/innertube/models/MusicResponsiveListItemRenderer.kt index 94cb6a2..a8110ca 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/MusicResponsiveListItemRenderer.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/MusicResponsiveListItemRenderer.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/MusicShelfRenderer.kt b/app/src/main/java/melody/offline/music/innertube/models/MusicShelfRenderer.kt similarity index 96% rename from app/src/main/java/relax/offline/music/innertube/models/MusicShelfRenderer.kt rename to app/src/main/java/melody/offline/music/innertube/models/MusicShelfRenderer.kt index da1653b..f0857f0 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/MusicShelfRenderer.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/MusicShelfRenderer.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/MusicTwoRowItemRenderer.kt b/app/src/main/java/melody/offline/music/innertube/models/MusicTwoRowItemRenderer.kt similarity index 83% rename from app/src/main/java/relax/offline/music/innertube/models/MusicTwoRowItemRenderer.kt rename to app/src/main/java/melody/offline/music/innertube/models/MusicTwoRowItemRenderer.kt index 2ad50a2..1aa545b 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/MusicTwoRowItemRenderer.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/MusicTwoRowItemRenderer.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/NavigationEndpoint.kt b/app/src/main/java/melody/offline/music/innertube/models/NavigationEndpoint.kt similarity index 99% rename from app/src/main/java/relax/offline/music/innertube/models/NavigationEndpoint.kt rename to app/src/main/java/melody/offline/music/innertube/models/NavigationEndpoint.kt index 21c1094..830580f 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/NavigationEndpoint.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/NavigationEndpoint.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/NextResponse.kt b/app/src/main/java/melody/offline/music/innertube/models/NextResponse.kt similarity index 98% rename from app/src/main/java/relax/offline/music/innertube/models/NextResponse.kt rename to app/src/main/java/melody/offline/music/innertube/models/NextResponse.kt index d95a976..ae3cbcb 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/NextResponse.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/NextResponse.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/PlayerResponse.kt b/app/src/main/java/melody/offline/music/innertube/models/PlayerResponse.kt similarity index 96% rename from app/src/main/java/relax/offline/music/innertube/models/PlayerResponse.kt rename to app/src/main/java/melody/offline/music/innertube/models/PlayerResponse.kt index 35e34ad..99bf9ec 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/PlayerResponse.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/PlayerResponse.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/PlaylistPanelVideoRenderer.kt b/app/src/main/java/melody/offline/music/innertube/models/PlaylistPanelVideoRenderer.kt similarity index 87% rename from app/src/main/java/relax/offline/music/innertube/models/PlaylistPanelVideoRenderer.kt rename to app/src/main/java/melody/offline/music/innertube/models/PlaylistPanelVideoRenderer.kt index 805311d..560ec51 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/PlaylistPanelVideoRenderer.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/PlaylistPanelVideoRenderer.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/Runs.kt b/app/src/main/java/melody/offline/music/innertube/models/Runs.kt similarity index 94% rename from app/src/main/java/relax/offline/music/innertube/models/Runs.kt rename to app/src/main/java/melody/offline/music/innertube/models/Runs.kt index 7408516..3eb7393 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/Runs.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/Runs.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/SearchResponse.kt b/app/src/main/java/melody/offline/music/innertube/models/SearchResponse.kt similarity index 82% rename from app/src/main/java/relax/offline/music/innertube/models/SearchResponse.kt rename to app/src/main/java/melody/offline/music/innertube/models/SearchResponse.kt index 8dc3ec2..bd14b23 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/SearchResponse.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/SearchResponse.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/SearchSuggestionsResponse.kt b/app/src/main/java/melody/offline/music/innertube/models/SearchSuggestionsResponse.kt similarity index 94% rename from app/src/main/java/relax/offline/music/innertube/models/SearchSuggestionsResponse.kt rename to app/src/main/java/melody/offline/music/innertube/models/SearchSuggestionsResponse.kt index 05b1460..fe1e946 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/SearchSuggestionsResponse.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/SearchSuggestionsResponse.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/SectionListContinuation.kt b/app/src/main/java/melody/offline/music/innertube/models/SectionListContinuation.kt similarity index 94% rename from app/src/main/java/relax/offline/music/innertube/models/SectionListContinuation.kt rename to app/src/main/java/melody/offline/music/innertube/models/SectionListContinuation.kt index c9585c7..f2b7daf 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/SectionListContinuation.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/SectionListContinuation.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/SectionListRenderer.kt b/app/src/main/java/melody/offline/music/innertube/models/SectionListRenderer.kt similarity index 95% rename from app/src/main/java/relax/offline/music/innertube/models/SectionListRenderer.kt rename to app/src/main/java/melody/offline/music/innertube/models/SectionListRenderer.kt index 8045b9e..146ce5d 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/SectionListRenderer.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/SectionListRenderer.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/Tabs.kt b/app/src/main/java/melody/offline/music/innertube/models/Tabs.kt similarity index 91% rename from app/src/main/java/relax/offline/music/innertube/models/Tabs.kt rename to app/src/main/java/melody/offline/music/innertube/models/Tabs.kt index ba600ee..feed891 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/Tabs.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/Tabs.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/Thumbnail.kt b/app/src/main/java/melody/offline/music/innertube/models/Thumbnail.kt similarity index 91% rename from app/src/main/java/relax/offline/music/innertube/models/Thumbnail.kt rename to app/src/main/java/melody/offline/music/innertube/models/Thumbnail.kt index bf7dc80..f15136b 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/Thumbnail.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/Thumbnail.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.offline.music.innertube.models import kotlinx.serialization.Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/ThumbnailRenderer.kt b/app/src/main/java/melody/offline/music/innertube/models/ThumbnailRenderer.kt similarity index 79% rename from app/src/main/java/relax/offline/music/innertube/models/ThumbnailRenderer.kt rename to app/src/main/java/melody/offline/music/innertube/models/ThumbnailRenderer.kt index b66f47b..99d3fc0 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/ThumbnailRenderer.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/ThumbnailRenderer.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.models +package melody.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/relax/offline/music/innertube/models/bodies/BrowseBody.kt b/app/src/main/java/melody/offline/music/innertube/models/bodies/BrowseBody.kt similarity index 63% rename from app/src/main/java/relax/offline/music/innertube/models/bodies/BrowseBody.kt rename to app/src/main/java/melody/offline/music/innertube/models/bodies/BrowseBody.kt index 4605406..4cccb74 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/bodies/BrowseBody.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/bodies/BrowseBody.kt @@ -1,6 +1,6 @@ -package relax.offline.music.innertube.models.bodies +package melody.offline.music.innertube.models.bodies -import relax.offline.music.innertube.models.Context +import melody.offline.music.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/bodies/BrowseMoreBody.kt b/app/src/main/java/melody/offline/music/innertube/models/bodies/BrowseMoreBody.kt similarity index 55% rename from app/src/main/java/relax/offline/music/innertube/models/bodies/BrowseMoreBody.kt rename to app/src/main/java/melody/offline/music/innertube/models/bodies/BrowseMoreBody.kt index d610c0f..57dfc4e 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/bodies/BrowseMoreBody.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/bodies/BrowseMoreBody.kt @@ -1,6 +1,6 @@ -package relax.offline.music.innertube.models.bodies +package melody.offline.music.innertube.models.bodies -import relax.offline.music.innertube.models.Context +import melody.offline.music.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/bodies/ContinuationBody.kt b/app/src/main/java/melody/offline/music/innertube/models/bodies/ContinuationBody.kt similarity index 61% rename from app/src/main/java/relax/offline/music/innertube/models/bodies/ContinuationBody.kt rename to app/src/main/java/melody/offline/music/innertube/models/bodies/ContinuationBody.kt index 28e5c52..02f55c0 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/bodies/ContinuationBody.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/bodies/ContinuationBody.kt @@ -1,6 +1,6 @@ -package relax.offline.music.innertube.models.bodies +package melody.offline.music.innertube.models.bodies -import relax.offline.music.innertube.models.Context +import melody.offline.music.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/bodies/NextBody.kt b/app/src/main/java/melody/offline/music/innertube/models/bodies/NextBody.kt similarity index 86% rename from app/src/main/java/relax/offline/music/innertube/models/bodies/NextBody.kt rename to app/src/main/java/melody/offline/music/innertube/models/bodies/NextBody.kt index 10630a7..2a39f64 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/bodies/NextBody.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/bodies/NextBody.kt @@ -1,6 +1,6 @@ -package relax.offline.music.innertube.models.bodies +package melody.offline.music.innertube.models.bodies -import relax.offline.music.innertube.models.Context +import melody.offline.music.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/bodies/PlayerBody.kt b/app/src/main/java/melody/offline/music/innertube/models/bodies/PlayerBody.kt similarity index 64% rename from app/src/main/java/relax/offline/music/innertube/models/bodies/PlayerBody.kt rename to app/src/main/java/melody/offline/music/innertube/models/bodies/PlayerBody.kt index b290af5..d08954b 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/bodies/PlayerBody.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/bodies/PlayerBody.kt @@ -1,6 +1,6 @@ -package relax.offline.music.innertube.models.bodies +package melody.offline.music.innertube.models.bodies -import relax.offline.music.innertube.models.Context +import melody.offline.music.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/bodies/QueueBody.kt b/app/src/main/java/melody/offline/music/innertube/models/bodies/QueueBody.kt similarity index 65% rename from app/src/main/java/relax/offline/music/innertube/models/bodies/QueueBody.kt rename to app/src/main/java/melody/offline/music/innertube/models/bodies/QueueBody.kt index c620132..e61b7b8 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/bodies/QueueBody.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/bodies/QueueBody.kt @@ -1,6 +1,6 @@ -package relax.offline.music.innertube.models.bodies +package melody.offline.music.innertube.models.bodies -import relax.offline.music.innertube.models.Context +import melody.offline.music.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/bodies/SearchBody.kt b/app/src/main/java/melody/offline/music/innertube/models/bodies/SearchBody.kt similarity index 63% rename from app/src/main/java/relax/offline/music/innertube/models/bodies/SearchBody.kt rename to app/src/main/java/melody/offline/music/innertube/models/bodies/SearchBody.kt index fe9a9a2..30f4cc9 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/bodies/SearchBody.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/bodies/SearchBody.kt @@ -1,6 +1,6 @@ -package relax.offline.music.innertube.models.bodies +package melody.offline.music.innertube.models.bodies -import relax.offline.music.innertube.models.Context +import melody.offline.music.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/models/bodies/SearchSuggestionsBody.kt b/app/src/main/java/melody/offline/music/innertube/models/bodies/SearchSuggestionsBody.kt similarity index 60% rename from app/src/main/java/relax/offline/music/innertube/models/bodies/SearchSuggestionsBody.kt rename to app/src/main/java/melody/offline/music/innertube/models/bodies/SearchSuggestionsBody.kt index b2aee71..b18d0f7 100644 --- a/app/src/main/java/relax/offline/music/innertube/models/bodies/SearchSuggestionsBody.kt +++ b/app/src/main/java/melody/offline/music/innertube/models/bodies/SearchSuggestionsBody.kt @@ -1,6 +1,6 @@ -package relax.offline.music.innertube.models.bodies +package melody.offline.music.innertube.models.bodies -import relax.offline.music.innertube.models.Context +import melody.offline.music.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/app/src/main/java/relax/offline/music/innertube/requests/AlbumPage.kt b/app/src/main/java/melody/offline/music/innertube/requests/AlbumPage.kt similarity index 82% rename from app/src/main/java/relax/offline/music/innertube/requests/AlbumPage.kt rename to app/src/main/java/melody/offline/music/innertube/requests/AlbumPage.kt index b89ca94..9782338 100644 --- a/app/src/main/java/relax/offline/music/innertube/requests/AlbumPage.kt +++ b/app/src/main/java/melody/offline/music/innertube/requests/AlbumPage.kt @@ -1,9 +1,9 @@ -package relax.offline.music.innertube.requests +package melody.offline.music.innertube.requests import io.ktor.http.Url -import relax.offline.music.innertube.Innertube -import relax.offline.music.innertube.models.NavigationEndpoint -import relax.offline.music.innertube.models.bodies.BrowseBody +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.NavigationEndpoint +import melody.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/relax/offline/music/innertube/requests/ArtistPage.kt b/app/src/main/java/melody/offline/music/innertube/requests/ArtistPage.kt similarity index 85% rename from app/src/main/java/relax/offline/music/innertube/requests/ArtistPage.kt rename to app/src/main/java/melody/offline/music/innertube/requests/ArtistPage.kt index ef390a1..f899b26 100644 --- a/app/src/main/java/relax/offline/music/innertube/requests/ArtistPage.kt +++ b/app/src/main/java/melody/offline/music/innertube/requests/ArtistPage.kt @@ -1,17 +1,17 @@ -package relax.offline.music.innertube.requests +package melody.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -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 +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.BrowseResponse +import melody.offline.music.innertube.models.MusicCarouselShelfRenderer +import melody.offline.music.innertube.models.MusicShelfRenderer +import melody.offline.music.innertube.models.SectionListRenderer +import melody.offline.music.innertube.models.bodies.BrowseBody +import melody.offline.music.innertube.utils.findSectionByTitle +import melody.offline.music.innertube.utils.from +import melody.offline.music.innertube.utils.runCatchingNonCancellable suspend fun Innertube.artistPage(body: BrowseBody): Result? = runCatchingNonCancellable { diff --git a/app/src/main/java/relax/offline/music/innertube/requests/HomePage.kt b/app/src/main/java/melody/offline/music/innertube/requests/HomePage.kt similarity index 85% rename from app/src/main/java/relax/offline/music/innertube/requests/HomePage.kt rename to app/src/main/java/melody/offline/music/innertube/requests/HomePage.kt index f786cfb..f3ce5cf 100644 --- a/app/src/main/java/relax/offline/music/innertube/requests/HomePage.kt +++ b/app/src/main/java/melody/offline/music/innertube/requests/HomePage.kt @@ -1,12 +1,12 @@ -package relax.offline.music.innertube.requests +package melody.offline.music.innertube.requests -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 melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.BrowseResponse +import melody.offline.music.innertube.models.Context +import melody.offline.music.innertube.models.SectionListRenderer +import melody.offline.music.innertube.models.bodies.BrowseBody +import melody.offline.music.innertube.utils.runCatchingNonCancellable +import melody.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/relax/offline/music/innertube/requests/HomePageMore.kt b/app/src/main/java/melody/offline/music/innertube/requests/HomePageMore.kt similarity index 85% rename from app/src/main/java/relax/offline/music/innertube/requests/HomePageMore.kt rename to app/src/main/java/melody/offline/music/innertube/requests/HomePageMore.kt index 13d2b56..7a1edfa 100644 --- a/app/src/main/java/relax/offline/music/innertube/requests/HomePageMore.kt +++ b/app/src/main/java/melody/offline/music/innertube/requests/HomePageMore.kt @@ -1,11 +1,11 @@ -package relax.offline.music.innertube.requests +package melody.offline.music.innertube.requests -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 melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.BrowseResponse +import melody.offline.music.innertube.models.Context +import melody.offline.music.innertube.models.SectionListContinuation +import melody.offline.music.innertube.models.bodies.BrowseMoreBody +import melody.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/relax/offline/music/innertube/requests/ItemsPage.kt b/app/src/main/java/melody/offline/music/innertube/requests/ItemsPage.kt similarity index 83% rename from app/src/main/java/relax/offline/music/innertube/requests/ItemsPage.kt rename to app/src/main/java/melody/offline/music/innertube/requests/ItemsPage.kt index 72fd634..3b278bc 100644 --- a/app/src/main/java/relax/offline/music/innertube/requests/ItemsPage.kt +++ b/app/src/main/java/melody/offline/music/innertube/requests/ItemsPage.kt @@ -1,18 +1,18 @@ -package relax.offline.music.innertube.requests +package melody.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -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 +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.BrowseResponse +import melody.offline.music.innertube.models.ContinuationResponse +import melody.offline.music.innertube.models.GridRenderer +import melody.offline.music.innertube.models.MusicResponsiveListItemRenderer +import melody.offline.music.innertube.models.MusicShelfRenderer +import melody.offline.music.innertube.models.MusicTwoRowItemRenderer +import melody.offline.music.innertube.models.bodies.BrowseBody +import melody.offline.music.innertube.models.bodies.ContinuationBody +import melody.offline.music.innertube.utils.runCatchingNonCancellable suspend fun Innertube.itemsPage( body: BrowseBody, diff --git a/app/src/main/java/relax/offline/music/innertube/requests/Lyrics.kt b/app/src/main/java/melody/offline/music/innertube/requests/Lyrics.kt similarity index 74% rename from app/src/main/java/relax/offline/music/innertube/requests/Lyrics.kt rename to app/src/main/java/melody/offline/music/innertube/requests/Lyrics.kt index 4509390..855efb0 100644 --- a/app/src/main/java/relax/offline/music/innertube/requests/Lyrics.kt +++ b/app/src/main/java/melody/offline/music/innertube/requests/Lyrics.kt @@ -1,14 +1,14 @@ -package relax.offline.music.innertube.requests +package melody.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -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 +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.BrowseResponse +import melody.offline.music.innertube.models.NextResponse +import melody.offline.music.innertube.models.bodies.BrowseBody +import melody.offline.music.innertube.models.bodies.NextBody +import melody.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/relax/offline/music/innertube/requests/MoNextPage.kt b/app/src/main/java/melody/offline/music/innertube/requests/MoNextPage.kt similarity index 82% rename from app/src/main/java/relax/offline/music/innertube/requests/MoNextPage.kt rename to app/src/main/java/melody/offline/music/innertube/requests/MoNextPage.kt index 98ef879..64f50af 100644 --- a/app/src/main/java/relax/offline/music/innertube/requests/MoNextPage.kt +++ b/app/src/main/java/melody/offline/music/innertube/requests/MoNextPage.kt @@ -1,12 +1,12 @@ -package relax.offline.music.innertube.requests +package melody.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -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 +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.NextResponse +import melody.offline.music.innertube.models.bodies.NextBody +import melody.offline.music.innertube.utils.runCatchingNonCancellable suspend fun Innertube.moNextPage( diff --git a/app/src/main/java/relax/offline/music/innertube/requests/MoPlaylistPage.kt b/app/src/main/java/melody/offline/music/innertube/requests/MoPlaylistPage.kt similarity index 93% rename from app/src/main/java/relax/offline/music/innertube/requests/MoPlaylistPage.kt rename to app/src/main/java/melody/offline/music/innertube/requests/MoPlaylistPage.kt index 1766834..e5738d6 100644 --- a/app/src/main/java/relax/offline/music/innertube/requests/MoPlaylistPage.kt +++ b/app/src/main/java/melody/offline/music/innertube/requests/MoPlaylistPage.kt @@ -1,10 +1,10 @@ -package relax.offline.music.innertube.requests +package melody.offline.music.innertube.requests -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 melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.BrowseResponse +import melody.offline.music.innertube.models.MusicShelfRenderer +import melody.offline.music.innertube.models.bodies.BrowseBody +import melody.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/relax/offline/music/innertube/requests/MoSearchPage.kt b/app/src/main/java/melody/offline/music/innertube/requests/MoSearchPage.kt similarity index 95% rename from app/src/main/java/relax/offline/music/innertube/requests/MoSearchPage.kt rename to app/src/main/java/melody/offline/music/innertube/requests/MoSearchPage.kt index 9399063..f62599f 100644 --- a/app/src/main/java/relax/offline/music/innertube/requests/MoSearchPage.kt +++ b/app/src/main/java/melody/offline/music/innertube/requests/MoSearchPage.kt @@ -1,13 +1,13 @@ -package relax.offline.music.innertube.requests +package melody.offline.music.innertube.requests -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 melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.ContinuationResponse +import melody.offline.music.innertube.models.MusicShelfRenderer +import melody.offline.music.innertube.models.SearchResponse +import melody.offline.music.innertube.models.SectionListRenderer +import melody.offline.music.innertube.models.bodies.ContinuationBody +import melody.offline.music.innertube.models.bodies.SearchBody +import melody.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/relax/offline/music/innertube/requests/MoSingerlistPage.kt b/app/src/main/java/melody/offline/music/innertube/requests/MoSingerlistPage.kt similarity index 94% rename from app/src/main/java/relax/offline/music/innertube/requests/MoSingerlistPage.kt rename to app/src/main/java/melody/offline/music/innertube/requests/MoSingerlistPage.kt index a29916a..217889b 100644 --- a/app/src/main/java/relax/offline/music/innertube/requests/MoSingerlistPage.kt +++ b/app/src/main/java/melody/offline/music/innertube/requests/MoSingerlistPage.kt @@ -1,15 +1,15 @@ -package relax.offline.music.innertube.requests +package melody.offline.music.innertube.requests -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 melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.BrowseResponse +import melody.offline.music.innertube.models.ContinuationResponse +import melody.offline.music.innertube.models.GridRenderer +import melody.offline.music.innertube.models.MusicCarouselShelfRenderer +import melody.offline.music.innertube.models.MusicShelfRenderer +import melody.offline.music.innertube.models.SectionListRenderer +import melody.offline.music.innertube.models.bodies.BrowseBody +import melody.offline.music.innertube.models.bodies.ContinuationBody +import melody.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/relax/offline/music/innertube/requests/NextPage.kt b/app/src/main/java/melody/offline/music/innertube/requests/NextPage.kt similarity index 85% rename from app/src/main/java/relax/offline/music/innertube/requests/NextPage.kt rename to app/src/main/java/melody/offline/music/innertube/requests/NextPage.kt index eba519e..a356dbb 100644 --- a/app/src/main/java/relax/offline/music/innertube/requests/NextPage.kt +++ b/app/src/main/java/melody/offline/music/innertube/requests/NextPage.kt @@ -1,15 +1,15 @@ -package relax.offline.music.innertube.requests +package melody.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -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 +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.ContinuationResponse +import melody.offline.music.innertube.models.NextResponse +import melody.offline.music.innertube.models.bodies.ContinuationBody +import melody.offline.music.innertube.models.bodies.NextBody +import melody.offline.music.innertube.utils.from +import melody.offline.music.innertube.utils.runCatchingNonCancellable diff --git a/app/src/main/java/relax/offline/music/innertube/requests/Player.kt b/app/src/main/java/melody/offline/music/innertube/requests/Player.kt similarity index 86% rename from app/src/main/java/relax/offline/music/innertube/requests/Player.kt rename to app/src/main/java/melody/offline/music/innertube/requests/Player.kt index 07bc0ac..b0a0cb8 100644 --- a/app/src/main/java/relax/offline/music/innertube/requests/Player.kt +++ b/app/src/main/java/melody/offline/music/innertube/requests/Player.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.requests +package melody.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 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 melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.Context +import melody.offline.music.innertube.models.PlayerResponse +import melody.offline.music.innertube.models.bodies.PlayerBody +import melody.offline.music.innertube.utils.runCatchingNonCancellable import kotlinx.serialization.Serializable suspend fun Innertube.player(body: PlayerBody) = runCatchingNonCancellable { diff --git a/app/src/main/java/relax/offline/music/innertube/requests/PlaylistPage.kt b/app/src/main/java/melody/offline/music/innertube/requests/PlaylistPage.kt similarity index 83% rename from app/src/main/java/relax/offline/music/innertube/requests/PlaylistPage.kt rename to app/src/main/java/melody/offline/music/innertube/requests/PlaylistPage.kt index ed44ee8..2cc258a 100644 --- a/app/src/main/java/relax/offline/music/innertube/requests/PlaylistPage.kt +++ b/app/src/main/java/melody/offline/music/innertube/requests/PlaylistPage.kt @@ -1,17 +1,17 @@ -package relax.offline.music.innertube.requests +package melody.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -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 +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.BrowseResponse +import melody.offline.music.innertube.models.ContinuationResponse +import melody.offline.music.innertube.models.MusicCarouselShelfRenderer +import melody.offline.music.innertube.models.MusicShelfRenderer +import melody.offline.music.innertube.models.bodies.BrowseBody +import melody.offline.music.innertube.models.bodies.ContinuationBody +import melody.offline.music.innertube.utils.from +import melody.offline.music.innertube.utils.runCatchingNonCancellable suspend fun Innertube.playlistPage(body: BrowseBody) = runCatchingNonCancellable { val response = client.post(browse) { diff --git a/app/src/main/java/relax/offline/music/innertube/requests/Queue.kt b/app/src/main/java/melody/offline/music/innertube/requests/Queue.kt similarity index 67% rename from app/src/main/java/relax/offline/music/innertube/requests/Queue.kt rename to app/src/main/java/melody/offline/music/innertube/requests/Queue.kt index badd14a..55b9394 100644 --- a/app/src/main/java/relax/offline/music/innertube/requests/Queue.kt +++ b/app/src/main/java/melody/offline/music/innertube/requests/Queue.kt @@ -1,13 +1,13 @@ -package relax.offline.music.innertube.requests +package melody.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -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 +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.GetQueueResponse +import melody.offline.music.innertube.models.bodies.QueueBody +import melody.offline.music.innertube.utils.from +import melody.offline.music.innertube.utils.runCatchingNonCancellable suspend fun Innertube.queue(body: QueueBody) = runCatchingNonCancellable { val response = client.post(queue) { diff --git a/app/src/main/java/relax/offline/music/innertube/requests/RelatedPage.kt b/app/src/main/java/melody/offline/music/innertube/requests/RelatedPage.kt similarity index 79% rename from app/src/main/java/relax/offline/music/innertube/requests/RelatedPage.kt rename to app/src/main/java/melody/offline/music/innertube/requests/RelatedPage.kt index e0a11ae..4cb5a68 100644 --- a/app/src/main/java/relax/offline/music/innertube/requests/RelatedPage.kt +++ b/app/src/main/java/melody/offline/music/innertube/requests/RelatedPage.kt @@ -1,18 +1,18 @@ -package relax.offline.music.innertube.requests +package melody.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -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 +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.BrowseResponse +import melody.offline.music.innertube.models.MusicCarouselShelfRenderer +import melody.offline.music.innertube.models.NextResponse +import melody.offline.music.innertube.models.bodies.BrowseBody +import melody.offline.music.innertube.models.bodies.NextBody +import melody.offline.music.innertube.utils.findSectionByStrapline +import melody.offline.music.innertube.utils.findSectionByTitle +import melody.offline.music.innertube.utils.from +import melody.offline.music.innertube.utils.runCatchingNonCancellable suspend fun Innertube.relatedPage(body: NextBody) = runCatchingNonCancellable { val nextResponse = client.post(next) { diff --git a/app/src/main/java/relax/offline/music/innertube/requests/SearchPage.kt b/app/src/main/java/melody/offline/music/innertube/requests/SearchPage.kt similarity index 78% rename from app/src/main/java/relax/offline/music/innertube/requests/SearchPage.kt rename to app/src/main/java/melody/offline/music/innertube/requests/SearchPage.kt index 53e94ea..003d008 100644 --- a/app/src/main/java/relax/offline/music/innertube/requests/SearchPage.kt +++ b/app/src/main/java/melody/offline/music/innertube/requests/SearchPage.kt @@ -1,15 +1,15 @@ -package relax.offline.music.innertube.requests +package melody.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -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 +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.ContinuationResponse +import melody.offline.music.innertube.models.MusicShelfRenderer +import melody.offline.music.innertube.models.SearchResponse +import melody.offline.music.innertube.models.bodies.ContinuationBody +import melody.offline.music.innertube.models.bodies.SearchBody +import melody.offline.music.innertube.utils.runCatchingNonCancellable suspend fun Innertube.searchPage( body: SearchBody, diff --git a/app/src/main/java/relax/offline/music/innertube/requests/SearchSuggestions.kt b/app/src/main/java/melody/offline/music/innertube/requests/SearchSuggestions.kt similarity index 71% rename from app/src/main/java/relax/offline/music/innertube/requests/SearchSuggestions.kt rename to app/src/main/java/melody/offline/music/innertube/requests/SearchSuggestions.kt index 6271983..647908f 100644 --- a/app/src/main/java/relax/offline/music/innertube/requests/SearchSuggestions.kt +++ b/app/src/main/java/melody/offline/music/innertube/requests/SearchSuggestions.kt @@ -1,12 +1,12 @@ -package relax.offline.music.innertube.requests +package melody.offline.music.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -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 +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.SearchSuggestionsResponse +import melody.offline.music.innertube.models.bodies.SearchSuggestionsBody +import melody.offline.music.innertube.utils.runCatchingNonCancellable suspend fun Innertube.searchSuggestions(body: SearchSuggestionsBody) = runCatchingNonCancellable { val response = client.post(searchSuggestions) { diff --git a/app/src/main/java/relax/offline/music/innertube/utils/BrotliEncoder.kt b/app/src/main/java/melody/offline/music/innertube/utils/BrotliEncoder.kt similarity index 93% rename from app/src/main/java/relax/offline/music/innertube/utils/BrotliEncoder.kt rename to app/src/main/java/melody/offline/music/innertube/utils/BrotliEncoder.kt index c1a4cb2..3a69c70 100644 --- a/app/src/main/java/relax/offline/music/innertube/utils/BrotliEncoder.kt +++ b/app/src/main/java/melody/offline/music/innertube/utils/BrotliEncoder.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.utils +package melody.offline.music.innertube.utils import io.ktor.client.plugins.compression.ContentEncoder import io.ktor.utils.io.ByteReadChannel diff --git a/app/src/main/java/relax/offline/music/innertube/utils/FromMusicResponsiveListItemRenderer.kt b/app/src/main/java/melody/offline/music/innertube/utils/FromMusicResponsiveListItemRenderer.kt similarity index 85% rename from app/src/main/java/relax/offline/music/innertube/utils/FromMusicResponsiveListItemRenderer.kt rename to app/src/main/java/melody/offline/music/innertube/utils/FromMusicResponsiveListItemRenderer.kt index 30a5ba2..87a08cf 100644 --- a/app/src/main/java/relax/offline/music/innertube/utils/FromMusicResponsiveListItemRenderer.kt +++ b/app/src/main/java/melody/offline/music/innertube/utils/FromMusicResponsiveListItemRenderer.kt @@ -1,9 +1,9 @@ -package relax.offline.music.innertube.utils +package melody.offline.music.innertube.utils -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 +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.MusicResponsiveListItemRenderer +import melody.offline.music.innertube.models.NavigationEndpoint +import melody.offline.music.innertube.models.Runs fun Innertube.SongItem.Companion.from(renderer: MusicResponsiveListItemRenderer): Innertube.SongItem? { return Innertube.SongItem( diff --git a/app/src/main/java/relax/offline/music/innertube/utils/FromMusicShelfRendererContent.kt b/app/src/main/java/melody/offline/music/innertube/utils/FromMusicShelfRendererContent.kt similarity index 95% rename from app/src/main/java/relax/offline/music/innertube/utils/FromMusicShelfRendererContent.kt rename to app/src/main/java/melody/offline/music/innertube/utils/FromMusicShelfRendererContent.kt index b3e31dc..9ec6df2 100644 --- a/app/src/main/java/relax/offline/music/innertube/utils/FromMusicShelfRendererContent.kt +++ b/app/src/main/java/melody/offline/music/innertube/utils/FromMusicShelfRendererContent.kt @@ -1,8 +1,8 @@ -package relax.offline.music.innertube.utils +package melody.offline.music.innertube.utils -import relax.offline.music.innertube.Innertube -import relax.offline.music.innertube.models.MusicShelfRenderer -import relax.offline.music.innertube.models.NavigationEndpoint +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.MusicShelfRenderer +import melody.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/relax/offline/music/innertube/utils/FromMusicTwoRowItemRenderer.kt b/app/src/main/java/melody/offline/music/innertube/utils/FromMusicTwoRowItemRenderer.kt similarity index 92% rename from app/src/main/java/relax/offline/music/innertube/utils/FromMusicTwoRowItemRenderer.kt rename to app/src/main/java/melody/offline/music/innertube/utils/FromMusicTwoRowItemRenderer.kt index 26dfedf..3606367 100644 --- a/app/src/main/java/relax/offline/music/innertube/utils/FromMusicTwoRowItemRenderer.kt +++ b/app/src/main/java/melody/offline/music/innertube/utils/FromMusicTwoRowItemRenderer.kt @@ -1,7 +1,7 @@ -package relax.offline.music.innertube.utils +package melody.offline.music.innertube.utils -import relax.offline.music.innertube.Innertube -import relax.offline.music.innertube.models.MusicTwoRowItemRenderer +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.MusicTwoRowItemRenderer fun Innertube.AlbumItem.Companion.from(renderer: MusicTwoRowItemRenderer): Innertube.AlbumItem? { return Innertube.AlbumItem( diff --git a/app/src/main/java/relax/offline/music/innertube/utils/FromPlaylistPanelVideoRenderer.kt b/app/src/main/java/melody/offline/music/innertube/utils/FromPlaylistPanelVideoRenderer.kt similarity index 87% rename from app/src/main/java/relax/offline/music/innertube/utils/FromPlaylistPanelVideoRenderer.kt rename to app/src/main/java/melody/offline/music/innertube/utils/FromPlaylistPanelVideoRenderer.kt index 11724a1..f68a63f 100644 --- a/app/src/main/java/relax/offline/music/innertube/utils/FromPlaylistPanelVideoRenderer.kt +++ b/app/src/main/java/melody/offline/music/innertube/utils/FromPlaylistPanelVideoRenderer.kt @@ -1,7 +1,7 @@ -package relax.offline.music.innertube.utils +package melody.offline.music.innertube.utils -import relax.offline.music.innertube.Innertube -import relax.offline.music.innertube.models.PlaylistPanelVideoRenderer +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.PlaylistPanelVideoRenderer fun Innertube.SongItem.Companion.from(renderer: PlaylistPanelVideoRenderer): Innertube.SongItem? { return Innertube.SongItem( diff --git a/app/src/main/java/relax/offline/music/innertube/utils/Utils.kt b/app/src/main/java/melody/offline/music/innertube/utils/Utils.kt similarity index 89% rename from app/src/main/java/relax/offline/music/innertube/utils/Utils.kt rename to app/src/main/java/melody/offline/music/innertube/utils/Utils.kt index 8f7c9c0..39f5797 100644 --- a/app/src/main/java/relax/offline/music/innertube/utils/Utils.kt +++ b/app/src/main/java/melody/offline/music/innertube/utils/Utils.kt @@ -1,8 +1,8 @@ -package relax.offline.music.innertube.utils +package melody.offline.music.innertube.utils import io.ktor.utils.io.CancellationException -import relax.offline.music.innertube.Innertube -import relax.offline.music.innertube.models.SectionListRenderer +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.SectionListRenderer internal fun SectionListRenderer.findSectionByTitle(text: String): SectionListRenderer.Content? { return contents?.find { content -> diff --git a/app/src/main/java/relax/offline/music/innertube/utils/brotli.kt b/app/src/main/java/melody/offline/music/innertube/utils/brotli.kt similarity index 78% rename from app/src/main/java/relax/offline/music/innertube/utils/brotli.kt rename to app/src/main/java/melody/offline/music/innertube/utils/brotli.kt index a8b5d76..435e1d5 100644 --- a/app/src/main/java/relax/offline/music/innertube/utils/brotli.kt +++ b/app/src/main/java/melody/offline/music/innertube/utils/brotli.kt @@ -1,4 +1,4 @@ -package relax.offline.music.innertube.utils +package melody.offline.music.innertube.utils import io.ktor.client.plugins.compression.ContentEncoding diff --git a/app/src/main/java/relax/offline/music/media/DefaultMediaNotificationProvider.kt b/app/src/main/java/melody/offline/music/media/DefaultMediaNotificationProvider.kt similarity index 92% rename from app/src/main/java/relax/offline/music/media/DefaultMediaNotificationProvider.kt rename to app/src/main/java/melody/offline/music/media/DefaultMediaNotificationProvider.kt index 890bf46..bea92cd 100644 --- a/app/src/main/java/relax/offline/music/media/DefaultMediaNotificationProvider.kt +++ b/app/src/main/java/melody/offline/music/media/DefaultMediaNotificationProvider.kt @@ -1,4 +1,4 @@ -package relax.offline.music.media +package melody.offline.music.media import android.content.Context import android.os.Bundle @@ -9,12 +9,12 @@ import androidx.media3.session.CommandButton import androidx.media3.session.MediaNotification import androidx.media3.session.MediaSession import com.google.common.collect.ImmutableList -import relax.offline.music.R +import melody.offline.music.R @UnstableApi class MyMediaNotificationProvider(val context: Context) : MediaNotification.Provider { companion object { - private const val CHANNEL_ID = "musiclax_notification_channel" + private const val CHANNEL_ID = "HiMelody_notification_channel" private const val NOTIFICATION_ID = 1231 } diff --git a/app/src/main/java/relax/offline/music/media/LocalMediaControllerManager.kt b/app/src/main/java/melody/offline/music/media/LocalMediaControllerManager.kt similarity index 89% rename from app/src/main/java/relax/offline/music/media/LocalMediaControllerManager.kt rename to app/src/main/java/melody/offline/music/media/LocalMediaControllerManager.kt index b6e0799..391b4d7 100644 --- a/app/src/main/java/relax/offline/music/media/LocalMediaControllerManager.kt +++ b/app/src/main/java/melody/offline/music/media/LocalMediaControllerManager.kt @@ -1,4 +1,4 @@ -package relax.offline.music.media +package melody.offline.music.media import android.content.ComponentName import android.content.Context @@ -12,11 +12,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 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 melody.offline.music.R +import melody.offline.music.bean.Audio +import melody.offline.music.bean.CurrentPlayingAudio +import melody.offline.music.service.LocalPlaybackService +import melody.offline.music.util.containsContent import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -90,9 +90,9 @@ object LocalMediaControllerManager { false ) CoroutineScope(Dispatchers.IO).launch { - relax.offline.music.App.currentAudioManager.setCurrentPlayingAudio(currentPlayingAudio) + melody.offline.music.App.currentAudioManager.setCurrentPlayingAudio(currentPlayingAudio) withContext(Dispatchers.Main) { - relax.offline.music.App.initCurrentPlayingAudio()//更新到入口变量中 + melody.offline.music.App.initCurrentPlayingAudio()//更新到入口变量中 } } } @@ -149,9 +149,9 @@ object LocalMediaControllerManager { false ) CoroutineScope(Dispatchers.IO).launch { - relax.offline.music.App.currentAudioManager.setCurrentPlayingAudio(currentPlayingAudio) + melody.offline.music.App.currentAudioManager.setCurrentPlayingAudio(currentPlayingAudio) withContext(Dispatchers.Main) { - relax.offline.music.App.initCurrentPlayingAudio()//更新到入口变量中 + melody.offline.music.App.initCurrentPlayingAudio()//更新到入口变量中 } } diff --git a/app/src/main/java/relax/offline/music/media/MediaControllerManager.kt b/app/src/main/java/melody/offline/music/media/MediaControllerManager.kt similarity index 93% rename from app/src/main/java/relax/offline/music/media/MediaControllerManager.kt rename to app/src/main/java/melody/offline/music/media/MediaControllerManager.kt index 2976e42..8d3db72 100644 --- a/app/src/main/java/relax/offline/music/media/MediaControllerManager.kt +++ b/app/src/main/java/melody/offline/music/media/MediaControllerManager.kt @@ -1,13 +1,12 @@ -package relax.offline.music.media +package melody.offline.music.media import android.content.ComponentName import android.content.Context -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 relax.offline.music.service.PlaybackService +import melody.offline.music.service.PlaybackService object MediaControllerManager { private var mediaController: MediaController? = null diff --git a/app/src/main/java/relax/offline/music/media/MediaControllerUtils.kt b/app/src/main/java/melody/offline/music/media/MediaControllerUtils.kt similarity index 84% rename from app/src/main/java/relax/offline/music/media/MediaControllerUtils.kt rename to app/src/main/java/melody/offline/music/media/MediaControllerUtils.kt index a0c9db1..456194b 100644 --- a/app/src/main/java/relax/offline/music/media/MediaControllerUtils.kt +++ b/app/src/main/java/melody/offline/music/media/MediaControllerUtils.kt @@ -1,4 +1,4 @@ -package relax.offline.music.media +package melody.offline.music.media import androidx.media3.common.MediaItem import androidx.media3.session.MediaController diff --git a/app/src/main/java/relax/offline/music/media/SongRadio.kt b/app/src/main/java/melody/offline/music/media/SongRadio.kt similarity index 84% rename from app/src/main/java/relax/offline/music/media/SongRadio.kt rename to app/src/main/java/melody/offline/music/media/SongRadio.kt index 16d921d..ca2d984 100644 --- a/app/src/main/java/relax/offline/music/media/SongRadio.kt +++ b/app/src/main/java/melody/offline/music/media/SongRadio.kt @@ -1,9 +1,9 @@ -package relax.offline.music.media +package melody.offline.music.media -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 melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.bodies.ContinuationBody +import melody.offline.music.innertube.models.bodies.NextBody +import melody.offline.music.innertube.requests.nextPage import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/java/relax/offline/music/service/CustomMediaNotificationProvider.kt b/app/src/main/java/melody/offline/music/service/CustomMediaNotificationProvider.kt similarity index 92% rename from app/src/main/java/relax/offline/music/service/CustomMediaNotificationProvider.kt rename to app/src/main/java/melody/offline/music/service/CustomMediaNotificationProvider.kt index 49df5f3..a1e4e06 100644 --- a/app/src/main/java/relax/offline/music/service/CustomMediaNotificationProvider.kt +++ b/app/src/main/java/melody/offline/music/service/CustomMediaNotificationProvider.kt @@ -1,4 +1,4 @@ -package relax.offline.music.service +package melody.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 relax.offline.music.util.LogTag -import relax.offline.music.util.LogTag.LogD +import melody.offline.music.util.LogTag +import melody.offline.music.util.LogTag.LogD @UnstableApi class CustomMediaNotificationProvider(context: Context) : diff --git a/app/src/main/java/relax/offline/music/service/LocalPlaybackService.kt b/app/src/main/java/melody/offline/music/service/LocalPlaybackService.kt similarity index 92% rename from app/src/main/java/relax/offline/music/service/LocalPlaybackService.kt rename to app/src/main/java/melody/offline/music/service/LocalPlaybackService.kt index ea70849..cd9ab28 100644 --- a/app/src/main/java/relax/offline/music/service/LocalPlaybackService.kt +++ b/app/src/main/java/melody/offline/music/service/LocalPlaybackService.kt @@ -1,4 +1,4 @@ -package relax.offline.music.service +package melody.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 relax.offline.music.R +import melody.offline.music.R @UnstableApi diff --git a/app/src/main/java/relax/offline/music/service/MyDownloadService.kt b/app/src/main/java/melody/offline/music/service/MyDownloadService.kt similarity index 94% rename from app/src/main/java/relax/offline/music/service/MyDownloadService.kt rename to app/src/main/java/melody/offline/music/service/MyDownloadService.kt index eb00759..50098c4 100644 --- a/app/src/main/java/relax/offline/music/service/MyDownloadService.kt +++ b/app/src/main/java/melody/offline/music/service/MyDownloadService.kt @@ -1,4 +1,4 @@ -package relax.offline.music.service +package melody.offline.music.service import android.annotation.SuppressLint import android.app.Notification @@ -10,8 +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 relax.offline.music.R -import relax.offline.music.util.DownloadUtil +import melody.offline.music.R +import melody.offline.music.util.DownloadUtil @OptIn(UnstableApi::class) diff --git a/app/src/main/java/relax/offline/music/service/NotificationCustomButton.kt b/app/src/main/java/melody/offline/music/service/NotificationCustomButton.kt similarity index 93% rename from app/src/main/java/relax/offline/music/service/NotificationCustomButton.kt rename to app/src/main/java/melody/offline/music/service/NotificationCustomButton.kt index 2f29ca7..1ce2ff9 100644 --- a/app/src/main/java/relax/offline/music/service/NotificationCustomButton.kt +++ b/app/src/main/java/melody/offline/music/service/NotificationCustomButton.kt @@ -1,9 +1,9 @@ -package relax.offline.music.service +package melody.offline.music.service import android.os.Bundle import androidx.media3.session.CommandButton import androidx.media3.session.SessionCommand -import relax.offline.music.R +import melody.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/relax/offline/music/service/PlaybackExceptions.kt b/app/src/main/java/melody/offline/music/service/PlaybackExceptions.kt similarity index 94% rename from app/src/main/java/relax/offline/music/service/PlaybackExceptions.kt rename to app/src/main/java/melody/offline/music/service/PlaybackExceptions.kt index 2630023..2b55de9 100644 --- a/app/src/main/java/relax/offline/music/service/PlaybackExceptions.kt +++ b/app/src/main/java/melody/offline/music/service/PlaybackExceptions.kt @@ -1,4 +1,4 @@ -package relax.offline.music.service +package melody.offline.music.service import androidx.annotation.OptIn import androidx.media3.common.PlaybackException diff --git a/app/src/main/java/relax/offline/music/service/PlaybackService.kt b/app/src/main/java/melody/offline/music/service/PlaybackService.kt similarity index 95% rename from app/src/main/java/relax/offline/music/service/PlaybackService.kt rename to app/src/main/java/melody/offline/music/service/PlaybackService.kt index 2e5b73f..37f9362 100644 --- a/app/src/main/java/relax/offline/music/service/PlaybackService.kt +++ b/app/src/main/java/melody/offline/music/service/PlaybackService.kt @@ -1,4 +1,4 @@ -package relax.offline.music.service +package melody.offline.music.service import android.content.Intent import android.net.Uri @@ -30,18 +30,18 @@ import androidx.media3.extractor.mp4.FragmentedMp4Extractor import androidx.media3.session.DefaultMediaNotificationProvider import androidx.media3.session.MediaSession import androidx.media3.session.MediaSessionService -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 melody.offline.music.R +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.bodies.PlayerBody +import melody.offline.music.innertube.requests.player +import melody.offline.music.sp.AppStore +import melody.offline.music.util.CacheManager +import melody.offline.music.util.LogTag +import melody.offline.music.util.LogTag.LogD +import melody.offline.music.util.PlayMode import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking -import relax.offline.music.util.RingBuffer +import melody.offline.music.util.RingBuffer @OptIn(UnstableApi::class) class PlaybackService : MediaSessionService(), Player.Listener { diff --git a/app/src/main/java/relax/offline/music/service/ViewModelMain.kt b/app/src/main/java/melody/offline/music/service/ViewModelMain.kt similarity index 86% rename from app/src/main/java/relax/offline/music/service/ViewModelMain.kt rename to app/src/main/java/melody/offline/music/service/ViewModelMain.kt index dce373c..82adccf 100644 --- a/app/src/main/java/relax/offline/music/service/ViewModelMain.kt +++ b/app/src/main/java/melody/offline/music/service/ViewModelMain.kt @@ -1,4 +1,4 @@ -package relax.offline.music.service +package melody.offline.music.service import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/relax/offline/music/sp/AppStore.kt b/app/src/main/java/melody/offline/music/sp/AppStore.kt similarity index 89% rename from app/src/main/java/relax/offline/music/sp/AppStore.kt rename to app/src/main/java/melody/offline/music/sp/AppStore.kt index 2dde20c..7a63267 100644 --- a/app/src/main/java/relax/offline/music/sp/AppStore.kt +++ b/app/src/main/java/melody/offline/music/sp/AppStore.kt @@ -1,10 +1,10 @@ -package relax.offline.music.sp +package melody.offline.music.sp import android.content.Context -import relax.offline.music.firebase.Constants -import relax.offline.music.sp.store.Store -import relax.offline.music.sp.store.asStoreProvider -import relax.offline.music.util.PlayMode +import melody.offline.music.firebase.Constants +import melody.offline.music.sp.store.Store +import melody.offline.music.sp.store.asStoreProvider +import melody.offline.music.util.PlayMode class AppStore(context: Context) { private val store = Store( diff --git a/app/src/main/java/relax/offline/music/sp/SharedPreferencesHelper.kt b/app/src/main/java/melody/offline/music/sp/SharedPreferencesHelper.kt similarity index 98% rename from app/src/main/java/relax/offline/music/sp/SharedPreferencesHelper.kt rename to app/src/main/java/melody/offline/music/sp/SharedPreferencesHelper.kt index 0821250..13cc416 100644 --- a/app/src/main/java/relax/offline/music/sp/SharedPreferencesHelper.kt +++ b/app/src/main/java/melody/offline/music/sp/SharedPreferencesHelper.kt @@ -1,4 +1,4 @@ -package relax.offline.music.sp +package melody.offline.music.sp import android.content.Context import android.content.SharedPreferences diff --git a/app/src/main/java/relax/offline/music/sp/store/Providers.kt b/app/src/main/java/melody/offline/music/sp/store/Providers.kt similarity index 97% rename from app/src/main/java/relax/offline/music/sp/store/Providers.kt rename to app/src/main/java/melody/offline/music/sp/store/Providers.kt index 99424e4..ae5e023 100644 --- a/app/src/main/java/relax/offline/music/sp/store/Providers.kt +++ b/app/src/main/java/melody/offline/music/sp/store/Providers.kt @@ -1,4 +1,4 @@ -package relax.offline.music.sp.store +package melody.offline.music.sp.store import android.content.SharedPreferences import androidx.core.content.edit diff --git a/app/src/main/java/relax/offline/music/sp/store/Store.kt b/app/src/main/java/melody/offline/music/sp/store/Store.kt similarity index 98% rename from app/src/main/java/relax/offline/music/sp/store/Store.kt rename to app/src/main/java/melody/offline/music/sp/store/Store.kt index c9a88fa..ccb8c8c 100644 --- a/app/src/main/java/relax/offline/music/sp/store/Store.kt +++ b/app/src/main/java/melody/offline/music/sp/store/Store.kt @@ -1,4 +1,4 @@ -package relax.offline.music.sp.store +package melody.offline.music.sp.store import kotlin.reflect.KProperty diff --git a/app/src/main/java/relax/offline/music/sp/store/StoreProvider.kt b/app/src/main/java/melody/offline/music/sp/store/StoreProvider.kt similarity index 93% rename from app/src/main/java/relax/offline/music/sp/store/StoreProvider.kt rename to app/src/main/java/melody/offline/music/sp/store/StoreProvider.kt index 821c588..288af75 100644 --- a/app/src/main/java/relax/offline/music/sp/store/StoreProvider.kt +++ b/app/src/main/java/melody/offline/music/sp/store/StoreProvider.kt @@ -1,4 +1,4 @@ -package relax.offline.music.sp.store +package melody.offline.music.sp.store interface StoreProvider { fun getInt(key: String, defaultValue: Int): Int diff --git a/app/src/main/java/relax/offline/music/util/AesEncryptUtil.java b/app/src/main/java/melody/offline/music/util/AesEncryptUtil.java similarity index 96% rename from app/src/main/java/relax/offline/music/util/AesEncryptUtil.java rename to app/src/main/java/melody/offline/music/util/AesEncryptUtil.java index 4a2f669..6e9b0a6 100644 --- a/app/src/main/java/relax/offline/music/util/AesEncryptUtil.java +++ b/app/src/main/java/melody/offline/music/util/AesEncryptUtil.java @@ -1,10 +1,10 @@ -package relax.offline.music.util; +package melody.offline.music.util; import javax.crypto.Cipher; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import relax.offline.music.http.BaseApiUtil; +import melody.offline.music.http.BaseApiUtil; public class AesEncryptUtil { diff --git a/app/src/main/java/relax/offline/music/util/AnalysisUtil.kt b/app/src/main/java/melody/offline/music/util/AnalysisUtil.kt similarity index 98% rename from app/src/main/java/relax/offline/music/util/AnalysisUtil.kt rename to app/src/main/java/melody/offline/music/util/AnalysisUtil.kt index 9d66cd7..c1ad5b3 100644 --- a/app/src/main/java/relax/offline/music/util/AnalysisUtil.kt +++ b/app/src/main/java/melody/offline/music/util/AnalysisUtil.kt @@ -1,4 +1,4 @@ -package relax.offline.music.util +package melody.offline.music.util import android.os.Bundle import android.text.TextUtils diff --git a/app/src/main/java/relax/offline/music/util/AppLifecycleHandler.kt b/app/src/main/java/melody/offline/music/util/AppLifecycleHandler.kt similarity index 94% rename from app/src/main/java/relax/offline/music/util/AppLifecycleHandler.kt rename to app/src/main/java/melody/offline/music/util/AppLifecycleHandler.kt index 883de0a..db4f016 100644 --- a/app/src/main/java/relax/offline/music/util/AppLifecycleHandler.kt +++ b/app/src/main/java/melody/offline/music/util/AppLifecycleHandler.kt @@ -1,12 +1,12 @@ -package relax.offline.music.util +package melody.offline.music.util import android.app.Activity import android.app.Application import android.content.Intent import android.os.Bundle import android.os.SystemClock -import relax.offline.music.App -import relax.offline.music.activity.LaunchActivity +import melody.offline.music.App +import melody.offline.music.activity.LaunchActivity /** * 一个处理应用程序生命周期事件并管理启动页显示的类。 diff --git a/app/src/main/java/relax/offline/music/util/AudioPlayer.kt b/app/src/main/java/melody/offline/music/util/AudioPlayer.kt similarity index 98% rename from app/src/main/java/relax/offline/music/util/AudioPlayer.kt rename to app/src/main/java/melody/offline/music/util/AudioPlayer.kt index 60fb0c5..0dc8561 100644 --- a/app/src/main/java/relax/offline/music/util/AudioPlayer.kt +++ b/app/src/main/java/melody/offline/music/util/AudioPlayer.kt @@ -1,4 +1,4 @@ -package relax.offline.music.util +package melody.offline.music.util import android.content.Context import android.media.AudioAttributes diff --git a/app/src/main/java/relax/offline/music/util/Base64.java b/app/src/main/java/melody/offline/music/util/Base64.java similarity index 99% rename from app/src/main/java/relax/offline/music/util/Base64.java rename to app/src/main/java/melody/offline/music/util/Base64.java index 715d634..52cfd0a 100644 --- a/app/src/main/java/relax/offline/music/util/Base64.java +++ b/app/src/main/java/melody/offline/music/util/Base64.java @@ -1,4 +1,4 @@ -package relax.offline.music.util; +package melody.offline.music.util; import java.nio.charset.StandardCharsets; diff --git a/app/src/main/java/relax/offline/music/util/CacheManager.kt b/app/src/main/java/melody/offline/music/util/CacheManager.kt similarity index 98% rename from app/src/main/java/relax/offline/music/util/CacheManager.kt rename to app/src/main/java/melody/offline/music/util/CacheManager.kt index 93ad5c3..2416f6d 100644 --- a/app/src/main/java/relax/offline/music/util/CacheManager.kt +++ b/app/src/main/java/melody/offline/music/util/CacheManager.kt @@ -1,4 +1,4 @@ -package relax.offline.music.util +package melody.offline.music.util import android.content.Context import androidx.annotation.OptIn diff --git a/app/src/main/java/relax/offline/music/util/ConvertUtil.kt b/app/src/main/java/melody/offline/music/util/ConvertUtil.kt similarity index 94% rename from app/src/main/java/relax/offline/music/util/ConvertUtil.kt rename to app/src/main/java/melody/offline/music/util/ConvertUtil.kt index 1acd114..fc28463 100644 --- a/app/src/main/java/relax/offline/music/util/ConvertUtil.kt +++ b/app/src/main/java/melody/offline/music/util/ConvertUtil.kt @@ -1,4 +1,4 @@ -package relax.offline.music.util +package melody.offline.music.util import android.content.Context import android.content.pm.PackageManager diff --git a/app/src/main/java/relax/offline/music/util/DownloadUtil.kt b/app/src/main/java/melody/offline/music/util/DownloadUtil.kt similarity index 93% rename from app/src/main/java/relax/offline/music/util/DownloadUtil.kt rename to app/src/main/java/melody/offline/music/util/DownloadUtil.kt index 1d3c053..2d76769 100644 --- a/app/src/main/java/relax/offline/music/util/DownloadUtil.kt +++ b/app/src/main/java/melody/offline/music/util/DownloadUtil.kt @@ -1,4 +1,4 @@ -package relax.offline.music.util +package melody.offline.music.util import android.app.Notification import android.content.Context @@ -21,23 +21,21 @@ 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 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 melody.offline.music.R +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.Innertube.TAG +import melody.offline.music.innertube.models.bodies.PlayerBody +import melody.offline.music.innertube.requests.player +import melody.offline.music.service.LoginRequiredException +import melody.offline.music.service.PlayableFormatNotFoundException +import melody.offline.music.service.UnplayableException +import melody.offline.music.service.VideoIdMismatchException +import melody.offline.music.service.ViewModelMain import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking -import relax.offline.music.App +import melody.offline.music.App import java.net.CookieHandler import java.net.CookieManager import java.net.CookiePolicy diff --git a/app/src/main/java/relax/offline/music/util/ExoPlayerDiskCacheMaxSize.kt b/app/src/main/java/melody/offline/music/util/ExoPlayerDiskCacheMaxSize.kt similarity index 91% rename from app/src/main/java/relax/offline/music/util/ExoPlayerDiskCacheMaxSize.kt rename to app/src/main/java/melody/offline/music/util/ExoPlayerDiskCacheMaxSize.kt index 40c8138..fd91106 100644 --- a/app/src/main/java/relax/offline/music/util/ExoPlayerDiskCacheMaxSize.kt +++ b/app/src/main/java/melody/offline/music/util/ExoPlayerDiskCacheMaxSize.kt @@ -1,4 +1,4 @@ -package relax.offline.music.util +package melody.offline.music.util enum class ExoPlayerDiskCacheMaxSize { `32MB`, diff --git a/app/src/main/java/relax/offline/music/util/FileSizeConverter.kt b/app/src/main/java/melody/offline/music/util/FileSizeConverter.kt similarity index 97% rename from app/src/main/java/relax/offline/music/util/FileSizeConverter.kt rename to app/src/main/java/melody/offline/music/util/FileSizeConverter.kt index 13f7456..1d0b91a 100644 --- a/app/src/main/java/relax/offline/music/util/FileSizeConverter.kt +++ b/app/src/main/java/melody/offline/music/util/FileSizeConverter.kt @@ -1,4 +1,4 @@ -package relax.offline.music.util +package melody.offline.music.util class FileSizeConverter(private val sizeInBytes: Long) { diff --git a/app/src/main/java/relax/offline/music/util/GridSpacingItemDecoration.kt b/app/src/main/java/melody/offline/music/util/GridSpacingItemDecoration.kt similarity index 96% rename from app/src/main/java/relax/offline/music/util/GridSpacingItemDecoration.kt rename to app/src/main/java/melody/offline/music/util/GridSpacingItemDecoration.kt index 2b8e753..4b5d476 100644 --- a/app/src/main/java/relax/offline/music/util/GridSpacingItemDecoration.kt +++ b/app/src/main/java/melody/offline/music/util/GridSpacingItemDecoration.kt @@ -1,4 +1,4 @@ -package relax.offline.music.util +package melody.offline.music.util import android.content.Context import android.graphics.Rect diff --git a/app/src/main/java/relax/offline/music/util/HorizontalSpaceItemDecoration.kt b/app/src/main/java/melody/offline/music/util/HorizontalSpaceItemDecoration.kt similarity index 96% rename from app/src/main/java/relax/offline/music/util/HorizontalSpaceItemDecoration.kt rename to app/src/main/java/melody/offline/music/util/HorizontalSpaceItemDecoration.kt index 1ef0b42..ae05768 100644 --- a/app/src/main/java/relax/offline/music/util/HorizontalSpaceItemDecoration.kt +++ b/app/src/main/java/melody/offline/music/util/HorizontalSpaceItemDecoration.kt @@ -1,4 +1,4 @@ -package relax.offline.music.util +package melody.offline.music.util import android.content.Context import android.graphics.Rect diff --git a/app/src/main/java/relax/offline/music/util/LogTag.kt b/app/src/main/java/melody/offline/music/util/LogTag.kt similarity index 87% rename from app/src/main/java/relax/offline/music/util/LogTag.kt rename to app/src/main/java/melody/offline/music/util/LogTag.kt index b5413d2..b9e0f0b 100644 --- a/app/src/main/java/relax/offline/music/util/LogTag.kt +++ b/app/src/main/java/melody/offline/music/util/LogTag.kt @@ -1,7 +1,7 @@ -package relax.offline.music.util +package melody.offline.music.util import android.util.Log -import relax.offline.music.BuildConfig +import melody.offline.music.BuildConfig object LogTag { const val VO_ACT_LOG = "vo-act—log" diff --git a/app/src/main/java/relax/offline/music/util/OpenUrlUtil.kt b/app/src/main/java/melody/offline/music/util/OpenUrlUtil.kt similarity index 88% rename from app/src/main/java/relax/offline/music/util/OpenUrlUtil.kt rename to app/src/main/java/melody/offline/music/util/OpenUrlUtil.kt index cc12dd7..5126db2 100644 --- a/app/src/main/java/relax/offline/music/util/OpenUrlUtil.kt +++ b/app/src/main/java/melody/offline/music/util/OpenUrlUtil.kt @@ -1,12 +1,12 @@ -package relax.offline.music.util +package melody.offline.music.util import android.content.Context import android.content.Intent import android.net.Uri import android.widget.Toast -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" +const val PRIVACY_POLICY_URL = "https://himelody.mystrikingly.com/privacy" +const val TERMS_OF_SERVICE_URL = "https://himelody.mystrikingly.com/terms" fun openPrivacyPolicy(context: Context, privacyPolicyUrl: String) { val intent = Intent(Intent.ACTION_VIEW, Uri.parse(privacyPolicyUrl)) diff --git a/app/src/main/java/relax/offline/music/util/PlayMode.kt b/app/src/main/java/melody/offline/music/util/PlayMode.kt similarity index 88% rename from app/src/main/java/relax/offline/music/util/PlayMode.kt rename to app/src/main/java/melody/offline/music/util/PlayMode.kt index 4115bfd..e32d3c6 100644 --- a/app/src/main/java/relax/offline/music/util/PlayMode.kt +++ b/app/src/main/java/melody/offline/music/util/PlayMode.kt @@ -1,4 +1,4 @@ -package relax.offline.music.util +package melody.offline.music.util enum class PlayMode(val value: Int) { LIST_LOOP(0), // 列表循环 diff --git a/app/src/main/java/relax/offline/music/util/ResourcesMusicUtil.kt b/app/src/main/java/melody/offline/music/util/ResourcesMusicUtil.kt similarity index 94% rename from app/src/main/java/relax/offline/music/util/ResourcesMusicUtil.kt rename to app/src/main/java/melody/offline/music/util/ResourcesMusicUtil.kt index a9644c8..03b66bf 100644 --- a/app/src/main/java/relax/offline/music/util/ResourcesMusicUtil.kt +++ b/app/src/main/java/melody/offline/music/util/ResourcesMusicUtil.kt @@ -1,13 +1,13 @@ -package relax.offline.music.util +package melody.offline.music.util import android.content.Context import android.database.Cursor import android.media.MediaMetadataRetriever import android.net.Uri import android.provider.MediaStore -import relax.offline.music.bean.Audio -import relax.offline.music.bean.Category -import relax.offline.music.bean.ResourcesList +import melody.offline.music.bean.Audio +import melody.offline.music.bean.Category +import melody.offline.music.bean.ResourcesList import org.json.JSONObject import java.io.File import java.io.InputStream diff --git a/app/src/main/java/relax/offline/music/util/RingBuffer.kt b/app/src/main/java/melody/offline/music/util/RingBuffer.kt similarity index 88% rename from app/src/main/java/relax/offline/music/util/RingBuffer.kt rename to app/src/main/java/melody/offline/music/util/RingBuffer.kt index 2b48b25..9ac808c 100644 --- a/app/src/main/java/relax/offline/music/util/RingBuffer.kt +++ b/app/src/main/java/melody/offline/music/util/RingBuffer.kt @@ -1,4 +1,4 @@ -package relax.offline.music.util +package melody.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/relax/offline/music/util/Utils.kt b/app/src/main/java/melody/offline/music/util/Utils.kt similarity index 91% rename from app/src/main/java/relax/offline/music/util/Utils.kt rename to app/src/main/java/melody/offline/music/util/Utils.kt index b853135..0794246 100644 --- a/app/src/main/java/relax/offline/music/util/Utils.kt +++ b/app/src/main/java/melody/offline/music/util/Utils.kt @@ -1,4 +1,4 @@ -package relax.offline.music.util +package melody.offline.music.util import android.net.Uri import android.os.Build @@ -9,12 +9,12 @@ import androidx.core.os.bundleOf import androidx.media3.common.MediaItem import androidx.media3.common.MediaMetadata import androidx.media3.common.util.UnstableApi -import relax.offline.music.bean.FavoriteBean -import relax.offline.music.bean.OfflineBean -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 +import melody.offline.music.bean.FavoriteBean +import melody.offline.music.bean.OfflineBean +import melody.offline.music.innertube.Innertube +import melody.offline.music.innertube.models.bodies.ContinuationBody +import melody.offline.music.innertube.requests.playlistPage +import melody.offline.music.innertube.utils.plus val OfflineBean.asMediaItem: MediaItem @OptIn(UnstableApi::class) diff --git a/app/src/main/java/relax/offline/music/view/BlurLayout.kt b/app/src/main/java/melody/offline/music/view/BlurLayout.kt similarity index 99% rename from app/src/main/java/relax/offline/music/view/BlurLayout.kt rename to app/src/main/java/melody/offline/music/view/BlurLayout.kt index 43f5fc7..895baef 100644 --- a/app/src/main/java/relax/offline/music/view/BlurLayout.kt +++ b/app/src/main/java/melody/offline/music/view/BlurLayout.kt @@ -1,4 +1,4 @@ -package relax.offline.music.view +package melody.offline.music.view import android.content.Context import android.graphics.* diff --git a/app/src/main/java/relax/offline/music/view/CircularProgressBar.kt b/app/src/main/java/melody/offline/music/view/CircularProgressBar.kt similarity index 98% rename from app/src/main/java/relax/offline/music/view/CircularProgressBar.kt rename to app/src/main/java/melody/offline/music/view/CircularProgressBar.kt index 3a92a41..39c9866 100644 --- a/app/src/main/java/relax/offline/music/view/CircularProgressBar.kt +++ b/app/src/main/java/melody/offline/music/view/CircularProgressBar.kt @@ -1,4 +1,4 @@ -package relax.offline.music.view +package melody.offline.music.view import android.content.Context import android.graphics.Canvas diff --git a/app/src/main/java/relax/offline/music/view/CustomProgressBar.kt b/app/src/main/java/melody/offline/music/view/CustomProgressBar.kt similarity index 98% rename from app/src/main/java/relax/offline/music/view/CustomProgressBar.kt rename to app/src/main/java/melody/offline/music/view/CustomProgressBar.kt index 74978aa..cb6a49a 100644 --- a/app/src/main/java/relax/offline/music/view/CustomProgressBar.kt +++ b/app/src/main/java/melody/offline/music/view/CustomProgressBar.kt @@ -1,4 +1,4 @@ -package relax.offline.music.view +package melody.offline.music.view import android.content.Context import android.graphics.Canvas diff --git a/app/src/main/java/relax/offline/music/view/MarqueeTextView.java b/app/src/main/java/melody/offline/music/view/MarqueeTextView.java similarity index 95% rename from app/src/main/java/relax/offline/music/view/MarqueeTextView.java rename to app/src/main/java/melody/offline/music/view/MarqueeTextView.java index 69ecc09..0d2cf81 100644 --- a/app/src/main/java/relax/offline/music/view/MarqueeTextView.java +++ b/app/src/main/java/melody/offline/music/view/MarqueeTextView.java @@ -1,4 +1,4 @@ -package relax.offline.music.view; +package melody.offline.music.view; import android.content.Context; import android.text.TextUtils; diff --git a/app/src/main/java/relax/offline/music/view/ModuleView.kt b/app/src/main/java/melody/offline/music/view/ModuleView.kt similarity index 93% rename from app/src/main/java/relax/offline/music/view/ModuleView.kt rename to app/src/main/java/melody/offline/music/view/ModuleView.kt index c3076fe..bddc020 100644 --- a/app/src/main/java/relax/offline/music/view/ModuleView.kt +++ b/app/src/main/java/melody/offline/music/view/ModuleView.kt @@ -1,4 +1,4 @@ -package relax.offline.music.view +package melody.offline.music.view import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/relax/offline/music/view/MusicBarsView.kt b/app/src/main/java/melody/offline/music/view/MusicBarsView.kt similarity index 98% rename from app/src/main/java/relax/offline/music/view/MusicBarsView.kt rename to app/src/main/java/melody/offline/music/view/MusicBarsView.kt index c0583ce..12c82b4 100644 --- a/app/src/main/java/relax/offline/music/view/MusicBarsView.kt +++ b/app/src/main/java/melody/offline/music/view/MusicBarsView.kt @@ -1,4 +1,4 @@ -package relax.offline.music.view +package melody.offline.music.view import android.animation.ValueAnimator import android.content.Context diff --git a/app/src/main/java/relax/offline/music/view/MusicPlayerView.kt b/app/src/main/java/melody/offline/music/view/MusicPlayerView.kt similarity index 91% rename from app/src/main/java/relax/offline/music/view/MusicPlayerView.kt rename to app/src/main/java/melody/offline/music/view/MusicPlayerView.kt index 3f13c63..021ed5f 100644 --- a/app/src/main/java/relax/offline/music/view/MusicPlayerView.kt +++ b/app/src/main/java/melody/offline/music/view/MusicPlayerView.kt @@ -1,4 +1,4 @@ -package relax.offline.music.view +package melody.offline.music.view import android.annotation.SuppressLint import android.app.Activity @@ -15,15 +15,14 @@ import androidx.media3.common.MediaItem import androidx.media3.common.Player import androidx.media3.session.MediaController import com.bumptech.glide.Glide -import relax.offline.music.R -import relax.offline.music.activity.MoPlayDetailsActivity -import relax.offline.music.activity.PrimaryActivity -import relax.offline.music.fragment.MoHomeFragment -import relax.offline.music.fragment.MoMeFragment -import relax.offline.music.fragment.SearchFragment -import relax.offline.music.media.MediaControllerManager -import relax.offline.music.util.AnalysisUtil -import relax.offline.music.util.LogTag +import melody.offline.music.R +import melody.offline.music.activity.MoPlayDetailsActivity +import melody.offline.music.activity.PrimaryActivity +import melody.offline.music.fragment.MoHomeFragment +import melody.offline.music.fragment.MoMeFragment +import melody.offline.music.fragment.SearchFragment +import melody.offline.music.media.MediaControllerManager +import melody.offline.music.util.AnalysisUtil @SuppressLint("ViewConstructor") class MusicPlayerView( diff --git a/app/src/main/java/relax/offline/music/view/MusicResponsiveListView.kt b/app/src/main/java/melody/offline/music/view/MusicResponsiveListView.kt similarity index 87% rename from app/src/main/java/relax/offline/music/view/MusicResponsiveListView.kt rename to app/src/main/java/melody/offline/music/view/MusicResponsiveListView.kt index f7f059c..3bb31ca 100644 --- a/app/src/main/java/relax/offline/music/view/MusicResponsiveListView.kt +++ b/app/src/main/java/melody/offline/music/view/MusicResponsiveListView.kt @@ -1,4 +1,4 @@ -package relax.offline.music.view +package melody.offline.music.view import android.annotation.SuppressLint import android.content.Context @@ -6,10 +6,10 @@ import android.widget.TextView import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import org.json.JSONObject -import relax.offline.music.R -import relax.offline.music.adapter.ResponsiveListAdapter -import relax.offline.music.innertube.Innertube -import relax.offline.music.util.AnalysisUtil +import melody.offline.music.R +import melody.offline.music.adapter.ResponsiveListAdapter +import melody.offline.music.innertube.Innertube +import melody.offline.music.util.AnalysisUtil @SuppressLint("ViewConstructor") class MusicResponsiveListView(context: Context, homePage: Innertube.HomePage) : diff --git a/app/src/main/java/relax/offline/music/view/MusicTowRowListView.kt b/app/src/main/java/melody/offline/music/view/MusicTowRowListView.kt similarity index 85% rename from app/src/main/java/relax/offline/music/view/MusicTowRowListView.kt rename to app/src/main/java/melody/offline/music/view/MusicTowRowListView.kt index d71900f..cf1baeb 100644 --- a/app/src/main/java/relax/offline/music/view/MusicTowRowListView.kt +++ b/app/src/main/java/melody/offline/music/view/MusicTowRowListView.kt @@ -1,4 +1,4 @@ -package relax.offline.music.view +package melody.offline.music.view import android.annotation.SuppressLint import android.app.Activity @@ -6,10 +6,10 @@ import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import org.json.JSONObject -import relax.offline.music.R -import relax.offline.music.adapter.TowRowListAdapter -import relax.offline.music.innertube.Innertube -import relax.offline.music.util.AnalysisUtil +import melody.offline.music.R +import melody.offline.music.adapter.TowRowListAdapter +import melody.offline.music.innertube.Innertube +import melody.offline.music.util.AnalysisUtil @SuppressLint("ViewConstructor") class MusicTowRowListView(context: Activity, homePage: Innertube.HomePage) : ModuleView(context) { diff --git a/app/src/main/java/relax/offline/music/view/RadiusLayout.kt b/app/src/main/java/melody/offline/music/view/RadiusLayout.kt similarity index 97% rename from app/src/main/java/relax/offline/music/view/RadiusLayout.kt rename to app/src/main/java/melody/offline/music/view/RadiusLayout.kt index 16c3b34..791c594 100644 --- a/app/src/main/java/relax/offline/music/view/RadiusLayout.kt +++ b/app/src/main/java/melody/offline/music/view/RadiusLayout.kt @@ -1,4 +1,4 @@ -package relax.offline.music.view +package melody.offline.music.view import android.content.Context import android.graphics.* diff --git a/app/src/main/java/relax/offline/music/view/SearchResultOptimalView.kt b/app/src/main/java/melody/offline/music/view/SearchResultOptimalView.kt similarity index 90% rename from app/src/main/java/relax/offline/music/view/SearchResultOptimalView.kt rename to app/src/main/java/melody/offline/music/view/SearchResultOptimalView.kt index 29ae76b..14de5ba 100644 --- a/app/src/main/java/relax/offline/music/view/SearchResultOptimalView.kt +++ b/app/src/main/java/melody/offline/music/view/SearchResultOptimalView.kt @@ -1,4 +1,4 @@ -package relax.offline.music.view +package melody.offline.music.view import android.annotation.SuppressLint import android.content.Context @@ -7,12 +7,12 @@ import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView import com.bumptech.glide.Glide -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 -import relax.offline.music.util.AnalysisUtil +import melody.offline.music.R +import melody.offline.music.activity.MoListDetailsActivity +import melody.offline.music.activity.MoPlayDetailsActivity +import melody.offline.music.activity.MoSingerDetailsActivity +import melody.offline.music.innertube.Innertube +import melody.offline.music.util.AnalysisUtil @SuppressLint("ViewConstructor") class SearchResultOptimalView(context: Context, data: Innertube.SearchDataPage) : diff --git a/app/src/main/java/relax/offline/music/view/SearchResultOtherView.kt b/app/src/main/java/melody/offline/music/view/SearchResultOtherView.kt similarity index 85% rename from app/src/main/java/relax/offline/music/view/SearchResultOtherView.kt rename to app/src/main/java/melody/offline/music/view/SearchResultOtherView.kt index fb7062d..586819f 100644 --- a/app/src/main/java/relax/offline/music/view/SearchResultOtherView.kt +++ b/app/src/main/java/melody/offline/music/view/SearchResultOtherView.kt @@ -1,4 +1,4 @@ -package relax.offline.music.view +package melody.offline.music.view import android.annotation.SuppressLint import android.content.Context @@ -7,11 +7,11 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import relax.offline.music.R -import relax.offline.music.activity.MoSearchMoreActivity -import relax.offline.music.adapter.SearchResultOtherAdapter -import relax.offline.music.innertube.Innertube -import relax.offline.music.util.AnalysisUtil +import melody.offline.music.R +import melody.offline.music.activity.MoSearchMoreActivity +import melody.offline.music.adapter.SearchResultOtherAdapter +import melody.offline.music.innertube.Innertube +import melody.offline.music.util.AnalysisUtil @SuppressLint("ViewConstructor") class SearchResultOtherView(context: Context, data: Innertube.SearchDataPage) : diff --git a/app/src/main/java/relax/offline/music/view/SingerDetailsOtherView.kt b/app/src/main/java/melody/offline/music/view/SingerDetailsOtherView.kt similarity index 88% rename from app/src/main/java/relax/offline/music/view/SingerDetailsOtherView.kt rename to app/src/main/java/melody/offline/music/view/SingerDetailsOtherView.kt index f5319ae..d0988da 100644 --- a/app/src/main/java/relax/offline/music/view/SingerDetailsOtherView.kt +++ b/app/src/main/java/melody/offline/music/view/SingerDetailsOtherView.kt @@ -1,4 +1,4 @@ -package relax.offline.music.view +package melody.offline.music.view import android.annotation.SuppressLint import android.app.Activity @@ -7,10 +7,10 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import relax.offline.music.R -import relax.offline.music.activity.MoSingerMoreSongActivity -import relax.offline.music.adapter.TowRowListAdapter -import relax.offline.music.innertube.Innertube +import melody.offline.music.R +import melody.offline.music.activity.MoSingerMoreSongActivity +import melody.offline.music.adapter.TowRowListAdapter +import melody.offline.music.innertube.Innertube @SuppressLint("ViewConstructor") class SingerDetailsOtherView(context: Activity, bean: Innertube.SingerDetailsListPage) : diff --git a/app/src/main/java/relax/offline/music/view/SingerDetailsSongView.kt b/app/src/main/java/melody/offline/music/view/SingerDetailsSongView.kt similarity index 85% rename from app/src/main/java/relax/offline/music/view/SingerDetailsSongView.kt rename to app/src/main/java/melody/offline/music/view/SingerDetailsSongView.kt index b31678a..a98d08d 100644 --- a/app/src/main/java/relax/offline/music/view/SingerDetailsSongView.kt +++ b/app/src/main/java/melody/offline/music/view/SingerDetailsSongView.kt @@ -1,4 +1,4 @@ -package relax.offline.music.view +package melody.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 relax.offline.music.R -import relax.offline.music.activity.MoSingerMoreSongActivity -import relax.offline.music.adapter.SingerDetailsSongListAdapter -import relax.offline.music.innertube.Innertube +import melody.offline.music.R +import melody.offline.music.activity.MoSingerMoreSongActivity +import melody.offline.music.adapter.SingerDetailsSongListAdapter +import melody.offline.music.innertube.Innertube @SuppressLint("ViewConstructor") class SingerDetailsSongView(context: Context, bean: Innertube.SingerDetailsListPage) : diff --git a/app/src/main/res/layout/activity_launch.xml b/app/src/main/res/layout/activity_launch.xml index 58d8c6d..8a1908a 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" /> - - - - - - - @@ -69,7 +69,7 @@ android:gravity="center_vertical" android:orientation="vertical"> - - - @@ -64,7 +64,7 @@ android:gravity="center_vertical" android:orientation="vertical"> - - - - - - @@ -55,7 +55,7 @@ android:gravity="center_vertical" android:orientation="vertical"> - - - - - @@ -64,7 +64,7 @@ android:gravity="center_vertical" android:orientation="vertical"> - - - - @@ -63,7 +63,7 @@ android:gravity="center_vertical" android:orientation="vertical"> - - - @@ -24,7 +24,7 @@ android:layout_height="match_parent" android:scaleType="centerCrop" /> - + - - - - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 10f5856..0f79753 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - Musiclax + HiMelody Sleep Soundly Tonight Experience the tranquility of our specially designed sleep sounds. Data Error diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 4af2abe..9db3450 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,10 +1,10 @@ - -