diff --git a/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/LockScreenCurrent.kt b/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/LockScreenCurrent.kt
index 0c6081af..ecfedc9f 100644
--- a/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/LockScreenCurrent.kt
+++ b/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/LockScreenCurrent.kt
@@ -1,8 +1,8 @@
package com.lt2333.simplicitytools.hook.app.systemui
import android.annotation.SuppressLint
+import android.content.BroadcastReceiver
import android.content.Context
-import android.content.Intent
import android.content.IntentFilter
import android.graphics.Typeface
import android.view.Gravity
@@ -32,13 +32,13 @@ class LockScreenCurrent(private var battery: String = "") : IXposedHookLoadPacka
"com.android.systemui.statusbar.phone.KeyguardBottomAreaView".findClass(lpparam.classLoader)
miuiPhoneStatusBarViewClass.hookAfterMethod("onFinishInflate") { param ->
val viewGroup = param.thisObject as ViewGroup
- battery = getSystemBattery(viewGroup.context)
+ battery = getBatteryTemperature(viewGroup.context).toString()
val textView = TextView(viewGroup.context).also {
it.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
- it.textSize = dp2px(viewGroup.context, 5f).toFloat()
+ it.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, 14f)
+ it.gravity = Gravity.CENTER or Gravity.BOTTOM
+ it.setPadding(0, 0, 0, dp2px(viewGroup.context, 5f))
}
- textView.gravity = Gravity.CENTER or Gravity.BOTTOM
- textView.setPadding(0, 0, 0, dp2px(viewGroup.context, 5f))
Timer().schedule(object : TimerTask() {
override fun run() {
runOnUiThread {
@@ -76,8 +76,12 @@ class LockScreenCurrent(private var battery: String = "") : IXposedHookLoadPacka
} else if (platName.startsWith("qcom")) {
val filePath = "/sys/class/power_supply/battery/current_now"
val current = (getMeanCurrentVal(filePath, 5, 0) / 1000.0f).roundToInt()
- result = if (current < 0) {
- "${InitFields.moduleRes.getString(R.string.current_current)}$current mA,${InitFields.moduleRes.getString(R.string.charging)}$battery%".replace("-", "")
+ result = if (current <= 0) {
+ "${InitFields.moduleRes.getString(R.string.current_current)}$current mA,${
+ InitFields.moduleRes.getString(
+ R.string.temp
+ )
+ }$battery℃".replace("-", "").replace("${InitFields.moduleRes.getString(R.string.current_current)}0 mA,", "")
} else {
"${InitFields.moduleRes.getString(R.string.current_current)}-$current mA"
}
@@ -127,14 +131,10 @@ class LockScreenCurrent(private var battery: String = "") : IXposedHookLoadPacka
return defaultValue
}
- private fun getSystemBattery(context: Context): String {
- val batteryInfoIntent: Intent? = context.applicationContext.registerReceiver(
- null,
- IntentFilter(Intent.ACTION_BATTERY_CHANGED)
- )
- val level: Int = batteryInfoIntent!!.getIntExtra("level", 0)
- val batterySum = batteryInfoIntent.getIntExtra("scale", 100)
- val percentBattery = 100 * level / batterySum
- return percentBattery.toString()
+ private fun getBatteryTemperature(context: Context): Int {
+ return context.registerReceiver(
+ null as BroadcastReceiver?,
+ IntentFilter("android.intent.action.BATTERY_CHANGED")
+ )!!.getIntExtra("temperature", 0) / 10
}
}
\ No newline at end of file
diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 264e7abf..39062e77 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 264e7abf..39062e77 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 264e7abf..2e20bb7a 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -154,5 +154,4 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 264e7abf..39062e77 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 264e7abf..39062e77 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 264e7abf..39062e77 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 264e7abf..39062e77 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 888d3a3f..d12d67ee 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 264e7abf..39062e77 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 9b7cac4a..7c577495 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 264e7abf..39062e77 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 264e7abf..39062e77 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 52e8c92c..02b0daaf 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -154,5 +154,5 @@
Bantu kami menerjemahkan aplikasi ke dalam bahasa Anda
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 264e7abf..39062e77 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 0a0eb16b..5b6fbd8a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -154,5 +154,5 @@
翻訳を手伝ってください!
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 264e7abf..39062e77 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 264e7abf..39062e77 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 264e7abf..39062e77 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 264e7abf..39062e77 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 264e7abf..39062e77 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index cb3cf571..a1d05c1c 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 73068cb8..ec651515 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -158,5 +158,5 @@
Помогите нам перевести приложение на ваш язык
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 264e7abf..39062e77 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 264e7abf..39062e77 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 46ba9132..f2b88d42 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -160,5 +160,5 @@
Uygulamayı kendi dilinize çevirmemize yardımcı olun
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 264e7abf..39062e77 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index e952a537..78337375 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -154,5 +154,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 747e7025..ef42f07a 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -154,5 +154,5 @@
帮助我们将应用翻译成您的语言
锁屏显示电流信息
当前电流:
- 充电中:
+ 电池温度:
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 28d76351..cf1b2519 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -154,5 +154,5 @@
幫助我們將這個APP翻譯成您的語言
鎖定螢幕顯示電流訊息
當前電流:
- 充電中:
+ 電池溫度:
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 49e89ff3..858ee05c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -154,5 +154,5 @@
幫助我們將這個APP翻譯成您的語言
鎖定螢幕顯示電流訊息
當前電流:
- 充電中:
+ 電池溫度:
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8a0c5247..a7c2c7e1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -158,5 +158,5 @@
Help us translate the app into your language
Lock screen displays current information
current:
- charging:
+ temp.