Skip to content

Commit 1f5ac40

Browse files
committed
Clean up warnings in `:demo
1 parent d857073 commit 1f5ac40

2 files changed

Lines changed: 31 additions & 7 deletions

File tree

  • demo/src/main/java/dev/drewhamilton/androidtime/format/demo

demo/src/main/java/dev/drewhamilton/androidtime/format/demo/Demo.kt

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package dev.drewhamilton.androidtime.format.demo
22

33
import android.content.res.Configuration
4+
import android.os.Build
45
import androidx.compose.foundation.background
56
import androidx.compose.foundation.layout.Arrangement
67
import androidx.compose.foundation.layout.Column
@@ -126,9 +127,9 @@ private fun parseLocaleString(value: String): Locale? {
126127
val parts = value.split('_')
127128
return when (parts.size) {
128129
0 -> null
129-
1 -> Locale(parts.single())
130-
2 -> Locale(parts[0], parts[1])
131-
3 -> Locale(parts[0], parts[1], parts[2])
130+
1 -> localeOf(language = parts.single())
131+
2 -> localeOf(language = parts[0], country = parts[1])
132+
3 -> localeOf(language = parts[0], country = parts[1], variant = parts[2])
132133
else -> null
133134
}?.let {
134135
if (it.toLanguageTag() == "und") {
@@ -139,6 +140,33 @@ private fun parseLocaleString(value: String): Locale? {
139140
}
140141
}
141142

143+
private fun localeOf(language: String): Locale {
144+
return if (Build.VERSION.SDK_INT >= 36) {
145+
Locale.of(language)
146+
} else {
147+
@Suppress("DEPRECATION")
148+
Locale(language)
149+
}
150+
}
151+
152+
private fun localeOf(language: String, country: String): Locale {
153+
return if (Build.VERSION.SDK_INT >= 36) {
154+
Locale.of(language, country)
155+
} else {
156+
@Suppress("DEPRECATION")
157+
Locale(language, country)
158+
}
159+
}
160+
161+
private fun localeOf(language: String, country: String, variant: String): Locale {
162+
return if (Build.VERSION.SDK_INT >= 36) {
163+
Locale.of(language, country, variant)
164+
} else {
165+
@Suppress("DEPRECATION")
166+
Locale(language, country, variant)
167+
}
168+
}
169+
142170
@Composable
143171
private fun LocaleInputField(
144172
value: String,

demo/src/main/java/dev/drewhamilton/androidtime/format/demo/ui/theme/Color.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ val md_theme_light_outline = Color(0xFF857370)
2828
val md_theme_light_inverseOnSurface = Color(0xFFFBEEEC)
2929
val md_theme_light_inverseSurface = Color(0xFF362F2E)
3030
val md_theme_light_inversePrimary = Color(0xFFFFB4A8)
31-
val md_theme_light_shadow = Color(0xFF000000)
3231
val md_theme_light_surfaceTint = Color(0xFFC00000)
3332
val md_theme_light_outlineVariant = Color(0xFFD8C2BE)
3433
val md_theme_light_scrim = Color(0xFF000000)
@@ -59,9 +58,6 @@ val md_theme_dark_outline = Color(0xFFA08C89)
5958
val md_theme_dark_inverseOnSurface = Color(0xFF201A19)
6059
val md_theme_dark_inverseSurface = Color(0xFFEDE0DD)
6160
val md_theme_dark_inversePrimary = Color(0xFFC00000)
62-
val md_theme_dark_shadow = Color(0xFF000000)
6361
val md_theme_dark_surfaceTint = Color(0xFFFFB4A8)
6462
val md_theme_dark_outlineVariant = Color(0xFF534341)
6563
val md_theme_dark_scrim = Color(0xFF000000)
66-
67-
val seed = Color(0xFFD00000)

0 commit comments

Comments
 (0)