Skip to content

Commit 643ec03

Browse files
committed
Make setLocale parameter nullable in Locale class
Changed the setLocale parameter in the Locale class to be nullable and updated its usage to safely invoke it. This allows for more flexible instantiation when a setLocale function is not required.
1 parent 4546a38 commit 643ec03

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

app/src/processing/app/ui/theme/Locale.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import java.util.*
2121
* val localizedString = locale["someKey"]
2222
* ```
2323
*/
24-
class Locale(language: String = "", val setLocale: (java.util.Locale) -> Unit) : Properties() {
24+
class Locale(language: String = "", val setLocale: ((java.util.Locale) -> Unit)? = null) : Properties() {
2525
var locale: java.util.Locale = java.util.Locale.getDefault()
2626

2727
init {
@@ -46,7 +46,7 @@ class Locale(language: String = "", val setLocale: (java.util.Locale) -> Unit) :
4646
}
4747
operator fun get(key: String): String = getProperty(key, key)
4848
fun set(locale: java.util.Locale) {
49-
setLocale(locale)
49+
setLocale?.invoke(locale)
5050
}
5151
}
5252
/**
@@ -104,7 +104,7 @@ fun LocaleProvider(content: @Composable () -> Unit) {
104104
val update = watchFile(languageFile)
105105
var code by remember(languageFile, update){ mutableStateOf(languageFile.readText().substring(0, 2)) }
106106
remember(code) {
107-
val locale = Locale(code)
107+
val locale = java.util.Locale(code)
108108
java.util.Locale.setDefault(locale)
109109
}
110110

0 commit comments

Comments
 (0)