mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-02 04:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Repaired up navigation in TrackListActivity

Browse Source
This commit is contained in:
casey langen 2019-02-10 11:38:01 -08:00
parent 89fc15fe72
commit f43360a5b0
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/Application.kt
View File

@ -17,7 +17,7 @@ import javax.inject.Inject
class Application : android.app.Application() {
@Inject lateinit var gaplessService: GaplessHeaderService
@Inject lateinit var offlineDb: OfflineDb
@Inject @Suppress("unused") lateinit var offlineDb: OfflineDb
override fun onCreate() {
instance = this

3
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/activity/FragmentActivityWithTransport.kt
View File

@ -11,7 +11,10 @@ import io.casey.musikcube.remote.ui.shared.fragment.TransportFragment
abstract class FragmentActivityWithTransport: BaseActivity(), Filterable {
protected lateinit var transport: TransportFragment
private set
protected lateinit var content: BaseFragment
private set
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

5
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/tracks/activity/TrackListActivity.kt
View File

@ -20,7 +20,10 @@ class TrackListActivity : FragmentActivityWithTransport(), Filterable {
tracks.createOptionsMenu(menu)
override fun onOptionsItemSelected(item: MenuItem): Boolean =
tracks.optionsItemSelected(item)
when (tracks.optionsItemSelected(item)) {
true -> true
false -> super.onOptionsItemSelected(item)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) =
tracks.activityResult(requestCode, resultCode, data)

20
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/tracks/fragment/TrackListFragment.kt
View File

@ -134,13 +134,19 @@ class TrackListFragment: BaseFragment(), Filterable, TitleProvider {
return true
}
fun optionsItemSelected(item: MenuItem): Boolean {
if (item.itemId == R.id.action_edit) {
startActivityForResult(EditPlaylistActivity.getStartIntent(
appCompatActivity, categoryValue, categoryId), Track.RequestCode.EDIT_PLAYLIST)
fun optionsItemSelected(item: MenuItem): Boolean =
when (item.itemId == R.id.action_edit) {
true -> {
appCompatActivity.startActivityForResult(
EditPlaylistActivity.getStartIntent(
appCompatActivity,
categoryValue,
categoryId),
Track.RequestCode.EDIT_PLAYLIST)
true
}
else -> false
}
return super.onOptionsItemSelected(item)
}
fun activityResult(requestCode: Int, resultCode: Int, data: Intent?) {
if (requestCode == Track.RequestCode.EDIT_PLAYLIST && resultCode == AppCompatActivity.RESULT_OK && data != null) {
@ -154,7 +160,7 @@ class TrackListFragment: BaseFragment(), Filterable, TitleProvider {
buttonText = getString(R.string.button_view),
buttonCb = {
startActivity(TrackListActivity.getStartIntent(
appCompatActivity, Messages.Category.PLAYLISTS, playlistId, playlistName))
appCompatActivity, Messages.Category.PLAYLISTS, playlistId, playlistName))
})
}
}