From 756aeba7ab36605a7929d752673677edd7656052 Mon Sep 17 00:00:00 2001 From: casey langen Date: Sat, 23 Jul 2022 23:00:20 -0700 Subject: [PATCH] Fix package name. --- .../remote/service/system/MediaButtonReceiver.kt | 2 +- .../remote/service/system/SystemService.kt | 2 +- .../ui/settings/activity/ConnectionsActivity.kt | 1 - .../ui/settings/activity/SettingsActivity.kt | 3 --- .../remote/ui/shared/extension/Compat.kt | 2 +- .../ui/shared/mixin/ItemContextMenuMixin.kt | 15 +-------------- .../ui/tracks/fragment/TrackListFragment.kt | 1 - 7 files changed, 4 insertions(+), 22 deletions(-) diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/system/MediaButtonReceiver.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/system/MediaButtonReceiver.kt index 38f61c452..293dc7f7a 100644 --- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/system/MediaButtonReceiver.kt +++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/system/MediaButtonReceiver.kt @@ -5,7 +5,7 @@ import android.content.Context import android.content.Intent import android.view.KeyEvent import androidx.core.content.ContextCompat -import io.casey.musikcube.remote.util.getParcelableExtraCompat +import io.casey.musikcube.remote.ui.shared.extension.getParcelableExtraCompat class MediaButtonReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/system/SystemService.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/system/SystemService.kt index 3e67ac27f..a2b3ac026 100644 --- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/system/SystemService.kt +++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/system/SystemService.kt @@ -32,10 +32,10 @@ import io.casey.musikcube.remote.service.websocket.model.ITrack import io.casey.musikcube.remote.ui.home.activity.MainActivity import io.casey.musikcube.remote.ui.settings.constants.Prefs import io.casey.musikcube.remote.ui.shared.extension.fallback +import io.casey.musikcube.remote.ui.shared.extension.getParcelableExtraCompat import io.casey.musikcube.remote.ui.shared.util.AlbumArtLookup import io.casey.musikcube.remote.ui.shared.util.Size import io.casey.musikcube.remote.util.Debouncer -import io.casey.musikcube.remote.util.getParcelableExtraCompat import androidx.core.app.NotificationCompat.Action as NotifAction const val ENABLE_LOGGING = false diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/activity/ConnectionsActivity.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/activity/ConnectionsActivity.kt index 8b93b3485..9bfdecb53 100644 --- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/activity/ConnectionsActivity.kt +++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/activity/ConnectionsActivity.kt @@ -22,7 +22,6 @@ import io.casey.musikcube.remote.ui.settings.model.Connection import io.casey.musikcube.remote.ui.settings.model.ConnectionsDb import io.casey.musikcube.remote.ui.shared.activity.BaseActivity import io.casey.musikcube.remote.ui.shared.extension.* -import io.casey.musikcube.remote.util.getParcelableCompat import javax.inject.Inject private const val EXTRA_CONNECTION = "extra_connection" diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/activity/SettingsActivity.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/activity/SettingsActivity.kt index f55e14669..84ec6befb 100644 --- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/activity/SettingsActivity.kt +++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/activity/SettingsActivity.kt @@ -25,9 +25,6 @@ import io.casey.musikcube.remote.ui.shared.activity.BaseActivity import io.casey.musikcube.remote.ui.shared.extension.* import io.casey.musikcube.remote.ui.shared.mixin.MetadataProxyMixin import io.casey.musikcube.remote.ui.shared.mixin.PlaybackMixin -import io.casey.musikcube.remote.util.getParcelableCompat -import io.casey.musikcube.remote.util.getParcelableExtraCompat -import io.casey.musikcube.remote.util.launcher import java.util.* import javax.inject.Inject import io.casey.musikcube.remote.ui.settings.constants.Prefs.Default as Defaults diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/extension/Compat.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/extension/Compat.kt index 95d406bf4..3de05f9af 100644 --- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/extension/Compat.kt +++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/extension/Compat.kt @@ -1,4 +1,4 @@ -package io.casey.musikcube.remote.util +package io.casey.musikcube.remote.ui.shared.extension import android.content.Intent import android.content.pm.PackageInfo diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/mixin/ItemContextMenuMixin.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/mixin/ItemContextMenuMixin.kt index a52c03c7e..eca8c8084 100644 --- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/mixin/ItemContextMenuMixin.kt +++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/mixin/ItemContextMenuMixin.kt @@ -26,15 +26,10 @@ import io.casey.musikcube.remote.service.websocket.model.IMetadataProxy import io.casey.musikcube.remote.service.websocket.model.ITrack import io.casey.musikcube.remote.ui.category.constant.Category import io.casey.musikcube.remote.ui.navigation.Navigate -import io.casey.musikcube.remote.ui.shared.extension.hideKeyboard -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.extension.* 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.util.getSerializableCompat -import io.casey.musikcube.remote.util.launcher import io.reactivex.Observable import io.reactivex.rxkotlin.subscribeBy import java.io.Serializable @@ -53,7 +48,6 @@ class ItemContextMenuMixin(private val activity: AppCompatActivity, open fun onPlaylistUpdated(id: Long, name: String) { } } - private var pendingCode = -1 private var completion: ((Long, String) -> Unit)? = null init { @@ -104,7 +98,6 @@ class ItemContextMenuMixin(private val activity: AppCompatActivity, completion?.invoke(playlistId, playlistName) } } - pendingCode = -1 completion = null } @@ -188,7 +181,6 @@ class ItemContextMenuMixin(private val activity: AppCompatActivity, private fun showPlaylistChooser(callback: (Long, String) -> Unit) { completion = callback - pendingCode = REQUEST_ADD_TO_PLAYLIST Navigate.toPlaylistChooser(choosePlaylistLauncher, activity) } @@ -578,9 +570,4 @@ class ItemContextMenuMixin(private val activity: AppCompatActivity, } } } - - companion object { - private const val REQUEST_ADD_TO_PLAYLIST = 32 - private const val REQUEST_EDIT_PLAYLIST = 33 - } } \ No newline at end of file diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/tracks/fragment/TrackListFragment.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/tracks/fragment/TrackListFragment.kt index 5d791cd06..22beaaec2 100644 --- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/tracks/fragment/TrackListFragment.kt +++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/tracks/fragment/TrackListFragment.kt @@ -29,7 +29,6 @@ import io.casey.musikcube.remote.ui.tracks.activity.TrackListActivity import io.casey.musikcube.remote.ui.tracks.adapter.TrackListAdapter import io.casey.musikcube.remote.ui.tracks.constant.Track import io.casey.musikcube.remote.util.Debouncer -import io.casey.musikcube.remote.util.launcher import io.reactivex.Observable import io.reactivex.rxkotlin.subscribeBy