diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/app/MediaEditor.java b/app/src/main/java/com/sevtinge/hyperceiler/module/app/MediaEditor.java index b00695ce6..e4bcce5ee 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/app/MediaEditor.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/app/MediaEditor.java @@ -21,7 +21,6 @@ import com.hchen.database.HookBase; import com.sevtinge.hyperceiler.module.base.BaseModule; import com.sevtinge.hyperceiler.module.hook.mediaeditor.CustomWatermark; -import com.sevtinge.hyperceiler.module.hook.mediaeditor.FilterManagerAll; import com.sevtinge.hyperceiler.module.hook.mediaeditor.UnlockAigc; import com.sevtinge.hyperceiler.module.hook.mediaeditor.UnlockCustomPhotoFrames; import com.sevtinge.hyperceiler.module.hook.mediaeditor.UnlockDisney; @@ -37,7 +36,6 @@ public class MediaEditor extends BaseModule { public void handleLoadPackage() { // 基础 initHook(UnlockMinimumCropLimit2.INSTANCE, mPrefsMap.getBoolean("mediaeditor_unlock_minimum_crop_limit")); - initHook(FilterManagerAll.INSTANCE, mPrefsMap.getBoolean("mediaeditor_filter_manager")); initHook(UnlockLeicaFilter.INSTANCE, mPrefsMap.getBoolean("mediaeditor_unlock_leica_filter")); initHook(CustomWatermark.INSTANCE, !Objects.equals(mPrefsMap.getString("mediaeditor_custom_watermark", ""), "")); // AI 创作 diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/hook/mediaeditor/FilterManagerAll.kt b/app/src/main/java/com/sevtinge/hyperceiler/module/hook/mediaeditor/FilterManagerAll.kt deleted file mode 100644 index 512df4451..000000000 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/hook/mediaeditor/FilterManagerAll.kt +++ /dev/null @@ -1,55 +0,0 @@ -/* - * This file is part of HyperCeiler. - - * HyperCeiler 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. - - * 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 . - - * Copyright (C) 2023-2025 HyperCeiler Contributions -*/ -package com.sevtinge.hyperceiler.module.hook.mediaeditor - -import android.os.* -import com.github.kyuubiran.ezxhelper.ClassUtils.setStaticObject -import com.github.kyuubiran.ezxhelper.HookFactory.`-Static`.createHook -import com.sevtinge.hyperceiler.module.base.* -import com.sevtinge.hyperceiler.module.base.dexkit.* -import com.sevtinge.hyperceiler.utils.api.LazyClass.AndroidBuildCls -import java.lang.reflect.* - - -object FilterManagerAll : BaseHook() { - private lateinit var device: String - private val methodResult by lazy { - DexKit.findMember("FilterManagerAll") { dexkit -> - dexkit.findMethod { - matcher { - addUsingString("wayne") - } - }.filter { it.isMethod }.toTypedArray().firstOrNull() - } - } - - override fun init() { - methodResult.createHook { - before { - if (!this@FilterManagerAll::device.isInitialized) { - device = Build.DEVICE - } - setStaticObject(AndroidBuildCls, "DEVICE", "wayne") - } - after { - setStaticObject(AndroidBuildCls, "DEVICE", device) - } - } - } -} diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/hook/mediaeditor/UnlockCustomPhotoFrames.kt b/app/src/main/java/com/sevtinge/hyperceiler/module/hook/mediaeditor/UnlockCustomPhotoFrames.kt index 92132c9d0..c5c4f840a 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/module/hook/mediaeditor/UnlockCustomPhotoFrames.kt +++ b/app/src/main/java/com/sevtinge/hyperceiler/module/hook/mediaeditor/UnlockCustomPhotoFrames.kt @@ -28,9 +28,6 @@ object UnlockCustomPhotoFrames : BaseHook() { private val frames by lazy { mPrefsMap.getStringAsInt("mediaeditor_unlock_custom_photo_frames", 0) } - private val isOpenSpring by lazy { - mPrefsMap.getBoolean("mediaeditor_unlock_spring") - } private val isNewMediaeditor by lazy { // 以 1.7.5.0.4 为新旧版本分界线 getPackageVersionCode(lpparam) >= 4658180 @@ -116,13 +113,13 @@ object UnlockCustomPhotoFrames : BaseHook() { other(method) } - if (isOpenSpring && publicC.isNotEmpty()) { + /*if (isOpenSpring && publicC.isNotEmpty()) { publicC.forEach { method -> other(method) // 1.6.0.5.2 新增限时新春定制画框 // 后续版本已移除,其实可以删掉的,但还是留着吧,兴许后面可能还有用 } - } + }*/ } private fun xiaomi(name: Method) { diff --git a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/app/systemui/SystemUIOtherSettings.java b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/app/systemui/SystemUIOtherSettings.java index c43821ace..674e55b74 100644 --- a/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/app/systemui/SystemUIOtherSettings.java +++ b/app/src/main/java/com/sevtinge/hyperceiler/ui/fragment/app/systemui/SystemUIOtherSettings.java @@ -34,6 +34,8 @@ import com.sevtinge.hyperceiler.R; import com.sevtinge.hyperceiler.ui.fragment.dashboard.DashboardFragment; +import java.util.Objects; + import fan.preference.DropDownPreference; public class SystemUIOtherSettings extends DashboardFragment { @@ -88,7 +90,7 @@ public void initPrefs() { (preference, o) -> { ComponentName componentName = new ComponentName("miui.systemui.plugin", "miui.systemui.volume.VolumeDialogPlugin"); - PackageManager packageManager = getContext().getPackageManager(); + PackageManager packageManager = requireContext().getPackageManager(); if ((boolean) o) { packageManager.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, @@ -107,7 +109,7 @@ public void initPrefs() { public boolean onPreferenceChange(@NonNull Preference preference, Object o) { ComponentName componentName = new ComponentName("miui.systemui.plugin", "miui.systemui.globalactions.GlobalActionsPlugin"); - PackageManager packageManager = getContext().getPackageManager(); + PackageManager packageManager = requireContext().getPackageManager(); if ((boolean) o) { packageManager.setComponentEnabledSetting(componentName, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml index c1a6fbd92..538b39bb2 100644 --- a/app/src/main/res/values-ar-rSA/strings.xml +++ b/app/src/main/res/values-ar-rSA/strings.xml @@ -1493,7 +1493,6 @@ تخصيص نوع الإطار فتح فلتر لايكا يتم دعم بعض الإصدارات فقط - فتح مدير الفلاتر فتح AIGC مشاركة شاومي diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index a124215bc..00befcdba 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -1283,7 +1283,6 @@ aplicaciones del sistema Personalizar el tipo de marco Desbloquear filtros de Leica Solo en algunas versiones se funciona - Desbloquear filtros de maestro Mi Share No se permite el cierre automático de Mi Share diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml index 962546dc1..ad3a3b73c 100644 --- a/app/src/main/res/values-in-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -1279,7 +1279,6 @@ Sesuaikan jenis bingkai Buka kunci filter Leica Hanya beberapa versi yang didukung - Buka kunci manajer filter Mi Share Nonaktifkan penutupan otomatis Mi Share diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index 4313a783b..f5e6f3695 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -1249,7 +1249,6 @@ Personalizza il tipo di cornice Sblocca il filtro Leica Sono supportate solo alcune versioni - Sblocca la gestione filtri Mi Share Disabilita la chiusura automatica di Mi Share diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 5cdd7ca82..5ddb68063 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -1454,7 +1454,6 @@ フレームの種類をカスタマイズ Leica フィルターをアンロック 一部のバージョンにのみ対応しています - フィルターマネージャーをアンロック AIGC をアンロック Mi シェア diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml index 44ad11800..7887f89ce 100644 --- a/app/src/main/res/values-pl-rPL/strings.xml +++ b/app/src/main/res/values-pl-rPL/strings.xml @@ -1494,7 +1494,6 @@ Dostosuj typ ramki Odblokuj filtr Leica Obsługiwane są tylko niektóre wersje - Odblokuj menedżera filtrów Odblokuj AIGC Mi Share diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 1bd366bd9..ee95e9300 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1494,7 +1494,6 @@ Personalizar tipo de moldura Desbloquear filtro Leica Apenas algumas versões são suportadas - Desbloquear gerenciador de filtros Desbloquear AIGC Xiaomi Share diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index f697b5e9c..88087cec9 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -1494,7 +1494,6 @@ Изменить тип фрейма Разблокировать фильтр Leica Поддерживаются только некоторые версии - Менеджер фильтров Разблокировать AIGC Mi Share diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index f05bce6fd..779be0a79 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -1269,7 +1269,6 @@ Çerçeve türünü özelleştirin Leica filtresinin kilidini açın Sadece bazı sürümler destekleniyor - Filtre yöneticisinin kilidini açın Mi Paylaşım Mi Paylaşımının otomatik kapanmasını devre dışı bırak diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml index b1db16cd8..6ddd35777 100644 --- a/app/src/main/res/values-vi-rVN/strings.xml +++ b/app/src/main/res/values-vi-rVN/strings.xml @@ -1500,7 +1500,6 @@ Chức năng này là chức năng thử nghiệm có độ ổn định caoTùy chỉnh loại khung hình Mở khóa bộ lọc Leica Chỉ hỗ trợ một số phiên bản - Mở khóa bộ lọc chính Mở khóa AIGC Mi Share diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 50d90cfb2..06c0df74a 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1587,7 +1587,6 @@ 定制画框类型 解锁 Leica 滤镜 仅支持部分版本 - 解锁大师滤镜 解锁 AIGC 小米互传 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index e191ae7a5..13a2d8ec6 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1356,7 +1356,7 @@ 訂製画框類型 解鎖 Leica 濾鏡 僅支援部分版本 - 解鎖大師濾鏡 + 解鎖 AIGC 小米互傳 禁用自動關閉小米互傳 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 6533ac952..f3f50d706 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1494,7 +1494,6 @@ 訂製畫框類型 解鎖 Leica 濾鏡 僅支援部分版本 - 解鎖大師濾鏡 解鎖 AIGC 小米互傳 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3155c5c1b..aa2c7a6f7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1574,7 +1574,6 @@ Customize the frame type Unlock the Leica filter Only some versions are supported - Unlock the filter manager Unlock AIGC Xiaomi Share diff --git a/app/src/main/res/xml/mediaeditor.xml b/app/src/main/res/xml/mediaeditor.xml index 415883458..b134ce255 100644 --- a/app/src/main/res/xml/mediaeditor.xml +++ b/app/src/main/res/xml/mediaeditor.xml @@ -37,11 +37,6 @@ android:summary="@string/mediaeditor_unlock_leica_filter_desc" android:title="@string/mediaeditor_unlock_leica_filter_title" /> - - - + android:title="@string/mediaeditor_unlock_spring_title" />-->