From a107f7198691c83beb6ab02b5bdb4330b1e041da Mon Sep 17 00:00:00 2001
From: LittleTurtle2333 <lturtle2333@outlook.com>
Date: Sat, 18 Feb 2023 19:00:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81=E6=A0=8F?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E9=A1=BA=E5=BA=8F=EF=BC=88=E6=9C=AA=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rules/t/systemui/StatusBarLayoutForT.kt   | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/StatusBarLayoutForT.kt b/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/StatusBarLayoutForT.kt
index 7eb9442c..399caa31 100644
--- a/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/StatusBarLayoutForT.kt
+++ b/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/StatusBarLayoutForT.kt
@@ -16,6 +16,7 @@ import com.lt2333.simplicitytools.utils.XSPUtils
 import com.lt2333.simplicitytools.utils.hasEnable
 import com.lt2333.simplicitytools.utils.xposed.base.HookRegister
 
+
 object StatusBarLayoutForT : HookRegister() {
 
     private val getMode = XSPUtils.getInt("status_bar_layout_mode", 0)
@@ -67,9 +68,7 @@ object StatusBarLayoutForT : HookRegister() {
                     val res: Resources = miuiPhoneStatusBarView.resources
                     val statusBarId: Int = res.getIdentifier("status_bar", "id", "com.android.systemui")
                     val statusBarContentsId: Int = res.getIdentifier(
-                        "status_bar_contents",
-                        "id",
-                        "com.android.systemui"
+                        "status_bar_contents", "id", "com.android.systemui"
                     )
                     val systemIconAreaId: Int = res.getIdentifier("system_icon_area", "id", "com.android.systemui")
                     val clockId: Int = res.getIdentifier("clock", "id", "com.android.systemui")
@@ -117,9 +116,7 @@ object StatusBarLayoutForT : HookRegister() {
                     //增加一个左对齐布局
                     mLeftLayout = LinearLayout(context)
                     val leftLp: LinearLayout.LayoutParams = LinearLayout.LayoutParams(
-                        0,
-                        LinearLayout.LayoutParams.MATCH_PARENT,
-                        1.0f
+                        0, LinearLayout.LayoutParams.MATCH_PARENT, 1.0f
                     )
                     mLeftLayout!!.layoutParams = leftLp
                     mLeftLayout!!.gravity = Gravity.START or Gravity.CENTER_VERTICAL
@@ -133,9 +130,7 @@ object StatusBarLayoutForT : HookRegister() {
                     mCenterLayout!!.gravity = Gravity.CENTER or Gravity.CENTER_VERTICAL
                     mRightLayout = LinearLayout(context)
                     val rightLp: LinearLayout.LayoutParams = LinearLayout.LayoutParams(
-                        0,
-                        LinearLayout.LayoutParams.MATCH_PARENT,
-                        1.0f
+                        0, LinearLayout.LayoutParams.MATCH_PARENT, 1.0f
                     )
                     mRightLayout!!.layoutParams = rightLp
                     mRightLayout!!.gravity = Gravity.END or Gravity.CENTER_VERTICAL
@@ -223,9 +218,7 @@ object StatusBarLayoutForT : HookRegister() {
                     val res: Resources = miuiPhoneStatusBarView.resources
                     val statusBarId: Int = res.getIdentifier("status_bar", "id", "com.android.systemui")
                     val statusBarContentsId: Int = res.getIdentifier(
-                        "status_bar_contents",
-                        "id",
-                        "com.android.systemui"
+                        "status_bar_contents", "id", "com.android.systemui"
                     )
                     val systemIconAreaId: Int = res.getIdentifier("system_icon_area", "id", "com.android.systemui")
                     val clockId: Int = res.getIdentifier("clock", "id", "com.android.systemui")
@@ -301,9 +294,7 @@ object StatusBarLayoutForT : HookRegister() {
                     //增加一个左对齐布局
                     mLeftLayout = LinearLayout(context)
                     val leftLp: LinearLayout.LayoutParams = LinearLayout.LayoutParams(
-                        0,
-                        LinearLayout.LayoutParams.MATCH_PARENT,
-                        1.0f
+                        0, LinearLayout.LayoutParams.MATCH_PARENT, 1.0f
                     )
                     mLeftLayout!!.layoutParams = leftLp
                     mLeftLayout!!.gravity = Gravity.START or Gravity.CENTER_VERTICAL
@@ -319,9 +310,7 @@ object StatusBarLayoutForT : HookRegister() {
                     //增加一个右布局
                     mRightLayout = LinearLayout(context)
                     val rightLp: LinearLayout.LayoutParams = LinearLayout.LayoutParams(
-                        0,
-                        LinearLayout.LayoutParams.MATCH_PARENT,
-                        1.0f
+                        0, LinearLayout.LayoutParams.MATCH_PARENT, 1.0f
                     )
                     mRightLayout!!.layoutParams = rightLp
                     mRightLayout!!.gravity = Gravity.END or Gravity.CENTER_VERTICAL
@@ -388,6 +377,14 @@ object StatusBarLayoutForT : HookRegister() {
                         statusBar1!!.visibility = View.VISIBLE
                     }
                 }
+
+
+                //TODO: 修改图标的顺序
+                /*findConstructor("com.android.systemui.statusbar.phone.StatusBarIconList") {
+                    parameterCount == 1
+                }.hookBefore {
+
+                }*/
             }
         }
     }