UI tests

app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt

@@ -130,7 +130,7 @@ class VancedDownloadService: Service() {
     }
 
     private fun prepareInstall(variant: String) {
-        val intent = Intent(HomeFragment.VANCED_DOWNLOADED)
+        val intent = Intent()
         intent.action = HomeFragment.VANCED_DOWNLOADED
         LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
         if (variant == "root")

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

@@ -23,19 +23,7 @@ open class Home : BaseFragment(), View.OnClickListener {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val microginstallbtn = view.findViewById<MaterialButton>(R.id.microg_installbtn)
-        val vancedinstallbtn = view.findViewById<MaterialButton>(R.id.vanced_installbtn)
-        val microguninstallbtn = view.findViewById<ImageView>(R.id.microg_uninstallbtn)
-        val vanceduninstallbtn = view.findViewById<ImageView>(R.id.vanced_uninstallbtn)
-        val rootswitch = view.findViewById<MaterialButton>(R.id.root_switch)
-        val nonrootswitch = view.findViewById<MaterialButton>(R.id.nonroot_switch)
 
-        vancedinstallbtn.setOnClickListener(this)
-        microginstallbtn.setOnClickListener(this)
-        microguninstallbtn.setOnClickListener(this)
-        vanceduninstallbtn.setOnClickListener(this)
-        rootswitch.setOnClickListener(this)
-        nonrootswitch.setOnClickListener(this)
 
     }
 

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

@@ -2,6 +2,7 @@ package com.vanced.manager.ui.fragments
 
 import android.content.*
 import android.os.Bundle
+import android.util.Log
 import android.view.*
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.widget.Toast
@@ -16,7 +17,7 @@ import com.vanced.manager.core.fragments.Home
 import com.vanced.manager.databinding.FragmentHomeBinding
 import com.vanced.manager.ui.viewmodels.HomeViewModel
 
-class HomeFragment : Home() {
+class HomeFragment : Home(), View.OnClickListener {
 
     private lateinit var binding: FragmentHomeBinding
     private var isExpanded: Boolean = false
@@ -48,6 +49,15 @@ class HomeFragment : Home() {
         }
 
          */
+        with(binding) {
+            rootSwitch.setOnClickListener(this@HomeFragment)
+            nonrootSwitch.setOnClickListener(this@HomeFragment)
+
+            includeVancedLayout.vancedInstallbtn.setOnClickListener(this@HomeFragment)
+            includeVancedLayout.vancedUninstallbtn.setOnClickListener(this@HomeFragment)
+            includeMicrogLayout.microgInstallbtn.setOnClickListener(this@HomeFragment)
+            includeMicrogLayout.microgUninstallbtn.setOnClickListener(this@HomeFragment)
+        }
 
         binding.includeChangelogsLayout.changelogButton.setOnClickListener {
             cardExpandCollapse()
@@ -55,7 +65,7 @@ class HomeFragment : Home() {
 
         binding.includeVancedLayout.vancedCard.setOnLongClickListener {
             val clip = requireActivity().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-            clip.setPrimaryClip(ClipData.newPlainText("vanced", this.viewModel.vancedInstalledVersion.get()))
+            clip.setPrimaryClip(ClipData.newPlainText("vanced", viewModel.vancedInstalledVersion.get()))
             versionToast("Vanced")
             true
         }
@@ -75,7 +85,6 @@ class HomeFragment : Home() {
                         0 -> tab.text = "Vanced"
                         1 -> tab.text = "Manager"
                     }
-
                 else
                     when (position) {
                         0 -> tab.text = "Vanced"
@@ -93,7 +102,7 @@ class HomeFragment : Home() {
 
     private fun cardExpandCollapse() {
         with(binding.includeChangelogsLayout) {
-            activity?.runOnUiThread { viewModel?.expanded?.set(!isExpanded) }
+            binding.viewModel.expanded.set(!isExpanded)
             changelogButton.animate().apply {
                 rotation(if (isExpanded) 0F else 180F)
                 interpolator = AccelerateDecelerateInterpolator()
@@ -112,7 +121,10 @@ class HomeFragment : Home() {
             when (intent.action) {
                 MICROG_DOWNLOADED -> binding.includeMicrogLayout.microgInstalling.visibility = View.VISIBLE
                 VANCED_DOWNLOADED -> binding.includeVancedLayout.vancedInstalling.visibility = View.VISIBLE
-                REFRESH_HOME -> activity?.runOnUiThread { viewModel.fetchData() }
+                REFRESH_HOME ->  {
+                    binding.viewModel.fetchData()
+                    Log.d("VMRefresh", "Refreshing home page")
+                }
             }
         }
     }

app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt

@@ -62,9 +62,7 @@ class UpdateCheckFragment : DialogFragment() {
                 view?.findViewById<Button>(R.id.update_center_recheck)?.visibility = View.GONE
                 checkingTxt?.text = getString(R.string.update_found)
 
-                updatebtn?.setOnClickListener {
+                updatebtn?.setOnClickListener { upgradeManager() }
-                    upgradeManager()
-                }
             } else
                 checkingTxt?.text = getString(R.string.update_notfound)
         }
@@ -118,7 +116,7 @@ class UpdateCheckFragment : DialogFragment() {
         override fun onReceive(context: Context?, intent: Intent?) {
             if (intent?.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) == downloadId) {
                 activity?.let {
-                    val apk = File("${activity?.filesDir?.path}/manager.apk")
+                    val apk = File("${activity?.getExternalFilesDir("apk")}/manager.apk")
                     val uri =
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
                             FileProvider.getUriForFile(activity!!, "${activity?.packageName}.provider", apk)

app/src/main/res/layout/include_vanced.xml

@@ -49,10 +49,9 @@
                     android:id="@+id/vanced_installbtn"
                     style="@style/ButtonStyle"
                     android:text="@{viewModel.vancedInstallButtonTxt}"
-                    android:textColor="@{viewModel.shouldBeDisabled ? @color/LightGray : @color/White}"
+                    android:textColor="@color/White"
-                    android:backgroundTint="@{viewModel.shouldBeDisabled ? @drawable/Gray : @drawable/Accent}"
+                    android:backgroundTint="?colorPrimary"
                     app:icon="@{viewModel.vancedInstallButtonIcon}"
-                    android:clickable="@{!viewModel.shouldBeDisabled}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 

app/src/main/res/values/colors.xml

@@ -16,7 +16,4 @@
 
     <color name="Accent">?attr/colorPrimary</color>
 
-    <drawable name="Accent">?attr/colorPrimary</drawable>
-    <drawable name="Gray">@color/Gray</drawable>
-
 </resources>