mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-03-14 04:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

ItemContextMenuMixin to work with fragments.

Browse Source
This commit is contained in:
casey langen 2019-02-11 09:37:52 -08:00
parent 80de532697
commit 6db4ee5684
4 changed files with 15 additions and 6 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/ui/albums/fragment/AlbumBrowseFragment.kt
View File

@ -42,7 +42,7 @@ class AlbumBrowseFragment: BaseFragment(), IFilterable, ITitleProvider, ITranspo
component.inject(this)
data = mixin(DataProviderMixin())
playback = mixin(PlaybackMixin())
mixin(ItemContextMenuMixin(appCompatActivity))
mixin(ItemContextMenuMixin(appCompatActivity, fragment = this))
super.onCreate(savedInstanceState)

2
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/category/fragment/CategoryBrowseFragment.kt
View File

@ -60,7 +60,7 @@ class CategoryBrowseFragment: BaseFragment(), IFilterable, ITitleProvider, ITran
component.inject(this)
data = mixin(DataProviderMixin())
playback = mixin(PlaybackMixin())
mixin(ItemContextMenuMixin(appCompatActivity, contextMenuListener))
mixin(ItemContextMenuMixin(appCompatActivity, contextMenuListener, this))
extras.run {
category = getString(Category.Extra.CATEGORY, category)

15
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/mixin/ItemContextMenuMixin.kt
View File

@ -29,6 +29,7 @@ import io.casey.musikcube.remote.ui.shared.extension.showErrorSnackbar
import io.casey.musikcube.remote.ui.shared.extension.showKeyboard
import io.casey.musikcube.remote.ui.shared.extension.showSnackbar
import io.casey.musikcube.remote.ui.shared.fragment.BaseDialogFragment
import io.casey.musikcube.remote.ui.shared.fragment.BaseFragment
import io.casey.musikcube.remote.ui.tracks.activity.EditPlaylistActivity
import io.casey.musikcube.remote.ui.tracks.activity.TrackListActivity
import io.reactivex.Observable
@ -36,7 +37,8 @@ import io.reactivex.rxkotlin.subscribeBy
import javax.inject.Inject
class ItemContextMenuMixin(private val activity: AppCompatActivity,
internal val listener: EventListener? = null): MixinBase() {
internal val listener: EventListener? = null,
internal val fragment: BaseFragment? = null): MixinBase() {
private enum class TrackType { Normal, Playlist }
@Inject lateinit var provider: IDataProvider
@ -192,7 +194,7 @@ class ItemContextMenuMixin(private val activity: AppCompatActivity,
NavigationType.Select,
activity.getString(R.string.playlist_edit_pick_playlist))
activity.startActivityForResult(intent, pendingCode)
startActivityForResult(intent, pendingCode)
}
fun showForTrack(track: ITrack, anchorView: View) {
@ -253,7 +255,7 @@ class ItemContextMenuMixin(private val activity: AppCompatActivity,
ConfirmDeletePlaylistDialog.show(activity, this, playlistName, playlistId)
}
R.id.menu_playlist_edit -> {
activity.startActivityForResult(EditPlaylistActivity.getStartIntent(
startActivityForResult(EditPlaylistActivity.getStartIntent(
activity, playlistName, playlistId), REQUEST_EDIT_PLAYLIST)
}
R.id.menu_playlist_rename -> {
@ -385,6 +387,13 @@ class ItemContextMenuMixin(private val activity: AppCompatActivity,
private fun showError(message: String) =
showErrorSnackbar(activity.findViewById(android.R.id.content), message)
private fun startActivityForResult(intent: Intent, requestCode: Int) {
when (fragment != null) {
true -> fragment.startActivityForResult(intent, requestCode)
false -> activity.startActivityForResult(intent, requestCode)
}
}
class ConfirmRemoveFromPlaylistDialog : BaseDialogFragment() {
private lateinit var mixin: ItemContextMenuMixin

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

@ -57,7 +57,7 @@ class TrackListFragment: BaseFragment(), IFilterable, ITitleProvider, ITransport
super.onCreate(savedInstanceState)
mixin(ItemContextMenuMixin(appCompatActivity, menuListener))
mixin(ItemContextMenuMixin(appCompatActivity, menuListener, this))
extras.run {
categoryType = getString(Track.Extra.CATEGORY_TYPE, "")