diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt index d5c3f4840..2efaaa31b 100644 --- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt @@ -50,10 +50,10 @@ import org.oxycblt.auxio.home.HomeViewModel import org.oxycblt.auxio.home.Outer import org.oxycblt.auxio.list.ListViewModel import org.oxycblt.auxio.music.IndexingState -import org.oxycblt.auxio.music.Music +import org.oxycblt.musikr.Music import org.oxycblt.auxio.music.MusicType import org.oxycblt.auxio.music.MusicViewModel -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.OpenPanel import org.oxycblt.auxio.playback.PlaybackBottomSheetBehavior import org.oxycblt.auxio.playback.PlaybackViewModel diff --git a/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt index dd66d7a68..aa9b5d985 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt @@ -29,13 +29,13 @@ import org.oxycblt.auxio.detail.list.AlbumDetailListAdapter import org.oxycblt.auxio.list.Item import org.oxycblt.auxio.list.ListFragment import org.oxycblt.auxio.list.menu.Menu -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.PlaylistDecision import org.oxycblt.auxio.music.PlaylistMessage -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.music.resolveNames +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.resolveNames import org.oxycblt.auxio.playback.PlaybackDecision import org.oxycblt.auxio.playback.formatDurationMs import org.oxycblt.auxio.util.collect diff --git a/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt index 3b1352069..160c6be07 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt @@ -29,14 +29,14 @@ import org.oxycblt.auxio.detail.list.ArtistDetailListAdapter import org.oxycblt.auxio.list.Item import org.oxycblt.auxio.list.ListFragment import org.oxycblt.auxio.list.menu.Menu -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.PlaylistDecision import org.oxycblt.auxio.music.PlaylistMessage -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.music.resolveNames +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.resolveNames import org.oxycblt.auxio.playback.PlaybackDecision import org.oxycblt.auxio.util.collect import org.oxycblt.auxio.util.collectImmediately diff --git a/app/src/main/java/org/oxycblt/auxio/detail/DetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/DetailFragment.kt index 355c9961e..2875e0acd 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/DetailFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/DetailFragment.kt @@ -35,8 +35,8 @@ import org.oxycblt.auxio.list.ListFragment import org.oxycblt.auxio.list.ListViewModel import org.oxycblt.auxio.list.PlainDivider import org.oxycblt.auxio.list.PlainHeader -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.MusicViewModel import org.oxycblt.auxio.playback.PlaybackViewModel import org.oxycblt.auxio.util.getDimenPixels diff --git a/app/src/main/java/org/oxycblt/auxio/detail/DetailGenerator.kt b/app/src/main/java/org/oxycblt/auxio/detail/DetailGenerator.kt index 307341268..2e818b638 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/DetailGenerator.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/DetailGenerator.kt @@ -23,17 +23,17 @@ import javax.inject.Inject import org.oxycblt.auxio.R import org.oxycblt.auxio.list.ListSettings import org.oxycblt.auxio.list.sort.Sort -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.MusicRepository import org.oxycblt.auxio.music.MusicType -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.musikr.tag.Disc -import org.oxycblt.auxio.musikr.tag.ReleaseType +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.tag.Disc +import org.oxycblt.musikr.tag.ReleaseType import timber.log.Timber as L interface DetailGenerator { diff --git a/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt b/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt index b4b4bdd73..e40278ef6 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt @@ -40,16 +40,16 @@ import org.oxycblt.auxio.list.PlainDivider import org.oxycblt.auxio.list.PlainHeader import org.oxycblt.auxio.list.adapter.UpdateInstructions import org.oxycblt.auxio.list.sort.Sort -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.MusicRepository import org.oxycblt.auxio.music.MusicType -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.musikr.metadata.AudioProperties +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.metadata.AudioProperties import org.oxycblt.auxio.playback.PlaySong import org.oxycblt.auxio.playback.PlaybackSettings import org.oxycblt.auxio.util.Event diff --git a/app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt index b12610f6e..cfae353fd 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt @@ -29,13 +29,13 @@ import org.oxycblt.auxio.detail.list.GenreDetailListAdapter import org.oxycblt.auxio.list.Item import org.oxycblt.auxio.list.ListFragment import org.oxycblt.auxio.list.menu.Menu -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.PlaylistDecision import org.oxycblt.auxio.music.PlaylistMessage -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.PlaybackDecision import org.oxycblt.auxio.util.collect import org.oxycblt.auxio.util.collectImmediately diff --git a/app/src/main/java/org/oxycblt/auxio/detail/PlaylistDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/PlaylistDetailFragment.kt index 8bcb64605..5c0961e1f 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/PlaylistDetailFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/PlaylistDetailFragment.kt @@ -35,13 +35,13 @@ import org.oxycblt.auxio.detail.list.PlaylistDragCallback import org.oxycblt.auxio.list.Item import org.oxycblt.auxio.list.ListFragment import org.oxycblt.auxio.list.menu.Menu -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.MusicParent -import org.oxycblt.auxio.music.Playlist +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.MusicParent +import org.oxycblt.musikr.Playlist import org.oxycblt.auxio.music.PlaylistDecision import org.oxycblt.auxio.music.PlaylistMessage -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.musikr.playlist.m3u.M3U +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.playlist.m3u.M3U import org.oxycblt.auxio.playback.PlaybackDecision import org.oxycblt.auxio.playback.formatDurationMs import org.oxycblt.auxio.ui.DialogAwareNavigationListener diff --git a/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt b/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt index 2329343e6..631c0f554 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/SongDetailDialog.kt @@ -32,11 +32,11 @@ import org.oxycblt.auxio.databinding.DialogSongDetailBinding import org.oxycblt.auxio.detail.list.SongProperty import org.oxycblt.auxio.detail.list.SongPropertyAdapter import org.oxycblt.auxio.list.adapter.UpdateInstructions -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.music.resolveNames -import org.oxycblt.auxio.musikr.metadata.AudioProperties -import org.oxycblt.auxio.musikr.tag.Name +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.resolveNames +import org.oxycblt.musikr.metadata.AudioProperties +import org.oxycblt.musikr.tag.Name import org.oxycblt.auxio.playback.formatDurationMs import org.oxycblt.auxio.playback.replaygain.formatDb import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment diff --git a/app/src/main/java/org/oxycblt/auxio/detail/decision/ArtistShowChoice.kt b/app/src/main/java/org/oxycblt/auxio/detail/decision/ArtistShowChoice.kt index 98a411a04..e01a190a9 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/decision/ArtistShowChoice.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/decision/ArtistShowChoice.kt @@ -25,7 +25,7 @@ import org.oxycblt.auxio.list.ClickableListListener import org.oxycblt.auxio.list.adapter.FlexibleListAdapter import org.oxycblt.auxio.list.adapter.SimpleDiffCallback import org.oxycblt.auxio.list.recycler.DialogRecyclerView -import org.oxycblt.auxio.music.Artist +import org.oxycblt.musikr.Artist import org.oxycblt.auxio.util.context import org.oxycblt.auxio.util.inflater diff --git a/app/src/main/java/org/oxycblt/auxio/detail/decision/DetailDecisionViewModel.kt b/app/src/main/java/org/oxycblt/auxio/detail/decision/DetailDecisionViewModel.kt index 15c7dfe35..af3a4b4db 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/decision/DetailDecisionViewModel.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/decision/DetailDecisionViewModel.kt @@ -23,12 +23,12 @@ import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Library -import org.oxycblt.auxio.music.Music +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Library +import org.oxycblt.musikr.Music import org.oxycblt.auxio.music.MusicRepository -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Song import timber.log.Timber as L /** diff --git a/app/src/main/java/org/oxycblt/auxio/detail/decision/ShowArtistDialog.kt b/app/src/main/java/org/oxycblt/auxio/detail/decision/ShowArtistDialog.kt index 3879c677a..e2defed2e 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/decision/ShowArtistDialog.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/decision/ShowArtistDialog.kt @@ -32,7 +32,7 @@ import org.oxycblt.auxio.databinding.DialogMusicChoicesBinding import org.oxycblt.auxio.detail.DetailViewModel import org.oxycblt.auxio.list.ClickableListListener import org.oxycblt.auxio.list.adapter.UpdateInstructions -import org.oxycblt.auxio.music.Artist +import org.oxycblt.musikr.Artist import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment import org.oxycblt.auxio.util.collectImmediately import timber.log.Timber as L diff --git a/app/src/main/java/org/oxycblt/auxio/detail/list/AlbumDetailListAdapter.kt b/app/src/main/java/org/oxycblt/auxio/detail/list/AlbumDetailListAdapter.kt index 15588707c..b1ec4cba2 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/list/AlbumDetailListAdapter.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/list/AlbumDetailListAdapter.kt @@ -35,10 +35,10 @@ import org.oxycblt.auxio.list.Item import org.oxycblt.auxio.list.SelectableListListener import org.oxycblt.auxio.list.adapter.SelectionIndicatorAdapter import org.oxycblt.auxio.list.adapter.SimpleDiffCallback -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.musikr.tag.Disc -import org.oxycblt.auxio.musikr.tag.resolveNumber +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.tag.Disc +import org.oxycblt.musikr.tag.resolveNumber import org.oxycblt.auxio.playback.formatDurationMs import org.oxycblt.auxio.util.context import org.oxycblt.auxio.util.getAttrColorCompat diff --git a/app/src/main/java/org/oxycblt/auxio/detail/list/ArtistDetailListAdapter.kt b/app/src/main/java/org/oxycblt/auxio/detail/list/ArtistDetailListAdapter.kt index 524c27792..4679ae668 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/list/ArtistDetailListAdapter.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/list/ArtistDetailListAdapter.kt @@ -29,10 +29,10 @@ import org.oxycblt.auxio.list.Item import org.oxycblt.auxio.list.SelectableListListener import org.oxycblt.auxio.list.adapter.SelectionIndicatorAdapter import org.oxycblt.auxio.list.adapter.SimpleDiffCallback -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.Song import org.oxycblt.auxio.util.context import org.oxycblt.auxio.util.inflater diff --git a/app/src/main/java/org/oxycblt/auxio/detail/list/DetailListAdapter.kt b/app/src/main/java/org/oxycblt/auxio/detail/list/DetailListAdapter.kt index 87aebf5df..a823ae012 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/list/DetailListAdapter.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/list/DetailListAdapter.kt @@ -35,7 +35,7 @@ import org.oxycblt.auxio.list.adapter.SelectionIndicatorAdapter import org.oxycblt.auxio.list.adapter.SimpleDiffCallback import org.oxycblt.auxio.list.recycler.BasicHeaderViewHolder import org.oxycblt.auxio.list.recycler.DividerViewHolder -import org.oxycblt.auxio.music.Music +import org.oxycblt.musikr.Music import org.oxycblt.auxio.util.context import org.oxycblt.auxio.util.inflater diff --git a/app/src/main/java/org/oxycblt/auxio/detail/list/GenreDetailListAdapter.kt b/app/src/main/java/org/oxycblt/auxio/detail/list/GenreDetailListAdapter.kt index 5f2c704f2..29ecd6185 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/list/GenreDetailListAdapter.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/list/GenreDetailListAdapter.kt @@ -24,10 +24,10 @@ import org.oxycblt.auxio.list.Item import org.oxycblt.auxio.list.adapter.SimpleDiffCallback import org.oxycblt.auxio.list.recycler.ArtistViewHolder import org.oxycblt.auxio.list.recycler.SongViewHolder -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.Song /** * A [DetailListAdapter] implementing the header and sub-items for the [Genre] detail view. diff --git a/app/src/main/java/org/oxycblt/auxio/detail/list/PlaylistDetailListAdapter.kt b/app/src/main/java/org/oxycblt/auxio/detail/list/PlaylistDetailListAdapter.kt index dd9513335..2645759dd 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/list/PlaylistDetailListAdapter.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/list/PlaylistDetailListAdapter.kt @@ -40,9 +40,9 @@ import org.oxycblt.auxio.list.adapter.SelectionIndicatorAdapter import org.oxycblt.auxio.list.adapter.SimpleDiffCallback import org.oxycblt.auxio.list.recycler.MaterialDragCallback import org.oxycblt.auxio.list.recycler.SongViewHolder -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.music.resolveNames +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.resolveNames import org.oxycblt.auxio.util.context import org.oxycblt.auxio.util.getAttrColorCompat import org.oxycblt.auxio.util.inflater diff --git a/app/src/main/java/org/oxycblt/auxio/detail/sort/AlbumSongSortDialog.kt b/app/src/main/java/org/oxycblt/auxio/detail/sort/AlbumSongSortDialog.kt index 2ded72ab9..6aeb51eea 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/sort/AlbumSongSortDialog.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/sort/AlbumSongSortDialog.kt @@ -26,7 +26,7 @@ import org.oxycblt.auxio.databinding.DialogSortBinding import org.oxycblt.auxio.detail.DetailViewModel import org.oxycblt.auxio.list.sort.Sort import org.oxycblt.auxio.list.sort.SortDialog -import org.oxycblt.auxio.music.Album +import org.oxycblt.musikr.Album import org.oxycblt.auxio.util.collectImmediately import timber.log.Timber as L diff --git a/app/src/main/java/org/oxycblt/auxio/detail/sort/ArtistSongSortDialog.kt b/app/src/main/java/org/oxycblt/auxio/detail/sort/ArtistSongSortDialog.kt index d132be42c..1362eef5f 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/sort/ArtistSongSortDialog.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/sort/ArtistSongSortDialog.kt @@ -26,7 +26,7 @@ import org.oxycblt.auxio.databinding.DialogSortBinding import org.oxycblt.auxio.detail.DetailViewModel import org.oxycblt.auxio.list.sort.Sort import org.oxycblt.auxio.list.sort.SortDialog -import org.oxycblt.auxio.music.Artist +import org.oxycblt.musikr.Artist import org.oxycblt.auxio.util.collectImmediately import timber.log.Timber as L diff --git a/app/src/main/java/org/oxycblt/auxio/detail/sort/GenreSongSortDialog.kt b/app/src/main/java/org/oxycblt/auxio/detail/sort/GenreSongSortDialog.kt index 504d857cc..5103d870f 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/sort/GenreSongSortDialog.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/sort/GenreSongSortDialog.kt @@ -26,7 +26,7 @@ import org.oxycblt.auxio.databinding.DialogSortBinding import org.oxycblt.auxio.detail.DetailViewModel import org.oxycblt.auxio.list.sort.Sort import org.oxycblt.auxio.list.sort.SortDialog -import org.oxycblt.auxio.music.Genre +import org.oxycblt.musikr.Genre import org.oxycblt.auxio.util.collectImmediately import timber.log.Timber as L diff --git a/app/src/main/java/org/oxycblt/auxio/detail/sort/PlaylistSongSortDialog.kt b/app/src/main/java/org/oxycblt/auxio/detail/sort/PlaylistSongSortDialog.kt index 86192da1d..3e0df5289 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/sort/PlaylistSongSortDialog.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/sort/PlaylistSongSortDialog.kt @@ -26,7 +26,7 @@ import org.oxycblt.auxio.databinding.DialogSortBinding import org.oxycblt.auxio.detail.DetailViewModel import org.oxycblt.auxio.list.sort.Sort import org.oxycblt.auxio.list.sort.SortDialog -import org.oxycblt.auxio.music.Playlist +import org.oxycblt.musikr.Playlist import org.oxycblt.auxio.util.collectImmediately import timber.log.Timber as L diff --git a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt index 37dbbaeb7..946a5a69e 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt @@ -59,14 +59,14 @@ import org.oxycblt.auxio.list.ListViewModel import org.oxycblt.auxio.list.SelectionFragment import org.oxycblt.auxio.list.menu.Menu import org.oxycblt.auxio.music.IndexingState -import org.oxycblt.auxio.music.Music +import org.oxycblt.musikr.Music import org.oxycblt.auxio.music.MusicType import org.oxycblt.auxio.music.MusicViewModel -import org.oxycblt.auxio.music.Playlist +import org.oxycblt.musikr.Playlist import org.oxycblt.auxio.music.PlaylistDecision import org.oxycblt.auxio.music.PlaylistMessage -import org.oxycblt.auxio.musikr.IndexingProgress -import org.oxycblt.auxio.musikr.playlist.m3u.M3U +import org.oxycblt.musikr.IndexingProgress +import org.oxycblt.musikr.playlist.m3u.M3U import org.oxycblt.auxio.playback.PlaybackDecision import org.oxycblt.auxio.playback.PlaybackViewModel import org.oxycblt.auxio.util.collect diff --git a/app/src/main/java/org/oxycblt/auxio/home/HomeGenerator.kt b/app/src/main/java/org/oxycblt/auxio/home/HomeGenerator.kt index 50f8e29e1..657ebbe55 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/HomeGenerator.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/HomeGenerator.kt @@ -22,13 +22,13 @@ import javax.inject.Inject import org.oxycblt.auxio.home.tabs.Tab import org.oxycblt.auxio.list.ListSettings import org.oxycblt.auxio.list.adapter.UpdateInstructions -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre import org.oxycblt.auxio.music.MusicRepository import org.oxycblt.auxio.music.MusicType -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song import timber.log.Timber as L interface HomeGenerator { diff --git a/app/src/main/java/org/oxycblt/auxio/home/HomeViewModel.kt b/app/src/main/java/org/oxycblt/auxio/home/HomeViewModel.kt index 63558b839..969816c09 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/HomeViewModel.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/HomeViewModel.kt @@ -27,12 +27,12 @@ import org.oxycblt.auxio.home.tabs.Tab import org.oxycblt.auxio.list.ListSettings import org.oxycblt.auxio.list.adapter.UpdateInstructions import org.oxycblt.auxio.list.sort.Sort -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre import org.oxycblt.auxio.music.MusicType -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.PlaySong import org.oxycblt.auxio.playback.PlaybackSettings import org.oxycblt.auxio.util.Event diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt index d26c1983a..3e9148417 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt @@ -37,12 +37,12 @@ import org.oxycblt.auxio.list.adapter.SelectionIndicatorAdapter import org.oxycblt.auxio.list.recycler.AlbumViewHolder import org.oxycblt.auxio.list.recycler.FastScrollRecyclerView import org.oxycblt.auxio.list.sort.Sort -import org.oxycblt.auxio.music.Album +import org.oxycblt.musikr.Album import org.oxycblt.auxio.music.IndexingState -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.MusicViewModel -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.PlaybackViewModel import org.oxycblt.auxio.playback.formatDurationMs import org.oxycblt.auxio.playback.secsToMs diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt index 386ee1df7..747096b65 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt @@ -35,12 +35,12 @@ import org.oxycblt.auxio.list.adapter.SelectionIndicatorAdapter import org.oxycblt.auxio.list.recycler.ArtistViewHolder import org.oxycblt.auxio.list.recycler.FastScrollRecyclerView import org.oxycblt.auxio.list.sort.Sort -import org.oxycblt.auxio.music.Artist +import org.oxycblt.musikr.Artist import org.oxycblt.auxio.music.IndexingState -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.MusicViewModel -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.PlaybackViewModel import org.oxycblt.auxio.playback.formatDurationMs import org.oxycblt.auxio.util.collectImmediately diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt index 08953e580..b62b01ccc 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt @@ -35,12 +35,12 @@ import org.oxycblt.auxio.list.adapter.SelectionIndicatorAdapter import org.oxycblt.auxio.list.recycler.FastScrollRecyclerView import org.oxycblt.auxio.list.recycler.GenreViewHolder import org.oxycblt.auxio.list.sort.Sort -import org.oxycblt.auxio.music.Genre +import org.oxycblt.musikr.Genre import org.oxycblt.auxio.music.IndexingState -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.MusicViewModel -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.PlaybackViewModel import org.oxycblt.auxio.playback.formatDurationMs import org.oxycblt.auxio.util.collectImmediately diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/PlaylistListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/PlaylistListFragment.kt index 70b7e7e1b..70f574c98 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/list/PlaylistListFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/list/PlaylistListFragment.kt @@ -35,11 +35,11 @@ import org.oxycblt.auxio.list.recycler.FastScrollRecyclerView import org.oxycblt.auxio.list.recycler.PlaylistViewHolder import org.oxycblt.auxio.list.sort.Sort import org.oxycblt.auxio.music.IndexingState -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.MusicViewModel -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.PlaybackViewModel import org.oxycblt.auxio.playback.formatDurationMs import org.oxycblt.auxio.util.collectImmediately diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt index 36a24f20c..ee0470330 100644 --- a/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt @@ -37,10 +37,10 @@ import org.oxycblt.auxio.list.recycler.FastScrollRecyclerView import org.oxycblt.auxio.list.recycler.SongViewHolder import org.oxycblt.auxio.list.sort.Sort import org.oxycblt.auxio.music.IndexingState -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.MusicViewModel -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.PlaybackViewModel import org.oxycblt.auxio.playback.formatDurationMs import org.oxycblt.auxio.playback.secsToMs diff --git a/app/src/main/java/org/oxycblt/auxio/image/BitmapProvider.kt b/app/src/main/java/org/oxycblt/auxio/image/BitmapProvider.kt index b5ce9a4d5..ac77b5d7a 100644 --- a/app/src/main/java/org/oxycblt/auxio/image/BitmapProvider.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/BitmapProvider.kt @@ -20,7 +20,6 @@ package org.oxycblt.auxio.image import android.content.Context import android.graphics.Bitmap -import androidx.core.graphics.drawable.toBitmap import coil3.ImageLoader import coil3.request.Disposable import coil3.request.ImageRequest @@ -28,7 +27,7 @@ import coil3.size.Size import coil3.toBitmap import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Song /** * A utility to provide bitmaps in a race-less manner. diff --git a/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt b/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt index 8a41de877..680138e64 100644 --- a/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt @@ -53,12 +53,12 @@ import javax.inject.Inject import org.oxycblt.auxio.R import org.oxycblt.auxio.image.coil.RoundedRectTransformation import org.oxycblt.auxio.image.coil.SquareCropTransformation -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.musikr.cover.Cover +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.cover.Cover import org.oxycblt.auxio.ui.MaterialFader import org.oxycblt.auxio.ui.UISettings import org.oxycblt.auxio.util.getAttrColorCompat diff --git a/app/src/main/java/org/oxycblt/auxio/image/coil/Components.kt b/app/src/main/java/org/oxycblt/auxio/image/coil/Components.kt index 9a8e7629a..fc5ebffaa 100644 --- a/app/src/main/java/org/oxycblt/auxio/image/coil/Components.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/coil/Components.kt @@ -44,7 +44,7 @@ import okio.FileSystem import okio.buffer import okio.source import org.oxycblt.auxio.image.stack.CoverRetriever -import org.oxycblt.auxio.musikr.cover.Cover +import org.oxycblt.musikr.cover.Cover class CoverKeyer @Inject constructor() : Keyer { override fun key(data: Cover, options: Options) = "${data.key}&${options.size}" diff --git a/app/src/main/java/org/oxycblt/auxio/image/stack/CoverRetriever.kt b/app/src/main/java/org/oxycblt/auxio/image/stack/CoverRetriever.kt index b7bebc407..4bd761b74 100644 --- a/app/src/main/java/org/oxycblt/auxio/image/stack/CoverRetriever.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/stack/CoverRetriever.kt @@ -21,8 +21,8 @@ package org.oxycblt.auxio.image.stack import java.io.InputStream import javax.inject.Inject import org.oxycblt.auxio.image.stack.extractor.CoverExtractor -import org.oxycblt.auxio.musikr.cover.Cover -import org.oxycblt.auxio.musikr.cover.CoverCache +import org.oxycblt.musikr.cover.Cover +import org.oxycblt.musikr.cover.CoverCache import timber.log.Timber interface CoverRetriever { diff --git a/app/src/main/java/org/oxycblt/auxio/image/stack/extractor/CoverExtractor.kt b/app/src/main/java/org/oxycblt/auxio/image/stack/extractor/CoverExtractor.kt index 08adb6a58..02ee0abf1 100644 --- a/app/src/main/java/org/oxycblt/auxio/image/stack/extractor/CoverExtractor.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/stack/extractor/CoverExtractor.kt @@ -20,7 +20,7 @@ package org.oxycblt.auxio.image.stack.extractor import android.net.Uri import javax.inject.Inject -import org.oxycblt.auxio.musikr.cover.Cover +import org.oxycblt.musikr.cover.Cover interface CoverExtractor { suspend fun extract(cover: Cover.Single): ByteArray? diff --git a/app/src/main/java/org/oxycblt/auxio/list/ListFragment.kt b/app/src/main/java/org/oxycblt/auxio/list/ListFragment.kt index 546b03a49..ddaf9555e 100644 --- a/app/src/main/java/org/oxycblt/auxio/list/ListFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/list/ListFragment.kt @@ -20,7 +20,7 @@ package org.oxycblt.auxio.list import androidx.recyclerview.widget.RecyclerView import androidx.viewbinding.ViewBinding -import org.oxycblt.auxio.music.Music +import org.oxycblt.musikr.Music /** * A Fragment containing a selectable list. diff --git a/app/src/main/java/org/oxycblt/auxio/list/ListViewModel.kt b/app/src/main/java/org/oxycblt/auxio/list/ListViewModel.kt index 3d35d77bc..d6bd43f8d 100644 --- a/app/src/main/java/org/oxycblt/auxio/list/ListViewModel.kt +++ b/app/src/main/java/org/oxycblt/auxio/list/ListViewModel.kt @@ -25,14 +25,14 @@ import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import org.oxycblt.auxio.list.menu.Menu -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.MusicRepository -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.PlaySong import org.oxycblt.auxio.util.Event import org.oxycblt.auxio.util.MutableEvent diff --git a/app/src/main/java/org/oxycblt/auxio/list/adapter/SelectionIndicatorAdapter.kt b/app/src/main/java/org/oxycblt/auxio/list/adapter/SelectionIndicatorAdapter.kt index 1c43ca72b..64e443846 100644 --- a/app/src/main/java/org/oxycblt/auxio/list/adapter/SelectionIndicatorAdapter.kt +++ b/app/src/main/java/org/oxycblt/auxio/list/adapter/SelectionIndicatorAdapter.kt @@ -21,7 +21,7 @@ package org.oxycblt.auxio.list.adapter import android.view.View import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.RecyclerView -import org.oxycblt.auxio.music.Music +import org.oxycblt.musikr.Music import timber.log.Timber as L /** diff --git a/app/src/main/java/org/oxycblt/auxio/list/menu/Menu.kt b/app/src/main/java/org/oxycblt/auxio/list/menu/Menu.kt index 24581b5d2..e3dc2b341 100644 --- a/app/src/main/java/org/oxycblt/auxio/list/menu/Menu.kt +++ b/app/src/main/java/org/oxycblt/auxio/list/menu/Menu.kt @@ -21,12 +21,12 @@ package org.oxycblt.auxio.list.menu import android.os.Parcelable import androidx.annotation.MenuRes import kotlinx.parcelize.Parcelize -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.PlaySong /** diff --git a/app/src/main/java/org/oxycblt/auxio/list/menu/MenuDialogFragmentImpl.kt b/app/src/main/java/org/oxycblt/auxio/list/menu/MenuDialogFragmentImpl.kt index 238d315da..c76e684f4 100644 --- a/app/src/main/java/org/oxycblt/auxio/list/menu/MenuDialogFragmentImpl.kt +++ b/app/src/main/java/org/oxycblt/auxio/list/menu/MenuDialogFragmentImpl.kt @@ -27,12 +27,12 @@ import org.oxycblt.auxio.R import org.oxycblt.auxio.databinding.DialogMenuBinding import org.oxycblt.auxio.detail.DetailViewModel import org.oxycblt.auxio.list.ListViewModel -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre import org.oxycblt.auxio.music.MusicViewModel -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.music.resolveNames +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.resolveNames import org.oxycblt.auxio.playback.PlaybackViewModel import org.oxycblt.auxio.playback.formatDurationMs import org.oxycblt.auxio.util.getPlural diff --git a/app/src/main/java/org/oxycblt/auxio/list/menu/MenuViewModel.kt b/app/src/main/java/org/oxycblt/auxio/list/menu/MenuViewModel.kt index 5b56bd9d3..fa8e7dad9 100644 --- a/app/src/main/java/org/oxycblt/auxio/list/menu/MenuViewModel.kt +++ b/app/src/main/java/org/oxycblt/auxio/list/menu/MenuViewModel.kt @@ -23,7 +23,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.MusicRepository import org.oxycblt.auxio.playback.PlaySong import timber.log.Timber as L diff --git a/app/src/main/java/org/oxycblt/auxio/list/recycler/ViewHolders.kt b/app/src/main/java/org/oxycblt/auxio/list/recycler/ViewHolders.kt index c99d87953..6c14f568e 100644 --- a/app/src/main/java/org/oxycblt/auxio/list/recycler/ViewHolders.kt +++ b/app/src/main/java/org/oxycblt/auxio/list/recycler/ViewHolders.kt @@ -32,13 +32,13 @@ import org.oxycblt.auxio.list.PlainDivider import org.oxycblt.auxio.list.SelectableListListener import org.oxycblt.auxio.list.adapter.SelectionIndicatorAdapter import org.oxycblt.auxio.list.adapter.SimpleDiffCallback -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.music.areNamesTheSame -import org.oxycblt.auxio.music.resolveNames +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.areNamesTheSame +import org.oxycblt.musikr.resolveNames import org.oxycblt.auxio.util.context import org.oxycblt.auxio.util.getPlural import org.oxycblt.auxio.util.inflater diff --git a/app/src/main/java/org/oxycblt/auxio/list/sort/Sort.kt b/app/src/main/java/org/oxycblt/auxio/list/sort/Sort.kt index 78e5d4388..d6536ca2b 100644 --- a/app/src/main/java/org/oxycblt/auxio/list/sort/Sort.kt +++ b/app/src/main/java/org/oxycblt/auxio/list/sort/Sort.kt @@ -20,11 +20,11 @@ package org.oxycblt.auxio.list.sort import org.oxycblt.auxio.IntegerTable import org.oxycblt.auxio.R -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song /** * A sorting method. diff --git a/app/src/main/java/org/oxycblt/auxio/music/Indexing.kt b/app/src/main/java/org/oxycblt/auxio/music/Indexing.kt index ccad505d5..193b4a75a 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/Indexing.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/Indexing.kt @@ -19,7 +19,7 @@ package org.oxycblt.auxio.music import android.os.Build -import org.oxycblt.auxio.musikr.IndexingProgress +import org.oxycblt.musikr.IndexingProgress /** Version-aware permission identifier for reading audio files. */ val PERMISSION_READ_AUDIO = diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt index 4b53254e8..543581d87 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt @@ -25,12 +25,16 @@ import kotlinx.coroutines.Job import kotlinx.coroutines.withContext import kotlinx.coroutines.yield import org.oxycblt.auxio.music.MusicRepository.IndexingWorker -import org.oxycblt.auxio.musikr.Indexer -import org.oxycblt.auxio.musikr.IndexingProgress -import org.oxycblt.auxio.musikr.model.MutableLibrary -import org.oxycblt.auxio.musikr.tag.Interpretation -import org.oxycblt.auxio.musikr.tag.Name -import org.oxycblt.auxio.musikr.tag.interpret.Separators +import org.oxycblt.musikr.Indexer +import org.oxycblt.musikr.IndexingProgress +import org.oxycblt.musikr.Library +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.model.MutableLibrary +import org.oxycblt.musikr.tag.Interpretation +import org.oxycblt.musikr.tag.Name +import org.oxycblt.musikr.tag.interpret.Separators import timber.log.Timber as L /** diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicSettings.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicSettings.kt index 88bff6582..dd94c51a8 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/MusicSettings.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/MusicSettings.kt @@ -24,7 +24,7 @@ import androidx.core.content.edit import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject import org.oxycblt.auxio.R -import org.oxycblt.auxio.musikr.fs.path.DocumentPathFactory +import org.oxycblt.musikr.fs.path.DocumentPathFactory import org.oxycblt.auxio.settings.Settings import timber.log.Timber as L diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicViewModel.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicViewModel.kt index 2796cbaf9..accfb5ff4 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/MusicViewModel.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/MusicViewModel.kt @@ -29,10 +29,15 @@ import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch import org.oxycblt.auxio.R import org.oxycblt.auxio.list.ListSettings -import org.oxycblt.auxio.musikr.playlist.ExportConfig -import org.oxycblt.auxio.musikr.playlist.ExternalPlaylistManager +import org.oxycblt.musikr.playlist.ExportConfig +import org.oxycblt.musikr.playlist.ExternalPlaylistManager import org.oxycblt.auxio.util.Event import org.oxycblt.auxio.util.MutableEvent +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song import timber.log.Timber as L /** diff --git a/app/src/main/java/org/oxycblt/auxio/music/decision/AddToPlaylistDialog.kt b/app/src/main/java/org/oxycblt/auxio/music/decision/AddToPlaylistDialog.kt index 0ac15185d..752b87427 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/decision/AddToPlaylistDialog.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/decision/AddToPlaylistDialog.kt @@ -33,7 +33,7 @@ import org.oxycblt.auxio.databinding.DialogMusicChoicesBinding import org.oxycblt.auxio.list.ClickableListListener import org.oxycblt.auxio.music.MusicViewModel import org.oxycblt.auxio.music.PlaylistDecision -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Song import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment import org.oxycblt.auxio.util.collectImmediately import org.oxycblt.auxio.util.navigateSafe diff --git a/app/src/main/java/org/oxycblt/auxio/music/decision/DeletePlaylistDialog.kt b/app/src/main/java/org/oxycblt/auxio/music/decision/DeletePlaylistDialog.kt index 4b0d04af4..e0b5d2445 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/decision/DeletePlaylistDialog.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/decision/DeletePlaylistDialog.kt @@ -29,7 +29,7 @@ import dagger.hilt.android.AndroidEntryPoint import org.oxycblt.auxio.R import org.oxycblt.auxio.databinding.DialogDeletePlaylistBinding import org.oxycblt.auxio.music.MusicViewModel -import org.oxycblt.auxio.music.Playlist +import org.oxycblt.musikr.Playlist import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment import org.oxycblt.auxio.util.collectImmediately import org.oxycblt.auxio.util.unlikelyToBeNull diff --git a/app/src/main/java/org/oxycblt/auxio/music/decision/ExportPlaylistDialog.kt b/app/src/main/java/org/oxycblt/auxio/music/decision/ExportPlaylistDialog.kt index 2b10abb82..6c86f9f11 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/decision/ExportPlaylistDialog.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/decision/ExportPlaylistDialog.kt @@ -31,9 +31,9 @@ import dagger.hilt.android.AndroidEntryPoint import org.oxycblt.auxio.R import org.oxycblt.auxio.databinding.DialogPlaylistExportBinding import org.oxycblt.auxio.music.MusicViewModel -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.musikr.playlist.ExportConfig -import org.oxycblt.auxio.musikr.playlist.m3u.M3U +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.playlist.ExportConfig +import org.oxycblt.musikr.playlist.m3u.M3U import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment import org.oxycblt.auxio.util.collectImmediately import org.oxycblt.auxio.util.unlikelyToBeNull diff --git a/app/src/main/java/org/oxycblt/auxio/music/decision/PlaylistPickerViewModel.kt b/app/src/main/java/org/oxycblt/auxio/music/decision/PlaylistPickerViewModel.kt index 6ae62d019..1f36fbcda 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/decision/PlaylistPickerViewModel.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/decision/PlaylistPickerViewModel.kt @@ -27,12 +27,12 @@ import kotlinx.coroutines.flow.StateFlow import org.oxycblt.auxio.R import org.oxycblt.auxio.list.Item import org.oxycblt.auxio.list.sort.Sort -import org.oxycblt.auxio.music.Music +import org.oxycblt.musikr.Music import org.oxycblt.auxio.music.MusicRepository -import org.oxycblt.auxio.music.Playlist +import org.oxycblt.musikr.Playlist import org.oxycblt.auxio.music.PlaylistDecision -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.musikr.playlist.ExportConfig +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.playlist.ExportConfig import timber.log.Timber as L /** diff --git a/app/src/main/java/org/oxycblt/auxio/music/locations/LocationAdapter.kt b/app/src/main/java/org/oxycblt/auxio/music/locations/LocationAdapter.kt index 771b2eb1b..7fd41ebef 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/locations/LocationAdapter.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/locations/LocationAdapter.kt @@ -24,7 +24,7 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import org.oxycblt.auxio.databinding.ItemMusicLocationBinding import org.oxycblt.auxio.list.recycler.DialogRecyclerView -import org.oxycblt.auxio.musikr.fs.Path +import org.oxycblt.musikr.fs.Path import org.oxycblt.auxio.util.context import org.oxycblt.auxio.util.inflater import timber.log.Timber as L diff --git a/app/src/main/java/org/oxycblt/auxio/music/locations/MusicSourcesDialog.kt b/app/src/main/java/org/oxycblt/auxio/music/locations/MusicSourcesDialog.kt index 137f0c2b7..a3c38a77b 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/locations/MusicSourcesDialog.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/locations/MusicSourcesDialog.kt @@ -36,7 +36,7 @@ import org.oxycblt.auxio.BuildConfig import org.oxycblt.auxio.R import org.oxycblt.auxio.databinding.DialogMusicLocationsBinding import org.oxycblt.auxio.music.MusicSettings -import org.oxycblt.auxio.musikr.fs.path.DocumentPathFactory +import org.oxycblt.musikr.fs.path.DocumentPathFactory import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment import org.oxycblt.auxio.util.showToast import timber.log.Timber as L diff --git a/app/src/main/java/org/oxycblt/auxio/music/metadata/SeparatorsDialog.kt b/app/src/main/java/org/oxycblt/auxio/music/metadata/SeparatorsDialog.kt index 2bf58ca53..000daf45f 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/metadata/SeparatorsDialog.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/metadata/SeparatorsDialog.kt @@ -29,7 +29,7 @@ import org.oxycblt.auxio.BuildConfig import org.oxycblt.auxio.R import org.oxycblt.auxio.databinding.DialogSeparatorsBinding import org.oxycblt.auxio.music.MusicSettings -import org.oxycblt.auxio.musikr.tag.interpret.Separators +import org.oxycblt.musikr.tag.interpret.Separators import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment import timber.log.Timber as L diff --git a/app/src/main/java/org/oxycblt/auxio/music/service/IndexerNotifications.kt b/app/src/main/java/org/oxycblt/auxio/music/service/IndexerNotifications.kt index 63f9f2c08..c5f9d3d37 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/service/IndexerNotifications.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/service/IndexerNotifications.kt @@ -25,7 +25,7 @@ import org.oxycblt.auxio.BuildConfig import org.oxycblt.auxio.ForegroundServiceNotification import org.oxycblt.auxio.IntegerTable import org.oxycblt.auxio.R -import org.oxycblt.auxio.musikr.IndexingProgress +import org.oxycblt.musikr.IndexingProgress import org.oxycblt.auxio.util.newMainPendingIntent import timber.log.Timber as L diff --git a/app/src/main/java/org/oxycblt/auxio/music/service/IndexingHolder.kt b/app/src/main/java/org/oxycblt/auxio/music/service/IndexingHolder.kt index 30d36deb1..95570eeb1 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/service/IndexingHolder.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/service/IndexingHolder.kt @@ -30,7 +30,7 @@ import org.oxycblt.auxio.BuildConfig import org.oxycblt.auxio.ForegroundListener import org.oxycblt.auxio.ForegroundServiceNotification import org.oxycblt.auxio.music.IndexingState -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.MusicRepository import org.oxycblt.auxio.music.MusicSettings import org.oxycblt.auxio.playback.state.PlaybackStateManager diff --git a/app/src/main/java/org/oxycblt/auxio/music/service/MediaItemTranslation.kt b/app/src/main/java/org/oxycblt/auxio/music/service/MediaItemTranslation.kt index fabff0d99..896e3a7a1 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/service/MediaItemTranslation.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/service/MediaItemTranslation.kt @@ -27,14 +27,14 @@ import androidx.annotation.StringRes import androidx.media.utils.MediaConstants import org.oxycblt.auxio.BuildConfig import org.oxycblt.auxio.R -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.MusicParent -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.music.resolveNames +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.MusicParent +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.resolveNames import org.oxycblt.auxio.playback.formatDurationDs import org.oxycblt.auxio.util.getPlural diff --git a/app/src/main/java/org/oxycblt/auxio/music/service/MusicBrowser.kt b/app/src/main/java/org/oxycblt/auxio/music/service/MusicBrowser.kt index 8989af40e..d21388eb9 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/service/MusicBrowser.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/service/MusicBrowser.kt @@ -27,15 +27,15 @@ import org.oxycblt.auxio.detail.DetailGenerator import org.oxycblt.auxio.detail.DetailSection import org.oxycblt.auxio.home.HomeGenerator import org.oxycblt.auxio.list.adapter.UpdateInstructions -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.Music +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Music import org.oxycblt.auxio.music.MusicRepository import org.oxycblt.auxio.music.MusicType -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.musikr.tag.resolveNumber +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.tag.resolveNumber import org.oxycblt.auxio.search.SearchEngine class MusicBrowser diff --git a/app/src/main/java/org/oxycblt/auxio/music/service/SystemContentObserver.kt b/app/src/main/java/org/oxycblt/auxio/music/service/SystemContentObserver.kt index 67f8bd0a3..4fc9f1f9b 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/service/SystemContentObserver.kt +++ b/app/src/main/java/org/oxycblt/auxio/music/service/SystemContentObserver.kt @@ -27,7 +27,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject import org.oxycblt.auxio.music.MusicRepository import org.oxycblt.auxio.music.MusicSettings -import org.oxycblt.auxio.musikr.fs.contentResolverSafe +import org.oxycblt.musikr.fs.contentResolverSafe import timber.log.Timber as L /** diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaySong.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaySong.kt index 34dd90929..d76ffcfd4 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/PlaySong.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaySong.kt @@ -19,10 +19,10 @@ package org.oxycblt.auxio.playback import org.oxycblt.auxio.IntegerTable -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.MusicParent -import org.oxycblt.auxio.music.Playlist +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.MusicParent +import org.oxycblt.musikr.Playlist /** * Configuration to play a song in a desired way. diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackBarFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackBarFragment.kt index a47f53123..77bb5ec6e 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackBarFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackBarFragment.kt @@ -26,8 +26,8 @@ import dagger.hilt.android.AndroidEntryPoint import org.oxycblt.auxio.R import org.oxycblt.auxio.databinding.FragmentPlaybackBarBinding import org.oxycblt.auxio.detail.DetailViewModel -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.music.resolveNames +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.resolveNames import org.oxycblt.auxio.playback.state.RepeatMode import org.oxycblt.auxio.ui.ViewBindingFragment import org.oxycblt.auxio.util.collectImmediately diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt index 361fdc8b4..eb4c14325 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt @@ -35,9 +35,9 @@ import org.oxycblt.auxio.R import org.oxycblt.auxio.databinding.FragmentPlaybackPanelBinding import org.oxycblt.auxio.detail.DetailViewModel import org.oxycblt.auxio.list.ListViewModel -import org.oxycblt.auxio.music.MusicParent -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.music.resolveNames +import org.oxycblt.musikr.MusicParent +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.resolveNames import org.oxycblt.auxio.playback.state.RepeatMode import org.oxycblt.auxio.playback.ui.StyledSeekBar import org.oxycblt.auxio.playback.ui.SwipeCoverView diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt index 944b7bae7..2895e2cbe 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackViewModel.kt @@ -28,12 +28,12 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch import org.oxycblt.auxio.list.ListSettings -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.MusicParent -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.MusicParent +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.state.DeferredPlayback import org.oxycblt.auxio.playback.state.PlaybackCommand import org.oxycblt.auxio.playback.state.PlaybackStateManager diff --git a/app/src/main/java/org/oxycblt/auxio/playback/decision/ArtistPlaybackChoiceAdapter.kt b/app/src/main/java/org/oxycblt/auxio/playback/decision/ArtistPlaybackChoiceAdapter.kt index 025c71b89..991a04569 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/decision/ArtistPlaybackChoiceAdapter.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/decision/ArtistPlaybackChoiceAdapter.kt @@ -25,7 +25,7 @@ import org.oxycblt.auxio.list.ClickableListListener import org.oxycblt.auxio.list.adapter.FlexibleListAdapter import org.oxycblt.auxio.list.adapter.SimpleDiffCallback import org.oxycblt.auxio.list.recycler.DialogRecyclerView -import org.oxycblt.auxio.music.Artist +import org.oxycblt.musikr.Artist import org.oxycblt.auxio.util.context import org.oxycblt.auxio.util.inflater diff --git a/app/src/main/java/org/oxycblt/auxio/playback/decision/GenrePlaybackChoiceAdapter.kt b/app/src/main/java/org/oxycblt/auxio/playback/decision/GenrePlaybackChoiceAdapter.kt index 584f31e00..8d91321a6 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/decision/GenrePlaybackChoiceAdapter.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/decision/GenrePlaybackChoiceAdapter.kt @@ -25,7 +25,7 @@ import org.oxycblt.auxio.list.ClickableListListener import org.oxycblt.auxio.list.adapter.FlexibleListAdapter import org.oxycblt.auxio.list.adapter.SimpleDiffCallback import org.oxycblt.auxio.list.recycler.DialogRecyclerView -import org.oxycblt.auxio.music.Genre +import org.oxycblt.musikr.Genre import org.oxycblt.auxio.util.context import org.oxycblt.auxio.util.inflater diff --git a/app/src/main/java/org/oxycblt/auxio/playback/decision/PlayFromArtistDialog.kt b/app/src/main/java/org/oxycblt/auxio/playback/decision/PlayFromArtistDialog.kt index 7139ff8af..12eeffb80 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/decision/PlayFromArtistDialog.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/decision/PlayFromArtistDialog.kt @@ -31,8 +31,8 @@ import org.oxycblt.auxio.R import org.oxycblt.auxio.databinding.DialogMusicChoicesBinding import org.oxycblt.auxio.list.ClickableListListener import org.oxycblt.auxio.list.adapter.UpdateInstructions -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.PlaybackViewModel import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment import org.oxycblt.auxio.util.collectImmediately diff --git a/app/src/main/java/org/oxycblt/auxio/playback/decision/PlayFromGenreDialog.kt b/app/src/main/java/org/oxycblt/auxio/playback/decision/PlayFromGenreDialog.kt index c92d24e8c..c0f263556 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/decision/PlayFromGenreDialog.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/decision/PlayFromGenreDialog.kt @@ -31,8 +31,8 @@ import org.oxycblt.auxio.R import org.oxycblt.auxio.databinding.DialogMusicChoicesBinding import org.oxycblt.auxio.list.ClickableListListener import org.oxycblt.auxio.list.adapter.UpdateInstructions -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.PlaybackViewModel import org.oxycblt.auxio.ui.ViewBindingMaterialDialogFragment import org.oxycblt.auxio.util.collectImmediately diff --git a/app/src/main/java/org/oxycblt/auxio/playback/decision/PlaybackPickerViewModel.kt b/app/src/main/java/org/oxycblt/auxio/playback/decision/PlaybackPickerViewModel.kt index bc276a20b..6df3fa0d9 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/decision/PlaybackPickerViewModel.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/decision/PlaybackPickerViewModel.kt @@ -23,10 +23,10 @@ import dagger.hilt.android.lifecycle.HiltViewModel import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Music +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Music import org.oxycblt.auxio.music.MusicRepository -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Song import timber.log.Timber as L /** diff --git a/app/src/main/java/org/oxycblt/auxio/playback/persist/PersistenceDatabase.kt b/app/src/main/java/org/oxycblt/auxio/playback/persist/PersistenceDatabase.kt index adceb581f..2dd88f674 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/persist/PersistenceDatabase.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/persist/PersistenceDatabase.kt @@ -28,7 +28,7 @@ import androidx.room.Query import androidx.room.RoomDatabase import androidx.room.TypeConverters import androidx.room.migration.Migration -import org.oxycblt.auxio.music.Music +import org.oxycblt.musikr.Music import org.oxycblt.auxio.playback.state.RepeatMode /** diff --git a/app/src/main/java/org/oxycblt/auxio/playback/persist/PersistenceRepository.kt b/app/src/main/java/org/oxycblt/auxio/playback/persist/PersistenceRepository.kt index 60df8e3da..3ed14f2d7 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/persist/PersistenceRepository.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/persist/PersistenceRepository.kt @@ -19,7 +19,7 @@ package org.oxycblt.auxio.playback.persist import javax.inject.Inject -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.MusicRepository import org.oxycblt.auxio.playback.state.PlaybackStateManager import timber.log.Timber as L diff --git a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueAdapter.kt b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueAdapter.kt index 05d0d5927..794e52e04 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueAdapter.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueAdapter.kt @@ -32,8 +32,8 @@ import org.oxycblt.auxio.list.adapter.FlexibleListAdapter import org.oxycblt.auxio.list.adapter.PlayingIndicatorAdapter import org.oxycblt.auxio.list.recycler.MaterialDragCallback import org.oxycblt.auxio.list.recycler.SongViewHolder -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.music.resolveNames +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.resolveNames import org.oxycblt.auxio.util.context import org.oxycblt.auxio.util.getAttrColorCompat import org.oxycblt.auxio.util.inflater diff --git a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueFragment.kt b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueFragment.kt index 2654fe9b8..2cdfea7b7 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueFragment.kt @@ -30,7 +30,7 @@ import dagger.hilt.android.AndroidEntryPoint import kotlin.math.min import org.oxycblt.auxio.databinding.FragmentQueueBinding import org.oxycblt.auxio.list.EditClickListListener -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.PlaybackViewModel import org.oxycblt.auxio.ui.ViewBindingFragment import org.oxycblt.auxio.util.collectImmediately diff --git a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueViewModel.kt b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueViewModel.kt index 97ed2493f..b5fcc7bb0 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueViewModel.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/queue/QueueViewModel.kt @@ -24,8 +24,8 @@ import javax.inject.Inject import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import org.oxycblt.auxio.list.adapter.UpdateInstructions -import org.oxycblt.auxio.music.MusicParent -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.MusicParent +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.state.PlaybackStateManager import org.oxycblt.auxio.playback.state.QueueChange import org.oxycblt.auxio.util.Event diff --git a/app/src/main/java/org/oxycblt/auxio/playback/replaygain/ReplayGainAudioProcessor.kt b/app/src/main/java/org/oxycblt/auxio/playback/replaygain/ReplayGainAudioProcessor.kt index c9a5393d4..8672ecb00 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/replaygain/ReplayGainAudioProcessor.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/replaygain/ReplayGainAudioProcessor.kt @@ -26,9 +26,9 @@ import androidx.media3.common.audio.BaseAudioProcessor import java.nio.ByteBuffer import javax.inject.Inject import kotlin.math.pow -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.MusicParent -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.MusicParent +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.PlaybackSettings import org.oxycblt.auxio.playback.state.PlaybackStateManager import org.oxycblt.auxio.playback.state.QueueChange diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/ExoPlaybackStateHolder.kt b/app/src/main/java/org/oxycblt/auxio/playback/service/ExoPlaybackStateHolder.kt index 5f87d0a96..3a494babd 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/service/ExoPlaybackStateHolder.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/service/ExoPlaybackStateHolder.kt @@ -43,9 +43,9 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import kotlinx.coroutines.yield import org.oxycblt.auxio.image.ImageSettings -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.MusicRepository -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.PlaybackSettings import org.oxycblt.auxio.playback.msToSecs import org.oxycblt.auxio.playback.persist.PersistenceRepository diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionHolder.kt b/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionHolder.kt index f190f657f..021128a99 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionHolder.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionHolder.kt @@ -36,9 +36,9 @@ import org.oxycblt.auxio.IntegerTable import org.oxycblt.auxio.R import org.oxycblt.auxio.image.BitmapProvider import org.oxycblt.auxio.image.ImageSettings -import org.oxycblt.auxio.music.MusicParent -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.music.resolveNames +import org.oxycblt.musikr.MusicParent +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.resolveNames import org.oxycblt.auxio.music.service.MediaSessionUID import org.oxycblt.auxio.music.service.toMediaDescription import org.oxycblt.auxio.playback.ActionMode diff --git a/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionInterface.kt b/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionInterface.kt index 718c8dc02..7fde57c78 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionInterface.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/service/MediaSessionInterface.kt @@ -29,18 +29,18 @@ import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject import org.apache.commons.text.similarity.JaroWinklerSimilarity import org.oxycblt.auxio.BuildConfig -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.Library -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Library +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.MusicRepository -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song import org.oxycblt.auxio.music.service.MediaSessionUID import org.oxycblt.auxio.music.service.MusicBrowser -import org.oxycblt.auxio.musikr.tag.Name +import org.oxycblt.musikr.tag.Name import org.oxycblt.auxio.playback.state.PlaybackCommand import org.oxycblt.auxio.playback.state.PlaybackStateManager import org.oxycblt.auxio.playback.state.RepeatMode diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackCommand.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackCommand.kt index 05bc985e8..bc58043b2 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackCommand.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackCommand.kt @@ -21,13 +21,13 @@ package org.oxycblt.auxio.playback.state import javax.inject.Inject import org.oxycblt.auxio.list.ListSettings import org.oxycblt.auxio.list.sort.Sort -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.MusicRepository -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.PlaybackSettings /** diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateHolder.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateHolder.kt index 4d1cdca98..11f5f2938 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateHolder.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateHolder.kt @@ -22,8 +22,8 @@ import android.net.Uri import android.os.SystemClock import android.support.v4.media.session.PlaybackStateCompat import org.oxycblt.auxio.list.adapter.UpdateInstructions -import org.oxycblt.auxio.music.MusicParent -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.MusicParent +import org.oxycblt.musikr.Song /** * The designated "source of truth" for the current playback state. Should only be used by diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt index b74b53d5c..ecfe72b8e 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt @@ -21,9 +21,9 @@ package org.oxycblt.auxio.playback.state import javax.inject.Inject import org.oxycblt.auxio.BuildConfig import org.oxycblt.auxio.list.adapter.UpdateInstructions -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.MusicParent -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.MusicParent +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.state.PlaybackStateManager.Listener import timber.log.Timber as L diff --git a/app/src/main/java/org/oxycblt/auxio/search/SearchAdapter.kt b/app/src/main/java/org/oxycblt/auxio/search/SearchAdapter.kt index fc27bc8dd..32f9b09a0 100644 --- a/app/src/main/java/org/oxycblt/auxio/search/SearchAdapter.kt +++ b/app/src/main/java/org/oxycblt/auxio/search/SearchAdapter.kt @@ -33,12 +33,12 @@ import org.oxycblt.auxio.list.recycler.DividerViewHolder import org.oxycblt.auxio.list.recycler.GenreViewHolder import org.oxycblt.auxio.list.recycler.PlaylistViewHolder import org.oxycblt.auxio.list.recycler.SongViewHolder -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song /** * An adapter that displays search results. diff --git a/app/src/main/java/org/oxycblt/auxio/search/SearchEngine.kt b/app/src/main/java/org/oxycblt/auxio/search/SearchEngine.kt index fe0b85d3a..5ff40a0c1 100644 --- a/app/src/main/java/org/oxycblt/auxio/search/SearchEngine.kt +++ b/app/src/main/java/org/oxycblt/auxio/search/SearchEngine.kt @@ -22,13 +22,13 @@ import android.content.Context import dagger.hilt.android.qualifiers.ApplicationContext import java.text.Normalizer import javax.inject.Inject -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.musikr.tag.Name +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.tag.Name import timber.log.Timber as L /** diff --git a/app/src/main/java/org/oxycblt/auxio/search/SearchFragment.kt b/app/src/main/java/org/oxycblt/auxio/search/SearchFragment.kt index 761164298..b522efedf 100644 --- a/app/src/main/java/org/oxycblt/auxio/search/SearchFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/search/SearchFragment.kt @@ -44,17 +44,17 @@ import org.oxycblt.auxio.list.ListViewModel import org.oxycblt.auxio.list.PlainDivider import org.oxycblt.auxio.list.PlainHeader import org.oxycblt.auxio.list.menu.Menu -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.MusicParent +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.MusicParent import org.oxycblt.auxio.music.MusicViewModel -import org.oxycblt.auxio.music.Playlist +import org.oxycblt.musikr.Playlist import org.oxycblt.auxio.music.PlaylistDecision import org.oxycblt.auxio.music.PlaylistMessage -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.musikr.playlist.m3u.M3U +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.playlist.m3u.M3U import org.oxycblt.auxio.playback.PlaybackDecision import org.oxycblt.auxio.playback.PlaybackViewModel import org.oxycblt.auxio.util.collect diff --git a/app/src/main/java/org/oxycblt/auxio/search/SearchViewModel.kt b/app/src/main/java/org/oxycblt/auxio/search/SearchViewModel.kt index ee72eab94..372a72254 100644 --- a/app/src/main/java/org/oxycblt/auxio/search/SearchViewModel.kt +++ b/app/src/main/java/org/oxycblt/auxio/search/SearchViewModel.kt @@ -33,10 +33,10 @@ import org.oxycblt.auxio.list.BasicHeader import org.oxycblt.auxio.list.Item import org.oxycblt.auxio.list.PlainDivider import org.oxycblt.auxio.list.sort.Sort -import org.oxycblt.auxio.music.Library +import org.oxycblt.musikr.Library import org.oxycblt.auxio.music.MusicRepository import org.oxycblt.auxio.music.MusicType -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.PlaySong import org.oxycblt.auxio.playback.PlaybackSettings import timber.log.Timber as L diff --git a/app/src/main/java/org/oxycblt/auxio/util/FrameworkUtil.kt b/app/src/main/java/org/oxycblt/auxio/util/FrameworkUtil.kt index 034299d1d..91242e1bb 100644 --- a/app/src/main/java/org/oxycblt/auxio/util/FrameworkUtil.kt +++ b/app/src/main/java/org/oxycblt/auxio/util/FrameworkUtil.kt @@ -46,8 +46,8 @@ import androidx.viewbinding.ViewBinding import com.google.android.material.appbar.MaterialToolbar import java.lang.IllegalArgumentException import org.oxycblt.auxio.R -import org.oxycblt.auxio.music.MusicParent -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.MusicParent +import org.oxycblt.musikr.Song import timber.log.Timber as L /** diff --git a/app/src/main/java/org/oxycblt/auxio/util/LangUtil.kt b/app/src/main/java/org/oxycblt/auxio/util/LangUtil.kt index 5b02d02ab..91eb66ed6 100644 --- a/app/src/main/java/org/oxycblt/auxio/util/LangUtil.kt +++ b/app/src/main/java/org/oxycblt/auxio/util/LangUtil.kt @@ -22,7 +22,7 @@ import java.security.MessageDigest import java.util.UUID import kotlin.reflect.KClass import org.oxycblt.auxio.BuildConfig -import org.oxycblt.auxio.musikr.tag.Date +import org.oxycblt.musikr.tag.Date /** * Sanitizes a value that is unlikely to be null. On debug builds, this aliases to [requireNotNull], diff --git a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetComponent.kt b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetComponent.kt index 6d19af745..100246efc 100644 --- a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetComponent.kt +++ b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetComponent.kt @@ -30,8 +30,8 @@ import org.oxycblt.auxio.image.BitmapProvider import org.oxycblt.auxio.image.ImageSettings import org.oxycblt.auxio.image.coil.RoundedRectTransformation import org.oxycblt.auxio.image.coil.SquareCropTransformation -import org.oxycblt.auxio.music.MusicParent -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.MusicParent +import org.oxycblt.musikr.Song import org.oxycblt.auxio.playback.state.PlaybackStateManager import org.oxycblt.auxio.playback.state.Progression import org.oxycblt.auxio.playback.state.QueueChange diff --git a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt index 9dc85edc8..567956c15 100644 --- a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt +++ b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt @@ -30,7 +30,7 @@ import android.view.View import android.widget.RemoteViews import org.oxycblt.auxio.BuildConfig import org.oxycblt.auxio.R -import org.oxycblt.auxio.music.resolveNames +import org.oxycblt.musikr.resolveNames import org.oxycblt.auxio.playback.service.PlaybackActions import org.oxycblt.auxio.playback.state.RepeatMode import org.oxycblt.auxio.ui.UISettings diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/Indexer.kt b/app/src/main/java/org/oxycblt/musikr/Indexer.kt similarity index 89% rename from app/src/main/java/org/oxycblt/auxio/musikr/Indexer.kt rename to app/src/main/java/org/oxycblt/musikr/Indexer.kt index 441b7c9af..e6773a01c 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/Indexer.kt +++ b/app/src/main/java/org/oxycblt/musikr/Indexer.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr +package org.oxycblt.musikr import android.net.Uri import javax.inject.Inject @@ -26,11 +26,11 @@ import kotlinx.coroutines.flow.buffer import kotlinx.coroutines.flow.onCompletion import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onStart -import org.oxycblt.auxio.musikr.model.MutableLibrary -import org.oxycblt.auxio.musikr.pipeline.EvaluateStep -import org.oxycblt.auxio.musikr.pipeline.ExploreStep -import org.oxycblt.auxio.musikr.pipeline.ExtractStep -import org.oxycblt.auxio.musikr.tag.Interpretation +import org.oxycblt.musikr.model.MutableLibrary +import org.oxycblt.musikr.pipeline.EvaluateStep +import org.oxycblt.musikr.pipeline.ExploreStep +import org.oxycblt.musikr.pipeline.ExtractStep +import org.oxycblt.musikr.tag.Interpretation interface Indexer { suspend fun run( diff --git a/app/src/main/java/org/oxycblt/auxio/music/Music.kt b/app/src/main/java/org/oxycblt/musikr/Music.kt similarity index 97% rename from app/src/main/java/org/oxycblt/auxio/music/Music.kt rename to app/src/main/java/org/oxycblt/musikr/Music.kt index 57e4a9085..6e3f8fcbe 100644 --- a/app/src/main/java/org/oxycblt/auxio/music/Music.kt +++ b/app/src/main/java/org/oxycblt/musikr/Music.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.music +package org.oxycblt.musikr import android.content.Context import android.net.Uri @@ -28,13 +28,14 @@ import kotlin.math.max import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize import org.oxycblt.auxio.list.Item -import org.oxycblt.auxio.musikr.cover.Cover -import org.oxycblt.auxio.musikr.fs.MimeType -import org.oxycblt.auxio.musikr.fs.Path -import org.oxycblt.auxio.musikr.tag.Date -import org.oxycblt.auxio.musikr.tag.Disc -import org.oxycblt.auxio.musikr.tag.Name -import org.oxycblt.auxio.musikr.tag.ReleaseType +import org.oxycblt.auxio.music.MusicType +import org.oxycblt.musikr.cover.Cover +import org.oxycblt.musikr.fs.MimeType +import org.oxycblt.musikr.fs.Path +import org.oxycblt.musikr.tag.Date +import org.oxycblt.musikr.tag.Disc +import org.oxycblt.musikr.tag.Name +import org.oxycblt.musikr.tag.ReleaseType import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment import org.oxycblt.auxio.util.concatLocalized import org.oxycblt.auxio.util.toUuidOrNull @@ -138,7 +139,7 @@ sealed interface Music : Item { @TypeConverter fun fromMusicUID(uid: UID?) = uid?.toString() /** @see [Music.UID.fromString] */ - @TypeConverter fun toMusicUid(string: String?) = string?.let(UID::fromString) + @TypeConverter fun toMusicUid(string: String?) = string?.let(Companion::fromString) } companion object { diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/StackModule.kt b/app/src/main/java/org/oxycblt/musikr/StackModule.kt similarity index 96% rename from app/src/main/java/org/oxycblt/auxio/musikr/StackModule.kt rename to app/src/main/java/org/oxycblt/musikr/StackModule.kt index 54e66d334..49795ae06 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/StackModule.kt +++ b/app/src/main/java/org/oxycblt/musikr/StackModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr +package org.oxycblt.musikr import dagger.Binds import dagger.Module diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/cover/CacheModule.kt b/app/src/main/java/org/oxycblt/musikr/cover/CacheModule.kt similarity index 97% rename from app/src/main/java/org/oxycblt/auxio/musikr/cover/CacheModule.kt rename to app/src/main/java/org/oxycblt/musikr/cover/CacheModule.kt index 83c13e13d..16bd1a07f 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/cover/CacheModule.kt +++ b/app/src/main/java/org/oxycblt/musikr/cover/CacheModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.cover +package org.oxycblt.musikr.cover import android.content.Context import androidx.room.Room diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/cover/Cover.kt b/app/src/main/java/org/oxycblt/musikr/cover/Cover.kt similarity index 95% rename from app/src/main/java/org/oxycblt/auxio/musikr/cover/Cover.kt rename to app/src/main/java/org/oxycblt/musikr/cover/Cover.kt index 1b477f12b..2d7d332c2 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/cover/Cover.kt +++ b/app/src/main/java/org/oxycblt/musikr/cover/Cover.kt @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.cover +package org.oxycblt.musikr.cover import org.oxycblt.auxio.list.sort.Sort -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Song sealed interface Cover { val key: String diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverCache.kt b/app/src/main/java/org/oxycblt/musikr/cover/CoverCache.kt similarity index 96% rename from app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverCache.kt rename to app/src/main/java/org/oxycblt/musikr/cover/CoverCache.kt index fd79635db..687a952ee 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverCache.kt +++ b/app/src/main/java/org/oxycblt/musikr/cover/CoverCache.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.cover +package org.oxycblt.musikr.cover import java.io.InputStream import javax.inject.Inject @@ -44,7 +44,8 @@ constructor( val id = coverIdentifier.identify(data) coverFiles.write(id, data) storedCoversDao.setStoredCover( - StoredCover(uid = cover.uid, lastModified = cover.lastModified, coverId = id)) + StoredCover(uid = cover.uid, lastModified = cover.lastModified, coverId = id) + ) return coverFiles.read(id) } } diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverFiles.kt b/app/src/main/java/org/oxycblt/musikr/cover/CoverFiles.kt similarity index 98% rename from app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverFiles.kt rename to app/src/main/java/org/oxycblt/musikr/cover/CoverFiles.kt index 39d729ed4..060cac513 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverFiles.kt +++ b/app/src/main/java/org/oxycblt/musikr/cover/CoverFiles.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.cover +package org.oxycblt.musikr.cover import android.content.Context import dagger.hilt.android.qualifiers.ApplicationContext diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverFormat.kt b/app/src/main/java/org/oxycblt/musikr/cover/CoverFormat.kt similarity index 98% rename from app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverFormat.kt rename to app/src/main/java/org/oxycblt/musikr/cover/CoverFormat.kt index a565ac3d5..b84bb6f3c 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverFormat.kt +++ b/app/src/main/java/org/oxycblt/musikr/cover/CoverFormat.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.cover +package org.oxycblt.musikr.cover import android.graphics.Bitmap import android.graphics.BitmapFactory diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverIdentifier.kt b/app/src/main/java/org/oxycblt/musikr/cover/CoverIdentifier.kt similarity index 96% rename from app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverIdentifier.kt rename to app/src/main/java/org/oxycblt/musikr/cover/CoverIdentifier.kt index 75cb2bf7a..0a7ac57d7 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/cover/CoverIdentifier.kt +++ b/app/src/main/java/org/oxycblt/musikr/cover/CoverIdentifier.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.cover +package org.oxycblt.musikr.cover import java.security.MessageDigest import javax.inject.Inject diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/cover/StoredCoversDatabase.kt b/app/src/main/java/org/oxycblt/musikr/cover/StoredCoversDatabase.kt similarity index 95% rename from app/src/main/java/org/oxycblt/auxio/musikr/cover/StoredCoversDatabase.kt rename to app/src/main/java/org/oxycblt/musikr/cover/StoredCoversDatabase.kt index fb03e29bb..cde40884f 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/cover/StoredCoversDatabase.kt +++ b/app/src/main/java/org/oxycblt/musikr/cover/StoredCoversDatabase.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.cover +package org.oxycblt.musikr.cover import androidx.room.Dao import androidx.room.Database @@ -27,7 +27,7 @@ import androidx.room.PrimaryKey import androidx.room.Query import androidx.room.RoomDatabase import androidx.room.TypeConverters -import org.oxycblt.auxio.music.Music +import org.oxycblt.musikr.Music @Database(entities = [StoredCover::class], version = 50, exportSchema = false) abstract class StoredCoversDatabase : RoomDatabase() { diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/fs/DeviceFiles.kt b/app/src/main/java/org/oxycblt/musikr/fs/DeviceFiles.kt similarity index 96% rename from app/src/main/java/org/oxycblt/auxio/musikr/fs/DeviceFiles.kt rename to app/src/main/java/org/oxycblt/musikr/fs/DeviceFiles.kt index d269dbb36..da9d81ffc 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/fs/DeviceFiles.kt +++ b/app/src/main/java/org/oxycblt/musikr/fs/DeviceFiles.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.fs +package org.oxycblt.musikr.fs import android.content.ContentResolver import android.content.Context @@ -31,7 +31,7 @@ import kotlinx.coroutines.flow.emitAll import kotlinx.coroutines.flow.flatMapMerge import kotlinx.coroutines.flow.flattenMerge import kotlinx.coroutines.flow.flow -import org.oxycblt.auxio.musikr.fs.path.DocumentPathFactory +import org.oxycblt.musikr.fs.path.DocumentPathFactory import timber.log.Timber interface DeviceFiles { @@ -73,7 +73,8 @@ constructor( ): Flow = flow { contentResolver.useQuery( DocumentsContract.buildChildDocumentsUriUsingTree(rootUri, treeDocumentId), - PROJECTION) { cursor -> + PROJECTION + ) { cursor -> val childUriIndex = cursor.getColumnIndexOrThrow(DocumentsContract.Document.COLUMN_DOCUMENT_ID) val displayNameIndex = @@ -105,7 +106,8 @@ constructor( mimeType, newPath, size, - lastModified)) + lastModified) + ) } } emitAll(recursive.asFlow().flattenMerge()) diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/fs/Fs.kt b/app/src/main/java/org/oxycblt/musikr/fs/Fs.kt similarity index 99% rename from app/src/main/java/org/oxycblt/auxio/musikr/fs/Fs.kt rename to app/src/main/java/org/oxycblt/musikr/fs/Fs.kt index 421747767..245999190 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/fs/Fs.kt +++ b/app/src/main/java/org/oxycblt/musikr/fs/Fs.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.fs +package org.oxycblt.musikr.fs import android.content.Context import android.media.MediaFormat diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/fs/FsModule.kt b/app/src/main/java/org/oxycblt/musikr/fs/FsModule.kt similarity index 89% rename from app/src/main/java/org/oxycblt/auxio/musikr/fs/FsModule.kt rename to app/src/main/java/org/oxycblt/musikr/fs/FsModule.kt index 6424a5380..658c9f9a3 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/fs/FsModule.kt +++ b/app/src/main/java/org/oxycblt/musikr/fs/FsModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.fs +package org.oxycblt.musikr.fs import android.content.ContentResolver import android.content.Context @@ -27,9 +27,9 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import org.oxycblt.auxio.musikr.fs.path.DocumentPathFactory -import org.oxycblt.auxio.musikr.fs.path.DocumentPathFactoryImpl -import org.oxycblt.auxio.musikr.fs.path.MediaStorePathInterpreter +import org.oxycblt.musikr.fs.path.DocumentPathFactory +import org.oxycblt.musikr.fs.path.DocumentPathFactoryImpl +import org.oxycblt.musikr.fs.path.MediaStorePathInterpreter import org.oxycblt.auxio.util.getSystemServiceCompat @Module diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/fs/StorageUtil.kt b/app/src/main/java/org/oxycblt/musikr/fs/StorageUtil.kt similarity index 99% rename from app/src/main/java/org/oxycblt/auxio/musikr/fs/StorageUtil.kt rename to app/src/main/java/org/oxycblt/musikr/fs/StorageUtil.kt index 658329918..52e0b7477 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/fs/StorageUtil.kt +++ b/app/src/main/java/org/oxycblt/musikr/fs/StorageUtil.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.fs +package org.oxycblt.musikr.fs import android.annotation.SuppressLint import android.content.ContentResolver diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/fs/path/DocumentPathFactory.kt b/app/src/main/java/org/oxycblt/musikr/fs/path/DocumentPathFactory.kt similarity index 94% rename from app/src/main/java/org/oxycblt/auxio/musikr/fs/path/DocumentPathFactory.kt rename to app/src/main/java/org/oxycblt/musikr/fs/path/DocumentPathFactory.kt index 4967938a6..5820e7af3 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/fs/path/DocumentPathFactory.kt +++ b/app/src/main/java/org/oxycblt/musikr/fs/path/DocumentPathFactory.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.fs.path +package org.oxycblt.musikr.fs.path import android.content.ContentUris import android.content.Context @@ -25,12 +25,12 @@ import android.provider.DocumentsContract import dagger.hilt.android.qualifiers.ApplicationContext import java.io.File import javax.inject.Inject -import org.oxycblt.auxio.musikr.fs.Components -import org.oxycblt.auxio.musikr.fs.Path -import org.oxycblt.auxio.musikr.fs.Volume -import org.oxycblt.auxio.musikr.fs.VolumeManager -import org.oxycblt.auxio.musikr.fs.contentResolverSafe -import org.oxycblt.auxio.musikr.fs.useQuery +import org.oxycblt.musikr.fs.Components +import org.oxycblt.musikr.fs.Path +import org.oxycblt.musikr.fs.Volume +import org.oxycblt.musikr.fs.VolumeManager +import org.oxycblt.musikr.fs.contentResolverSafe +import org.oxycblt.musikr.fs.useQuery /** * A factory for parsing the reverse-engineered format of the URIs obtained from document picker. diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/fs/path/MediaStorePathInterpreter.kt b/app/src/main/java/org/oxycblt/musikr/fs/path/MediaStorePathInterpreter.kt similarity index 98% rename from app/src/main/java/org/oxycblt/auxio/musikr/fs/path/MediaStorePathInterpreter.kt rename to app/src/main/java/org/oxycblt/musikr/fs/path/MediaStorePathInterpreter.kt index ebe41f451..d93fef53e 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/fs/path/MediaStorePathInterpreter.kt +++ b/app/src/main/java/org/oxycblt/musikr/fs/path/MediaStorePathInterpreter.kt @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.fs.path +package org.oxycblt.musikr.fs.path import android.database.Cursor import android.os.Build import android.provider.MediaStore -import org.oxycblt.auxio.musikr.fs.Components -import org.oxycblt.auxio.musikr.fs.Path -import org.oxycblt.auxio.musikr.fs.VolumeManager +import org.oxycblt.musikr.fs.Components +import org.oxycblt.musikr.fs.Path +import org.oxycblt.musikr.fs.VolumeManager import timber.log.Timber as L /** diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/graph/GraphModule.kt b/app/src/main/java/org/oxycblt/musikr/graph/GraphModule.kt similarity index 96% rename from app/src/main/java/org/oxycblt/auxio/musikr/graph/GraphModule.kt rename to app/src/main/java/org/oxycblt/musikr/graph/GraphModule.kt index 49fa786ae..1ac09a7f1 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/graph/GraphModule.kt +++ b/app/src/main/java/org/oxycblt/musikr/graph/GraphModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.graph +package org.oxycblt.musikr.graph import dagger.Binds import dagger.Module diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/graph/MusicGraph.kt b/app/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt similarity index 97% rename from app/src/main/java/org/oxycblt/auxio/musikr/graph/MusicGraph.kt rename to app/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt index fd067e4b1..33e1e6500 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/graph/MusicGraph.kt +++ b/app/src/main/java/org/oxycblt/musikr/graph/MusicGraph.kt @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.graph +package org.oxycblt.musikr.graph import javax.inject.Inject -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.musikr.tag.interpret.PreAlbum -import org.oxycblt.auxio.musikr.tag.interpret.PreArtist -import org.oxycblt.auxio.musikr.tag.interpret.PreGenre -import org.oxycblt.auxio.musikr.tag.interpret.PreSong +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.tag.interpret.PreAlbum +import org.oxycblt.musikr.tag.interpret.PreArtist +import org.oxycblt.musikr.tag.interpret.PreGenre +import org.oxycblt.musikr.tag.interpret.PreSong import org.oxycblt.auxio.util.unlikelyToBeNull import timber.log.Timber as L diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/metadata/AudioMetadata.kt b/app/src/main/java/org/oxycblt/musikr/metadata/AudioMetadata.kt similarity index 95% rename from app/src/main/java/org/oxycblt/auxio/musikr/metadata/AudioMetadata.kt rename to app/src/main/java/org/oxycblt/musikr/metadata/AudioMetadata.kt index bdfb061a8..07ce984d2 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/metadata/AudioMetadata.kt +++ b/app/src/main/java/org/oxycblt/musikr/metadata/AudioMetadata.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.metadata +package org.oxycblt.musikr.metadata import android.media.MediaMetadataRetriever import androidx.media3.common.Format diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/metadata/AudioProperties.kt b/app/src/main/java/org/oxycblt/musikr/metadata/AudioProperties.kt similarity index 96% rename from app/src/main/java/org/oxycblt/auxio/musikr/metadata/AudioProperties.kt rename to app/src/main/java/org/oxycblt/musikr/metadata/AudioProperties.kt index 5fb79950e..38df57b45 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/metadata/AudioProperties.kt +++ b/app/src/main/java/org/oxycblt/musikr/metadata/AudioProperties.kt @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.metadata +package org.oxycblt.musikr.metadata import android.content.Context import android.media.MediaExtractor import android.media.MediaFormat import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.musikr.fs.MimeType +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.fs.MimeType import timber.log.Timber as L /** @@ -119,6 +119,7 @@ constructor(@ApplicationContext private val context: Context) : AudioProperties. return AudioProperties( bitrate, sampleRate, - MimeType(fromExtension = song.mimeType.fromExtension, fromFormat = formatMimeType)) + MimeType(fromExtension = song.mimeType.fromExtension, fromFormat = formatMimeType) + ) } } diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/metadata/MetadataExtractor.kt b/app/src/main/java/org/oxycblt/musikr/metadata/MetadataExtractor.kt similarity index 96% rename from app/src/main/java/org/oxycblt/auxio/musikr/metadata/MetadataExtractor.kt rename to app/src/main/java/org/oxycblt/musikr/metadata/MetadataExtractor.kt index ff151dc49..b1a756d04 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/metadata/MetadataExtractor.kt +++ b/app/src/main/java/org/oxycblt/musikr/metadata/MetadataExtractor.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.metadata +package org.oxycblt.musikr.metadata import android.content.Context import android.media.MediaMetadataRetriever @@ -28,7 +28,7 @@ import javax.inject.Inject import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.guava.await import kotlinx.coroutines.withContext -import org.oxycblt.auxio.musikr.fs.DeviceFile +import org.oxycblt.musikr.fs.DeviceFile interface MetadataExtractor { suspend fun extract(file: DeviceFile): AudioMetadata diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/metadata/MetadataModule.kt b/app/src/main/java/org/oxycblt/musikr/metadata/MetadataModule.kt similarity index 96% rename from app/src/main/java/org/oxycblt/auxio/musikr/metadata/MetadataModule.kt rename to app/src/main/java/org/oxycblt/musikr/metadata/MetadataModule.kt index 459127266..10746ce05 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/metadata/MetadataModule.kt +++ b/app/src/main/java/org/oxycblt/musikr/metadata/MetadataModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.metadata +package org.oxycblt.musikr.metadata import dagger.Binds import dagger.Module diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/metadata/ReusableMetadataRetriever.kt b/app/src/main/java/org/oxycblt/musikr/metadata/ReusableMetadataRetriever.kt similarity index 99% rename from app/src/main/java/org/oxycblt/auxio/musikr/metadata/ReusableMetadataRetriever.kt rename to app/src/main/java/org/oxycblt/musikr/metadata/ReusableMetadataRetriever.kt index 4f915fa1d..bc7e1ec86 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/metadata/ReusableMetadataRetriever.kt +++ b/app/src/main/java/org/oxycblt/musikr/metadata/ReusableMetadataRetriever.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.metadata +package org.oxycblt.musikr.metadata import android.os.Handler import android.os.HandlerThread @@ -110,7 +110,8 @@ constructor(private val mediaSourceFactory: MediaSource.Factory) : job = MetadataJob(data, mediaSourceCaller) mediaSourceHandler.sendEmptyMessageDelayed( - MESSAGE_CHECK_FAILURE, /* delayMs= */ CHECK_INTERVAL_MS) + MESSAGE_CHECK_FAILURE, /* delayMs= */ CHECK_INTERVAL_MS + ) return true } diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/model/DeviceMusicImpl.kt b/app/src/main/java/org/oxycblt/musikr/model/DeviceMusicImpl.kt similarity index 92% rename from app/src/main/java/org/oxycblt/auxio/musikr/model/DeviceMusicImpl.kt rename to app/src/main/java/org/oxycblt/musikr/model/DeviceMusicImpl.kt index 147988b67..dd23495a7 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/model/DeviceMusicImpl.kt +++ b/app/src/main/java/org/oxycblt/musikr/model/DeviceMusicImpl.kt @@ -16,20 +16,20 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.model +package org.oxycblt.musikr.model -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.Music +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Music import org.oxycblt.auxio.music.MusicType -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.musikr.cover.Cover -import org.oxycblt.auxio.musikr.tag.Date -import org.oxycblt.auxio.musikr.tag.interpret.PreAlbum -import org.oxycblt.auxio.musikr.tag.interpret.PreArtist -import org.oxycblt.auxio.musikr.tag.interpret.PreGenre -import org.oxycblt.auxio.musikr.tag.interpret.PreSong +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.cover.Cover +import org.oxycblt.musikr.tag.Date +import org.oxycblt.musikr.tag.interpret.PreAlbum +import org.oxycblt.musikr.tag.interpret.PreArtist +import org.oxycblt.musikr.tag.interpret.PreGenre +import org.oxycblt.musikr.tag.interpret.PreSong import org.oxycblt.auxio.util.update interface SongHandle { diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/model/Library.kt b/app/src/main/java/org/oxycblt/musikr/model/Library.kt similarity index 89% rename from app/src/main/java/org/oxycblt/auxio/musikr/model/Library.kt rename to app/src/main/java/org/oxycblt/musikr/model/Library.kt index 40296a494..124204e43 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/model/Library.kt +++ b/app/src/main/java/org/oxycblt/musikr/model/Library.kt @@ -16,22 +16,22 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.model +package org.oxycblt.musikr.model import javax.inject.Inject -import org.oxycblt.auxio.music.Album -import org.oxycblt.auxio.music.Artist -import org.oxycblt.auxio.music.Genre -import org.oxycblt.auxio.music.Library -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.musikr.fs.Path -import org.oxycblt.auxio.musikr.graph.AlbumVertex -import org.oxycblt.auxio.musikr.graph.ArtistVertex -import org.oxycblt.auxio.musikr.graph.GenreVertex -import org.oxycblt.auxio.musikr.graph.MusicGraph -import org.oxycblt.auxio.musikr.graph.SongVertex +import org.oxycblt.musikr.Album +import org.oxycblt.musikr.Artist +import org.oxycblt.musikr.Genre +import org.oxycblt.musikr.Library +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.fs.Path +import org.oxycblt.musikr.graph.AlbumVertex +import org.oxycblt.musikr.graph.ArtistVertex +import org.oxycblt.musikr.graph.GenreVertex +import org.oxycblt.musikr.graph.MusicGraph +import org.oxycblt.musikr.graph.SongVertex interface MutableLibrary : Library { suspend fun createPlaylist(name: String, songs: List): MutableLibrary diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/model/ModelModule.kt b/app/src/main/java/org/oxycblt/musikr/model/ModelModule.kt similarity index 96% rename from app/src/main/java/org/oxycblt/auxio/musikr/model/ModelModule.kt rename to app/src/main/java/org/oxycblt/musikr/model/ModelModule.kt index 9918a11b2..0779e222e 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/model/ModelModule.kt +++ b/app/src/main/java/org/oxycblt/musikr/model/ModelModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.model +package org.oxycblt.musikr.model import dagger.Binds import dagger.Module diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/model/PlaylistImpl.kt b/app/src/main/java/org/oxycblt/musikr/model/PlaylistImpl.kt similarity index 82% rename from app/src/main/java/org/oxycblt/auxio/musikr/model/PlaylistImpl.kt rename to app/src/main/java/org/oxycblt/musikr/model/PlaylistImpl.kt index a350a2cce..ac1e2cefe 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/model/PlaylistImpl.kt +++ b/app/src/main/java/org/oxycblt/musikr/model/PlaylistImpl.kt @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.model +package org.oxycblt.musikr.model -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.musikr.cover.Cover -import org.oxycblt.auxio.musikr.playlist.PlaylistHandle -import org.oxycblt.auxio.musikr.tag.Name -import org.oxycblt.auxio.musikr.tag.interpret.PrePlaylist +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.Song +import org.oxycblt.musikr.cover.Cover +import org.oxycblt.musikr.playlist.PlaylistHandle +import org.oxycblt.musikr.tag.Name +import org.oxycblt.musikr.tag.interpret.PrePlaylist interface PlaylistCore { val prePlaylist: PrePlaylist diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/pipeline/EvaluateStep.kt b/app/src/main/java/org/oxycblt/musikr/pipeline/EvaluateStep.kt similarity index 85% rename from app/src/main/java/org/oxycblt/auxio/musikr/pipeline/EvaluateStep.kt rename to app/src/main/java/org/oxycblt/musikr/pipeline/EvaluateStep.kt index 64581299e..02165e385 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/pipeline/EvaluateStep.kt +++ b/app/src/main/java/org/oxycblt/musikr/pipeline/EvaluateStep.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.pipeline +package org.oxycblt.musikr.pipeline import javax.inject.Inject import kotlinx.coroutines.Dispatchers @@ -26,12 +26,11 @@ import kotlinx.coroutines.flow.buffer import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map -import org.oxycblt.auxio.music.Song -import org.oxycblt.auxio.musikr.graph.MusicGraph -import org.oxycblt.auxio.musikr.model.LibraryFactory -import org.oxycblt.auxio.musikr.model.MutableLibrary -import org.oxycblt.auxio.musikr.tag.Interpretation -import org.oxycblt.auxio.musikr.tag.interpret.TagInterpreter +import org.oxycblt.musikr.graph.MusicGraph +import org.oxycblt.musikr.model.LibraryFactory +import org.oxycblt.musikr.model.MutableLibrary +import org.oxycblt.musikr.tag.Interpretation +import org.oxycblt.musikr.tag.interpret.TagInterpreter interface EvaluateStep { suspend fun evaluate( diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/pipeline/ExploreStep.kt b/app/src/main/java/org/oxycblt/musikr/pipeline/ExploreStep.kt similarity index 89% rename from app/src/main/java/org/oxycblt/auxio/musikr/pipeline/ExploreStep.kt rename to app/src/main/java/org/oxycblt/musikr/pipeline/ExploreStep.kt index 31328e581..4b96533c4 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/pipeline/ExploreStep.kt +++ b/app/src/main/java/org/oxycblt/musikr/pipeline/ExploreStep.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.pipeline +package org.oxycblt.musikr.pipeline import android.net.Uri import javax.inject.Inject @@ -25,9 +25,9 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.asFlow import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.mapNotNull -import org.oxycblt.auxio.musikr.fs.DeviceFile -import org.oxycblt.auxio.musikr.fs.DeviceFiles -import org.oxycblt.auxio.musikr.playlist.m3u.M3U +import org.oxycblt.musikr.fs.DeviceFile +import org.oxycblt.musikr.fs.DeviceFiles +import org.oxycblt.musikr.playlist.m3u.M3U interface ExploreStep { fun explore(uris: List): Flow diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/pipeline/ExtractStep.kt b/app/src/main/java/org/oxycblt/musikr/pipeline/ExtractStep.kt similarity index 90% rename from app/src/main/java/org/oxycblt/auxio/musikr/pipeline/ExtractStep.kt rename to app/src/main/java/org/oxycblt/musikr/pipeline/ExtractStep.kt index 2dd032af3..8ffa84e32 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/pipeline/ExtractStep.kt +++ b/app/src/main/java/org/oxycblt/musikr/pipeline/ExtractStep.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.pipeline +package org.oxycblt.musikr.pipeline import javax.inject.Inject import kotlinx.coroutines.Dispatchers @@ -27,11 +27,11 @@ import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge -import org.oxycblt.auxio.musikr.fs.DeviceFile -import org.oxycblt.auxio.musikr.metadata.MetadataExtractor -import org.oxycblt.auxio.musikr.tag.cache.TagCache -import org.oxycblt.auxio.musikr.tag.parse.ParsedTags -import org.oxycblt.auxio.musikr.tag.parse.TagParser +import org.oxycblt.musikr.fs.DeviceFile +import org.oxycblt.musikr.metadata.MetadataExtractor +import org.oxycblt.musikr.tag.cache.TagCache +import org.oxycblt.musikr.tag.parse.ParsedTags +import org.oxycblt.musikr.tag.parse.TagParser interface ExtractStep { fun extract(nodes: Flow): Flow diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/pipeline/FlowUtil.kt b/app/src/main/java/org/oxycblt/musikr/pipeline/FlowUtil.kt similarity index 98% rename from app/src/main/java/org/oxycblt/auxio/musikr/pipeline/FlowUtil.kt rename to app/src/main/java/org/oxycblt/musikr/pipeline/FlowUtil.kt index 1ad88f942..96bb3143e 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/pipeline/FlowUtil.kt +++ b/app/src/main/java/org/oxycblt/musikr/pipeline/FlowUtil.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.pipeline +package org.oxycblt.musikr.pipeline import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/pipeline/PipelineModule.kt b/app/src/main/java/org/oxycblt/musikr/pipeline/PipelineModule.kt similarity index 96% rename from app/src/main/java/org/oxycblt/auxio/musikr/pipeline/PipelineModule.kt rename to app/src/main/java/org/oxycblt/musikr/pipeline/PipelineModule.kt index 8eafc4fae..6eefc849e 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/pipeline/PipelineModule.kt +++ b/app/src/main/java/org/oxycblt/musikr/pipeline/PipelineModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.pipeline +package org.oxycblt.musikr.pipeline import dagger.Binds import dagger.Module diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/playlist/ExternalPlaylistManager.kt b/app/src/main/java/org/oxycblt/musikr/playlist/ExternalPlaylistManager.kt similarity index 93% rename from app/src/main/java/org/oxycblt/auxio/musikr/playlist/ExternalPlaylistManager.kt rename to app/src/main/java/org/oxycblt/musikr/playlist/ExternalPlaylistManager.kt index 6b2d7706b..e8c33f30d 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/playlist/ExternalPlaylistManager.kt +++ b/app/src/main/java/org/oxycblt/musikr/playlist/ExternalPlaylistManager.kt @@ -16,18 +16,18 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.playlist +package org.oxycblt.musikr.playlist import android.content.Context import android.net.Uri import dagger.hilt.android.qualifiers.ApplicationContext import javax.inject.Inject -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.musikr.fs.Components -import org.oxycblt.auxio.musikr.fs.Path -import org.oxycblt.auxio.musikr.fs.contentResolverSafe -import org.oxycblt.auxio.musikr.fs.path.DocumentPathFactory -import org.oxycblt.auxio.musikr.playlist.m3u.M3U +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.fs.Components +import org.oxycblt.musikr.fs.Path +import org.oxycblt.musikr.fs.contentResolverSafe +import org.oxycblt.musikr.fs.path.DocumentPathFactory +import org.oxycblt.musikr.playlist.m3u.M3U import timber.log.Timber as L /** diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/playlist/PlaylistFile.kt b/app/src/main/java/org/oxycblt/musikr/playlist/PlaylistFile.kt similarity index 91% rename from app/src/main/java/org/oxycblt/auxio/musikr/playlist/PlaylistFile.kt rename to app/src/main/java/org/oxycblt/musikr/playlist/PlaylistFile.kt index 1133b4df2..a973e2e68 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/playlist/PlaylistFile.kt +++ b/app/src/main/java/org/oxycblt/musikr/playlist/PlaylistFile.kt @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.playlist +package org.oxycblt.musikr.playlist -import org.oxycblt.auxio.music.Music -import org.oxycblt.auxio.music.Song +import org.oxycblt.musikr.Music +import org.oxycblt.musikr.Song data class PlaylistFile( val name: String, diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/playlist/PlaylistModule.kt b/app/src/main/java/org/oxycblt/musikr/playlist/PlaylistModule.kt similarity index 96% rename from app/src/main/java/org/oxycblt/auxio/musikr/playlist/PlaylistModule.kt rename to app/src/main/java/org/oxycblt/musikr/playlist/PlaylistModule.kt index 4df6125f4..e4eb9869a 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/playlist/PlaylistModule.kt +++ b/app/src/main/java/org/oxycblt/musikr/playlist/PlaylistModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.playlist +package org.oxycblt.musikr.playlist import dagger.Binds import dagger.Module diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/playlist/db/PlaylistDatabase.kt b/app/src/main/java/org/oxycblt/musikr/playlist/db/PlaylistDatabase.kt similarity index 98% rename from app/src/main/java/org/oxycblt/auxio/musikr/playlist/db/PlaylistDatabase.kt rename to app/src/main/java/org/oxycblt/musikr/playlist/db/PlaylistDatabase.kt index 40534b41d..9be2422fd 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/playlist/db/PlaylistDatabase.kt +++ b/app/src/main/java/org/oxycblt/musikr/playlist/db/PlaylistDatabase.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.playlist.db +package org.oxycblt.musikr.playlist.db import androidx.room.Dao import androidx.room.Database @@ -26,7 +26,7 @@ import androidx.room.Query import androidx.room.RoomDatabase import androidx.room.Transaction import androidx.room.TypeConverters -import org.oxycblt.auxio.music.Music +import org.oxycblt.musikr.Music /** * Allows persistence of all user-created music information. diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/playlist/db/RawPlaylist.kt b/app/src/main/java/org/oxycblt/musikr/playlist/db/RawPlaylist.kt similarity index 96% rename from app/src/main/java/org/oxycblt/auxio/musikr/playlist/db/RawPlaylist.kt rename to app/src/main/java/org/oxycblt/musikr/playlist/db/RawPlaylist.kt index 3eae0d966..d2ea0357a 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/playlist/db/RawPlaylist.kt +++ b/app/src/main/java/org/oxycblt/musikr/playlist/db/RawPlaylist.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.playlist.db +package org.oxycblt.musikr.playlist.db import androidx.room.ColumnInfo import androidx.room.Embedded @@ -24,7 +24,7 @@ import androidx.room.Entity import androidx.room.Junction import androidx.room.PrimaryKey import androidx.room.Relation -import org.oxycblt.auxio.music.Music +import org.oxycblt.musikr.Music /** * Raw playlist information persisted to [PlaylistDatabase]. diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/playlist/db/StoredPlaylists.kt b/app/src/main/java/org/oxycblt/musikr/playlist/db/StoredPlaylists.kt similarity index 92% rename from app/src/main/java/org/oxycblt/auxio/musikr/playlist/db/StoredPlaylists.kt rename to app/src/main/java/org/oxycblt/musikr/playlist/db/StoredPlaylists.kt index 7053f2f4f..565313f53 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/playlist/db/StoredPlaylists.kt +++ b/app/src/main/java/org/oxycblt/musikr/playlist/db/StoredPlaylists.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.playlist.db +package org.oxycblt.musikr.playlist.db import javax.inject.Inject import kotlinx.coroutines.flow.Flow @@ -24,7 +24,7 @@ import kotlinx.coroutines.flow.asFlow import kotlinx.coroutines.flow.emitAll import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.map -import org.oxycblt.auxio.musikr.playlist.PlaylistFile +import org.oxycblt.musikr.playlist.PlaylistFile interface StoredPlaylists { fun read(): Flow diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/playlist/db/UserModule.kt b/app/src/main/java/org/oxycblt/musikr/playlist/db/UserModule.kt similarity index 97% rename from app/src/main/java/org/oxycblt/auxio/musikr/playlist/db/UserModule.kt rename to app/src/main/java/org/oxycblt/musikr/playlist/db/UserModule.kt index 00b99f9df..82fb72cf4 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/playlist/db/UserModule.kt +++ b/app/src/main/java/org/oxycblt/musikr/playlist/db/UserModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.playlist.db +package org.oxycblt.musikr.playlist.db import android.content.Context import androidx.room.Room diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/playlist/m3u/M3U.kt b/app/src/main/java/org/oxycblt/musikr/playlist/m3u/M3U.kt similarity index 95% rename from app/src/main/java/org/oxycblt/auxio/musikr/playlist/m3u/M3U.kt rename to app/src/main/java/org/oxycblt/musikr/playlist/m3u/M3U.kt index 562d4eb0d..79c3c9dee 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/playlist/m3u/M3U.kt +++ b/app/src/main/java/org/oxycblt/musikr/playlist/m3u/M3U.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.playlist.m3u +package org.oxycblt.musikr.playlist.m3u import android.content.Context import dagger.hilt.android.qualifiers.ApplicationContext @@ -26,16 +26,16 @@ import java.io.InputStream import java.io.InputStreamReader import java.io.OutputStream import javax.inject.Inject -import org.oxycblt.auxio.music.Playlist -import org.oxycblt.auxio.music.resolveNames -import org.oxycblt.auxio.musikr.fs.Components -import org.oxycblt.auxio.musikr.fs.Path -import org.oxycblt.auxio.musikr.fs.Volume -import org.oxycblt.auxio.musikr.fs.VolumeManager -import org.oxycblt.auxio.musikr.playlist.ExportConfig -import org.oxycblt.auxio.musikr.playlist.ImportedPlaylist -import org.oxycblt.auxio.musikr.playlist.PossiblePaths -import org.oxycblt.auxio.musikr.tag.util.correctWhitespace +import org.oxycblt.musikr.Playlist +import org.oxycblt.musikr.resolveNames +import org.oxycblt.musikr.fs.Components +import org.oxycblt.musikr.fs.Path +import org.oxycblt.musikr.fs.Volume +import org.oxycblt.musikr.fs.VolumeManager +import org.oxycblt.musikr.playlist.ExportConfig +import org.oxycblt.musikr.playlist.ImportedPlaylist +import org.oxycblt.musikr.playlist.PossiblePaths +import org.oxycblt.musikr.tag.util.correctWhitespace import org.oxycblt.auxio.util.unlikelyToBeNull import timber.log.Timber as L @@ -154,7 +154,8 @@ constructor( else -> listOf( InterpretedPath(Components.parseUnix(path), false), - InterpretedPath(Components.parseWindows(path), true)) + InterpretedPath(Components.parseWindows(path), true) + ) } private fun expandInterpretation( diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/playlist/m3u/M3UModule.kt b/app/src/main/java/org/oxycblt/musikr/playlist/m3u/M3UModule.kt similarity index 95% rename from app/src/main/java/org/oxycblt/auxio/musikr/playlist/m3u/M3UModule.kt rename to app/src/main/java/org/oxycblt/musikr/playlist/m3u/M3UModule.kt index 1d8a55035..d18e36d82 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/playlist/m3u/M3UModule.kt +++ b/app/src/main/java/org/oxycblt/musikr/playlist/m3u/M3UModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.playlist.m3u +package org.oxycblt.musikr.playlist.m3u import dagger.Binds import dagger.Module diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/Date.kt b/app/src/main/java/org/oxycblt/musikr/tag/Date.kt similarity index 99% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/Date.kt rename to app/src/main/java/org/oxycblt/musikr/tag/Date.kt index 0ab7b4dda..98f03e1d7 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/Date.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/Date.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag +package org.oxycblt.musikr.tag import android.content.Context import java.text.ParseException diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/Disc.kt b/app/src/main/java/org/oxycblt/musikr/tag/Disc.kt similarity index 97% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/Disc.kt rename to app/src/main/java/org/oxycblt/musikr/tag/Disc.kt index eb0add922..28e45c508 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/Disc.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/Disc.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag +package org.oxycblt.musikr.tag import android.content.Context import org.oxycblt.auxio.R diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/Interpretation.kt b/app/src/main/java/org/oxycblt/musikr/tag/Interpretation.kt similarity index 89% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/Interpretation.kt rename to app/src/main/java/org/oxycblt/musikr/tag/Interpretation.kt index 41c7c6afd..7387bebd3 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/Interpretation.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/Interpretation.kt @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag +package org.oxycblt.musikr.tag -import org.oxycblt.auxio.musikr.tag.interpret.Separators +import org.oxycblt.musikr.tag.interpret.Separators data class Interpretation(val nameFactory: Name.Known.Factory, val separators: Separators) diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/Name.kt b/app/src/main/java/org/oxycblt/musikr/tag/Name.kt similarity index 99% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/Name.kt rename to app/src/main/java/org/oxycblt/musikr/tag/Name.kt index ae54103cb..2b021be57 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/Name.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/Name.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag +package org.oxycblt.musikr.tag import android.content.Context import androidx.annotation.StringRes diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/ReleaseType.kt b/app/src/main/java/org/oxycblt/musikr/tag/ReleaseType.kt similarity index 99% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/ReleaseType.kt rename to app/src/main/java/org/oxycblt/musikr/tag/ReleaseType.kt index f7ef3cf5e..ee7a4b881 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/ReleaseType.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/ReleaseType.kt @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag +package org.oxycblt.musikr.tag import org.oxycblt.auxio.R -import org.oxycblt.auxio.musikr.tag.ReleaseType.Album +import org.oxycblt.musikr.tag.ReleaseType.Album /** * The type of release an [Album] is considered. This includes EPs, Singles, Compilations, etc. diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/cache/TagCache.kt b/app/src/main/java/org/oxycblt/musikr/tag/cache/TagCache.kt similarity index 89% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/cache/TagCache.kt rename to app/src/main/java/org/oxycblt/musikr/tag/cache/TagCache.kt index b20f9d566..600430f6c 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/cache/TagCache.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/cache/TagCache.kt @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag.cache +package org.oxycblt.musikr.tag.cache import javax.inject.Inject -import org.oxycblt.auxio.musikr.fs.DeviceFile -import org.oxycblt.auxio.musikr.tag.parse.ParsedTags +import org.oxycblt.musikr.fs.DeviceFile +import org.oxycblt.musikr.tag.parse.ParsedTags interface TagCache { suspend fun read(file: DeviceFile): ParsedTags? diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/cache/TagCacheModule.kt b/app/src/main/java/org/oxycblt/musikr/tag/cache/TagCacheModule.kt similarity index 97% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/cache/TagCacheModule.kt rename to app/src/main/java/org/oxycblt/musikr/tag/cache/TagCacheModule.kt index db133bcfe..db8a893e5 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/cache/TagCacheModule.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/cache/TagCacheModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag.cache +package org.oxycblt.musikr.tag.cache import android.content.Context import androidx.room.Room diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/cache/TagDatabase.kt b/app/src/main/java/org/oxycblt/musikr/tag/cache/TagDatabase.kt similarity index 95% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/cache/TagDatabase.kt rename to app/src/main/java/org/oxycblt/musikr/tag/cache/TagDatabase.kt index 71c319b1c..d6a359c56 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/cache/TagDatabase.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/cache/TagDatabase.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag.cache +package org.oxycblt.musikr.tag.cache import androidx.room.Dao import androidx.room.Database @@ -28,11 +28,11 @@ import androidx.room.Query import androidx.room.RoomDatabase import androidx.room.TypeConverter import androidx.room.TypeConverters -import org.oxycblt.auxio.musikr.fs.DeviceFile -import org.oxycblt.auxio.musikr.tag.Date -import org.oxycblt.auxio.musikr.tag.parse.ParsedTags -import org.oxycblt.auxio.musikr.tag.util.correctWhitespace -import org.oxycblt.auxio.musikr.tag.util.splitEscaped +import org.oxycblt.musikr.fs.DeviceFile +import org.oxycblt.musikr.tag.Date +import org.oxycblt.musikr.tag.parse.ParsedTags +import org.oxycblt.musikr.tag.util.correctWhitespace +import org.oxycblt.musikr.tag.util.splitEscaped @Database(entities = [CachedTags::class], version = 50, exportSchema = false) abstract class TagDatabase : RoomDatabase() { diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/interpret/InterpretModule.kt b/app/src/main/java/org/oxycblt/musikr/tag/interpret/InterpretModule.kt similarity index 95% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/interpret/InterpretModule.kt rename to app/src/main/java/org/oxycblt/musikr/tag/interpret/InterpretModule.kt index 5f58cb6e4..c6bb546de 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/interpret/InterpretModule.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/interpret/InterpretModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag.interpret +package org.oxycblt.musikr.tag.interpret import dagger.Binds import dagger.Module diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/interpret/PreMusic.kt b/app/src/main/java/org/oxycblt/musikr/tag/interpret/PreMusic.kt similarity index 86% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/interpret/PreMusic.kt rename to app/src/main/java/org/oxycblt/musikr/tag/interpret/PreMusic.kt index 1c8b37265..ce2526f05 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/interpret/PreMusic.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/interpret/PreMusic.kt @@ -16,19 +16,19 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag.interpret +package org.oxycblt.musikr.tag.interpret import android.net.Uri import java.util.UUID -import org.oxycblt.auxio.music.Music +import org.oxycblt.musikr.Music import org.oxycblt.auxio.music.MusicType -import org.oxycblt.auxio.musikr.fs.MimeType -import org.oxycblt.auxio.musikr.fs.Path -import org.oxycblt.auxio.musikr.playlist.PlaylistHandle -import org.oxycblt.auxio.musikr.tag.Date -import org.oxycblt.auxio.musikr.tag.Disc -import org.oxycblt.auxio.musikr.tag.Name -import org.oxycblt.auxio.musikr.tag.ReleaseType +import org.oxycblt.musikr.fs.MimeType +import org.oxycblt.musikr.fs.Path +import org.oxycblt.musikr.playlist.PlaylistHandle +import org.oxycblt.musikr.tag.Date +import org.oxycblt.musikr.tag.Disc +import org.oxycblt.musikr.tag.Name +import org.oxycblt.musikr.tag.ReleaseType import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment import org.oxycblt.auxio.util.update diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/interpret/Separators.kt b/app/src/main/java/org/oxycblt/musikr/tag/interpret/Separators.kt similarity index 93% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/interpret/Separators.kt rename to app/src/main/java/org/oxycblt/musikr/tag/interpret/Separators.kt index 74ceccd55..edde18804 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/interpret/Separators.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/interpret/Separators.kt @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag.interpret +package org.oxycblt.musikr.tag.interpret -import org.oxycblt.auxio.musikr.tag.util.correctWhitespace -import org.oxycblt.auxio.musikr.tag.util.splitEscaped +import org.oxycblt.musikr.tag.util.correctWhitespace +import org.oxycblt.musikr.tag.util.splitEscaped /** * Defines the user-specified parsing of multi-value tags. This should be used to parse any tags diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/interpret/TagInterpreter.kt b/app/src/main/java/org/oxycblt/musikr/tag/interpret/TagInterpreter.kt similarity index 92% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/interpret/TagInterpreter.kt rename to app/src/main/java/org/oxycblt/musikr/tag/interpret/TagInterpreter.kt index 43328ab5b..21534c592 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/interpret/TagInterpreter.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/interpret/TagInterpreter.kt @@ -16,19 +16,18 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag.interpret +package org.oxycblt.musikr.tag.interpret import javax.inject.Inject -import kotlinx.coroutines.flow.map import org.oxycblt.auxio.R -import org.oxycblt.auxio.musikr.fs.DeviceFile -import org.oxycblt.auxio.musikr.fs.MimeType -import org.oxycblt.auxio.musikr.tag.Disc -import org.oxycblt.auxio.musikr.tag.Interpretation -import org.oxycblt.auxio.musikr.tag.Name -import org.oxycblt.auxio.musikr.tag.ReleaseType -import org.oxycblt.auxio.musikr.tag.parse.ParsedTags -import org.oxycblt.auxio.musikr.tag.util.parseId3GenreNames +import org.oxycblt.musikr.fs.DeviceFile +import org.oxycblt.musikr.fs.MimeType +import org.oxycblt.musikr.tag.Disc +import org.oxycblt.musikr.tag.Interpretation +import org.oxycblt.musikr.tag.Name +import org.oxycblt.musikr.tag.ReleaseType +import org.oxycblt.musikr.tag.parse.ParsedTags +import org.oxycblt.musikr.tag.util.parseId3GenreNames import org.oxycblt.auxio.playback.replaygain.ReplayGainAdjustment import org.oxycblt.auxio.util.toUuidOrNull diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/parse/ExoPlayerTagFields.kt b/app/src/main/java/org/oxycblt/musikr/tag/parse/ExoPlayerTagFields.kt similarity index 97% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/parse/ExoPlayerTagFields.kt rename to app/src/main/java/org/oxycblt/musikr/tag/parse/ExoPlayerTagFields.kt index 621b422b0..ee9a10872 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/parse/ExoPlayerTagFields.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/parse/ExoPlayerTagFields.kt @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag.parse +package org.oxycblt.musikr.tag.parse import androidx.core.text.isDigitsOnly -import org.oxycblt.auxio.musikr.tag.Date -import org.oxycblt.auxio.musikr.tag.util.parseId3v2PositionField -import org.oxycblt.auxio.musikr.tag.util.parseVorbisPositionField +import org.oxycblt.musikr.tag.Date +import org.oxycblt.musikr.tag.util.parseId3v2PositionField +import org.oxycblt.musikr.tag.util.parseVorbisPositionField import org.oxycblt.auxio.util.nonZeroOrNull // Song diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/parse/ExoPlayerTags.kt b/app/src/main/java/org/oxycblt/musikr/tag/parse/ExoPlayerTags.kt similarity index 97% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/parse/ExoPlayerTags.kt rename to app/src/main/java/org/oxycblt/musikr/tag/parse/ExoPlayerTags.kt index a89ca917e..235d143a1 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/parse/ExoPlayerTags.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/parse/ExoPlayerTags.kt @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag.parse +package org.oxycblt.musikr.tag.parse import androidx.media3.common.Metadata import androidx.media3.extractor.metadata.id3.InternalFrame import androidx.media3.extractor.metadata.id3.TextInformationFrame import androidx.media3.extractor.metadata.vorbis.VorbisComment -import org.oxycblt.auxio.musikr.tag.util.correctWhitespace +import org.oxycblt.musikr.tag.util.correctWhitespace /** * Processing wrapper for [Metadata] that allows organized access to text-based audio tags. diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/parse/MediaMetadataTagFields.kt b/app/src/main/java/org/oxycblt/musikr/tag/parse/MediaMetadataTagFields.kt similarity index 95% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/parse/MediaMetadataTagFields.kt rename to app/src/main/java/org/oxycblt/musikr/tag/parse/MediaMetadataTagFields.kt index e3ba0f508..7751ffbc7 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/parse/MediaMetadataTagFields.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/parse/MediaMetadataTagFields.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag.parse +package org.oxycblt.musikr.tag.parse import android.media.MediaMetadataRetriever diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/parse/ParseModule.kt b/app/src/main/java/org/oxycblt/musikr/tag/parse/ParseModule.kt similarity index 95% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/parse/ParseModule.kt rename to app/src/main/java/org/oxycblt/musikr/tag/parse/ParseModule.kt index c802bf906..9412f1d3d 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/parse/ParseModule.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/parse/ParseModule.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag.parse +package org.oxycblt.musikr.tag.parse import dagger.Binds import dagger.Module diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/parse/ParsedTags.kt b/app/src/main/java/org/oxycblt/musikr/tag/parse/ParsedTags.kt similarity index 95% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/parse/ParsedTags.kt rename to app/src/main/java/org/oxycblt/musikr/tag/parse/ParsedTags.kt index b73ed77a7..2a143aee7 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/parse/ParsedTags.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/parse/ParsedTags.kt @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag.parse +package org.oxycblt.musikr.tag.parse -import org.oxycblt.auxio.musikr.tag.Date +import org.oxycblt.musikr.tag.Date data class ParsedTags( val durationMs: Long, diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/parse/TagParser.kt b/app/src/main/java/org/oxycblt/musikr/tag/parse/TagParser.kt similarity index 95% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/parse/TagParser.kt rename to app/src/main/java/org/oxycblt/musikr/tag/parse/TagParser.kt index e07c67015..3f06833ca 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/parse/TagParser.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/parse/TagParser.kt @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag.parse +package org.oxycblt.musikr.tag.parse import javax.inject.Inject -import org.oxycblt.auxio.musikr.fs.DeviceFile -import org.oxycblt.auxio.musikr.metadata.AudioMetadata +import org.oxycblt.musikr.fs.DeviceFile +import org.oxycblt.musikr.metadata.AudioMetadata interface TagParser { fun parse(file: DeviceFile, metadata: AudioMetadata): ParsedTags diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/util/ID3.kt b/app/src/main/java/org/oxycblt/musikr/tag/util/ID3.kt similarity index 99% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/util/ID3.kt rename to app/src/main/java/org/oxycblt/musikr/tag/util/ID3.kt index 57ba58253..e49a65f75 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/util/ID3.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/util/ID3.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag.util +package org.oxycblt.musikr.tag.util /// --- ID3v2 PARSING --- diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/util/Transform.kt b/app/src/main/java/org/oxycblt/musikr/tag/util/Transform.kt similarity index 98% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/util/Transform.kt rename to app/src/main/java/org/oxycblt/musikr/tag/util/Transform.kt index f954723d5..48e690733 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/util/Transform.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/util/Transform.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag.util +package org.oxycblt.musikr.tag.util /// --- GENERIC PARSING --- diff --git a/app/src/main/java/org/oxycblt/auxio/musikr/tag/util/Vorbis.kt b/app/src/main/java/org/oxycblt/musikr/tag/util/Vorbis.kt similarity index 98% rename from app/src/main/java/org/oxycblt/auxio/musikr/tag/util/Vorbis.kt rename to app/src/main/java/org/oxycblt/musikr/tag/util/Vorbis.kt index 02dbc351a..beada6676 100644 --- a/app/src/main/java/org/oxycblt/auxio/musikr/tag/util/Vorbis.kt +++ b/app/src/main/java/org/oxycblt/musikr/tag/util/Vorbis.kt @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package org.oxycblt.auxio.musikr.tag.util +package org.oxycblt.musikr.tag.util import org.oxycblt.auxio.util.positiveOrNull diff --git a/app/src/main/res/navigation/inner.xml b/app/src/main/res/navigation/inner.xml index 2f8b7a6f8..aa10ee2f9 100644 --- a/app/src/main/res/navigation/inner.xml +++ b/app/src/main/res/navigation/inner.xml @@ -139,7 +139,7 @@ tools:layout="@layout/dialog_song_detail"> + app:argType="org.oxycblt.musikr.Music$UID" /> + app:argType="org.oxycblt.musikr.Music$UID" /> @@ -259,7 +259,7 @@ tools:layout="@layout/fragment_detail"> + app:argType="org.oxycblt.musikr.Music$UID" /> @@ -308,7 +308,7 @@ tools:layout="@layout/fragment_detail"> + app:argType="org.oxycblt.musikr.Music$UID" /> @@ -357,7 +357,7 @@ tools:layout="@layout/fragment_detail"> + app:argType="org.oxycblt.musikr.Music$UID" /> @@ -415,7 +415,7 @@ tools:layout="@layout/dialog_playlist_name"> + app:argType="org.oxycblt.musikr.Music$UID[]" /> + app:argType="org.oxycblt.musikr.Music$UID" /> + app:argType="org.oxycblt.musikr.Music$UID[]" /> @@ -452,7 +452,7 @@ tools:layout="@layout/dialog_playlist_name"> + app:argType="org.oxycblt.musikr.Music$UID" /> + app:argType="org.oxycblt.musikr.Music$UID" /> + app:argType="org.oxycblt.musikr.Music$UID[]" /> @@ -485,7 +485,7 @@ tools:layout="@layout/dialog_music_choices"> + app:argType="org.oxycblt.musikr.Music$UID" /> + app:argType="org.oxycblt.musikr.Music$UID" /> + app:argType="org.oxycblt.musikr.Music$UID" />