tests
This commit is contained in:
parent
15443e9afd
commit
499517dcec
|
@ -7,6 +7,7 @@ import android.util.Log
|
|||
import android.view.View
|
||||
import android.widget.*
|
||||
import androidx.navigation.findNavController
|
||||
import androidx.preference.PreferenceManager
|
||||
import androidx.preference.PreferenceManager.getDefaultSharedPreferences
|
||||
import com.google.android.material.button.MaterialButton
|
||||
import com.topjohnwu.superuser.Shell
|
||||
|
@ -52,6 +53,7 @@ open class Home : BaseFragment(), View.OnClickListener {
|
|||
|
||||
override fun onClick(v: View?) {
|
||||
val prefs = activity?.getSharedPreferences("installPrefs", Context.MODE_PRIVATE)
|
||||
val defPrefs = getDefaultSharedPreferences(activity)
|
||||
val isVancedDownloading: Boolean? = prefs?.getBoolean("isVancedDownloading", false)
|
||||
val isMicrogDownloading: Boolean? = prefs?.getBoolean("isMicrogDownloading", false)
|
||||
val variant = getDefaultSharedPreferences(activity).getString("vanced_variant", "nonroot")
|
||||
|
@ -70,24 +72,20 @@ open class Home : BaseFragment(), View.OnClickListener {
|
|||
} catch (e: Exception) {
|
||||
Log.d("VMCache", "Unable to delete cacheDir")
|
||||
}
|
||||
if (prefs.getBoolean("valuesModified", false)) {
|
||||
if (!MiuiHelper.isMiuiOptimisationsDisabled()) {
|
||||
activity?.let { view?.let { it1 -> secondMiuiDialog(it, it1) } }
|
||||
} else {
|
||||
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
|
||||
)
|
||||
)
|
||||
}
|
||||
} else {
|
||||
if (!MiuiHelper.isMiuiOptimisationsDisabled()) {
|
||||
activity?.let { view?.let { it1 -> secondMiuiDialog(it, it1) } }
|
||||
} else
|
||||
} else {
|
||||
view?.findNavController()?.navigate(R.id.toInstallThemeFragment)
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
Toast.makeText(
|
||||
activity,
|
||||
|
|
|
@ -70,10 +70,6 @@ object DialogContainer {
|
|||
.setMessage(context.getString(R.string.miui_two))
|
||||
.setPositiveButton(context.getString(R.string.button_fine)) { dialog, _ ->
|
||||
dialog.dismiss()
|
||||
if (context.getSharedPreferences("installPrefs", Context.MODE_PRIVATE).getBoolean("valuesModified", false))
|
||||
context.startService(Intent(context, VancedDownloadService::class.java))
|
||||
else
|
||||
view.findNavController().navigate(R.id.toInstallThemeFragment)
|
||||
}
|
||||
.setNeutralButton(context.getString(R.string.guide)) { _, _ ->
|
||||
openUrl("https://telegra.ph/How-to-install-v15-on-MIUI-02-11", R.color.Telegram, context)
|
||||
|
|
|
@ -3,11 +3,9 @@ package com.vanced.manager.ui.fragments
|
|||
import android.os.Bundle
|
||||
import android.view.Menu
|
||||
import android.view.MenuInflater
|
||||
import androidx.preference.ListPreference
|
||||
import androidx.preference.Preference
|
||||
import androidx.preference.PreferenceFragmentCompat
|
||||
import androidx.preference.PreferenceManager
|
||||
import androidx.preference.*
|
||||
import com.vanced.manager.R
|
||||
import com.vanced.manager.utils.MiuiHelper.isMiui
|
||||
|
||||
class SettingsFragment : PreferenceFragmentCompat() {
|
||||
|
||||
|
@ -17,6 +15,7 @@ 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 {
|
||||
|
|
|
@ -9,7 +9,12 @@ object MiuiHelper {
|
|||
|
||||
fun isMiui(): Boolean = !TextUtils.isEmpty(getSystemProps("ro.miui.ui.version.name"))
|
||||
|
||||
fun isMiuiOptimisationsDisabled(): Boolean = isMiui() && getSystemProps("persist.sys.miui_optimization") == "0"
|
||||
fun isMiuiOptimisationsDisabled(): Boolean {
|
||||
return if (isMiui())
|
||||
getSystemProps("persist.sys.miui_optimization") == "0"
|
||||
else
|
||||
false
|
||||
}
|
||||
|
||||
private fun getSystemProps(propname: String): String? {
|
||||
val line: String
|
||||
|
|
|
@ -37,9 +37,10 @@
|
|||
|
||||
</com.google.android.material.textfield.TextInputLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center">
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/url_reset"
|
||||
|
@ -49,19 +50,16 @@
|
|||
android:layout_marginStart="4dp"
|
||||
android:layout_marginEnd="2dp"
|
||||
android:text="@string/reset"
|
||||
android:textAllCaps="false"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignEnd="@id/url_save" />
|
||||
android:textAllCaps="false" />
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/url_save"
|
||||
style="@style/ButtonStyle"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:layout_marginStart="2dp"
|
||||
android:text="@string/save"
|
||||
android:layout_alignParentEnd="true" />
|
||||
android:text="@string/save" />
|
||||
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
@ -70,6 +70,7 @@
|
|||
<string name="update_url">Update Channel URL</string>
|
||||
<string name="push_notifications">Push Notifications</string>
|
||||
<string name="push_notifications_summary">Receive push notifications when update is released</string>
|
||||
<string name="suppress_miui">Suppress MiUI warnings</string>
|
||||
<string name="re_check">Re-check</string>
|
||||
<string name="update_center">Update Center</string>
|
||||
<string name="update_found">Update found!</string>
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
<SwitchPreference
|
||||
android:title="Auto-Check updates"
|
||||
android:key="auto_check_update"
|
||||
android:defaultValue="true"
|
||||
android:summary="Check manager updates on app startup" />
|
||||
|
||||
<SwitchPreference
|
||||
|
@ -63,6 +64,10 @@
|
|||
android:title="@string/update_url"
|
||||
android:key="install_url" />
|
||||
|
||||
<SwitchPreference
|
||||
android:title="@string/suppress_miui"
|
||||
android:key="suppress_miui"/>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
</PreferenceScreen>
|
Loading…
Reference in New Issue