ReVanced-Mirror/revanced-manager-compose
1
0
Fork 0
mirror of https://github.com/revanced/revanced-manager-compose synced 2024-06-16 10:00:00 +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 b8c58c0695
commit d2af48ff48
No known key found for this signature in database
GPG Key ID: C58ED617AEA8CB68
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(::SettingsViewModel)
viewModelOf(::AppSelectorViewModel)
viewModelOf(::SourcesScreenViewModel)
viewModelOf(::InstallerScreenViewModel)
viewModelOf(::SourcesViewModel)
viewModelOf(::InstallerViewModel)
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.RemoteSource
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 kotlinx.coroutines.launch
import java.io.InputStream
@ -108,7 +108,7 @@ private fun RemoteSourceItem(source: RemoteSource) {
Button(onClick = {
coroutineScope.launch {
uiSafe(androidContext, R.string.source_download_fail, SourcesScreenViewModel.failLogMsg) {
uiSafe(androidContext, R.string.source_download_fail, SourcesViewModel.failLogMsg) {
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.ui.component.AppScaffold
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 kotlin.math.floor
@ -41,7 +41,7 @@ import kotlin.math.floor
@Composable
fun InstallerScreen(
onBackClick: () -> Unit,
vm: InstallerScreenViewModel
vm: InstallerViewModel
) {
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.ui.component.sources.NewSourceDialog
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 org.koin.androidx.compose.getViewModel
@Composable
fun SourcesScreen(vm: SourcesScreenViewModel = getViewModel()) {
fun SourcesScreen(vm: SourcesViewModel = getViewModel()) {
var showNewSourceDialog by rememberSaveable { mutableStateOf(false) }
val scope = rememberCoroutineScope()
@ -39,7 +39,7 @@ fun SourcesScreen(vm: SourcesScreenViewModel = getViewModel()) {
Column(
modifier = Modifier
.fillMaxWidth(),
.fillMaxSize(),
) {
sources.forEach { (name, source) ->
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.Intent
import android.content.IntentFilter
import android.content.pm.PackageInfo
import android.content.pm.PackageInstaller
import android.net.Uri
import androidx.compose.runtime.derivedStateOf
@ -33,7 +32,7 @@ import org.koin.core.component.inject
import java.io.File
import java.nio.file.Files
class InstallerScreenViewModel(
class InstallerViewModel(
input: AppInfo,
selectedPatches: PatchesSelection
) : 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.content.ContentResolver
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.viewModelScope
import app.revanced.manager.compose.R
@ -15,7 +12,7 @@ import app.revanced.manager.compose.util.uiSafe
import io.ktor.http.*
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
private val contentResolver: ContentResolver = app.contentResolver