diff --git a/app/build.gradle b/app/build.gradle index 1806c79f9..0589353f9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -89,14 +89,6 @@ android { applicationId "io.legado.play" manifestPlaceholders = [APP_CHANNEL_VALUE: "google"] } - cronet { - dimension "mode" - applicationId "io.legado.cronet" - manifestPlaceholders = [APP_CHANNEL_VALUE: "cronet"] - ndk { - abiFilters 'arm64-v8a','armeabi-v7a','x86_64','x86' - } - } } compileOptions { // Flag to enable support for the new language APIs @@ -190,8 +182,7 @@ dependencies { //网络 implementation('com.squareup.okhttp3:okhttp:4.9.1') - compileOnly(fileTree(dir: 'cronetlib', include: ['*.jar', '*.aar'])) - cronetImplementation(fileTree(dir: 'cronetlib', include: ['*.jar', '*.aar'])) + implementation(fileTree(dir: 'cronetlib', include: ['*.jar', '*.aar'])) //Glide implementation('com.github.bumptech.glide:glide:4.12.0') diff --git a/app/src/main/java/io/legado/app/base/BaseActivity.kt b/app/src/main/java/io/legado/app/base/BaseActivity.kt index 8f4105882..88f2ee150 100644 --- a/app/src/main/java/io/legado/app/base/BaseActivity.kt +++ b/app/src/main/java/io/legado/app/base/BaseActivity.kt @@ -15,7 +15,6 @@ import androidx.viewbinding.ViewBinding import io.legado.app.App import io.legado.app.R import io.legado.app.constant.AppConst -import io.legado.app.constant.PreferKey import io.legado.app.constant.Theme import io.legado.app.help.AppConfig import io.legado.app.help.ThemeConfig @@ -67,26 +66,6 @@ abstract class BaseActivity( } override fun onCreate(savedInstanceState: Bundle?) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && - getPrefBoolean(PreferKey.highBrush) - ) { - /** - * 添加高刷新率支持 - */ - // 获取系统window支持的模式 - @Suppress("DEPRECATION") - val modes = window.windowManager.defaultDisplay.supportedModes - // 对获取的模式,基于刷新率的大小进行排序,从小到大排序 - modes.sortBy { - it.refreshRate - } - window.let { - val lp = it.attributes - // 取出最大的那一个刷新率,直接设置给window - lp.preferredDisplayModeId = modes.last().modeId - it.attributes = lp - } - } window.decorView.disableAutoFill() initTheme() super.onCreate(savedInstanceState) diff --git a/app/src/main/java/io/legado/app/constant/PreferKey.kt b/app/src/main/java/io/legado/app/constant/PreferKey.kt index 14fd9c00b..6a1e5f876 100644 --- a/app/src/main/java/io/legado/app/constant/PreferKey.kt +++ b/app/src/main/java/io/legado/app/constant/PreferKey.kt @@ -82,7 +82,6 @@ object PreferKey { const val exportUseReplace = "exportUseReplace" const val useZhLayout = "useZhLayout" const val fullScreenGesturesSupport = "fullScreenGesturesSupport" - const val highBrush = "highBrush" const val brightness = "brightness" const val nightBrightness = "nightBrightness" const val expandTextMenu = "expandTextMenu" diff --git a/app/src/main/java/io/legado/app/help/AppConfig.kt b/app/src/main/java/io/legado/app/help/AppConfig.kt index fd0c75376..bf169d443 100644 --- a/app/src/main/java/io/legado/app/help/AppConfig.kt +++ b/app/src/main/java/io/legado/app/help/AppConfig.kt @@ -10,7 +10,7 @@ import splitties.init.appCtx @Suppress("MemberVisibilityCanBePrivate") object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener { val isGooglePlay = appCtx.channel == "google" - val isCronet = appCtx.channel == "cronet" + val isCronet = appCtx.getPrefBoolean("Cronet") var userAgent: String = getPrefUserAgent() var isEInkMode = appCtx.getPrefString(PreferKey.themeMode) == "3" var clickActionTL = appCtx.getPrefInt(PreferKey.clickActionTL, 2) diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 01fd289cc..803bfae84 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -863,4 +863,5 @@ Blurring radius Disabled when 0, enable range from 1 to 25\nThe greater the radius, the stronger the effect of blurring 需登录 + 使用Cronet网络组件 diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index f36623a15..805f16d6e 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -863,4 +863,5 @@ Blurring radius Disabled when 0, enable range from 1 to 25\nThe greater the radius, the stronger the effect of blurring 需登录 + 使用Cronet网络组件 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 6ea55fcb5..4a79b1294 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -863,5 +863,6 @@ Blurring radius Disabled when 0, enable range from 1 to 25\nThe greater the radius, the stronger the effect of blurring 需登录 + 使用Cronet网络组件 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 1f30ea160..ab94ebc25 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -860,5 +860,6 @@ 校驗書源顯示詳細信息 書源校驗時顯示網絡請求步驟和時間 需登录 + 使用Cronet网络组件 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 620190c0e..02e01270e 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -861,5 +861,6 @@ 校驗書源顯示詳細信息 書源校驗時顯示網絡請求步驟和時間 需登录 + 使用Cronet网络组件 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 611ae4930..4dc88b7d6 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -862,5 +862,6 @@ 校验显示详细信息 书源校验时显示网络请求步骤和时间 需登录 + 使用Cronet网络组件 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ec41c8165..aa38bae1c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -863,5 +863,6 @@ Check book source shows debug message Show network status and timestamp during source checking 需登录 + 使用Cronet网络组件 diff --git a/app/src/main/res/xml/pref_config_other.xml b/app/src/main/res/xml/pref_config_other.xml index 28360973f..9a0355dfd 100644 --- a/app/src/main/res/xml/pref_config_other.xml +++ b/app/src/main/res/xml/pref_config_other.xml @@ -57,10 +57,10 @@ android:title="UserAgent" /> + android:title="Cronet" + android:summary="@string/pref_cronet_summary" />