Update demo

demo-module/build.gradle

@@ -50,6 +50,7 @@ android {
     buildFeatures {
         viewBinding true
     }
+    aaptOptions.additionalParameters '--allow-reserved-package-id', '--package-id', '0x64'
 }
 
 dependencies {

demo-module/src/main/java/com/highcapable/yukihookapi/demo_module/hook/HookEntry.kt

@@ -30,12 +30,14 @@
 package com.highcapable.yukihookapi.demo_module.hook
 
 import android.app.Activity
-import android.app.AlertDialog
 import android.widget.Button
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.highcapable.yukihookapi.YukiHookAPI
 import com.highcapable.yukihookapi.annotation.xposed.InjectYukiHookWithXposed
 import com.highcapable.yukihookapi.demo_module.R
 import com.highcapable.yukihookapi.demo_module.data.DataConst
+import com.highcapable.yukihookapi.demo_module.hook.factory.compatStyle
+import com.highcapable.yukihookapi.hook.factory.applyTheme
 import com.highcapable.yukihookapi.hook.type.android.ActivityClass
 import com.highcapable.yukihookapi.hook.type.android.BundleClass
 import com.highcapable.yukihookapi.hook.type.java.StringArrayClass
@@ -155,7 +157,7 @@ class HookEntry : IYukiHookXposedInit {
                         // 在执行方法之后拦截
                         afterHook {
                             if (prefs.getBoolean("show_dialog_when_demo_app_opend"))
-                                AlertDialog.Builder(instance())
+                                MaterialAlertDialogBuilder(instance<Activity>().applyTheme(R.style.Theme_Default))
                                     .setTitle("Hooked")
                                     .setMessage(
                                         "This App has been hooked!\n\n" +
@@ -164,7 +166,7 @@ class HookEntry : IYukiHookXposedInit {
                                                 "Support Resources Hook: ${YukiHookAPI.Status.isSupportResourcesHook}"
                                     )
                                     .setPositiveButton("OK", null)
-                                    .show()
+                                    .show().compatStyle()
                         }
                     }
                     // 注入要 Hook 的方法
@@ -202,7 +204,7 @@ class HookEntry : IYukiHookXposedInit {
                         }
                         // 拦截整个方法
                         replaceUnit {
-                            AlertDialog.Builder(instance())
+                            MaterialAlertDialogBuilder(instance<Activity>().applyTheme(R.style.Theme_Default))
                                 .setTitle("Hooked")
                                 .setMessage("I am hook your toast showing!")
                                 .setPositiveButton("OK", null)
@@ -210,7 +212,7 @@ class HookEntry : IYukiHookXposedInit {
                                     dataChannel.put(DataConst.TEST_CN_DATA, value = "I am host, can you hear me?")
                                 }.setNeutralButton("REMOVE HOOK") { _, _ ->
                                     removeSelf()
-                                }.show()
+                                }.show().compatStyle()
                         }
                     }
                     // 注入要 Hook 的方法

demo-module/src/main/java/com/highcapable/yukihookapi/demo_module/hook/factory/ComponentCompatFactory.kt

@@ -0,0 +1,58 @@
+/*
+ * YukiHookAPI - An efficient Kotlin version of the Xposed Hook API.
+ * Copyright (C) 2019-2022 HighCapable
+ * https://github.com/fankes/YukiHookAPI
+ *
+ * MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * This file is Created by fankes on 2022/8/16.
+ */
+package com.highcapable.yukihookapi.demo_module.hook.factory
+
+import android.graphics.drawable.Drawable
+import android.util.TypedValue
+import android.widget.Button
+import androidx.appcompat.app.AlertDialog
+import com.highcapable.yukihookapi.hook.factory.current
+
+/**
+ * 修复 [AlertDialog] 对话框按钮在一些宿主中注入模块资源后会发生问题
+ *
+ * 通过反射重新设置按钮的文字颜色和背景 [Drawable]
+ * @return [AlertDialog]
+ */
+fun AlertDialog.compatStyle(): AlertDialog {
+    current().field { name = "mAlert" }.current {
+        arrayOf(
+            field { name = "mButtonPositive" }.cast<Button>(),
+            field { name = "mButtonNegative" }.cast<Button>(),
+            field { name = "mButtonNeutral" }.cast<Button>()
+        ).forEach {
+            it?.setBackgroundResource(TypedValue().apply {
+                context.theme.resolveAttribute(android.R.attr.selectableItemBackground, this, true)
+            }.resourceId)
+            it?.setTextColor(TypedValue().apply {
+                context.theme.resolveAttribute(android.R.attr.colorPrimary, this, true)
+            }.data)
+        }
+    }
+    return this
+}