Fix warning 1.5: String.capitalize is now deprecated
This commit is contained in:
parent
4a94426d38
commit
df68cd4b56
|
@ -0,0 +1,30 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2021 New Vector Ltd
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package im.vector.app.core.utils
|
||||||
|
|
||||||
|
import java.util.Locale
|
||||||
|
|
||||||
|
// String.capitalize is now deprecated
|
||||||
|
fun String.safeCapitalize(locale: Locale): String {
|
||||||
|
return replaceFirstChar { char ->
|
||||||
|
if (char.isLowerCase()) {
|
||||||
|
char.titlecase(locale)
|
||||||
|
} else {
|
||||||
|
char.toString()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -24,6 +24,7 @@ import im.vector.app.core.epoxy.loadingItem
|
||||||
import im.vector.app.core.epoxy.noResultItem
|
import im.vector.app.core.epoxy.noResultItem
|
||||||
import im.vector.app.core.epoxy.profiles.profileSectionItem
|
import im.vector.app.core.epoxy.profiles.profileSectionItem
|
||||||
import im.vector.app.core.resources.StringProvider
|
import im.vector.app.core.resources.StringProvider
|
||||||
|
import im.vector.app.core.utils.safeCapitalize
|
||||||
import im.vector.app.features.settings.VectorLocale
|
import im.vector.app.features.settings.VectorLocale
|
||||||
import im.vector.app.features.settings.VectorPreferences
|
import im.vector.app.features.settings.VectorPreferences
|
||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
|
@ -46,7 +47,7 @@ class LocalePickerController @Inject constructor(
|
||||||
}
|
}
|
||||||
localeItem {
|
localeItem {
|
||||||
id(data.currentLocale.toString())
|
id(data.currentLocale.toString())
|
||||||
title(VectorLocale.localeToLocalisedString(data.currentLocale).capitalize(data.currentLocale))
|
title(VectorLocale.localeToLocalisedString(data.currentLocale).safeCapitalize(data.currentLocale))
|
||||||
if (vectorPreferences.developerMode()) {
|
if (vectorPreferences.developerMode()) {
|
||||||
subtitle(VectorLocale.localeToLocalisedStringInfo(data.currentLocale))
|
subtitle(VectorLocale.localeToLocalisedStringInfo(data.currentLocale))
|
||||||
}
|
}
|
||||||
|
@ -75,7 +76,7 @@ class LocalePickerController @Inject constructor(
|
||||||
.forEach {
|
.forEach {
|
||||||
localeItem {
|
localeItem {
|
||||||
id(it.toString())
|
id(it.toString())
|
||||||
title(VectorLocale.localeToLocalisedString(it).capitalize(it))
|
title(VectorLocale.localeToLocalisedString(it).safeCapitalize(it))
|
||||||
if (vectorPreferences.developerMode()) {
|
if (vectorPreferences.developerMode()) {
|
||||||
subtitle(VectorLocale.localeToLocalisedStringInfo(it))
|
subtitle(VectorLocale.localeToLocalisedStringInfo(it))
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue