Skip to content

Exit selection mode when back button is pressed on Library tabs #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rivaldi8 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Exit selection mode when back button is pressed on Library tabs #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c793e99
Exit selection mode when pressing back on Songs tab
rivaldi8 May 3, 2026
0df0a7b
Exit selection mode when pressing back on Albums tab
rivaldi8 May 4, 2026
5b817c9
Exit selection mode when pressing back on Artists tab
rivaldi8 May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions ...ava/com/simplecityapps/shuttle/ui/screens/library/albumartists/AlbumArtistListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import android.widget.Toast
import androidx.activity.OnBackPressedCallback
import androidx.activity.addCallback
import androidx.appcompat.widget.SwitchCompat
import androidx.compose.runtime.getValue
import androidx.compose.ui.platform.ComposeView
Expand Down Expand Up @@ -63,11 +65,18 @@ class AlbumArtistListFragment :

private lateinit var playlistMenuView: PlaylistMenuView

private var onBackPressedCallback: OnBackPressedCallback? = null

// Lifecycle

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

onBackPressedCallback = requireActivity().onBackPressedDispatcher
.addCallback(this, false) {
viewModel.clearSelection()
}

setHasOptionsMenu(true)
}

Expand Down Expand Up @@ -98,12 +107,12 @@ class AlbumArtistListFragment :
viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
viewModel.uiState
.collect { state ->
val count = state.selectedArtists.size
if (count == 0) {
contextualToolbarHelper.hide()
} else {
if (state.isSelecting) {
onBackPressedCallback?.isEnabled = true

contextualToolbarHelper.show()

val count = state.selectedArtists.size
contextualToolbarHelper.contextualToolbar?.title =
Phrase.fromPlural(requireContext(), R.plurals.multi_select_items_selected, count)
.put("count", count)
Expand All @@ -116,6 +125,9 @@ class AlbumArtistListFragment :
.distinct(),
)
}
} else {
onBackPressedCallback?.isEnabled = false
contextualToolbarHelper.hide()
}

updateToolbarMenuViewMode(state.viewMode)
Expand Down
20 changes: 16 additions & 4 deletions ...p/src/main/java/com/simplecityapps/shuttle/ui/screens/library/albums/AlbumListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import android.widget.Toast
import androidx.activity.OnBackPressedCallback
import androidx.activity.addCallback
import androidx.appcompat.widget.SwitchCompat
import androidx.compose.runtime.getValue
import androidx.compose.ui.platform.ComposeView
Expand Down Expand Up @@ -64,11 +66,18 @@ class AlbumListFragment :

private lateinit var playlistMenuView: PlaylistMenuView

private var onBackPressedCallback: OnBackPressedCallback? = null

// Lifecycle

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

onBackPressedCallback = requireActivity().onBackPressedDispatcher
.addCallback(this, false) {
viewModel.clearSelection()
}

setHasOptionsMenu(true)
}

Expand Down Expand Up @@ -99,12 +108,12 @@ class AlbumListFragment :
viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
viewModel.uiState
.collect { state ->
val count = state.selectedAlbums.size
if (count == 0) {
contextualToolbarHelper.hide()
} else {
if (state.isSelecting) {
onBackPressedCallback?.isEnabled = true

contextualToolbarHelper.show()

val count = state.selectedAlbums.size
contextualToolbarHelper.contextualToolbar?.title =
Phrase.fromPlural(requireContext(), R.plurals.multi_select_items_selected, count)
.put("count", count)
Expand All @@ -117,6 +126,9 @@ class AlbumListFragment :
.distinct(),
)
}
} else {
onBackPressedCallback?.isEnabled = false
contextualToolbarHelper.hide()
}

updateToolbarMenuViewMode(state.viewMode)
Expand Down
20 changes: 16 additions & 4 deletions ...app/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/SongListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import android.widget.Toast
import androidx.activity.OnBackPressedCallback
import androidx.activity.addCallback
import androidx.appcompat.widget.SwitchCompat
import androidx.compose.runtime.getValue
import androidx.compose.ui.platform.ComposeView
Expand Down Expand Up @@ -64,11 +66,18 @@ class SongListFragment :

private lateinit var playlistMenuView: PlaylistMenuView

private var onBackPressedCallback: OnBackPressedCallback? = null

// Lifecycle

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

onBackPressedCallback = requireActivity().onBackPressedDispatcher
.addCallback(this, false) {
viewModel.clearSelection()
}

setHasOptionsMenu(true)
}

Expand Down Expand Up @@ -99,12 +108,12 @@ class SongListFragment :
viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
viewModel.uiState
.collect { state ->
val count = state.selectedSongs.size
if (count == 0) {
contextualToolbarHelper.hide()
} else {
if (state.isSelecting) {
onBackPressedCallback?.isEnabled = true

contextualToolbarHelper.show()

val count = state.selectedSongs.size
contextualToolbarHelper.contextualToolbar?.title =
Phrase.fromPlural(requireContext(), R.plurals.multi_select_items_selected, count)
.put("count", count)
Expand All @@ -117,6 +126,9 @@ class SongListFragment :
.distinct(),
)
}
} else {
onBackPressedCallback?.isEnabled = false
contextualToolbarHelper.hide()
}

updateToolbarMenuSortOrder(state.sortOrder)
Expand Down
Loading