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