diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml index cc0b8ea..d797b6b 100644 --- a/.github/workflows/android_build.yml +++ b/.github/workflows/android_build.yml @@ -11,10 +11,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: set up JDK 17 + - name: set up JDK 21 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: gradle diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 97934f6..508d7fe 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -48,7 +48,7 @@ dependencies { } apkMixin { - versionName = "1.5.1" + versionName = "1.5.2" targetApk = "source.apk" useProcessorCountAsThreadCount = project.properties["useProcessorCountAsThreadCount"] == "true" diff --git a/app/mixin/source.apk b/app/mixin/source.apk index 526284b..f94055d 100644 Binary files a/app/mixin/source.apk and b/app/mixin/source.apk differ diff --git "a/app/src/main/java/momoi/mod/qqpro/hook/\347\211\210\346\235\203\344\277\241\346\201\257.kt" "b/app/src/main/java/momoi/mod/qqpro/hook/\347\211\210\346\235\203\344\277\241\346\201\257.kt" index 7090cd6..e5f0c30 100644 --- "a/app/src/main/java/momoi/mod/qqpro/hook/\347\211\210\346\235\203\344\277\241\346\201\257.kt" +++ "b/app/src/main/java/momoi/mod/qqpro/hook/\347\211\210\346\235\203\344\277\241\346\201\257.kt" @@ -9,7 +9,7 @@ import android.widget.TextView import com.tencent.qqnt.watch.selftab.ui.SelfFragment import momoi.anno.mixin.Mixin -const val VERSION_CODE = 11 +const val VERSION_CODE = 12 @Mixin class 版权信息 : SelfFragment() { @@ -22,19 +22,20 @@ class 版权信息 : SelfFragment() { val result = super.Y(inflater, container, savedInstanceState) val tv = result.findViewById(2114521808) tv.text = buildString { - appendLine("QQPro - v1.5.1") + appendLine("QQPro - v1.5.2") appendLine() appendLine("更新日志:") appendLine("优化回复消息溯源") appendLine("更换等级头衔相关内容接口") appendLine("调整管理撤回按钮位置") appendLine("调整等级头衔位置") - appendLine("也许修复卡片消息图片尺寸问题") - appendLine("[有人@我]但是bug有点多,就这样吧") + appendLine("修复卡片消息图片尺寸问题") + appendLine("[有人@我]但是bug有点多") + appendLine("添加无障碍保活服务") appendLine() appendLine("交流群:392106734") - appendLine("2025/06/22") + appendLine("2026/02/28") } return result } -} \ No newline at end of file +} diff --git "a/app/src/main/java/momoi/mod/qqpro/hook/\350\256\276\347\275\256\351\241\265.kt" "b/app/src/main/java/momoi/mod/qqpro/hook/\350\256\276\347\275\256\351\241\265.kt" index 248cb40..6efa260 100644 --- "a/app/src/main/java/momoi/mod/qqpro/hook/\350\256\276\347\275\256\351\241\265.kt" +++ "b/app/src/main/java/momoi/mod/qqpro/hook/\350\256\276\347\275\256\351\241\265.kt" @@ -54,7 +54,7 @@ class 设置页 : SettingsActivity() { ) floatInput( "聊天文本缩放", - "", + "仅影响聊天页", Settings.chatScale ) switch( @@ -85,7 +85,22 @@ class 设置页 : SettingsActivity() { baseEntry(title, desc) { add() .checked(pref.value) - .weight(0.6f) + .apply { + showText = false + + scaleX = 0.85f + scaleY = 0.85f + + setSwitchMinWidth(36.dp) + minimumWidth = 0 + minWidth = 0 + setPadding(0, 0, 0, 0) + + (layoutParams as? LinearLayout.LayoutParams)?.apply { + width = LinearLayout.LayoutParams.WRAP_CONTENT + height = LinearLayout.LayoutParams.WRAP_CONTENT + } + } .doAfterSwitch { pref.value = it } @@ -101,7 +116,18 @@ class 设置页 : SettingsActivity() { .text(pref.value.toString()) .textSize(13f) .textColor(0xFF_FFFFFF) - .weight(1f) + .apply { + (layoutParams as? LinearLayout.LayoutParams)?.apply { + width = 60.dp + height = LinearLayout.LayoutParams.WRAP_CONTENT + } + + setSingleLine(true) + setPadding(8.dp, 6.dp, 8.dp, 6.dp) + + inputType = android.text.InputType.TYPE_CLASS_NUMBER or + android.text.InputType.TYPE_NUMBER_FLAG_DECIMAL + } .doAfterTextChanged { pref.value = it.toString().toFloatOrNull() ?: pref.value } @@ -134,4 +160,4 @@ class 设置页 : SettingsActivity() { content.invoke(this) } } -} \ No newline at end of file +}