ReVanced-Mirror/revanced-manager
1
0
Fork 0
mirror of https://github.com/revanced/revanced-manager synced 2024-05-14 13:56:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: rename ViewModels for consistency

Browse Source
This commit is contained in:
CnC-Robert 2023-06-03 23:27:01 +02:00
parent ffa8d9c063
commit e088d053ab
6 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/app/revanced/manager/compose/di/ViewModelModule.kt
View File

@ -9,7 +9,7 @@ val viewModelModule = module {
viewModelOf(::PatchesSelectorViewModel) viewModelOf(::PatchesSelectorViewModel)
viewModelOf(::SettingsViewModel) viewModelOf(::SettingsViewModel)
viewModelOf(::AppSelectorViewModel) viewModelOf(::AppSelectorViewModel)
viewModelOf(::SourcesScreenViewModel) viewModelOf(::SourcesViewModel)
viewModelOf(::InstallerScreenViewModel) viewModelOf(::InstallerViewModel)
viewModelOf(::UpdateSettingsViewModel) viewModelOf(::UpdateSettingsViewModel)
} }

4
app/src/main/java/app/revanced/manager/compose/ui/component/sources/SourceItem.kt
View File

@ -17,7 +17,7 @@ import app.revanced.manager.compose.R
import app.revanced.manager.compose.domain.sources.LocalSource import app.revanced.manager.compose.domain.sources.LocalSource
import app.revanced.manager.compose.domain.sources.RemoteSource import app.revanced.manager.compose.domain.sources.RemoteSource
import app.revanced.manager.compose.domain.sources.Source import app.revanced.manager.compose.domain.sources.Source
import app.revanced.manager.compose.ui.viewmodel.SourcesScreenViewModel import app.revanced.manager.compose.ui.viewmodel.SourcesViewModel
import app.revanced.manager.compose.util.uiSafe import app.revanced.manager.compose.util.uiSafe
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import java.io.InputStream import java.io.InputStream
@ -108,7 +108,7 @@ private fun RemoteSourceItem(source: RemoteSource) {
Button(onClick = { Button(onClick = {
coroutineScope.launch { coroutineScope.launch {
uiSafe(androidContext, R.string.source_download_fail, SourcesScreenViewModel.failLogMsg) { uiSafe(androidContext, R.string.source_download_fail, SourcesViewModel.failLogMsg) {
source.update() source.update()
} }
} }

4
app/src/main/java/app/revanced/manager/compose/ui/screen/InstallerScreen.kt
View File

@ -33,7 +33,7 @@ import app.revanced.manager.compose.patcher.worker.StepGroup
import app.revanced.manager.compose.patcher.worker.StepStatus import app.revanced.manager.compose.patcher.worker.StepStatus
import app.revanced.manager.compose.ui.component.AppScaffold import app.revanced.manager.compose.ui.component.AppScaffold
import app.revanced.manager.compose.ui.component.AppTopBar import app.revanced.manager.compose.ui.component.AppTopBar
import app.revanced.manager.compose.ui.viewmodel.InstallerScreenViewModel import app.revanced.manager.compose.ui.viewmodel.InstallerViewModel
import app.revanced.manager.compose.util.APK_MIMETYPE import app.revanced.manager.compose.util.APK_MIMETYPE
import kotlin.math.floor import kotlin.math.floor
@ -41,7 +41,7 @@ import kotlin.math.floor
@Composable @Composable
fun InstallerScreen( fun InstallerScreen(
onBackClick: () -> Unit, onBackClick: () -> Unit,
vm: InstallerScreenViewModel vm: InstallerViewModel
) { ) {
val exportApkLauncher = rememberLauncherForActivityResult(CreateDocument(APK_MIMETYPE), vm::export) val exportApkLauncher = rememberLauncherForActivityResult(CreateDocument(APK_MIMETYPE), vm::export)

6
app/src/main/java/app/revanced/manager/compose/ui/screen/SourcesScreen.kt
View File

@ -10,12 +10,12 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import app.revanced.manager.compose.R import app.revanced.manager.compose.R
import app.revanced.manager.compose.ui.component.sources.NewSourceDialog import app.revanced.manager.compose.ui.component.sources.NewSourceDialog
import app.revanced.manager.compose.ui.component.sources.SourceItem import app.revanced.manager.compose.ui.component.sources.SourceItem
import app.revanced.manager.compose.ui.viewmodel.SourcesScreenViewModel import app.revanced.manager.compose.ui.viewmodel.SourcesViewModel
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.koin.androidx.compose.getViewModel import org.koin.androidx.compose.getViewModel
@Composable @Composable
fun SourcesScreen(vm: SourcesScreenViewModel = getViewModel()) { fun SourcesScreen(vm: SourcesViewModel = getViewModel()) {
var showNewSourceDialog by rememberSaveable { mutableStateOf(false) } var showNewSourceDialog by rememberSaveable { mutableStateOf(false) }
val scope = rememberCoroutineScope() val scope = rememberCoroutineScope()
@ -39,7 +39,7 @@ fun SourcesScreen(vm: SourcesScreenViewModel = getViewModel()) {
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxWidth(), .fillMaxSize(),
) { ) {
sources.forEach { (name, source) -> sources.forEach { (name, source) ->
SourceItem( SourceItem(

3
app/src/main/java/app/revanced/manager/compose/ui/viewmodel/InstallerScreenViewModel.kt → app/src/main/java/app/revanced/manager/compose/ui/viewmodel/InstallerViewModel.kt
View File

@ -5,7 +5,6 @@ import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.IntentFilter import android.content.IntentFilter
import android.content.pm.PackageInfo
import android.content.pm.PackageInstaller import android.content.pm.PackageInstaller
import android.net.Uri import android.net.Uri
import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.derivedStateOf
@ -33,7 +32,7 @@ import org.koin.core.component.inject
import java.io.File import java.io.File
import java.nio.file.Files import java.nio.file.Files
class InstallerScreenViewModel( class InstallerViewModel(
input: AppInfo, input: AppInfo,
selectedPatches: PatchesSelection selectedPatches: PatchesSelection
) : ViewModel(), KoinComponent { ) : ViewModel(), KoinComponent {

5
app/src/main/java/app/revanced/manager/compose/ui/viewmodel/SourcesScreenViewModel.kt → app/src/main/java/app/revanced/manager/compose/ui/viewmodel/SourcesViewModel.kt
View File

@ -3,9 +3,6 @@ package app.revanced.manager.compose.ui.viewmodel
import android.app.Application import android.app.Application
import android.content.ContentResolver import android.content.ContentResolver
import android.net.Uri import android.net.Uri
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import app.revanced.manager.compose.R import app.revanced.manager.compose.R
@ -15,7 +12,7 @@ import app.revanced.manager.compose.util.uiSafe
import io.ktor.http.* import io.ktor.http.*
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
class SourcesScreenViewModel(private val app: Application, private val sourceRepository: SourceRepository) : ViewModel() { class SourcesViewModel(private val app: Application, private val sourceRepository: SourceRepository) : ViewModel() {
val sources = sourceRepository.sources val sources = sourceRepository.sources
private val contentResolver: ContentResolver = app.contentResolver private val contentResolver: ContentResolver = app.contentResolver