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

Fixed some proguard wonkiness.

Browse Source
This commit is contained in:
casey langen 2017-12-04 12:28:04 -08:00
parent dca2526879
commit a66c14e931
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.txt
View File

@ -4,7 +4,6 @@ musikcube:
* added support for Ubuntu Artsy
* added preliminary audio encoders (MP3, OGG/Vorbis)
* fixed and exposed album-level artwork. previously it was track-only.
* fixed notification icon color
musikdroid:
@ -23,6 +22,7 @@ musikdroid:
- a view component layer for sharing functionality across screens
* updated Glide from v3 -> v4
* updated to Android Studio 3.0.1 and related tooling
* fixed notification icon color
sdk:

3
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/framework/MixinBase.kt
View File

@ -15,9 +15,6 @@ abstract class MixinBase : IMixin {
protected val active
get() = state == State.Resumed
protected var context = Application.instance!!
private set
override fun onCreate(bundle: Bundle) {
state = State.Created
}

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

@ -95,8 +95,8 @@ class ItemContextMenuMixin(private val activity: AppCompatActivity,
showSnackbar(
activity.findViewById(android.R.id.content),
context.getString(R.string.playlist_edit_add_success, playlistName),
context.getString(R.string.button_view),
activity.getString(R.string.playlist_edit_add_success, playlistName),
activity.getString(R.string.button_view),
viewPlaylist(playlistId, playlistName))
}
@ -167,8 +167,8 @@ class ItemContextMenuMixin(private val activity: AppCompatActivity,
listener?.onPlaylistUpdated(playlistId, playlistName)
showSuccess(
context.getString(R.string.playlist_edit_add_success, playlistName),
context.getString(R.string.button_view),
activity.getString(R.string.playlist_edit_add_success, playlistName),
activity.getString(R.string.button_view),
viewPlaylist(playlistId, playlistName))
}
else {

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

@ -4,6 +4,7 @@ import android.content.Context
import android.content.SharedPreferences
import android.os.Bundle
import android.view.KeyEvent
import io.casey.musikcube.remote.Application
import io.casey.musikcube.remote.framework.MixinBase
import io.casey.musikcube.remote.service.playback.IPlaybackService
import io.casey.musikcube.remote.service.playback.PlaybackServiceFactory
@ -11,6 +12,7 @@ import io.casey.musikcube.remote.ui.settings.constants.Prefs
class PlaybackMixin(var listener: (() -> Unit)? = null): MixinBase() {
private lateinit var prefs: SharedPreferences
private val context = Application.instance!!
var service: IPlaybackService = PlaybackServiceFactory.instance(context)
private set

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

@ -2,6 +2,7 @@ package io.casey.musikcube.remote.ui.shared.mixin
import android.os.Bundle
import com.uacf.taskrunner.Runner
import io.casey.musikcube.remote.Application
import io.casey.musikcube.remote.framework.MixinBase
class RunnerMixin(private val callbacks: Runner.TaskCallbacks,
@ -12,7 +13,7 @@ class RunnerMixin(private val callbacks: Runner.TaskCallbacks,
override fun onCreate(bundle: Bundle) {
super.onCreate(bundle)
this.runner = Runner.attach(this.context, callingType, callbacks, bundle, null)
this.runner = Runner.attach(Application.instance!!, callingType, callbacks, bundle, null)
}
override fun onResume() {