diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index f5e115d3..53bf3196 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.0-RC1" />
+    <option name="version" value="2.0.0-RC2" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 47f5c28c..ea5aa075 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -27,7 +27,7 @@ android {
         minSdk = 24
         targetSdk = 34
         versionCode = gitCommitCount
-        versionName = "1.2.6-$gitCommitHash"
+        versionName = "1.2.7-$gitCommitHash"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -69,11 +69,11 @@ android {
 }
 
 dependencies {
-    implementation("androidx.core:core-ktx:1.13.0-rc01")
+    implementation("androidx.core:core-ktx:1.13.0")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("androidx.core:core-splashscreen:1.1.0-rc01")
-    implementation("com.google.android.material:material:1.12.0-rc01")
+    implementation("com.google.android.material:material:1.12.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
diff --git a/app/src/main/java/com/xiaoniu/qqversionlist/ui/MainActivity.kt b/app/src/main/java/com/xiaoniu/qqversionlist/ui/MainActivity.kt
index a395b8fa..782c84ee 100644
--- a/app/src/main/java/com/xiaoniu/qqversionlist/ui/MainActivity.kt
+++ b/app/src/main/java/com/xiaoniu/qqversionlist/ui/MainActivity.kt
@@ -174,10 +174,8 @@ class MainActivity : AppCompatActivity() {
 
         //这里的“getInt: userAgreement”的值代表着用户协议修订版本，后续更新协议版本后也需要在下面一行把“judgeUARead”+1，以此类推
         val judgeUARead = 1
-        if (DataStoreUtil.getInt("userAgreement", 0) != judgeUARead)
-            showUADialog(false)
-        else
-            getData()
+        if (DataStoreUtil.getInt("userAgreement", 0) != judgeUARead) showUADialog(false)
+        else getData()
 
         // 进度条动画
         // https://github.com/material-components/material-components-android/blob/master/docs/components/ProgressIndicator.md
@@ -204,14 +202,13 @@ class MainActivity : AppCompatActivity() {
                 }
 
                 R.id.btn_about -> {
-                    val message =
-                        SpannableString(
-                            "QQ 版本列表实用工具 for Android\n\n" +
-                                    "作者：快乐小牛、有鲫雪狐\n\n" +
-                                    "版本：${BuildConfig.VERSION_NAME}(${BuildConfig.VERSION_CODE})\n\n" +
-                                    "Since 2023.8.9\n\nLicensed under AGPL v3\n\n" +
-                                    "开源地址"
-                        )
+                    val message = SpannableString(
+                        "QQ 版本列表实用工具 for Android\n\n" +
+                                "作者：快乐小牛、有鲫雪狐\n\n" +
+                                "版本：${BuildConfig.VERSION_NAME}(${BuildConfig.VERSION_CODE})\n\n" +
+                                "Since 2023.8.9\n\nLicensed under AGPL v3\n\n" +
+                                "开源地址"
+                    )
                     val urlSpan = URLSpan("https://github.com/klxiaoniu/QQVersionList")
                     message.setSpan(
                         urlSpan,
@@ -226,7 +223,9 @@ class MainActivity : AppCompatActivity() {
                         .setPositiveButton("确定", null)
                         .setNegativeButton("撤回同意用户协议") { _, _ ->
                             showUADialog(true)
-                        }.show().apply {
+                        }
+                        .show()
+                        .apply {
                             findViewById<TextView>(android.R.id.message)?.movementMethod =
                                 LinkMovementMethodCompat.getInstance()
                         }
@@ -260,10 +259,9 @@ class MainActivity : AppCompatActivity() {
                         switchDisplayFirst.setOnCheckedChangeListener { _, isChecked ->
                             DataStoreUtil.putBooleanAsync("displayFirst", isChecked)
                             qqVersion = qqVersion.mapIndexed { index, qqVersionBean ->
-                                if (index == 0)
-                                    qqVersionBean.copy(
-                                        displayType = if (isChecked) 1 else 0
-                                    )
+                                if (index == 0) qqVersionBean.copy(
+                                    displayType = if (isChecked) 1 else 0
+                                )
                                 else qqVersionBean
                             }
                             versionAdapter.submitList(qqVersion)
@@ -301,11 +299,69 @@ class MainActivity : AppCompatActivity() {
                                 }
                             }
 
-                            val dialogSuffix = MaterialAlertDialogBuilder(this@MainActivity)
-                                .setTitle("自定义猜版后缀")
-                                .setIcon(R.drawable.settings_line)
-                                .setView(dialogSuffixDefine.root)
-                                .show()
+                            val dialogSuffix =
+                                MaterialAlertDialogBuilder(this@MainActivity)
+                                    .setTitle("猜版后缀设置")
+                                    .setIcon(R.drawable.settings_line)
+                                    .setView(dialogSuffixDefine.root)
+                                    .create()
+
+                            val screenHeight = Resources.getSystem().displayMetrics.heightPixels
+
+                            val constraintSet = ConstraintSet()
+                            constraintSet.clone(dialogSuffixDefine.dialogSuffixDefineContainer)
+
+                            // 屏幕方向判断，不同方向分别设置相应的约束布局滚动列表子项高度
+                            val currentConfig = resources.configuration
+                            if (currentConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) constraintSet.constrainHeight(
+                                R.id.suffix_define_check_group_all, screenHeight / 6
+                            )
+                            else if (currentConfig.orientation == Configuration.ORIENTATION_PORTRAIT) constraintSet.constrainHeight(
+                                R.id.suffix_define_check_group_all, screenHeight / 3
+                            )
+
+                            constraintSet.applyTo(dialogSuffixDefine.dialogSuffixDefineContainer)
+
+                            dialogSuffixDefine.suffixDefineCheckbox64hb.isChecked =
+                                DataStoreUtil.getBoolean("suffix64HB", true)
+                            dialogSuffixDefine.suffixDefineCheckboxHb64.isChecked =
+                                DataStoreUtil.getBoolean("suffixHB64", true)
+                            dialogSuffixDefine.suffixDefineCheckbox64hb1.isChecked =
+                                DataStoreUtil.getBoolean("suffix64HB1", true)
+                            dialogSuffixDefine.suffixDefineCheckboxHb164.isChecked =
+                                DataStoreUtil.getBoolean("suffixHB164", true)
+                            dialogSuffixDefine.suffixDefineCheckbox64hb2.isChecked =
+                                DataStoreUtil.getBoolean("suffix64HB2", true)
+                            dialogSuffixDefine.suffixDefineCheckboxHb264.isChecked =
+                                DataStoreUtil.getBoolean("suffixHB264", true)
+                            dialogSuffixDefine.suffixDefineCheckbox64hb3.isChecked =
+                                DataStoreUtil.getBoolean("suffix64HB3", true)
+                            dialogSuffixDefine.suffixDefineCheckboxHb364.isChecked =
+                                DataStoreUtil.getBoolean("suffixHB364", true)
+
+                            dialogSuffixDefine.suffixDefineCheckbox64hd.isChecked =
+                                DataStoreUtil.getBoolean("suffix64HD", true)
+                            dialogSuffixDefine.suffixDefineCheckboxHd64.isChecked =
+                                DataStoreUtil.getBoolean("suffixHD64", true)
+                            dialogSuffixDefine.suffixDefineCheckbox64hd1.isChecked =
+                                DataStoreUtil.getBoolean("suffix64HD1", true)
+                            dialogSuffixDefine.suffixDefineCheckboxHd164.isChecked =
+                                DataStoreUtil.getBoolean("suffixHD164", true)
+                            dialogSuffixDefine.suffixDefineCheckbox64hd2.isChecked =
+                                DataStoreUtil.getBoolean("suffix64HD2", true)
+                            dialogSuffixDefine.suffixDefineCheckboxHd264.isChecked =
+                                DataStoreUtil.getBoolean("suffixHD264", true)
+                            dialogSuffixDefine.suffixDefineCheckbox64hd3.isChecked =
+                                DataStoreUtil.getBoolean("suffix64HD3", true)
+                            dialogSuffixDefine.suffixDefineCheckboxHd364.isChecked =
+                                DataStoreUtil.getBoolean("suffixHD364", true)
+
+                            dialogSuffixDefine.suffixDefineCheckbox64hd1hb.isChecked =
+                                DataStoreUtil.getBoolean("suffix64HD1HB", true)
+                            dialogSuffixDefine.suffixDefineCheckboxHd1hb64.isChecked =
+                                DataStoreUtil.getBoolean("suffixHD1HB64", true)
+
+                            dialogSuffix.show()
 
                             dialogSuffixDefine.settingSuffixDefine.editText?.setText(
                                 DataStoreUtil.getString("suffixDefine", "")
@@ -315,6 +371,82 @@ class MainActivity : AppCompatActivity() {
                                 val suffixDefine =
                                     dialogSuffixDefine.settingSuffixDefine.editText?.text.toString()
                                 DataStoreUtil.putStringAsync("suffixDefine", suffixDefine)
+
+                                DataStoreUtil.putBooleanAsync(
+                                    "suffix64HB",
+                                    dialogSuffixDefine.suffixDefineCheckbox64hb.isChecked
+                                )
+                                DataStoreUtil.putBooleanAsync(
+                                    "suffixHB64",
+                                    dialogSuffixDefine.suffixDefineCheckboxHb64.isChecked
+                                )
+                                DataStoreUtil.putBooleanAsync(
+                                    "suffix64HB1",
+                                    dialogSuffixDefine.suffixDefineCheckbox64hb1.isChecked
+                                )
+                                DataStoreUtil.putBooleanAsync(
+                                    "suffixHB164",
+                                    dialogSuffixDefine.suffixDefineCheckboxHb164.isChecked
+                                )
+                                DataStoreUtil.putBooleanAsync(
+                                    "suffix64HB2",
+                                    dialogSuffixDefine.suffixDefineCheckbox64hb2.isChecked
+                                )
+                                DataStoreUtil.putBooleanAsync(
+                                    "suffixHB264",
+                                    dialogSuffixDefine.suffixDefineCheckboxHb264.isChecked
+                                )
+                                DataStoreUtil.putBooleanAsync(
+                                    "suffix64HB3",
+                                    dialogSuffixDefine.suffixDefineCheckbox64hb3.isChecked
+                                )
+                                DataStoreUtil.putBooleanAsync(
+                                    "suffixHB364",
+                                    dialogSuffixDefine.suffixDefineCheckboxHb364.isChecked
+                                )
+
+                                DataStoreUtil.putBooleanAsync(
+                                    "suffix64HD",
+                                    dialogSuffixDefine.suffixDefineCheckbox64hd.isChecked
+                                )
+                                DataStoreUtil.putBooleanAsync(
+                                    "suffixHD64",
+                                    dialogSuffixDefine.suffixDefineCheckboxHd64.isChecked
+                                )
+                                DataStoreUtil.putBooleanAsync(
+                                    "suffix64HD1",
+                                    dialogSuffixDefine.suffixDefineCheckbox64hd1.isChecked
+                                )
+                                DataStoreUtil.putBooleanAsync(
+                                    "suffixHD164",
+                                    dialogSuffixDefine.suffixDefineCheckboxHd164.isChecked
+                                )
+                                DataStoreUtil.putBooleanAsync(
+                                    "suffix64HD2",
+                                    dialogSuffixDefine.suffixDefineCheckbox64hd2.isChecked
+                                )
+                                DataStoreUtil.putBooleanAsync(
+                                    "suffixHD264",
+                                    dialogSuffixDefine.suffixDefineCheckboxHd264.isChecked
+                                )
+                                DataStoreUtil.putBooleanAsync(
+                                    "suffix64HD3",
+                                    dialogSuffixDefine.suffixDefineCheckbox64hd3.isChecked
+                                )
+                                DataStoreUtil.putBooleanAsync(
+                                    "suffixHD364",
+                                    dialogSuffixDefine.suffixDefineCheckboxHd364.isChecked
+                                )
+
+                                DataStoreUtil.putBooleanAsync(
+                                    "suffixHD1HB64",
+                                    dialogSuffixDefine.suffixDefineCheckboxHd1hb64.isChecked
+                                )
+                                DataStoreUtil.putBooleanAsync(
+                                    "suffix64HD1HB",
+                                    dialogSuffixDefine.suffixDefineCheckbox64hd1hb.isChecked
+                                )
+
                                 showToast("已保存")
                                 dialogSuffix.dismiss()
                             }
@@ -332,8 +464,10 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-        if (intent.action == "android.intent.action.VIEW"
-            && DataStoreUtil.getInt("userAgreement", 0) == judgeUARead
+        if (intent.action == "android.intent.action.VIEW" && DataStoreUtil.getInt(
+                "userAgreement",
+                0
+            ) == judgeUARead
         ) {
             showGuessVersionDialog()
         }
@@ -446,8 +580,7 @@ class MainActivity : AppCompatActivity() {
             try {
                 val okHttpClient = OkHttpClient()
                 val request =
-                    Request.Builder().url("https://im.qq.com/rainbow/androidQQVersionList")
-                        .build()
+                    Request.Builder().url("https://im.qq.com/rainbow/androidQQVersionList").build()
                 val response = okHttpClient.newCall(request).execute()
                 val responseData = response.body?.string()
                 if (responseData != null) {
@@ -464,8 +597,7 @@ class MainActivity : AppCompatActivity() {
                             this.isShowProgressSize = isShowProgressSize
                         }
                     }
-                    if (DataStoreUtil.getBoolean("displayFirst", true))
-                        qqVersion[0].displayType = 1
+                    if (DataStoreUtil.getBoolean("displayFirst", true)) qqVersion[0].displayType = 1
                     withContext(Dispatchers.Main) {
                         versionAdapter.submitList(qqVersion)
                         // 舍弃 currentQQVersion = qqVersion.first().versionNumber
@@ -541,8 +673,96 @@ class MainActivity : AppCompatActivity() {
             var vSmall = versionSmall
             val defineSuf = DataStoreUtil.getString("suffixDefine", "")
             val defineSufList = defineSuf.split(", ")
-            val stListPre = listOf(
-                "_64",
+            val suf64hb =
+                if (DataStoreUtil.getBoolean("suffix64HB", true)) listOf("_64_HB") else emptyList()
+            val sufHb64 =
+                if (DataStoreUtil.getBoolean("suffixHB64", true)) listOf("_HB_64") else emptyList()
+            val suf64hb1 = if (DataStoreUtil.getBoolean(
+                    "suffix64HB1", true
+                )
+            ) listOf("_64_HB1") else emptyList()
+            val sufHb164 = if (DataStoreUtil.getBoolean(
+                    "suffixHB164", true
+                )
+            ) listOf("_HB1_64") else emptyList()
+            val suf64hb2 = if (DataStoreUtil.getBoolean(
+                    "suffix64HB2", true
+                )
+            ) listOf("_64_HB2") else emptyList()
+            val sufHb264 = if (DataStoreUtil.getBoolean(
+                    "suffixHB264", true
+                )
+            ) listOf("_HB2_64") else emptyList()
+            val suf64hb3 = if (DataStoreUtil.getBoolean(
+                    "suffix64HB3", true
+                )
+            ) listOf("_64_HB3") else emptyList()
+            val sufHb364 = if (DataStoreUtil.getBoolean(
+                    "suffixHB364", true
+                )
+            ) listOf("_HB3_64") else emptyList()
+            val suf64hd =
+                if (DataStoreUtil.getBoolean("suffix64HD", true)) listOf("_64_HD") else emptyList()
+            val sufHd64 =
+                if (DataStoreUtil.getBoolean("suffixHD64", true)) listOf("_HD_64") else emptyList()
+            val suf64hd1 = if (DataStoreUtil.getBoolean(
+                    "suffix64HD1", true
+                )
+            ) listOf("_64_HD1") else emptyList()
+            val sufHd164 = if (DataStoreUtil.getBoolean(
+                    "suffixHD164", true
+                )
+            ) listOf("_HD1_64") else emptyList()
+            val suf64hd2 = if (DataStoreUtil.getBoolean(
+                    "suffix64HD2", true
+                )
+            ) listOf("_64_HD2") else emptyList()
+            val sufHd264 = if (DataStoreUtil.getBoolean(
+                    "suffixHD264", true
+                )
+            ) listOf("_HD2_64") else emptyList()
+            val suf64hd3 = if (DataStoreUtil.getBoolean(
+                    "suffix64HD3",
+                    true
+                )
+            ) listOf("_64_HD3") else emptyList()
+            val sufHd364 = if (DataStoreUtil.getBoolean(
+                    "suffixHD364",
+                    true
+                )
+            ) listOf("_HD3_64") else emptyList()
+            val suf64hd1hb = if (DataStoreUtil.getBoolean(
+                    "suffix64HD1HB",
+                    true
+                )
+            ) listOf("_64_HD1HB") else emptyList()
+            val sufHd1hb64 = if (DataStoreUtil.getBoolean(
+                    "suffixHD1HB64", true
+                )
+            ) listOf("_HD1HB_64") else emptyList()
+
+            val stListPre = listOf("_64") + arrayListOf(
+                suf64hb,
+                suf64hb1,
+                suf64hb2,
+                suf64hb3,
+                suf64hd,
+                suf64hd1,
+                suf64hd2,
+                suf64hd3,
+                suf64hd1hb,
+                sufHb64,
+                sufHb164,
+                sufHb264,
+                sufHb364,
+                sufHd64,
+                sufHd164,
+                sufHd264,
+                sufHd364,
+                sufHd1hb64
+            ).flatten()
+
+            /*
                 "_64_HB",
                 "_64_HB1",
                 "_64_HB2",
@@ -561,7 +781,7 @@ class MainActivity : AppCompatActivity() {
                 "_HD2_64",
                 "_HD3_64",
                 "_HD1HB_64"
-            )
+             */
             val stList = if (defineSufList != listOf("")) stListPre + defineSufList else stListPre
             try {
                 var sIndex = 0
@@ -570,15 +790,13 @@ class MainActivity : AppCompatActivity() {
                         STATUS_ONGOING -> {
                             if (mode == MODE_TEST) {
                                 if (link == "" || !DataStoreUtil.getBoolean(
-                                        "guessTestExtend",
-                                        false
+                                        "guessTestExtend", false
                                     )
                                 ) {
                                     link =
                                         "https://downv6.qq.com/qqweb/QQ_1/android_apk/Android_$versionBig.${vSmall}${stList[sIndex]}.apk"
                                     if (DataStoreUtil.getBoolean(
-                                            "guessTestExtend",
-                                            false
+                                            "guessTestExtend", false
                                         )
                                     ) sIndex += 1
                                 } else if (DataStoreUtil.getBoolean("guessTestExtend", false)) {
@@ -635,18 +853,19 @@ class MainActivity : AppCompatActivity() {
                                             }
                                         }
 
-                                        val successMaterialDialog = MaterialAlertDialogBuilder(this)
-                                            .setTitle("猜测成功")
-                                            .setMessage("下载地址：$link")
-                                            .setIcon(R.drawable.check_circle)
-                                            .setView(successButtonBinding.root)
-                                            .setCancelable(false)
-                                            .apply {
-                                                if (appSize != "Error" && appSize != "-0.00" && appSize != "0.00") setMessage(
-                                                    "下载地址：$link\n\n大小：$appSize MB"
-                                                )
-                                                else setMessage("下载地址：$link")
-                                            }.show()
+                                        val successMaterialDialog =
+                                            MaterialAlertDialogBuilder(this)
+                                                .setTitle("猜测成功")
+                                                .setMessage("下载地址：$link")
+                                                .setIcon(R.drawable.check_circle)
+                                                .setView(successButtonBinding.root)
+                                                .setCancelable(false)
+                                                .apply {
+                                                    if (appSize != "Error" && appSize != "-0.00" && appSize != "0.00") setMessage(
+                                                        "下载地址：$link\n\n大小：$appSize MB"
+                                                    )
+                                                    else setMessage("下载地址：$link")
+                                                }.show()
 
 
                                         // 复制并停止按钮点击事件
@@ -660,19 +879,16 @@ class MainActivity : AppCompatActivity() {
                                         successButtonBinding.btnContinue.setOnClickListener {
                                             // 测试版情况下，未打开扩展猜版或扩展猜版到最后一步时执行小版本号的递增
                                             if (mode == MODE_TEST && (!DataStoreUtil.getBoolean(
-                                                    "guessTestExtend",
-                                                    false
+                                                    "guessTestExtend", false
                                                 ) || sIndex == (stList.size))
                                             ) {
                                                 vSmall += if (!DataStoreUtil.getBoolean(
-                                                        "guessNot5",
-                                                        false
+                                                        "guessNot5", false
                                                     )
                                                 ) 5 else 1
                                                 sIndex = 0
                                             } else if (mode == MODE_UNOFFICIAL) vSmall += if (!DataStoreUtil.getBoolean(
-                                                    "guessNot5",
-                                                    false
+                                                    "guessNot5", false
                                                 )
                                             ) 5 else 1
                                             successMaterialDialog.dismiss()
@@ -734,19 +950,16 @@ class MainActivity : AppCompatActivity() {
                                 }
                             } else {
                                 if (mode == MODE_TEST && (!DataStoreUtil.getBoolean(
-                                        "guessTestExtend",
-                                        false
+                                        "guessTestExtend", false
                                     ) || sIndex == (stList.size)) // 测试版情况下，未打开扩展猜版或扩展猜版到最后一步时执行小版本号的递增
                                 ) {
                                     vSmall += if (!DataStoreUtil.getBoolean(
-                                            "guessNot5",
-                                            false
+                                            "guessNot5", false
                                         )
                                     ) 5 else 1
                                     sIndex = 0
                                 } else if (mode == MODE_UNOFFICIAL) vSmall += if (!DataStoreUtil.getBoolean(
-                                        "guessNot5",
-                                        false
+                                        "guessNot5", false
                                     )
                                 ) 5 else 1
                             }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a1e744a0..04adf997 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -78,6 +78,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="猜版"
+        android:minWidth="0dp"
         app:icon="@drawable/search_line"
         app:layout_anchor="@id/bottomAppBar"
         app:removeEmbeddedFabElevation="true" />
diff --git a/app/src/main/res/layout/dialog_setting.xml b/app/src/main/res/layout/dialog_setting.xml
index c8f30c27..6252f474 100644
--- a/app/src/main/res/layout/dialog_setting.xml
+++ b/app/src/main/res/layout/dialog_setting.xml
@@ -56,7 +56,7 @@
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:text="扩展猜版测试版直链格式" />
+        android:text="扩展测试版猜版直链格式" />
 
     <TextView
         android:id="@+id/dialog_suffix_define_click"
@@ -64,7 +64,7 @@
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:text="自定义猜版后缀"
+        android:text="猜版后缀设置"
         android:textColor="?attr/colorOnSurface"
         android:drawablePadding="8dp"
         app:drawableEndCompat="@drawable/arrow_right_s_line"
diff --git a/app/src/main/res/layout/dialog_suffix_define.xml b/app/src/main/res/layout/dialog_suffix_define.xml
index c2d8bf83..12567fc6 100644
--- a/app/src/main/res/layout/dialog_suffix_define.xml
+++ b/app/src/main/res/layout/dialog_suffix_define.xml
@@ -1,10 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+    QQ Version Tool for Android™
+    Copyright (C) 2023 klxiaoniu
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/dialog_suffix_define_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="12dp"
     android:paddingStart="20dp"
+    android:paddingTop="12dp"
     android:paddingEnd="20dp"
     android:paddingBottom="20dp">
 
@@ -26,15 +43,274 @@
             android:singleLine="true" />
     </com.google.android.material.textfield.TextInputLayout>
 
+    <LinearLayout
+        android:id="@+id/suffix_define_check_group_all"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/suffix_define_button_group"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/setting_suffix_define">
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scrollbarStyle="insideOverlay">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:id="@+id/suffix_define_checkbox_group1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="2"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/setting_suffix_define">
+
+                    <CheckBox
+                        android:id="@+id/suffix_define_checkbox_64hb"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="_64_HB" />
+
+                    <CheckBox
+                        android:id="@+id/suffix_define_checkbox_hb64"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="_HB_64" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/suffix_define_checkbox_group2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="2"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/suffix_define_checkbox_group1">
+
+                    <CheckBox
+                        android:id="@+id/suffix_define_checkbox_64hb1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="_64_HB1" />
+
+                    <CheckBox
+                        android:id="@+id/suffix_define_checkbox_hb164"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="_HB1_64" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/suffix_define_checkbox_group3"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="2"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/suffix_define_checkbox_group2">
+
+                    <CheckBox
+                        android:id="@+id/suffix_define_checkbox_64hb2"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="_64_HB2" />
+
+                    <CheckBox
+                        android:id="@+id/suffix_define_checkbox_hb264"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="_HB2_64" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/suffix_define_checkbox_group4"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="2"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/suffix_define_checkbox_group3">
+
+                    <CheckBox
+                        android:id="@+id/suffix_define_checkbox_64hb3"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="_64_HB3" />
+
+                    <CheckBox
+                        android:id="@+id/suffix_define_checkbox_hb364"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="_HB3_64" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/suffix_define_checkbox_group5"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="2"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/suffix_define_checkbox_group4">
+
+                    <CheckBox
+                        android:id="@+id/suffix_define_checkbox_64hd"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="_64_HD" />
+
+                    <CheckBox
+                        android:id="@+id/suffix_define_checkbox_hd64"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="_HD_64" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/suffix_define_checkbox_group6"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="2"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/suffix_define_checkbox_group5">
+
+                    <CheckBox
+                        android:id="@+id/suffix_define_checkbox_64hd1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="_64_HD1" />
+
+                    <CheckBox
+                        android:id="@+id/suffix_define_checkbox_hd164"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="_HD1_64" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/suffix_define_checkbox_group7"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="2"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/suffix_define_checkbox_group6">
+
+                    <CheckBox
+                        android:id="@+id/suffix_define_checkbox_64hd2"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="_64_HD2" />
+
+                    <CheckBox
+                        android:id="@+id/suffix_define_checkbox_hd264"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="_HD2_64" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/suffix_define_checkbox_group8"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="2"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/suffix_define_checkbox_group7">
+
+                    <CheckBox
+                        android:id="@+id/suffix_define_checkbox_64hd3"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="_64_HD3" />
+
+                    <CheckBox
+                        android:id="@+id/suffix_define_checkbox_hd364"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="_HD3_64" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/suffix_define_checkbox_group9"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="2"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/suffix_define_checkbox_group8">
+
+                    <CheckBox
+                        android:id="@+id/suffix_define_checkbox_64hd1hb"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="_64_HD1HB" />
+
+                    <CheckBox
+                        android:id="@+id/suffix_define_checkbox_hd1hb64"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="_HD1HB_64" />
+
+                </LinearLayout>
+            </LinearLayout>
+
+        </ScrollView>
+    </LinearLayout>
+
 
     <LinearLayout
+        android:id="@+id/suffix_define_button_group"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:weightSum="2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/setting_suffix_define">
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/suffix_define_check_group_all">
 
         <Button
             android:id="@+id/btn_suffix_cancel"
diff --git a/build.gradle.kts b/build.gradle.kts
index 916111f3..4df55d5d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.3.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.0.0-RC1" apply false
+    id("com.android.application") version "8.4.0" apply false
+    id("org.jetbrains.kotlin.android") version "2.0.0-RC2" apply false
 }
\ No newline at end of file