mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-03-29 19:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use BrowseActivity by default from MainActivity

Browse Source
This commit is contained in:
casey langen 2019-02-10 12:56:54 -08:00
parent 530ffca376
commit 7666ba271b
4 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/playback/impl/remote/Metadata.kt
View File

@ -34,6 +34,7 @@ object Metadata {
const val ARTIST = "artist"
const val ALBUM_ARTIST = "album_artist"
const val GENRE = "genre"
const val TRACKS = "track"
const val PLAYLISTS = "playlists"
}

2
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/browse/activity/BrowseActivity.kt
View File

@ -32,6 +32,8 @@ class BrowseActivity: BaseActivity(), IFilterable {
tabs.setupWithViewPager(pager)
pager.adapter = adapter
pager.currentItem = adapter.indexOf(extras.getString(EXTRA_INITIAL_CATEGORY_TYPE))
when (savedInstanceState == null) {
true -> createFragments()
else -> restoreFragments()

17
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/browse/adapter/BrowseFragmentAdapter.kt
View File

@ -30,11 +30,20 @@ class BrowseFragmentAdapter(private val context: Context, fm: FragmentManager):
(it.value as? ITransportObserver)?.onTransportChanged()
}
fun indexOf(category: String?): Int =
when (category) {
Metadata.Category.ALBUM_ARTIST -> 0
Metadata.Category.ALBUM -> 1
Metadata.Category.TRACKS -> 2
Metadata.Category.PLAYLISTS -> 3
else -> 0
}
override fun getItem(index: Int): Fragment =
when (index) {
0 -> AlbumBrowseFragment.create()
1 -> CategoryBrowseFragment.create(
0 -> CategoryBrowseFragment.create(
CategoryBrowseFragment.arguments(context, Metadata.Category.ALBUM_ARTIST))
1 -> AlbumBrowseFragment.create()
2 -> TrackListFragment.create()
else -> CategoryBrowseFragment.create(
CategoryBrowseFragment.arguments(Metadata.Category.PLAYLISTS, NavigationType.Tracks))
@ -42,8 +51,8 @@ class BrowseFragmentAdapter(private val context: Context, fm: FragmentManager):
override fun getPageTitle(position: Int): CharSequence? =
context.getString(when (position) {
0 -> R.string.button_albums
1 -> R.string.button_artists
0 -> R.string.button_artists
1 -> R.string.button_albums
2 -> R.string.button_tracks
else -> R.string.button_playlists
})

24
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/home/activity/MainActivity.kt
View File

@ -21,6 +21,7 @@ import io.casey.musikcube.remote.service.websocket.WebSocketService
import io.casey.musikcube.remote.service.websocket.model.IDataProvider
import io.casey.musikcube.remote.ui.albums.activity.AlbumBrowseActivity
import io.casey.musikcube.remote.ui.browse.activity.BrowseActivity
import io.casey.musikcube.remote.ui.category.activity.AllCategoriesActivity
import io.casey.musikcube.remote.ui.category.activity.CategoryBrowseActivity
import io.casey.musikcube.remote.ui.category.constant.NavigationType
import io.casey.musikcube.remote.ui.home.fragment.InvalidPasswordDialogFragment
@ -171,8 +172,7 @@ class MainActivity : BaseActivity() {
}
R.id.action_categories -> {
// startActivity(AllCategoriesActivity.getStartIntent(this))
startActivity(BrowseActivity.getStartIntent(this))
startActivity(AllCategoriesActivity.getStartIntent(this))
return true
}
@ -325,26 +325,20 @@ class MainActivity : BaseActivity() {
}
})
findViewById<View>(R.id.button_albums).setOnClickListener {
startActivity(BrowseActivity.getStartIntent(this, Metadata.Category.ALBUM))
}
findViewById<View>(R.id.button_artists).setOnClickListener {
startActivity(CategoryBrowseActivity
.getStartIntent(this, Metadata.Category.ALBUM_ARTIST))
startActivity(BrowseActivity.getStartIntent(this, Metadata.Category.ALBUM_ARTIST))
}
findViewById<View>(R.id.button_tracks).setOnClickListener {
startActivity(TrackListActivity.getStartIntent(this@MainActivity))
}
findViewById<View>(R.id.button_albums).setOnClickListener {
startActivity(AlbumBrowseActivity.getStartIntent(this@MainActivity))
}
findViewById<View>(R.id.button_albums).setOnClickListener {
startActivity(AlbumBrowseActivity.getStartIntent(this@MainActivity))
startActivity(BrowseActivity.getStartIntent(this, Metadata.Category.TRACKS))
}
findViewById<View>(R.id.button_playlists).setOnClickListener {
startActivity(CategoryBrowseActivity.getStartIntent(
this, Metadata.Category.PLAYLISTS, NavigationType.Tracks))
startActivity(BrowseActivity.getStartIntent(this, Metadata.Category.PLAYLISTS))
}
findViewById<View>(R.id.button_play_queue).setOnClickListener {