From d3132b68ddbeb1a68cab759f92b1f19761942794 Mon Sep 17 00:00:00 2001
From: X1nto <burtkni@yandex.ru>
Date: Wed, 20 May 2020 23:40:19 +0400
Subject: [PATCH] viewmodel haha yEs

---
 .../com/vanced/manager/core/fragments/Home.kt |   4 +-
 .../manager/ui/fragments/HomeViewModel.kt     |  15 +-
 app/src/main/res/layout/include_microg.xml    | 176 ++++++++++--------
 app/src/main/res/layout/include_vanced.xml    | 160 ++++++++--------
 4 files changed, 195 insertions(+), 160 deletions(-)

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 6503fc82..82e6733e 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
@@ -48,7 +48,7 @@ open class Home : BaseFragment() {
         val microgStatus = pm?.let { isPackageInstalled("com.mgoogle.android.gms", it) }
         val vancedStatus = pm?.let { isPackageInstalled("com.vanced.android.youtube", it) }
 
-        val vancedLatestTxt = view.findViewById<TextView>(R.id.vanced_latest_version)
+        /*val vancedLatestTxt = view.findViewById<TextView>(R.id.vanced_latest_version)
         val microgLatestTxt = view.findViewById<TextView>(R.id.microg_latest_version)
 
         if (GetJson().isConnected(requireContext())) {
@@ -60,7 +60,7 @@ open class Home : BaseFragment() {
         } else {
             vancedLatestTxt.text = getString(R.string.unavailable)
             microgLatestTxt.text = getString(R.string.unavailable)
-        }
+        }*/
 
         vancedinstallbtn.setOnClickListener {
             view.findNavController().navigate(R.id.toInstallThemeFragment)
diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/HomeViewModel.kt b/app/src/main/java/com/vanced/manager/ui/fragments/HomeViewModel.kt
index 1d7d2c59..5c90bbfa 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/HomeViewModel.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/HomeViewModel.kt
@@ -1,12 +1,16 @@
 package com.vanced.manager.ui.fragments
 
 import android.app.Activity
+import android.app.Application
 import android.content.pm.PackageManager
+import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.ViewModel
+import com.dezlum.codelabs.getjson.GetJson
+import com.google.gson.JsonObject
 
-class HomeViewModel {
+class HomeViewModel(application: Application): AndroidViewModel(application) {
 
-    private val pm: PackageManager? = Activity().packageManager
+    /*private val pm: PackageManager? = Activity().packageManager
 
     //we need to check whether these apps are installed or not
     val microgStatus: Boolean? = pm?.let { isPackageInstalled("com.mgoogle.android.gms", it) }
@@ -23,5 +27,12 @@ class HomeViewModel {
 
     val microgInstalledTxt: String? = pm?.getPackageInfo("com.mgoogle.android.gms", 0)?.versionName
     val vancedInstalledTxt: String? = pm?.getPackageInfo("com.vanced.android.youtube", 0)?.versionName
+    */
+
+    val isConnected: Boolean = GetJson().isConnected(getApplication())
+    private val vancedVer: JsonObject = GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/vanced.json")
+    private val microgVer: JsonObject = GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/microg.json")
+    val vancedLatestTxt: String? = vancedVer.get("version").asString
+    val microgLatestTxt: String? = microgVer.get("version").asString
 
 }
diff --git a/app/src/main/res/layout/include_microg.xml b/app/src/main/res/layout/include_microg.xml
index 123e30b6..07c88e24 100644
--- a/app/src/main/res/layout/include_microg.xml
+++ b/app/src/main/res/layout/include_microg.xml
@@ -1,103 +1,115 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
+<layout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    style="@style/MaterialCard">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    <data>
 
-        <ImageView
-            android:id="@+id/home_microg_logo"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_microg"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/microg_title_buttons_barrier" />
+        <variable
+            name="viewModel"
+            type="com.vanced.manager.ui.fragments.HomeViewModel" />
 
-        <TextView
-            style="@style/TextAppTitle"
-            android:id="@+id/microg_title"
-            android:text="@string/microg"
-            app:layout_constraintStart_toEndOf="@id/home_microg_logo"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/microg_title_buttons_barrier" />
+    </data>
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/microg_installbtn"
-            style="@style/ButtonStyle"
-            android:text="@string/install"
-            app:icon="@drawable/outline_cloud_download_24"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/microg_uninstallbtn" />
+    <com.google.android.material.card.MaterialCardView
+        style="@style/MaterialCard">
 
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/microg_title_buttons_barrier"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:barrierDirection="bottom"
-            app:constraint_referenced_ids="microg_title, microg_installbtn"/>
+            android:layout_height="match_parent">
 
-        <LinearLayout
-            android:id="@+id/microg_remote_latest_version"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/microg_title_buttons_barrier"
-            app:layout_constraintBottom_toTopOf="@id/linearLayout2">
+            <ImageView
+                android:id="@+id/home_microg_logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:srcCompat="@drawable/ic_microg"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/microg_title_buttons_barrier" />
 
             <TextView
-                style="@style/AppVer"
-                android:id="@+id/microg_latest"
-                android:text="@string/latest" />
+                style="@style/TextAppTitle"
+                android:id="@+id/microg_title"
+                android:text="@string/microg"
+                app:layout_constraintStart_toEndOf="@id/home_microg_logo"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/microg_title_buttons_barrier" />
 
-            <TextView
-                style="@style/AppVer.Bold"
-                android:id="@+id/microg_latest_version"
-                android:text="@string/loading" />
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/microg_installbtn"
+                style="@style/ButtonStyle"
+                android:text="@string/install"
+                app:icon="@drawable/outline_cloud_download_24"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/microg_uninstallbtn" />
 
-        </LinearLayout>
+            <androidx.constraintlayout.widget.Barrier
+                android:id="@+id/microg_title_buttons_barrier"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:barrierDirection="bottom"
+                app:constraint_referenced_ids="microg_title, microg_installbtn"/>
 
-        <LinearLayout
-            android:id="@+id/linearLayout2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/microg_remote_latest_version"
-            app:layout_constraintBottom_toBottomOf="parent">
+            <LinearLayout
+                android:id="@+id/microg_remote_latest_version"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/microg_title_buttons_barrier"
+                app:layout_constraintBottom_toTopOf="@id/linearLayout2">
 
-            <TextView
-                style="@style/AppVer"
-                android:id="@+id/microg_installed"
-                android:text="@string/installed" />
+                <TextView
+                    style="@style/AppVer"
+                    android:id="@+id/microg_latest"
+                    android:text="@string/latest" />
 
-            <TextView
-                style="@style/AppVer.Bold"
-                android:id="@+id/microg_installed_version"
-                android:text="@string/loading" />
+                <TextView
+                    style="@style/AppVer.Bold"
+                    android:id="@+id/microg_latest_version"
+                    android:text="@{ viewModel.isConnected ? viewModel.microgLatestTxt : @string/unavailable}" />
 
-        </LinearLayout>
+            </LinearLayout>
 
-        <ImageView
-            style="@style/ClickableImageWidget"
-            android:id="@+id/microg_settingsbtn"
-            app:srcCompat="@drawable/ic_microg_settings"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/microg_uninstallbtn"
-            app:layout_constraintTop_toBottomOf="@id/microg_title_buttons_barrier"
-            android:layout_marginEnd="4dp"/>
+            <LinearLayout
+                android:id="@+id/linearLayout2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/microg_remote_latest_version"
+                app:layout_constraintBottom_toBottomOf="parent">
 
-        <ImageView
-            style="@style/ClickableImageWidget.Red"
-            android:id="@+id/microg_uninstallbtn"
-            app:srcCompat="@drawable/ic_delete_black_24dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/microg_title_buttons_barrier" />
+                <TextView
+                    style="@style/AppVer"
+                    android:id="@+id/microg_installed"
+                    android:text="@string/installed" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+                <TextView
+                    style="@style/AppVer.Bold"
+                    android:id="@+id/microg_installed_version"
+                    android:text="@string/loading" />
 
-</com.google.android.material.card.MaterialCardView>
+            </LinearLayout>
+
+            <ImageView
+                style="@style/ClickableImageWidget"
+                android:id="@+id/microg_settingsbtn"
+                app:srcCompat="@drawable/ic_microg_settings"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/microg_uninstallbtn"
+                app:layout_constraintTop_toBottomOf="@id/microg_title_buttons_barrier"
+                android:layout_marginEnd="4dp"/>
+
+            <ImageView
+                style="@style/ClickableImageWidget.Red"
+                android:id="@+id/microg_uninstallbtn"
+                app:srcCompat="@drawable/ic_delete_black_24dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/microg_title_buttons_barrier" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+</layout>
diff --git a/app/src/main/res/layout/include_vanced.xml b/app/src/main/res/layout/include_vanced.xml
index de250777..b70a6893 100644
--- a/app/src/main/res/layout/include_vanced.xml
+++ b/app/src/main/res/layout/include_vanced.xml
@@ -1,96 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
+<layout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    style="@style/MaterialCard"
-    tools:ignore="ContentDescription, KeyboardInaccessibleWidget">
+    xmlns:tools="http://schemas.android.com/tools">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+    <data>
 
-        <ImageView
-            android:id="@+id/home_vanced_logo"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_vanced"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/vanced_title_buttons_barrier" />
+        <variable
+            name="viewModel"
+            type="com.vanced.manager.ui.fragments.HomeViewModel" />
 
-        <TextView
-            style="@style/TextAppTitle"
-            android:id="@+id/vanced_title"
-            android:text="@string/vanced"
-            app:layout_constraintStart_toEndOf="@id/home_vanced_logo"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/vanced_title_buttons_barrier" />
+    </data>
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/vanced_installbtn"
-            style="@style/ButtonStyle"
-            android:text="@string/install"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:icon="@drawable/outline_cloud_download_24" />
+    <com.google.android.material.card.MaterialCardView
+        style="@style/MaterialCard"
+        tools:ignore="ContentDescription, KeyboardInaccessibleWidget">
 
-        <androidx.constraintlayout.widget.Barrier
-            android:id="@+id/vanced_title_buttons_barrier"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:barrierDirection="bottom"
-            app:constraint_referenced_ids="home_vanced_logo, vanced_title, vanced_installbtn"/>
+            android:layout_height="wrap_content">
 
-        <ImageView
-            style="@style/ClickableImageWidget.Red"
-            android:id="@+id/vanced_uninstallbtn"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vanced_title_buttons_barrier"
-            app:srcCompat="@drawable/ic_delete_black_24dp" />
-
-        <LinearLayout
-            android:id="@+id/vanced_remote_latest_version"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintBottom_toTopOf="@id/linearLayout2"
-            app:layout_constraintTop_toBottomOf="@+id/vanced_title_buttons_barrier">
+            <ImageView
+                android:id="@+id/home_vanced_logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:srcCompat="@drawable/ic_vanced"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/vanced_title_buttons_barrier" />
 
             <TextView
-                style="@style/AppVer"
-                android:id="@+id/vanced_latest"
-                android:text="@string/latest" />
+                style="@style/TextAppTitle"
+                android:id="@+id/vanced_title"
+                android:text="@string/vanced"
+                app:layout_constraintStart_toEndOf="@id/home_vanced_logo"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/vanced_title_buttons_barrier" />
 
-            <TextView
-                style="@style/AppVer.Bold"
-                android:id="@+id/vanced_latest_version"
-                android:text="@string/loading" />
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/vanced_installbtn"
+                style="@style/ButtonStyle"
+                android:text="@string/install"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:icon="@drawable/outline_cloud_download_24" />
 
-        </LinearLayout>
+            <androidx.constraintlayout.widget.Barrier
+                android:id="@+id/vanced_title_buttons_barrier"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:barrierDirection="bottom"
+                app:constraint_referenced_ids="home_vanced_logo, vanced_title, vanced_installbtn"/>
 
-        <LinearLayout
-            android:id="@+id/linearLayout2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vanced_remote_latest_version">
+            <ImageView
+                style="@style/ClickableImageWidget.Red"
+                android:id="@+id/vanced_uninstallbtn"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/vanced_title_buttons_barrier"
+                app:srcCompat="@drawable/ic_delete_black_24dp" />
 
-            <TextView
-                style="@style/AppVer"
-                android:id="@+id/vanced_installed"
-                android:text="@string/installed" />
+            <LinearLayout
+                android:id="@+id/vanced_remote_latest_version"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/linearLayout2"
+                app:layout_constraintTop_toBottomOf="@+id/vanced_title_buttons_barrier">
 
-            <TextView
-                style="@style/AppVer.Bold"
-                android:id="@+id/vanced_installed_version"
-                android:text="@string/loading" />
+                <TextView
+                    style="@style/AppVer"
+                    android:id="@+id/vanced_latest"
+                    android:text="@string/latest" />
 
-        </LinearLayout>
+                <TextView
+                    style="@style/AppVer.Bold"
+                    android:id="@+id/vanced_latest_version"
+                    android:text="@{ viewModel.isConnected ? viewModel.vancedLatestTxt : @string/unavailable}" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            </LinearLayout>
 
-</com.google.android.material.card.MaterialCardView>
+            <LinearLayout
+                android:id="@+id/linearLayout2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/vanced_remote_latest_version">
+
+                <TextView
+                    style="@style/AppVer"
+                    android:id="@+id/vanced_installed"
+                    android:text="@string/installed" />
+
+                <TextView
+                    style="@style/AppVer.Bold"
+                    android:id="@+id/vanced_installed_version"
+                    android:text="@string/loading" />
+
+            </LinearLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+</layout>