新增时间居中布局兼容模式

app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/StatusBarLayout.kt

@@ -3,6 +3,7 @@ package com.lt2333.simplicitytools.hook.app.systemui
 import android.content.Context
 import android.content.res.Resources
 import android.os.Bundle
+import android.util.Log
 import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
@@ -149,17 +150,26 @@ class StatusBarLayout : IXposedHookLoadPackage {
                     status_bar_contents.addView(mCenterLayout)
                     status_bar_contents.addView(mRightLayout)
 
-
                     status_bar_left = status_bar!!.paddingLeft
                     status_bar_top = status_bar!!.paddingTop
                     status_bar_right = status_bar!!.paddingRight
                     status_bar_bottom = status_bar!!.paddingBottom
 
 
-                    mLeftLayout!!.setPadding(status_bar_left, 0, 0, 0)
+                    if (XSPUtils.getBoolean("layout_compatibility_mode", false)) {
-                    mRightLayout!!.setPadding(0, 0, status_bar_right, 0)
+                        val custom_left_margin = XSPUtils.getInt("status_bar_left_margin", 0)
-                    status_bar!!.setPadding(0, status_bar_top, 0, status_bar_bottom)
+                        if (custom_left_margin != 0) {
+                            Log.d("测试", "afterHookedMethod: "+custom_left_margin)
+                            status_bar_left = custom_left_margin
+                        }
 
+                        val custom_right_margin = XSPUtils.getInt("status_bar_right_margin", 0)
+                        if (custom_right_margin != 0) {
+                            Log.d("测试", "afterHookedMethod: "+custom_right_margin)
+                            status_bar_right = custom_right_margin
+                        }
+                        updateLayout()
+                    }
 
                 }
             })
@@ -174,15 +184,19 @@ class StatusBarLayout : IXposedHookLoadPackage {
             "updateLayoutForCutout",
             object : XC_MethodHook() {
                 override fun afterHookedMethod(param: MethodHookParam) {
-
+                    if (XSPUtils.getBoolean("layout_compatibility_mode", false)) {
-                    mLeftLayout!!.setPadding(status_bar_left, 0, 0, 0)
+                        updateLayout()
-                    mRightLayout!!.setPadding(0, 0, status_bar_right, 0)
+                    }
-                    status_bar!!.setPadding(0, status_bar_top, 0, status_bar_bottom)
-
                 }
             }
         )
+    }
 
 
+    fun updateLayout() {
+        mLeftLayout!!.setPadding(status_bar_left, 0, 0, 0)
+        mRightLayout!!.setPadding(0, 0, status_bar_right, 0)
+        status_bar!!.setPadding(0, status_bar_top, 0, status_bar_bottom)
     }
+
 }

app/src/main/res/values-zh-rCN/strings.xml

@@ -134,4 +134,9 @@
     <string name="hide_wifi_standard_icon">隐藏 WIFI标准 图标</string>
     <string name="status_bar_time_center">时间居中</string>
     <string name="status_bar_layout_summary">更多状态栏布局等待开发中</string>
+    <string name="status_bar_layout">状态栏布局</string>
+    <string name="layout_compatibility_mode">兼容模式</string>
+    <string name="left_margin">左边距 (0: 自动)</string>
+    <string name="right_margin">右边距 (0: 自动)</string>
+    <string name="layout_compatibility_mode_summary">使左右挖孔屏幕能正常显示</string>
 </resources>

app/src/main/res/values-zh-rHK/strings.xml

@@ -134,4 +134,9 @@
     <string name="hide_wifi_standard_icon">隱藏 WIFI標準 圖標</string>
     <string name="status_bar_time_center">時間居中</string>
     <string name="status_bar_layout_summary">更多狀態欄佈局等待開發中</string>
+    <string name="status_bar_layout">狀態欄佈局</string>
+    <string name="layout_compatibility_mode">兼容模式</string>
+    <string name="left_margin">左邊距 (0: 自動)</string>
+    <string name="right_margin">右邊距 (0: 自動)</string>
+    <string name="layout_compatibility_mode_summary">使左右挖孔螢幕能正常顯示</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -134,4 +134,9 @@
     <string name="hide_wifi_standard_icon">隱藏 WIFI標準 圖示</string>
     <string name="status_bar_time_center">時間居中</string>
     <string name="status_bar_layout_summary">更多狀態欄布局等待開發中</string>
+    <string name="status_bar_layout">狀態欄布局</string>
+    <string name="layout_compatibility_mode">相容模式</string>
+    <string name="left_margin">左邊距 (0: 自動)</string>
+    <string name="right_margin">右邊距 (0: 自動)</string>
+    <string name="layout_compatibility_mode_summary">使左右挖孔螢幕能正常顯示</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -134,4 +134,9 @@
     <string name="hide_wifi_standard_icon">Hide WIFI standard icon</string>
     <string name="status_bar_time_center">Status bar time center</string>
     <string name="status_bar_layout_summary">More status bar layouts are under development</string>
+    <string name="status_bar_layout">Status bar layout</string>
+    <string name="layout_compatibility_mode">Compatibility mode</string>
+    <string name="left_margin">Left margin (0: Auto)</string>
+    <string name="right_margin">Right margin (0: Auto)</string>
+    <string name="layout_compatibility_mode_summary">Make the left and right hole screen can be displayed normally</string>
 </resources>