etc
/
VancedManager
mirror of https://github.com/YTVanced/VancedManager
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

finish the uninstall dialog

This commit is contained in:
X1nto 2021-10-08 15:13:07 +04:00
parent 1cd0294801
commit 7fca85be14
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/vanced/manager/adapter/ExpandableAppListAdapter.kt
View File

@ -65,7 +65,10 @@ class ExpandableAppListAdapter(
}
}
appUninstall.setOnClickListener {
AppUninstallDialog.newInstance(apps[position]).show(activity.supportFragmentManager, null)
AppUninstallDialog.newInstance(
dataModel?.appName,
dataModel?.appPkg
).show(activity.supportFragmentManager, null)
}
appLaunch.setOnClickListener {
viewModel.launchApp(apps[position], isRoot)

28
app/src/main/java/com/vanced/manager/ui/dialogs/AppUninstallDialog.kt
View File

@ -1,6 +1,5 @@
package com.vanced.manager.ui.dialogs
import android.app.Activity
import android.graphics.Color
import android.graphics.drawable.ColorDrawable
import android.os.Bundle
@ -9,16 +8,23 @@ import android.view.ViewGroup
import com.vanced.manager.R
import com.vanced.manager.core.ui.base.BindingDialogFragment
import com.vanced.manager.databinding.DialogAppUninstallBinding
import com.vanced.manager.utils.PackageHelper
class AppUninstallDialog : BindingDialogFragment<DialogAppUninstallBinding>() {
companion object {
private var TAG_APP_NAME: String? = null
private const val TAG_APP_NAME = "APP_NAME"
private const val TAG_APP_PACKAGE = "APP_PACKAGE"
fun newInstance(appName: String?) : AppUninstallDialog = AppUninstallDialog().apply {
fun newInstance(
appName: String?,
appPackage: String?,
) = AppUninstallDialog().apply {
arguments = Bundle().apply {
TAG_APP_NAME = appName
putString(TAG_APP_NAME, appName)
putString(TAG_APP_PACKAGE, appPackage)
}
}
}
@ -35,16 +41,22 @@ class AppUninstallDialog : BindingDialogFragment<DialogAppUninstallBinding>() {
}
private fun bindData() {
val appName = arguments?.getString(TAG_APP_NAME)
val appPackage = arguments?.getString(TAG_APP_PACKAGE)
with(binding) {
appUninstallConfirm.setOnClickListener {
//uninstall instruction ??
//dataModel?.appPkg?.let { it1 -> viewModel.uninstallPackage(it1) } (taken from original ExpandanbleAppListAdapter.kt)
//but uninstallPackage method is not static so I would be forced to spawn a new HomeViewModel instance
if (appPackage != null) {
PackageHelper.uninstallApk(
pkg = appPackage,
context = requireActivity()
)
}
dismiss()
}
appUninstallCancel.setOnClickListener {
dismiss()
}
appUninstallMessage.text = getString(R.string.uninstall_app_text, TAG_APP_NAME)
appUninstallMessage.text = getString(R.string.uninstall_app_text, appName)
}
}
}