Skip to content

Commit b99d43b

Browse files
committed
viewmodelの更新
1 parent aac6226 commit b99d43b

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/settings/SettingsScreen.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import androidx.compose.ui.Alignment
3636
import androidx.compose.ui.Modifier
3737
import androidx.compose.ui.graphics.ColorFilter
3838
import androidx.compose.ui.graphics.vector.ImageVector
39-
import androidx.compose.ui.platform.LocalContext
4039
import androidx.compose.ui.platform.LocalFocusManager
4140
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
4241
import androidx.compose.ui.res.stringResource
@@ -63,20 +62,19 @@ fun SettingsScreen(
6362
snackbarHostState: SnackbarHostState,
6463
viewModel: SettingsViewModel = koinViewModel()
6564
) {
66-
val context = LocalContext.current
6765
val uiState by viewModel.uiState.collectAsState()
6866
val uiEvents by viewModel.uiEvent.collectAsState()
6967
val exportLauncher = rememberLauncherForActivityResult(
7068
contract = ActivityResultContracts.StartActivityForResult()
7169
) {
7270
if (it.resultCode != AppCompatActivity.RESULT_OK) return@rememberLauncherForActivityResult
73-
viewModel.exportData(context, it.data?.data)
71+
viewModel.exportData(it.data?.data)
7472
}
7573
val importLauncher = rememberLauncherForActivityResult(
7674
contract = ActivityResultContracts.StartActivityForResult()
7775
) {
7876
if (it.resultCode != AppCompatActivity.RESULT_OK) return@rememberLauncherForActivityResult
79-
viewModel.importData(context, it.data?.data)
77+
viewModel.importData(it.data?.data)
8078
}
8179
uiEvents.firstOrNull()?.let {
8280
when (it) {

AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/settings/SettingsViewModel.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package me.nya_n.notificationnotifier.ui.screen.settings
22

3-
import android.content.Context
43
import android.net.Uri
54
import androidx.lifecycle.viewModelScope
65
import kotlinx.coroutines.flow.MutableStateFlow
@@ -61,13 +60,13 @@ class SettingsViewModel(
6160
}
6261

6362
/** バックアップのために外部ストレージにデータを保存 */
64-
fun exportData(context: Context, uri: Uri?) {
63+
fun exportData(uri: Uri?) {
6564
if (uri == null) {
6665
_uiState.update { it.copy(message = Message.Error(R.string.export_failed)) }
6766
return
6867
}
6968
viewModelScope.launch {
70-
val message = if (exportDataUseCase(context, uri).isSuccess) {
69+
val message = if (exportDataUseCase(uri).isSuccess) {
7170
Message.Notice(R.string.export_succeeded)
7271
} else {
7372
Message.Error(R.string.export_failed)
@@ -77,13 +76,13 @@ class SettingsViewModel(
7776
}
7877

7978
/** 外部ストレージのバックアップからデータを復元 */
80-
fun importData(context: Context, uri: Uri?) {
79+
fun importData(uri: Uri?) {
8180
if (uri == null) {
8281
_uiState.update { it.copy(message = Message.Error(R.string.import_failed)) }
8382
return
8483
}
8584
viewModelScope.launch {
86-
val message = if (importDataUseCase(context, uri).isSuccess) {
85+
val message = if (importDataUseCase(uri).isSuccess) {
8786
Message.Notice(R.string.import_succeeded)
8887
} else {
8988
Message.Error(R.string.import_failed)

0 commit comments

Comments
 (0)