Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sharing albums, artists, genres and playlists

Browse source
This commit is contained in:
Koitharu 2023-05-18 12:07:00 +03:00
parent 7915655c78
commit 7f11e886f7
No known key found for this signature in database
GPG key ID: 8E861F8CE6E7CE27
19 changed files with 69 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
View file

@ -142,6 +142,10 @@ class AlbumDetailFragment :
musicModel.addToPlaylist(currentAlbum)
true
}
R.id.action_share -> {
requireContext().shareSongs(currentAlbum.songs)
true
}
else -> false
}
}

4
app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
View file

@ -137,6 +137,10 @@ class ArtistDetailFragment :
musicModel.addToPlaylist(currentArtist)
true
}
R.id.action_share -> {
requireContext().shareSongs(currentArtist.songs)
true
}
else -> false
}
}

4
app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt
View file

@ -130,6 +130,10 @@ class GenreDetailFragment :
musicModel.addToPlaylist(currentGenre)
true
}
R.id.action_share -> {
requireContext().shareSongs(currentGenre.songs)
true
}
else -> false
}
}

4
app/src/main/java/org/oxycblt/auxio/detail/PlaylistDetailFragment.kt
View file

@ -130,6 +130,10 @@ class PlaylistDetailFragment :
musicModel.deletePlaylist(currentPlaylist)
true
}
R.id.action_share -> {
requireContext().shareSongs(currentPlaylist.songs)
true
}
else -> false
}
}

15
app/src/main/java/org/oxycblt/auxio/list/ListFragment.kt
View file

@ -33,6 +33,7 @@ import org.oxycblt.auxio.navigation.MainNavigationAction
import org.oxycblt.auxio.navigation.NavigationViewModel
import org.oxycblt.auxio.util.logD
import org.oxycblt.auxio.util.shareSong
import org.oxycblt.auxio.util.shareSongs
import org.oxycblt.auxio.util.showToast
/**
@ -100,7 +101,7 @@ abstract class ListFragment<in T : Music, VB : ViewBinding> :
R.id.action_go_album -> {
navModel.exploreNavigateTo(song.album)
}
R.id.action_song_share -> {
R.id.action_share -> {
requireContext().shareSong(song)
}
R.id.action_playlist_add -> {
@ -151,6 +152,9 @@ abstract class ListFragment<in T : Music, VB : ViewBinding> :
R.id.action_playlist_add -> {
musicModel.addToPlaylist(album)
}
R.id.action_share -> {
requireContext().shareSongs(album.songs)
}
else -> {
error("Unexpected menu item selected")
}
@ -188,6 +192,9 @@ abstract class ListFragment<in T : Music, VB : ViewBinding> :
R.id.action_playlist_add -> {
musicModel.addToPlaylist(artist)
}
R.id.action_share -> {
requireContext().shareSongs(artist.songs)
}
else -> {
error("Unexpected menu item selected")
}
@ -225,6 +232,9 @@ abstract class ListFragment<in T : Music, VB : ViewBinding> :
R.id.action_playlist_add -> {
musicModel.addToPlaylist(genre)
}
R.id.action_share -> {
requireContext().shareSongs(genre.songs)
}
else -> {
error("Unexpected menu item selected")
}
@ -262,6 +272,9 @@ abstract class ListFragment<in T : Music, VB : ViewBinding> :
R.id.action_delete -> {
musicModel.deletePlaylist(playlist)
}
R.id.action_share -> {
requireContext().shareSongs(playlist.songs)
}
else -> {
error("Unexpected menu item selected")
}

4
app/src/main/java/org/oxycblt/auxio/music/fs/Fs.kt
View file

@ -216,8 +216,8 @@ data class MimeType(val fromExtension: String, val fromFormat: String?) {
/**
* Return a mime-type such as "audio/ogg"
*
* @return A raw mime-type string. Will first try [fromFormat], then falling
* back to [fromExtension], and then null if that fails.
* @return A raw mime-type string. Will first try [fromFormat], then falling back to
* [fromExtension], and then null if that fails.
*/
fun getRawType(): String {
return fromFormat ?: fromExtension

5
app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt
View file

@ -42,6 +42,7 @@ import org.oxycblt.auxio.playback.state.RepeatMode
import org.oxycblt.auxio.playback.ui.StyledSeekBar
import org.oxycblt.auxio.ui.ViewBindingFragment
import org.oxycblt.auxio.util.collectImmediately
import org.oxycblt.auxio.util.shareSong
import org.oxycblt.auxio.util.showToast
import org.oxycblt.auxio.util.systemBarInsetsCompat
@ -172,6 +173,10 @@ class PlaybackPanelFragment :
}
true
}
R.id.action_share -> {
playbackModel.song.value?.let { requireContext().shareSong(it) }
true
}
else -> false
}

