Merge branch 'main' of github.com:MM2-0/Kvaesitso
This commit is contained in:
@@ -874,4 +874,8 @@
|
||||
<string name="preference_search_bar_style_transparent">Průhledná</string>
|
||||
<string name="preference_search_bar_style_solid">Plná</string>
|
||||
<string name="preference_search_bar_style_hidden">Skrytá</string>
|
||||
<string name="preference_clock_widget_monospaced">Neproporcionální číslice</string>
|
||||
<string name="poi_category_stationery">Papírnictví</string>
|
||||
<string name="poi_category_climbing_gym">Lezecká stěna</string>
|
||||
<string name="poi_category_hackerspace">Hackerspace</string>
|
||||
</resources>
|
||||
@@ -865,4 +865,6 @@
|
||||
<string name="preference_search_bar_style_hidden">Versteckt</string>
|
||||
<string name="music_widget_interactive_progress_bar">Interaktiver Fortschrittsbalken</string>
|
||||
<string name="clock_variant_analog_ticks">Striche</string>
|
||||
<string name="preference_clock_widget_monospaced">Monospace Ziffern</string>
|
||||
<string name="poi_category_hackerspace">Hackerspace</string>
|
||||
</resources>
|
||||
@@ -852,4 +852,8 @@
|
||||
<string name="preference_widgets_on_home_screen_summary">在主屏幕而不是组件页显示组件</string>
|
||||
<string name="tag_empty_name">标签必须拥有一个名字。如果继续设为空,这个标签会被删除。</string>
|
||||
<string name="preference_launch_tasks_app">打开 Tasks 应用</string>
|
||||
<string name="preference_clock_widget_monospaced">等宽</string>
|
||||
<string name="poi_category_stationery">文具店</string>
|
||||
<string name="poi_category_climbing_gym">攀岩馆</string>
|
||||
<string name="poi_category_hackerspace">创客空间</string>
|
||||
</resources>
|
||||
@@ -28,7 +28,7 @@ class CurrencyConverter(
|
||||
private val topCurrencies = arrayOf("USD", "EUR", "JPY", "GBP", "AUD")
|
||||
|
||||
override suspend fun isValidUnit(symbol: String): Boolean {
|
||||
return repository.isValidCurrency(symbol)
|
||||
return repository.isValidCurrency(symbol.uppercase())
|
||||
}
|
||||
|
||||
|
||||
@@ -76,7 +76,7 @@ class CurrencyConverter(
|
||||
value: Double,
|
||||
toUnit: String?
|
||||
): UnitConverter {
|
||||
val fromIsoCode = repository.resolveAlias(fromUnit)
|
||||
val fromIsoCode = repository.resolveAlias(fromUnit.uppercase())
|
||||
val toIsoCode = toUnit?.let { repository.resolveAlias(it) }
|
||||
|
||||
val values = repository.convertCurrency(fromIsoCode, value, toIsoCode).map {
|
||||
|
||||
Reference in New Issue
Block a user