small fixes
This commit is contained in:
parent
51b1ec1a12
commit
f242aa8c09
|
@ -8,6 +8,8 @@
|
||||||
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
|
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||||
|
|
||||||
|
|
||||||
<!-- is required for some Android 5.x devices -->
|
<!-- is required for some Android 5.x devices -->
|
||||||
<uses-permission
|
<uses-permission
|
||||||
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
|
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
|
||||||
|
|
|
@ -35,10 +35,14 @@ class InstallationFilesDetectedDialog(private val app: String) : BottomSheetDial
|
||||||
|
|
||||||
binding.installationDetectedRedownload.setOnClickListener {
|
binding.installationDetectedRedownload.setOnClickListener {
|
||||||
dismiss()
|
dismiss()
|
||||||
AppDownloadDialog(app).show(requireActivity())
|
if (app == requireActivity().getString(R.string.vanced))
|
||||||
|
VancedPreferencesDialog().show(requireActivity())
|
||||||
|
else
|
||||||
|
AppDownloadDialog(app).show(requireActivity())
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.installationDetectedInstall.setOnClickListener {
|
binding.installationDetectedInstall.setOnClickListener {
|
||||||
|
dismiss()
|
||||||
when (app) {
|
when (app) {
|
||||||
requireActivity().getString(R.string.vanced) -> startVancedInstall(requireActivity(), getDefaultSharedPreferences(requireActivity()).getString("vanced_variant", "nonroot"))
|
requireActivity().getString(R.string.vanced) -> startVancedInstall(requireActivity(), getDefaultSharedPreferences(requireActivity()).getString("vanced_variant", "nonroot"))
|
||||||
requireActivity().getString(R.string.music) -> startMusicInstall(requireActivity())
|
requireActivity().getString(R.string.music) -> startMusicInstall(requireActivity())
|
||||||
|
|
|
@ -4,10 +4,12 @@ import android.os.Bundle
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
|
import androidx.core.content.edit
|
||||||
import androidx.databinding.DataBindingUtil
|
import androidx.databinding.DataBindingUtil
|
||||||
import androidx.preference.PreferenceManager.getDefaultSharedPreferences
|
import androidx.preference.PreferenceManager.getDefaultSharedPreferences
|
||||||
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
|
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
|
||||||
import com.google.android.material.radiobutton.MaterialRadioButton
|
import com.google.android.material.radiobutton.MaterialRadioButton
|
||||||
|
import com.topjohnwu.superuser.Shell
|
||||||
import com.vanced.manager.R
|
import com.vanced.manager.R
|
||||||
import com.vanced.manager.databinding.DialogManagerVariantBinding
|
import com.vanced.manager.databinding.DialogManagerVariantBinding
|
||||||
import com.vanced.manager.utils.Extensions.getCheckedButtonTag
|
import com.vanced.manager.utils.Extensions.getCheckedButtonTag
|
||||||
|
@ -33,7 +35,11 @@ class ManagerVariantDialog : BottomSheetDialogFragment() {
|
||||||
binding.variantSave.setOnClickListener {
|
binding.variantSave.setOnClickListener {
|
||||||
val newPref = binding.variantRadiogroup.getCheckedButtonTag()
|
val newPref = binding.variantRadiogroup.getCheckedButtonTag()
|
||||||
if (variant != newPref) {
|
if (variant != newPref) {
|
||||||
prefs.edit().putString("vanced_variant", newPref).apply()
|
if (newPref == "root" && Shell.rootAccess())
|
||||||
|
prefs.edit { putString("vanced_variant", "root") }
|
||||||
|
else
|
||||||
|
prefs.edit { putString("vanced_variant", "nonroot") }
|
||||||
|
|
||||||
dismiss()
|
dismiss()
|
||||||
requireActivity().recreate()
|
requireActivity().recreate()
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -47,7 +47,7 @@ class SettingsFragment : Fragment() {
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.managerVariant.apply {
|
binding.managerVariant.apply {
|
||||||
prefs.getString("vanced_variant", "nonrooot")?.let { setSummary(it) }
|
prefs.getString("vanced_variant", "nonroot")?.let { setSummary(it) }
|
||||||
setOnClickListener {
|
setOnClickListener {
|
||||||
ManagerVariantDialog().show(requireActivity().supportFragmentManager, "")
|
ManagerVariantDialog().show(requireActivity().supportFragmentManager, "")
|
||||||
}
|
}
|
||||||
|
@ -55,8 +55,8 @@ class SettingsFragment : Fragment() {
|
||||||
|
|
||||||
binding.clearFiles.setOnClickListener {
|
binding.clearFiles.setOnClickListener {
|
||||||
with(requireActivity()) {
|
with(requireActivity()) {
|
||||||
listOf("apk", "apks").forEach { dir ->
|
listOf("vanced/nonroot", "vanced/root", "music/nonroot", "music/root", "microg").forEach { dir ->
|
||||||
File(getExternalFilesDir(dir)?.path as String).deleteRecursively()
|
File(getExternalFilesDir(dir)?.path.toString()).deleteRecursively()
|
||||||
}
|
}
|
||||||
Toast.makeText(this, getString(R.string.cleared_files), Toast.LENGTH_SHORT).show()
|
Toast.makeText(this, getString(R.string.cleared_files), Toast.LENGTH_SHORT).show()
|
||||||
}
|
}
|
||||||
|
|
|
@ -64,7 +64,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginTop="4dp"
|
||||||
android:nestedScrollingEnabled="false"
|
android:nestedScrollingEnabled="false"
|
||||||
android:paddingBottom="4dp"
|
android:paddingBottom="8dp"
|
||||||
tools:itemCount="6"
|
tools:itemCount="6"
|
||||||
tools:listitem="@layout/view_social_link" />
|
tools:listitem="@layout/view_social_link" />
|
||||||
|
|
||||||
|
|
|
@ -111,7 +111,6 @@
|
||||||
<string name="vanced_team">Vanced Team</string>
|
<string name="vanced_team">Vanced Team</string>
|
||||||
|
|
||||||
<!-- Error messages -->
|
<!-- Error messages -->
|
||||||
|
|
||||||
<string name="chown_fail">Failed to `chown` apk to system owner, please try again.</string>
|
<string name="chown_fail">Failed to `chown` apk to system owner, please try again.</string>
|
||||||
<string name="error_downloading">Error Downloading %1$s</string>
|
<string name="error_downloading">Error Downloading %1$s</string>
|
||||||
<string name="failed_uninstall">Failed to uninstall package %1$s</string>
|
<string name="failed_uninstall">Failed to uninstall package %1$s</string>
|
||||||
|
|
Loading…
Reference in New Issue