cmclark00/RetroMusicPlayer
1
0
Fork 0
mirror of https://github.com/cmclark00/RetroMusicPlayer.git synced 2025-05-17 23:55:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix toolbar navigation button (#1721)

Browse source
This commit is contained in:
Christian Martínez A. 2025-01-05 11:19:29 -04:00 • committed by GitHub
parent 552618ebaf
commit fc9e79726d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsFragment.kt
View file

@ -21,6 +21,7 @@ import android.view.MenuItem
import android.view.View import android.view.View
import androidx.core.view.doOnPreDraw import androidx.core.view.doOnPreDraw
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs import androidx.navigation.fragment.navArgs
import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.DefaultItemAnimator
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
@ -58,6 +59,7 @@ class GenreDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playlist_
binding.container.transitionName = "genre" binding.container.transitionName = "genre"
genre = arguments.extraGenre genre = arguments.extraGenre
binding.toolbar.title = arguments.extraGenre.name binding.toolbar.title = arguments.extraGenre.name
binding.toolbar.setNavigationOnClickListener { findNavController().navigateUp() }
setupRecyclerView() setupRecyclerView()
detailsViewModel.getSongs().observe(viewLifecycleOwner) { detailsViewModel.getSongs().observe(viewLifecycleOwner) {
songs(it) songs(it)

1
app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt
View file

@ -254,6 +254,7 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
override fun onMenuItemSelected(item: MenuItem): Boolean { override fun onMenuItemSelected(item: MenuItem): Boolean {
when (item.itemId) { when (item.itemId) {
android.R.id.home -> findNavController().navigateUp()
R.id.action_clear_history -> { R.id.action_clear_history -> {
if (binding.recyclerView.adapter?.itemCount!! > 0) { if (binding.recyclerView.adapter?.itemCount!! > 0) {
libraryViewModel.clearHistory() libraryViewModel.clearHistory()

3
app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt
View file

@ -81,6 +81,9 @@ class UserInfoFragment : Fragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
applyToolbar(binding.toolbar) applyToolbar(binding.toolbar)
binding.toolbar.setNavigationOnClickListener {
findNavController().navigateUp()
}
binding.nameContainer.accentColor() binding.nameContainer.accentColor()
binding.next.accentColor() binding.next.accentColor()

1
app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
View file

@ -76,6 +76,7 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli
enterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true).addTarget(view) enterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true).addTarget(view)
returnTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false) returnTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
mainActivity.setSupportActionBar(binding.toolbar) mainActivity.setSupportActionBar(binding.toolbar)
binding.toolbar.setNavigationOnClickListener { findNavController().navigateUp() }
binding.toolbar.title = null binding.toolbar.title = null
// binding.container.transitionName = playlist.playlistEntity.playlistName // binding.container.transitionName = playlist.playlistEntity.playlistName

2
app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt
View file

@ -26,6 +26,7 @@ import androidx.activity.result.contract.ActivityResultContracts
import androidx.core.content.getSystemService import androidx.core.content.getSystemService
import androidx.core.view.* import androidx.core.view.*
import androidx.core.widget.doAfterTextChanged import androidx.core.widget.doAfterTextChanged
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import androidx.transition.TransitionManager import androidx.transition.TransitionManager
@ -68,6 +69,7 @@ class SearchFragment : AbsMainActivityFragment(R.layout.fragment_search),
libraryViewModel.clearSearchResult() libraryViewModel.clearSearchResult()
setupRecyclerView() setupRecyclerView()
binding.toolbar.setNavigationOnClickListener { findNavController().navigateUp() }
binding.voiceSearch.setOnClickListener { startMicSearch() } binding.voiceSearch.setOnClickListener { startMicSearch() }
binding.clearText.setOnClickListener { binding.clearText.setOnClickListener {
binding.searchView.clearText() binding.searchView.clearText()