ui: clean up share impl

Clean up the sharing implementation to be more in-line with how I
would write it.

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## dev
+
+#### What's New
+- Added ability to share a track
+
 ## 3.1.0
 
 #### What's New

app/src/main/java/org/oxycblt/auxio/util/FrameworkUtil.kt

@@ -36,12 +36,10 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
 import java.lang.IllegalArgumentException
-import org.oxycblt.auxio.music.Music
+import org.oxycblt.auxio.R
 import org.oxycblt.auxio.music.MusicParent
 import org.oxycblt.auxio.music.Song
 
-private const val MIME_TYPE_FALLBACK = "audio/*"
-
 /**
  * Get if this [View] contains the given [PointF], with optional leeway.
  *
@@ -271,35 +269,31 @@ fun WindowInsets.replaceSystemBarInsetsCompat(
 }
 
 /**
- * Show system share sheet to share songs
+ * Share a single [Song].
  *
- * @param music the [Music] to share
+ * @param song
  */
-fun Context.share(music: Music) = share(
+fun Context.share(song: Song) = share(listOf(song))
-    when (music) {
-        is Song -> listOf(music)
-        is MusicParent -> music.songs
-    }
-)
 
 /**
- * Show system share sheet to share multiple song
+ * Share all songs in a [MusicParent].
  *
- * @param songs the collection of [Song] to share
+ * @param parent The [MusicParent] to share.
  */
-fun Context.share(songs: Collection<Song>) {
+fun Context.share(parent: MusicParent) = share(parent.songs)
-    if (songs.isEmpty()) {
+
-        return
+/**
+ * Share an arbitrary list of [Song]s.
+ * @param songs The [Song]s to share.
+ */
+fun Context.share(songs: List<Song>) {
+    if (songs.isEmpty()) return
+    val builder = ShareCompat.IntentBuilder(this)
+    val mimeTypes = mutableSetOf<String>()
+    for (song in songs) {
+        builder.addStream(song.uri)
+        mimeTypes.add(song.mimeType.fromFormat ?: song.mimeType.fromExtension)
     }
-    val type = songs.mapTo(HashSet(songs.size)) {
+
-        it.mimeType.raw
+    builder.setType(mimeTypes.singleOrNull() ?: "audio/*").startChooser()
-    }.singleOrNull() ?: MIME_TYPE_FALLBACK
-    ShareCompat.IntentBuilder(this)
-        .apply {
-            for (song in songs) {
-                addStream(song.uri)
-            }
-        }
-        .setType(type)
-        .startChooser()
 }

app/src/main/res/menu/menu_album_detail.xml

@@ -9,10 +9,10 @@
     <item
         android:id="@+id/action_go_artist"
         android:title="@string/lbl_go_artist" />
-    <item
-        android:id="@+id/action_share"
-        android:title="@string/lbl_share" />
     <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>

app/src/main/res/menu/menu_album_song_actions.xml

@@ -12,10 +12,10 @@
     <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" />
+    <item
+        android:id="@+id/action_share"
+        android:title="@string/lbl_share" />
 </menu>

app/src/main/res/menu/menu_artist_song_actions.xml

@@ -12,10 +12,10 @@
     <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" />
+    <item
+        android:id="@+id/action_share"
+        android:title="@string/lbl_share" />
 </menu>

app/src/main/res/menu/menu_parent_actions.xml

@@ -12,10 +12,10 @@
     <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" />
+    <item
+        android:id="@+id/action_share"
+        android:title="@string/lbl_share" />
 </menu>

app/src/main/res/menu/menu_playback.xml

@@ -14,9 +14,6 @@
         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_playlist_add"
         android:title="@string/lbl_playlist_add" />
@@ -24,4 +21,7 @@
         android:id="@+id/action_song_detail"
         android:title="@string/lbl_song_detail"
         app:showAsAction="never" />
+    <item
+        android:id="@+id/action_share"
+        android:title="@string/lbl_share" />
 </menu>

app/src/main/res/menu/menu_playlist_song_actions.xml

@@ -15,4 +15,7 @@
     <item
         android:id="@+id/action_song_detail"
         android:title="@string/lbl_song_detail" />
+    <item
+        android:id="@+id/action_share"
+        android:title="@string/lbl_share" />
 </menu>

app/src/main/res/menu/menu_song_actions.xml

@@ -15,10 +15,10 @@
     <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" />
+    <item
+        android:id="@+id/action_share"
+        android:title="@string/lbl_share" />
 </menu>