From 64c5faf6acf87b39258a9fd1464e9b0fbe0449ab Mon Sep 17 00:00:00 2001 From: X1nto Date: Wed, 1 Jul 2020 00:07:44 +0400 Subject: [PATCH] finalisations --- .../main/java/com/vanced/manager/core/Main.kt | 4 ++++ .../com/vanced/manager/core/fragments/Home.kt | 20 ++++++++----------- .../manager/ui/dialogs/DialogContainer.kt | 2 +- .../manager/ui/fragments/SettingsFragment.kt | 2 -- .../com/vanced/manager/utils/MiuiHelper.kt | 4 +++- app/src/main/res/values/strings.xml | 5 ++--- app/src/main/res/xml/preferences.xml | 4 ---- 7 files changed, 18 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/com/vanced/manager/core/Main.kt b/app/src/main/java/com/vanced/manager/core/Main.kt index 34459b5e..0b9a854c 100644 --- a/app/src/main/java/com/vanced/manager/core/Main.kt +++ b/app/src/main/java/com/vanced/manager/core/Main.kt @@ -12,7 +12,10 @@ import com.vanced.manager.ui.dialogs.DialogContainer.statementFalse import com.vanced.manager.ui.fragments.UpdateCheckFragment import com.vanced.manager.utils.InternetTools import com.vanced.manager.R +import com.vanced.manager.ui.dialogs.DialogContainer.secondMiuiDialog import com.vanced.manager.ui.dialogs.DialogContainer.showRootDialog +import com.vanced.manager.utils.MiuiHelper.isMiui +import com.vanced.manager.utils.MiuiHelper.isMiuiOptimisationsDisabled // This activity will NOT be used in manifest // since MainActivity will extend it @@ -37,6 +40,7 @@ open class Main: AppCompatActivity() { !falseStatement -> statementFalse(this) isUpgrading -> prefs.edit().putBoolean("isUpgrading", false).apply() variant == "root" && shouldShowRootDialog -> showRootDialog(this) + !firstStart && !isMiuiOptimisationsDisabled() -> secondMiuiDialog(this) } } diff --git a/app/src/main/java/com/vanced/manager/core/fragments/Home.kt b/app/src/main/java/com/vanced/manager/core/fragments/Home.kt index a6673654..c4be33fa 100644 --- a/app/src/main/java/com/vanced/manager/core/fragments/Home.kt +++ b/app/src/main/java/com/vanced/manager/core/fragments/Home.kt @@ -72,19 +72,15 @@ open class Home : BaseFragment(), View.OnClickListener { } catch (e: Exception) { Log.d("VMCache", "Unable to delete cacheDir") } - if (!MiuiHelper.isMiuiOptimisationsDisabled() && !defPrefs.getBoolean("suppress_miui", false)) { - activity?.let { view?.let { it1 -> secondMiuiDialog(it, it1) } } - } else { - if (prefs.getBoolean("valuesModified", false)) { - activity?.startService( - Intent( - activity, - VancedDownloadService::class.java - ) + if (prefs.getBoolean("valuesModified", false)) { + activity?.startService( + Intent( + activity, + VancedDownloadService::class.java ) - } else { - view?.findNavController()?.navigate(R.id.toInstallThemeFragment) - } + ) + } else { + view?.findNavController()?.navigate(R.id.toInstallThemeFragment) } } else { Toast.makeText( diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt index 36bd556e..23fedcf6 100644 --- a/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt +++ b/app/src/main/java/com/vanced/manager/ui/dialogs/DialogContainer.kt @@ -64,7 +64,7 @@ object DialogContainer { .show() } - fun secondMiuiDialog(context: Context, view: View) { + fun secondMiuiDialog(context: Context) { AlertDialog.Builder(context) .setTitle(context.getString(R.string.miui_two_title)) .setMessage(context.getString(R.string.miui_two)) diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt index 165dc212..748ce019 100644 --- a/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt +++ b/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt @@ -15,8 +15,6 @@ class SettingsFragment : PreferenceFragmentCompat() { activity?.title = getString(R.string.title_settings) setHasOptionsMenu(true) - if (!isMiui()) preferenceScreen.removePreference(findPreference("suppress_miui")) - val updateCheck: Preference? = findPreference("update_check") updateCheck?.setOnPreferenceClickListener { val fm = childFragmentManager.beginTransaction() diff --git a/app/src/main/java/com/vanced/manager/utils/MiuiHelper.kt b/app/src/main/java/com/vanced/manager/utils/MiuiHelper.kt index ed0630b2..16033d29 100644 --- a/app/src/main/java/com/vanced/manager/utils/MiuiHelper.kt +++ b/app/src/main/java/com/vanced/manager/utils/MiuiHelper.kt @@ -7,7 +7,9 @@ import java.io.InputStreamReader object MiuiHelper { - fun isMiui(): Boolean = !TextUtils.isEmpty(getSystemProps("ro.miui.ui.version.name")) + fun isMiui(): Boolean { + return !TextUtils.isEmpty(getSystemProps("ro.miui.ui.version.name")) + } fun isMiuiOptimisationsDisabled(): Boolean { return if (isMiui()) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7c577b65..4ad609de 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -70,7 +70,6 @@ Update Channel URL Push Notifications Receive push notifications when update is released - Suppress MiUI warnings Re-check Update Center Update found! @@ -80,9 +79,9 @@ Guide Hold on! Detected MiUI user! - Hey! Looks like you\'re a MiUI user. in order to properly use Vanced Manager, you will have to disable MiUI optimisations in developer settings\nIf you can\'t find such setting, it means that you are using a new version of ROM which does not need fixing anything. + Hey! Looks like you\'re a MiUI user. in order to properly use Vanced Manager, you will have to disable MiUI optimisations in developer settings\n However, if you are on 20.2.20 ROM that\'s based on xiaomi.eu, you can safely ignore this warning. I\'m gonna stop you right there! - Looks like you did NOT disable MiUI optimisations. Please disable it. K thx bai + Looks like you did NOT disable MiUI optimisations. Please disable it. However, if you are on 20.2.20 ROM that\'s based on xiaomi.eu, you can safely ignore this warning. Error Please make sure you downloaded app from vanced.app, Vanced Discord server or GitHub Success! diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index deedb1f7..1e1563f0 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -64,10 +64,6 @@ android:title="@string/update_url" android:key="install_url" /> - - \ No newline at end of file