From 58720f8cb919ecc84932d359339e7fb261fa92fe Mon Sep 17 00:00:00 2001 From: vfsfitvnm Date: Sun, 16 Oct 2022 15:31:27 +0200 Subject: [PATCH] Rename youtubemusic package to innertube --- .../it/vfsfitvnm/vimusic/MainActivity.kt | 8 +++---- .../vimusic/savers/InnertubeAlbumItemSaver.kt | 2 +- .../savers/InnertubeArtistItemSaver.kt | 2 +- .../savers/InnertubeArtistPageSaver.kt | 2 +- .../savers/InnertubeBrowseEndpointSaver.kt | 2 +- .../savers/InnertubeBrowseInfoSaver.kt | 4 ++-- .../savers/InnertubePlaylistItemSaver.kt | 2 +- .../InnertubePlaylistOrAlbumPageSaver.kt | 2 +- .../savers/InnertubeRelatedPageSaver.kt | 2 +- .../vimusic/savers/InnertubeSongItemSaver.kt | 2 +- .../vimusic/savers/InnertubeThumbnailSaver.kt | 2 +- .../vimusic/savers/InnertubeVideoItemSaver.kt | 2 +- .../savers/InnertubeWatchEndpointSaver.kt | 2 +- .../vimusic/savers/InnertubeWatchInfoSaver.kt | 4 ++-- .../it/vfsfitvnm/vimusic/savers/Savers.kt | 2 +- .../vimusic/service/PlayerService.kt | 8 +++---- .../ui/components/themed/MediaItemMenu.kt | 2 +- .../vfsfitvnm/vimusic/ui/items/AlbumItem.kt | 2 +- .../vfsfitvnm/vimusic/ui/items/ArtistItem.kt | 2 +- .../vimusic/ui/items/PlaylistItem.kt | 2 +- .../it/vfsfitvnm/vimusic/ui/items/SongItem.kt | 2 +- .../vfsfitvnm/vimusic/ui/items/VideoItem.kt | 2 +- .../vimusic/ui/screens/album/AlbumScreen.kt | 6 ++--- .../ui/screens/artist/ArtistOverview.kt | 4 ++-- .../vimusic/ui/screens/artist/ArtistScreen.kt | 12 +++++----- .../vimusic/ui/screens/home/QuickPicks.kt | 8 +++---- .../localplaylist/LocalPlaylistSongs.kt | 6 ++--- .../vimusic/ui/screens/player/Lyrics.kt | 6 ++--- .../vimusic/ui/screens/player/Player.kt | 2 +- .../ui/screens/player/StatsForNerds.kt | 6 ++--- .../ui/screens/playlist/PlaylistSongList.kt | 6 ++--- .../ui/screens/search/LocalSongSearch.kt | 2 +- .../vimusic/ui/screens/search/OnlineSearch.kt | 6 ++--- .../ui/screens/searchresult/ItemsPage.kt | 4 ++-- .../searchresult/SearchResultScreen.kt | 10 ++++----- .../it/vfsfitvnm/vimusic/utils/Utils.kt | 8 +++---- .../vfsfitvnm/vimusic/utils/YoutubeRadio.kt | 8 +++---- .../{youtubemusic => innertube}/Innertube.kt | 8 +++---- .../models/BrowseResponse.kt | 2 +- .../models/ButtonRenderer.kt | 2 +- .../models/Context.kt | 2 +- .../models/Continuation.kt | 2 +- .../models/ContinuationResponse.kt | 2 +- .../models/GetQueueResponse.kt | 2 +- .../models/GridRenderer.kt | 2 +- .../models/MusicCarouselShelfRenderer.kt | 2 +- .../models/MusicResponsiveListItemRenderer.kt | 2 +- .../models/MusicShelfRenderer.kt | 2 +- .../models/MusicTwoRowItemRenderer.kt | 2 +- .../models/NavigationEndpoint.kt | 2 +- .../models/NextResponse.kt | 2 +- .../models/PlayerResponse.kt | 2 +- .../models/PlaylistPanelVideoRenderer.kt | 2 +- .../models/Runs.kt | 2 +- .../models/SearchResponse.kt | 2 +- .../models/SearchSuggestionsResponse.kt | 2 +- .../models/SectionListRenderer.kt | 2 +- .../models/Tabs.kt | 2 +- .../models/Thumbnail.kt | 2 +- .../models/ThumbnailRenderer.kt | 4 ++-- .../models/bodies/BrowseBody.kt | 4 ++-- .../models/bodies/ContinuationBody.kt | 4 ++-- .../models/bodies/NextBody.kt | 4 ++-- .../models/bodies/PlayerBody.kt | 4 ++-- .../models/bodies/QueueBody.kt | 4 ++-- .../models/bodies/SearchBody.kt | 4 ++-- .../models/bodies/SearchSuggestionsBody.kt | 4 ++-- .../requests/AlbumPage.kt | 8 +++---- .../requests/ArtistPage.kt | 20 ++++++++--------- .../requests/ItemsPage.kt | 22 +++++++++---------- .../requests/Lyrics.kt | 14 ++++++------ .../requests/NextPage.kt | 16 +++++++------- .../requests/Player.kt | 12 +++++----- .../requests/PlaylistPage.kt | 20 ++++++++--------- .../requests/Queue.kt | 12 +++++----- .../requests/RelatedPage.kt | 22 +++++++++---------- .../requests/SearchPage.kt | 16 +++++++------- .../requests/SearchSuggestions.kt | 10 ++++----- .../FromMusicResponsiveListItemRenderer.kt | 10 ++++----- .../utils/FromMusicShelfRendererContent.kt | 8 +++---- .../utils/FromMusicTwoRowItemRenderer.kt | 6 ++--- .../utils/FromPlaylistPanelVideoRenderer.kt | 6 ++--- .../utils/Utils.kt | 6 ++--- 83 files changed, 222 insertions(+), 222 deletions(-) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/Innertube.kt (97%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/BrowseResponse.kt (97%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/ButtonRenderer.kt (76%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/Context.kt (97%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/Continuation.kt (91%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/ContinuationResponse.kt (93%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/GetQueueResponse.kt (86%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/GridRenderer.kt (84%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/MusicCarouselShelfRenderer.kt (96%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/MusicResponsiveListItemRenderer.kt (94%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/MusicShelfRenderer.kt (96%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/MusicTwoRowItemRenderer.kt (85%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/NavigationEndpoint.kt (99%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/NextResponse.kt (98%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/PlayerResponse.kt (96%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/PlaylistPanelVideoRenderer.kt (89%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/Runs.kt (95%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/SearchResponse.kt (86%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/SearchSuggestionsResponse.kt (94%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/SectionListRenderer.kt (95%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/Tabs.kt (92%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/Thumbnail.kt (92%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/ThumbnailRenderer.kt (81%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/bodies/BrowseBody.kt (66%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/bodies/ContinuationBody.kt (63%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/bodies/NextBody.kt (87%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/bodies/PlayerBody.kt (66%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/bodies/QueueBody.kt (68%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/bodies/SearchBody.kt (64%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/models/bodies/SearchSuggestionsBody.kt (62%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/requests/AlbumPage.kt (84%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/requests/ArtistPage.kt (86%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/requests/ItemsPage.kt (84%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/requests/Lyrics.kt (75%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/requests/NextPage.kt (86%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/requests/Player.kt (87%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/requests/PlaylistPage.kt (84%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/requests/Queue.kt (69%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/requests/RelatedPage.kt (80%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/requests/SearchPage.kt (79%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/requests/SearchSuggestions.kt (72%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/utils/FromMusicResponsiveListItemRenderer.kt (84%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/utils/FromMusicShelfRendererContent.kt (95%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/utils/FromMusicTwoRowItemRenderer.kt (93%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/utils/FromPlaylistPanelVideoRenderer.kt (85%) rename innertube/src/main/kotlin/it/vfsfitvnm/{youtubemusic => innertube}/utils/Utils.kt (90%) diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt index ff2acaf..7317327 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/MainActivity.kt @@ -84,10 +84,10 @@ import it.vfsfitvnm.vimusic.utils.intent import it.vfsfitvnm.vimusic.utils.listener import it.vfsfitvnm.vimusic.utils.preferences import it.vfsfitvnm.vimusic.utils.thumbnailRoundnessKey -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.bodies.BrowseBody -import it.vfsfitvnm.youtubemusic.requests.playlistPage -import it.vfsfitvnm.youtubemusic.requests.song +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.bodies.BrowseBody +import it.vfsfitvnm.innertube.requests.playlistPage +import it.vfsfitvnm.innertube.requests.song import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.flow.filterNotNull diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeAlbumItemSaver.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeAlbumItemSaver.kt index 78e1854..11dfe8b 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeAlbumItemSaver.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeAlbumItemSaver.kt @@ -2,7 +2,7 @@ package it.vfsfitvnm.vimusic.savers import androidx.compose.runtime.saveable.Saver import androidx.compose.runtime.saveable.SaverScope -import it.vfsfitvnm.youtubemusic.Innertube +import it.vfsfitvnm.innertube.Innertube object InnertubeAlbumItemSaver : Saver> { override fun SaverScope.save(value: Innertube.AlbumItem): List = listOf( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeArtistItemSaver.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeArtistItemSaver.kt index fd94ebe..5b706a1 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeArtistItemSaver.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeArtistItemSaver.kt @@ -2,7 +2,7 @@ package it.vfsfitvnm.vimusic.savers import androidx.compose.runtime.saveable.Saver import androidx.compose.runtime.saveable.SaverScope -import it.vfsfitvnm.youtubemusic.Innertube +import it.vfsfitvnm.innertube.Innertube object InnertubeArtistItemSaver : Saver> { override fun SaverScope.save(value: Innertube.ArtistItem): List = listOf( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeArtistPageSaver.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeArtistPageSaver.kt index 5a86315..972ba95 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeArtistPageSaver.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeArtistPageSaver.kt @@ -2,7 +2,7 @@ package it.vfsfitvnm.vimusic.savers import androidx.compose.runtime.saveable.Saver import androidx.compose.runtime.saveable.SaverScope -import it.vfsfitvnm.youtubemusic.Innertube +import it.vfsfitvnm.innertube.Innertube object InnertubeArtistPageSaver : Saver> { override fun SaverScope.save(value: Innertube.ArtistPage) = listOf( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeBrowseEndpointSaver.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeBrowseEndpointSaver.kt index 2ccd732..3b7097b 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeBrowseEndpointSaver.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeBrowseEndpointSaver.kt @@ -2,7 +2,7 @@ package it.vfsfitvnm.vimusic.savers import androidx.compose.runtime.saveable.Saver import androidx.compose.runtime.saveable.SaverScope -import it.vfsfitvnm.youtubemusic.models.NavigationEndpoint +import it.vfsfitvnm.innertube.models.NavigationEndpoint object InnertubeBrowseEndpointSaver : Saver> { override fun SaverScope.save(value: NavigationEndpoint.Endpoint.Browse) = listOf( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeBrowseInfoSaver.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeBrowseInfoSaver.kt index 9a0e876..5a14451 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeBrowseInfoSaver.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeBrowseInfoSaver.kt @@ -2,8 +2,8 @@ package it.vfsfitvnm.vimusic.savers import androidx.compose.runtime.saveable.Saver import androidx.compose.runtime.saveable.SaverScope -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.NavigationEndpoint +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.NavigationEndpoint object InnertubeBrowseInfoSaver : Saver, List> { override fun SaverScope.save(value: Innertube.Info) = listOf( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubePlaylistItemSaver.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubePlaylistItemSaver.kt index 3f82dfc..21c0eb6 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubePlaylistItemSaver.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubePlaylistItemSaver.kt @@ -2,7 +2,7 @@ package it.vfsfitvnm.vimusic.savers import androidx.compose.runtime.saveable.Saver import androidx.compose.runtime.saveable.SaverScope -import it.vfsfitvnm.youtubemusic.Innertube +import it.vfsfitvnm.innertube.Innertube object InnertubePlaylistItemSaver : Saver> { override fun SaverScope.save(value: Innertube.PlaylistItem): List = listOf( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubePlaylistOrAlbumPageSaver.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubePlaylistOrAlbumPageSaver.kt index de0fdd9..e4f350d 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubePlaylistOrAlbumPageSaver.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubePlaylistOrAlbumPageSaver.kt @@ -2,7 +2,7 @@ package it.vfsfitvnm.vimusic.savers import androidx.compose.runtime.saveable.Saver import androidx.compose.runtime.saveable.SaverScope -import it.vfsfitvnm.youtubemusic.Innertube +import it.vfsfitvnm.innertube.Innertube object InnertubePlaylistOrAlbumPageSaver : Saver> { override fun SaverScope.save(value: Innertube.PlaylistOrAlbumPage): List = listOf( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeRelatedPageSaver.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeRelatedPageSaver.kt index 46f9f16..a913411 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeRelatedPageSaver.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeRelatedPageSaver.kt @@ -2,7 +2,7 @@ package it.vfsfitvnm.vimusic.savers import androidx.compose.runtime.saveable.Saver import androidx.compose.runtime.saveable.SaverScope -import it.vfsfitvnm.youtubemusic.Innertube +import it.vfsfitvnm.innertube.Innertube object InnertubeRelatedPageSaver : Saver> { override fun SaverScope.save(value: Innertube.RelatedPage): List = listOf( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeSongItemSaver.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeSongItemSaver.kt index 0a696b9..6d87947 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeSongItemSaver.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeSongItemSaver.kt @@ -2,7 +2,7 @@ package it.vfsfitvnm.vimusic.savers import androidx.compose.runtime.saveable.Saver import androidx.compose.runtime.saveable.SaverScope -import it.vfsfitvnm.youtubemusic.Innertube +import it.vfsfitvnm.innertube.Innertube object InnertubeSongItemSaver : Saver> { override fun SaverScope.save(value: Innertube.SongItem): List = listOf( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeThumbnailSaver.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeThumbnailSaver.kt index 2aa3b64..1b1d589 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeThumbnailSaver.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeThumbnailSaver.kt @@ -2,7 +2,7 @@ package it.vfsfitvnm.vimusic.savers import androidx.compose.runtime.saveable.Saver import androidx.compose.runtime.saveable.SaverScope -import it.vfsfitvnm.youtubemusic.models.Thumbnail +import it.vfsfitvnm.innertube.models.Thumbnail object InnertubeThumbnailSaver : Saver> { override fun SaverScope.save(value: Thumbnail) = listOf( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeVideoItemSaver.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeVideoItemSaver.kt index 2c8f245..49c3177 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeVideoItemSaver.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeVideoItemSaver.kt @@ -2,7 +2,7 @@ package it.vfsfitvnm.vimusic.savers import androidx.compose.runtime.saveable.Saver import androidx.compose.runtime.saveable.SaverScope -import it.vfsfitvnm.youtubemusic.Innertube +import it.vfsfitvnm.innertube.Innertube object InnertubeVideoItemSaver : Saver> { override fun SaverScope.save(value: Innertube.VideoItem): List = listOf( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeWatchEndpointSaver.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeWatchEndpointSaver.kt index 69feee1..f8ad670 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeWatchEndpointSaver.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeWatchEndpointSaver.kt @@ -2,7 +2,7 @@ package it.vfsfitvnm.vimusic.savers import androidx.compose.runtime.saveable.Saver import androidx.compose.runtime.saveable.SaverScope -import it.vfsfitvnm.youtubemusic.models.NavigationEndpoint +import it.vfsfitvnm.innertube.models.NavigationEndpoint object InnertubeWatchEndpointSaver : Saver> { override fun SaverScope.save(value: NavigationEndpoint.Endpoint.Watch) = listOf( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeWatchInfoSaver.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeWatchInfoSaver.kt index 1090e0b..d9eacef 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeWatchInfoSaver.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/InnertubeWatchInfoSaver.kt @@ -2,8 +2,8 @@ package it.vfsfitvnm.vimusic.savers import androidx.compose.runtime.saveable.Saver import androidx.compose.runtime.saveable.SaverScope -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.NavigationEndpoint +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.NavigationEndpoint object InnertubeWatchInfoSaver : Saver, List> { override fun SaverScope.save(value: Innertube.Info) = listOf( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/Savers.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/Savers.kt index adf0fa0..3dd2811 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/Savers.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/savers/Savers.kt @@ -2,7 +2,7 @@ package it.vfsfitvnm.vimusic.savers import androidx.compose.runtime.saveable.Saver import androidx.compose.runtime.saveable.SaverScope -import it.vfsfitvnm.youtubemusic.Innertube +import it.vfsfitvnm.innertube.Innertube interface ListSaver : Saver, List> { override fun SaverScope.save(value: List): List diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt index 3339204..2e45781 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt @@ -93,10 +93,10 @@ import it.vfsfitvnm.vimusic.utils.shouldBePlaying import it.vfsfitvnm.vimusic.utils.skipSilenceKey import it.vfsfitvnm.vimusic.utils.timer import it.vfsfitvnm.vimusic.utils.volumeNormalizationKey -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.NavigationEndpoint -import it.vfsfitvnm.youtubemusic.models.bodies.PlayerBody -import it.vfsfitvnm.youtubemusic.requests.player +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.NavigationEndpoint +import it.vfsfitvnm.innertube.models.bodies.PlayerBody +import it.vfsfitvnm.innertube.requests.player import kotlin.math.roundToInt import kotlin.system.exitProcess import kotlinx.coroutines.CoroutineScope diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt index 94f1035..90dc046 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt @@ -65,7 +65,7 @@ import it.vfsfitvnm.vimusic.utils.enqueue import it.vfsfitvnm.vimusic.utils.forcePlay import it.vfsfitvnm.vimusic.utils.semiBold import it.vfsfitvnm.vimusic.utils.thumbnail -import it.vfsfitvnm.youtubemusic.models.NavigationEndpoint +import it.vfsfitvnm.innertube.models.NavigationEndpoint import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.flowOf diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/AlbumItem.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/AlbumItem.kt index 911540a..d6d13fd 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/AlbumItem.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/AlbumItem.kt @@ -20,7 +20,7 @@ import it.vfsfitvnm.vimusic.ui.styling.shimmer import it.vfsfitvnm.vimusic.utils.secondary import it.vfsfitvnm.vimusic.utils.semiBold import it.vfsfitvnm.vimusic.utils.thumbnail -import it.vfsfitvnm.youtubemusic.Innertube +import it.vfsfitvnm.innertube.Innertube @Composable fun AlbumItem( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/ArtistItem.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/ArtistItem.kt index 64c2892..732e32e 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/ArtistItem.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/ArtistItem.kt @@ -22,7 +22,7 @@ import it.vfsfitvnm.vimusic.ui.styling.shimmer import it.vfsfitvnm.vimusic.utils.secondary import it.vfsfitvnm.vimusic.utils.semiBold import it.vfsfitvnm.vimusic.utils.thumbnail -import it.vfsfitvnm.youtubemusic.Innertube +import it.vfsfitvnm.innertube.Innertube @Composable fun ArtistItem( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/PlaylistItem.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/PlaylistItem.kt index 91ad1a5..a614243 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/PlaylistItem.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/PlaylistItem.kt @@ -39,7 +39,7 @@ import it.vfsfitvnm.vimusic.utils.medium import it.vfsfitvnm.vimusic.utils.secondary import it.vfsfitvnm.vimusic.utils.semiBold import it.vfsfitvnm.vimusic.utils.thumbnail -import it.vfsfitvnm.youtubemusic.Innertube +import it.vfsfitvnm.innertube.Innertube import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.map diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/SongItem.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/SongItem.kt index 728af35..3395ec8 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/SongItem.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/SongItem.kt @@ -27,7 +27,7 @@ import it.vfsfitvnm.vimusic.utils.medium import it.vfsfitvnm.vimusic.utils.secondary import it.vfsfitvnm.vimusic.utils.semiBold import it.vfsfitvnm.vimusic.utils.thumbnail -import it.vfsfitvnm.youtubemusic.Innertube +import it.vfsfitvnm.innertube.Innertube @Composable fun SongItem( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/VideoItem.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/VideoItem.kt index 06aa30b..f3ee2f2 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/VideoItem.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/items/VideoItem.kt @@ -25,7 +25,7 @@ import it.vfsfitvnm.vimusic.utils.color import it.vfsfitvnm.vimusic.utils.medium import it.vfsfitvnm.vimusic.utils.secondary import it.vfsfitvnm.vimusic.utils.semiBold -import it.vfsfitvnm.youtubemusic.Innertube +import it.vfsfitvnm.innertube.Innertube @Composable fun VideoItem( diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumScreen.kt index a89dc62..2539a99 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumScreen.kt @@ -41,9 +41,9 @@ import it.vfsfitvnm.vimusic.ui.screens.searchresult.ItemsPage import it.vfsfitvnm.vimusic.ui.styling.LocalAppearance import it.vfsfitvnm.vimusic.ui.styling.px import it.vfsfitvnm.vimusic.utils.asMediaItem -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.bodies.BrowseBody -import it.vfsfitvnm.youtubemusic.requests.albumPage +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.bodies.BrowseBody +import it.vfsfitvnm.innertube.requests.albumPage import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.combine import kotlinx.coroutines.withContext diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/artist/ArtistOverview.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/artist/ArtistOverview.kt index 13e4248..899121e 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/artist/ArtistOverview.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/artist/ArtistOverview.kt @@ -49,8 +49,8 @@ import it.vfsfitvnm.vimusic.utils.color import it.vfsfitvnm.vimusic.utils.forcePlay import it.vfsfitvnm.vimusic.utils.secondary import it.vfsfitvnm.vimusic.utils.semiBold -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.NavigationEndpoint +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.NavigationEndpoint @ExperimentalFoundationApi @ExperimentalAnimationApi diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/artist/ArtistScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/artist/ArtistScreen.kt index 905515f..b81bdd1 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/artist/ArtistScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/artist/ArtistScreen.kt @@ -51,12 +51,12 @@ import it.vfsfitvnm.vimusic.utils.artistScreenTabIndexKey import it.vfsfitvnm.vimusic.utils.asMediaItem import it.vfsfitvnm.vimusic.utils.forcePlay import it.vfsfitvnm.vimusic.utils.rememberPreference -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.bodies.BrowseBody -import it.vfsfitvnm.youtubemusic.models.bodies.ContinuationBody -import it.vfsfitvnm.youtubemusic.requests.artistPage -import it.vfsfitvnm.youtubemusic.requests.itemsPage -import it.vfsfitvnm.youtubemusic.utils.from +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.bodies.BrowseBody +import it.vfsfitvnm.innertube.models.bodies.ContinuationBody +import it.vfsfitvnm.innertube.requests.artistPage +import it.vfsfitvnm.innertube.requests.itemsPage +import it.vfsfitvnm.innertube.utils.from import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/QuickPicks.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/QuickPicks.kt index f4024a1..800caca 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/QuickPicks.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/QuickPicks.kt @@ -72,10 +72,10 @@ import it.vfsfitvnm.vimusic.utils.center import it.vfsfitvnm.vimusic.utils.forcePlay import it.vfsfitvnm.vimusic.utils.secondary import it.vfsfitvnm.vimusic.utils.semiBold -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.NavigationEndpoint -import it.vfsfitvnm.youtubemusic.models.bodies.NextBody -import it.vfsfitvnm.youtubemusic.requests.relatedPage +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.NavigationEndpoint +import it.vfsfitvnm.innertube.models.bodies.NextBody +import it.vfsfitvnm.innertube.requests.relatedPage import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.flowOn diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/localplaylist/LocalPlaylistSongs.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/localplaylist/LocalPlaylistSongs.kt index 4442674..4fef7b1 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/localplaylist/LocalPlaylistSongs.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/localplaylist/LocalPlaylistSongs.kt @@ -58,9 +58,9 @@ import it.vfsfitvnm.vimusic.utils.enqueue import it.vfsfitvnm.vimusic.utils.forcePlayAtIndex import it.vfsfitvnm.vimusic.utils.forcePlayFromBeginning import it.vfsfitvnm.vimusic.utils.produceSaveableState -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.bodies.BrowseBody -import it.vfsfitvnm.youtubemusic.requests.playlistPage +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.bodies.BrowseBody +import it.vfsfitvnm.innertube.requests.playlistPage import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.runBlocking diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Lyrics.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Lyrics.kt index ff2863c..47e661c 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Lyrics.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Lyrics.kt @@ -68,9 +68,9 @@ import it.vfsfitvnm.vimusic.utils.medium import it.vfsfitvnm.vimusic.utils.produceSaveableState import it.vfsfitvnm.vimusic.utils.rememberPreference import it.vfsfitvnm.vimusic.utils.verticalFadingEdge -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.bodies.NextBody -import it.vfsfitvnm.youtubemusic.requests.lyrics +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.bodies.NextBody +import it.vfsfitvnm.innertube.requests.lyrics import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.flow.distinctUntilChanged diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Player.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Player.kt index b3d7656..84f544c 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Player.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Player.kt @@ -67,7 +67,7 @@ import it.vfsfitvnm.vimusic.utils.seamlessPlay import it.vfsfitvnm.vimusic.utils.secondary import it.vfsfitvnm.vimusic.utils.semiBold import it.vfsfitvnm.vimusic.utils.thumbnail -import it.vfsfitvnm.youtubemusic.models.NavigationEndpoint +import it.vfsfitvnm.innertube.models.NavigationEndpoint import kotlin.math.absoluteValue @ExperimentalFoundationApi diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/StatsForNerds.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/StatsForNerds.kt index fd1f879..2d65349 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/StatsForNerds.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/StatsForNerds.kt @@ -38,9 +38,9 @@ import it.vfsfitvnm.vimusic.ui.styling.overlay import it.vfsfitvnm.vimusic.utils.color import it.vfsfitvnm.vimusic.utils.medium import it.vfsfitvnm.vimusic.utils.rememberVolume -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.bodies.PlayerBody -import it.vfsfitvnm.youtubemusic.requests.player +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.bodies.PlayerBody +import it.vfsfitvnm.innertube.requests.player import kotlin.math.roundToInt import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.distinctUntilChanged diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/playlist/PlaylistSongList.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/playlist/PlaylistSongList.kt index da25da6..66959cf 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/playlist/PlaylistSongList.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/playlist/PlaylistSongList.kt @@ -57,9 +57,9 @@ import it.vfsfitvnm.vimusic.utils.forcePlayAtIndex import it.vfsfitvnm.vimusic.utils.forcePlayFromBeginning import it.vfsfitvnm.vimusic.utils.isLandscape import it.vfsfitvnm.vimusic.utils.produceSaveableState -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.bodies.BrowseBody -import it.vfsfitvnm.youtubemusic.requests.playlistPage +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.bodies.BrowseBody +import it.vfsfitvnm.innertube.requests.playlistPage import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/LocalSongSearch.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/LocalSongSearch.kt index e42964d..01e3746 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/LocalSongSearch.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/LocalSongSearch.kt @@ -39,7 +39,7 @@ import it.vfsfitvnm.vimusic.utils.asMediaItem import it.vfsfitvnm.vimusic.utils.forcePlay import it.vfsfitvnm.vimusic.utils.medium import it.vfsfitvnm.vimusic.utils.produceSaveableState -import it.vfsfitvnm.youtubemusic.models.NavigationEndpoint +import it.vfsfitvnm.innertube.models.NavigationEndpoint import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.flowOn diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/OnlineSearch.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/OnlineSearch.kt index 1712173..10d2361 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/OnlineSearch.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/OnlineSearch.kt @@ -62,9 +62,9 @@ import it.vfsfitvnm.vimusic.utils.center import it.vfsfitvnm.vimusic.utils.medium import it.vfsfitvnm.vimusic.utils.produceSaveableState import it.vfsfitvnm.vimusic.utils.secondary -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.bodies.SearchSuggestionsBody -import it.vfsfitvnm.youtubemusic.requests.searchSuggestions +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.bodies.SearchSuggestionsBody +import it.vfsfitvnm.innertube.requests.searchSuggestions import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.flow.distinctUntilChanged diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/searchresult/ItemsPage.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/searchresult/ItemsPage.kt index 1a0e553..5a8343f 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/searchresult/ItemsPage.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/searchresult/ItemsPage.kt @@ -28,8 +28,8 @@ import it.vfsfitvnm.vimusic.ui.styling.LocalAppearance import it.vfsfitvnm.vimusic.utils.center import it.vfsfitvnm.vimusic.utils.produceSaveableState import it.vfsfitvnm.vimusic.utils.secondary -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.utils.plus +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.utils.plus import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/searchresult/SearchResultScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/searchresult/SearchResultScreen.kt index c554ddd..6dc2d13 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/searchresult/SearchResultScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/searchresult/SearchResultScreen.kt @@ -43,11 +43,11 @@ import it.vfsfitvnm.vimusic.utils.asMediaItem import it.vfsfitvnm.vimusic.utils.forcePlay import it.vfsfitvnm.vimusic.utils.rememberPreference import it.vfsfitvnm.vimusic.utils.searchResultScreenTabIndexKey -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.bodies.ContinuationBody -import it.vfsfitvnm.youtubemusic.models.bodies.SearchBody -import it.vfsfitvnm.youtubemusic.requests.searchPage -import it.vfsfitvnm.youtubemusic.utils.from +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.bodies.ContinuationBody +import it.vfsfitvnm.innertube.models.bodies.SearchBody +import it.vfsfitvnm.innertube.requests.searchPage +import it.vfsfitvnm.innertube.utils.from @ExperimentalFoundationApi @ExperimentalAnimationApi diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/Utils.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/Utils.kt index 3c32c64..ff6144f 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/Utils.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/Utils.kt @@ -6,10 +6,10 @@ import androidx.core.os.bundleOf import androidx.media3.common.MediaItem import androidx.media3.common.MediaMetadata import it.vfsfitvnm.vimusic.models.DetailedSong -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.bodies.ContinuationBody -import it.vfsfitvnm.youtubemusic.requests.playlistPage -import it.vfsfitvnm.youtubemusic.utils.plus +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.bodies.ContinuationBody +import it.vfsfitvnm.innertube.requests.playlistPage +import it.vfsfitvnm.innertube.utils.plus val Innertube.SongItem.asMediaItem: MediaItem get() = MediaItem.Builder() diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/YoutubeRadio.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/YoutubeRadio.kt index a83399e..67f1746 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/YoutubeRadio.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/YoutubeRadio.kt @@ -1,10 +1,10 @@ package it.vfsfitvnm.vimusic.utils import androidx.media3.common.MediaItem -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.bodies.ContinuationBody -import it.vfsfitvnm.youtubemusic.models.bodies.NextBody -import it.vfsfitvnm.youtubemusic.requests.nextPage +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.bodies.ContinuationBody +import it.vfsfitvnm.innertube.models.bodies.NextBody +import it.vfsfitvnm.innertube.requests.nextPage import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/Innertube.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/Innertube.kt similarity index 97% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/Innertube.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/Innertube.kt index 6370b30..2443610 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/Innertube.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/Innertube.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic +package it.vfsfitvnm.innertube import io.ktor.client.HttpClient import io.ktor.client.engine.okhttp.OkHttp @@ -12,9 +12,9 @@ import io.ktor.client.request.header import io.ktor.http.ContentType import io.ktor.http.HttpHeaders import io.ktor.serialization.kotlinx.json.json -import it.vfsfitvnm.youtubemusic.models.NavigationEndpoint -import it.vfsfitvnm.youtubemusic.models.Runs -import it.vfsfitvnm.youtubemusic.models.Thumbnail +import it.vfsfitvnm.innertube.models.NavigationEndpoint +import it.vfsfitvnm.innertube.models.Runs +import it.vfsfitvnm.innertube.models.Thumbnail import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/BrowseResponse.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/BrowseResponse.kt similarity index 97% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/BrowseResponse.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/BrowseResponse.kt index 4d66b65..ef7e2f8 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/BrowseResponse.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/BrowseResponse.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/ButtonRenderer.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/ButtonRenderer.kt similarity index 76% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/ButtonRenderer.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/ButtonRenderer.kt index 495cf83..12d8507 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/ButtonRenderer.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/ButtonRenderer.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/Context.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/Context.kt similarity index 97% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/Context.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/Context.kt index b3a0e89..369d7f0 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/Context.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/Context.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/Continuation.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/Continuation.kt similarity index 91% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/Continuation.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/Continuation.kt index 5dbc6f8..61f8099 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/Continuation.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/Continuation.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/ContinuationResponse.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/ContinuationResponse.kt similarity index 93% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/ContinuationResponse.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/ContinuationResponse.kt index f5df6c1..9f321c3 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/ContinuationResponse.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/ContinuationResponse.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/GetQueueResponse.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/GetQueueResponse.kt similarity index 86% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/GetQueueResponse.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/GetQueueResponse.kt index 3c619ba..02a3899 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/GetQueueResponse.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/GetQueueResponse.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/GridRenderer.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/GridRenderer.kt similarity index 84% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/GridRenderer.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/GridRenderer.kt index fce0477..2a000cf 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/GridRenderer.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/GridRenderer.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/MusicCarouselShelfRenderer.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/MusicCarouselShelfRenderer.kt similarity index 96% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/MusicCarouselShelfRenderer.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/MusicCarouselShelfRenderer.kt index e5ea54e..f7f1d16 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/MusicCarouselShelfRenderer.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/MusicCarouselShelfRenderer.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/MusicResponsiveListItemRenderer.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/MusicResponsiveListItemRenderer.kt similarity index 94% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/MusicResponsiveListItemRenderer.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/MusicResponsiveListItemRenderer.kt index 340f5ba..bbd178e 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/MusicResponsiveListItemRenderer.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/MusicResponsiveListItemRenderer.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/MusicShelfRenderer.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/MusicShelfRenderer.kt similarity index 96% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/MusicShelfRenderer.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/MusicShelfRenderer.kt index 25699d1..15e8659 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/MusicShelfRenderer.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/MusicShelfRenderer.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/MusicTwoRowItemRenderer.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/MusicTwoRowItemRenderer.kt similarity index 85% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/MusicTwoRowItemRenderer.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/MusicTwoRowItemRenderer.kt index 6baee0d..17f755d 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/MusicTwoRowItemRenderer.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/MusicTwoRowItemRenderer.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/NavigationEndpoint.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/NavigationEndpoint.kt similarity index 99% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/NavigationEndpoint.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/NavigationEndpoint.kt index 5352669..91efa5c 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/NavigationEndpoint.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/NavigationEndpoint.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/NextResponse.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/NextResponse.kt similarity index 98% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/NextResponse.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/NextResponse.kt index 7676c89..a165974 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/NextResponse.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/NextResponse.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/PlayerResponse.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/PlayerResponse.kt similarity index 96% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/PlayerResponse.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/PlayerResponse.kt index 2122816..e768cdc 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/PlayerResponse.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/PlayerResponse.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/PlaylistPanelVideoRenderer.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/PlaylistPanelVideoRenderer.kt similarity index 89% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/PlaylistPanelVideoRenderer.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/PlaylistPanelVideoRenderer.kt index f24ba6d..6e0b497 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/PlaylistPanelVideoRenderer.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/PlaylistPanelVideoRenderer.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/Runs.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/Runs.kt similarity index 95% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/Runs.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/Runs.kt index 94825a8..c2a9463 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/Runs.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/Runs.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/SearchResponse.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/SearchResponse.kt similarity index 86% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/SearchResponse.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/SearchResponse.kt index 5d6936b..c6b6d96 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/SearchResponse.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/SearchResponse.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/SearchSuggestionsResponse.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/SearchSuggestionsResponse.kt similarity index 94% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/SearchSuggestionsResponse.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/SearchSuggestionsResponse.kt index f6dc30a..b61de04 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/SearchSuggestionsResponse.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/SearchSuggestionsResponse.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/SectionListRenderer.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/SectionListRenderer.kt similarity index 95% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/SectionListRenderer.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/SectionListRenderer.kt index 7b2bbfb..0d52b65 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/SectionListRenderer.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/SectionListRenderer.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/Tabs.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/Tabs.kt similarity index 92% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/Tabs.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/Tabs.kt index e6c5de5..ad4a3fb 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/Tabs.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/Tabs.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/Thumbnail.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/Thumbnail.kt similarity index 92% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/Thumbnail.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/Thumbnail.kt index 2705b99..7db4281 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/Thumbnail.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/Thumbnail.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.innertube.models import kotlinx.serialization.Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/ThumbnailRenderer.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/ThumbnailRenderer.kt similarity index 81% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/ThumbnailRenderer.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/ThumbnailRenderer.kt index f1efcf5..1153a4f 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/ThumbnailRenderer.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/ThumbnailRenderer.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.models +package it.vfsfitvnm.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/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/BrowseBody.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/BrowseBody.kt similarity index 66% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/BrowseBody.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/BrowseBody.kt index ea910da..7c35633 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/BrowseBody.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/BrowseBody.kt @@ -1,6 +1,6 @@ -package it.vfsfitvnm.youtubemusic.models.bodies +package it.vfsfitvnm.innertube.models.bodies -import it.vfsfitvnm.youtubemusic.models.Context +import it.vfsfitvnm.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/ContinuationBody.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/ContinuationBody.kt similarity index 63% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/ContinuationBody.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/ContinuationBody.kt index ff7b95b..946dd11 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/ContinuationBody.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/ContinuationBody.kt @@ -1,6 +1,6 @@ -package it.vfsfitvnm.youtubemusic.models.bodies +package it.vfsfitvnm.innertube.models.bodies -import it.vfsfitvnm.youtubemusic.models.Context +import it.vfsfitvnm.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/NextBody.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/NextBody.kt similarity index 87% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/NextBody.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/NextBody.kt index f1face1..d3f2bd8 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/NextBody.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/NextBody.kt @@ -1,6 +1,6 @@ -package it.vfsfitvnm.youtubemusic.models.bodies +package it.vfsfitvnm.innertube.models.bodies -import it.vfsfitvnm.youtubemusic.models.Context +import it.vfsfitvnm.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/PlayerBody.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/PlayerBody.kt similarity index 66% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/PlayerBody.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/PlayerBody.kt index 6f9b11f..b09dd2f 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/PlayerBody.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/PlayerBody.kt @@ -1,6 +1,6 @@ -package it.vfsfitvnm.youtubemusic.models.bodies +package it.vfsfitvnm.innertube.models.bodies -import it.vfsfitvnm.youtubemusic.models.Context +import it.vfsfitvnm.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/QueueBody.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/QueueBody.kt similarity index 68% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/QueueBody.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/QueueBody.kt index 960dfbc..2f9288c 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/QueueBody.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/QueueBody.kt @@ -1,6 +1,6 @@ -package it.vfsfitvnm.youtubemusic.models.bodies +package it.vfsfitvnm.innertube.models.bodies -import it.vfsfitvnm.youtubemusic.models.Context +import it.vfsfitvnm.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/SearchBody.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/SearchBody.kt similarity index 64% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/SearchBody.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/SearchBody.kt index af4bb59..d21af57 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/SearchBody.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/SearchBody.kt @@ -1,6 +1,6 @@ -package it.vfsfitvnm.youtubemusic.models.bodies +package it.vfsfitvnm.innertube.models.bodies -import it.vfsfitvnm.youtubemusic.models.Context +import it.vfsfitvnm.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/SearchSuggestionsBody.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/SearchSuggestionsBody.kt similarity index 62% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/SearchSuggestionsBody.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/SearchSuggestionsBody.kt index 3a7a32b..c0115e9 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/models/bodies/SearchSuggestionsBody.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/models/bodies/SearchSuggestionsBody.kt @@ -1,6 +1,6 @@ -package it.vfsfitvnm.youtubemusic.models.bodies +package it.vfsfitvnm.innertube.models.bodies -import it.vfsfitvnm.youtubemusic.models.Context +import it.vfsfitvnm.innertube.models.Context import kotlinx.serialization.Serializable @Serializable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/AlbumPage.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/AlbumPage.kt similarity index 84% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/AlbumPage.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/AlbumPage.kt index 0e610f6..378f96b 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/AlbumPage.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/AlbumPage.kt @@ -1,9 +1,9 @@ -package it.vfsfitvnm.youtubemusic.requests +package it.vfsfitvnm.innertube.requests import io.ktor.http.Url -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.NavigationEndpoint -import it.vfsfitvnm.youtubemusic.models.bodies.BrowseBody +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.NavigationEndpoint +import it.vfsfitvnm.innertube.models.bodies.BrowseBody suspend fun Innertube.albumPage(body: BrowseBody): Result? { return playlistPage(body)?.map { album -> diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/ArtistPage.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/ArtistPage.kt similarity index 86% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/ArtistPage.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/ArtistPage.kt index 027be7c..7b59519 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/ArtistPage.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/ArtistPage.kt @@ -1,17 +1,17 @@ -package it.vfsfitvnm.youtubemusic.requests +package it.vfsfitvnm.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.BrowseResponse -import it.vfsfitvnm.youtubemusic.models.MusicCarouselShelfRenderer -import it.vfsfitvnm.youtubemusic.models.MusicShelfRenderer -import it.vfsfitvnm.youtubemusic.models.SectionListRenderer -import it.vfsfitvnm.youtubemusic.models.bodies.BrowseBody -import it.vfsfitvnm.youtubemusic.utils.findSectionByTitle -import it.vfsfitvnm.youtubemusic.utils.from -import it.vfsfitvnm.youtubemusic.utils.runCatchingNonCancellable +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.BrowseResponse +import it.vfsfitvnm.innertube.models.MusicCarouselShelfRenderer +import it.vfsfitvnm.innertube.models.MusicShelfRenderer +import it.vfsfitvnm.innertube.models.SectionListRenderer +import it.vfsfitvnm.innertube.models.bodies.BrowseBody +import it.vfsfitvnm.innertube.utils.findSectionByTitle +import it.vfsfitvnm.innertube.utils.from +import it.vfsfitvnm.innertube.utils.runCatchingNonCancellable suspend fun Innertube.artistPage(body: BrowseBody): Result? = runCatchingNonCancellable { diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/ItemsPage.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/ItemsPage.kt similarity index 84% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/ItemsPage.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/ItemsPage.kt index 840aac0..f4c17bd 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/ItemsPage.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/ItemsPage.kt @@ -1,18 +1,18 @@ -package it.vfsfitvnm.youtubemusic.requests +package it.vfsfitvnm.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.BrowseResponse -import it.vfsfitvnm.youtubemusic.models.ContinuationResponse -import it.vfsfitvnm.youtubemusic.models.GridRenderer -import it.vfsfitvnm.youtubemusic.models.MusicResponsiveListItemRenderer -import it.vfsfitvnm.youtubemusic.models.MusicShelfRenderer -import it.vfsfitvnm.youtubemusic.models.MusicTwoRowItemRenderer -import it.vfsfitvnm.youtubemusic.models.bodies.BrowseBody -import it.vfsfitvnm.youtubemusic.models.bodies.ContinuationBody -import it.vfsfitvnm.youtubemusic.utils.runCatchingNonCancellable +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.BrowseResponse +import it.vfsfitvnm.innertube.models.ContinuationResponse +import it.vfsfitvnm.innertube.models.GridRenderer +import it.vfsfitvnm.innertube.models.MusicResponsiveListItemRenderer +import it.vfsfitvnm.innertube.models.MusicShelfRenderer +import it.vfsfitvnm.innertube.models.MusicTwoRowItemRenderer +import it.vfsfitvnm.innertube.models.bodies.BrowseBody +import it.vfsfitvnm.innertube.models.bodies.ContinuationBody +import it.vfsfitvnm.innertube.utils.runCatchingNonCancellable suspend fun Innertube.itemsPage( body: BrowseBody, diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/Lyrics.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/Lyrics.kt similarity index 75% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/Lyrics.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/Lyrics.kt index a7222e9..a4c0615 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/Lyrics.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/Lyrics.kt @@ -1,14 +1,14 @@ -package it.vfsfitvnm.youtubemusic.requests +package it.vfsfitvnm.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.BrowseResponse -import it.vfsfitvnm.youtubemusic.models.NextResponse -import it.vfsfitvnm.youtubemusic.models.bodies.BrowseBody -import it.vfsfitvnm.youtubemusic.models.bodies.NextBody -import it.vfsfitvnm.youtubemusic.utils.runCatchingNonCancellable +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.BrowseResponse +import it.vfsfitvnm.innertube.models.NextResponse +import it.vfsfitvnm.innertube.models.bodies.BrowseBody +import it.vfsfitvnm.innertube.models.bodies.NextBody +import it.vfsfitvnm.innertube.utils.runCatchingNonCancellable suspend fun Innertube.lyrics(body: NextBody): Result? = runCatchingNonCancellable { val nextResponse = client.post(next) { diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/NextPage.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/NextPage.kt similarity index 86% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/NextPage.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/NextPage.kt index 38fed8a..edb84d0 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/NextPage.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/NextPage.kt @@ -1,15 +1,15 @@ -package it.vfsfitvnm.youtubemusic.requests +package it.vfsfitvnm.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.ContinuationResponse -import it.vfsfitvnm.youtubemusic.models.NextResponse -import it.vfsfitvnm.youtubemusic.models.bodies.ContinuationBody -import it.vfsfitvnm.youtubemusic.models.bodies.NextBody -import it.vfsfitvnm.youtubemusic.utils.from -import it.vfsfitvnm.youtubemusic.utils.runCatchingNonCancellable +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.ContinuationResponse +import it.vfsfitvnm.innertube.models.NextResponse +import it.vfsfitvnm.innertube.models.bodies.ContinuationBody +import it.vfsfitvnm.innertube.models.bodies.NextBody +import it.vfsfitvnm.innertube.utils.from +import it.vfsfitvnm.innertube.utils.runCatchingNonCancellable diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/Player.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/Player.kt similarity index 87% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/Player.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/Player.kt index 824c233..d2fa6a4 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/Player.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/Player.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.youtubemusic.requests +package it.vfsfitvnm.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 it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.Context -import it.vfsfitvnm.youtubemusic.models.PlayerResponse -import it.vfsfitvnm.youtubemusic.models.bodies.PlayerBody -import it.vfsfitvnm.youtubemusic.utils.runCatchingNonCancellable +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.Context +import it.vfsfitvnm.innertube.models.PlayerResponse +import it.vfsfitvnm.innertube.models.bodies.PlayerBody +import it.vfsfitvnm.innertube.utils.runCatchingNonCancellable import kotlinx.serialization.Serializable suspend fun Innertube.player(body: PlayerBody) = runCatchingNonCancellable { diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/PlaylistPage.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/PlaylistPage.kt similarity index 84% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/PlaylistPage.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/PlaylistPage.kt index 2c01ccb..a9824d3 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/PlaylistPage.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/PlaylistPage.kt @@ -1,17 +1,17 @@ -package it.vfsfitvnm.youtubemusic.requests +package it.vfsfitvnm.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.BrowseResponse -import it.vfsfitvnm.youtubemusic.models.ContinuationResponse -import it.vfsfitvnm.youtubemusic.models.MusicCarouselShelfRenderer -import it.vfsfitvnm.youtubemusic.models.MusicShelfRenderer -import it.vfsfitvnm.youtubemusic.models.bodies.BrowseBody -import it.vfsfitvnm.youtubemusic.models.bodies.ContinuationBody -import it.vfsfitvnm.youtubemusic.utils.from -import it.vfsfitvnm.youtubemusic.utils.runCatchingNonCancellable +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.BrowseResponse +import it.vfsfitvnm.innertube.models.ContinuationResponse +import it.vfsfitvnm.innertube.models.MusicCarouselShelfRenderer +import it.vfsfitvnm.innertube.models.MusicShelfRenderer +import it.vfsfitvnm.innertube.models.bodies.BrowseBody +import it.vfsfitvnm.innertube.models.bodies.ContinuationBody +import it.vfsfitvnm.innertube.utils.from +import it.vfsfitvnm.innertube.utils.runCatchingNonCancellable suspend fun Innertube.playlistPage(body: BrowseBody) = runCatchingNonCancellable { val response = client.post(browse) { diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/Queue.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/Queue.kt similarity index 69% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/Queue.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/Queue.kt index 06c9f19..9ea86ea 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/Queue.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/Queue.kt @@ -1,13 +1,13 @@ -package it.vfsfitvnm.youtubemusic.requests +package it.vfsfitvnm.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.GetQueueResponse -import it.vfsfitvnm.youtubemusic.models.bodies.QueueBody -import it.vfsfitvnm.youtubemusic.utils.from -import it.vfsfitvnm.youtubemusic.utils.runCatchingNonCancellable +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.GetQueueResponse +import it.vfsfitvnm.innertube.models.bodies.QueueBody +import it.vfsfitvnm.innertube.utils.from +import it.vfsfitvnm.innertube.utils.runCatchingNonCancellable suspend fun Innertube.queue(body: QueueBody) = runCatchingNonCancellable { val response = client.post(queue) { diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/RelatedPage.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/RelatedPage.kt similarity index 80% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/RelatedPage.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/RelatedPage.kt index f50f8cf..41d0b8e 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/RelatedPage.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/RelatedPage.kt @@ -1,18 +1,18 @@ -package it.vfsfitvnm.youtubemusic.requests +package it.vfsfitvnm.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.BrowseResponse -import it.vfsfitvnm.youtubemusic.models.MusicCarouselShelfRenderer -import it.vfsfitvnm.youtubemusic.models.NextResponse -import it.vfsfitvnm.youtubemusic.models.bodies.BrowseBody -import it.vfsfitvnm.youtubemusic.models.bodies.NextBody -import it.vfsfitvnm.youtubemusic.utils.findSectionByStrapline -import it.vfsfitvnm.youtubemusic.utils.findSectionByTitle -import it.vfsfitvnm.youtubemusic.utils.from -import it.vfsfitvnm.youtubemusic.utils.runCatchingNonCancellable +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.BrowseResponse +import it.vfsfitvnm.innertube.models.MusicCarouselShelfRenderer +import it.vfsfitvnm.innertube.models.NextResponse +import it.vfsfitvnm.innertube.models.bodies.BrowseBody +import it.vfsfitvnm.innertube.models.bodies.NextBody +import it.vfsfitvnm.innertube.utils.findSectionByStrapline +import it.vfsfitvnm.innertube.utils.findSectionByTitle +import it.vfsfitvnm.innertube.utils.from +import it.vfsfitvnm.innertube.utils.runCatchingNonCancellable suspend fun Innertube.relatedPage(body: NextBody) = runCatchingNonCancellable { val nextResponse = client.post(next) { diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/SearchPage.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/SearchPage.kt similarity index 79% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/SearchPage.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/SearchPage.kt index 4d9218e..6e57d28 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/SearchPage.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/SearchPage.kt @@ -1,15 +1,15 @@ -package it.vfsfitvnm.youtubemusic.requests +package it.vfsfitvnm.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.ContinuationResponse -import it.vfsfitvnm.youtubemusic.models.MusicShelfRenderer -import it.vfsfitvnm.youtubemusic.models.SearchResponse -import it.vfsfitvnm.youtubemusic.models.bodies.ContinuationBody -import it.vfsfitvnm.youtubemusic.models.bodies.SearchBody -import it.vfsfitvnm.youtubemusic.utils.runCatchingNonCancellable +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.ContinuationResponse +import it.vfsfitvnm.innertube.models.MusicShelfRenderer +import it.vfsfitvnm.innertube.models.SearchResponse +import it.vfsfitvnm.innertube.models.bodies.ContinuationBody +import it.vfsfitvnm.innertube.models.bodies.SearchBody +import it.vfsfitvnm.innertube.utils.runCatchingNonCancellable suspend fun Innertube.searchPage( body: SearchBody, diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/SearchSuggestions.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/SearchSuggestions.kt similarity index 72% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/SearchSuggestions.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/SearchSuggestions.kt index 21a18bd..bb00be9 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/requests/SearchSuggestions.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/requests/SearchSuggestions.kt @@ -1,12 +1,12 @@ -package it.vfsfitvnm.youtubemusic.requests +package it.vfsfitvnm.innertube.requests import io.ktor.client.call.body import io.ktor.client.request.post import io.ktor.client.request.setBody -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.SearchSuggestionsResponse -import it.vfsfitvnm.youtubemusic.models.bodies.SearchSuggestionsBody -import it.vfsfitvnm.youtubemusic.utils.runCatchingNonCancellable +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.SearchSuggestionsResponse +import it.vfsfitvnm.innertube.models.bodies.SearchSuggestionsBody +import it.vfsfitvnm.innertube.utils.runCatchingNonCancellable suspend fun Innertube.searchSuggestions(body: SearchSuggestionsBody) = runCatchingNonCancellable { val response = client.post(searchSuggestions) { diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/utils/FromMusicResponsiveListItemRenderer.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/utils/FromMusicResponsiveListItemRenderer.kt similarity index 84% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/utils/FromMusicResponsiveListItemRenderer.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/utils/FromMusicResponsiveListItemRenderer.kt index 51a3ca2..7339f0c 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/utils/FromMusicResponsiveListItemRenderer.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/utils/FromMusicResponsiveListItemRenderer.kt @@ -1,9 +1,9 @@ -package it.vfsfitvnm.youtubemusic.utils +package it.vfsfitvnm.innertube.utils -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.MusicResponsiveListItemRenderer -import it.vfsfitvnm.youtubemusic.models.NavigationEndpoint -import it.vfsfitvnm.youtubemusic.models.Runs +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.MusicResponsiveListItemRenderer +import it.vfsfitvnm.innertube.models.NavigationEndpoint +import it.vfsfitvnm.innertube.models.Runs fun Innertube.SongItem.Companion.from(renderer: MusicResponsiveListItemRenderer): Innertube.SongItem? { return Innertube.SongItem( diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/utils/FromMusicShelfRendererContent.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/utils/FromMusicShelfRendererContent.kt similarity index 95% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/utils/FromMusicShelfRendererContent.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/utils/FromMusicShelfRendererContent.kt index ea4c69b..1cbcab6 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/utils/FromMusicShelfRendererContent.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/utils/FromMusicShelfRendererContent.kt @@ -1,8 +1,8 @@ -package it.vfsfitvnm.youtubemusic.utils +package it.vfsfitvnm.innertube.utils -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.MusicShelfRenderer -import it.vfsfitvnm.youtubemusic.models.NavigationEndpoint +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.MusicShelfRenderer +import it.vfsfitvnm.innertube.models.NavigationEndpoint fun Innertube.SongItem.Companion.from(content: MusicShelfRenderer.Content): Innertube.SongItem? { val (mainRuns, otherRuns) = content.runs diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/utils/FromMusicTwoRowItemRenderer.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/utils/FromMusicTwoRowItemRenderer.kt similarity index 93% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/utils/FromMusicTwoRowItemRenderer.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/utils/FromMusicTwoRowItemRenderer.kt index f693427..15dc097 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/utils/FromMusicTwoRowItemRenderer.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/utils/FromMusicTwoRowItemRenderer.kt @@ -1,7 +1,7 @@ -package it.vfsfitvnm.youtubemusic.utils +package it.vfsfitvnm.innertube.utils -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.MusicTwoRowItemRenderer +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.MusicTwoRowItemRenderer fun Innertube.AlbumItem.Companion.from(renderer: MusicTwoRowItemRenderer): Innertube.AlbumItem? { return Innertube.AlbumItem( diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/utils/FromPlaylistPanelVideoRenderer.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/utils/FromPlaylistPanelVideoRenderer.kt similarity index 85% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/utils/FromPlaylistPanelVideoRenderer.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/utils/FromPlaylistPanelVideoRenderer.kt index d180dfe..92ea20c 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/utils/FromPlaylistPanelVideoRenderer.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/utils/FromPlaylistPanelVideoRenderer.kt @@ -1,7 +1,7 @@ -package it.vfsfitvnm.youtubemusic.utils +package it.vfsfitvnm.innertube.utils -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.PlaylistPanelVideoRenderer +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.PlaylistPanelVideoRenderer fun Innertube.SongItem.Companion.from(renderer: PlaylistPanelVideoRenderer): Innertube.SongItem? { return Innertube.SongItem( diff --git a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/utils/Utils.kt b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/utils/Utils.kt similarity index 90% rename from innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/utils/Utils.kt rename to innertube/src/main/kotlin/it/vfsfitvnm/innertube/utils/Utils.kt index 56b27a4..6a2acf8 100644 --- a/innertube/src/main/kotlin/it/vfsfitvnm/youtubemusic/utils/Utils.kt +++ b/innertube/src/main/kotlin/it/vfsfitvnm/innertube/utils/Utils.kt @@ -1,8 +1,8 @@ -package it.vfsfitvnm.youtubemusic.utils +package it.vfsfitvnm.innertube.utils import io.ktor.utils.io.CancellationException -import it.vfsfitvnm.youtubemusic.Innertube -import it.vfsfitvnm.youtubemusic.models.SectionListRenderer +import it.vfsfitvnm.innertube.Innertube +import it.vfsfitvnm.innertube.models.SectionListRenderer internal fun SectionListRenderer.findSectionByTitle(text: String): SectionListRenderer.Content? { return contents?.find { content ->