BatteryChargingView: Replace the deprecated LifecycleObserver with DefaultLifecycleObserver

This commit is contained in:
MM20 2021-10-17 14:30:21 +02:00
parent ebfe257884
commit 47d6c3071b
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389

View File

@ -11,13 +11,11 @@ import android.os.BatteryManager
import android.util.AttributeSet import android.util.AttributeSet
import android.view.View import android.view.View
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.Lifecycle import androidx.lifecycle.*
import androidx.lifecycle.LifecycleObserver
import androidx.lifecycle.OnLifecycleEvent
import de.mm20.launcher2.ktx.dp import de.mm20.launcher2.ktx.dp
import java.util.* import java.util.*
class BatteryChargingView : View, LifecycleObserver { class BatteryChargingView : View, DefaultLifecycleObserver {
constructor(context: Context) : super(context) constructor(context: Context) : super(context)
constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
constructor(context: Context, attrs: AttributeSet?, defStyleRes: Int) : super(context, attrs, defStyleRes) constructor(context: Context, attrs: AttributeSet?, defStyleRes: Int) : super(context, attrs, defStyleRes)
@ -37,15 +35,15 @@ class BatteryChargingView : View, LifecycleObserver {
} }
} }
@OnLifecycleEvent(Lifecycle.Event.ON_RESUME) override fun onResume(owner: LifecycleOwner) {
fun onResume() { super.onResume(owner)
val intent = activity.registerReceiver(batteryReceiver, IntentFilter(Intent.ACTION_BATTERY_CHANGED)) val intent = activity.registerReceiver(batteryReceiver, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
start() start()
intent?.let { update(it, true) } intent?.let { update(it, true) }
} }
@OnLifecycleEvent(Lifecycle.Event.ON_PAUSE) override fun onPause(owner: LifecycleOwner) {
fun onPause() { super.onPause(owner)
stop() stop()
try { try {
activity.unregisterReceiver(batteryReceiver) activity.unregisterReceiver(batteryReceiver)