mirror of
https://github.com/clangen/musikcube.git
synced 2025-03-14 04:18:36 +00:00
Proguard tweaks. This issue has been around forever, wish I could figure
out how to fix it properly.
This commit is contained in:
parent
2678a26919
commit
52655937d8
2
src/musikdroid/app/proguard-rules.pro
vendored
2
src/musikdroid/app/proguard-rules.pro
vendored
@ -18,6 +18,8 @@
|
||||
|
||||
-dontobfuscate
|
||||
|
||||
-keep public class io.casey.musikcube.** { *; }
|
||||
|
||||
-keep public class * implements com.bumptech.glide.module.GlideModule
|
||||
-keep public class * extends com.bumptech.glide.AppGlideModule
|
||||
-keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
|
||||
|
@ -50,7 +50,7 @@ class MainMetadataView : FrameLayout {
|
||||
@Inject lateinit var wss: WebSocketService
|
||||
private lateinit var prefs: SharedPreferences
|
||||
|
||||
private var isPaused = true
|
||||
private var paused = true
|
||||
private lateinit var title: TextView
|
||||
private lateinit var artist: TextView
|
||||
private lateinit var album: TextView
|
||||
@ -84,16 +84,16 @@ class MainMetadataView : FrameLayout {
|
||||
|
||||
fun onResume() {
|
||||
this.wss.addClient(wssClient)
|
||||
isPaused = false
|
||||
paused = false
|
||||
}
|
||||
|
||||
fun onPause() {
|
||||
this.wss.removeClient(wssClient)
|
||||
isPaused = true
|
||||
paused = true
|
||||
}
|
||||
|
||||
fun clear() {
|
||||
if (!isPaused) {
|
||||
if (!paused) {
|
||||
loadedAlbumArtUrl = null
|
||||
updateAlbumArt()
|
||||
}
|
||||
@ -104,7 +104,7 @@ class MainMetadataView : FrameLayout {
|
||||
}
|
||||
|
||||
fun refresh() {
|
||||
if (!isPaused) {
|
||||
if (!paused) {
|
||||
visibility = View.VISIBLE
|
||||
|
||||
val playback = playbackService
|
||||
@ -246,7 +246,7 @@ class MainMetadataView : FrameLayout {
|
||||
.apply(BITMAP_OPTIONS)
|
||||
.listener(object : RequestListener<Drawable> {
|
||||
override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
|
||||
if (!isPaused) {
|
||||
if (!paused) {
|
||||
preloadNextImage()
|
||||
}
|
||||
|
||||
|
@ -31,8 +31,7 @@ abstract class BaseActivity : AppCompatActivity(), ViewModel.Provider, Runner.Ta
|
||||
protected var disposables = CompositeDisposable()
|
||||
private set
|
||||
|
||||
protected var paused = false
|
||||
private set
|
||||
protected var paused = true /* `private set` confuses proguard. sigh */
|
||||
|
||||
protected lateinit var prefs: SharedPreferences
|
||||
private val mixins = MixinSet()
|
||||
|
@ -26,8 +26,7 @@ open class BaseFragment: Fragment(), ViewModel.Provider {
|
||||
.appComponent(Application.appComponent)
|
||||
.build()
|
||||
|
||||
protected var paused = true
|
||||
private set
|
||||
protected var paused = true /* `private set` confuses proguard. sigh */
|
||||
|
||||
protected var disposables = CompositeDisposable()
|
||||
private set
|
||||
|
Loading…
x
Reference in New Issue
Block a user