Revert "合并拉取请求 #233"

This reverts commit 317340bf6f.

.github/workflows/dev.yml

@@ -0,0 +1,50 @@
+name: Dev
+
+on:
+  push:
+    branches: [ "main" ]
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+        cache: gradle
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+      
+    - name: Clone UI
+      run: |
+        cd blockmiui
+        git submodule init
+        git submodule update
+      
+    - name: Build with Gradle
+      run: |
+        bash ./gradlew assembleDebug
+        
+    - name: Sign Debug APK
+      if: success()
+      id: sign_debug
+      uses: r0adkll/sign-android-release@v1.0.4
+      with:
+        releaseDirectory: ./app/build/outputs/apk/debug
+        signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+        alias: ${{ secrets.KEY_STORE_ALIAS }}
+        keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+        keyPassword: ${{ secrets.KEY_STORE_PASSWORD }}
+        
+    - name: Upload Debug APK
+      uses: actions/upload-artifact@v2
+      with:
+        name: WooBox_Debug
+        path: ${{ steps.sign_debug.outputs.signedReleaseFile }}

.github/workflows/pr.yml

@@ -1,4 +1,4 @@
-name: Android CI
+name: PR Check
 
 on:
   pull_request:

README.md

@@ -13,7 +13,9 @@
 
 ### 模块说明
 
