From e0256f823c29f30b9654f167a5190851b97c42e6 Mon Sep 17 00:00:00 2001
From: HeCodes2Much <wayne6324@gmail.com>
Date: Mon, 10 Jun 2024 21:30:33 +0100
Subject: [PATCH] Fix: Fixed the battery current and voltage numbers.

Signed-off-by: HeCodes2Much <wayne6324@gmail.com>
---
 .../launcher/ui/widgets/WidgetFragment.kt                 | 8 +++++---
 app/src/main/res/values/strings.xml                       | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt
index 4f1df25..911e52a 100644
--- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt
+++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt
@@ -268,10 +268,12 @@ class WidgetFragment : Fragment(),
                 val isCharging = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1)
                 val health = intent.getIntExtra(BatteryManager.EXTRA_HEALTH, BatteryManager.BATTERY_HEALTH_UNKNOWN)
                 val count = intent.getIntExtra(BatteryManager.EXTRA_CYCLE_COUNT, 0)
-                val current = batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW)
+                val currentMicroAmps = batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW)
+                val current = (currentMicroAmps / 1000.0)
                 val voltage = intent.getIntExtra(BatteryManager.EXTRA_VOLTAGE, 0)
+                val voltageVolts = (voltage / 1.0)
                 val temperature = intent.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, 0)
-                val temperatureCelsius = temperature / 10.0
+                val temperatureCelsius = (temperature / 10.0)
 
                 val voltageScale = getString(R.string.widget_mv)
                 val currentScale = getString(R.string.widget_ma)
@@ -296,7 +298,7 @@ class WidgetFragment : Fragment(),
                 binding.batteryCount.text = getString(R.string.widgets_battery_count, count)
                 binding.chargingStatus.text = getString(R.string.widgets_battery_status, chargingStatusText)
                 binding.batteryHealth.text = getString(R.string.widgets_battery_health, healthStatus)
-                binding.batteryVoltage.text = getString(R.string.widgets_battery_voltage, voltage, voltageScale)
+                binding.batteryVoltage.text = getString(R.string.widgets_battery_voltage, voltageVolts, voltageScale)
                 binding.batteryCurrent.text = getString(R.string.widgets_battery_current, current, currentScale)
                 binding.batteryTemperature.text = getString(R.string.widgets_battery_temperature, temperatureCelsius, temperatureScale)
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8409f0c..2b9708e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -598,10 +598,10 @@
 
     <string name="widgets_battery_level">Battery Level : %d %%</string>
     <string name="widgets_battery_count">Battery Charge Count : %1$d</string>
-    <string name="widgets_battery_current">Battery Current : %1$d %2$s</string>
+    <string name="widgets_battery_current">Battery Current : %1$.2f %2$s</string>
     <string name="widgets_battery_status">Charging Status : %1$s</string>
     <string name="widgets_battery_health">Battery Health : %1$s</string>
-    <string name="widgets_battery_voltage">Battery Voltage : %1$d %2$s</string>
+    <string name="widgets_battery_voltage">Battery Voltage : %1$.2f %2$s</string>
     <string name="widgets_battery_temperature">Battery Temperature : %1$.2f %2$s</string>
 
     <string name="widgets_settings_display_weather">Weather Widget</string>