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

viewmodel haha yEs

This commit is contained in:
X1nto 2020-05-20 23:40:19 +04:00
parent 4746a3e696
commit d3132b68dd
4 changed files with 195 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ open class Home : BaseFragment() {
val microgStatus = pm?.let { isPackageInstalled("com.mgoogle.android.gms", it) } val microgStatus = pm?.let { isPackageInstalled("com.mgoogle.android.gms", it) }
val vancedStatus = pm?.let { isPackageInstalled("com.vanced.android.youtube", 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) val microgLatestTxt = view.findViewById<TextView>(R.id.microg_latest_version)
if (GetJson().isConnected(requireContext())) { if (GetJson().isConnected(requireContext())) {
@ -60,7 +60,7 @@ open class Home : BaseFragment() {
} else { } else {
vancedLatestTxt.text = getString(R.string.unavailable) vancedLatestTxt.text = getString(R.string.unavailable)
microgLatestTxt.text = getString(R.string.unavailable) microgLatestTxt.text = getString(R.string.unavailable)
} }*/
vancedinstallbtn.setOnClickListener { vancedinstallbtn.setOnClickListener {
view.findNavController().navigate(R.id.toInstallThemeFragment) view.findNavController().navigate(R.id.toInstallThemeFragment)

15
app/src/main/java/com/vanced/manager/ui/fragments/HomeViewModel.kt
View File

@ -1,12 +1,16 @@
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.content.pm.PackageManager import android.content.pm.PackageManager
import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.ViewModel 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 //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) }
@ -23,5 +27,12 @@ class HomeViewModel {
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())
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
} }

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

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

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

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