nomad/ananas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change multiple ViewModels to AndroidViewModels

Browse source
This commit is contained in:
Jarne Demeulemeester 2021-06-18 23:56:57 +02:00
parent 0b663b1d17
commit 74eb9f30a5
No known key found for this signature in database
GPG key ID: 60884A0C1EBA43E5
12 changed files with 17 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/dev/jdtech/jellyfin/fragments/AddServerFragment.kt
View file

@ -10,18 +10,15 @@ import androidx.navigation.fragment.findNavController
import dev.jdtech.jellyfin.R
import dev.jdtech.jellyfin.databinding.FragmentAddServerBinding
import dev.jdtech.jellyfin.viewmodels.AddServerViewModel
import dev.jdtech.jellyfin.viewmodels.AddServerViewModelFactory
class AddServerFragment : Fragment() {
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View {
val application = requireNotNull(this.activity).application
val binding = FragmentAddServerBinding.inflate(inflater)
val viewModelFactory = AddServerViewModelFactory(application)
val viewModel =
ViewModelProvider(this, viewModelFactory).get(AddServerViewModel::class.java)
ViewModelProvider(this).get(AddServerViewModel::class.java)
binding.lifecycleOwner = this
binding.viewModel = viewModel

5
app/src/main/java/dev/jdtech/jellyfin/fragments/HomeFragment.kt
View file

@ -9,7 +9,6 @@ import androidx.lifecycle.ViewModelProvider
import dev.jdtech.jellyfin.adapters.ViewListAdapter
import dev.jdtech.jellyfin.databinding.FragmentHomeBinding
import dev.jdtech.jellyfin.viewmodels.HomeViewModel
import dev.jdtech.jellyfin.viewmodels.HomeViewModelFactory
class HomeFragment : Fragment() {
override fun onCreateView(
@ -17,10 +16,8 @@ class HomeFragment : Fragment() {
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
val application = requireNotNull(this.activity).application
val binding = FragmentHomeBinding.inflate(inflater, container, false)
val viewModelFactory = HomeViewModelFactory(application)
val viewModel = ViewModelProvider(this, viewModelFactory).get(HomeViewModel::class.java)
val viewModel = ViewModelProvider(this).get(HomeViewModel::class.java)
binding.lifecycleOwner = this
binding.viewModel = viewModel

5
app/src/main/java/dev/jdtech/jellyfin/fragments/LoginFragment.kt
View file

@ -10,17 +10,14 @@ import androidx.navigation.fragment.findNavController
import dev.jdtech.jellyfin.R
import dev.jdtech.jellyfin.databinding.FragmentLoginBinding
import dev.jdtech.jellyfin.viewmodels.LoginViewModel
import dev.jdtech.jellyfin.viewmodels.LoginViewModelFactory
class LoginFragment : Fragment() {
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View {
val application = requireNotNull(this.activity).application
val binding = FragmentLoginBinding.inflate(inflater)
val viewModelFactory = LoginViewModelFactory(application)
val viewModel = ViewModelProvider(this, viewModelFactory).get(LoginViewModel::class.java)
val viewModel = ViewModelProvider(this).get(LoginViewModel::class.java)
binding.lifecycleOwner = this
binding.viewModel = viewModel

5
app/src/main/java/dev/jdtech/jellyfin/fragments/MediaFragment.kt
View file

@ -11,7 +11,6 @@ import dev.jdtech.jellyfin.R
import dev.jdtech.jellyfin.adapters.CollectionListAdapter
import dev.jdtech.jellyfin.databinding.FragmentMediaBinding
import dev.jdtech.jellyfin.viewmodels.MediaViewModel
import dev.jdtech.jellyfin.viewmodels.MediaViewModelFactory
class MediaFragment : Fragment() {
override fun onCreateView(
@ -19,10 +18,8 @@ class MediaFragment : Fragment() {
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
val application = requireNotNull(this.activity).application
val binding = FragmentMediaBinding.inflate(inflater, container, false)
val viewModelFactory = MediaViewModelFactory(application)
val viewModel = ViewModelProvider(this, viewModelFactory).get(MediaViewModel::class.java)
val viewModel = ViewModelProvider(this).get(MediaViewModel::class.java)
binding.lifecycleOwner = this
binding.viewModel = viewModel

11
app/src/main/java/dev/jdtech/jellyfin/viewmodels/AddServerViewModel.kt
View file

@ -2,10 +2,7 @@ package dev.jdtech.jellyfin.viewmodels
import android.app.Application
import android.util.Log
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import androidx.lifecycle.*
import dev.jdtech.jellyfin.api.JellyfinApi
import dev.jdtech.jellyfin.database.Server
import dev.jdtech.jellyfin.database.ServerDatabase
@ -14,7 +11,7 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.lang.Exception
class AddServerViewModel(val application: Application) : ViewModel() {
class AddServerViewModel(application: Application) : AndroidViewModel(application) {
private val database = ServerDatabase.getInstance(application).serverDatabaseDao
private val _navigateToLogin = MutableLiveData<Boolean>()
@ -23,6 +20,8 @@ class AddServerViewModel(val application: Application) : ViewModel() {
private val _error = MutableLiveData<String>()
val error: LiveData<String> = _error
private val app = application
/**
* Run multiple check on the server before continuing:
*
@ -33,7 +32,7 @@ class AddServerViewModel(val application: Application) : ViewModel() {
_error.value = null
viewModelScope.launch {
val jellyfinApi = JellyfinApi.newInstance(application, baseUrl)
val jellyfinApi = JellyfinApi.newInstance(app, baseUrl)
try {
val publicSystemInfo by jellyfinApi.systemApi.getPublicSystemInfo()
Log.i("AddServerViewModel", "Remote server: ${publicSystemInfo.id}")

18
app/src/main/java/dev/jdtech/jellyfin/viewmodels/AddServerViewModelFactory.kt
View file

@ -1,18 +0,0 @@
package dev.jdtech.jellyfin.viewmodels
import android.app.Application
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import java.lang.IllegalArgumentException
class AddServerViewModelFactory(
private val application: Application
) : ViewModelProvider.Factory {
override fun <T : ViewModel?> create(modelClass: Class<T>): T {
if (modelClass.isAssignableFrom(AddServerViewModel::class.java)) {
@Suppress("UNCHECKED_CAST")
return AddServerViewModel(application) as T
}
throw IllegalArgumentException("Unknown ViewModel class")
}
}

2
app/src/main/java/dev/jdtech/jellyfin/viewmodels/HomeViewModel.kt
View file

@ -13,7 +13,7 @@ import java.util.*
class HomeViewModel(
application: Application
) : ViewModel() {
) : AndroidViewModel(application) {
private val jellyfinApi = JellyfinApi.getInstance(application, "")
private val _views = MutableLiveData<List<View>>()

18
app/src/main/java/dev/jdtech/jellyfin/viewmodels/HomeViewModelFactory.kt
View file

@ -1,18 +0,0 @@
package dev.jdtech.jellyfin.viewmodels
import android.app.Application
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import java.lang.IllegalArgumentException
class HomeViewModelFactory(
private val application: Application
) : ViewModelProvider.Factory {
override fun <T : ViewModel?> create(modelClass: Class<T>): T {
if (modelClass.isAssignableFrom(HomeViewModel::class.java)) {
@Suppress("UNCHECKED_CAST")
return HomeViewModel(application) as T
}
throw IllegalArgumentException("Unknown ViewModel class")
}
}

7
app/src/main/java/dev/jdtech/jellyfin/viewmodels/LoginViewModel.kt
View file

@ -2,10 +2,7 @@ package dev.jdtech.jellyfin.viewmodels
import android.app.Application
import android.util.Log
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import androidx.lifecycle.*
import dev.jdtech.jellyfin.api.JellyfinApi
import dev.jdtech.jellyfin.database.Server
import dev.jdtech.jellyfin.database.ServerDatabase
@ -15,7 +12,7 @@ import kotlinx.coroutines.withContext
import org.jellyfin.sdk.model.api.AuthenticateUserByName
import java.lang.Exception
class LoginViewModel(application: Application) : ViewModel() {
class LoginViewModel(application: Application) : AndroidViewModel(application) {
// BaseUrl can be empty string because we want to get the existing instance.
private val jellyfinApi = JellyfinApi.getInstance(application, "")
private val database = ServerDatabase.getInstance(application).serverDatabaseDao

18
app/src/main/java/dev/jdtech/jellyfin/viewmodels/LoginViewModelFactory.kt
View file

@ -1,18 +0,0 @@
package dev.jdtech.jellyfin.viewmodels
import android.app.Application
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import java.lang.IllegalArgumentException
class LoginViewModelFactory(
private val application: Application
) : ViewModelProvider.Factory {
override fun <T : ViewModel?> create(modelClass: Class<T>): T {
if (modelClass.isAssignableFrom(LoginViewModel::class.java)) {
@Suppress("UNCHECKED_CAST")
return LoginViewModel(application) as T
}
throw IllegalArgumentException("Unknown ViewModel class")
}
}

13
app/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaViewModel.kt
View file

@ -1,10 +1,7 @@
package dev.jdtech.jellyfin.viewmodels
import android.app.Application
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import androidx.lifecycle.*
import dev.jdtech.jellyfin.api.JellyfinApi
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
@ -13,12 +10,12 @@ import org.jellyfin.sdk.model.api.BaseItemDto
import java.util.*
class MediaViewModel(
val application: Application
) : ViewModel() {
application: Application
) : AndroidViewModel(application) {
private val jellyfinApi = JellyfinApi.getInstance(application, "")
private val _collections = MutableLiveData<List<BaseItemDto>>()
val collections : LiveData<List<BaseItemDto>> = _collections
val collections: LiveData<List<BaseItemDto>> = _collections
private val _finishedLoading = MutableLiveData<Boolean>()
val finishedLoading: LiveData<Boolean> = _finishedLoading
@ -31,7 +28,7 @@ class MediaViewModel(
}
}
private suspend fun getItems(userId: UUID) : List<BaseItemDto>? {
private suspend fun getItems(userId: UUID): List<BaseItemDto>? {
var items: List<BaseItemDto>?
withContext(Dispatchers.IO) {
items = jellyfinApi.itemsApi.getItems(userId).content.items

18
app/src/main/java/dev/jdtech/jellyfin/viewmodels/MediaViewModelFactory.kt
View file

@ -1,18 +0,0 @@
package dev.jdtech.jellyfin.viewmodels
import android.app.Application
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import java.lang.IllegalArgumentException
class MediaViewModelFactory(
private val application: Application
) : ViewModelProvider.Factory {
override fun <T : ViewModel?> create(modelClass: Class<T>): T {
if (modelClass.isAssignableFrom(MediaViewModel::class.java)) {
@Suppress("UNCHECKED_CAST")
return MediaViewModel(application) as T
}
throw IllegalArgumentException("Unknown ViewModel class")
}
}