third-party-mirrors/ultrasonic
1
0
Fork 0
mirror of https://gitlab.com/ultrasonic/ultrasonic.git synced 2025-04-12 15:37:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'movePlaylistMenu' into 'develop'

Browse Source 
Move Playlist entry to navigation drawer

See merge request ultrasonic/ultrasonic!879
This commit is contained in:
birdbird 2022-11-25 14:07:21 +00:00
commit 76e34a1f6a
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/MainFragment.kt
View File

@ -25,7 +25,6 @@ import org.moire.ultrasonic.NavigationGraphDirections
import org.moire.ultrasonic.R
import org.moire.ultrasonic.api.subsonic.models.AlbumListType
import org.moire.ultrasonic.data.ActiveServerProvider
import org.moire.ultrasonic.fragment.legacy.PlaylistsFragment
import org.moire.ultrasonic.fragment.legacy.SelectGenreFragment
import org.moire.ultrasonic.util.LayoutType
import org.moire.ultrasonic.util.Settings
@ -165,7 +164,7 @@ class MusicCollectionAdapter(fragment: Fragment, initialType: LayoutType = Layou
override fun getItemCount(): Int {
// Hide Genre tab when offline
return if (ActiveServerProvider.isOffline()) 4 else 5
return if (ActiveServerProvider.isOffline()) 3 else 4
}
override fun createFragment(position: Int): Fragment {
@ -178,16 +177,14 @@ class MusicCollectionAdapter(fragment: Fragment, initialType: LayoutType = Layou
AlbumListType.NEWEST,
size = Settings.maxAlbums
)
2 -> NavigationGraphDirections.toPlaylistFragment()
3 -> NavigationGraphDirections.toTrackCollection()
2 -> NavigationGraphDirections.toTrackCollection()
else -> NavigationGraphDirections.toGenreList()
}
val fragment = when (position) {
0 -> ArtistListFragment()
1 -> AlbumListFragment(layoutType)
2 -> PlaylistsFragment()
3 -> TrackCollectionFragment(SortOrder.RANDOM)
2 -> TrackCollectionFragment(SortOrder.RANDOM)
else -> SelectGenreFragment()
}
@ -208,9 +205,8 @@ class MusicCollectionAdapter(fragment: Fragment, initialType: LayoutType = Layou
return when (pos) {
0 -> context.getString(R.string.main_artists_title)
1 -> context.getString(R.string.main_albums_title)
2 -> context.getString(R.string.playlist_label)
3 -> context.getString(R.string.main_songs_title)
4 -> context.getString(R.string.main_genres_title)
2 -> context.getString(R.string.main_songs_title)
3 -> context.getString(R.string.main_genres_title)
else -> "Unknown"
}
}

5
ultrasonic/src/main/res/menu/navigation_drawer.xml
View File

@ -15,6 +15,11 @@
a:checkable="true"
a:icon="@drawable/ic_menu_search"
a:title="@string/button_bar.search" />
<item
a:id="@+id/playlistsFragment"
a:checkable="true"
a:icon="@drawable/ic_menu_playlists"
a:title="@string/playlist.label" />
<item
a:id="@+id/downloadsFragment"
a:checkable="true"