melod1n/fast-messenger
3
2
Fork 1
Code Issues Actions Packages Projects 1 Releases Wiki Activity

move strings in core/ui module

Browse Source 
disable generating android resources everywhere except core/ui module
replace UiR with R
This commit is contained in:
Danil Nikolaev
2025-08-27 04:53:46 +03:00
parent 799ed820e3
commit 4677e484d9
37 changed files with 359 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
feature/languagepicker/src/main/kotlin/dev/meloda/fast/languagepicker/LanguagePickerViewModel.kt
+9 -9
View File
@@ -12,7 +12,7 @@ import dev.meloda.fast.languagepicker.model.SelectableLanguage
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import dev.meloda.fast.ui.R as UiR
import dev.meloda.fast.ui.R
interface LanguagePickerViewModel {
val screenState: StateFlow<LanguagePickerScreenState>
@@ -32,23 +32,23 @@ class LanguagePickerViewModelImpl(
val languages = listOf(
Triple(
"",
UiText.Resource(UiR.string.language_key_system),
UiText.Resource(UiR.string.language_system)
UiText.Resource(R.string.language_key_system),
UiText.Resource(R.string.language_system)
),
Triple(
"en-US",
UiText.Resource(UiR.string.language_key_english),
UiText.Resource(UiR.string.language_english),
UiText.Resource(R.string.language_key_english),
UiText.Resource(R.string.language_english),
),
Triple(
"ru-RU",
UiText.Resource(UiR.string.language_key_russian),
UiText.Resource(UiR.string.language_russian)
UiText.Resource(R.string.language_key_russian),
UiText.Resource(R.string.language_russian)
),
Triple(
"uk-UA",
UiText.Resource(UiR.string.language_key_ukrainian),
UiText.Resource(UiR.string.language_ukrainian)
UiText.Resource(R.string.language_key_ukrainian),
UiText.Resource(R.string.language_ukrainian)
)
).map { (key, language, local) ->
Triple(
feature/languagepicker/src/main/kotlin/dev/meloda/fast/languagepicker/presentation/LanguagePickerScreen.kt
+4 -4
View File
@@ -59,7 +59,7 @@ import dev.meloda.fast.languagepicker.LanguagePickerViewModelImpl
import dev.meloda.fast.languagepicker.model.LanguagePickerScreenState
import dev.meloda.fast.languagepicker.model.SelectableLanguage
import org.koin.androidx.compose.koinViewModel
import dev.meloda.fast.ui.R as UiR
import dev.meloda.fast.ui.R
@Composable
fun LanguagePickerRoute(
@@ -110,7 +110,7 @@ fun LanguagePickerScreen(
LargeTopAppBar(
title = {
Text(
text = stringResource(id = UiR.string.title_application_language),
text = stringResource(id = R.string.title_application_language),
style = MaterialTheme.typography.headlineSmall
)
},
@@ -162,7 +162,7 @@ fun LanguagePickerScreen(
)
},
text = {
Text(text = stringResource(id = UiR.string.open_system_language_picker))
Text(text = stringResource(id = R.string.open_system_language_picker))
}
)
}
@@ -216,7 +216,7 @@ fun LanguagePickerScreen(
.align(Alignment.BottomCenter)
.height(64.dp)
) {
Text(text = stringResource(id = UiR.string.action_apply))
Text(text = stringResource(id = R.string.action_apply))
}
}
}