3
app/src/main/res/menu/menu_album_actions.xml
View file

@ -18,4 +18,7 @@
<item
android:id="@+id/action_playlist_add"
android:title="@string/lbl_playlist_add" />
<item
android:id="@+id/action_share"
android:title="@string/lbl_share" />
</menu>

3
app/src/main/res/menu/menu_album_detail.xml
View file

@ -9,4 +9,7 @@
<item
android:id="@+id/action_go_artist"
android:title="@string/lbl_go_artist" />
<item
android:id="@+id/action_share"
android:title="@string/lbl_share" />
</menu>

3
app/src/main/res/menu/menu_album_song_actions.xml
View file

@ -12,6 +12,9 @@
<item
android:id="@+id/action_playlist_add"
android:title="@string/lbl_playlist_add" />
<item
android:id="@+id/action_share"
android:title="@string/lbl_share" />
<item
android:id="@+id/action_song_detail"
android:title="@string/lbl_song_detail" />

3
app/src/main/res/menu/menu_artist_album_actions.xml
View file

@ -18,4 +18,7 @@
<item
android:id="@+id/action_playlist_add"
android:title="@string/lbl_playlist_add" />
<item
android:id="@+id/action_share"
android:title="@string/lbl_share" />
</menu>

3
app/src/main/res/menu/menu_artist_song_actions.xml
View file

@ -12,6 +12,9 @@
<item
android:id="@+id/action_playlist_add"
android:title="@string/lbl_playlist_add" />
<item
android:id="@+id/action_share"
android:title="@string/lbl_share" />
<item
android:id="@+id/action_song_detail"
android:title="@string/lbl_song_detail" />

3
app/src/main/res/menu/menu_parent_actions.xml
View file

@ -12,6 +12,9 @@
<item
android:id="@+id/action_queue_add"
android:title="@string/lbl_queue_add" />
<item
android:id="@+id/action_share"
android:title="@string/lbl_share" />
<item
android:id="@+id/action_playlist_add"
android:title="@string/lbl_playlist_add" />

3
app/src/main/res/menu/menu_parent_detail.xml
View file

@ -9,4 +9,7 @@
<item
android:id="@+id/action_playlist_add"
android:title="@string/lbl_playlist_add" />
<item
android:id="@+id/action_share"
android:title="@string/lbl_share" />
</menu>

3
app/src/main/res/menu/menu_playback.xml
View file

@ -14,6 +14,9 @@
android:id="@+id/action_go_album"
android:title="@string/lbl_go_album"
app:showAsAction="never" />
<item
android:id="@+id/action_share"
android:title="@string/lbl_share" />
<item
android:id="@+id/action_song_detail"
android:title="@string/lbl_song_detail"

3
app/src/main/res/menu/menu_playlist_actions.xml
View file

@ -12,6 +12,9 @@
<item
android:id="@+id/action_queue_add"
android:title="@string/lbl_queue_add" />
<item
android:id="@+id/action_share"
android:title="@string/lbl_share" />
<item
android:id="@+id/action_delete"
android:title="@string/lbl_delete" />

3
app/src/main/res/menu/menu_playlist_detail.xml
View file

@ -6,6 +6,9 @@
<item
android:id="@+id/action_queue_add"
android:title="@string/lbl_queue_add" />
<item
android:id="@+id/action_share"
android:title="@string/lbl_share" />
<item
android:id="@+id/action_delete"
android:title="@string/lbl_delete" />

2
app/src/main/res/menu/menu_song_actions.xml
View file

@ -16,7 +16,7 @@
android:id="@+id/action_playlist_add"
android:title="@string/lbl_playlist_add" />
<item
android:id="@+id/action_song_share"
android:id="@+id/action_share"
android:title="@string/lbl_share" />
<item
android:id="@+id/action_song_detail"