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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/vanced/manager/ui/fragments/HomeViewModel.kt
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
} }
*/

176
app/src/main/res/layout/include_microg.xml
View File

@ -1,115 +1,103 @@
<?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"
style="@style/MaterialCard">
<data> <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<variable <ImageView
name="viewModel" android:id="@+id/home_microg_logo"
type="com.vanced.manager.ui.fragments.HomeViewModel" /> 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" />
</data> <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" />
<com.google.android.material.card.MaterialCardView <com.google.android.material.button.MaterialButton
style="@style/MaterialCard"> 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" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.Barrier
android:id="@+id/microg_title_buttons_barrier"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="microg_title, microg_installbtn"/>
<ImageView <LinearLayout
android:id="@+id/home_microg_logo" android:id="@+id/microg_remote_latest_version"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_microg" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/microg_title_buttons_barrier"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@id/linearLayout2">
app:layout_constraintBottom_toTopOf="@id/microg_title_buttons_barrier" />
<TextView <TextView
style="@style/TextAppTitle" style="@style/AppVer"
android:id="@+id/microg_title" android:id="@+id/microg_latest"
android:text="@string/microg" android:text="@string/latest" />
app:layout_constraintStart_toEndOf="@id/home_microg_logo"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/microg_title_buttons_barrier" />
<com.google.android.material.button.MaterialButton <TextView
android:id="@+id/microg_installbtn" style="@style/AppVer.Bold"
style="@style/ButtonStyle" android:id="@+id/microg_latest_version"
android:text="@string/install" android:text="@string/loading" />
app:icon="@drawable/outline_cloud_download_24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/microg_uninstallbtn" />
<androidx.constraintlayout.widget.Barrier </LinearLayout>
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 <LinearLayout
android:id="@+id/microg_remote_latest_version" android:id="@+id/linearLayout2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/microg_title_buttons_barrier" app:layout_constraintTop_toBottomOf="@id/microg_remote_latest_version"
app:layout_constraintBottom_toTopOf="@id/linearLayout2"> app:layout_constraintBottom_toBottomOf="parent">
<TextView <TextView
style="@style/AppVer" style="@style/AppVer"
android:id="@+id/microg_latest" android:id="@+id/microg_installed"
android:text="@string/latest" /> android:text="@string/installed" />
<TextView <TextView
style="@style/AppVer.Bold" style="@style/AppVer.Bold"
android:id="@+id/microg_latest_version" android:id="@+id/microg_installed_version"
android:text="@{ viewModel.isConnected ? viewModel.microgLatestTxt : @string/unavailable}" /> android:text="@string/loading" />
</LinearLayout> </LinearLayout>
<LinearLayout <ImageView
android:id="@+id/linearLayout2" style="@style/ClickableImageWidget"
android:layout_width="wrap_content" android:id="@+id/microg_settingsbtn"
android:layout_height="wrap_content" app:srcCompat="@drawable/ic_microg_settings"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/microg_remote_latest_version" app:layout_constraintEnd_toStartOf="@id/microg_uninstallbtn"
app:layout_constraintBottom_toBottomOf="parent"> app:layout_constraintTop_toBottomOf="@id/microg_title_buttons_barrier"
android:layout_marginEnd="4dp"/>
<TextView <ImageView
style="@style/AppVer" style="@style/ClickableImageWidget.Red"
android:id="@+id/microg_installed" android:id="@+id/microg_uninstallbtn"
android:text="@string/installed" /> 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 </androidx.constraintlayout.widget.ConstraintLayout>
style="@style/AppVer.Bold"
android:id="@+id/microg_installed_version"
android:text="@string/loading" />
</LinearLayout> </com.google.android.material.card.MaterialCardView>
<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>

160
app/src/main/res/layout/include_vanced.xml
View File

@ -1,108 +1,96 @@
<?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"
style="@style/MaterialCard"
tools:ignore="ContentDescription, KeyboardInaccessibleWidget">
<data> <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<variable <ImageView
name="viewModel" android:id="@+id/home_vanced_logo"
type="com.vanced.manager.ui.fragments.HomeViewModel" /> 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" />
</data> <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" />
<com.google.android.material.card.MaterialCardView <com.google.android.material.button.MaterialButton
style="@style/MaterialCard" android:id="@+id/vanced_installbtn"
tools:ignore="ContentDescription, KeyboardInaccessibleWidget"> style="@style/ButtonStyle"
android:text="@string/install"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:icon="@drawable/outline_cloud_download_24" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.Barrier
android:id="@+id/vanced_title_buttons_barrier"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="home_vanced_logo, vanced_title, vanced_installbtn"/>
<ImageView <ImageView
android:id="@+id/home_vanced_logo" style="@style/ClickableImageWidget.Red"
android:layout_width="wrap_content" android:id="@+id/vanced_uninstallbtn"
android:layout_height="wrap_content" app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@drawable/ic_vanced" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/vanced_title_buttons_barrier"
app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/ic_delete_black_24dp" />
app:layout_constraintBottom_toTopOf="@id/vanced_title_buttons_barrier" />
<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 <TextView
style="@style/TextAppTitle" style="@style/AppVer"
android:id="@+id/vanced_title" android:id="@+id/vanced_latest"
android:text="@string/vanced" android:text="@string/latest" />
app:layout_constraintStart_toEndOf="@id/home_vanced_logo"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/vanced_title_buttons_barrier" />
<com.google.android.material.button.MaterialButton <TextView
android:id="@+id/vanced_installbtn" style="@style/AppVer.Bold"
style="@style/ButtonStyle" android:id="@+id/vanced_latest_version"
android:text="@string/install" android:text="@string/loading" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:icon="@drawable/outline_cloud_download_24" />
<androidx.constraintlayout.widget.Barrier </LinearLayout>
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"/>
<ImageView <LinearLayout
style="@style/ClickableImageWidget.Red" android:id="@+id/linearLayout2"
android:id="@+id/vanced_uninstallbtn" android:layout_width="wrap_content"
app:layout_constraintEnd_toEndOf="parent" android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vanced_title_buttons_barrier" app:layout_constraintTop_toBottomOf="@id/vanced_remote_latest_version">
app:srcCompat="@drawable/ic_delete_black_24dp" />
<LinearLayout <TextView
android:id="@+id/vanced_remote_latest_version" style="@style/AppVer"
android:layout_width="wrap_content" android:id="@+id/vanced_installed"
android:layout_height="wrap_content" android:text="@string/installed" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@id/linearLayout2"
app:layout_constraintTop_toBottomOf="@+id/vanced_title_buttons_barrier">
<TextView <TextView
style="@style/AppVer" style="@style/AppVer.Bold"
android:id="@+id/vanced_latest" android:id="@+id/vanced_installed_version"
android:text="@string/latest" /> android:text="@string/loading" />
<TextView </LinearLayout>
style="@style/AppVer.Bold"
android:id="@+id/vanced_latest_version"
android:text="@{ viewModel.isConnected ? viewModel.vancedLatestTxt : @string/unavailable}" />
</LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout </com.google.android.material.card.MaterialCardView>
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>