Refactor BatteryReceiver to improve reliability and efficiency

The `BatteryReceiver` has been refactored to be more robust and efficient.

It now takes the `FontAppCompatTextView` and `Prefs` as constructor parameters, removing the need to look up the view on each `onReceive` call. The battery level calculation has been improved to use `BatteryManager.BATTERY_PROPERTY_CAPACITY` as a fallback if the intent extras are not available.

In `HomeFragment`, the receiver is now registered with a sticky intent, allowing the battery UI to be updated immediately upon registration instead of waiting for the next battery change event.

Author: CreativeCodeCat

app/src/main/java/com/github/codeworkscreativehub/mlauncher/helper/receivers/BatteryReceiver.kt

@@ -1,66 +1,57 @@
 package com.github.codeworkscreativehub.mlauncher.helper.receivers
 
-import android.app.Activity
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.os.BatteryManager
 import androidx.core.content.ContextCompat
-import com.github.creativecodecat.components.views.FontAppCompatTextView
 import com.github.codeworkscreativehub.mlauncher.R
 import com.github.codeworkscreativehub.mlauncher.data.Prefs
+import com.github.creativecodecat.components.views.FontAppCompatTextView
 
-class BatteryReceiver : BroadcastReceiver() {
-
-    private lateinit var prefs: Prefs
+class BatteryReceiver(
+    private val batteryTextView: FontAppCompatTextView,
+    private val prefs: Prefs
+) : BroadcastReceiver() {
 
     override fun onReceive(context: Context, intent: Intent) {
-        prefs = Prefs(context)
+
+        // Try to get level/scale from the intent
         val level: Int = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1)
         val scale: Int = intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1)
 
-        val contextBattery = context as? Activity
-        val batteryTextView = (contextBattery)?.findViewById<FontAppCompatTextView>(R.id.battery)
-
-        val batteryLevel = level * 100 / scale.toFloat()
+        val batteryLevel: Float = if (level >= 0 && scale > 0) {
+            level * 100f / scale
+        } else {
+            // Fallback using BatteryManager
+            val bm = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
+            bm.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY).toFloat()
+        }
 
+        // Select battery drawable based on percentage
         val batteryDrawable = when {
-            batteryLevel >= 76 -> ContextCompat.getDrawable(
-                context,
-                R.drawable.app_battery100
-            )
-
-            batteryLevel >= 51 -> ContextCompat.getDrawable(
-                context,
-                R.drawable.app_battery75
-            )
-
-            batteryLevel >= 26 -> ContextCompat.getDrawable(
-                context,
-                R.drawable.app_battery50
-            )
-
+            batteryLevel >= 76 -> ContextCompat.getDrawable(context, R.drawable.app_battery100)
+            batteryLevel >= 51 -> ContextCompat.getDrawable(context, R.drawable.app_battery75)
+            batteryLevel >= 26 -> ContextCompat.getDrawable(context, R.drawable.app_battery50)
             else -> ContextCompat.getDrawable(context, R.drawable.app_battery25)
         }
 
+        // Update drawable
         batteryDrawable?.let {
-            // Resize the drawable to match the text size
-            val textSize = batteryTextView?.textSize?.toInt()
+            val textSize = batteryTextView.textSize.toInt()
             if (prefs.showBatteryIcon) {
-                textSize?.let { bottom -> it.setBounds(0, 0, textSize, bottom) }
-                batteryTextView?.setCompoundDrawables(it, null, null, null)
+                it.setBounds(0, 0, textSize, textSize)
+                batteryTextView.setCompoundDrawables(it, null, null, null)
             } else {
                 it.setBounds(0, 0, 0, 0)
-                batteryTextView?.setCompoundDrawables(null, null, null, null)
+                batteryTextView.setCompoundDrawables(null, null, null, null)
             }
         }
 
         val batteryLevelInt = batteryLevel.toInt()
-        batteryTextView?.text = buildString {
+        batteryTextView.text = buildString {
             append(batteryLevelInt)
             append("%")
         }
-
     }
 }
-

app/src/main/java/com/github/codeworkscreativehub/mlauncher/ui/HomeFragment.kt

@@ -118,7 +118,7 @@ class HomeFragment : BaseFragment(), View.OnClickListener, View.OnLongClickListe
 
         val view = binding.root
         prefs = Prefs(requireContext())
-        batteryReceiver = BatteryReceiver()
+        batteryReceiver = BatteryReceiver(binding.battery, prefs)
         dialogBuilder = DialogManager(requireContext(), requireActivity())
         if (PrivateSpaceManager(requireContext()).isPrivateSpaceSupported()) {
             privateSpaceReceiver = PrivateSpaceReceiver()
@@ -188,8 +188,14 @@ class HomeFragment : BaseFragment(), View.OnClickListener, View.OnLongClickListe
 
         // Register battery receiver
         context?.let { ctx ->
-            batteryReceiver = BatteryReceiver()
-            ctx.registerReceiver(batteryReceiver, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
+            binding.battery.let { textView ->
+                batteryReceiver = BatteryReceiver(textView, prefs)
+                val intentFilter = IntentFilter(Intent.ACTION_BATTERY_CHANGED)
+                // Register receiver
+                val stickyIntent = ctx.registerReceiver(batteryReceiver, intentFilter)
+                // Immediately update UI with sticky intent
+                stickyIntent?.let { batteryReceiver.onReceive(ctx, it) }
+            }
 
             // Register private space receiver if supported
             if (PrivateSpaceManager(ctx).isPrivateSpaceSupported()) {