Proguard tweaks. This issue has been around forever, wish I could figure

out how to fix it properly.
This commit is contained in:
casey langen 2019-02-10 14:52:37 -08:00
parent 2678a26919
commit 52655937d8
4 changed files with 10 additions and 10 deletions

View File

@ -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$** {

View File

@ -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()
}

View File

@ -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()

View File

@ -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