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

Minor Fixes

Browse source 
Fix some issues with playback, album detail, and other things in the app
This commit is contained in:
OxygenCobalt 2020-12-12 11:30:50 -07:00
parent dbd2c022a0
commit 60750d976b
10 changed files with 51 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -86,8 +86,4 @@ class MainActivity : AppCompatActivity() {
handleTransparentSystemBars(resources.configuration)
}
}
private fun doThemeRecreate(newTheme: Int) {
AppCompatDelegate.setDefaultNightMode(newTheme)
}
}

1
app/src/main/java/org/oxycblt/auxio/MainFragment.kt
View file

@ -25,7 +25,6 @@ import org.oxycblt.auxio.ui.getTransparentAccent
import org.oxycblt.auxio.ui.toColor
import kotlin.IllegalArgumentException
// TODO: Dedicated Search Tab?
class MainFragment : Fragment() {
private val playbackModel: PlaybackViewModel by activityViewModels()
private val detailModel: DetailViewModel by activityViewModels()

7
app/src/main/java/org/oxycblt/auxio/database/PlaybackStateDatabase.kt
View file

@ -119,7 +119,7 @@ class PlaybackStateDatabase(context: Context) :
val database = writableDatabase
var state: PlaybackState? = null
var stateCursor: Cursor? = null
val stateCursor: Cursor
try {
stateCursor = database.query(
@ -161,7 +161,6 @@ class PlaybackStateDatabase(context: Context) :
)
}
} finally {
stateCursor?.close()
return state
}
}
@ -230,7 +229,7 @@ class PlaybackStateDatabase(context: Context) :
val database = readableDatabase
val queueItems = mutableListOf<QueueItem>()
var queueCursor: Cursor? = null
val queueCursor: Cursor
try {
queueCursor = database.query(
@ -258,8 +257,6 @@ class PlaybackStateDatabase(context: Context) :
}
}
} finally {
queueCursor?.close()
return queueItems
}
}

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