-开发者：[酷安@乌堆小透明](http://www.coolapk.com/u/883441)
+开发者：[酷安@乌堆小透明](http://www.coolapk.com/u/883441)  
+  
+当前仅基于`Android13`进行开发，`Android12`几乎不再维护。也有基于`Android13`开发，但是能在`Android12`使用的情况，请广大社区使用`Android12`的开发者自行测试和修复后提交`Pull Request`。
 
 ---
 

README_EN.md

@@ -11,6 +11,12 @@
 
 ---
 
+### Module Description
+
+Currently only developed based on `Android13`, `Android12` is almost no longer maintained. There are also cases where the development is based on `Android13`, but it can be used in `Android12`. Developers in the community who use `Android12` are requested to submit `Pull Request` after testing and repairing by themselves.
+
+---
+
 ### Screenshot
 
 ![Screenshot](https://raw.githubusercontent.com/LittleTurtle2333/SimplicityTools/main/doc/en.jpg)

app/build.gradle.kts

@@ -11,8 +11,8 @@ android {
         applicationId = "com.lt2333.simplicitytools"
         minSdk = 31
         targetSdk = 33
-        versionCode = 74
+        versionCode = 75
-        versionName = "1.7.4"
+        versionName = "1.7.5"
         buildConfigField("String", "BUILD_TIME", "\"${System.currentTimeMillis()}\"")
     }
 

app/src/main/java/com/lt2333/simplicitytools/activity/pages/s/SystemUIPageForS.kt

@@ -1,5 +1,7 @@
 package com.lt2333.simplicitytools.activity.pages.s
 
+import android.content.Intent
+import android.net.Uri
 import android.view.View
 import android.widget.Switch
 import android.widget.Toast
@@ -11,11 +13,11 @@ import cn.fkj233.ui.activity.view.SwitchV
 import cn.fkj233.ui.activity.view.TextSummaryV
 import cn.fkj233.ui.activity.view.TextV
 import cn.fkj233.ui.dialog.MIUIDialog
+import cn.fkj233.ui.dialog.NewDialog
 import com.lt2333.simplicitytools.R
-import java.util.HashMap
 
 
-@BMPage("scope_systemui","System UI", hideMenu = false)
+@BMPage("scope_systemui", "System UI", hideMenu = false)
 class SystemUIPageForS : BasePage() {
 
     override fun onCreate() {
@@ -54,11 +56,10 @@ class SystemUIPageForS : BasePage() {
                 }
             })
 
-        val layoutCompatibilityModeBinding = GetDataBinding({
+        val layoutCompatibilityBinding = GetDataBinding({
-            MIUIActivity.safeSP.getInt(
+            MIUIActivity.safeSP.getBoolean(
-                "screen_hole_location",
+                "layout_compatibility_mode", false
-                0
+            )
-            ) == 2
         }) { view, flags, data ->
             when (flags) {
                 1 -> (view as Switch).isEnabled = data as Boolean
@@ -66,57 +67,23 @@ class SystemUIPageForS : BasePage() {
             }
         }
 
-        val screenHoleLocation: HashMap<Int, String> = hashMapOf<Int, String>().also {
+        TextSummaryWithSwitch(
-            it[0] = getString(R.string.off)
-            it[1] = getString(R.string.center)
-            it[2] = getString(R.string.left_or_right)
-        }
-        TextSummaryWithSpinner(
             TextSummaryV(
-                textId = R.string.layout_compatibility_mode,
+                textId = R.string.layout_compatibility_mode, tipsId = R.string.layout_compatibility_mode_summary
-                tipsId = R.string.screen_hole_location
+            ), SwitchV("layout_compatibility_mode", dataBindingSend = layoutCompatibilityBinding.bindingSend)
-            ),
+        )
-            SpinnerV(
-                screenHoleLocation[MIUIActivity.safeSP.getInt(
-                    "screen_hole_location",
-                    0
-                )].toString()
-            ) {
-                add(screenHoleLocation[0].toString()) {
-                    MIUIActivity.safeSP.putAny("screen_hole_location", 0)
-                    layoutCompatibilityModeBinding.binding.Send().send(false)
-                }
-                add(screenHoleLocation[1].toString()) {
-                    MIUIActivity.safeSP.putAny("screen_hole_location", 1)
-                    layoutCompatibilityModeBinding.binding.Send().send(false)
-                }
-                add(screenHoleLocation[2].toString()) {
-                    MIUIActivity.safeSP.putAny("screen_hole_location", 2)
-                    layoutCompatibilityModeBinding.binding.Send().send(true)
-                }
-            })
 
         Text(
-            textId = R.string.left_margin,
+            textId = R.string.left_margin, dataBindingRecv = layoutCompatibilityBinding.binding.getRecv(2)
-            dataBindingRecv = layoutCompatibilityModeBinding.binding.getRecv(2)
         )
         SeekBarWithText(
-            "status_bar_left_margin",
+            "status_bar_left_margin", 0, 300, 0, dataBindingRecv = layoutCompatibilityBinding.binding.getRecv(2)
-            0,
-            300,
-            0,
-            dataBindingRecv = layoutCompatibilityModeBinding.binding.getRecv(2)
         )
         Text(
-            textId = R.string.right_margin,
+            textId = R.string.right_margin, dataBindingRecv = layoutCompatibilityBinding.binding.getRecv(2)
-            dataBindingRecv = layoutCompatibilityModeBinding.binding.getRecv(2)
         )
         SeekBarWithText(
-            "status_bar_right_margin",
+            "status_bar_right_margin", 0, 300, 0, dataBindingRecv = layoutCompatibilityBinding.binding.getRecv(2)
-            0,
-            300,
-            0,
-            dataBindingRecv = layoutCompatibilityModeBinding.binding.getRecv(2)
         )
         Line()
         TitleText(textId = R.string.status_bar_clock_format)
@@ -246,23 +213,37 @@ class SystemUIPageForS : BasePage() {
 
         //极客模式起始
         TextSummaryWithArrow(TextSummaryV(textId = R.string.custom_clock_format_geek) {
-            MIUIDialog(activity) {
+            NewDialog(activity) {
                 setTitle(R.string.custom_clock_format_geek)
-                setEditText(MIUIActivity.safeSP.getString("custom_clock_format_geek", "HH:mm:ss"), "", isSingleLine = false)
+                setEditText(
-                setLButton(textId = R.string.cancel) {
+                    MIUIActivity.safeSP.getString("custom_clock_format_geek", "HH:mm:ss"), "", isSingleLine = false
-                    dismiss()
+                )
+                Button(getString(R.string.click_to_view_use_cases)) {
+                    val locale = context.resources.configuration.locale
+                    val language = locale.language
+                    if (language.endsWith("zh")) {
+                        val uri = Uri.parse("https://zhuti.designer.xiaomi.com/docs/grammar/#%E6%97%B6%E9%97%B4%E6%97%A5%E6%9C%9F")
+                        val intent = Intent(Intent.ACTION_VIEW, uri)
+                        activity.startActivity(intent)
+                    } else {
+                        val uri = Uri.parse("https://docs.google.com/spreadsheets/d/1ghkT2iFbxB3bT4TKCiKAfmEdGt6kTVKFU3dm4Nz1or8/edit?usp=sharing")
+                        val intent = Intent(Intent.ACTION_VIEW, uri)
+                        activity.startActivity(intent)
+                    }
                 }
-                setRButton(textId = R.string.Done) {
+                Button(getString(R.string.Done)) {
                     if (getEditText().isNotEmpty()) {
                         try {
                             MIUIActivity.safeSP.putAny("custom_clock_format_geek", getEditText())
                             dismiss()
-                            return@setRButton
+                            return@Button
                         } catch (_: Throwable) {
                         }
                     }
-                    Toast.makeText(activity, R.string.input_error, Toast.LENGTH_SHORT)
+                    Toast.makeText(activity, R.string.input_error, Toast.LENGTH_SHORT).show()
-                        .show()
+                }
+                Button(getString(R.string.cancel), cancelStyle = true) {
+                    dismiss()
                 }
             }.show()
         }, dataBindingRecv = customClockGeekBinding.binding.getRecv(2))

app/src/main/java/com/lt2333/simplicitytools/activity/pages/t/SystemUIPageForT.kt

@@ -566,6 +566,13 @@ import com.lt2333.simplicitytools.R
         )
         Line()
         TitleText(textId = R.string.control_center)
+        TextSummaryWithSwitch(
+            TextSummaryV(
+                textId = R.string.disable_bluetooth_temporarily_off
+            ), SwitchV(
+                "disable_bluetooth_temporarily_off"
+            )
+        )
         val controlCenterWeatherBinding = GetDataBinding({
             MIUIActivity.safeSP.getBoolean(
                 "control_center_weather", false

app/src/main/java/com/lt2333/simplicitytools/hooks/apps/SystemUI.kt

@@ -32,37 +32,7 @@ import com.lt2333.simplicitytools.hooks.rules.s.systemui.StatusBarLayoutForS
 import com.lt2333.simplicitytools.hooks.rules.s.systemui.StatusBarNetworkSpeedRefreshSpeedForS
 import com.lt2333.simplicitytools.hooks.rules.s.systemui.StatusBarTimeCustomizationForS
 import com.lt2333.simplicitytools.hooks.rules.s.systemui.WaveChargeForS
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.BatteryPercentageForT
+import com.lt2333.simplicitytools.hooks.rules.t.systemui.*
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.CanNotificationSlideForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.ControlCenterWeatherForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.CustomMobileTypeTextForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.DoubleLineNetworkSpeedForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.HideBatteryIconForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.HideHDIconForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.HideMobileActivityIconForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.HideMobileTypeIconForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.HideNetworkSpeedSplitterForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.HideSimIconForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.HideStatusBarIconForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.HideStatusBarNetworkSpeedSecondForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.HideWifiActivityIconForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.LockScreenClockDisplaySecondsForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.LockScreenCurrentForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.LockScreenDoubleTapToSleepForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.MaximumNumberOfNotificationIconsForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.NewNotificationWeatherForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.NotificationWeatherForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.OldNotificationWeatherForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.OldQSCustomForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.RemoveLockScreenCameraForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.RemoveTheLeftSideOfTheLockScreenForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.ShowWifiStandardForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.StatusBarBigMobileTypeIconForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.StatusBarDoubleTapToSleepForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.StatusBarLayoutForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.StatusBarNetworkSpeedRefreshSpeedForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.StatusBarTimeCustomizationForT
-import com.lt2333.simplicitytools.hooks.rules.t.systemui.WaveChargeForT
 import com.lt2333.simplicitytools.utils.xposed.base.AppRegister
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 
@@ -105,6 +75,7 @@ object SystemUI : AppRegister() {
                     CanNotificationSlideForT, //允许下滑通知打开小窗
                     LockScreenClockDisplaySecondsForT, // 锁屏时钟显示秒
                     ShowWifiStandardForT, // 显示 WIFI 角标
+                    DisableBluetoothTemporarilyOffForT, //禁用临时蓝牙关闭
                 )
             }
 

app/src/main/java/com/lt2333/simplicitytools/hooks/rules/s/systemui/StatusBarLayoutForS.kt

@@ -1,5 +1,6 @@
 package com.lt2333.simplicitytools.hooks.rules.s.systemui
 
+
 import android.app.KeyguardManager
 import android.content.Context
 import android.content.res.Configuration
@@ -16,10 +17,11 @@ import com.lt2333.simplicitytools.utils.XSPUtils
 import com.lt2333.simplicitytools.utils.hasEnable
 import com.lt2333.simplicitytools.utils.xposed.base.HookRegister
 
+
 object StatusBarLayoutForS : HookRegister() {
 
     private val getMode = XSPUtils.getInt("status_bar_layout_mode", 0)
-    private val getHoleLocation = XSPUtils.getInt("screen_hole_location", 0)
+    private val isCompatibilityMode = XSPUtils.getBoolean("layout_compatibility_mode", false)
 
     private var statusBarLeft = 0
     private var statusBarTop = 0
@@ -32,23 +34,31 @@ object StatusBarLayoutForS : HookRegister() {
         var mCenterLayout: LinearLayout?
         var statusBar: ViewGroup? = null
 
-        fun updateLayout(context: Context) {
+        //判断屏幕状态更新布局 mode: 1正常布局 2居中布局
-            //判断屏幕方向
+        fun updateLayout(context: Context,mode: Int) {
-            val mConfiguration: Configuration = context.resources.configuration
+            when(mode){
-            if (mConfiguration.orientation == Configuration.ORIENTATION_PORTRAIT) {
+                1->{
-                mLeftLayout!!.setPadding(statusBarLeft, 0, 0, 0)
+                    val mConfiguration: Configuration = context.resources.configuration
-                mRightLayout!!.setPadding(0, 0, statusBarRight, 0)
+                    if (mConfiguration.orientation == Configuration.ORIENTATION_PORTRAIT) { //横屏
-                statusBar!!.setPadding(0, statusBarTop, 0, statusBarBottom)
+                        statusBar!!.setPadding(statusBarLeft, statusBarTop, statusBarRight, statusBarBottom)
-            } else {
+                    }
-                //横屏状态
+                }
-                mLeftLayout!!.setPadding(175, 0, 0, 0)
+                2->{
-                mRightLayout!!.setPadding(0, 0, 175, 0)
+                    val mConfiguration: Configuration = context.resources.configuration
-                statusBar!!.setPadding(0, statusBarTop, 0, statusBarBottom)
+                    if (mConfiguration.orientation == Configuration.ORIENTATION_PORTRAIT) { //横屏
+                        mLeftLayout!!.setPadding(statusBarLeft, 0, 0, 0)
+                        mRightLayout!!.setPadding(0, 0, statusBarRight, 0)
+                        statusBar!!.setPadding(0, statusBarTop, 0, statusBarBottom)
+                    }else{ //竖屏
+                        mLeftLayout!!.setPadding(0, 0, 0, 0)
+                        mRightLayout!!.setPadding(0, 0, 0, 0)
+                    }
+                }
             }
         }
 
-        //判断是否开启居中挖孔兼容模式
+        //判断是否开启挖孔兼容模式
-        if (getHoleLocation == 1) {
+        if (isCompatibilityMode) {
             findMethod("com.android.systemui.ScreenDecorations\$DisplayCutoutView") {
                 name == "boundsFromDirection" && parameterCount == 3 && isStatic
             }.hookBefore {
@@ -56,48 +66,83 @@ object StatusBarLayoutForS : HookRegister() {
             }
         }
 
+        //修改对应布局
         when (getMode) {
             //默认
-            0 -> return
+            0 -> {
+
+                findMethod("com.android.systemui.statusbar.phone.CollapsedStatusBarFragment") {
+                    name == "onViewCreated" && parameterCount == 2
+                }.hookAfter { param ->
+                    val miuiPhoneStatusBarView = param.thisObject.getObjectAs<ViewGroup>("mStatusBar")
+                    val context: Context = miuiPhoneStatusBarView.context
+                    val res: Resources = miuiPhoneStatusBarView.resources
+                    val statusBarId: Int = res.getIdentifier("status_bar", "id", "com.android.systemui")
+                    statusBar = miuiPhoneStatusBarView.findViewById(statusBarId)
+                    if (statusBar == null) return@hookAfter
+
+                    statusBarLeft = statusBar!!.paddingLeft
+                    statusBarTop = statusBar!!.paddingTop
+                    statusBarRight = statusBar!!.paddingRight
+                    statusBarBottom = statusBar!!.paddingBottom
+
+
+                    if (isCompatibilityMode) {
+                        val customLeftMargin = XSPUtils.getInt("status_bar_left_margin", 0)
+                        if (customLeftMargin != 0) {
+                            statusBarLeft = customLeftMargin
+                        }
+
+                        val customRightMargin = XSPUtils.getInt("status_bar_right_margin", 0)
+                        if (customRightMargin != 0) {
+                            statusBarRight = customRightMargin
+                        }
+                        updateLayout(context,1)
+                    }
+                }
+
+
+                //兼容模式
+                findMethod("com.android.systemui.statusbar.phone.PhoneStatusBarView") {
+                    name == "updateLayoutForCutout"
+                }.hookAfter {
+                    if (isCompatibilityMode) {
+                        val context = (it.thisObject as ViewGroup).context
+                        updateLayout(context,1)
+                    }
+                }
+            }
             //时钟居中
             1 -> {
                 findMethod("com.android.systemui.statusbar.phone.CollapsedStatusBarFragment") {
                     name == "onViewCreated" && parameterCount == 2
                 }.hookAfter { param ->
-                    val miuiPhoneStatusBarView =
+                    val miuiPhoneStatusBarView = param.thisObject.getObjectAs<ViewGroup>("mStatusBar")
-                        param.thisObject.getObjectAs<ViewGroup>("mStatusBar")
                     val context: Context = miuiPhoneStatusBarView.context
                     val res: Resources = miuiPhoneStatusBarView.resources
-                    val statusBarId: Int =
+                    val statusBarId: Int = res.getIdentifier("status_bar", "id", "com.android.systemui")
-                        res.getIdentifier("status_bar", "id", "com.android.systemui")
+                    val statusBarContentsId: Int = res.getIdentifier(
-                    val statusBarContentsId: Int =
+                        "status_bar_contents", "id", "com.android.systemui"
-                        res.getIdentifier("status_bar_contents", "id", "com.android.systemui")
+                    )
-                    val systemIconAreaId: Int =
+                    val systemIconAreaId: Int = res.getIdentifier("system_icon_area", "id", "com.android.systemui")
-                        res.getIdentifier("system_icon_area", "id", "com.android.systemui")
                     val clockId: Int = res.getIdentifier("clock", "id", "com.android.systemui")
-                    val phoneStatusBarLeftContainerId: Int =
+                    val phoneStatusBarLeftContainerId: Int = res.getIdentifier(
-                        res.getIdentifier(
+                        "phone_status_bar_left_container", "id", "com.android.systemui"
-                            "phone_status_bar_left_container",
+                    )
-                            "id",
+                    val notificationIconAreaInnerId: Int = res.getIdentifier(
-                            "com.android.systemui"
+                        "notification_icon_area_inner", "id", "com.android.systemui"
-                        )
+                    )
-                    val notificationIconAreaInnerId: Int =
-                        res.getIdentifier(
-                            "notification_icon_area_inner",
-                            "id",
-                            "com.android.systemui"
-                        )
                     statusBar = miuiPhoneStatusBarView.findViewById(statusBarId)
-                    val statusBarContents: ViewGroup =
+                    val statusBarContents: ViewGroup = miuiPhoneStatusBarView.findViewById(statusBarContentsId)
-                        miuiPhoneStatusBarView.findViewById(statusBarContentsId)
                     if (statusBar == null) return@hookAfter
                     val clock: TextView = miuiPhoneStatusBarView.findViewById(clockId)
-                    val phoneStatusBarLeftContainer: ViewGroup =
+                    val phoneStatusBarLeftContainer: ViewGroup = miuiPhoneStatusBarView.findViewById(
-                        miuiPhoneStatusBarView.findViewById(phoneStatusBarLeftContainerId)
+                        phoneStatusBarLeftContainerId
-                    val notificationIconAreaInner: ViewGroup =
+                    )
-                        miuiPhoneStatusBarView.findViewById(notificationIconAreaInnerId)
+                    val notificationIconAreaInner: ViewGroup = miuiPhoneStatusBarView.findViewById(
-                    val systemIconArea: ViewGroup =
+                        notificationIconAreaInnerId
-                        miuiPhoneStatusBarView.findViewById(systemIconAreaId)
+                    )
+                    val systemIconArea: ViewGroup = miuiPhoneStatusBarView.findViewById(systemIconAreaId)
 
                     (clock.parent as ViewGroup).removeView(clock)
                     (phoneStatusBarLeftContainer.parent as ViewGroup).removeView(
@@ -108,41 +153,39 @@ object StatusBarLayoutForS : HookRegister() {
                     )
                     (systemIconArea.parent as ViewGroup).removeView(systemIconArea)
 
-                    val mConstraintLayout =
+                    val mConstraintLayout = ConstraintLayout(context).also {
-                        ConstraintLayout(context).also {
+                        it.layoutParams = ConstraintLayout.LayoutParams(
-                            it.layoutParams = ConstraintLayout.LayoutParams(
+                            ConstraintLayout.LayoutParams.MATCH_PARENT, ConstraintLayout.LayoutParams.MATCH_PARENT
-                                ConstraintLayout.LayoutParams.MATCH_PARENT,
+                        )
-                                ConstraintLayout.LayoutParams.MATCH_PARENT
+                    }
-                            )
-                        }
 
                     mConstraintLayout.addView(notificationIconAreaInner)
 
                     val fullscreenNotificationIconAreaLp = LinearLayout.LayoutParams(
-                        ConstraintLayout.LayoutParams.MATCH_PARENT,
+                        ConstraintLayout.LayoutParams.MATCH_PARENT, ConstraintLayout.LayoutParams.MATCH_PARENT
-                        ConstraintLayout.LayoutParams.MATCH_PARENT
                     )
 
                     notificationIconAreaInner.layoutParams = fullscreenNotificationIconAreaLp
 
                     //增加一个左对齐布局
                     mLeftLayout = LinearLayout(context)
-                    val leftLp: LinearLayout.LayoutParams =
+                    val leftLp: LinearLayout.LayoutParams = 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
 
                     //增加一个居中布局
                     mCenterLayout = LinearLayout(context)
                     val centerLp: LinearLayout.LayoutParams = LinearLayout.LayoutParams(
-                        LinearLayout.LayoutParams.WRAP_CONTENT,
+                        LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.MATCH_PARENT
-                        LinearLayout.LayoutParams.MATCH_PARENT
                     )
                     mCenterLayout!!.layoutParams = centerLp
                     mCenterLayout!!.gravity = Gravity.CENTER or Gravity.CENTER_VERTICAL
                     mRightLayout = LinearLayout(context)
-                    val rightLp: LinearLayout.LayoutParams =
+                    val rightLp: LinearLayout.LayoutParams = 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
                     mLeftLayout!!.addView(phoneStatusBarLeftContainer)
@@ -160,7 +203,7 @@ object StatusBarLayoutForS : HookRegister() {
                     statusBarBottom = statusBar!!.paddingBottom
 
 
-                    if (getHoleLocation == 2) {
+                    if (isCompatibilityMode) {
                         val customLeftMargin = XSPUtils.getInt("status_bar_left_margin", 0)
                         if (customLeftMargin != 0) {
                             statusBarLeft = customLeftMargin
@@ -170,7 +213,7 @@ object StatusBarLayoutForS : HookRegister() {
                         if (customRightMargin != 0) {
                             statusBarRight = customRightMargin
                         }
-                        updateLayout(context)
+                        updateLayout(context,2)
                     }
                 }
 
@@ -179,7 +222,7 @@ object StatusBarLayoutForS : HookRegister() {
                 }.hookAfter {
                     hasEnable("layout_compatibility_mode") {
                         val context = (it.thisObject as ViewGroup).context
-                        updateLayout(context)
+                        updateLayout(context,2)
                     }
                 }
             }
@@ -188,14 +231,12 @@ object StatusBarLayoutForS : HookRegister() {
                 findMethod("com.android.systemui.statusbar.phone.CollapsedStatusBarFragment") {
                     name == "onViewCreated" && parameterCount == 2
                 }.hookAfter { param ->
-                    val miuiPhoneStatusBarView =
+                    val miuiPhoneStatusBarView = param.thisObject.getObjectAs<ViewGroup>("mStatusBar")
-                        param.thisObject.getObjectAs<ViewGroup>("mStatusBar")
                     val context: Context = miuiPhoneStatusBarView.context
                     val res: Resources = miuiPhoneStatusBarView.resources
 
                     //组件ID
-                    val statusBarId: Int =
+                    val statusBarId: Int = res.getIdentifier("status_bar", "id", "com.android.systemui")
-                        res.getIdentifier("status_bar", "id", "com.android.systemui")
                     val clockId: Int = res.getIdentifier("clock", "id", "com.android.systemui")
                     val batteryId: Int = res.getIdentifier("battery", "id", "com.android.systemui")
 
@@ -207,8 +248,7 @@ object StatusBarLayoutForS : HookRegister() {
 
                     //新建布局
                     val rightLp = LinearLayout.LayoutParams(
-                        LinearLayout.LayoutParams.WRAP_CONTENT,
+                        LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.MATCH_PARENT
-                        LinearLayout.LayoutParams.MATCH_PARENT
                     ).also {
                         it.marginStart = dp2px(context, 5f)
                     }
@@ -220,6 +260,36 @@ object StatusBarLayoutForS : HookRegister() {
                     battery.addView(mRightLayout)
                     (clock.parent as ViewGroup).removeView(clock)
                     mRightLayout!!.addView(clock)
+
+
+                    statusBarLeft = statusBar!!.paddingLeft
+                    statusBarTop = statusBar!!.paddingTop
+                    statusBarRight = statusBar!!.paddingRight
+                    statusBarBottom = statusBar!!.paddingBottom
+
+
+                    if (isCompatibilityMode) {
+                        val customLeftMargin = XSPUtils.getInt("status_bar_left_margin", 0)
+                        if (customLeftMargin != 0) {
+                            statusBarLeft = customLeftMargin
+                        }
+
+                        val customRightMargin = XSPUtils.getInt("status_bar_right_margin", 0)
+                        if (customRightMargin != 0) {
+                            statusBarRight = customRightMargin
+                        }
+                        updateLayout(context,1)
+                    }
+                }
+
+                //兼容模式
+                findMethod("com.android.systemui.statusbar.phone.PhoneStatusBarView") {
+                    name == "updateLayoutForCutout"
+                }.hookAfter {
+                    if (isCompatibilityMode) {
+                        val context = (it.thisObject as ViewGroup).context
+                        updateLayout(context,1)
+                    }
                 }
             }
             //时钟居中+图标居左
@@ -227,65 +297,45 @@ object StatusBarLayoutForS : HookRegister() {
                 findMethod("com.android.systemui.statusbar.phone.CollapsedStatusBarFragment") {
                     name == "onViewCreated" && parameterCount == 2
                 }.hookAfter { param ->
-                    val miuiPhoneStatusBarView =
+                    val miuiPhoneStatusBarView = param.thisObject.getObjectAs<ViewGroup>("mStatusBar")
-                        param.thisObject.getObjectAs<ViewGroup>("mStatusBar")
                     val context: Context = miuiPhoneStatusBarView.context
                     val res: Resources = miuiPhoneStatusBarView.resources
-                    val statusBarId: Int =
+                    val statusBarId: Int = res.getIdentifier("status_bar", "id", "com.android.systemui")
-                        res.getIdentifier("status_bar", "id", "com.android.systemui")
+                    val statusBarContentsId: Int = res.getIdentifier(
-                    val statusBarContentsId: Int =
+                        "status_bar_contents", "id", "com.android.systemui"
-                        res.getIdentifier("status_bar_contents", "id", "com.android.systemui")
+                    )
-                    val systemIconAreaId: Int =
+                    val systemIconAreaId: Int = res.getIdentifier("system_icon_area", "id", "com.android.systemui")
-                        res.getIdentifier("system_icon_area", "id", "com.android.systemui")
                     val clockId: Int = res.getIdentifier("clock", "id", "com.android.systemui")
-                    val phoneStatusBarLeftContainerId: Int =
+                    val phoneStatusBarLeftContainerId: Int = res.getIdentifier(
-                        res.getIdentifier(
+                        "phone_status_bar_left_container", "id", "com.android.systemui"
-                            "phone_status_bar_left_container",
+                    )
-                            "id",
+                    val fullscreenNotificationIconAreaId: Int = res.getIdentifier(
-                            "com.android.systemui"
+                        "fullscreen_notification_icon_area", "id", "com.android.systemui"
-                        )
+                    )
-                    val fullscreenNotificationIconAreaId: Int =
+                    val statusIconsId: Int = res.getIdentifier(
-                        res.getIdentifier(
+                        "statusIcons", "id", "com.android.systemui"
-                            "fullscreen_notification_icon_area",
+                    )
-                            "id",
+                    val systemIconsId: Int = res.getIdentifier(
-                            "com.android.systemui"
+                        "system_icons", "id", "com.android.systemui"
-                        )
+                    )
-                    val statusIconsId: Int =
+                    val batteryId: Int = res.getIdentifier(
-                        res.getIdentifier(
+                        "battery", "id", "com.android.systemui"
-                            "statusIcons",
+                    )
-                            "id",
-                            "com.android.systemui"
-                        )
-                    val systemIconsId: Int =
-                        res.getIdentifier(
-                            "system_icons",
-                            "id",
-                            "com.android.systemui"
-                        )
-                    val batteryId: Int =
-                        res.getIdentifier(
-                            "battery",
-                            "id",
-                            "com.android.systemui"
-                        )
 
                     statusBar = miuiPhoneStatusBarView.findViewById(statusBarId)
-                    val statusBarContents: ViewGroup =
+                    val statusBarContents: ViewGroup = miuiPhoneStatusBarView.findViewById(statusBarContentsId)
-                        miuiPhoneStatusBarView.findViewById(statusBarContentsId)
                     if (statusBar == null) return@hookAfter
                     val clock: TextView = miuiPhoneStatusBarView.findViewById(clockId)
-                    val phoneStatusBarLeftContainer: ViewGroup =
+                    val phoneStatusBarLeftContainer: ViewGroup = miuiPhoneStatusBarView.findViewById(
-                        miuiPhoneStatusBarView.findViewById(phoneStatusBarLeftContainerId)
+                        phoneStatusBarLeftContainerId
-                    val fullscreenNotificationIconArea: ViewGroup =
+                    )
-                        miuiPhoneStatusBarView.findViewById(fullscreenNotificationIconAreaId)
+                    val fullscreenNotificationIconArea: ViewGroup = miuiPhoneStatusBarView.findViewById(
-                    val systemIconArea: ViewGroup =
+                        fullscreenNotificationIconAreaId
-                        miuiPhoneStatusBarView.findViewById(systemIconAreaId)
+                    )
-                    val statusIcons: ViewGroup =
+                    val systemIconArea: ViewGroup = miuiPhoneStatusBarView.findViewById(systemIconAreaId)
-                        miuiPhoneStatusBarView.findViewById(statusIconsId)
+                    val statusIcons: ViewGroup = miuiPhoneStatusBarView.findViewById(statusIconsId)
-                    val systemIcons: ViewGroup =
+                    val systemIcons: ViewGroup = miuiPhoneStatusBarView.findViewById(systemIconsId)
-                        miuiPhoneStatusBarView.findViewById(systemIconsId)
+                    val battery: ViewGroup = miuiPhoneStatusBarView.findViewById(batteryId)
-                    val battery: ViewGroup =
-                        miuiPhoneStatusBarView.findViewById(batteryId)
 
                     (clock.parent as ViewGroup).removeView(clock)
                     (phoneStatusBarLeftContainer.parent as ViewGroup).removeView(
@@ -299,29 +349,25 @@ object StatusBarLayoutForS : HookRegister() {
                         fullscreenNotificationIconArea
                     )
 
-                    val mConstraintLayout =
+                    val mConstraintLayout = ConstraintLayout(context).also {
-                        ConstraintLayout(context).also {
+                        it.layoutParams = ConstraintLayout.LayoutParams(
-                            it.layoutParams = ConstraintLayout.LayoutParams(
+                            ConstraintLayout.LayoutParams.MATCH_PARENT, ConstraintLayout.LayoutParams.MATCH_PARENT
-                                ConstraintLayout.LayoutParams.MATCH_PARENT,
+                        )
-                                ConstraintLayout.LayoutParams.MATCH_PARENT
+                    }
-                            )
-                        }
 
                     mConstraintLayout.addView(fullscreenNotificationIconArea)
                     mConstraintLayout.addView(battery)
 
 
                     battery.layoutParams = ConstraintLayout.LayoutParams(
-                        ConstraintLayout.LayoutParams.WRAP_CONTENT,
+                        ConstraintLayout.LayoutParams.WRAP_CONTENT, ConstraintLayout.LayoutParams.MATCH_PARENT
-                        ConstraintLayout.LayoutParams.MATCH_PARENT
                     ).also {
                         it.endToEnd = 0
                     }
 
 
                     fullscreenNotificationIconArea.layoutParams = ConstraintLayout.LayoutParams(
-                        0,
+                        0, ConstraintLayout.LayoutParams.MATCH_PARENT
-                        ConstraintLayout.LayoutParams.MATCH_PARENT
                     ).also {
                         it.startToEnd = batteryId
                         it.endToEnd = 0
@@ -331,24 +377,25 @@ object StatusBarLayoutForS : HookRegister() {
 
                     //增加一个左对齐布局
                     mLeftLayout = LinearLayout(context)
-                    val leftLp: LinearLayout.LayoutParams =
+                    val leftLp: LinearLayout.LayoutParams = 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
 
                     //增加一个居中布局
                     mCenterLayout = LinearLayout(context)
                     val centerLp: LinearLayout.LayoutParams = LinearLayout.LayoutParams(
-                        LinearLayout.LayoutParams.WRAP_CONTENT,
+                        LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.MATCH_PARENT
-                        LinearLayout.LayoutParams.MATCH_PARENT
                     )
                     mCenterLayout!!.layoutParams = centerLp
                     mCenterLayout!!.gravity = Gravity.CENTER or Gravity.CENTER_VERTICAL
 
                     //增加一个右布局
                     mRightLayout = LinearLayout(context)
-                    val rightLp: LinearLayout.LayoutParams =
+                    val rightLp: LinearLayout.LayoutParams = 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
 
@@ -375,7 +422,7 @@ object StatusBarLayoutForS : HookRegister() {
                     statusBarBottom = statusBar!!.paddingBottom
 
 
-                    if (getHoleLocation == 2) {
+                    if (isCompatibilityMode) {
                         val customLeftMargin = XSPUtils.getInt("status_bar_left_margin", 0)
                         if (customLeftMargin != 0) {
                             statusBarLeft = customLeftMargin
@@ -385,16 +432,16 @@ object StatusBarLayoutForS : HookRegister() {
                         if (customRightMargin != 0) {
                             statusBarRight = customRightMargin
                         }
-                        updateLayout(context)
+                        updateLayout(context,2)
                     }
                 }
                 //兼容模式
                 findMethod("com.android.systemui.statusbar.phone.PhoneStatusBarView") {
                     name == "updateLayoutForCutout"
                 }.hookAfter {
-                    if (getHoleLocation == 2) {
+                    if (isCompatibilityMode) {
                         val context = (it.thisObject as ViewGroup).context
-                        updateLayout(context)
+                        updateLayout(context,2)
                     }
                 }
 
@@ -404,12 +451,10 @@ object StatusBarLayoutForS : HookRegister() {
                 }.hookAfter {
                     val miuiPhoneStatusBarView = it.thisObject.getObjectAs<ViewGroup>("mStatusBar")
                     val res = miuiPhoneStatusBarView.resources
-                    val statusBarId =
+                    val statusBarId = res.getIdentifier("status_bar", "id", "com.android.systemui")
-                        res.getIdentifier("status_bar", "id", "com.android.systemui")
                     val statusBar1 = miuiPhoneStatusBarView.findViewById<ViewGroup>(statusBarId)
                     //非锁屏下整个状态栏布局
-                    val keyguardMgr =
+                    val keyguardMgr = statusBar1.context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
-                        statusBar1.context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
                     if (keyguardMgr.isKeyguardLocked) {
                         statusBar1!!.visibility = View.GONE
                     } else {

app/src/main/java/com/lt2333/simplicitytools/hooks/rules/s/systemui/StatusBarTimeCustomizationForS.kt

@@ -2,12 +2,10 @@ package com.lt2333.simplicitytools.hooks.rules.s.systemui
 
 import android.annotation.SuppressLint
 import android.content.Context
-import android.content.res.Resources
 import android.os.Handler
 import android.provider.Settings
 import android.util.TypedValue
 import android.view.Gravity
-import android.view.ViewGroup
 import android.widget.TextView
 import com.github.kyuubiran.ezxhelper.utils.*
 import com.lt2333.simplicitytools.utils.XSPUtils
@@ -16,6 +14,7 @@ import java.lang.reflect.Method
 import java.text.SimpleDateFormat
 import java.util.*
 
+
 object StatusBarTimeCustomizationForS : HookRegister() {
 
     private val getMode = XSPUtils.getInt("custom_clock_mode", 0)
@@ -30,14 +29,12 @@ object StatusBarTimeCustomizationForS : HookRegister() {
     private val isSecond = XSPUtils.getBoolean("status_bar_time_seconds", false)
     private val isDoubleHour = XSPUtils.getBoolean("status_bar_time_double_hour", false)
     private val isPeriod = XSPUtils.getBoolean("status_bar_time_period", true)
-    private val isCenterAlign =
+    private val isCenterAlign = XSPUtils.getBoolean("status_bar_time_double_line_center_align", false)
-        XSPUtils.getBoolean("status_bar_time_double_line_center_align", false)
 
     //极客模式
     private val getGeekClockSize = XSPUtils.getInt("status_bar_clock_size_geek", 0)
     private val getGeekFormat = XSPUtils.getString("custom_clock_format_geek", "HH:mm:ss")
-    private val isGeekCenterAlign =
+    private val isGeekCenterAlign = XSPUtils.getBoolean("status_bar_time_center_align_geek", false)
-        XSPUtils.getBoolean("status_bar_time_center_align_geek", false)
 
     private lateinit var nowTime: Date
     private var str = ""
@@ -83,9 +80,7 @@ object StatusBarTimeCustomizationForS : HookRegister() {
                             }
                         }
                         Timer().scheduleAtFixedRate(
-                            T(),
+                            T(), 1000 - System.currentTimeMillis() % 1000, 1000
-                            1000 - System.currentTimeMillis() % 1000,
-                            1000
                         )
                     } catch (_: Exception) {
                     }
@@ -98,8 +93,7 @@ object StatusBarTimeCustomizationForS : HookRegister() {
                         val textV = it.thisObject as TextView
                         if (textV.resources.getResourceEntryName(textV.id) == "clock") {
                             val t = Settings.System.getString(
-                                c!!.contentResolver,
+                                c!!.contentResolver, Settings.System.TIME_12_24
-                                Settings.System.TIME_12_24
                             )
                             val is24 = t == "24"
                             nowTime = Calendar.getInstance().time
@@ -110,15 +104,18 @@ object StatusBarTimeCustomizationForS : HookRegister() {
                 }
 
                 if (isCenterAlign) {
-                    findMethod("com.android.systemui.statusbar.phone.CollapsedStatusBarFragment") {
+                    findConstructor("com.android.systemui.statusbar.views.MiuiClock") {
-                        name == "onViewCreated" && parameterCount == 2
+                        paramCount == 3
                     }.hookAfter {
-                        val miuiPhoneStatusBarView =
+                        try {
-                            it.thisObject.getObject("mStatusBar") as ViewGroup
+                            val textV = it.thisObject as TextView
-                        val res: Resources = miuiPhoneStatusBarView.resources
+                            if (textV.resources.getResourceEntryName(textV.id) == "clock") {
-                        val clockId: Int = res.getIdentifier("clock", "id", "com.android.systemui")
+                                c = it.args[0] as Context
-                        val clock: TextView = miuiPhoneStatusBarView.findViewById(clockId)
+                                val textV = it.thisObject as TextView
-                        clock.gravity = Gravity.CENTER
+                                textV.gravity = Gravity.CENTER
+                            }
+                        } catch (_: Exception) {
+                        }
                     }
                 }
             }
@@ -152,9 +149,7 @@ object StatusBarTimeCustomizationForS : HookRegister() {
                             }
                         }
                         Timer().scheduleAtFixedRate(
-                            T(),
+                            T(), 1000 - System.currentTimeMillis() % 1000, 1000
-                            1000 - System.currentTimeMillis() % 1000,
-                            1000
                         )
                     } catch (_: Exception) {
                     }
@@ -162,27 +157,38 @@ object StatusBarTimeCustomizationForS : HookRegister() {
 
                 findMethod("com.android.systemui.statusbar.views.MiuiClock") {
                     name == "updateTime"
-                }.hookAfter {
+                }.hookBefore {
                     try {
                         val textV = it.thisObject as TextView
                         if (textV.resources.getResourceEntryName(textV.id) == "clock") {
-                            nowTime = Calendar.getInstance().time
+                            val mMiuiStatusBarClockController = textV.getObject("mMiuiStatusBarClockController")
-                            textV.text = SimpleDateFormat(getGeekFormat).format(nowTime)
+                            val mCalendar = mMiuiStatusBarClockController.invokeMethodAuto("getCalendar")
+                            mCalendar?.invokeMethodAuto(
+                                "setTimeInMillis", System.currentTimeMillis()
+                            )
+                            val textSb = StringBuilder()
+                            val formatSb = StringBuilder(getGeekFormat.toString())
+                            mCalendar?.invokeMethodAuto("format", c, textSb, formatSb)
+                            textV.text = textSb.toString()
+                            it.result = null
                         }
                     } catch (_: Exception) {
                     }
                 }
 
                 if (isGeekCenterAlign) {
-                    findMethod("com.android.systemui.statusbar.phone.CollapsedStatusBarFragment") {
+                    findConstructor("com.android.systemui.statusbar.views.MiuiClock") {
-                        name == "onViewCreated" && parameterCount == 2
+                        paramCount == 3
                     }.hookAfter {
-                        val miuiPhoneStatusBarView =
+                        try {
-                            it.thisObject.getObject("mStatusBar") as ViewGroup
+                            val textV = it.thisObject as TextView
-                        val res: Resources = miuiPhoneStatusBarView.resources
+                            if (textV.resources.getResourceEntryName(textV.id) == "clock") {
-                        val clockId: Int = res.getIdentifier("clock", "id", "com.android.systemui")
+                                c = it.args[0] as Context
-                        val clock: TextView = miuiPhoneStatusBarView.findViewById(clockId)
+                                val textV = it.thisObject as TextView
-                        clock.gravity = Gravity.CENTER
+                                textV.gravity = Gravity.CENTER
+                            }
+                        } catch (_: Exception) {
+                        }
                     }
                 }
             }
@@ -197,7 +203,6 @@ object StatusBarTimeCustomizationForS : HookRegister() {
         if (isYear) {
             if (isZh) {
                 datePattern += "YY年"
-//                if (!isHideSpace) datePattern = "$datePattern "
             } else {
                 datePattern += "YY"
                 if (isMonth || isDay) datePattern += "/"
@@ -206,7 +211,6 @@ object StatusBarTimeCustomizationForS : HookRegister() {
         if (isMonth) {
             if (isZh) {
                 datePattern += "M月"
-//                if (!isHideSpace) datePattern = "$datePattern "
             } else {
                 datePattern += "M"
                 if (isDay) datePattern += "/"

app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/DisableBluetoothTemporarilyOffForT.kt

@@ -0,0 +1,16 @@
+package com.lt2333.simplicitytools.hooks.rules.t.systemui
+
+import com.github.kyuubiran.ezxhelper.utils.findMethod
+import com.github.kyuubiran.ezxhelper.utils.hookBefore
+import com.lt2333.simplicitytools.utils.hasEnable
+import com.lt2333.simplicitytools.utils.xposed.base.HookRegister
+
+object DisableBluetoothTemporarilyOffForT: HookRegister() {
+    override fun init()= hasEnable("disable_bluetooth_temporarily_off") {
+        findMethod("com.android.settingslib.bluetooth.LocalBluetoothAdapter"){
+            name == "isSupportBluetoothRestrict" && parameterCount==1
+        }.hookBefore {
+            it.result = false
+        }
+    }
+}

app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/StatusBarLayoutForT.kt

@@ -28,24 +28,31 @@ object StatusBarLayoutForT : HookRegister() {
     private var statusBarBottom = 0
 
     override fun init() {
-
-        // TODO: Android13状态栏布局不可用
-
         var mLeftLayout: LinearLayout? = null
         var mRightLayout: LinearLayout? = null
         var mCenterLayout: LinearLayout?
         var statusBar: ViewGroup? = null
 
-        fun updateLayout(context: Context) {
+        //判断屏幕状态更新布局 mode: 1正常布局 2居中布局
-            //判断屏幕方向
+        fun updateLayout(context: Context,mode: Int) {
-            val mConfiguration: Configuration = context.resources.configuration
+            when(mode){
-            if (mConfiguration.orientation == Configuration.ORIENTATION_PORTRAIT) {
+                1->{
-                mLeftLayout!!.setPadding(statusBarLeft, 0, 0, 0)
+                    val mConfiguration: Configuration = context.resources.configuration
-                mRightLayout!!.setPadding(0, 0, statusBarRight, 0)
+                    if (mConfiguration.orientation == Configuration.ORIENTATION_PORTRAIT) { //横屏
-                statusBar!!.setPadding(0, statusBarTop, 0, statusBarBottom)
+                        statusBar!!.setPadding(statusBarLeft, statusBarTop, statusBarRight, statusBarBottom)
-            }else{
+                    }
-                mLeftLayout!!.setPadding(0, 0, 0, 0)
+                }
-                mRightLayout!!.setPadding(0, 0, 0, 0)
+                2->{
+                    val mConfiguration: Configuration = context.resources.configuration
+                    if (mConfiguration.orientation == Configuration.ORIENTATION_PORTRAIT) { //横屏
+                        mLeftLayout!!.setPadding(statusBarLeft, 0, 0, 0)
+                        mRightLayout!!.setPadding(0, 0, statusBarRight, 0)
+                        statusBar!!.setPadding(0, statusBarTop, 0, statusBarBottom)
+                    }else{ //竖屏
+                        mLeftLayout!!.setPadding(0, 0, 0, 0)
+                        mRightLayout!!.setPadding(0, 0, 0, 0)
+                    }
+                }
             }
         }
 
@@ -58,9 +65,52 @@ object StatusBarLayoutForT : HookRegister() {
             }
         }
 
+        //修改对应布局
         when (getMode) {
             //默认
-            0 -> return
+            0 -> {
+
+                findMethod("com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment") {
+                    name == "onViewCreated" && parameterCount == 2
+                }.hookAfter { param ->
+                    val miuiPhoneStatusBarView = param.thisObject.getObjectAs<ViewGroup>("mStatusBar")
+                    val context: Context = miuiPhoneStatusBarView.context
+                    val res: Resources = miuiPhoneStatusBarView.resources
+                    val statusBarId: Int = res.getIdentifier("status_bar", "id", "com.android.systemui")
+                    statusBar = miuiPhoneStatusBarView.findViewById(statusBarId)
+                    if (statusBar == null) return@hookAfter
+
+                    statusBarLeft = statusBar!!.paddingLeft
+                    statusBarTop = statusBar!!.paddingTop
+                    statusBarRight = statusBar!!.paddingRight
+                    statusBarBottom = statusBar!!.paddingBottom
+
+
+                    if (isCompatibilityMode) {
+                        val customLeftMargin = XSPUtils.getInt("status_bar_left_margin", 0)
+                        if (customLeftMargin != 0) {
+                            statusBarLeft = customLeftMargin
+                        }
+
+                        val customRightMargin = XSPUtils.getInt("status_bar_right_margin", 0)
+                        if (customRightMargin != 0) {
+                            statusBarRight = customRightMargin
+                        }
+                        updateLayout(context,1)
+                    }
+                }
+
+
+                //兼容模式
+                findMethod("com.android.systemui.statusbar.phone.PhoneStatusBarView") {
+                    name == "updateLayoutForCutout"
+                }.hookAfter {
+                    if (isCompatibilityMode) {
+                        val context = (it.thisObject as ViewGroup).context
+                        updateLayout(context,1)
+                    }
+                }
+            }
             //时钟居中
             1 -> {
                 findMethod("com.android.systemui.statusbar.phone.fragment.CollapsedStatusBarFragment") {
@@ -162,7 +212,7 @@ object StatusBarLayoutForT : HookRegister() {
                         if (customRightMargin != 0) {
                             statusBarRight = customRightMargin
                         }
-                        updateLayout(context)
+                        updateLayout(context,2)
                     }
                 }
 
@@ -171,7 +221,7 @@ object StatusBarLayoutForT : HookRegister() {
                 }.hookAfter {
                     hasEnable("layout_compatibility_mode") {
                         val context = (it.thisObject as ViewGroup).context
-                        updateLayout(context)
+                        updateLayout(context,2)
                     }
                 }
             }
@@ -209,6 +259,36 @@ object StatusBarLayoutForT : HookRegister() {
                     battery.addView(mRightLayout)
                     (clock.parent as ViewGroup).removeView(clock)
                     mRightLayout!!.addView(clock)
+
+
+                    statusBarLeft = statusBar!!.paddingLeft
+                    statusBarTop = statusBar!!.paddingTop
+                    statusBarRight = statusBar!!.paddingRight
+                    statusBarBottom = statusBar!!.paddingBottom
+
+
+                    if (isCompatibilityMode) {
+                        val customLeftMargin = XSPUtils.getInt("status_bar_left_margin", 0)
+                        if (customLeftMargin != 0) {
+                            statusBarLeft = customLeftMargin
+                        }
+
+                        val customRightMargin = XSPUtils.getInt("status_bar_right_margin", 0)
+                        if (customRightMargin != 0) {
+                            statusBarRight = customRightMargin
+                        }
+                        updateLayout(context,1)
+                    }
+                }
+
+                //兼容模式
+                findMethod("com.android.systemui.statusbar.phone.PhoneStatusBarView") {
+                    name == "updateLayoutForCutout"
+                }.hookAfter {
+                    if (isCompatibilityMode) {
+                        val context = (it.thisObject as ViewGroup).context
+                        updateLayout(context,1)
+                    }
                 }
             }
             //时钟居中+图标居左
@@ -351,7 +431,7 @@ object StatusBarLayoutForT : HookRegister() {
                         if (customRightMargin != 0) {
                             statusBarRight = customRightMargin
                         }
-                        updateLayout(context)
+                        updateLayout(context,2)
                     }
                 }
                 //兼容模式
@@ -360,7 +440,7 @@ object StatusBarLayoutForT : HookRegister() {
                 }.hookAfter {
                     if (isCompatibilityMode) {
                         val context = (it.thisObject as ViewGroup).context
-                        updateLayout(context)
+                        updateLayout(context,2)
                     }
                 }
 

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

@@ -38,7 +38,6 @@
     <string name="github_url">Vítejte více vývojářů, aby se podíleli na vývoji</string>
     <string name="issues">Zpětná vazba/návrh</string>
     <string name="issues_url">Kliknutím zobrazíte problémy GitHub</string>
-    <string name="xposeddescription">Nástroj pro přizpůsobení MIUI13(Android 12)</string>
     <string name="statusbar">Stavová lišta</string>
     <string name="status_bar_time_seconds">Zobrazit vteřiny</string>
     <string name="status_bar_network_speed_refresh_speed">Obnovení rychlosti sítě v sekundách</string>

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

@@ -39,7 +39,7 @@
     <string name="github_url">Más desarrolladores están invitados a participar en el proyecto</string>
     <string name="issues">Comentarios/Sugerencias</string>
     <string name="issues_url">Clic para ver errores en GitHub</string>
-    <string name="xposeddescription">Herramienta de personalización para MIUI13 (Android 12)</string>
+    <string name="xposeddescription">Herramienta de personalización para MIUI13+(Android 12+)</string>
     <string name="statusbar">Barra de estado</string>
     <string name="status_bar_time_seconds">Mostrar segundos</string>
     <string name="status_bar_network_speed_refresh_speed">La velocidad de red se actualiza en segundos</string>
@@ -240,4 +240,11 @@
     <string name="miuihome_recentview_remove_card_animation">Modificar la animación de marcado de tarjetas</string>
     <string name="miuihome_recentview_remove_card_animation_summary">Modificar el efecto de animación al remover ventana de tareas recientes</string>
     <string name="miuihome_recentwiew_wallpaper_darkening">Deshabilitar atenuación de fondo de pantalla</string>
+    <string name="miuihome_recentwiew_wallpaper_darkening_summary">Esto deshabilitará el efecto en el que el fondo de pantalla se ilumina gradualmente cuando se abre y se cierra una tarea reciente</string>
+    <string name="miuihome_scroll_icon_name">Desplazar el nombre de la app</string>
+    <string name="miuihome_scroll_icon_name_summary">Si el nombre de la aplicación es demasiado largo se mostrará con desplazamiento y sin ningúna línea nueva</string>
+    <string name="miuihome_shortcut_add_small_window">Añadir ventana al menú de accesos directos</string>
+    <string name="miuihome_shortcut_add_small_window_summary">Mantener presionando el icono del escritorio para añadir a una ventana de acceso rápido</string>
+    <string name="miuihome_shortcut_add_small_window_title">Ventana pequeña </string>
+    <string name="click_to_view_use_cases">Clic para ver casos de uso</string>
 </resources>

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

@@ -34,7 +34,6 @@
     <string name="github_url">Bienvenue à d\'autres développeurs pour participer au développement</string>
     <string name="issues">Feed-back/Proposition</string>
     <string name="issues_url">Cliquez pour voir GitHub</string>
-    <string name="xposeddescription">Outil de personnalisation pour MIUI13(Android 12)</string>
     <string name="statusbar">Barre d\'État</string>
     <string name="status_bar_time_seconds">Affichage des secondes</string>
     <string name="status_bar_network_speed_refresh_speed">Rafraichissement de la vitesse du réseau en secondes</string>

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

@@ -37,7 +37,6 @@
     <string name="github_url">Szeretnénk, hogy több fejlesztő vegyen részt a fejlesztésben</string>
     <string name="issues">Visszajelzés/javaslat</string>
     <string name="issues_url">Kattintson a GitHub problémák megtekintéséhez</string>
-    <string name="xposeddescription">Testreszabási eszköz a MIUI13(Android 12) számára</string>
     <string name="statusbar">Állapotsor</string>
     <string name="status_bar_time_seconds">Másodpercek kijelzése</string>
     <string name="status_bar_network_speed_refresh_speed">Hálózati sebesség frissítése másodpercekben</string>

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

@@ -35,7 +35,6 @@
     <string name="github_url">Selamat datang lebih banyak developer untuk berpartisipasi dalam pengembangan</string>
     <string name="issues">Umpan Balik/Usulan</string>
     <string name="issues_url">Klik untuk melihat Masalah GitHub</string>
-    <string name="xposeddescription">Alat perubahan untuk MIUI13 (Android 12)</string>
     <string name="status_bar_time_seconds">Tampilkan detik</string>
     <string name="status_bar_network_speed_refresh_speed">Perubahan kecepatan jaringan dalam detik</string>
     <string name="remove_the_maximum_number_of_notification_icons">Hapus jumlah maksimum ikon notifikasi</string>

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

@@ -39,7 +39,7 @@
     <string name="github_url">開発に参加できる開発者を歓迎します</string>
     <string name="issues">ご意見・ご提案</string>
     <string name="issues_url">クリックして GitHub Issues を表示する</string>
-    <string name="xposeddescription">MIUI13 (Android 12) のカスタマイズツール</string>
+    <string name="xposeddescription">MIUI13 (Android 12) 以降向けカスタマイズツール</string>
     <string name="statusbar">ステータスバー</string>
     <string name="status_bar_time_seconds">秒を表示する</string>
     <string name="status_bar_network_speed_refresh_speed">ネットワーク速度を秒単位で更新</string>

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

@@ -38,7 +38,6 @@
     <string name="github_url">개발에 참여하는 더 많은 개발자를 환영합니다</string>
     <string name="issues">피드백 및 제안</string>
     <string name="issues_url">클릭해 GitHub 이슈 보기</string>
-    <string name="xposeddescription">MIUI 13(Android 12) 용 커스텀 도구</string>
     <string name="statusbar">상태 바</string>
     <string name="status_bar_time_seconds">화면 표시 시간</string>
     <string name="status_bar_network_speed_refresh_speed">몇 초에 네트워크 속도 새로 고침</string>

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

@@ -35,7 +35,6 @@
     <string name="github_url">Welkom meer ontwikkelaars om deel te nemen in de ontwikkeling</string>
     <string name="issues">Feedback/Voorstel</string>
     <string name="issues_url">Klik om GitHub Problemen te bekijken</string>
-    <string name="xposeddescription">Aanpassingsgereedschap voor MIUI13(Android 12)</string>
     <string name="statusbar">Statusbalk</string>
     <string name="status_bar_time_seconds">Seconden weergeven</string>
     <string name="status_bar_network_speed_refresh_speed">Netwerksnelheid vernieuwen in seconden</string>

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

@@ -39,7 +39,7 @@
     <string name="github_url">Zachęcam do rozwijania projektu innych deweloperów</string>
     <string name="issues">Opinie/propozycje</string>
     <string name="issues_url">Kliknij, aby wyświetlić zgłoszenia na GitHubie</string>
-    <string name="xposeddescription">Narzędzie do dostosowywania MIUI 13 (Android 12)</string>
+    <string name="xposeddescription">Narzędzie do dostosowywania MIUI 13+ (Android 12+)</string>
     <string name="statusbar">Pasek statusu</string>
     <string name="status_bar_time_seconds">Wyświetlaj sekundy</string>
     <string name="status_bar_network_speed_refresh_speed">Odświeżenie prędkości sieci w sekundach</string>
@@ -136,6 +136,7 @@
     <string name="layout_compatibility_mode">Tryb zgodności</string>
     <string name="left_margin">Lewy margines (0: autom.)</string>
     <string name="right_margin">Prawy margines (0: autom.)</string>
+    <string name="layout_compatibility_mode_summary">Wymuś układ pełnoekranowy (obsługuje wszystkie ekrany o specjalnym kształcie)</string>
     <string name="remove_macro_blacklist">Usuń czarną listę gier, dla których wyłączono obsługę makr</string>
     <string name="hide_network_speed_splitter">Ukryj rozdzielacz prędkości sieci</string>
     <string name="updater">Aktualizacje</string>
@@ -236,4 +237,14 @@
     <string name="pkg_installer_summary">Wyłącz sprawdzanie licznika instalacji aplikacji</string>
     <string name="big_mobile_type_only_show_network_card">Duża ikona typu sieci tylko dla aktywnej karty SIM</string>
     <string name="big_mobile_type_location">Pozycja dużej ikony typu sieci</string>
+    <string name="miuihome_recentview_remove_card_animation">Zmodyfikuj animację oznaczania kart</string>
+    <string name="miuihome_recentview_remove_card_animation_summary">Zmodyfikuj efekt animacji karty usunięcia ostatniego zadania</string>
+    <string name="miuihome_recentwiew_wallpaper_darkening">Wyłącz przyciemnianie tapety</string>
+    <string name="miuihome_recentwiew_wallpaper_darkening_summary">Spowoduje to wyłączenie efektu polegającego na tym, że tapeta stopniowo rozjaśnia się od przyciemnienia podczas wchodzenia i wychodzenia z ostatnich zadań</string>
+    <string name="miuihome_scroll_icon_name">Przewiń nazwę aplikacji</string>
+    <string name="miuihome_scroll_icon_name_summary">Zbyt długa nazwa aplikacji zostanie przewinięta i wyświetlona bez nowego wiersza</string>
+    <string name="miuihome_shortcut_add_small_window">Dodaj widżet \"Menu skrótów\"</string>
+    <string name="miuihome_shortcut_add_small_window_summary">Naciśnij i przytrzymaj ikonę na ekranie głównym, aby dodać okno szybkiego otwierania</string>
+    <string name="miuihome_shortcut_add_small_window_title">Małe okno</string>
+    <string name="click_to_view_use_cases">Kliknij, aby wyświetlić przypadki użycia</string>
 </resources>

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

@@ -38,7 +38,6 @@
     <string name="github_url">Sunt bineveniți mai mulți dezvoltatori să participe la dezvoltare</string>
     <string name="issues">Feedback/Propunere</string>
     <string name="issues_url">Clic pentru a vizualiza problemele pe GitHub</string>
-    <string name="xposeddescription">Instrument de personalizare pentru MIUI13 (Android 12)</string>
     <string name="statusbar">Bară de stare</string>
     <string name="status_bar_time_seconds">Afișare secunde</string>
     <string name="status_bar_network_speed_refresh_speed">Reîmprospătare viteză rețea în secunde</string>

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

@@ -39,7 +39,6 @@
     <string name="github_url">Приглашаем больше разработчиков принять участие в разработке</string>
     <string name="issues">Обратная связь</string>
     <string name="issues_url">Нажмите, чтобы просмотреть обсуждение на GitHub</string>
-    <string name="xposeddescription">Инструмент настройки для MIUI13 (Android 12)</string>
     <string name="statusbar">Строка состояния</string>
     <string name="status_bar_time_seconds">Секунды</string>
     <string name="status_bar_network_speed_refresh_speed">Обновление скорости сети в секундах</string>

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

@@ -39,7 +39,6 @@
     <string name="github_url">Geliştirmeye katılmak için daha fazla geliştiriciye hoş geldiniz</string>
     <string name="issues">Geribildirim/Teklif</string>
     <string name="issues_url">GitHub Sorunlarını görüntülemek için tıklayın</string>
-    <string name="xposeddescription">MIUI13 (Android 12) için özelleştirme aracı</string>
     <string name="statusbar">Durum çubuğu</string>
     <string name="status_bar_time_seconds">Saniye göster</string>
     <string name="status_bar_network_speed_refresh_speed">Saniyeler içinde ağ hızı yenileme</string>

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

@@ -39,7 +39,7 @@
     <string name="github_url">Chào mừng các nhà phát triển tham gia vào quá trình phát triển</string>
     <string name="issues">Phản hồi/Đề xuất</string>
     <string name="issues_url">Ấn để xem GitHub Issues</string>
-    <string name="xposeddescription">Công cụ tuỳ chỉnh hoá MIUI13(Android 12)</string>
+    <string name="xposeddescription">Công cụ tuỳ chỉnh cho MIUI13+(Android 12+)</string>
     <string name="statusbar">Thanh trạng thái</string>
     <string name="status_bar_time_seconds">Hiển thị giây</string>
     <string name="status_bar_network_speed_refresh_speed">Làm mới tốc độ mạng trong vài giây</string>

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

@@ -39,7 +39,7 @@
     <string name="github_url">欢迎更多开发者共同参与开发</string>
     <string name="issues">反馈/提议</string>
     <string name="issues_url">点击查看GitHub Issues</string>
-    <string name="xposeddescription">基于 MIUI13(Android 12) 适配的自定义工具</string>
+    <string name="xposeddescription">基于 MIUI13+(Android 12+) 适配的自定义工具</string>
     <string name="statusbar">状态栏</string>
     <string name="status_bar_time_seconds">显示秒数</string>
     <string name="status_bar_network_speed_refresh_speed">网速秒刷新</string>
@@ -247,4 +247,5 @@
     <string name="miuihome_shortcut_add_small_window_summary">桌面图标长按快捷菜单位置添加快速打开小窗</string>
     <string name="miuihome_shortcut_add_small_window_title">小窗</string>
     <string name="click_to_view_use_cases">点击查看用例</string>
+    <string name="disable_bluetooth_temporarily_off" comment="This function is used to completely close Bluetooth">禁用临时关闭蓝牙</string>
 </resources>

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

@@ -39,7 +39,6 @@
     <string name="github_url">歡迎更多開發者共同參與開發</string>
     <string name="issues">反饋/提議</string>
     <string name="issues_url">點擊查看GitHub Issues</string>
-    <string name="xposeddescription">基於 MIUI13(Android 12) 適配的自定義工具</string>
     <string name="statusbar">狀態欄</string>
     <string name="status_bar_time_seconds">顯示秒數</string>
     <string name="status_bar_network_speed_refresh_speed">網速秒刷新</string>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="performance">效能</string>
+    <string name="performance">性能</string>
     <string name="lock_max_fps">鎖定目前重新整理速率上限</string>
     <string name="ui">介面</string>
     <string name="delete_on_post_notification">移除上層顯示通知</string>
@@ -10,7 +10,7 @@
     <string name="disable_flag_secure_summary">開啟後允許在不允許截圖的軟體中截圖\n支援新增下拉控制中心快速開關，保障安全</string>
     <string name="home">桌面</string>
     <string name="home_time">始終顯示桌面時鐘</string>
-    <string name="reboot_host">重啟所有範圍</string>
+    <string name="reboot_host">重啟所有作用範圍</string>
     <string name="reboot">重啟系統</string>
     <!--Status bar icons-->
     <string name="status_bar_icon">狀態列圖示</string>
@@ -39,11 +39,11 @@
     <string name="github_url">歡迎更多開發人員共同參與開發</string>
     <string name="issues">回饋/提議</string>
     <string name="issues_url">按一下以檢視 GitHub 問題</string>
-    <string name="xposeddescription">基於 MIUI13(Android 12) 適配的自訂工具</string>
+    <string name="xposeddescription">基於 MIUI13+(Android 12+) 的客製化工具</string>
     <string name="statusbar">狀態列</string>
     <string name="status_bar_time_seconds">顯示秒數</string>
     <string name="status_bar_network_speed_refresh_speed">每秒更新即時網路速度</string>
-    <string name="remove_the_maximum_number_of_notification_icons">解除通知圖示數量上限</string>
+    <string name="remove_the_maximum_number_of_notification_icons">移除通知圖示數量上限</string>
     <string name="main_switch">模組主開關</string>
     <string name="hide_gps_icon">隱藏「GPS」圖示</string>
     <string name="hide_status_bar_network_speed_second">隱藏網路速度 (/s) 單位</string>
@@ -76,7 +76,7 @@
     <string name="developer">開發人員</string>
     <string name="thank_list">感謝名單</string>
     <string name="third_party_open_source_statement">第三方開放原始碼聲明</string>
-    <string name="corepacth">解除安裝限制</string>
+    <string name="corepacth">移除安裝限制</string>
     <string name="corepacth_summary">支援降級/不同簽章/無簽章安裝</string>
     <string name="prevent_recovery_of_battery_optimization_white_list">防止復原電池效能最佳化白名單</string>
     <string name="failed_after_restart">系統重啟後仍會還原</string>
@@ -94,7 +94,7 @@
     <string name="remove_lock_screen_camera">移除鎖定螢幕相機功能</string>
     <string name="only_official_default_themes_are_supported">僅支援官方預設主題</string>
     <string name="lock_one_hundred">手機管家鎖定 100 分</string>
-    <string name="scope">範圍</string>
+    <string name="scope">作用範圍</string>
     <string name="scope_android">系統架構</string>
     <string name="scope_systemui">系統 UI</string>
     <string name="scope_miuihome">系統桌面</string>
@@ -102,7 +102,7 @@
     <string name="status_bar_network_speed_refresh_speed_summary">將狀態列網路速度元件的更新間隔變更為 1s</string>
     <string name="hide_battery_percentage_icon_summary">需自行開啟電池百分比外顯功能</string>
     <string name="hide_status_bar_network_speed_second_summary">隱藏狀態列網路速度元件的 (/s) 單位</string>
-    <string name="remove_the_maximum_number_of_notification_icons_summary">解除狀態列最多僅能顯示三條通知的限制</string>
+    <string name="remove_the_maximum_number_of_notification_icons_summary">移除狀態列最多僅能顯示三條通知的限制</string>
     <string name="scope_systemui_summary">自訂系統介面、狀態列、鎖定螢幕等</string>
     <string name="scope_android_summary">首次啟動模組或模組更新後，\n此處的功能需重啟系統後才能生效</string>
     <string name="scope_other_summary">手機管家、相簿編輯、電量與性能等</string>
@@ -127,7 +127,7 @@
     <string name="matters_needing_attention_context">首次啟動或更新後建議重啟手機\n絕大部分功能變更後需要在右上角重啟範圍後生效</string>
     <string name="are_you_sure_reboot">確定重啟系統？</string>
     <string name="cancel">取消</string>
-    <string name="are_you_sure_reboot_scope">確定重啟所有範圍？</string>
+    <string name="are_you_sure_reboot_scope">確定要重啟所有作用範圍？</string>
     <string name="hide_battery_charging_icon">隱藏「充電」圖示</string>
     <string name="hide_wifi_standard_icon">隱藏「WIFI 標準」圖示</string>
     <string name="status_bar_time_center">時間置中</string>
@@ -157,69 +157,69 @@
     <string name="lock_screen_charging_current">充電時顯示目前電流</string>
     <string name="current_current">目前電流</string>
     <string name="remove_open_app_confirmation_popup">移除「開啟應用程式」彈出式視窗</string>
-    <string name="remove_open_app_confirmation_popup_summary">移除 \"XXX 想要打開 XXX\" 的彈出視窗 。</string>
+    <string name="remove_open_app_confirmation_popup_summary">移除「XXX 想要開啟 XXX」的彈出式視窗</string>
-    <string name="hide_volume_icon">隱藏 音量 圖示</string>
+    <string name="hide_volume_icon">隱藏「音量」圖示</string>
-    <string name="hide_zen_icon">隱藏 勿擾 圖示</string>
+    <string name="hide_zen_icon">隱藏「勿擾」圖示</string>
     <string name="hide_icon">隱藏圖示</string>
-    <string name="double_tap_to_sleep">雙擊鎖定螢幕</string>
+    <string name="double_tap_to_sleep">輕觸兩下鎖定螢幕</string>
-    <string name="home_double_tap_to_sleep_summary">雙擊空白位置鎖定螢幕</string>
+    <string name="home_double_tap_to_sleep_summary">輕觸兩下空白位置鎖定螢幕</string>
-    <string name="old_quick_settings_panel">舊快速設定面板</string>
+    <string name="old_quick_settings_panel">舊版快速設定面板</string>
-    <string name="old_qs_custom_switch">自定義行與列</string>
+    <string name="old_qs_custom_switch">自訂行列</string>
-    <string name="qs_custom_columns_unexpanded">列 (未展開)</string>
+    <string name="qs_custom_columns_unexpanded">行 (未展開)</string>
-    <string name="qs_custom_rows">行</string>
+    <string name="qs_custom_rows">列</string>
-    <string name="qs_custom_columns">列</string>
+    <string name="qs_custom_columns">行</string>
-    <string name="qs_custom_rows_horizontal">行 (橫向)</string>
+    <string name="qs_custom_rows_horizontal">列 (橫向)</string>
-    <string name="status_bar_dual_row_network_speed">雙行網路速度</string>
+    <string name="status_bar_dual_row_network_speed">雙列網路速度</string>
-    <string name="status_bar_dual_row_network_speed_summary">上下行網路速度顯示</string>
+    <string name="status_bar_dual_row_network_speed_summary">上下列網路速度顯示</string>
-    <string name="status_bar_network_speed">狀態欄網路速度</string>
+    <string name="status_bar_network_speed">狀態列網路速度</string>
-    <string name="status_bar_network_speed_dual_row_size">雙行大小（0：不更改）</string>
+    <string name="status_bar_network_speed_dual_row_size">雙列大小 (0：無變更)</string>
-    <string name="status_bar_network_speed_dual_row_icon">雙行圖示</string>
+    <string name="status_bar_network_speed_dual_row_icon">雙列圖示</string>
     <string name="none">無</string>
-    <string name="status_bar_network_speed_dual_row_gravity">雙行網速對齊</string>
+    <string name="status_bar_network_speed_dual_row_gravity">雙列對齊</string>
     <string name="left">置左</string>
     <string name="right">置右</string>
-    <string name="big_mobile_type_icon">大行動網路圖示</string>
+    <string name="big_mobile_type_icon">大型行動網路圖示</string>
-    <string name="show_wifi_standard">顯示 Wifi 標準</string>
+    <string name="show_wifi_standard">顯示 WiFi 標準</string>
-    <string name="can_notification_slide">強制允許全部通知可使用小窗</string>
+    <string name="can_notification_slide">強制允許所有通知使用小窗</string>
-    <string name="battery_percentage_font_size">電量百分比字體大小</string>
+    <string name="battery_percentage_font_size">電量百分比字型大小</string>
-    <string name="zero_do_no_change">0：不修改</string>
+    <string name="zero_do_no_change">0：無變更</string>
-    <string name="big_mobile_type_icon_size">大行動網路圖示大小</string>
+    <string name="big_mobile_type_icon_size">大型行動網路圖示大小</string>
-    <string name="big_mobile_type_icon_bold">大行動網路圖示加粗</string>
+    <string name="big_mobile_type_icon_bold">大型行動網路圖示粗體</string>
-    <string name="big_mobile_type_icon_up_and_down_position">大行動網路圖示上下位置</string>
+    <string name="big_mobile_type_icon_up_and_down_position">大型行動網路圖示上下位置</string>
     <string name="input_error">輸入錯誤</string>
     <string name="range">範圍：</string>
-    <string name="big_mobile_type_icon_left_and_right_margins">大行動網路圖示左右邊距</string>
+    <string name="big_mobile_type_icon_left_and_right_margins">大型行動網路圖示左右邊距</string>
-    <string name="cast">接力</string>
+    <string name="cast">投放</string>
-    <string name="force_support_send_app">允許所有應用使用接力</string>
+    <string name="force_support_send_app">強制所有應用程式支援在其他裝置開啟</string>
-    <string name="status_bar_time_double_line_center_align">雙行居中對齊</string>
+    <string name="status_bar_time_double_line_center_align">雙列置中對齊</string>
     <string name="default1">預設值</string>
     <string name="clock_center">時鐘置中</string>
     <string name="clock_right">時鐘置右</string>
-    <string name="status_bar_layout_mode">狀態欄布局模式</string>
+    <string name="status_bar_layout_mode">狀態列版面配置模式</string>
-    <string name="clock_center_and_icon_left">時間居中+圖示置左</string>
+    <string name="clock_center_and_icon_left">時鐘置中 + 圖示置左</string>
     <string name="maximum_number_of_notification_icons">通知圖示最大數量</string>
-    <string name="maximum_number_of_notification_dots">通知點點數量</string>
+    <string name="maximum_number_of_notification_dots">通知圓點最大數量</string>
     <string name="custom_mobile_type_text">自訂行動網路類型文字</string>
     <string name="custom_mobile_type_text_switch">自訂行動網路類型文字開關</string>
-    <string name="downgr">允許降級安裝應用</string>
+    <string name="downgr">允許降級安裝應用程式</string>
-    <string name="downgr_summary">允許在已安裝新版的情況下覆蓋安裝舊版本</string>
+    <string name="downgr_summary">允許在已安裝新版的情況下覆寫為舊版本</string>
-    <string name="authcreak">禁用應用安裝管理器簽名驗證</string>
+    <string name="authcreak">停用安裝程式簽章驗證</string>
-    <string name="authcreak_summary">關閉安裝應用時的簽名驗證，可以安裝被修改的APK</string>
+    <string name="authcreak_summary">關閉安裝應用程式時的簽名驗證，可以安裝被修改的 APK</string>
-    <string name="digestCreak">禁用APK簽名驗證</string>
+    <string name="digestCreak">停用 APK 簽章驗證</string>
-    <string name="digestCreak_summary">允許覆蓋安裝同包名不同簽名的應用</string>
+    <string name="digestCreak_summary">允許安裝套件名稱相同但簽章不同的應用程式</string>
-    <string name="UsePreSig">安裝時始終使用已安裝應用的簽名</string>
+    <string name="UsePreSig">安裝時始終使用已安裝應用程式的簽章</string>
-    <string name="UsePreSig_summary">安裝時始終使用已安裝應用的簽名\n這非常<b>危險</b>\n僅在真正需要時啟用！</string>
+    <string name="UsePreSig_summary">安裝時始終使用已安裝應用程式的簽章\n這非常<b>危險</b>\n僅在真正需要時啟用！</string>
     <string name="enhancedMode">增強模式</string>
-    <string name="enhancedMode_summary">可以解決一些應用內部的完整性較驗，一般不需要開啟</string>
+    <string name="enhancedMode_summary">可以解決一些應用程式內部的完整性驗證，一般不需要開啟</string>
-    <string name="rear_display">後螢幕（11Ultra）</string>
+    <string name="rear_display">後方螢幕 (11 Ultra)</string>
     <string name="lock_screen_clock_display_seconds">時鐘顯示秒數</string>
     <string name="sound">聲音</string>
     <string name="media_volume_steps_switch">媒體音量階數</string>
     <string name="allow_untrusted_touches">允許不受信任的觸控</string>
     <string name="take_effect_after_reboot">重新開機後生效</string>
-    <string name="media_volume_steps_summary">開啟後可能會導致音量條的滾動卡頓或藍牙音量異常</string>
+    <string name="media_volume_steps_summary">開啟後可能會導致音量列捲動卡頓或藍牙音量異常</string>
-    <string name="can_notification_slide_summary">可能無法支援一些使用小米推送(Mi Push)推播的通知</string>
+    <string name="can_notification_slide_summary">可能無法支援一些使用小米推送 (Mi Push) 推播的通知</string>
-    <string name="screen_hole_location">螢幕挖孔位置</string>
+    <string name="screen_hole_location">螢幕凹口位置</string>
     <string name="custom_clock_mode">自訂時鐘模式</string>
     <string name="custom_clock_format_geek">時鐘格式</string>
     <string name="off">關閉</string>
@@ -233,10 +233,10 @@
     <string name="make_millet_more_aggressive_summary">允許 Millet 在背景應用程式有通知、有服務執行、有處理程序執行的狀況下凍結應用程式。\n不希望被凍結的應用程式可將省電策略設為無限制\n啟用前請先解除安裝墓碑和 NoANR 相關模組。</string>
     <string name="make_millet_ignore_active">允許 Millet 凍結使用中的應用程式</string>
     <string name="make_millet_ignore_active_summary">非常積極，可能會影響應用程式執行</string>
-    <string name="pkg_installer">應用包管理組件</string>
+    <string name="pkg_installer">套件安裝程式</string>
-    <string name="pkg_installer_summary">禁用頻繁安裝應用檢查</string>
+    <string name="pkg_installer_summary">停用頻繁應用程式安裝檢查</string>
-    <string name="big_mobile_type_only_show_network_card">大行動網路僅會顯示網路卡</string>
+    <string name="big_mobile_type_only_show_network_card">大型行動網路僅會顯示網路卡</string>
-    <string name="big_mobile_type_location">大行動網路位置</string>
+    <string name="big_mobile_type_location">大型行動網路位置</string>
     <string name="miuihome_recentview_remove_card_animation">修改卡片動畫</string>
     <string name="miuihome_recentview_remove_card_animation_summary">修改在最近任務介面移除卡片的動畫效果</string>
     <string name="miuihome_recentwiew_wallpaper_darkening">停用桌布壓暗</string>
@@ -246,5 +246,5 @@
     <string name="miuihome_shortcut_add_small_window">捷徑選單新增小窗</string>
     <string name="miuihome_shortcut_add_small_window_summary">長按桌面圖示以快速開啟小窗應用程式</string>
     <string name="miuihome_shortcut_add_small_window_title">小窗應用程式</string>
-    <string name="click_to_view_use_cases">按一下以檢視用例</string>
+    <string name="click_to_view_use_cases">按一下以檢視案例</string>
 </resources>

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

@@ -251,4 +251,5 @@
     <string name="miuihome_shortcut_add_small_window_summary">Press and hold the desktop icon to add a quick open window</string>
     <string name="miuihome_shortcut_add_small_window_title">Small window</string>
     <string name="click_to_view_use_cases">Click to view use cases</string>
+    <string name="disable_bluetooth_temporarily_off">Disable bluetooth temporarily off</string>
 </resources>