Skip to content

Commit 684e3ab

Browse files
fankesfankes
committed
feat: update demo
1 parent 1439953 commit 684e3ab

File tree

14 files changed

+224
-127
lines changed

14 files changed

+224
-127
lines changed

‎samples/demo-app/build.gradle.kts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ dependencies {
4747
implementation(com.highcapable.hikage.hikage.extension)
4848
implementation(com.highcapable.hikage.hikage.widget.androidx)
4949
implementation(com.highcapable.hikage.hikage.widget.material)
50+
implementation(com.highcapable.betterandroid.ui.component)
51+
implementation(com.highcapable.betterandroid.ui.extension)
52+
implementation(com.highcapable.betterandroid.system.extension)
5053
implementation(androidx.core.core.ktx)
5154
implementation(androidx.appcompat.appcompat)
5255
implementation(androidx.lifecycle.lifecycle.viewmodel.ktx)

‎samples/demo-app/src/main/java/com/highcapable/yukihookapi/demo_app/ui/MainActivity.kt‎

Lines changed: 52 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import android.os.Bundle
2727
import android.view.Gravity
2828
import android.widget.LinearLayout
2929
import android.widget.TextView
30-
import androidx.appcompat.app.AppCompatActivity
30+
import com.highcapable.betterandroid.ui.component.activity.AppViewsActivity
3131
import com.highcapable.betterandroid.ui.extension.view.toast
3232
import com.highcapable.betterandroid.ui.extension.view.updateMargins
3333
import com.highcapable.hikage.extension.setContentView
@@ -36,67 +36,82 @@ import com.highcapable.hikage.widget.android.widget.ImageView
3636
import com.highcapable.hikage.widget.android.widget.LinearLayout
3737
import com.highcapable.hikage.widget.android.widget.TextView
3838
import com.highcapable.hikage.widget.androidx.core.widget.NestedScrollView
39+
import com.highcapable.hikage.widget.com.google.android.material.appbar.MaterialToolbar
3940
import com.highcapable.yukihookapi.demo_app.R
4041
import com.highcapable.yukihookapi.demo_app.test.Main
4142
import android.R as Android_R
4243

43-
class MainActivity : AppCompatActivity() {
44+
class MainActivity : AppViewsActivity() {
4445

4546
override fun onCreate(savedInstanceState: Bundle?) {
4647
super.onCreate(savedInstanceState)
4748
val hikage = setContentView {
48-
NestedScrollView(
49-
lparams = LayoutParams(matchParent = true),
49+
LinearLayout(
50+
lparams = LayoutParams(widthMatchParent = true),
5051
init = {
51-
isFillViewport = true
52-
isVerticalScrollBarEnabled = false
52+
orientation = LinearLayout.VERTICAL
5353
}
5454
) {
55-
LinearLayout(
56-
lparams = LayoutParams(widthMatchParent = true) {
57-
updateMargins(vertical = 20.dp)
58-
},
55+
MaterialToolbar(
56+
lparams = LayoutParams(widthMatchParent = true),
5957
init = {
60-
orientation = LinearLayout.VERTICAL
61-
gravity = Gravity.CENTER
58+
title = stringResource(R.string.app_name)
59+
}
60+
)
61+
NestedScrollView(
62+
lparams = LayoutParams(matchParent = true),
63+
init = {
64+
isFillViewport = true
65+
isVerticalScrollBarEnabled = false
66+
isVerticalFadingEdgeEnabled = true
6267
}
6368
) {
64-
ImageView(
65-
lparams = LayoutParams(50.dp, 50.dp) {
66-
bottomMargin = 15.dp
69+
LinearLayout(
70+
lparams = LayoutParams(widthMatchParent = true) {
71+
updateMargins(vertical = 20.dp)
72+
},
73+
init = {
74+
orientation = LinearLayout.VERTICAL
75+
gravity = Gravity.CENTER
6776
}
6877
) {
69-
setImageResource(R.mipmap.ic_face_unhappy)
70-
}
71-
TextView(
72-
lparams = LayoutParams {
73-
bottomMargin = 25.dp
78+
ImageView(
79+
lparams = LayoutParams(50.dp, 50.dp) {
80+
bottomMargin = 15.dp
81+
}
82+
) {
83+
setImageResource(R.mipmap.ic_face_unhappy)
7484
}
75-
) {
76-
text = stringResource(R.string.test_string)
77-
textSize = 17.5f
78-
}
79-
repeat(11) {
8085
TextView(
81-
id = "sample_text_$it",
8286
lparams = LayoutParams {
83-
bottomMargin = 15.dp
87+
bottomMargin = 25.dp
8488
}
8589
) {
8690
text = stringResource(R.string.test_string)
8791
textSize = 17.5f
8892
}
89-
}
90-
ImageView(
91-
lparams = LayoutParams(30.dp, 30.dp) {
92-
bottomMargin = 15.dp
93+
repeat(11) {
94+
TextView(
95+
id = "sample_text_$it",
96+
lparams = LayoutParams {
97+
bottomMargin = 15.dp
98+
}
99+
) {
100+
text = stringResource(R.string.test_string)
101+
textSize = 17.5f
102+
}
103+
}
104+
ImageView(
105+
lparams = LayoutParams(30.dp, 30.dp) {
106+
bottomMargin = 15.dp
107+
}
108+
) {
109+
setImageResource(Android_R.mipmap.sym_def_app_icon)
110+
}
111+
Button {
112+
text = "Click Me!"
113+
setOnClickListener { toast() }
93114
}
94-
) {
95-
setImageResource(Android_R.mipmap.sym_def_app_icon)
96-
}
97-
Button {
98-
text = "Click Me!"
99-
setOnClickListener { toast() }
100115
}
101116
}
102117
}

‎samples/demo-app/src/main/res/values-night/themes.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<resources xmlns:tools="http://schemas.android.com/tools">
22
<!-- Base application theme. -->
3-
<style name="Theme.Default" parent="Theme.Material3.DayNight">
3+
<style name="Theme.Default" parent="Theme.Material3.DayNight.NoActionBar">
44
<!-- Primary brand color. -->
55
<item name="colorPrimary">@color/yuki_theme_color</item>
66
<item name="colorPrimaryVariant">@color/yuki_theme_color</item>

‎samples/demo-app/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<resources>
2-
<string name="app_name">YukiHookDemoApp</string>
2+
<string name="app_name">YukiHook App</string>
33
<string name="test_string">I am feel not good</string>
44
</resources>

‎samples/demo-app/src/main/res/values/themes.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<resources xmlns:tools="http://schemas.android.com/tools">
22
<!-- Base application theme. -->
3-
<style name="Theme.Default" parent="Theme.Material3.DayNight">
3+
<style name="Theme.Default" parent="Theme.Material3.DayNight.NoActionBar">
44
<!-- Primary brand color. -->
55
<item name="colorPrimary">@color/yuki_theme_color</item>
66
<item name="colorPrimaryVariant">@color/yuki_theme_color</item>

‎samples/demo-module/build.gradle.kts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ dependencies {
5353
implementation(com.highcapable.hikage.hikage.extension)
5454
implementation(com.highcapable.hikage.hikage.widget.androidx)
5555
implementation(com.highcapable.hikage.hikage.widget.material)
56+
implementation(com.highcapable.betterandroid.ui.component)
57+
implementation(com.highcapable.betterandroid.ui.extension)
58+
implementation(com.highcapable.betterandroid.system.extension)
5659
implementation(androidx.preference.preference.ktx)
5760
implementation(androidx.core.core.ktx)
5861
implementation(androidx.appcompat.appcompat)

‎samples/demo-module/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050

5151
<activity
5252
android:name=".ui.PreferenceActivity"
53-
android:exported="false" />
53+
android:exported="false"
54+
android:theme="@style/Theme.Default.ActionBar" />
5455
</application>
5556
</manifest>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ package com.highcapable.yukihookapi.demo_module.hook
2525

2626
import android.app.Activity
2727
import android.content.Intent
28-
import android.os.Build
2928
import android.os.Bundle
3029
import android.widget.Button
3130
import com.google.android.material.dialog.MaterialAlertDialogBuilder
31+
import com.highcapable.betterandroid.system.extension.tool.SystemVersion
3232
import com.highcapable.kavaref.KavaRef.Companion.resolve
3333
import com.highcapable.kavaref.extension.ArrayClass
3434
import com.highcapable.yukihookapi.YukiHookAPI
@@ -190,7 +190,7 @@ object HookEntry : IYukiHookXposedInit {
190190
// Register Activity Proxy
191191
// 注册模块 Activity 代理
192192
onAppLifecycle {
193-
onCreate { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) registerModuleAppActivities() }
193+
onCreate { if (SystemVersion.isHighOrEqualsTo(SystemVersion.N)) registerModuleAppActivities() }
194194
}
195195
// Find Class to hook
196196
// 得到需要 Hook 的 Class
@@ -288,7 +288,7 @@ object HookEntry : IYukiHookXposedInit {
288288
.setTitle("Hooked")
289289
.setMessage("I am hook your toast showing!")
290290
.apply {
291-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
291+
if (SystemVersion.isHighOrEqualsTo(SystemVersion.N))
292292
setPositiveButton("START PARASITIC") { _, _ ->
293293
MaterialAlertDialogBuilder(context)
294294
.setTitle("Start Parasitic")

0 commit comments

Comments
 (0)