@ -12,6 +12,7 @@ import androidx.navigation.fragment.navArgs
import org.oxycblt.auxio.R
import org.oxycblt.auxio.databinding.FragmentAlbumDetailBinding
import org.oxycblt.auxio.detail.adapters.AlbumSongAdapter
import org.oxycblt.auxio.music.Album
import org.oxycblt.auxio.music.MusicStore
import org.oxycblt.auxio.music.Song
import org.oxycblt.auxio.playback.PlaybackViewModel
@ -110,6 +111,13 @@ class AlbumDetailFragment : DetailFragment() {
binding.albumSortButton.disable(requireContext())
}
// If this fragment was created in order to nav to an item, then snap scroll to that item.
playbackModel.navToItem.value?.let {
if (it is Song) {
scrollToPlayingItem(binding, smooth = false)
}
}
// -- VIEWMODEL SETUP ---
detailModel.albumSortMode.observe(viewLifecycleOwner) { mode ->
@ -169,25 +177,10 @@ class AlbumDetailFragment : DetailFragment() {
playbackModel.navToItem.observe(viewLifecycleOwner) {
if (it != null) {
if (it is Song) {
// Calculate where the item for the currently played song is, and navigate to there.
val pos = detailModel.albumSortMode.value!!.getSortedSongList(
detailModel.currentAlbum.value!!.songs
).indexOf(playbackModel.song.value)
if (pos != -1) {
binding.albumSongRecycler.post {
// Only scroll after UI creation
val y = binding.albumSongRecycler.y +
binding.albumSongRecycler.getChildAt(pos).y
binding.nestedScroll.scrollTo(0, y.toInt())
}
playbackModel.doneWithNavToItem()
}
scrollToPlayingItem(binding, smooth = true)
}
if (detailModel.currentAlbum.value!!.id == playbackModel.song.value!!.album.id) {
if (it is Album && it.id == detailModel.currentAlbum.value!!.id) {
playbackModel.doneWithNavToItem()
}
}
@ -197,4 +190,31 @@ class AlbumDetailFragment : DetailFragment() {
return binding.root
}
/**
* Calculate the position and and scroll to a currently playing item.
* @param binding The binding required
* @param smooth Whether to scroll smoothly or not, true for yes, false for no.
*/
private fun scrollToPlayingItem(binding: FragmentAlbumDetailBinding, smooth: Boolean) {
// Calculate where the item for the currently played song is, and scroll to there
val pos = detailModel.albumSortMode.value!!.getSortedSongList(
detailModel.currentAlbum.value!!.songs
).indexOf(playbackModel.song.value)
if (pos != -1) {
binding.albumSongRecycler.post {
val y = binding.albumSongRecycler.y +
binding.albumSongRecycler.getChildAt(pos).y
if (smooth) {
binding.nestedScroll.smoothScrollTo(0, y.toInt())
} else {
binding.nestedScroll.scrollTo(0, y.toInt())
}
}
playbackModel.doneWithNavToItem()
}
}
}

5
app/src/main/java/org/oxycblt/auxio/detail/DetailFragment.kt
View file

@ -11,8 +11,7 @@ import androidx.navigation.fragment.findNavController
* A Base [Fragment] implementing a [OnBackPressedCallback] so that Auxio will navigate upwards
* instead of out of the app if a Detail Fragment is currently open. Also carries the
* multi-navigation fix.
* TODO: Implement a system where the Toolbar will update with some info when
* the main detail header is obscured.
* TODO: Migrate to a more powerful/efficient CoordinatorLayout instead of NestedScrollView
* @author OxygenCobalt
*/
abstract class DetailFragment : Fragment() {
@ -38,7 +37,7 @@ abstract class DetailFragment : Fragment() {
override fun handleOnBackPressed() {
val navController = findNavController()
// Check if it's the root of nested fragments in this navhost
// Check if it's the root of nested fragments in this NavHost
if (navController.currentDestination?.id == navController.graph.startDestination) {
isEnabled = false
requireActivity().onBackPressed()

6
app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
View file

@ -34,7 +34,11 @@ import org.oxycblt.auxio.ui.setupArtistActions
import org.oxycblt.auxio.ui.setupGenreActions
import org.oxycblt.auxio.ui.setupSongActions
// A Fragment to show all the music in the Library.
/**
* A [Fragment] that shows a custom list of [Genre], [Artist], or [Album] data. Also allows for
* search functionality.
* TODO: Move search to separate tab?
*/
class LibraryFragment : Fragment(), SearchView.OnQueryTextListener {
private val libraryModel: LibraryViewModel by activityViewModels()

3
app/src/main/java/org/oxycblt/auxio/playback/PlaybackFragment.kt
View file

@ -83,6 +83,9 @@ class PlaybackFragment : Fragment(), SeekBar.OnSeekBarChangeListener {
queueMenuItem = menu.findItem(R.id.action_queue)
}
// Make ellipsizing of song title work
binding.playbackSong.isSelected = true
binding.playbackSeekBar.setOnSeekBarChangeListener(this)
// --- VIEWMODEL SETUP --

2
app/src/main/java/org/oxycblt/auxio/playback/queue/QueueFragment.kt
View file

@ -53,7 +53,7 @@ class QueueFragment : Fragment() {
// Since QueueFragment doesn't fit system windows, inset padding needs to be
// artificially applied to the Toolbar so that it fits on the main window AND
// so that the elevation doesn't show on the top.
setOnApplyWindowInsetsListener { _, insets ->
setOnApplyWindowInsetsListener @Suppress("DEPRECATION") { _, insets ->
val top = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
insets.getInsets(WindowInsets.Type.systemBars()).top
} else {

1
app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt
View file

@ -457,7 +457,6 @@ class PlaybackStateManager private constructor() {
}
// --- PERSISTENCE FUNCTIONS ---
// TODO: Implement a fast queue save function
suspend fun saveStateToDatabase(context: Context) {
Log.d(this::class.simpleName, "Saving state to DB.")

2
app/src/main/res/values/strings.xml
View file

@ -126,7 +126,7 @@
<string name="format_double_info">%1$s / %2$s / %3$s</string>
<string name="format_double_counts">%1$s, %2$s</string>
<string name="format_next_from">Next From: %s</string>
<string name="format_accent_summary">&lt;b>%1s&lt;/b>:&#160;%2s</string>
<string name="format_accent_summary">&lt;b>%1$s&lt;/b>:&#160;%2$s</string>
<plurals name="format_song_count">
<item quantity="one">%s Song</item>