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

bug fixes

This commit is contained in:
X1nto 2020-05-27 13:38:46 +04:00
parent 6f11a9c92b
commit 933fd09e7c
4 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -11,7 +11,7 @@ android {
applicationId "com.vanced.manager"
minSdkVersion 21
targetSdkVersion 29
versionCode 4
versionCode 5
versionName "1.1.0 beta"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

10
app/src/main/java/com/vanced/manager/core/fragments/Home.kt
View File

@ -59,7 +59,15 @@ open class Home : BaseFragment() {
microginstallbtn.setOnClickListener {
if (!isDownloading!!) {
val dlText = view.findViewById<TextView>(R.id.microg_downloading)
installApk("https://x1nto.github.io/VancedFiles/microg.json", microgProgress, dlText)
try {
installApk(
"https://x1nto.github.io/VancedFiles/microg.json",
microgProgress,
dlText
)
} catch (e: Exception) {
Toast.makeText(activity, "Unable to start installation", Toast.LENGTH_SHORT).show()
}
} else {
Toast.makeText(activity, "Please wait until installation finishes", Toast.LENGTH_SHORT).show()
}

45
app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt
View File

@ -86,35 +86,32 @@ class HomeFragment : Home() {
if (microgStatus!!) {
val microgVer =
pm.getPackageInfo("com.mgoogle.android.gms", 0).versionName
when {
microgRemoteVer > microgVer -> {
microginstallbtn?.text = activity?.getString(R.string.update)
microginstallbtn?.icon =
activity?.getDrawable(R.drawable.ic_cloud_upload_black_24dp)
}
microgRemoteVer == microgVer -> {
microginstallbtn?.text =
activity?.getString(R.string.button_installed)
microginstallbtn?.icon =
activity?.getDrawable(R.drawable.outline_cloud_done_24)
}
if (microgRemoteVer > microgVer) {
microginstallbtn?.text = activity?.getString(R.string.update)
microginstallbtn?.icon =
activity?.getDrawable(R.drawable.ic_cloud_upload_black_24dp)
}
else if (microgRemoteVer == microgVer) {
microginstallbtn?.text =
activity?.getString(R.string.button_installed)
microginstallbtn?.icon =
activity?.getDrawable(R.drawable.outline_cloud_done_24)
}
}
if (vancedStatus!!) {
val vancedVer =
pm.getPackageInfo("com.vanced.android.youtube", 0).versionName
when {
vancedRemoteVer > vancedVer -> {
vancedinstallbtn?.text = activity?.getString(R.string.update)
vancedinstallbtn?.icon =
activity?.getDrawable(R.drawable.ic_cloud_upload_black_24dp)
}
vancedRemoteVer == vancedVer -> {
vancedinstallbtn?.text =
activity?.getString(R.string.button_installed)
vancedinstallbtn?.icon =
activity?.getDrawable(R.drawable.outline_cloud_done_24)
}
if (vancedRemoteVer > vancedVer) {
vancedinstallbtn?.text = activity?.getString(R.string.update)
vancedinstallbtn?.icon =
activity?.getDrawable(R.drawable.ic_cloud_upload_black_24dp)
}
else if (vancedRemoteVer == vancedVer) {
vancedinstallbtn?.text =
activity?.getString(R.string.button_installed)
vancedinstallbtn?.icon =
activity?.getDrawable(R.drawable.outline_cloud_done_24)
}
}

2
settings.gradle
View File

@ -1,2 +1,2 @@
rootProject.name='Vanced Manager'
include ':app', ':api', ':api'
include ':app'