viewmodel haha nO

This commit is contained in:
X1nto 2020-05-20 23:52:08 +04:00
parent d3132b68dd
commit f1da774205
3 changed files with 160 additions and 182 deletions

View File

@ -1,5 +1,6 @@
package com.vanced.manager.ui.fragments package com.vanced.manager.ui.fragments
/*
import android.app.Activity import android.app.Activity
import android.app.Application import android.app.Application
import android.content.pm.PackageManager import android.content.pm.PackageManager
@ -10,7 +11,7 @@ import com.google.gson.JsonObject
class HomeViewModel(application: Application): AndroidViewModel(application) { 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 //we need to check whether these apps are installed or not
val microgStatus: Boolean? = pm?.let { isPackageInstalled("com.mgoogle.android.gms", it) } val microgStatus: Boolean? = pm?.let { isPackageInstalled("com.mgoogle.android.gms", it) }
@ -27,7 +28,7 @@ class HomeViewModel(application: Application): AndroidViewModel(application) {
val microgInstalledTxt: String? = pm?.getPackageInfo("com.mgoogle.android.gms", 0)?.versionName val microgInstalledTxt: String? = pm?.getPackageInfo("com.mgoogle.android.gms", 0)?.versionName
val vancedInstalledTxt: String? = pm?.getPackageInfo("com.vanced.android.youtube", 0)?.versionName val vancedInstalledTxt: String? = pm?.getPackageInfo("com.vanced.android.youtube", 0)?.versionName
*/
val isConnected: Boolean = GetJson().isConnected(getApplication()) val isConnected: Boolean = GetJson().isConnected(getApplication())
private val vancedVer: JsonObject = GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/vanced.json") private val vancedVer: JsonObject = GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/vanced.json")
@ -36,3 +37,4 @@ class HomeViewModel(application: Application): AndroidViewModel(application) {
val microgLatestTxt: String? = microgVer.get("version").asString val microgLatestTxt: String? = microgVer.get("version").asString
} }
*/

View File

@ -1,17 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<variable
name="viewModel"
type="com.vanced.manager.ui.fragments.HomeViewModel" />
</data>
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/MaterialCard"> style="@style/MaterialCard">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
@ -67,7 +57,7 @@
<TextView <TextView
style="@style/AppVer.Bold" style="@style/AppVer.Bold"
android:id="@+id/microg_latest_version" android:id="@+id/microg_latest_version"
android:text="@{ viewModel.isConnected ? viewModel.microgLatestTxt : @string/unavailable}" /> android:text="@string/loading" />
</LinearLayout> </LinearLayout>
@ -111,5 +101,3 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>
</layout>

View File

@ -1,18 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout <com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools"
<data>
<variable
name="viewModel"
type="com.vanced.manager.ui.fragments.HomeViewModel" />
</data>
<com.google.android.material.card.MaterialCardView
style="@style/MaterialCard" style="@style/MaterialCard"
tools:ignore="ContentDescription, KeyboardInaccessibleWidget"> tools:ignore="ContentDescription, KeyboardInaccessibleWidget">
@ -76,7 +66,7 @@
<TextView <TextView
style="@style/AppVer.Bold" style="@style/AppVer.Bold"
android:id="@+id/vanced_latest_version" android:id="@+id/vanced_latest_version"
android:text="@{ viewModel.isConnected ? viewModel.vancedLatestTxt : @string/unavailable}" /> android:text="@string/loading" />
</LinearLayout> </LinearLayout>
@ -103,6 +93,4 @@
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>
</layout>