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

Fix style issues

Browse source
This commit is contained in:
Koitharu 2023-05-18 19:27:50 +03:00
parent 7f11e886f7
commit e48916fb27
No known key found for this signature in database
GPG key ID: 8E861F8CE6E7CE27
10 changed files with 64 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -143,7 +143,7 @@ class AlbumDetailFragment :
true
}
R.id.action_share -> {
requireContext().shareSongs(currentAlbum.songs)
requireContext().share(currentAlbum)
true
}
else -> false

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

@ -138,7 +138,7 @@ class ArtistDetailFragment :
true
}
R.id.action_share -> {
requireContext().shareSongs(currentArtist.songs)
requireContext().share(currentArtist)
true
}
else -> false

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

@ -131,7 +131,7 @@ class GenreDetailFragment :
true
}
R.id.action_share -> {
requireContext().shareSongs(currentGenre.songs)
requireContext().share(currentGenre)
true
}
else -> false

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

@ -131,7 +131,7 @@ class PlaylistDetailFragment :
true
}
R.id.action_share -> {
requireContext().shareSongs(currentPlaylist.songs)
requireContext().share(currentPlaylist)
true
}
else -> false

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

@ -32,8 +32,7 @@ import org.oxycblt.auxio.music.*
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.share
import org.oxycblt.auxio.util.showToast
/**
@ -102,7 +101,7 @@ abstract class ListFragment<in T : Music, VB : ViewBinding> :
navModel.exploreNavigateTo(song.album)
}
R.id.action_share -> {
requireContext().shareSong(song)
requireContext().share(song)
}
R.id.action_playlist_add -> {
musicModel.addToPlaylist(song)
@ -153,7 +152,7 @@ abstract class ListFragment<in T : Music, VB : ViewBinding> :
musicModel.addToPlaylist(album)
}
R.id.action_share -> {
requireContext().shareSongs(album.songs)
requireContext().share(album)
}
else -> {
error("Unexpected menu item selected")
@ -193,7 +192,7 @@ abstract class ListFragment<in T : Music, VB : ViewBinding> :
musicModel.addToPlaylist(artist)
}
R.id.action_share -> {
requireContext().shareSongs(artist.songs)
requireContext().share(artist)
}
else -> {
error("Unexpected menu item selected")
@ -233,7 +232,7 @@ abstract class ListFragment<in T : Music, VB : ViewBinding> :
musicModel.addToPlaylist(genre)
}
R.id.action_share -> {
requireContext().shareSongs(genre.songs)
requireContext().share(genre)
}
else -> {
error("Unexpected menu item selected")
@ -273,7 +272,7 @@ abstract class ListFragment<in T : Music, VB : ViewBinding> :
musicModel.deletePlaylist(playlist)
}
R.id.action_share -> {
requireContext().shareSongs(playlist.songs)
requireContext().share(playlist)
}
else -> {
error("Unexpected menu item selected")

4
app/src/main/java/org/oxycblt/auxio/list/selection/SelectionFragment.kt
View file

@ -26,7 +26,7 @@ import org.oxycblt.auxio.R
import org.oxycblt.auxio.music.MusicViewModel
import org.oxycblt.auxio.playback.PlaybackViewModel
import org.oxycblt.auxio.ui.ViewBindingFragment
import org.oxycblt.auxio.util.shareSongs
import org.oxycblt.auxio.util.share
import org.oxycblt.auxio.util.showToast
/**
@ -88,7 +88,7 @@ abstract class SelectionFragment<VB : ViewBinding> :
true
}
R.id.action_selection_share -> {
requireContext().shareSongs(selectionModel.take())
requireContext().share(selectionModel.take())
true
}
else -> false

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

@ -147,6 +147,16 @@ data class MusicDirectories(val dirs: List<Directory>, val shouldInclude: Boolea
* @author Alexander Capehart (OxygenCobalt)
*/
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.
*/
val raw: String
get() = fromFormat ?: fromExtension
/**
* Resolve the mime type into a human-readable format name, such as "Ogg Vorbis".
*
@ -212,14 +222,4 @@ data class MimeType(val fromExtension: String, val fromFormat: String?) {
MimeTypeMap.getSingleton().getExtensionFromMimeType(fromExtension)?.uppercase()
}
}
/**
* 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.
*/
fun getRawType(): String {
return fromFormat ?: fromExtension
}
}

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

@ -42,7 +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.share
import org.oxycblt.auxio.util.showToast
import org.oxycblt.auxio.util.systemBarInsetsCompat
@ -174,7 +174,7 @@ class PlaybackPanelFragment :
true
}
R.id.action_share -> {
playbackModel.song.value?.let { requireContext().shareSong(it) }
playbackModel.song.value?.let { requireContext().share(it) }
true
}
else -> false

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

@ -27,6 +27,7 @@ import android.view.WindowInsets
import androidx.annotation.RequiresApi
import androidx.appcompat.widget.AppCompatButton
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.app.ShareCompat
import androidx.core.graphics.Insets
import androidx.core.graphics.drawable.DrawableCompat
import androidx.navigation.NavController
@ -34,6 +35,11 @@ import androidx.navigation.NavDirections
import androidx.recyclerview.widget.RecyclerView
import androidx.viewbinding.ViewBinding
import java.lang.IllegalArgumentException
import org.oxycblt.auxio.music.Music
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.
@ -248,3 +254,37 @@ fun WindowInsets.replaceSystemBarInsetsCompat(
}
}
}
/**
* Show system share sheet to share songs
*
* @param music the [Music] to share
*/
fun Context.share(music: Music) = share(
when (music) {
is Song -> listOf(music)
is MusicParent -> music.songs
}
)
/**
* Show system share sheet to share multiple song
*
* @param songs the collection of [Song] to share
*/
fun Context.share(songs: Collection<Song>) {
if (songs.isEmpty()) {
return
}
val type = songs.mapTo(HashSet(songs.size)) {
it.mimeType.raw
}.singleOrNull() ?: MIME_TYPE_FALLBACK
ShareCompat.IntentBuilder(this)
.apply {
for (song in songs) {
addStream(song.uri)
}
}
.setType(type)
.startChooser()
}

63
app/src/main/java/org/oxycblt/auxio/util/ShareUtil.kt
View file

@ -1,63 +0,0 @@
/*
* Copyright (c) 2023 Auxio Project
* ShareUtil.kt is part of Auxio.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package org.oxycblt.auxio.util
import android.content.Context
import androidx.core.app.ShareCompat
import org.oxycblt.auxio.music.Song
private const val MIME_TYPE_FALLBACK = "audio/*"
/**
* Show system share sheet to share song
*
* @param song the [Song] to share
*/
fun Context.shareSong(song: Song) {
ShareCompat.IntentBuilder(this)
.setStream(song.uri)
.setType(song.mimeType.getRawType())
.startChooser()
}
/**
* Show system share sheet to share multiple song
*
* @param songs the collection of [Song] to share
*/
fun Context.shareSongs(songs: Collection<Song>) {
if (songs.isEmpty()) {
return
}
if (songs.size == 1) {
shareSong(songs.first())
return
}
val type = songs.mapTo(HashSet(songs.size)) {
it.mimeType.getRawType()
}.singleOrNull() ?: MIME_TYPE_FALLBACK
ShareCompat.IntentBuilder(this)
.apply {
for (song in songs) {
addStream(song.uri)
}
}
.setType(type)
.startChooser()
}