queue: temporarily remove navigation

Temporarily remove queue navigation, as it can no longer really fit
with the new transitions.

This will eventually be replaced with a queue bottom sheet, implying
that I can abuse one into working.
This commit is contained in:
OxygenCobalt 2022-07-27 08:48:13 -06:00
parent 6a4803e3d7
commit fe16ffb5bf
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
7 changed files with 3 additions and 21 deletions

View file

@ -15,6 +15,7 @@ at the cost of longer loading times
- Added ability to play songs from queue
#### What's Improved
- Added motion transitions throughout the entire app
- App now exposes an (immutable) queue.
#### What's Fixed

View file

@ -102,8 +102,6 @@ class MainFragment : ViewBindingFragment<FragmentMainBinding>() {
findNavController().navigate(MainFragmentDirections.actionShowSettings())
is MainNavigationAction.About ->
findNavController().navigate(MainFragmentDirections.actionShowAbout())
is MainNavigationAction.Queue ->
findNavController().navigate(MainFragmentDirections.actionShowQueue())
is MainNavigationAction.SongDetails ->
findNavController()
.navigate(MainFragmentDirections.actionShowDetails(action.song.id))

View file

@ -55,10 +55,6 @@ class PlaybackPanelFragment :
private val playbackModel: PlaybackViewModel by androidActivityViewModels()
private val navModel: NavigationViewModel by activityViewModels()
private val queueItem: MenuItem by lifecycleObject { binding ->
binding.playbackToolbar.menu.findItem(R.id.action_queue)
}
override fun onCreateBinding(inflater: LayoutInflater) =
FragmentPlaybackPanelBinding.inflate(inflater)
@ -125,10 +121,6 @@ class PlaybackPanelFragment :
override fun onMenuItemClick(item: MenuItem): Boolean {
return when (item.itemId) {
R.id.action_queue -> {
navModel.mainNavigateTo(MainNavigationAction.Queue)
true
}
R.id.action_go_artist -> {
playbackModel.song.value?.let { navModel.exploreNavigateTo(it.album.artist) }
true

View file

@ -91,8 +91,6 @@ sealed class MainNavigationAction {
object Settings : MainNavigationAction()
/** Go to the about page. */
object About : MainNavigationAction()
/** Go to the queue. */
object Queue : MainNavigationAction()
/** Show song details. */
data class SongDetails(val song: Song) : MainNavigationAction()
}

View file

@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="?attr/colorSurface">
<org.oxycblt.auxio.playback.BottomSheetLayout
android:id="@+id/bottom_sheet_layout"

View file

@ -1,11 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_queue"
android:icon="@drawable/ic_queue_24"
android:title="@string/lbl_queue"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_go_artist"
android:title="@string/lbl_go_artist"

View file

@ -8,9 +8,6 @@
android:name="org.oxycblt.auxio.MainFragment"
android:label="MainFragment"
tools:layout="@layout/fragment_main">
<action
android:id="@+id/action_show_queue"
app:destination="@id/queue_fragment" />
<action
android:id="@+id/action_show_settings"
app:destination="@id/settings_fragment" />