diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2f7b2367..f012c5e0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,7 +18,6 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:requestLegacyExternalStorage="true" android:usesCleartextTraffic="true" tools:ignore="UnusedAttribute"> 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 c3ee4c54..e7a61042 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 @@ -70,7 +70,7 @@ open class Home : BaseFragment() { if (microgStatus!!) { val microgVer = pm.getPackageInfo("com.mgoogle.android.gms", 0).versionName microguninstallbtn.setOnClickListener { - uninstallApk("com.mgoogle.android.gms", 69) + uninstallApk("com.mgoogle.android.gms") } microgsettingsbtn.setOnClickListener { @@ -97,7 +97,7 @@ open class Home : BaseFragment() { if (vancedStatus!!) { val vancedVer = pm.getPackageInfo("com.vanced.android.youtube", 0).versionName vanceduninstallbtn.setOnClickListener { - uninstallApk("com.vanced.android.youtube", 420) + uninstallApk("com.vanced.android.youtube") } vancedVerText.text = vancedVer.toString() } else { @@ -166,7 +166,7 @@ open class Home : BaseFragment() { intent.setDataAndType(uri, "application/vnd.android.package-archive") intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) - activity?.startActivityForResult(intent, 420) + startActivity(intent) }, onError = { throwable -> Toast.makeText(requireContext(), throwable.toString(), Toast.LENGTH_SHORT) @@ -175,11 +175,11 @@ open class Home : BaseFragment() { ) } - private fun uninstallApk(pkgUri: String, requestCode: Int) { + private fun uninstallApk(pkgUri: String) { try { val uri = Uri.parse(pkgUri) val uninstall = Intent(Intent.ACTION_DELETE, uri) - activity?.startActivityForResult(uninstall, requestCode) + startActivity(uninstall) } catch (e: ActivityNotFoundException) { Toast.makeText(requireContext(), "App not installed", Toast.LENGTH_SHORT).show() activity?.recreate() diff --git a/app/src/main/java/com/vanced/manager/core/installer/SplitInstallerService.kt b/app/src/main/java/com/vanced/manager/core/installer/SplitInstallerService.kt index 5b09b4dd..4b56d9fd 100644 --- a/app/src/main/java/com/vanced/manager/core/installer/SplitInstallerService.kt +++ b/app/src/main/java/com/vanced/manager/core/installer/SplitInstallerService.kt @@ -9,8 +9,11 @@ import android.util.Log class SplitInstallerService: Service() { override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int { - - when (if (intent.hasExtra(PackageInstaller.EXTRA_STATUS)) null else intent.getIntExtra(PackageInstaller.EXTRA_STATUS, 0)) { + when ( + if (intent.hasExtra(PackageInstaller.EXTRA_STATUS)) + null + else + intent.getIntExtra(PackageInstaller.EXTRA_STATUS, 0)) { PackageInstaller.STATUS_PENDING_USER_ACTION -> { val confirmationIntent = intent.getParcelableExtra(Intent.EXTRA_INTENT) confirmationIntent?.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) diff --git a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt index 5396d4ec..c414a744 100644 --- a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt +++ b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt @@ -81,23 +81,6 @@ class MainActivity : Main() { return false } - - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { - super.onActivityResult(requestCode, resultCode, data) - when (requestCode) { - 69 -> { - recreate() - } - 420 -> { - recreate() - } - 666 -> { - recreate() - } - } - - } - private fun setDisplayHomeAsUpEnabled(isNeeded: Boolean) { val toolbar: Toolbar = findViewById(R.id.home_toolbar) when { diff --git a/app/src/main/java/com/vanced/manager/ui/core/ThemedActivity.kt b/app/src/main/java/com/vanced/manager/ui/core/ThemedActivity.kt index 5ee40976..2dfa86cf 100644 --- a/app/src/main/java/com/vanced/manager/ui/core/ThemedActivity.kt +++ b/app/src/main/java/com/vanced/manager/ui/core/ThemedActivity.kt @@ -70,22 +70,18 @@ open class ThemedActivity : AppCompatActivity() { } private fun setDarkAccent(accentColor: String) { + val themeVal: Int = ("R.style.DarkTheme_$accentColor").toInt() when (accentColor) { - "Blue" -> setTheme(R.style.DarkTheme_Blue) - "Red" -> setTheme(R.style.DarkTheme_Red) - "Green" -> setTheme(R.style.DarkTheme_Green) - "Yellow" -> setTheme(R.style.DarkTheme_Yellow) - "Purple" -> setTheme(R.style.DarkTheme_Purple) + accentColor -> setTheme(themeVal) + else -> setTheme(R.style.DarkTheme_Blue) } } private fun setLightAccent(accentColor: String) { + val themeVal: Int = ("R.style.LightTheme_$accentColor").toInt() when (accentColor) { - "Blue" -> setTheme(R.style.LightTheme_Blue) - "Red" -> setTheme(R.style.LightTheme_Red) - "Green" -> setTheme(R.style.LightTheme_Green) - "Yellow" -> setTheme(R.style.LightTheme_Yellow) - "Purple" -> setTheme(R.style.LightTheme_Purple) + accentColor -> setTheme(themeVal) + else -> setTheme(R.style.LightTheme_Blue) } } diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 0e7e08ae..0502b97a 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -58,8 +58,8 @@