From 7deba9f3c3d14e02efd46743d4f8923f6b430144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B9=8C=E5=A0=86=E5=B0=8F=E9=80=8F=E6=98=8E?=
 <841474544@qq.com>
Date: Thu, 24 Feb 2022 23:28:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81=E6=A0=8F?=
 =?UTF-8?q?=E6=97=B6=E9=92=9F=E5=8F=8C=E6=8E=92=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                              |  4 ++--
 .../simplicitytools/activity/SettingsActivity.kt  |  6 ++++++
 .../app/systemui/StatusBarTimeCustomization.kt    | 15 +++++++++++++--
 app/src/main/res/values/strings.xml               |  1 +
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 9f107a15..75986217 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
         applicationId = "com.lt2333.simplicitytools"
         minSdk = 31
         targetSdk = 32
-        versionCode = 19
-        versionName = "1.1.8"
+        versionCode = 20
+        versionName = "1.1.9"
     }
 
     buildTypes {
diff --git a/app/src/main/java/com/lt2333/simplicitytools/activity/SettingsActivity.kt b/app/src/main/java/com/lt2333/simplicitytools/activity/SettingsActivity.kt
index 0ff24b0f..7eca8471 100644
--- a/app/src/main/java/com/lt2333/simplicitytools/activity/SettingsActivity.kt
+++ b/app/src/main/java/com/lt2333/simplicitytools/activity/SettingsActivity.kt
@@ -162,6 +162,12 @@ class SettingsActivity : MIUIActivity() {
                     SwitchV("status_bar_time_hide_space")
                 )
             )
+            add(
+                TextWithSwitchV(
+                    TextV(resId = R.string.status_bar_time_double_line),
+                    SwitchV("status_bar_time_double_line")
+                )
+            )
             add(LineV())
             add(TitleTextV(resId = R.string.status_bar_icon))
             add(
diff --git a/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/StatusBarTimeCustomization.kt b/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/StatusBarTimeCustomization.kt
index 14249231..ef42dc97 100644
--- a/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/StatusBarTimeCustomization.kt
+++ b/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/StatusBarTimeCustomization.kt
@@ -34,6 +34,7 @@ class StatusBarTimeCustomization : IXposedHookLoadPackage {
                     override fun afterHookedMethod(param: MethodHookParam) {
                         c = param.args[0] as Context
                         val textV = param.thisObject as TextView
+
                         val d: Method = textV.javaClass.getDeclaredMethod("updateTime")
                         val r = Runnable {
                             d.isAccessible = true
@@ -64,9 +65,18 @@ class StatusBarTimeCustomization : IXposedHookLoadPackage {
                                 c!!.contentResolver,
                                 Settings.System.TIME_12_24
                             )
-                            now_time= Calendar.getInstance().time
+                            now_time = Calendar.getInstance().time
+                            var str = ""
+                            if (XSPUtils.getBoolean("status_bar_time_double_line", false)) {
+                                textV.isSingleLine = false
+                                textV.textSize = 7F
+                                str = "\n"
+                            } else {
+                                textV.isSingleLine = true
+                                textV.textSize = 13.454498F
+                            }
                             textV.text =
-                                getYear() + getMonth() + getDay() + getDateSpace() + getWeek() + getDoubleHour() + getTime(
+                                getYear() + getMonth() + getDay() + getDateSpace() + getWeek() + str + getDoubleHour() + getTime(
                                     t
                                 ) + getSecond()
                         }
@@ -209,6 +219,7 @@ class StatusBarTimeCustomization : IXposedHookLoadPackage {
             } else {
                 doubleHour += " "
             }
+
         }
         return doubleHour
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8df41eaf..b43c695f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -68,5 +68,6 @@
     <string name="status_bar_time_double_hour">显示时辰</string>
     <string name="custom_clock_switch">自定义时钟-总开关</string>
     <string name="status_bar_time_period">显示时段</string>
+    <string name="status_bar_time_double_line">双行显示</string>
 
 </resources>
\ No newline at end of file