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:
parent
6a4803e3d7
commit
fe16ffb5bf
7 changed files with 3 additions and 21 deletions
|
@ -15,6 +15,7 @@ at the cost of longer loading times
|
||||||
- Added ability to play songs from queue
|
- Added ability to play songs from queue
|
||||||
|
|
||||||
#### What's Improved
|
#### What's Improved
|
||||||
|
- Added motion transitions throughout the entire app
|
||||||
- App now exposes an (immutable) queue.
|
- App now exposes an (immutable) queue.
|
||||||
|
|
||||||
#### What's Fixed
|
#### What's Fixed
|
||||||
|
|
|
@ -102,8 +102,6 @@ class MainFragment : ViewBindingFragment<FragmentMainBinding>() {
|
||||||
findNavController().navigate(MainFragmentDirections.actionShowSettings())
|
findNavController().navigate(MainFragmentDirections.actionShowSettings())
|
||||||
is MainNavigationAction.About ->
|
is MainNavigationAction.About ->
|
||||||
findNavController().navigate(MainFragmentDirections.actionShowAbout())
|
findNavController().navigate(MainFragmentDirections.actionShowAbout())
|
||||||
is MainNavigationAction.Queue ->
|
|
||||||
findNavController().navigate(MainFragmentDirections.actionShowQueue())
|
|
||||||
is MainNavigationAction.SongDetails ->
|
is MainNavigationAction.SongDetails ->
|
||||||
findNavController()
|
findNavController()
|
||||||
.navigate(MainFragmentDirections.actionShowDetails(action.song.id))
|
.navigate(MainFragmentDirections.actionShowDetails(action.song.id))
|
||||||
|
|
|
@ -55,10 +55,6 @@ class PlaybackPanelFragment :
|
||||||
private val playbackModel: PlaybackViewModel by androidActivityViewModels()
|
private val playbackModel: PlaybackViewModel by androidActivityViewModels()
|
||||||
private val navModel: NavigationViewModel by activityViewModels()
|
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) =
|
override fun onCreateBinding(inflater: LayoutInflater) =
|
||||||
FragmentPlaybackPanelBinding.inflate(inflater)
|
FragmentPlaybackPanelBinding.inflate(inflater)
|
||||||
|
|
||||||
|
@ -125,10 +121,6 @@ class PlaybackPanelFragment :
|
||||||
|
|
||||||
override fun onMenuItemClick(item: MenuItem): Boolean {
|
override fun onMenuItemClick(item: MenuItem): Boolean {
|
||||||
return when (item.itemId) {
|
return when (item.itemId) {
|
||||||
R.id.action_queue -> {
|
|
||||||
navModel.mainNavigateTo(MainNavigationAction.Queue)
|
|
||||||
true
|
|
||||||
}
|
|
||||||
R.id.action_go_artist -> {
|
R.id.action_go_artist -> {
|
||||||
playbackModel.song.value?.let { navModel.exploreNavigateTo(it.album.artist) }
|
playbackModel.song.value?.let { navModel.exploreNavigateTo(it.album.artist) }
|
||||||
true
|
true
|
||||||
|
|
|
@ -91,8 +91,6 @@ sealed class MainNavigationAction {
|
||||||
object Settings : MainNavigationAction()
|
object Settings : MainNavigationAction()
|
||||||
/** Go to the about page. */
|
/** Go to the about page. */
|
||||||
object About : MainNavigationAction()
|
object About : MainNavigationAction()
|
||||||
/** Go to the queue. */
|
|
||||||
object Queue : MainNavigationAction()
|
|
||||||
/** Show song details. */
|
/** Show song details. */
|
||||||
data class SongDetails(val song: Song) : MainNavigationAction()
|
data class SongDetails(val song: Song) : MainNavigationAction()
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,8 @@
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent"
|
||||||
|
android:background="?attr/colorSurface">
|
||||||
|
|
||||||
<org.oxycblt.auxio.playback.BottomSheetLayout
|
<org.oxycblt.auxio.playback.BottomSheetLayout
|
||||||
android:id="@+id/bottom_sheet_layout"
|
android:id="@+id/bottom_sheet_layout"
|
||||||
|
|
|
@ -1,11 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
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
|
<item
|
||||||
android:id="@+id/action_go_artist"
|
android:id="@+id/action_go_artist"
|
||||||
android:title="@string/lbl_go_artist"
|
android:title="@string/lbl_go_artist"
|
||||||
|
|
|
@ -8,9 +8,6 @@
|
||||||
android:name="org.oxycblt.auxio.MainFragment"
|
android:name="org.oxycblt.auxio.MainFragment"
|
||||||
android:label="MainFragment"
|
android:label="MainFragment"
|
||||||
tools:layout="@layout/fragment_main">
|
tools:layout="@layout/fragment_main">
|
||||||
<action
|
|
||||||
android:id="@+id/action_show_queue"
|
|
||||||
app:destination="@id/queue_fragment" />
|
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_show_settings"
|
android:id="@+id/action_show_settings"
|
||||||
app:destination="@id/settings_fragment" />
|
app:destination="@id/settings_fragment" />
|
||||||
|
|
Loading…
Reference in a new issue