From 7df4f4e643d590687ebf0086e1304a418a97e13e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Mon, 11 Sep 2023 11:16:47 +0200 Subject: [PATCH 01/58] Add unit converter This closes #197 --- app/src/main/AndroidManifest.xml | 4 + .../calculator/activities/MainActivity.kt | 6 + .../activities/UnitConverterActivity.kt | 137 +++++++++++++ .../activities/WidgetConfigureActivity.kt | 1 - .../calculator/extensions/Binding.kt | 10 - .../helpers/converters/AreaConverter.kt | 92 +++++++++ .../calculator/helpers/converters/Base.kt | 30 +++ .../helpers/converters/Converters.kt | 19 ++ .../helpers/converters/LengthConverter.kt | 165 +++++++++++++++ .../helpers/converters/VolumeConverter.kt | 92 +++++++++ .../calculator/views/ConverterView.kt | 192 ++++++++++++++++++ .../drawable/ic_arrow_drop_down_vector.xml | 5 + .../res/drawable/ic_square_foot_vector.xml | 5 + .../res/drawable/ic_swap_vertical_vector.xml | 5 + .../res/layout/activity_unit_converter.xml | 35 ++++ app/src/main/res/layout/view_converter.xml | 58 ++++++ .../main/res/layout/view_unit_converter.xml | 151 ++++++++++++++ app/src/main/res/menu/menu.xml | 5 + app/src/main/res/values-ar/strings.xml | 45 +++- app/src/main/res/values-az/strings.xml | 43 ++++ app/src/main/res/values-be/strings.xml | 45 +++- app/src/main/res/values-bg/strings.xml | 45 +++- app/src/main/res/values-ca/strings.xml | 45 +++- app/src/main/res/values-cs/strings.xml | 45 +++- app/src/main/res/values-cy/strings.xml | 45 +++- app/src/main/res/values-da/strings.xml | 43 ++++ app/src/main/res/values-de/strings.xml | 45 +++- app/src/main/res/values-el/strings.xml | 43 ++++ app/src/main/res/values-eo/strings.xml | 43 ++++ app/src/main/res/values-es/strings.xml | 45 +++- app/src/main/res/values-et/strings.xml | 45 +++- app/src/main/res/values-fi/strings.xml | 45 +++- app/src/main/res/values-fil/strings.xml | 45 +++- app/src/main/res/values-fr/strings.xml | 43 ++++ app/src/main/res/values-gl/strings.xml | 45 +++- app/src/main/res/values-hi/strings.xml | 45 +++- app/src/main/res/values-hr/strings.xml | 43 ++++ app/src/main/res/values-hu/strings.xml | 45 +++- app/src/main/res/values-in/strings.xml | 45 +++- app/src/main/res/values-is/strings.xml | 45 +++- app/src/main/res/values-it/strings.xml | 45 +++- app/src/main/res/values-iw/strings.xml | 43 ++++ app/src/main/res/values-ja/strings.xml | 45 +++- app/src/main/res/values-kn/strings.xml | 43 ++++ app/src/main/res/values-ko/strings.xml | 43 ++++ app/src/main/res/values-kr/strings.xml | 43 ++++ app/src/main/res/values-lt/strings.xml | 45 +++- app/src/main/res/values-lv/strings.xml | 43 ++++ app/src/main/res/values-mk/strings.xml | 43 ++++ app/src/main/res/values-ml/strings.xml | 45 +++- app/src/main/res/values-ms/strings.xml | 43 ++++ app/src/main/res/values-nl/strings.xml | 45 +++- app/src/main/res/values-no-rNO/strings.xml | 43 ++++ app/src/main/res/values-pa-rPK/strings.xml | 45 +++- app/src/main/res/values-pl/strings.xml | 43 ++++ app/src/main/res/values-pt-rBR/strings.xml | 43 ++++ app/src/main/res/values-pt/strings.xml | 45 +++- app/src/main/res/values-ro/strings.xml | 45 +++- app/src/main/res/values-ru/strings.xml | 45 +++- app/src/main/res/values-sk/strings.xml | 43 ++++ app/src/main/res/values-sl/strings.xml | 45 +++- app/src/main/res/values-sr/strings.xml | 43 ++++ app/src/main/res/values-sv/strings.xml | 43 ++++ app/src/main/res/values-ta/strings.xml | 43 ++++ app/src/main/res/values-te/strings.xml | 43 ++++ app/src/main/res/values-th/strings.xml | 43 ++++ app/src/main/res/values-tr/strings.xml | 43 ++++ app/src/main/res/values-uk/strings.xml | 43 ++++ app/src/main/res/values-zgh/strings.xml | 43 ++++ app/src/main/res/values-zh-rCN/strings.xml | 45 +++- app/src/main/res/values-zh-rTW/strings.xml | 43 ++++ app/src/main/res/values/strings.xml | 44 ++++ 72 files changed, 3351 insertions(+), 38 deletions(-) create mode 100644 app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt delete mode 100644 app/src/main/kotlin/com/simplemobiletools/calculator/extensions/Binding.kt create mode 100644 app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt create mode 100644 app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt create mode 100644 app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Converters.kt create mode 100644 app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt create mode 100644 app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt create mode 100644 app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt create mode 100644 app/src/main/res/drawable/ic_arrow_drop_down_vector.xml create mode 100644 app/src/main/res/drawable/ic_square_foot_vector.xml create mode 100644 app/src/main/res/drawable/ic_swap_vertical_vector.xml create mode 100644 app/src/main/res/layout/activity_unit_converter.xml create mode 100644 app/src/main/res/layout/view_converter.xml create mode 100644 app/src/main/res/layout/view_unit_converter.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 319e89c1..16879efa 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -34,6 +34,10 @@ android:name=".activities.MainActivity" android:exported="false" /> + + showHistory() R.id.more_apps_from_us -> launchMoreAppsFromUsIntent() + R.id.unit_converter -> launchUnitConverter() R.id.settings -> launchSettings() R.id.about -> launchAbout() else -> return@setOnMenuItemClickListener false @@ -174,6 +175,11 @@ class MainActivity : SimpleActivity(), Calculator { } } + private fun launchUnitConverter() { + hideKeyboard() + startActivity(Intent(applicationContext, UnitConverterActivity::class.java)) + } + private fun launchSettings() { hideKeyboard() startActivity(Intent(applicationContext, SettingsActivity::class.java)) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt new file mode 100644 index 00000000..c04c0e00 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt @@ -0,0 +1,137 @@ +package com.simplemobiletools.calculator.activities + +import android.os.Bundle +import android.view.View +import android.view.WindowManager +import androidx.core.content.res.ResourcesCompat +import com.simplemobiletools.calculator.BuildConfig +import com.simplemobiletools.calculator.databinding.ActivityUnitConverterBinding +import com.simplemobiletools.calculator.extensions.config +import com.simplemobiletools.calculator.extensions.updateViewColors +import com.simplemobiletools.calculator.helpers.COMMA +import com.simplemobiletools.calculator.helpers.DOT +import com.simplemobiletools.calculator.helpers.converters.Converter +import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.helpers.LOWER_ALPHA_INT +import com.simplemobiletools.commons.helpers.MEDIUM_ALPHA_INT +import com.simplemobiletools.commons.helpers.NavigationIcon + +class UnitConverterActivity : SimpleActivity() { + private val binding by viewBinding(ActivityUnitConverterBinding::inflate) + private var storedTextColor = 0 + private var vibrateOnButtonPress = true + private var storedUseCommaAsDecimalMark = false + + override fun onCreate(savedInstanceState: Bundle?) { + isMaterialActivity = true + super.onCreate(savedInstanceState) + setContentView(binding.root) + appLaunched(BuildConfig.APPLICATION_ID) + updateMaterialActivityViews(binding.unitConverterCoordinator, null, useTransparentNavigation = false, useTopSearchMenu = false) + setupMaterialScrollListener(binding.nestedScrollview, binding.unitConverterToolbar) + storeStateVariables() + + binding.viewUnitConverter.unitsTabLayout.onTabSelectionChanged( + tabSelectedAction = { + binding.viewUnitConverter.viewConverter.root.setConverter(Converter.ALL[it.id]) + } + ) + binding.viewUnitConverter.btnClear.setVibratingOnClickListener { + binding.viewUnitConverter.viewConverter.root.clear() + } + + getButtonIds().forEach { + it.setVibratingOnClickListener { view -> + binding.viewUnitConverter.viewConverter.root.numpadClicked(view.id) + } + } + + Converter.ALL.forEachIndexed { index, converter -> + binding.viewUnitConverter.unitsTabLayout.newTab() + .setId(index) + .setText(converter.nameResId) + .apply { binding.viewUnitConverter.unitsTabLayout.addTab(this) } + } + binding.viewUnitConverter.viewConverter.root.setConverter(Converter.ALL.first()) + } + + override fun onResume() { + super.onResume() + + setupToolbar(binding.unitConverterToolbar, NavigationIcon.Cross) + binding.viewUnitConverter.unitsTabLayout.setBackgroundColor(getProperBackgroundColor()) + binding.viewUnitConverter.viewConverter.root.updateColors() + if (storedTextColor != config.textColor) { + binding.viewUnitConverter.converterHolder.let { updateViewColors(it, getProperTextColor()) } + } + + if (config.preventPhoneFromSleeping) { + window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) + } + + if (storedUseCommaAsDecimalMark != config.useCommaAsDecimalMark) { + setupDecimalSeparator() + } + + vibrateOnButtonPress = config.vibrateOnButtonPress + + binding.viewUnitConverter.apply { + arrayOf(btnClear, btnDecimal).forEach { + it.background = ResourcesCompat.getDrawable(resources, com.simplemobiletools.commons.R.drawable.pill_background, theme) + it.background?.alpha = MEDIUM_ALPHA_INT + } + + arrayOf(btn0, btn1, btn2, btn3, btn4, btn5, btn6, btn7, btn8, btn9).forEach { + it.background = ResourcesCompat.getDrawable(resources, com.simplemobiletools.commons.R.drawable.pill_background, theme) + it.background?.alpha = LOWER_ALPHA_INT + } + } + } + + override fun onPause() { + super.onPause() + storeStateVariables() + if (config.preventPhoneFromSleeping) { + window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) + } + } + + private fun storeStateVariables() { + config.apply { + storedTextColor = textColor + storedUseCommaAsDecimalMark = useCommaAsDecimalMark + } + } + + private fun checkHaptic(view: View) { + if (vibrateOnButtonPress) { + view.performHapticFeedback() + } + } + + private fun getButtonIds() = binding.viewUnitConverter.run { + arrayOf(btnDecimal, btn0, btn1, btn2, btn3, btn4, btn5, btn6, btn7, btn8, btn9) + } + + private fun View.setVibratingOnClickListener(callback: (view: View) -> Unit) { + setOnClickListener { + callback(it) + checkHaptic(it) + } + } + + private fun setupDecimalSeparator() { + var decimalSeparator = DOT + var groupingSeparator = COMMA + storedUseCommaAsDecimalMark = config.useCommaAsDecimalMark + if (storedUseCommaAsDecimalMark) { + decimalSeparator = COMMA + groupingSeparator = DOT + } else { + decimalSeparator = DOT + groupingSeparator = COMMA + } + binding.viewUnitConverter.viewConverter.root.updateSeparators(decimalSeparator, groupingSeparator) + binding.viewUnitConverter.btnDecimal.text = decimalSeparator + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/WidgetConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/WidgetConfigureActivity.kt index 0fca9887..03b99ffd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/WidgetConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/WidgetConfigureActivity.kt @@ -12,7 +12,6 @@ import android.widget.TextView import com.simplemobiletools.calculator.R import com.simplemobiletools.calculator.databinding.WidgetConfigBinding import com.simplemobiletools.calculator.extensions.config -import com.simplemobiletools.calculator.extensions.viewBinding import com.simplemobiletools.calculator.helpers.MyWidgetProvider import com.simplemobiletools.commons.dialogs.ColorPickerDialog import com.simplemobiletools.commons.dialogs.FeatureLockedDialog diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/extensions/Binding.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/extensions/Binding.kt deleted file mode 100644 index 98a4ea20..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/extensions/Binding.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.simplemobiletools.calculator.extensions - -import android.app.Activity -import android.view.LayoutInflater -import androidx.viewbinding.ViewBinding - -inline fun Activity.viewBinding(crossinline bindingInflater: (LayoutInflater) -> T) = - lazy(LazyThreadSafetyMode.NONE) { - bindingInflater.invoke(layoutInflater) - } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt new file mode 100644 index 00000000..4876c78c --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt @@ -0,0 +1,92 @@ +package com.simplemobiletools.calculator.helpers.converters + +import com.simplemobiletools.calculator.R + +object AreaConverter : Converter { + override val nameResId: Int = R.string.unit_area + + sealed class Unit(nameResId: Int, factor: Double) : Converter.Unit(nameResId, factor) { + data object SquareKilometer : Unit( + nameResId = R.string.unit_area_square_kilometer, + factor = 1000000.0 + ) + + data object SquareMeter : Unit( + nameResId = R.string.unit_area_square_meter, + factor = 1.0 + ) + + data object SquareCentimeter : Unit( + nameResId = R.string.unit_area_square_centimeter, + factor = 0.0001 + ) + + data object SquareMillimeter : Unit( + nameResId = R.string.unit_area_square_millimeter, + factor = 0.000001 + ) + + data object SquareMile : Unit( + nameResId = R.string.unit_area_square_mile, + factor = 2_589_988.110336 + ) + + data object SquareYard : Unit( + nameResId = R.string.unit_area_square_yard, + factor = 0.83612736 + ) + + data object SquareMil : Unit( + nameResId = R.string.unit_area_square_mil, + factor = 0.00000000064516 + ) + + data object SquareInch : Unit( + nameResId = R.string.unit_area_square_inch, + factor = 0.00064516 + ) + + data object SquareRod : Unit( + nameResId = R.string.unit_area_square_rod, + factor = 25.29285264 + ) + + data object Acre : Unit( + nameResId = R.string.unit_area_acre, + factor = 4_046.8564224 + ) + + data object Are : Unit( + nameResId = R.string.unit_area_are, + factor = 100.0 + ) + + data object Dunam : Unit( + nameResId = R.string.unit_area_dunam, + factor = 1000.0 + ) + + data object Hectare : Unit( + nameResId = R.string.unit_area_hectare, + factor = 10_000.0 + ) + } + + override val units: List = listOf( + Unit.SquareKilometer, + Unit.SquareMeter, + Unit.SquareCentimeter, + Unit.SquareMillimeter, + Unit.SquareMile, + Unit.SquareYard, + Unit.SquareMil, + Unit.SquareInch, + Unit.SquareRod, + Unit.Acre, + Unit.Are, + Unit.Dunam, + Unit.Hectare, + ) + override val defaultTopUnit: Unit = Unit.SquareKilometer + override val defaultBottomUnit: Unit = Unit.SquareMeter +} diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt new file mode 100644 index 00000000..8623bb48 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt @@ -0,0 +1,30 @@ +package com.simplemobiletools.calculator.helpers.converters + +interface Converter { + companion object { + val ALL = listOf( + LengthConverter, + AreaConverter, + VolumeConverter + ) + } + + val nameResId: Int + val units: List + val defaultTopUnit: Unit + val defaultBottomUnit: Unit + + fun convert(from: ValueWithUnit, to: Unit): ValueWithUnit { + return ValueWithUnit(from.value * from.unit.factor / to.factor, to) + } + + open class Unit( + val nameResId: Int, + val factor: Double + ) { + + fun withValue(value: Double) = ValueWithUnit(value, this) + } +} + +data class ValueWithUnit(val value: Double, val unit: T) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Converters.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Converters.kt new file mode 100644 index 00000000..29a26633 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Converters.kt @@ -0,0 +1,19 @@ +package com.simplemobiletools.calculator.helpers.converters + +object Converters { + val ALL = listOf(LengthConverter) + + object Mass + + object Temperature + + object Speed + + object Time + + object Fuel + + object Energy + + object Pressure +} diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt new file mode 100644 index 00000000..ef59ba5b --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt @@ -0,0 +1,165 @@ +package com.simplemobiletools.calculator.helpers.converters + +import com.simplemobiletools.calculator.R + +object LengthConverter : Converter { + + override val nameResId: Int = R.string.unit_length + + sealed class Unit(nameResId: Int, factor: Double) : Converter.Unit(nameResId, factor) { + data object Kilometer : Unit( + nameResId = R.string.unit_length_kilometer, + factor = 1000.0 + ) + + data object Hectometer : Unit( + nameResId = R.string.unit_length_hectometer, + factor = 100.0 + ) + + data object Decameter : Unit( + nameResId = R.string.unit_length_decameter, + factor = 10.0 + ) + + data object Meter : Unit( + nameResId = R.string.unit_length_meter, + factor = 1.0 + ) + + data object Decimeter : Unit( + nameResId = R.string.unit_length_decimeter, + factor = 0.1 + ) + + data object Centimeter : Unit( + nameResId = R.string.unit_length_centimeter, + factor = 0.01 + ) + + data object Millimeter : Unit( + nameResId = R.string.unit_length_millimeter, + factor = 0.001 + ) + + data object Micrometer : Unit( + nameResId = R.string.unit_length_micrometer, + factor = 0.000001 + ) + + data object Nanometer : Unit( + nameResId = R.string.unit_length_nanometer, + factor = 0.000000001 + ) + + data object Picometer : Unit( + nameResId = R.string.unit_length_picometer, + factor = 0.000000000001 + ) + + data object Angstrom : Unit( + nameResId = R.string.unit_length_angstrom, + factor = 1e-10 + ) + + data object Mile : Unit( + nameResId = R.string.unit_length_mile, + factor = 1_609.344 + ) + + data object Chain : Unit( + nameResId = R.string.unit_length_chain, + factor = 20.1168 + ) + + data object Yard : Unit( + nameResId = R.string.unit_length_yard, + factor = 0.9144 + ) + + data object Foot : Unit( + nameResId = R.string.unit_length_foot, + factor = 0.3048 + ) + + data object Mil : Unit( + nameResId = R.string.unit_length_mil, + factor = 0.0000254 + ) + + data object Inch : Unit( + nameResId = R.string.unit_length_inch, + factor = 0.0254 + ) + + data object Fathom : Unit( + nameResId = R.string.unit_length_fathom, + factor = 1.852 + ) + + data object Cable : Unit( + nameResId = R.string.unit_length_cable, + factor = 185.2 + ) + + data object NauticalMile : Unit( + nameResId = R.string.unit_length_nautical_mile, + factor = 1_852.0 + ) + + data object Link : Unit( + nameResId = R.string.unit_length_link, + factor = 0.201168 + ) + + data object Rod : Unit( + nameResId = R.string.unit_length_rod, + factor = 5.0292 + ) + + data object AstronomicalUnit : Unit( + nameResId = R.string.unit_length_astronomical_unit, + factor = 1.495979e+11 + ) + + data object Parsec : Unit( + nameResId = R.string.unit_length_parsec, + factor = 3.0857e+16 + ) + + data object LightYear : Unit( + nameResId = R.string.unit_length_light_year, + factor = 9.4607e+15 + ) + } + + override val units: List = listOf( + Unit.Kilometer, + Unit.Hectometer, + Unit.Decameter, + Unit.Meter, + Unit.Decimeter, + Unit.Centimeter, + Unit.Millimeter, + Unit.Micrometer, + Unit.Nanometer, + Unit.Picometer, + Unit.Angstrom, + Unit.Mile, + Unit.Chain, + Unit.Yard, + Unit.Foot, + Unit.Mil, + Unit.Inch, + Unit.Fathom, + Unit.Cable, + Unit.NauticalMile, + Unit.Link, + Unit.Rod, + Unit.AstronomicalUnit, + Unit.Parsec, + Unit.LightYear + ) + override val defaultTopUnit: Unit = Unit.Kilometer + override val defaultBottomUnit: Unit = Unit.Meter +} diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt new file mode 100644 index 00000000..b7473df4 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt @@ -0,0 +1,92 @@ +package com.simplemobiletools.calculator.helpers.converters + +import com.simplemobiletools.calculator.R + +object VolumeConverter : Converter { + override val nameResId: Int = R.string.unit_volume + + sealed class Unit(nameResId: Int, factor: Double) : Converter.Unit(nameResId, factor) { + data object SquareKilometer : Unit( + nameResId = R.string.unit_length_kilometer, + factor = 1000000.0 + ) + + data object SquareMeter : Unit( + nameResId = R.string.unit_length_meter, + factor = 1.0 + ) + + data object SquareCentimeter : Unit( + nameResId = R.string.unit_length_centimeter, + factor = 0.0001 + ) + + data object SquareMillimeter : Unit( + nameResId = R.string.unit_length_millimeter, + factor = 0.000001 + ) + + data object SquareMile : Unit( + nameResId = R.string.unit_length_mile, + factor = 2_589_988.110336 + ) + + data object SquareYard : Unit( + nameResId = R.string.unit_length_yard, + factor = 0.83612736 + ) + + data object SquareMil : Unit( + nameResId = R.string.unit_length_mil, + factor = 0.00000000064516 + ) + + data object SquareInch : Unit( + nameResId = R.string.unit_length_inch, + factor = 0.00064516 + ) + + data object SquareRod : Unit( + nameResId = R.string.unit_length_rod, + factor = 25.29285264 + ) + + data object Acre : Unit( + nameResId = R.string.unit_length_astronomical_unit, + factor = 4_046.8564224 + ) + + data object Are : Unit( + nameResId = R.string.unit_length_parsec, + factor = 100.0 + ) + + data object Dunam : Unit( + nameResId = R.string.unit_length_parsec, + factor = 1000.0 + ) + + data object Hectare : Unit( + nameResId = R.string.unit_length_light_year, + factor = 10_000.0 + ) + } + + override val units: List = listOf( + Unit.SquareKilometer, + Unit.SquareMeter, + Unit.SquareCentimeter, + Unit.SquareMillimeter, + Unit.SquareMile, + Unit.SquareYard, + Unit.SquareMil, + Unit.SquareInch, + Unit.SquareRod, + Unit.Acre, + Unit.Are, + Unit.Dunam, + Unit.Hectare, + ) + override val defaultTopUnit: Unit = Unit.SquareKilometer + override val defaultBottomUnit: Unit = Unit.SquareMeter +} diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt new file mode 100644 index 00000000..9fe849ce --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt @@ -0,0 +1,192 @@ +package com.simplemobiletools.calculator.views + +import android.app.Activity +import android.content.Context +import android.content.res.ColorStateList +import android.util.AttributeSet +import android.view.View +import android.widget.LinearLayout +import androidx.core.widget.TextViewCompat +import com.simplemobiletools.calculator.R +import com.simplemobiletools.calculator.databinding.ViewConverterBinding +import com.simplemobiletools.calculator.helpers.COMMA +import com.simplemobiletools.calculator.helpers.DOT +import com.simplemobiletools.calculator.helpers.NumberFormatHelper +import com.simplemobiletools.calculator.helpers.converters.Converter +import com.simplemobiletools.commons.dialogs.RadioGroupDialog +import com.simplemobiletools.commons.extensions.applyColorFilter +import com.simplemobiletools.commons.extensions.getProperPrimaryColor +import com.simplemobiletools.commons.extensions.getProperTextColor +import com.simplemobiletools.commons.models.RadioItem +import me.grantland.widget.AutofitHelper +import kotlin.reflect.KMutableProperty0 + +class ConverterView @JvmOverloads constructor( + context: Context, attrs: AttributeSet? = null +) : LinearLayout(context, attrs) { + + private lateinit var binding: ViewConverterBinding + + private var converter: Converter? = null + private var topUnit: Converter.Unit? = null + private var bottomUnit: Converter.Unit? = null + + private var decimalSeparator: String = DOT + private var groupingSeparator: String = COMMA + private val formatter = NumberFormatHelper( + decimalSeparator = decimalSeparator, groupingSeparator = groupingSeparator + ) + + override fun onFinishInflate() { + super.onFinishInflate() + binding = ViewConverterBinding.bind(this) + + AutofitHelper.create(binding.topUnitText) + AutofitHelper.create(binding.bottomUnitText) + + binding.swapButton.setOnClickListener { switch() } + + binding.topUnitName.setClickListenerForUnitSelector(::topUnit, ::bottomUnit) + binding.bottomUnitName.setClickListenerForUnitSelector(::bottomUnit, ::topUnit) + + updateColors() + } + + fun setConverter(converter: Converter) { + this.converter = converter + topUnit = converter.defaultTopUnit + bottomUnit = converter.defaultBottomUnit + + binding.topUnitText.text = "1" + updateBottomValue() + updateUnitLabels() + } + + fun updateColors() { + binding.topUnitText.setTextColor(context.getProperTextColor()) + binding.bottomUnitText.setTextColor(context.getProperTextColor()) + binding.topUnitName.setTextColor(context.getProperTextColor()) + binding.bottomUnitName.setTextColor(context.getProperTextColor()) + TextViewCompat.setCompoundDrawableTintList( + binding.topUnitName, + ColorStateList.valueOf(context.getProperPrimaryColor()) + ) + TextViewCompat.setCompoundDrawableTintList( + binding.bottomUnitName, + ColorStateList.valueOf(context.getProperPrimaryColor()) + ) + + binding.swapButton.applyColorFilter(context.getProperPrimaryColor()) + } + + fun clear() { + binding.topUnitText.text = "0" + binding.bottomUnitText.text = "0" + } + + fun numpadClicked(id: Int) { + when (id) { + R.id.btn_decimal -> decimalClicked() + R.id.btn_0 -> zeroClicked() + R.id.btn_1 -> addDigit(1) + R.id.btn_2 -> addDigit(2) + R.id.btn_3 -> addDigit(3) + R.id.btn_4 -> addDigit(4) + R.id.btn_5 -> addDigit(5) + R.id.btn_6 -> addDigit(6) + R.id.btn_7 -> addDigit(7) + R.id.btn_8 -> addDigit(8) + R.id.btn_9 -> addDigit(9) + } + + updateBottomValue() + } + + private fun decimalClicked() { + var value = binding.topUnitText.text.toString() + if (!value.contains(decimalSeparator)) { + when (value) { + "0" -> value = "0$decimalSeparator" + "" -> value += "0$decimalSeparator" + else -> value += decimalSeparator + } + + binding.topUnitText.text = value + } + } + + private fun zeroClicked() { + val value = binding.topUnitText.text + if (value != "0" || value.contains(decimalSeparator)) { + addDigit(0) + } + } + + private fun addDigit(digit: Int) { + var value = binding.topUnitText.text.toString() + if (value == "0") { + value = "" + } + + value += digit + value = formatter.addGroupingSeparators(value) + binding.topUnitText.text = value + } + + private fun switch() { + binding.topUnitText.text.also { + binding.topUnitText.text = binding.bottomUnitText.text + binding.bottomUnitText.text = it + } + + ::topUnit.swapWith(::bottomUnit) + } + + private fun updateUnitLabels() { + binding.topUnitName.text = topUnit?.nameResId?.let { context.getString(it) } + binding.bottomUnitName.text = bottomUnit?.nameResId?.let { context.getString(it) } + } + + private fun updateBottomValue() { + converter?.apply { + val converted = convert(topUnit!!.withValue(formatter.removeGroupingSeparator(binding.topUnitText.text.toString()).toDouble()), bottomUnit!!).value + binding.bottomUnitText.text = formatter.doubleToString(converted) + } + } + + fun updateSeparators(decimalSeparator: String, groupingSeparator: String) { + if (this.decimalSeparator != decimalSeparator || this.groupingSeparator != groupingSeparator) { + this.decimalSeparator = decimalSeparator + this.groupingSeparator = groupingSeparator + formatter.decimalSeparator = decimalSeparator + formatter.groupingSeparator = groupingSeparator + binding.topUnitText.text = "0" + binding.bottomUnitText.text = "0" + } + } + + private fun KMutableProperty0.swapWith(other: KMutableProperty0) { + this.get().also { + this.set(other.get()) + other.set(it) + } + } + + private fun View.setClickListenerForUnitSelector(propertyToChange: KMutableProperty0, otherProperty: KMutableProperty0) { + setOnClickListener { + val items = ArrayList(converter!!.units.mapIndexed { index, unit -> + RadioItem(index, context.getString(unit.nameResId), unit) + }) + RadioGroupDialog(context as Activity, items) { + val unit = it as Converter.Unit + if (unit == otherProperty.get()) { + switch() + } else if (unit != propertyToChange.get()) { + propertyToChange.set(unit) + updateBottomValue() + } + updateUnitLabels() + } + } + } +} diff --git a/app/src/main/res/drawable/ic_arrow_drop_down_vector.xml b/app/src/main/res/drawable/ic_arrow_drop_down_vector.xml new file mode 100644 index 00000000..3dbfedba --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_drop_down_vector.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_square_foot_vector.xml b/app/src/main/res/drawable/ic_square_foot_vector.xml new file mode 100644 index 00000000..b3701480 --- /dev/null +++ b/app/src/main/res/drawable/ic_square_foot_vector.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_swap_vertical_vector.xml b/app/src/main/res/drawable/ic_swap_vertical_vector.xml new file mode 100644 index 00000000..d113e11a --- /dev/null +++ b/app/src/main/res/drawable/ic_swap_vertical_vector.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/activity_unit_converter.xml b/app/src/main/res/layout/activity_unit_converter.xml new file mode 100644 index 00000000..d5d93d12 --- /dev/null +++ b/app/src/main/res/layout/activity_unit_converter.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/layout/view_converter.xml b/app/src/main/res/layout/view_converter.xml new file mode 100644 index 00000000..12b94ed8 --- /dev/null +++ b/app/src/main/res/layout/view_converter.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/view_unit_converter.xml b/app/src/main/res/layout/view_unit_converter.xml new file mode 100644 index 00000000..d353f968 --- /dev/null +++ b/app/src/main/res/layout/view_unit_converter.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml index 24183ca4..6b23e7e4 100644 --- a/app/src/main/res/menu/menu.xml +++ b/app/src/main/res/menu/menu.xml @@ -8,6 +8,11 @@ android:icon="@drawable/ic_clock_vector" android:title="@string/history" app:showAsAction="always" /> + الحاسبة البسيطة الحاسبة الحاسبة العلمية + Unit converter خطأ: القسمة على صفر @@ -13,6 +14,48 @@ الاهتزاز عند الضغط على الازرار استخدام الفاصلة كعلامة عشرية + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume كيف يعمل الزر C (مسح)؟ النقر على ذلك سوف يزيل حرف واحد في وقت واحد. الضغط لفترة طويلة سوف إعادة تعيين جميع الحقول في وقت واحد. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index f4be96f2..c3502631 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -2,6 +2,7 @@ Sadə Kalkulyator Kalkulyator Scientific Calculator + Unit converter Səhv: sıfıra bölünmə @@ -15,6 +16,48 @@ Düyməyə basdıqda titrə Use comma as a decimal mark + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume C (Sil) düyməsi necə işləyir? diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 51e2b755..584dc614 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -3,6 +3,7 @@ Simple Calculator Калькулятар Навуковы калькулятар + Unit converter Памылка: дзяленне на нуль @@ -13,6 +14,48 @@ Вібраваць пры націску на кнопкі Выкарыстоўваць коску ў якасці дзесятковага падзельніка + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Як працуе кнопка C (Ачыстка)\? Крананне да яе выдаляе адзін сімвал. Доўгае націсканне на яе ачышчае адразу ўсе палі. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index f4387338..e4eb8a33 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -3,6 +3,7 @@ Обикновен Калкулатор Калкулатор Научен калкулатор + Unit converter Грешка: деление на нула @@ -13,6 +14,48 @@ Вибриране при натискане на бутоните Използване на запетая като десетичен знак + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Как работи бутонът C (Clear)\? Натискането му ще премахва по един символ. Дълго натискане ще изчисти наведнъж всички полета. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index ea2cc4cf..2e116383 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -3,6 +3,7 @@ Simple Calculator Calculadora Calculadora científica + Unit converter Error: divisió per zero @@ -13,6 +14,48 @@ Vibra en prémer els botons Utilitza la coma com a marca decimal + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Com funciona el botó C (Esborra)\? En tocar-lo, s\'eliminarà un caràcter a la vegada. Si el premeu prolongadament, es reiniciaran tots els camps de cop. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 131255e6..99694bfa 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -3,6 +3,7 @@ Jednoduchá kalkulačka Kalkulačka Vědecká kalkulačka + Unit converter Chyba: dělení nulou @@ -13,6 +14,48 @@ Vibrovat při stisku tlačítka Použít čárku jako oddělovač desetin + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Jak funguje tlačítko C? Stisknutím odmažete jeden znak. Dlouhým podržením smažete naráz všechna pole. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index bf7db4ad..e8bd3640 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -3,6 +3,7 @@ Simple Calculator Cyfrifiannell Cyfrifiannell Gwyddonol + Unit converter Gwall: rhannu â sero @@ -13,6 +14,48 @@ Dirgrynu wrth wasgu botymau Defnyddio atalnod fel pwynt degol + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Sut mae\'r botwm C (clirio) yn gweithio? Mae ei dapio yn tynnu un rhif ar y tro. Mae ei dal yn ailosod pob maes gyda\'i gilydd ar unwaith. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 0d56d90b..f2498c77 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -3,6 +3,7 @@ Simpel lommeregner Lommeregner Videnskabelig lommeregner + Unit converter Fejl: division med nul @@ -13,6 +14,48 @@ Vibrer ved knaptryk Use comma as a decimal mark + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Hvordan virker knappen C (Slet)\? Hvis du trykker på det, fjernes et tegn ad gangen. Langt tryk vil nulstille alle felter på én gang. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b3e753ba..61f3651b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3,6 +3,7 @@ Schlichter Rechner Rechnerng> Wissenschaftlicher Rechner + Unit converter Fehler: Division durch Null @@ -13,6 +14,48 @@ Bei Tastendruck vibrieren Komma als Dezimaltrennzeichen verwenden + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Wie funktioniert die C-Taste (Löschen)\? Bei einmaliger Berührung wird ein Zeichen entfernt. Bei langer Berührung werden alle Felder zurück gesetzt. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index bc06d927..c566ab95 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2,6 +2,7 @@ Απλή Αριθμομηχανή Αριθμομηχανή Επιστημονική Αριθμομηχανή + Unit converter Σφάλμα: διαίρεση με μηδέν @@ -15,6 +16,48 @@ Δόνηση στο πάτημα πλήκτρου Χρήση κόμματος ως δεκαδικό σημείο + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Πώς λειτουργεί το κουμπί C (Καθαρισμός); diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index d67cce2d..450cd01d 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -3,6 +3,7 @@ Simpla Kalkulilo Kalkulilo Sciena kalkulilo + Unit converter Eraro: divido per nul @@ -13,6 +14,48 @@ Vibrigi je butonpremo Use comma as a decimal mark + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Kiel funkcias la butono C («Forviŝi»)\? Frapetado sur ĝi forviŝos signojn po unu por frapeto. Longa premado forviŝos ĉiujn kampojn samtempe. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c0192689..f0f5bde6 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -3,6 +3,7 @@ Simple Calculator Calculadora Calculadora científica + Unit converter Error: división por cero @@ -13,6 +14,48 @@ Vibrar al presionar un botón Usar una coma como marca decimal + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume ¿Cómo funciona el botón C (Borrar)\? Presionándolo una vez eliminará un solo carácter. Mantenerlo presionado reiniciará todos los campos. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index a0eb7e4e..4113b668 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -3,6 +3,7 @@ Lihtne kalkulaator Kalkulaator Teadusrežiim + Unit converter Viga: nulliga jagamine @@ -13,6 +14,48 @@ Nupuvajutusel vibreeri Kasutage koma kui kümnendmärki + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Kuidas C (Clear) nupp toimib\? Üks klõpsatus kustutab ühe numbri. Pikk vajutus eemaldab kogu sisestuse. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index f3f87c58..0f6363ed 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3,6 +3,7 @@ Yksinkertainen laskin Laskin Funktiolaskin + Unit converter Virhe: jako nollalla @@ -13,6 +14,48 @@ Värähdä painikkeista Käytä pilkkua desimaalierottimena + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Miten C (Tyhjennä) -painike toimii\? Sen napautus poistaa yhden merkin kerrallaan ja pitkä painallus tyhjentää kaikki kentät. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index 911be3e2..a7763ed0 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -3,6 +3,7 @@ Simpleng Calculator Calculator Scientific Calculator + Unit converter Error: paghahati sa zero Nakaraan Walang nakaraan @@ -10,6 +11,48 @@ Nalinis na ang nakaraan Mag-vibrate sa pagpindot Gumamit ng kuwit bilang decimal mark + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Paano gumagana ang C (Clear) button\? Matatanggal ng isang karakter kapag pinindot ito nang isang beses. Ire-reset naman ang lahat ng mga field kapag mahabang pinindot ito. - \ No newline at end of file + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ebdcf43e..2a44adb8 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3,6 +3,7 @@ Simple Calculatrice Calculatrice Calculatrice scientifique + Unit converter Erreur : division par zéro @@ -13,6 +14,48 @@ Vibrer lors de l\'appui sur les boutons Utiliser la virgule comme séparateur décimal + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Comment fonctionne le bouton C (Effacer) \? En tapotant dessus, vous retirerez un caractère à la fois. Une pression prolongée sur le bouton réinitialisera tous les champs à la fois. diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index debd20d5..c8a368de 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -3,6 +3,7 @@ Calculadora sinxela Calculadora Calculadora Científica + Unit converter Erro: división por cero @@ -13,6 +14,48 @@ Vibrar ao premer nun botón Usar cómaa como marca decimal + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Como funciona o botón C (Borrar)? O premer, eliminarase un carácter á vez. O premer de forma continua, restableceranse todos os campos á vez. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 10b56a98..07cceb77 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -3,6 +3,7 @@ सरल कैलकुलेटर कैलकुलेटर वैज्ञानिक कैलकुलेटर + Unit converter त्रुटि: शून्य से विभाजन इतिहास इतिहास खाली है @@ -10,6 +11,48 @@ इतिहास साफ हो चुका है बटन प्रेस पर कंपन दशमलव चिह्न के रूप में अल्पविराम का उपयोग करें + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume सी (क्लियर) बटन कैसे काम करता है\? इस पर टैप करने से एक बार में एक कैरेक्टर हट जाएगा। लंबे समय तक इसे दबाने से एक ही बार में सभी फ़ील्ड रीसेट हो जाएंगे। - \ No newline at end of file + diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 2477ae0c..c0f73340 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -3,6 +3,7 @@ Jednostavan kalkulator Kalkulator Znanstveni kalkulator + Unit converter Greška: dijeljenje s nulom @@ -13,6 +14,48 @@ Vibriraj prilikom pritiskanja gumba Koristi zarez kao decimalni znak + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Kako funkcionira gumb C (Izbriši)\? Dodirom gumba uklanjaju se znakovi jedan po jedan. Dugim pritiskom gumba obnavljaju se sva polja. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index ea6829c6..fe27cfb8 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -3,6 +3,7 @@ Egyszerű számológép Számológép Tudományos számológép + Unit converter Hiba: nullával való osztás @@ -13,6 +14,48 @@ Rezgés gombnyomáskor Tizedesjelként vessző használata + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Hogyan működik a C (törlés) gomb\? A koppintás egyszerre egy karaktert töröl. A hosszú lenyomás egyszerre állítja vissza az összes mezőt. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 7db9ba8c..60a6b141 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -3,6 +3,7 @@ Simple Calculator Kalkulator Kalkulator Sains + Unit converter Kesalahan: pembagian dengan nol @@ -13,6 +14,48 @@ Getar saat tombol ditekan Gunakan koma sebagai tanda desimal + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Bagaimana tombol C (Clear) bekerja? Menyentuhnya sekali akan menghapus satu karakter. Menyentuhnya lama akan mengosongkan seluruh ruas sekaligus. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 71462453..233da591 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -3,6 +3,7 @@ Simple Calculator Calculator Vísindareiknivél + Unit converter Error: division by zero @@ -13,7 +14,49 @@ Titra þegar pikkað er á takka Nota kommu sem tugabrotskommu + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Hvernig virkar C (Hreinsa) hnappurinn\? Með því að pikka á hann verður einn stafur fjarlægður í einu. Haltu inni til þess að endurstilla alla reiti í einu. - \ No newline at end of file + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d3039861..76849a38 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3,6 +3,7 @@ Calcolatrice Semplice Calcolatrice Calcolatrice scientifica + Unit converter Errore: divisione per zero @@ -13,6 +14,48 @@ Vibra alla pressione di un tasto Usa la virgola come segno decimale + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Come funziona il tasto C (Cancella)? Premendo il tasto una volta verrà eliminato un singolo carattere; tenendolo premuto invece eliminerà tutta la stringa. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 12e6b0a4..e3865270 100755 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -3,6 +3,7 @@ מחשבון פשוט מחשבון מחשבון מדעי + Unit converter שגיאה: חלוקה באפס @@ -13,6 +14,48 @@ רטט בעת לחיצה Use comma as a decimal mark + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume כיצד פועל לחצן C (ניקוי)\? הקשה עליו תסיר תו אחד בכל פעם. לחיצה ארוכה עליו תאפס את כל השדות בבת אחת. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 397c1956..b73430e3 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -3,6 +3,7 @@ シンプル電卓 電卓 科学計算電卓 + Unit converter エラー：ゼロによる除算 @@ -13,6 +14,48 @@ ボタンのタップ時に振動する カンマを小数点として使う + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume C (クリア) ボタンはどのように機能しますか？ ボタンをタップするたびに1文字ずつ削除されます。ボタンを長押しするとすべてのフィールドがリセットされます。 @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml index 153ddaed..ec261cdb 100644 --- a/app/src/main/res/values-kn/strings.xml +++ b/app/src/main/res/values-kn/strings.xml @@ -3,6 +3,7 @@ ಸರಳ ಕ್ಯಾಲ್ಕುಲೇಟರ್ ಕ್ಯಾಲ್ಕುಲೇಟರ್ ವೈಜ್ಞಾನಿಕ ಕ್ಯಾಲ್ಕುಲೇಟರ್ + Unit converter ದೋಷ : ಶೂನ್ಯದಿಂದ ವಿಭಜನೆ @@ -13,6 +14,48 @@ Vibrate on button press ಅಲ್ಪವಿರಾಮವನ್ನು ದಶಮಾಂಶ ಚಿಹ್ನೆಯಾಗಿ ಬಳಸಿ + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume ಸಿ (ತೆರವುಗೊಳಿಸಿ) ಬಟನ್ ಹೇಗೆ ಕೆಲಸ ಮಾಡುತ್ತದೆ\? ಅದರ ಮೇಲೆ ಟ್ಯಾಪ್ ಮಾಡುವುದರಿಂದ ಒಂದು ಸಮಯದಲ್ಲಿ ಒಂದು ಅಕ್ಷರವನ್ನು ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ. ದೀರ್ಘವಾಗಿ ಒತ್ತಿದರೆ ಎಲ್ಲಾ ಕ್ಷೇತ್ರಗಳನ್ನು ಒಂದೇ ಬಾರಿಗೆ ಮರುಹೊಂದಿಸುತ್ತದೆ. diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 74890af8..6251bd60 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3,6 +3,7 @@ 간단한 계산기 계산기 과학 계산기 + Unit converter 오류: 0으로 나누기 @@ -13,6 +14,48 @@ 진동 버튼을 누릅니다 쉼표를 소수점으로 사용합니다 + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume C(지우기) 버튼은 어떻게 작동합니까\? 누르면 한 번에 한 문자씩 제거됩니다. 길게 누르면 모든 필드가 한 번에 재설정됩니다. diff --git a/app/src/main/res/values-kr/strings.xml b/app/src/main/res/values-kr/strings.xml index 720ad97e..5294c32c 100644 --- a/app/src/main/res/values-kr/strings.xml +++ b/app/src/main/res/values-kr/strings.xml @@ -2,6 +2,7 @@ 심플한 계산기 계산기 공학용 계산기 + Unit converter 에러: 공으로 나눌 할수 없어요 @@ -15,6 +16,48 @@ 버튼 탭시 진동 Use comma as a decimal mark + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume C (Clear) 버튼을 어떻게 사용합니까? diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 46cfc9e1..b909efdf 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -3,6 +3,7 @@ Paprastas skaičiuotuvas Skaičiuotuvas Mokslinis skaičiuotuvas + Unit converter Klaida: dalyba iš nulio @@ -13,6 +14,48 @@ Vibruoti, kai paspaudžiami mygtukai Naudoti kablelį kaip dešimtainių dalių skirtuką + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Kaip veikia C (Išvalymo) mygtukas\? Kiekvieną kartą ant jo bakstelėjus, bus šalinama po vieną simbolį. Ilgai jį palaikius, bus iš karto atstatyti visi laukai. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 369f2021..9bf71d2d 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -3,6 +3,7 @@ Vienkāršs kalkulators Kalkulators Zinātniskais kalkulators + Unit converter Kļūda: dalīšana ar nulli @@ -13,6 +14,48 @@ Vibrēšana pēc pogas nospiešanas Izmanto komatu kā decimālzīmi + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Kā darbojas poga C (Notīrīt)\? Pieskarieties tai, lai noņemtu vienu rakstzīmi vienlaikus. Ilgstoši nospiežot to, tiks atiestatīti visi lauki vienlaicīgi. diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index ee6205a7..1d9e90e1 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -3,6 +3,7 @@ Едноставен калкулатор Калкулатор Научен калкулатор + Unit converter Грешка: поделба по нула @@ -13,6 +14,48 @@ Вибрирајте на копчето притиснете Користете замена како знак за децимален знак + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Како функционира копчето C (Clear) \? Прислушкувањето на него ќе отстрани еден лик во исто време. Долгото притискање ќе ги ресетира сите полиња одеднаш. diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index ed3859b1..88223289 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -3,6 +3,7 @@ സിമ്പിൾ കാൽക്കുലേറ്റർ കാൽക്കുലേറ്റർ ശാസ്ത്രീയ കാൽക്കുലേറ്റർ + Unit converter പിശക്: 0 കൊണ്ട് ഹരിക്കാനാവില്ല @@ -13,6 +14,48 @@ ബട്ടൺ അമർത്തുമ്പോൾ വൈബ്രേറ്റ് ചെയ്യുക ദശാംശ ചിഹ്നമായി കോമ(,) ഉപയോഗിക്കുക + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume C(ക്ലിയർ ) ബട്ടൺ പ്രവർത്തിക്കുന്നത് എങ്ങനെ\? ടാപ്പ് ചെയ്യുമ്പോൾ ഒരു സമയം ഒരു പ്രതീകത്തെ നീക്കംചെയ്യും. ദീർഘനേരം അമർത്തിയാൽ എല്ലാ ഫീൽഡുകളും പുനഃസജ്ജമാക്കും. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index c98ea691..c190f0ad 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2,6 +2,7 @@ Kalkulator Ringkas Kalkulator Kalkulator Saintifik + Unit converter Amaran: pembahagian dengan sifar @@ -15,6 +16,48 @@ Getar semasa butang ditekan Use comma as a decimal mark + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Bagaimana Butang C (Menghapus) Digunakan？ diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 47302db4..d215f30b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -3,6 +3,7 @@ Eenvoudige Rekenmachine Rekenmachine Wetenschappelijke Rekenmachine + Unit converter Fout: delen door nul @@ -13,6 +14,48 @@ Trillen bij het indrukken van toetsen Komma als decimaalteken gebruiken + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Hoe werkt de knop C (Clear)\? Kort indrukken verwijdert één karakter per keer. Lang drukken wist direct alle velden. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index 2ea2ed45..d1cab89f 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -3,6 +3,7 @@ Enkel kalkulator Kalkulator Vitenskapelig kalkulator + Unit converter FeiL: Deling på null @@ -13,6 +14,48 @@ Vibrer ved knappetrykk Use comma as a decimal mark + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Hvordan fungerer C (Clear)-knappen\? Å trykke på den fjerner ett tegn av gangen. Lang-trykk tilbakestiller alle felter. غلطی آئی اے، صفر نال ونڈ @@ -13,7 +14,49 @@ Vibrate on button press Use comma as a decimal mark + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume How does the C (Clear) button work\? Tapping on it will remove one character at a time. Long pressing it will reset all fields at once. - \ No newline at end of file + diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a3aeedd4..568b69cf 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -3,6 +3,7 @@ Prosty kalkulator Kalkulator Kalkulator naukowy + Unit converter Błąd: dzielenie przez zero @@ -13,6 +14,48 @@ Wibracja przy naciśnięciu przycisku Używaj przecinka jako separatora dziesiętnego + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Jak działa przycisk C (Wyczyść)? Naciśnięcie go usunie jeden znak naraz. Długie naciśnięcie zresetuje wszystkie pola jednocześnie. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 3f5b6b79..c99870b5 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -3,6 +3,7 @@ Calculadora Simples Calculadora Calculadora Científica + Unit converter Erro: divisão por zero @@ -13,6 +14,48 @@ Vibrar ao pressionar um botão Usar virgula como marca decimal + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Como funciona o botão C (Clear)\? Um toque remove um caractere de cada vez. Um toque longo redefine todos os campos de uma vez. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 6efcda1a..fe621b7d 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -3,6 +3,7 @@ Simple Calculator Calculadora Calculadora científica + Unit converter Erro: divisão por zero @@ -13,6 +14,48 @@ Vibrar ao tocar nos botões Usar vírgula como separador decimal + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Como funciona o botão C (limpar)\? Ao tocar uma vez, os caracteres serão apagados um a um. Um toque longo apaga todos os caracteres ao mesmo tempo. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 796bede0..a9a303c9 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -3,6 +3,7 @@ Calculator simplu Calculator Calculator Ştiințific + Unit converter Eroare: împărțire la zero @@ -13,6 +14,48 @@ Vibrează la apăsarea butoanelor Utilizează virgula ca separator zecimal + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Cum funcționează butonul Ș (Șterge)\? Apăsând pe el, veți elimina câte un caracter pe rând. Apăsarea lungă va reseta toate câmpurile deodată. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index db1b516c..acd0063a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3,6 +3,7 @@ Простой калькулятор Калькулятор Научный калькулятор + Unit converter Ошибка: деление на ноль @@ -13,6 +14,48 @@ Вибрация при нажатии кнопок Использовать запятую в качестве десятичного знака + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Как работает кнопка C (Очистка)\? Нажатие на неё удалит один символ. Долгое нажатие сбросит все поля сразу. @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index d1a3ed6e..e8dc559a 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -3,6 +3,7 @@ Jednoduchá kalkulačka Kalkulačka Vedecká kalkulačka + Unit converter Chyba: delenie nulou @@ -13,6 +14,48 @@ Vibrovať pri stlačení tlačidla Používať čiarku na oddelenie desatinných čísel + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Ako funguje tlačidlo C? Jedným stlačením viete vymazať 1 znak. Dlhé podržanie vymaže všetky polia naraz. diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index ae3d4e99..04b87bf4 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -3,6 +3,7 @@ Preprost kalkulator Kalkulator Znanstveni kalkulator + Unit converter Napaka: deljenje z ničlo Zgodovina Zgodovina je prazna @@ -10,6 +11,48 @@ Zgodovina je bila izbrisana Vibriraj ob pritisku gumba Uporabite vejico kot decimalno znamenje + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Kako deluje gumb C (Clear)\? Če ga stisnete, odstranite po en lik naenkrat. Z dolgim pritiskom nanj boste odstranili vsa polja naenkrat. - \ No newline at end of file + diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 8a5b2408..0a56aa82 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -3,6 +3,7 @@ Једноставан калкулатор Калкулатор Научни калкулатор + Unit converter Грешка : дељење нулом @@ -13,6 +14,48 @@ Вибрирајте притиснути дугметом Коришћење зареза као децималног знака + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Како дугме Ц (Обриши) функционише\? Додиривање на њега ће уклонити један по један знак. Дуго притискање ће успоставити почетне вредности свих поља одједном. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index bd6cf68a..31398e87 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -3,6 +3,7 @@ Simpel kalkylator Kalkylator Avancerad kalkylator + Unit converter Fel: delning med noll @@ -13,6 +14,48 @@ Vibrera när jag trycker på knapparna Använd komma som decimaltecken + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Hur funkar C (Rensa) knappen\? Om du trycker på den tar du bort ett tecken i taget. Om du trycker länge på den återställs alla fält på en gång. diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 1f395c81..c4b59bf8 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -3,6 +3,7 @@ எளிய கால்குலேட்டர் கால்குலேட்டர் அறிவியல் கால்குலேட்டர் + Unit converter பிழை: பூஜ்ஜியத்தால் வகுத்தல் @@ -13,6 +14,48 @@ Vibrate on button press கமாவை தசம குறியாகப் பயன்படுத்தவும் + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume சி (தெளிவு) பொத்தான் எப்படி வேலை செய்கிறது\? அதைத் தட்டினால் ஒரு நேரத்தில் ஒரு எழுத்து நீக்கப்படும். நீண்ட நேரம் அழுத்தினால், எல்லாப் புலங்களையும் ஒரே நேரத்தில் மீட்டமைக்கும். diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml index e99866a0..f1e5611f 100644 --- a/app/src/main/res/values-te/strings.xml +++ b/app/src/main/res/values-te/strings.xml @@ -3,6 +3,7 @@ సాధారణ కాలిక్యులేటర్ గనన యంత్రము శాస్త్రీయ గనన యంత్రము + Unit converter లోపం: సున్నాతో భాగించటం @@ -13,6 +14,48 @@ Vibrate on button press కామాను దశాంశ గుర్తుగా ఉపయోగించండి + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume C (క్లియర్) బటన్ ఎలా పని చేస్తుంది\? దానిపై నొక్కడం ద్వారా ఒక్కో అక్షరం తీసివేయబడుతుంది. ఎక్కువసేపు నొక్కితే, అన్ని ఫీల్డ్‌లు ఒకేసారి రీసెట్ చేయబడతాయి. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 214962e0..34fb9332 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -3,6 +3,7 @@ Simple Calculator Calculator Scientific Calculator + Unit converter Error: division by zero @@ -16,6 +17,48 @@ Vibrate on button press Use comma as a decimal mark + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume How does the C (Clear) button work? diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index acdbf07c..17511189 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -3,6 +3,7 @@ Basit Hesap Makinesi Hesap Makinesi Bilimsel Hesap Makinesi + Unit converter Hata: sıfıra bölme @@ -13,6 +14,48 @@ Düğmeye basıldığında titret Ondalık işareti olarak virgül kullan + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume C (Temizle) düğmesi nasıl çalışır? Üzerine dokunmak, bir seferde bir karakteri kaldıracaktır. Uzun basma, tüm alanları bir kerede sıfırlayacaktır. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 208a90dd..f439af33 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -3,6 +3,7 @@ Простий Калькулятор Калькулятор Науковий Калькулятор + Unit converter Помилка: ділення на нуль @@ -13,6 +14,48 @@ Вібрувати з натиском кнопок Як десятковий знак використовувати кому + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume Як працює кнопка C (Очистити)? Короткий натиск видалить один символ за раз. Тривалий натиск одразу очистить всі поля. diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml index e8a0fd2d..3e362a27 100644 --- a/app/src/main/res/values-zgh/strings.xml +++ b/app/src/main/res/values-zgh/strings.xml @@ -3,6 +3,7 @@ ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ ⵜⴰⴼⵔⴰⵔⵜ ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ ⵜⴰⵎⴰⵙⵙⴰⵏⵜ + Unit converter ⵜⴰⵣⴳⵍⵜ: ⴰⴱⵟⵟⵓ ⵅⴼ ⵓⵎⵢⴰ @@ -13,6 +14,48 @@ ⴰⵔⵎⵉⵎⵎⵉ ⴳ ⵡⴰⴱⴱⴰⵥ ⵅⴼ ⵜⴳⵎⵎⵓⵜⵉⵏ ⵙⵎⵔⵙ ⵜⵉⵙⴽⵔⵜ ⴷ ⵜⴰⵎⴰⵜⴰⵔⵜ ⵜⴰⵎⵔⴰⵡⴰⵏⵜ + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume ⵎⴰⵎⴽ ⵜⵙⵡⵓⵔⵓⵢ ⵜⴳⵎⵎⵓⵜ C (ⴽⴽⵙ)\? ⴰⴱⴱⴰⵥ ⵅⴼ ⵓⵢⵏⵏⴰ ⴰⴷ ⵉⴽⴽⵙ ⵢⴰⵏ ⵓⵙⴽⴽⵉⵍ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. ⵎⵛ ⵉⵍⵍⴰ ⵡⴰⴱⴱⴰⵥ ⴰⵙⵓⵍⴰⵏ ⵔⴰⴷ ⵜⵜⵓⵙⵏⴼⵍⵏ ⵎⴰⵕⵕⴰ ⵉⴳⵔⴰⵏ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 6c7e63ba..f546914f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3,6 +3,7 @@ 简单计算器 计算器 科学计算器 + Unit converter 错误: 被零除 @@ -13,6 +14,48 @@ 按下按键后震动 用逗号作小数点 + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume 如何使用 C (清除) 按钮？ 点按它一次删除一个字母。长按它将立即重置所有字段。 @@ -20,4 +63,4 @@ Haven't found some strings? There's more at https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res --> - \ No newline at end of file + diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index f39df6f3..02cbcf77 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3,6 +3,7 @@ 簡易計算機 計算機 科學計算機 + Unit converter 錯誤：除以零 @@ -13,6 +14,48 @@ 按下按鈕時震動 Use comma as a decimal mark + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume C（清除）按鈕如何使用？ 按一次會刪除一個字元。長按會馬上重設全部欄位。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 214962e0..523d38b4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,6 +3,7 @@ Simple Calculator Calculator Scientific Calculator + Unit converter Error: division by zero @@ -17,6 +18,49 @@ Vibrate on button press Use comma as a decimal mark + + Length + Kilometer + Hectometer + Decameter + Meter + Decimeter + Centimeter + Millimeter + Micrometer + Nanometer + Picometer + Angstrom + Mile + Chain + Yard + Foot + Mil + Inch + Fathom + Cable + Nautical Mile + Link + Rod + Astronomical Unit + Parsec + Light Year + Area + Square Kilometer + Square Meter + Square Centimeter + Square Millimeter + Square Mile + Square Yard + Square Mil + Square Inch + Square Rod + Acre + Are + Dunam + Hectare + Volume + How does the C (Clear) button work? Tapping on it will remove one character at a time. Long pressing it will reset all fields at once. From 6fc4d8a5bbdeb2a98a8458aac7b2a2b720250ca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Mon, 11 Sep 2023 14:33:34 +0200 Subject: [PATCH 02/58] Add picker for unit types for conversion --- app/src/main/AndroidManifest.xml | 4 ++ .../calculator/activities/MainActivity.kt | 2 +- .../activities/UnitConverterActivity.kt | 53 +++++++------------ .../activities/UnitConverterPickerActivity.kt | 53 +++++++++++++++++++ .../calculator/adapters/UnitTypesAdapter.kt | 42 +++++++++++++++ .../helpers/converters/AreaConverter.kt | 1 + .../calculator/helpers/converters/Base.kt | 1 + .../helpers/converters/LengthConverter.kt | 2 +- .../helpers/converters/VolumeConverter.kt | 1 + app/src/main/res/drawable/ic_box_vector.xml | 5 ++ app/src/main/res/drawable/ic_drop_vector.xml | 5 ++ .../main/res/drawable/ic_height_vector.xml | 5 ++ .../res/drawable/ic_thermostat_vector.xml | 5 ++ .../res/drawable/unit_type_background.xml | 23 ++++++++ .../layout/activity_unit_converter_picker.xml | 29 ++++++++++ app/src/main/res/layout/item_unit_type.xml | 30 +++++++++++ .../main/res/layout/view_unit_converter.xml | 6 --- app/src/main/res/values/dimens.xml | 2 + 18 files changed, 227 insertions(+), 42 deletions(-) create mode 100644 app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterPickerActivity.kt create mode 100644 app/src/main/kotlin/com/simplemobiletools/calculator/adapters/UnitTypesAdapter.kt create mode 100644 app/src/main/res/drawable/ic_box_vector.xml create mode 100644 app/src/main/res/drawable/ic_drop_vector.xml create mode 100644 app/src/main/res/drawable/ic_height_vector.xml create mode 100644 app/src/main/res/drawable/ic_thermostat_vector.xml create mode 100644 app/src/main/res/drawable/unit_type_background.xml create mode 100644 app/src/main/res/layout/activity_unit_converter_picker.xml create mode 100644 app/src/main/res/layout/item_unit_type.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 16879efa..7496edb7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -38,6 +38,10 @@ android:name=".activities.UnitConverterActivity" android:exported="false" /> + + - binding.viewUnitConverter.unitsTabLayout.newTab() - .setId(index) - .setText(converter.nameResId) - .apply { binding.viewUnitConverter.unitsTabLayout.addTab(this) } - } - binding.viewUnitConverter.viewConverter.root.setConverter(Converter.ALL.first()) + binding.viewUnitConverter.viewConverter.root.setConverter(converter) } override fun onResume() { super.onResume() setupToolbar(binding.unitConverterToolbar, NavigationIcon.Cross) - binding.viewUnitConverter.unitsTabLayout.setBackgroundColor(getProperBackgroundColor()) binding.viewUnitConverter.viewConverter.root.updateColors() - if (storedTextColor != config.textColor) { - binding.viewUnitConverter.converterHolder.let { updateViewColors(it, getProperTextColor()) } - } + binding.viewUnitConverter.converterHolder.let { updateViewColors(it, getProperTextColor()) } if (config.preventPhoneFromSleeping) { window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) } - if (storedUseCommaAsDecimalMark != config.useCommaAsDecimalMark) { - setupDecimalSeparator() - } + setupDecimalSeparator() vibrateOnButtonPress = config.vibrateOnButtonPress @@ -90,19 +84,11 @@ class UnitConverterActivity : SimpleActivity() { override fun onPause() { super.onPause() - storeStateVariables() if (config.preventPhoneFromSleeping) { window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) } } - private fun storeStateVariables() { - config.apply { - storedTextColor = textColor - storedUseCommaAsDecimalMark = useCommaAsDecimalMark - } - } - private fun checkHaptic(view: View) { if (vibrateOnButtonPress) { view.performHapticFeedback() @@ -121,10 +107,9 @@ class UnitConverterActivity : SimpleActivity() { } private fun setupDecimalSeparator() { - var decimalSeparator = DOT - var groupingSeparator = COMMA - storedUseCommaAsDecimalMark = config.useCommaAsDecimalMark - if (storedUseCommaAsDecimalMark) { + val decimalSeparator: String + val groupingSeparator: String + if (config.useCommaAsDecimalMark) { decimalSeparator = COMMA groupingSeparator = DOT } else { diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterPickerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterPickerActivity.kt new file mode 100644 index 00000000..09306eff --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterPickerActivity.kt @@ -0,0 +1,53 @@ +package com.simplemobiletools.calculator.activities + +import android.content.Intent +import android.os.Bundle +import android.view.WindowManager +import com.simplemobiletools.calculator.BuildConfig +import com.simplemobiletools.calculator.R +import com.simplemobiletools.calculator.adapters.UnitTypesAdapter +import com.simplemobiletools.calculator.databinding.ActivityUnitConverterPickerBinding +import com.simplemobiletools.calculator.extensions.config +import com.simplemobiletools.calculator.helpers.converters.Converter +import com.simplemobiletools.commons.extensions.appLaunched +import com.simplemobiletools.commons.extensions.viewBinding +import com.simplemobiletools.commons.helpers.NavigationIcon +import com.simplemobiletools.commons.views.AutoGridLayoutManager + +class UnitConverterPickerActivity : SimpleActivity() { + private val binding by viewBinding(ActivityUnitConverterPickerBinding::inflate) + + override fun onCreate(savedInstanceState: Bundle?) { + isMaterialActivity = true + super.onCreate(savedInstanceState) + setContentView(binding.root) + appLaunched(BuildConfig.APPLICATION_ID) + updateMaterialActivityViews(binding.unitConverterPickerCoordinator, null, useTransparentNavigation = false, useTopSearchMenu = false) + setupMaterialScrollListener(binding.unitTypesGrid, binding.unitConverterPickerToolbar) + + binding.unitTypesGrid.layoutManager = AutoGridLayoutManager(this, resources.getDimensionPixelSize(R.dimen.unit_type_size)) + binding.unitTypesGrid.adapter = UnitTypesAdapter(this, Converter.ALL) { + Intent(this, UnitConverterActivity::class.java).apply { + putExtra(UnitConverterActivity.EXTRA_CONVERTER_ID, it) + startActivity(this) + } + } + } + + override fun onResume() { + super.onResume() + + setupToolbar(binding.unitConverterPickerToolbar, NavigationIcon.Cross) + + if (config.preventPhoneFromSleeping) { + window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) + } + } + + override fun onPause() { + super.onPause() + if (config.preventPhoneFromSleeping) { + window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) + } + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/adapters/UnitTypesAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/adapters/UnitTypesAdapter.kt new file mode 100644 index 00000000..bc71b1f6 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/adapters/UnitTypesAdapter.kt @@ -0,0 +1,42 @@ +package com.simplemobiletools.calculator.adapters + +import android.view.View +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import com.simplemobiletools.calculator.activities.SimpleActivity +import com.simplemobiletools.calculator.databinding.ItemUnitTypeBinding +import com.simplemobiletools.calculator.helpers.converters.Converter +import com.simplemobiletools.commons.extensions.applyColorFilter +import com.simplemobiletools.commons.extensions.getProperPrimaryColor +import com.simplemobiletools.commons.extensions.getProperTextColor + +class UnitTypesAdapter (val activity: SimpleActivity, val items: List, val itemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder = + ViewHolder(ItemUnitTypeBinding.inflate(activity.layoutInflater, parent, false)) + + + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + val item = items[position] + holder.bindView(item, position) + } + + override fun getItemCount() = items.size + + inner class ViewHolder(private val binding: ItemUnitTypeBinding) : RecyclerView.ViewHolder(binding.root) { + fun bindView(item: Converter, id: Int): View { + itemView.apply { + binding.unitImage.setImageResource(item.imageResId) + binding.unitLabel.setText(item.nameResId) + + binding.unitLabel.setTextColor(activity.getProperTextColor()) + binding.unitImage.applyColorFilter(activity.getProperPrimaryColor()) + + setOnClickListener { + itemClick(id) + } + } + + return itemView + } + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt index 4876c78c..f66b809f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt @@ -4,6 +4,7 @@ import com.simplemobiletools.calculator.R object AreaConverter : Converter { override val nameResId: Int = R.string.unit_area + override val imageResId: Int = R.drawable.ic_box_vector sealed class Unit(nameResId: Int, factor: Double) : Converter.Unit(nameResId, factor) { data object SquareKilometer : Unit( diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt index 8623bb48..d234c9c8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt @@ -10,6 +10,7 @@ interface Converter { } val nameResId: Int + val imageResId: Int val units: List val defaultTopUnit: Unit val defaultBottomUnit: Unit diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt index ef59ba5b..a8e30c6b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt @@ -3,8 +3,8 @@ package com.simplemobiletools.calculator.helpers.converters import com.simplemobiletools.calculator.R object LengthConverter : Converter { - override val nameResId: Int = R.string.unit_length + override val imageResId: Int = R.drawable.ic_height_vector sealed class Unit(nameResId: Int, factor: Double) : Converter.Unit(nameResId, factor) { data object Kilometer : Unit( diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt index b7473df4..fec7ebf0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt @@ -4,6 +4,7 @@ import com.simplemobiletools.calculator.R object VolumeConverter : Converter { override val nameResId: Int = R.string.unit_volume + override val imageResId: Int = R.drawable.ic_drop_vector sealed class Unit(nameResId: Int, factor: Double) : Converter.Unit(nameResId, factor) { data object SquareKilometer : Unit( diff --git a/app/src/main/res/drawable/ic_box_vector.xml b/app/src/main/res/drawable/ic_box_vector.xml new file mode 100644 index 00000000..b1bf0ac5 --- /dev/null +++ b/app/src/main/res/drawable/ic_box_vector.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_drop_vector.xml b/app/src/main/res/drawable/ic_drop_vector.xml new file mode 100644 index 00000000..f141fb3a --- /dev/null +++ b/app/src/main/res/drawable/ic_drop_vector.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_height_vector.xml b/app/src/main/res/drawable/ic_height_vector.xml new file mode 100644 index 00000000..0392a75e --- /dev/null +++ b/app/src/main/res/drawable/ic_height_vector.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_thermostat_vector.xml b/app/src/main/res/drawable/ic_thermostat_vector.xml new file mode 100644 index 00000000..13c773a6 --- /dev/null +++ b/app/src/main/res/drawable/ic_thermostat_vector.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/unit_type_background.xml b/app/src/main/res/drawable/unit_type_background.xml new file mode 100644 index 00000000..7d03375e --- /dev/null +++ b/app/src/main/res/drawable/unit_type_background.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_unit_converter_picker.xml b/app/src/main/res/layout/activity_unit_converter_picker.xml new file mode 100644 index 00000000..eb4fd3fb --- /dev/null +++ b/app/src/main/res/layout/activity_unit_converter_picker.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/app/src/main/res/layout/item_unit_type.xml b/app/src/main/res/layout/item_unit_type.xml new file mode 100644 index 00000000..cfc9bd7d --- /dev/null +++ b/app/src/main/res/layout/item_unit_type.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/app/src/main/res/layout/view_unit_converter.xml b/app/src/main/res/layout/view_unit_converter.xml index d353f968..b3a40b9a 100644 --- a/app/src/main/res/layout/view_unit_converter.xml +++ b/app/src/main/res/layout/view_unit_converter.xml @@ -1,7 +1,6 @@ - - 34sp 20sp 40sp + + 128dp From d38b5111a5e4e9a4bdd2443beebbc4d32c9ccf52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Mon, 11 Sep 2023 14:43:53 +0200 Subject: [PATCH 03/58] Fix background colors for unit types --- .../calculator/adapters/UnitTypesAdapter.kt | 15 ++++++++++--- .../calculator/extensions/Context.kt | 21 +++++++++++++++++++ .../res/drawable/unit_type_background.xml | 6 +++--- app/src/main/res/layout/item_unit_type.xml | 1 + 4 files changed, 37 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/adapters/UnitTypesAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/adapters/UnitTypesAdapter.kt index bc71b1f6..e63fd4ab 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/adapters/UnitTypesAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/adapters/UnitTypesAdapter.kt @@ -1,14 +1,17 @@ package com.simplemobiletools.calculator.adapters +import android.graphics.drawable.LayerDrawable +import android.graphics.drawable.RippleDrawable import android.view.View import android.view.ViewGroup +import androidx.core.content.res.ResourcesCompat import androidx.recyclerview.widget.RecyclerView +import com.simplemobiletools.calculator.R import com.simplemobiletools.calculator.activities.SimpleActivity import com.simplemobiletools.calculator.databinding.ItemUnitTypeBinding +import com.simplemobiletools.calculator.extensions.getStrokeColor import com.simplemobiletools.calculator.helpers.converters.Converter -import com.simplemobiletools.commons.extensions.applyColorFilter -import com.simplemobiletools.commons.extensions.getProperPrimaryColor -import com.simplemobiletools.commons.extensions.getProperTextColor +import com.simplemobiletools.commons.extensions.* class UnitTypesAdapter (val activity: SimpleActivity, val items: List, val itemClick: (id: Int) -> Unit) : RecyclerView.Adapter() { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder = @@ -28,6 +31,12 @@ class UnitTypesAdapter (val activity: SimpleActivity, val items: List binding.unitImage.setImageResource(item.imageResId) binding.unitLabel.setText(item.nameResId) + val rippleBg = ResourcesCompat.getDrawable(resources, R.drawable.unit_type_background, context.theme) as RippleDrawable + val layerDrawable = rippleBg.findDrawableByLayerId(R.id.background_holder) as LayerDrawable + layerDrawable.findDrawableByLayerId(R.id.background_stroke).applyColorFilter(context.getStrokeColor()) + layerDrawable.findDrawableByLayerId(R.id.background_shape).applyColorFilter(context.getProperBackgroundColor().darkenColor(2)) + binding.unitBackground.background = rippleBg + binding.unitLabel.setTextColor(activity.getProperTextColor()) binding.unitImage.applyColorFilter(activity.getProperPrimaryColor()) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/extensions/Context.kt index 82ab729f..ee059d3b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/extensions/Context.kt @@ -4,6 +4,7 @@ import android.appwidget.AppWidgetManager import android.content.ComponentName import android.content.Context import android.content.Intent +import android.graphics.Color import android.net.Uri import android.os.Build import android.provider.Settings @@ -15,6 +16,9 @@ import com.simplemobiletools.calculator.databases.CalculatorDatabase import com.simplemobiletools.calculator.helpers.Config import com.simplemobiletools.calculator.helpers.MyWidgetProvider import com.simplemobiletools.calculator.interfaces.CalculatorDao +import com.simplemobiletools.commons.extensions.getProperBackgroundColor +import com.simplemobiletools.commons.extensions.isUsingSystemDarkTheme +import com.simplemobiletools.commons.extensions.lightenColor import com.simplemobiletools.commons.extensions.showErrorToast val Context.config: Config get() = Config.newInstance(applicationContext) @@ -64,3 +68,20 @@ fun Context.launchChangeAppLanguageIntent() { } } } + +fun Context.getStrokeColor(): Int { + return if (config.isUsingSystemTheme) { + if (isUsingSystemDarkTheme()) { + resources.getColor(com.simplemobiletools.commons.R.color.md_grey_800, theme) + } else { + resources.getColor(com.simplemobiletools.commons.R.color.md_grey_400, theme) + } + } else { + val lighterColor = getProperBackgroundColor().lightenColor() + if (lighterColor == Color.WHITE || lighterColor == Color.BLACK) { + resources.getColor(com.simplemobiletools.commons.R.color.divider_grey, theme) + } else { + lighterColor + } + } +} diff --git a/app/src/main/res/drawable/unit_type_background.xml b/app/src/main/res/drawable/unit_type_background.xml index 7d03375e..4388d332 100644 --- a/app/src/main/res/drawable/unit_type_background.xml +++ b/app/src/main/res/drawable/unit_type_background.xml @@ -1,15 +1,15 @@ - + - + - + Date: Mon, 11 Sep 2023 14:48:27 +0200 Subject: [PATCH 04/58] Switch only units when switch is tapped --- .../simplemobiletools/calculator/views/ConverterView.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt index 9fe849ce..ecb847b9 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt @@ -134,12 +134,9 @@ class ConverterView @JvmOverloads constructor( } private fun switch() { - binding.topUnitText.text.also { - binding.topUnitText.text = binding.bottomUnitText.text - binding.bottomUnitText.text = it - } - ::topUnit.swapWith(::bottomUnit) + updateBottomValue() + updateUnitLabels() } private fun updateUnitLabels() { From 619b2660d333f48a94c748575402107c79338c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Mon, 11 Sep 2023 14:54:10 +0200 Subject: [PATCH 05/58] Add different background for top unit in converter for visibility --- .../calculator/views/ConverterView.kt | 9 +- app/src/main/res/layout/view_converter.xml | 90 +++++++++++-------- 2 files changed, 58 insertions(+), 41 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt index ecb847b9..a25a144e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt @@ -14,9 +14,7 @@ import com.simplemobiletools.calculator.helpers.DOT import com.simplemobiletools.calculator.helpers.NumberFormatHelper import com.simplemobiletools.calculator.helpers.converters.Converter import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.extensions.applyColorFilter -import com.simplemobiletools.commons.extensions.getProperPrimaryColor -import com.simplemobiletools.commons.extensions.getProperTextColor +import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.models.RadioItem import me.grantland.widget.AutofitHelper import kotlin.reflect.KMutableProperty0 @@ -46,8 +44,8 @@ class ConverterView @JvmOverloads constructor( binding.swapButton.setOnClickListener { switch() } - binding.topUnitName.setClickListenerForUnitSelector(::topUnit, ::bottomUnit) - binding.bottomUnitName.setClickListenerForUnitSelector(::bottomUnit, ::topUnit) + binding.topUnitHolder.setClickListenerForUnitSelector(::topUnit, ::bottomUnit) + binding.bottomUnitHolder.setClickListenerForUnitSelector(::bottomUnit, ::topUnit) updateColors() } @@ -75,6 +73,7 @@ class ConverterView @JvmOverloads constructor( binding.bottomUnitName, ColorStateList.valueOf(context.getProperPrimaryColor()) ) + binding.topUnitHolder.setBackgroundColor(context.getProperBackgroundColor().lightenColor()) binding.swapButton.applyColorFilter(context.getProperPrimaryColor()) } diff --git a/app/src/main/res/layout/view_converter.xml b/app/src/main/res/layout/view_converter.xml index 12b94ed8..7bb6d803 100644 --- a/app/src/main/res/layout/view_converter.xml +++ b/app/src/main/res/layout/view_converter.xml @@ -5,25 +5,34 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - + android:layout_height="wrap_content" + android:paddingStart="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" + android:orientation="vertical" + android:layout_weight="3"> + + + + - - - + android:layout_height="wrap_content" + android:paddingStart="@dimen/activity_margin" + android:paddingEnd="@dimen/activity_margin" + android:orientation="vertical" + android:layout_weight="3"> + + + + From b6a8fcbf9e15b798916a98dd44722ca197e0e36e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Mon, 11 Sep 2023 16:05:30 +0200 Subject: [PATCH 06/58] Add volume units --- .../helpers/converters/VolumeConverter.kt | 217 +++++++++++++----- app/src/main/res/values-ar/strings.xml | 31 +++ app/src/main/res/values-az/strings.xml | 31 +++ app/src/main/res/values-be/strings.xml | 31 +++ app/src/main/res/values-bg/strings.xml | 31 +++ app/src/main/res/values-ca/strings.xml | 31 +++ app/src/main/res/values-cs/strings.xml | 31 +++ app/src/main/res/values-cy/strings.xml | 31 +++ app/src/main/res/values-da/strings.xml | 31 +++ app/src/main/res/values-de/strings.xml | 31 +++ app/src/main/res/values-el/strings.xml | 31 +++ app/src/main/res/values-eo/strings.xml | 31 +++ app/src/main/res/values-es/strings.xml | 31 +++ app/src/main/res/values-et/strings.xml | 31 +++ app/src/main/res/values-fi/strings.xml | 31 +++ app/src/main/res/values-fil/strings.xml | 31 +++ app/src/main/res/values-fr/strings.xml | 31 +++ app/src/main/res/values-gl/strings.xml | 31 +++ app/src/main/res/values-hi/strings.xml | 31 +++ app/src/main/res/values-hr/strings.xml | 31 +++ app/src/main/res/values-hu/strings.xml | 31 +++ app/src/main/res/values-in/strings.xml | 31 +++ app/src/main/res/values-is/strings.xml | 31 +++ app/src/main/res/values-it/strings.xml | 31 +++ app/src/main/res/values-iw/strings.xml | 31 +++ app/src/main/res/values-ja/strings.xml | 31 +++ app/src/main/res/values-kn/strings.xml | 31 +++ app/src/main/res/values-ko/strings.xml | 31 +++ app/src/main/res/values-kr/strings.xml | 31 +++ app/src/main/res/values-lt/strings.xml | 31 +++ app/src/main/res/values-lv/strings.xml | 31 +++ app/src/main/res/values-mk/strings.xml | 31 +++ app/src/main/res/values-ml/strings.xml | 31 +++ app/src/main/res/values-ms/strings.xml | 31 +++ app/src/main/res/values-nl/strings.xml | 31 +++ app/src/main/res/values-no-rNO/strings.xml | 31 +++ app/src/main/res/values-pa-rPK/strings.xml | 31 +++ app/src/main/res/values-pl/strings.xml | 31 +++ app/src/main/res/values-pt-rBR/strings.xml | 31 +++ app/src/main/res/values-pt/strings.xml | 31 +++ app/src/main/res/values-ro/strings.xml | 31 +++ app/src/main/res/values-ru/strings.xml | 31 +++ app/src/main/res/values-sk/strings.xml | 31 +++ app/src/main/res/values-sl/strings.xml | 31 +++ app/src/main/res/values-sr/strings.xml | 31 +++ app/src/main/res/values-sv/strings.xml | 31 +++ app/src/main/res/values-ta/strings.xml | 31 +++ app/src/main/res/values-te/strings.xml | 31 +++ app/src/main/res/values-th/strings.xml | 31 +++ app/src/main/res/values-tr/strings.xml | 31 +++ app/src/main/res/values-uk/strings.xml | 31 +++ app/src/main/res/values-zgh/strings.xml | 31 +++ app/src/main/res/values-zh-rCN/strings.xml | 31 +++ app/src/main/res/values-zh-rTW/strings.xml | 31 +++ app/src/main/res/values/strings.xml | 31 +++ 55 files changed, 1837 insertions(+), 54 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt index fec7ebf0..585d0afb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt @@ -7,87 +7,196 @@ object VolumeConverter : Converter { override val imageResId: Int = R.drawable.ic_drop_vector sealed class Unit(nameResId: Int, factor: Double) : Converter.Unit(nameResId, factor) { - data object SquareKilometer : Unit( - nameResId = R.string.unit_length_kilometer, - factor = 1000000.0 - ) - - data object SquareMeter : Unit( - nameResId = R.string.unit_length_meter, + data object CubicMeter : Unit( + nameResId = R.string.unit_volume_cubic_meter, factor = 1.0 ) - data object SquareCentimeter : Unit( - nameResId = R.string.unit_length_centimeter, - factor = 0.0001 + data object CubicDecimeter : Unit( + nameResId = R.string.unit_volume_cubic_decimeter, + factor = 0.001 ) - data object SquareMillimeter : Unit( - nameResId = R.string.unit_length_millimeter, + data object CubicCentimeter : Unit( + nameResId = R.string.unit_volume_cubic_centimeter, factor = 0.000001 ) - data object SquareMile : Unit( - nameResId = R.string.unit_length_mile, - factor = 2_589_988.110336 + data object CubicMillimeter : Unit( + nameResId = R.string.unit_volume_cubic_millimeter, + factor = 0.000000001 ) - data object SquareYard : Unit( - nameResId = R.string.unit_length_yard, - factor = 0.83612736 + data object Liter : Unit( + nameResId = R.string.unit_volume_liter, + factor = 0.001 ) - data object SquareMil : Unit( - nameResId = R.string.unit_length_mil, - factor = 0.00000000064516 + data object Centiliter : Unit( + nameResId = R.string.unit_volume_centiliter, + factor = 0.0001 ) - data object SquareInch : Unit( - nameResId = R.string.unit_length_inch, - factor = 0.00064516 + data object Deciliter : Unit( + nameResId = R.string.unit_volume_deciliter, + factor = 0.00001 ) - data object SquareRod : Unit( - nameResId = R.string.unit_length_rod, - factor = 25.29285264 + data object Milliliter : Unit( + nameResId = R.string.unit_volume_milliliter, + factor = 0.000001 ) - data object Acre : Unit( - nameResId = R.string.unit_length_astronomical_unit, - factor = 4_046.8564224 + data object AcreFoot : Unit( + nameResId = R.string.unit_volume_acre_foot, + factor = 1_233.48183754752 ) - data object Are : Unit( - nameResId = R.string.unit_length_parsec, - factor = 100.0 + data object CubicYard : Unit( + nameResId = R.string.unit_volume_cubic_yard, + factor = 0.764554857984 ) - data object Dunam : Unit( - nameResId = R.string.unit_length_parsec, - factor = 1000.0 + data object CubicFoot : Unit( + nameResId = R.string.unit_volume_cubic_foot, + factor = 0.028316846592 ) - data object Hectare : Unit( - nameResId = R.string.unit_length_light_year, - factor = 10_000.0 + data object CubicInch : Unit( + nameResId = R.string.unit_volume_cubic_inch, + factor = 0.000016387064 + ) + + data object BarrelUS : Unit( + nameResId = R.string.unit_volume_barrel_us, + factor = 0.119240471196 + ) + + data object GallonUS : Unit( + nameResId = R.string.unit_volume_gallon_us, + factor = 0.003785411784 + ) + + data object QuartUS : Unit( + nameResId = R.string.unit_volume_quart_us, + factor = 0.000946352946 + ) + + data object PintUS : Unit( + nameResId = R.string.unit_volume_pint_us, + factor = 0.000473176473 + ) + + data object GillUS : Unit( + nameResId = R.string.unit_volume_gill_us, + factor = 0.00011829411825 + ) + + data object FluidOunceUS : Unit( + nameResId = R.string.unit_volume_fluid_ounce_us, + factor = 0.00003 + ) + + data object DropUS : Unit( + nameResId = R.string.unit_volume_drop_us, + factor = 0.00000008214869322916 + ) + + data object TeaspoonUS : Unit( + nameResId = R.string.unit_volume_teaspoon_us, + factor = 0.000005 + ) + + data object TablespoonUS : Unit( + nameResId = R.string.unit_volume_tablespoon_us, + factor = 0.000015 + ) + + data object CupUS : Unit( + nameResId = R.string.unit_volume_cup_us, + factor = 0.00024 + ) + + data object BarrelImperial : Unit( + nameResId = R.string.unit_volume_barrel_imperial, + factor = 0.16365924 + ) + + data object GallonImperial : Unit( + nameResId = R.string.unit_volume_gallon_imperial, + factor = 0.00454609 + ) + + data object QuartImperial : Unit( + nameResId = R.string.unit_volume_quart_imperial, + factor = 0.0011365225 + ) + + data object PintImperial : Unit( + nameResId = R.string.unit_volume_pint_imperial, + factor = 0.00056826125 + ) + + data object GillImperial : Unit( + nameResId = R.string.unit_volume_gill_imperial, + factor = 0.0001420653125 + ) + + data object FluidOunceImperial : Unit( + nameResId = R.string.unit_volume_fluid_ounce_imperial, + factor = 0.0000284130625 + ) + + data object DropImperial : Unit( + nameResId = R.string.unit_volume_drop_imperial, + factor = 0.0000000986564670138 + ) + + data object TeaspoonImperial : Unit( + nameResId = R.string.unit_volume_teaspoon_imperial, + factor = 0.00000591938802083 + ) + + data object TablespoonImperial : Unit( + nameResId = R.string.unit_volume_tablespoon_imperial, + factor = 0.0000177581640625 ) } override val units: List = listOf( - Unit.SquareKilometer, - Unit.SquareMeter, - Unit.SquareCentimeter, - Unit.SquareMillimeter, - Unit.SquareMile, - Unit.SquareYard, - Unit.SquareMil, - Unit.SquareInch, - Unit.SquareRod, - Unit.Acre, - Unit.Are, - Unit.Dunam, - Unit.Hectare, + Unit.CubicMeter, + Unit.CubicDecimeter, + Unit.CubicCentimeter, + Unit.CubicMillimeter, + Unit.Liter, + Unit.Centiliter, + Unit.Deciliter, + Unit.Milliliter, + Unit.AcreFoot, + Unit.CubicYard, + Unit.CubicFoot, + Unit.CubicInch, + Unit.BarrelUS, + Unit.GallonUS, + Unit.QuartUS, + Unit.PintUS, + Unit.GillUS, + Unit.FluidOunceUS, + Unit.DropUS, + Unit.TeaspoonUS, + Unit.TablespoonUS, + Unit.CupUS, + Unit.BarrelImperial, + Unit.GallonImperial, + Unit.QuartImperial, + Unit.PintImperial, + Unit.GillImperial, + Unit.FluidOunceImperial, + Unit.DropImperial, + Unit.TeaspoonImperial, + Unit.TablespoonImperial, ) - override val defaultTopUnit: Unit = Unit.SquareKilometer - override val defaultBottomUnit: Unit = Unit.SquareMeter + + override val defaultTopUnit: Unit = Unit.Liter + override val defaultBottomUnit: Unit = Unit.CubicMeter } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 03155515..722478a5 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) كيف يعمل الزر C (مسح)؟ النقر على ذلك سوف يزيل حرف واحد في وقت واحد. الضغط لفترة طويلة سوف إعادة تعيين جميع الحقول في وقت واحد. diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index c3502631..7430788a 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -58,6 +58,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) C (Sil) düyməsi necə işləyir? diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 584dc614..98a4fd2a 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Як працуе кнопка C (Ачыстка)\? Крананне да яе выдаляе адзін сімвал. Доўгае націсканне на яе ачышчае адразу ўсе палі. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index e4eb8a33..e1605ce7 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Как работи бутонът C (Clear)\? Натискането му ще премахва по един символ. Дълго натискане ще изчисти наведнъж всички полета. diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 2e116383..dedaf5b1 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Com funciona el botó C (Esborra)\? En tocar-lo, s\'eliminarà un caràcter a la vegada. Si el premeu prolongadament, es reiniciaran tots els camps de cop. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 99694bfa..88af5581 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Jak funguje tlačítko C? Stisknutím odmažete jeden znak. Dlouhým podržením smažete naráz všechna pole. diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index e8bd3640..9c9fc31c 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Sut mae\'r botwm C (clirio) yn gweithio? Mae ei dapio yn tynnu un rhif ar y tro. Mae ei dal yn ailosod pob maes gyda\'i gilydd ar unwaith. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index f2498c77..88923e6f 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Hvordan virker knappen C (Slet)\? Hvis du trykker på det, fjernes et tegn ad gangen. Langt tryk vil nulstille alle felter på én gang. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 61f3651b..99295787 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Wie funktioniert die C-Taste (Löschen)\? Bei einmaliger Berührung wird ein Zeichen entfernt. Bei langer Berührung werden alle Felder zurück gesetzt. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index c566ab95..75aa7833 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -58,6 +58,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Πώς λειτουργεί το κουμπί C (Καθαρισμός); diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 450cd01d..aed7f14a 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Kiel funkcias la butono C («Forviŝi»)\? Frapetado sur ĝi forviŝos signojn po unu por frapeto. Longa premado forviŝos ĉiujn kampojn samtempe. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f0f5bde6..32d14fdb 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) ¿Cómo funciona el botón C (Borrar)\? Presionándolo una vez eliminará un solo carácter. Mantenerlo presionado reiniciará todos los campos. diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 4113b668..b1f35b98 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Kuidas C (Clear) nupp toimib\? Üks klõpsatus kustutab ühe numbri. Pikk vajutus eemaldab kogu sisestuse. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 0f6363ed..7da5d523 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Miten C (Tyhjennä) -painike toimii\? Sen napautus poistaa yhden merkin kerrallaan ja pitkä painallus tyhjentää kaikki kentät. diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index a7763ed0..64f0fd9a 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -53,6 +53,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Paano gumagana ang C (Clear) button\? Matatanggal ng isang karakter kapag pinindot ito nang isang beses. Ire-reset naman ang lahat ng mga field kapag mahabang pinindot ito. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 2a44adb8..2e5fd280 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Comment fonctionne le bouton C (Effacer) \? En tapotant dessus, vous retirerez un caractère à la fois. Une pression prolongée sur le bouton réinitialisera tous les champs à la fois. diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index c8a368de..ed100209 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Como funciona o botón C (Borrar)? O premer, eliminarase un carácter á vez. O premer de forma continua, restableceranse todos os campos á vez. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 07cceb77..3288d56b 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -53,6 +53,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) सी (क्लियर) बटन कैसे काम करता है\? इस पर टैप करने से एक बार में एक कैरेक्टर हट जाएगा। लंबे समय तक इसे दबाने से एक ही बार में सभी फ़ील्ड रीसेट हो जाएंगे। diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index c0f73340..d2566b8b 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Kako funkcionira gumb C (Izbriši)\? Dodirom gumba uklanjaju se znakovi jedan po jedan. Dugim pritiskom gumba obnavljaju se sva polja. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index fe27cfb8..4e463b17 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Hogyan működik a C (törlés) gomb\? A koppintás egyszerre egy karaktert töröl. A hosszú lenyomás egyszerre állítja vissza az összes mezőt. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 60a6b141..acf41d8b 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Bagaimana tombol C (Clear) bekerja? Menyentuhnya sekali akan menghapus satu karakter. Menyentuhnya lama akan mengosongkan seluruh ruas sekaligus. diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 233da591..edaf3752 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Hvernig virkar C (Hreinsa) hnappurinn\? Með því að pikka á hann verður einn stafur fjarlægður í einu. Haltu inni til þess að endurstilla alla reiti í einu. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 76849a38..1c89b357 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Come funziona il tasto C (Cancella)? Premendo il tasto una volta verrà eliminato un singolo carattere; tenendolo premuto invece eliminerà tutta la stringa. diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index e3865270..a5985003 100755 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) כיצד פועל לחצן C (ניקוי)\? הקשה עליו תסיר תו אחד בכל פעם. לחיצה ארוכה עליו תאפס את כל השדות בבת אחת. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index b73430e3..f874d2f1 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) C (クリア) ボタンはどのように機能しますか？ ボタンをタップするたびに1文字ずつ削除されます。ボタンを長押しするとすべてのフィールドがリセットされます。 diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml index ec261cdb..3c9e0fd2 100644 --- a/app/src/main/res/values-kn/strings.xml +++ b/app/src/main/res/values-kn/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) ಸಿ (ತೆರವುಗೊಳಿಸಿ) ಬಟನ್ ಹೇಗೆ ಕೆಲಸ ಮಾಡುತ್ತದೆ\? ಅದರ ಮೇಲೆ ಟ್ಯಾಪ್ ಮಾಡುವುದರಿಂದ ಒಂದು ಸಮಯದಲ್ಲಿ ಒಂದು ಅಕ್ಷರವನ್ನು ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ. ದೀರ್ಘವಾಗಿ ಒತ್ತಿದರೆ ಎಲ್ಲಾ ಕ್ಷೇತ್ರಗಳನ್ನು ಒಂದೇ ಬಾರಿಗೆ ಮರುಹೊಂದಿಸುತ್ತದೆ. diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 6251bd60..a2eb0f27 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) C(지우기) 버튼은 어떻게 작동합니까\? 누르면 한 번에 한 문자씩 제거됩니다. 길게 누르면 모든 필드가 한 번에 재설정됩니다. diff --git a/app/src/main/res/values-kr/strings.xml b/app/src/main/res/values-kr/strings.xml index 5294c32c..206d6864 100644 --- a/app/src/main/res/values-kr/strings.xml +++ b/app/src/main/res/values-kr/strings.xml @@ -58,6 +58,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) C (Clear) 버튼을 어떻게 사용합니까? diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index b909efdf..eef099c6 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Kaip veikia C (Išvalymo) mygtukas\? Kiekvieną kartą ant jo bakstelėjus, bus šalinama po vieną simbolį. Ilgai jį palaikius, bus iš karto atstatyti visi laukai. diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 9bf71d2d..c70e1cf3 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Kā darbojas poga C (Notīrīt)\? Pieskarieties tai, lai noņemtu vienu rakstzīmi vienlaikus. Ilgstoši nospiežot to, tiks atiestatīti visi lauki vienlaicīgi. diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 1d9e90e1..732176ae 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Како функционира копчето C (Clear) \? Прислушкувањето на него ќе отстрани еден лик во исто време. Долгото притискање ќе ги ресетира сите полиња одеднаш. diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 88223289..2e7ae233 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) C(ക്ലിയർ ) ബട്ടൺ പ്രവർത്തിക്കുന്നത് എങ്ങനെ\? ടാപ്പ് ചെയ്യുമ്പോൾ ഒരു സമയം ഒരു പ്രതീകത്തെ നീക്കംചെയ്യും. ദീർഘനേരം അമർത്തിയാൽ എല്ലാ ഫീൽഡുകളും പുനഃസജ്ജമാക്കും. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index c190f0ad..a3f99770 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -58,6 +58,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Bagaimana Butang C (Menghapus) Digunakan？ diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d215f30b..cff4f9b6 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Hoe werkt de knop C (Clear)\? Kort indrukken verwijdert één karakter per keer. Lang drukken wist direct alle velden. diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index d1cab89f..110978eb 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Hvordan fungerer C (Clear)-knappen\? Å trykke på den fjerner ett tegn av gangen. Lang-trykk tilbakestiller alle felter. How does the C (Clear) button work\? Tapping on it will remove one character at a time. Long pressing it will reset all fields at once. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 568b69cf..228dbfb7 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Jak działa przycisk C (Wyczyść)? Naciśnięcie go usunie jeden znak naraz. Długie naciśnięcie zresetuje wszystkie pola jednocześnie. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index c99870b5..f69fc42d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Como funciona o botão C (Clear)\? Um toque remove um caractere de cada vez. Um toque longo redefine todos os campos de uma vez. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index fe621b7d..2a2fbdf6 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Como funciona o botão C (limpar)\? Ao tocar uma vez, os caracteres serão apagados um a um. Um toque longo apaga todos os caracteres ao mesmo tempo. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index a9a303c9..2da0ce4c 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Cum funcționează butonul Ș (Șterge)\? Apăsând pe el, veți elimina câte un caracter pe rând. Apăsarea lungă va reseta toate câmpurile deodată. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index acd0063a..a0e355bc 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Как работает кнопка C (Очистка)\? Нажатие на неё удалит один символ. Долгое нажатие сбросит все поля сразу. diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index e8dc559a..642e0f9b 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Ako funguje tlačidlo C? Jedným stlačením viete vymazať 1 znak. Dlhé podržanie vymaže všetky polia naraz. diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 04b87bf4..fd929543 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -53,6 +53,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Kako deluje gumb C (Clear)\? Če ga stisnete, odstranite po en lik naenkrat. Z dolgim pritiskom nanj boste odstranili vsa polja naenkrat. diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 0a56aa82..e5cedcac 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Како дугме Ц (Обриши) функционише\? Додиривање на њега ће уклонити један по један знак. Дуго притискање ће успоставити почетне вредности свих поља одједном. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 31398e87..a7445bdf 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Hur funkar C (Rensa) knappen\? Om du trycker på den tar du bort ett tecken i taget. Om du trycker länge på den återställs alla fält på en gång. diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index c4b59bf8..deb691f9 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) சி (தெளிவு) பொத்தான் எப்படி வேலை செய்கிறது\? அதைத் தட்டினால் ஒரு நேரத்தில் ஒரு எழுத்து நீக்கப்படும். நீண்ட நேரம் அழுத்தினால், எல்லாப் புலங்களையும் ஒரே நேரத்தில் மீட்டமைக்கும். diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml index f1e5611f..f1ec0b22 100644 --- a/app/src/main/res/values-te/strings.xml +++ b/app/src/main/res/values-te/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) C (క్లియర్) బటన్ ఎలా పని చేస్తుంది\? దానిపై నొక్కడం ద్వారా ఒక్కో అక్షరం తీసివేయబడుతుంది. ఎక్కువసేపు నొక్కితే, అన్ని ఫీల్డ్‌లు ఒకేసారి రీసెట్ చేయబడతాయి. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 34fb9332..59a627af 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -59,6 +59,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) How does the C (Clear) button work? diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 17511189..133f1258 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) C (Temizle) düğmesi nasıl çalışır? Üzerine dokunmak, bir seferde bir karakteri kaldıracaktır. Uzun basma, tüm alanları bir kerede sıfırlayacaktır. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index f439af33..e5ff89c1 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) Як працює кнопка C (Очистити)? Короткий натиск видалить один символ за раз. Тривалий натиск одразу очистить всі поля. diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml index 3e362a27..0c376049 100644 --- a/app/src/main/res/values-zgh/strings.xml +++ b/app/src/main/res/values-zgh/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) ⵎⴰⵎⴽ ⵜⵙⵡⵓⵔⵓⵢ ⵜⴳⵎⵎⵓⵜ C (ⴽⴽⵙ)\? ⴰⴱⴱⴰⵥ ⵅⴼ ⵓⵢⵏⵏⴰ ⴰⴷ ⵉⴽⴽⵙ ⵢⴰⵏ ⵓⵙⴽⴽⵉⵍ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. ⵎⵛ ⵉⵍⵍⴰ ⵡⴰⴱⴱⴰⵥ ⴰⵙⵓⵍⴰⵏ ⵔⴰⴷ ⵜⵜⵓⵙⵏⴼⵍⵏ ⵎⴰⵕⵕⴰ ⵉⴳⵔⴰⵏ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index f546914f..f5fe18e3 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) 如何使用 C (清除) 按钮？ 点按它一次删除一个字母。长按它将立即重置所有字段。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 02cbcf77..e80bee2d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -56,6 +56,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) C（清除）按鈕如何使用？ 按一次會刪除一個字元。長按會馬上重設全部欄位。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 523d38b4..561ff76b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -60,6 +60,37 @@ Dunam Hectare Volume + Cubic Meter + Cubic Decimeter + Cubic Centimeter + Cubic Millimeter + Liter + Centiliter + Deciliter + Milliliter + Acre Foot + Cubic Yard + Cubic Foot + Cubic Inch + Barrel (US) + Gallon (US) + Quart (US) + Pint (US) + Gill (US) + Fluid Ounce (US) + Drop (US) + Teaspoon (US) + Tablespoon (US) + Cup (US) + Barrel (Imperial) + Gallon (Imperial) + Quart (Imperial) + Pint (Imperial) + Gill (Imperial) + Fluid Ounce (Imperial) + Drop (Imperial) + Teaspoon (Imperial) + Tablespoon (Imperial) How does the C (Clear) button work? From d791fad05fd0aeb034923f37fb166f0e5c68121c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Tue, 12 Sep 2023 08:48:01 +0200 Subject: [PATCH 07/58] Add mass unit converter --- .../calculator/helpers/converters/Base.kt | 3 +- .../helpers/converters/MassConverter.kt | 100 ++++++++++++++++++ app/src/main/res/drawable/ic_scale_vector.xml | 5 + app/src/main/res/values-ar/strings.xml | 15 +++ app/src/main/res/values-az/strings.xml | 15 +++ app/src/main/res/values-be/strings.xml | 15 +++ app/src/main/res/values-bg/strings.xml | 15 +++ app/src/main/res/values-ca/strings.xml | 15 +++ app/src/main/res/values-cs/strings.xml | 15 +++ app/src/main/res/values-cy/strings.xml | 15 +++ app/src/main/res/values-da/strings.xml | 15 +++ app/src/main/res/values-de/strings.xml | 15 +++ app/src/main/res/values-el/strings.xml | 15 +++ app/src/main/res/values-eo/strings.xml | 15 +++ app/src/main/res/values-es/strings.xml | 15 +++ app/src/main/res/values-et/strings.xml | 15 +++ app/src/main/res/values-fi/strings.xml | 15 +++ app/src/main/res/values-fil/strings.xml | 15 +++ app/src/main/res/values-fr/strings.xml | 15 +++ app/src/main/res/values-gl/strings.xml | 15 +++ app/src/main/res/values-hi/strings.xml | 15 +++ app/src/main/res/values-hr/strings.xml | 15 +++ app/src/main/res/values-hu/strings.xml | 15 +++ app/src/main/res/values-in/strings.xml | 15 +++ app/src/main/res/values-is/strings.xml | 15 +++ app/src/main/res/values-it/strings.xml | 15 +++ app/src/main/res/values-iw/strings.xml | 15 +++ app/src/main/res/values-ja/strings.xml | 15 +++ app/src/main/res/values-kn/strings.xml | 15 +++ app/src/main/res/values-ko/strings.xml | 15 +++ app/src/main/res/values-kr/strings.xml | 15 +++ app/src/main/res/values-lt/strings.xml | 15 +++ app/src/main/res/values-lv/strings.xml | 15 +++ app/src/main/res/values-mk/strings.xml | 15 +++ app/src/main/res/values-ml/strings.xml | 15 +++ app/src/main/res/values-ms/strings.xml | 15 +++ app/src/main/res/values-nl/strings.xml | 15 +++ app/src/main/res/values-no-rNO/strings.xml | 15 +++ app/src/main/res/values-pa-rPK/strings.xml | 15 +++ app/src/main/res/values-pl/strings.xml | 15 +++ app/src/main/res/values-pt-rBR/strings.xml | 15 +++ app/src/main/res/values-pt/strings.xml | 15 +++ app/src/main/res/values-ro/strings.xml | 15 +++ app/src/main/res/values-ru/strings.xml | 15 +++ app/src/main/res/values-sk/strings.xml | 15 +++ app/src/main/res/values-sl/strings.xml | 15 +++ app/src/main/res/values-sr/strings.xml | 15 +++ app/src/main/res/values-sv/strings.xml | 15 +++ app/src/main/res/values-ta/strings.xml | 15 +++ app/src/main/res/values-te/strings.xml | 15 +++ app/src/main/res/values-th/strings.xml | 15 +++ app/src/main/res/values-tr/strings.xml | 15 +++ app/src/main/res/values-uk/strings.xml | 15 +++ app/src/main/res/values-zgh/strings.xml | 15 +++ app/src/main/res/values-zh-rCN/strings.xml | 15 +++ app/src/main/res/values-zh-rTW/strings.xml | 15 +++ app/src/main/res/values/strings.xml | 15 +++ 57 files changed, 917 insertions(+), 1 deletion(-) create mode 100644 app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/MassConverter.kt create mode 100644 app/src/main/res/drawable/ic_scale_vector.xml diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt index d234c9c8..9318dccc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt @@ -5,7 +5,8 @@ interface Converter { val ALL = listOf( LengthConverter, AreaConverter, - VolumeConverter + VolumeConverter, + MassConverter ) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/MassConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/MassConverter.kt new file mode 100644 index 00000000..26db2863 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/MassConverter.kt @@ -0,0 +1,100 @@ +package com.simplemobiletools.calculator.helpers.converters + +import com.simplemobiletools.calculator.R + +object MassConverter : Converter { + override val nameResId: Int = R.string.unit_mass + override val imageResId: Int = R.drawable.ic_scale_vector + + sealed class Unit(nameResId: Int, factor: Double) : Converter.Unit(nameResId, factor) { + data object Gram : Unit( + nameResId = R.string.unit_mass_gram, + factor = 0.001 + ) + + data object Kilogram : Unit( + nameResId = R.string.unit_mass_kilogram, + factor = 1.0 + ) + + data object Milligram : Unit( + nameResId = R.string.unit_mass_milligram, + factor = 0.000001 + ) + + data object Microgram : Unit( + nameResId = R.string.unit_mass_microgram, + factor = 0.000000001 + ) + + data object Tonne : Unit( + nameResId = R.string.unit_mass_tonne, + factor = 1_000.0 + ) + + data object Pound : Unit( + nameResId = R.string.unit_mass_pound, + factor = 0.45359237 + ) + + data object Ounce : Unit( + nameResId = R.string.unit_mass_ounce, + factor = 0.028349523125 + ) + + data object Grain : Unit( + nameResId = R.string.unit_mass_grain, + factor = 0.00006479891 + ) + + data object Dram : Unit( + nameResId = R.string.unit_mass_dram, + factor = 0.0017718451953125 + ) + + data object Stone : Unit( + nameResId = R.string.unit_mass_stone, + factor = 6.35029318 + ) + + data object LongTon : Unit( + nameResId = R.string.unit_mass_long_ton, + factor = 1_016.0469088 + ) + + data object ShortTon : Unit( + nameResId = R.string.unit_mass_short_ton, + factor = 907.18474 + ) + + data object Carat : Unit( + nameResId = R.string.unit_mass_carat, + factor = 0.0002051965483 + ) + + data object CaratMetric : Unit( + nameResId = R.string.unit_mass_carat_metric, + factor = 0.0002 + ) + } + + override val units: List = listOf( + Unit.Gram, + Unit.Kilogram, + Unit.Milligram, + Unit.Microgram, + Unit.Tonne, + Unit.Pound, + Unit.Ounce, + Unit.Grain, + Unit.Dram, + Unit.Stone, + Unit.LongTon, + Unit.ShortTon, + Unit.Carat, + Unit.CaratMetric, + ) + + override val defaultTopUnit: Unit = Unit.Pound + override val defaultBottomUnit: Unit = Unit.Kilogram +} diff --git a/app/src/main/res/drawable/ic_scale_vector.xml b/app/src/main/res/drawable/ic_scale_vector.xml new file mode 100644 index 00000000..54782c4c --- /dev/null +++ b/app/src/main/res/drawable/ic_scale_vector.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 722478a5..d99d92c7 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) كيف يعمل الزر C (مسح)؟ النقر على ذلك سوف يزيل حرف واحد في وقت واحد. الضغط لفترة طويلة سوف إعادة تعيين جميع الحقول في وقت واحد. diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 7430788a..ab047d68 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -89,6 +89,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) C (Sil) düyməsi necə işləyir? diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 98a4fd2a..9eb8be42 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Як працуе кнопка C (Ачыстка)\? Крананне да яе выдаляе адзін сімвал. Доўгае націсканне на яе ачышчае адразу ўсе палі. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index e1605ce7..56ce3ca8 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Как работи бутонът C (Clear)\? Натискането му ще премахва по един символ. Дълго натискане ще изчисти наведнъж всички полета. diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index dedaf5b1..2c66e66c 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Com funciona el botó C (Esborra)\? En tocar-lo, s\'eliminarà un caràcter a la vegada. Si el premeu prolongadament, es reiniciaran tots els camps de cop. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 88af5581..abdfad94 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Jak funguje tlačítko C? Stisknutím odmažete jeden znak. Dlouhým podržením smažete naráz všechna pole. diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 9c9fc31c..6b6bd4ed 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Sut mae\'r botwm C (clirio) yn gweithio? Mae ei dapio yn tynnu un rhif ar y tro. Mae ei dal yn ailosod pob maes gyda\'i gilydd ar unwaith. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 88923e6f..c7fb2f55 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Hvordan virker knappen C (Slet)\? Hvis du trykker på det, fjernes et tegn ad gangen. Langt tryk vil nulstille alle felter på én gang. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 99295787..bd3b5129 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Wie funktioniert die C-Taste (Löschen)\? Bei einmaliger Berührung wird ein Zeichen entfernt. Bei langer Berührung werden alle Felder zurück gesetzt. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 75aa7833..c26fbc9c 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -89,6 +89,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Πώς λειτουργεί το κουμπί C (Καθαρισμός); diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index aed7f14a..42f20d46 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Kiel funkcias la butono C («Forviŝi»)\? Frapetado sur ĝi forviŝos signojn po unu por frapeto. Longa premado forviŝos ĉiujn kampojn samtempe. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 32d14fdb..89e03af7 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) ¿Cómo funciona el botón C (Borrar)\? Presionándolo una vez eliminará un solo carácter. Mantenerlo presionado reiniciará todos los campos. diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index b1f35b98..838522b7 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Kuidas C (Clear) nupp toimib\? Üks klõpsatus kustutab ühe numbri. Pikk vajutus eemaldab kogu sisestuse. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 7da5d523..62b25540 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Miten C (Tyhjennä) -painike toimii\? Sen napautus poistaa yhden merkin kerrallaan ja pitkä painallus tyhjentää kaikki kentät. diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index 64f0fd9a..123d0712 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -84,6 +84,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Paano gumagana ang C (Clear) button\? Matatanggal ng isang karakter kapag pinindot ito nang isang beses. Ire-reset naman ang lahat ng mga field kapag mahabang pinindot ito. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 2e5fd280..c41bbc33 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Comment fonctionne le bouton C (Effacer) \? En tapotant dessus, vous retirerez un caractère à la fois. Une pression prolongée sur le bouton réinitialisera tous les champs à la fois. diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index ed100209..05f44a26 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Como funciona o botón C (Borrar)? O premer, eliminarase un carácter á vez. O premer de forma continua, restableceranse todos os campos á vez. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 3288d56b..11ab8234 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -84,6 +84,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) सी (क्लियर) बटन कैसे काम करता है\? इस पर टैप करने से एक बार में एक कैरेक्टर हट जाएगा। लंबे समय तक इसे दबाने से एक ही बार में सभी फ़ील्ड रीसेट हो जाएंगे। diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index d2566b8b..3f2aae28 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Kako funkcionira gumb C (Izbriši)\? Dodirom gumba uklanjaju se znakovi jedan po jedan. Dugim pritiskom gumba obnavljaju se sva polja. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 4e463b17..28e464db 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Hogyan működik a C (törlés) gomb\? A koppintás egyszerre egy karaktert töröl. A hosszú lenyomás egyszerre állítja vissza az összes mezőt. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index acf41d8b..6baea118 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Bagaimana tombol C (Clear) bekerja? Menyentuhnya sekali akan menghapus satu karakter. Menyentuhnya lama akan mengosongkan seluruh ruas sekaligus. diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index edaf3752..d95a0333 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Hvernig virkar C (Hreinsa) hnappurinn\? Með því að pikka á hann verður einn stafur fjarlægður í einu. Haltu inni til þess að endurstilla alla reiti í einu. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 1c89b357..889f334e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Come funziona il tasto C (Cancella)? Premendo il tasto una volta verrà eliminato un singolo carattere; tenendolo premuto invece eliminerà tutta la stringa. diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index a5985003..941ee8fb 100755 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) כיצד פועל לחצן C (ניקוי)\? הקשה עליו תסיר תו אחד בכל פעם. לחיצה ארוכה עליו תאפס את כל השדות בבת אחת. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index f874d2f1..8e03200b 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) C (クリア) ボタンはどのように機能しますか？ ボタンをタップするたびに1文字ずつ削除されます。ボタンを長押しするとすべてのフィールドがリセットされます。 diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml index 3c9e0fd2..6af3fb5b 100644 --- a/app/src/main/res/values-kn/strings.xml +++ b/app/src/main/res/values-kn/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) ಸಿ (ತೆರವುಗೊಳಿಸಿ) ಬಟನ್ ಹೇಗೆ ಕೆಲಸ ಮಾಡುತ್ತದೆ\? ಅದರ ಮೇಲೆ ಟ್ಯಾಪ್ ಮಾಡುವುದರಿಂದ ಒಂದು ಸಮಯದಲ್ಲಿ ಒಂದು ಅಕ್ಷರವನ್ನು ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ. ದೀರ್ಘವಾಗಿ ಒತ್ತಿದರೆ ಎಲ್ಲಾ ಕ್ಷೇತ್ರಗಳನ್ನು ಒಂದೇ ಬಾರಿಗೆ ಮರುಹೊಂದಿಸುತ್ತದೆ. diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index a2eb0f27..7de95ee5 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) C(지우기) 버튼은 어떻게 작동합니까\? 누르면 한 번에 한 문자씩 제거됩니다. 길게 누르면 모든 필드가 한 번에 재설정됩니다. diff --git a/app/src/main/res/values-kr/strings.xml b/app/src/main/res/values-kr/strings.xml index 206d6864..f9f2098d 100644 --- a/app/src/main/res/values-kr/strings.xml +++ b/app/src/main/res/values-kr/strings.xml @@ -89,6 +89,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) C (Clear) 버튼을 어떻게 사용합니까? diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index eef099c6..f3126f28 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Kaip veikia C (Išvalymo) mygtukas\? Kiekvieną kartą ant jo bakstelėjus, bus šalinama po vieną simbolį. Ilgai jį palaikius, bus iš karto atstatyti visi laukai. diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index c70e1cf3..4ec57318 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Kā darbojas poga C (Notīrīt)\? Pieskarieties tai, lai noņemtu vienu rakstzīmi vienlaikus. Ilgstoši nospiežot to, tiks atiestatīti visi lauki vienlaicīgi. diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 732176ae..73a46432 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Како функционира копчето C (Clear) \? Прислушкувањето на него ќе отстрани еден лик во исто време. Долгото притискање ќе ги ресетира сите полиња одеднаш. diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 2e7ae233..b4e83860 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) C(ക്ലിയർ ) ബട്ടൺ പ്രവർത്തിക്കുന്നത് എങ്ങനെ\? ടാപ്പ് ചെയ്യുമ്പോൾ ഒരു സമയം ഒരു പ്രതീകത്തെ നീക്കംചെയ്യും. ദീർഘനേരം അമർത്തിയാൽ എല്ലാ ഫീൽഡുകളും പുനഃസജ്ജമാക്കും. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index a3f99770..d6ddd496 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -89,6 +89,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Bagaimana Butang C (Menghapus) Digunakan？ diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index cff4f9b6..bff0c534 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Hoe werkt de knop C (Clear)\? Kort indrukken verwijdert één karakter per keer. Lang drukken wist direct alle velden. diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index 110978eb..2d17c242 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Hvordan fungerer C (Clear)-knappen\? Å trykke på den fjerner ett tegn av gangen. Lang-trykk tilbakestiller alle felter. How does the C (Clear) button work\? Tapping on it will remove one character at a time. Long pressing it will reset all fields at once. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 228dbfb7..27e088e2 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Jak działa przycisk C (Wyczyść)? Naciśnięcie go usunie jeden znak naraz. Długie naciśnięcie zresetuje wszystkie pola jednocześnie. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index f69fc42d..24b8b3d5 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Como funciona o botão C (Clear)\? Um toque remove um caractere de cada vez. Um toque longo redefine todos os campos de uma vez. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 2a2fbdf6..2284610f 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Como funciona o botão C (limpar)\? Ao tocar uma vez, os caracteres serão apagados um a um. Um toque longo apaga todos os caracteres ao mesmo tempo. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 2da0ce4c..5fe7c902 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Cum funcționează butonul Ș (Șterge)\? Apăsând pe el, veți elimina câte un caracter pe rând. Apăsarea lungă va reseta toate câmpurile deodată. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index a0e355bc..13f45017 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Как работает кнопка C (Очистка)\? Нажатие на неё удалит один символ. Долгое нажатие сбросит все поля сразу. diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 642e0f9b..85d7ae2b 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Ako funguje tlačidlo C? Jedným stlačením viete vymazať 1 znak. Dlhé podržanie vymaže všetky polia naraz. diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index fd929543..c03e4430 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -84,6 +84,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Kako deluje gumb C (Clear)\? Če ga stisnete, odstranite po en lik naenkrat. Z dolgim pritiskom nanj boste odstranili vsa polja naenkrat. diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index e5cedcac..e6eccf3e 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Како дугме Ц (Обриши) функционише\? Додиривање на њега ће уклонити један по један знак. Дуго притискање ће успоставити почетне вредности свих поља одједном. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index a7445bdf..86d2c30d 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Hur funkar C (Rensa) knappen\? Om du trycker på den tar du bort ett tecken i taget. Om du trycker länge på den återställs alla fält på en gång. diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index deb691f9..fdb4e7db 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) சி (தெளிவு) பொத்தான் எப்படி வேலை செய்கிறது\? அதைத் தட்டினால் ஒரு நேரத்தில் ஒரு எழுத்து நீக்கப்படும். நீண்ட நேரம் அழுத்தினால், எல்லாப் புலங்களையும் ஒரே நேரத்தில் மீட்டமைக்கும். diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml index f1ec0b22..2952f4b5 100644 --- a/app/src/main/res/values-te/strings.xml +++ b/app/src/main/res/values-te/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) C (క్లియర్) బటన్ ఎలా పని చేస్తుంది\? దానిపై నొక్కడం ద్వారా ఒక్కో అక్షరం తీసివేయబడుతుంది. ఎక్కువసేపు నొక్కితే, అన్ని ఫీల్డ్‌లు ఒకేసారి రీసెట్ చేయబడతాయి. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 59a627af..e0ba70bc 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -90,6 +90,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) How does the C (Clear) button work? diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 133f1258..39aa9962 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) C (Temizle) düğmesi nasıl çalışır? Üzerine dokunmak, bir seferde bir karakteri kaldıracaktır. Uzun basma, tüm alanları bir kerede sıfırlayacaktır. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index e5ff89c1..39a56f59 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) Як працює кнопка C (Очистити)? Короткий натиск видалить один символ за раз. Тривалий натиск одразу очистить всі поля. diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml index 0c376049..8ff9081a 100644 --- a/app/src/main/res/values-zgh/strings.xml +++ b/app/src/main/res/values-zgh/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) ⵎⴰⵎⴽ ⵜⵙⵡⵓⵔⵓⵢ ⵜⴳⵎⵎⵓⵜ C (ⴽⴽⵙ)\? ⴰⴱⴱⴰⵥ ⵅⴼ ⵓⵢⵏⵏⴰ ⴰⴷ ⵉⴽⴽⵙ ⵢⴰⵏ ⵓⵙⴽⴽⵉⵍ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. ⵎⵛ ⵉⵍⵍⴰ ⵡⴰⴱⴱⴰⵥ ⴰⵙⵓⵍⴰⵏ ⵔⴰⴷ ⵜⵜⵓⵙⵏⴼⵍⵏ ⵎⴰⵕⵕⴰ ⵉⴳⵔⴰⵏ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index f5fe18e3..42ab44b2 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) 如何使用 C (清除) 按钮？ 点按它一次删除一个字母。长按它将立即重置所有字段。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index e80bee2d..4289add6 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -87,6 +87,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) C（清除）按鈕如何使用？ 按一次會刪除一個字元。長按會馬上重設全部欄位。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 561ff76b..f1124040 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -91,6 +91,21 @@ Drop (Imperial) Teaspoon (Imperial) Tablespoon (Imperial) + Mass + Gram + Kilogram + Milligram + Microgram + Tonne + Pound + Ounce + Grain + Dram + Stone + Long Ton + Short Ton + Carat + Carat (Metric) How does the C (Clear) button work? From 85a6bde1cee10d63c58a29e2a346b052ffce5f0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Tue, 12 Sep 2023 10:21:39 +0200 Subject: [PATCH 08/58] Add temperature unit converter --- .../calculator/helpers/converters/Base.kt | 9 +- .../converters/TemperatureConverter.kt | 113 ++++++++++++++++++ app/src/main/res/values-ar/strings.xml | 10 ++ app/src/main/res/values-az/strings.xml | 10 ++ app/src/main/res/values-be/strings.xml | 10 ++ app/src/main/res/values-bg/strings.xml | 10 ++ app/src/main/res/values-ca/strings.xml | 10 ++ app/src/main/res/values-cs/strings.xml | 10 ++ app/src/main/res/values-cy/strings.xml | 10 ++ app/src/main/res/values-da/strings.xml | 10 ++ app/src/main/res/values-de/strings.xml | 10 ++ app/src/main/res/values-el/strings.xml | 10 ++ app/src/main/res/values-eo/strings.xml | 10 ++ app/src/main/res/values-es/strings.xml | 10 ++ app/src/main/res/values-et/strings.xml | 10 ++ app/src/main/res/values-fi/strings.xml | 10 ++ app/src/main/res/values-fil/strings.xml | 10 ++ app/src/main/res/values-fr/strings.xml | 10 ++ app/src/main/res/values-gl/strings.xml | 10 ++ app/src/main/res/values-hi/strings.xml | 10 ++ app/src/main/res/values-hr/strings.xml | 10 ++ app/src/main/res/values-hu/strings.xml | 10 ++ app/src/main/res/values-in/strings.xml | 10 ++ app/src/main/res/values-is/strings.xml | 10 ++ app/src/main/res/values-it/strings.xml | 10 ++ app/src/main/res/values-iw/strings.xml | 10 ++ app/src/main/res/values-ja/strings.xml | 10 ++ app/src/main/res/values-kn/strings.xml | 10 ++ app/src/main/res/values-ko/strings.xml | 10 ++ app/src/main/res/values-kr/strings.xml | 10 ++ app/src/main/res/values-lt/strings.xml | 10 ++ app/src/main/res/values-lv/strings.xml | 10 ++ app/src/main/res/values-mk/strings.xml | 10 ++ app/src/main/res/values-ml/strings.xml | 10 ++ app/src/main/res/values-ms/strings.xml | 10 ++ app/src/main/res/values-nl/strings.xml | 10 ++ app/src/main/res/values-no-rNO/strings.xml | 10 ++ app/src/main/res/values-pa-rPK/strings.xml | 10 ++ app/src/main/res/values-pl/strings.xml | 10 ++ app/src/main/res/values-pt-rBR/strings.xml | 10 ++ app/src/main/res/values-pt/strings.xml | 10 ++ app/src/main/res/values-ro/strings.xml | 10 ++ app/src/main/res/values-ru/strings.xml | 10 ++ app/src/main/res/values-sk/strings.xml | 10 ++ app/src/main/res/values-sl/strings.xml | 10 ++ app/src/main/res/values-sr/strings.xml | 10 ++ app/src/main/res/values-sv/strings.xml | 10 ++ app/src/main/res/values-ta/strings.xml | 10 ++ app/src/main/res/values-te/strings.xml | 10 ++ app/src/main/res/values-th/strings.xml | 10 ++ app/src/main/res/values-tr/strings.xml | 10 ++ app/src/main/res/values-uk/strings.xml | 10 ++ app/src/main/res/values-zgh/strings.xml | 10 ++ app/src/main/res/values-zh-rCN/strings.xml | 10 ++ app/src/main/res/values-zh-rTW/strings.xml | 10 ++ app/src/main/res/values/strings.xml | 10 ++ 56 files changed, 660 insertions(+), 2 deletions(-) create mode 100644 app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TemperatureConverter.kt diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt index 9318dccc..bfca0189 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt @@ -6,7 +6,8 @@ interface Converter { LengthConverter, AreaConverter, VolumeConverter, - MassConverter + MassConverter, + TemperatureConverter ) } @@ -17,7 +18,7 @@ interface Converter { val defaultBottomUnit: Unit fun convert(from: ValueWithUnit, to: Unit): ValueWithUnit { - return ValueWithUnit(from.value * from.unit.factor / to.factor, to) + return ValueWithUnit(to.fromBase(from.unit.toBase(from.value)), to) } open class Unit( @@ -25,6 +26,10 @@ interface Converter { val factor: Double ) { + open fun toBase(value: Double) = value * factor + + open fun fromBase(value: Double) = value / factor + fun withValue(value: Double) = ValueWithUnit(value, this) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TemperatureConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TemperatureConverter.kt new file mode 100644 index 00000000..3c7cf4b7 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TemperatureConverter.kt @@ -0,0 +1,113 @@ +package com.simplemobiletools.calculator.helpers.converters + +import com.simplemobiletools.calculator.R + +object TemperatureConverter : Converter { + override val nameResId: Int = R.string.unit_temperature + override val imageResId: Int = R.drawable.ic_thermostat_vector + + sealed class Unit(nameResId: Int, factor: Double) : Converter.Unit(nameResId, factor) { + + data object Celsius : Unit( + nameResId = R.string.unit_temperature_celsius, + factor = 1.0 + ) { + const val KELVIN_OFFSET = 273.15 + + override fun toBase(value: Double): Double = value + KELVIN_OFFSET + override fun fromBase(value: Double): Double = value - KELVIN_OFFSET + } + + data object Delisle : Unit( + nameResId = R.string.unit_temperature_delisle, + factor = 2.0 / 3 + ) { + private const val KELVIN_OFFSET = 373.15 + + override fun toBase(value: Double): Double = KELVIN_OFFSET - value * factor + + override fun fromBase(value: Double): Double = (KELVIN_OFFSET - value) / factor + } + + data object Fahrenheit : Unit( + nameResId = R.string.unit_temperature_fahrenheit, + factor = 9.0 / 5 + ) { + private const val CELSIUS_OFFSET = 32 + + override fun toBase(value: Double): Double = Celsius.toBase((value - CELSIUS_OFFSET) / factor) + + override fun fromBase(value: Double): Double = (Celsius.fromBase(value) * factor) + CELSIUS_OFFSET + } + + data object Newton : Unit( + nameResId = R.string.unit_temperature_newton, + factor = 100.0 / 33 + ) { + private const val KELVIN_OFFSET = Celsius.KELVIN_OFFSET + + override fun toBase(value: Double): Double = (value * factor) + KELVIN_OFFSET + + override fun fromBase(value: Double): Double = (value - KELVIN_OFFSET) / factor + } + + data object Rankine : Unit( + nameResId = R.string.unit_temperature_rankine, + factor = 5.0 / 9 + ) + + data object Reaumur : Unit( + nameResId = R.string.unit_temperature_reaumur, + factor = 5.0 / 4 + ) { + private const val KELVIN_OFFSET = Celsius.KELVIN_OFFSET + + override fun toBase(value: Double): Double = (value * factor) + KELVIN_OFFSET + + override fun fromBase(value: Double): Double = (value - KELVIN_OFFSET) / factor + } + + data object Romer : Unit( + nameResId = R.string.unit_temperature_romer, + factor = 40.0 / 21 + ) { + private const val KELVIN_OFFSET = Celsius.KELVIN_OFFSET + private const val ADJUSTMENT = 7.5 + + override fun toBase(value: Double): Double = (value - ADJUSTMENT) * factor + KELVIN_OFFSET + + override fun fromBase(value: Double): Double = ((value - KELVIN_OFFSET) / factor) + ADJUSTMENT + } + + data object GasMark : Unit( + nameResId = R.string.unit_temperature_gas_mark, + factor = 25.0 + ) { + private const val FAHRENHEIT_OFFSET = 250 + + override fun toBase(value: Double): Double = Fahrenheit.toBase(value * factor + FAHRENHEIT_OFFSET) + + override fun fromBase(value: Double): Double = (Fahrenheit.fromBase(value) - FAHRENHEIT_OFFSET) / factor + } + + data object Kelvin : Unit( + nameResId = R.string.unit_temperature_kelvin, + factor = 1.0 + ) + } + + override val units: List = listOf( + Unit.Celsius, + Unit.Delisle, + Unit.Fahrenheit, + Unit.Newton, + Unit.Rankine, + Unit.Reaumur, + Unit.Romer, + Unit.GasMark, + Unit.Kelvin, + ) + + override val defaultTopUnit: Unit = Unit.Celsius + override val defaultBottomUnit: Unit = Unit.Kelvin +} diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index d99d92c7..8dabcad5 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin كيف يعمل الزر C (مسح)؟ النقر على ذلك سوف يزيل حرف واحد في وقت واحد. الضغط لفترة طويلة سوف إعادة تعيين جميع الحقول في وقت واحد. diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index ab047d68..68a5b8bb 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -104,6 +104,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin C (Sil) düyməsi necə işləyir? diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 9eb8be42..8332feb4 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Як працуе кнопка C (Ачыстка)\? Крананне да яе выдаляе адзін сімвал. Доўгае націсканне на яе ачышчае адразу ўсе палі. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 56ce3ca8..7fcdc6f7 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Как работи бутонът C (Clear)\? Натискането му ще премахва по един символ. Дълго натискане ще изчисти наведнъж всички полета. diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 2c66e66c..eaffea0e 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Com funciona el botó C (Esborra)\? En tocar-lo, s\'eliminarà un caràcter a la vegada. Si el premeu prolongadament, es reiniciaran tots els camps de cop. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index abdfad94..f7522593 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Jak funguje tlačítko C? Stisknutím odmažete jeden znak. Dlouhým podržením smažete naráz všechna pole. diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 6b6bd4ed..e0e12058 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Sut mae\'r botwm C (clirio) yn gweithio? Mae ei dapio yn tynnu un rhif ar y tro. Mae ei dal yn ailosod pob maes gyda\'i gilydd ar unwaith. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index c7fb2f55..339d62fb 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Hvordan virker knappen C (Slet)\? Hvis du trykker på det, fjernes et tegn ad gangen. Langt tryk vil nulstille alle felter på én gang. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index bd3b5129..470a6e84 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Wie funktioniert die C-Taste (Löschen)\? Bei einmaliger Berührung wird ein Zeichen entfernt. Bei langer Berührung werden alle Felder zurück gesetzt. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index c26fbc9c..6f113d6e 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -104,6 +104,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Πώς λειτουργεί το κουμπί C (Καθαρισμός); diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 42f20d46..2c0c14df 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Kiel funkcias la butono C («Forviŝi»)\? Frapetado sur ĝi forviŝos signojn po unu por frapeto. Longa premado forviŝos ĉiujn kampojn samtempe. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 89e03af7..fa74ebb9 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin ¿Cómo funciona el botón C (Borrar)\? Presionándolo una vez eliminará un solo carácter. Mantenerlo presionado reiniciará todos los campos. diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 838522b7..44c0d077 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Kuidas C (Clear) nupp toimib\? Üks klõpsatus kustutab ühe numbri. Pikk vajutus eemaldab kogu sisestuse. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 62b25540..11865f9f 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Miten C (Tyhjennä) -painike toimii\? Sen napautus poistaa yhden merkin kerrallaan ja pitkä painallus tyhjentää kaikki kentät. diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index 123d0712..23fefcaf 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -99,6 +99,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Paano gumagana ang C (Clear) button\? Matatanggal ng isang karakter kapag pinindot ito nang isang beses. Ire-reset naman ang lahat ng mga field kapag mahabang pinindot ito. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c41bbc33..d573c74b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Comment fonctionne le bouton C (Effacer) \? En tapotant dessus, vous retirerez un caractère à la fois. Une pression prolongée sur le bouton réinitialisera tous les champs à la fois. diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 05f44a26..a5d80ee6 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Como funciona o botón C (Borrar)? O premer, eliminarase un carácter á vez. O premer de forma continua, restableceranse todos os campos á vez. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 11ab8234..c80275b4 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -99,6 +99,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin सी (क्लियर) बटन कैसे काम करता है\? इस पर टैप करने से एक बार में एक कैरेक्टर हट जाएगा। लंबे समय तक इसे दबाने से एक ही बार में सभी फ़ील्ड रीसेट हो जाएंगे। diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 3f2aae28..ee0c775e 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Kako funkcionira gumb C (Izbriši)\? Dodirom gumba uklanjaju se znakovi jedan po jedan. Dugim pritiskom gumba obnavljaju se sva polja. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 28e464db..674dc2f0 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Hogyan működik a C (törlés) gomb\? A koppintás egyszerre egy karaktert töröl. A hosszú lenyomás egyszerre állítja vissza az összes mezőt. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 6baea118..3631716f 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Bagaimana tombol C (Clear) bekerja? Menyentuhnya sekali akan menghapus satu karakter. Menyentuhnya lama akan mengosongkan seluruh ruas sekaligus. diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index d95a0333..73d3b3ac 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Hvernig virkar C (Hreinsa) hnappurinn\? Með því að pikka á hann verður einn stafur fjarlægður í einu. Haltu inni til þess að endurstilla alla reiti í einu. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 889f334e..86276a54 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Come funziona il tasto C (Cancella)? Premendo il tasto una volta verrà eliminato un singolo carattere; tenendolo premuto invece eliminerà tutta la stringa. diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 941ee8fb..a3c2c684 100755 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin כיצד פועל לחצן C (ניקוי)\? הקשה עליו תסיר תו אחד בכל פעם. לחיצה ארוכה עליו תאפס את כל השדות בבת אחת. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 8e03200b..615b8a03 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin C (クリア) ボタンはどのように機能しますか？ ボタンをタップするたびに1文字ずつ削除されます。ボタンを長押しするとすべてのフィールドがリセットされます。 diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml index 6af3fb5b..7ce294cc 100644 --- a/app/src/main/res/values-kn/strings.xml +++ b/app/src/main/res/values-kn/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin ಸಿ (ತೆರವುಗೊಳಿಸಿ) ಬಟನ್ ಹೇಗೆ ಕೆಲಸ ಮಾಡುತ್ತದೆ\? ಅದರ ಮೇಲೆ ಟ್ಯಾಪ್ ಮಾಡುವುದರಿಂದ ಒಂದು ಸಮಯದಲ್ಲಿ ಒಂದು ಅಕ್ಷರವನ್ನು ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ. ದೀರ್ಘವಾಗಿ ಒತ್ತಿದರೆ ಎಲ್ಲಾ ಕ್ಷೇತ್ರಗಳನ್ನು ಒಂದೇ ಬಾರಿಗೆ ಮರುಹೊಂದಿಸುತ್ತದೆ. diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 7de95ee5..bc27357d 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin C(지우기) 버튼은 어떻게 작동합니까\? 누르면 한 번에 한 문자씩 제거됩니다. 길게 누르면 모든 필드가 한 번에 재설정됩니다. diff --git a/app/src/main/res/values-kr/strings.xml b/app/src/main/res/values-kr/strings.xml index f9f2098d..db4cb67f 100644 --- a/app/src/main/res/values-kr/strings.xml +++ b/app/src/main/res/values-kr/strings.xml @@ -104,6 +104,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin C (Clear) 버튼을 어떻게 사용합니까? diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index f3126f28..8530cb23 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Kaip veikia C (Išvalymo) mygtukas\? Kiekvieną kartą ant jo bakstelėjus, bus šalinama po vieną simbolį. Ilgai jį palaikius, bus iš karto atstatyti visi laukai. diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 4ec57318..da819677 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Kā darbojas poga C (Notīrīt)\? Pieskarieties tai, lai noņemtu vienu rakstzīmi vienlaikus. Ilgstoši nospiežot to, tiks atiestatīti visi lauki vienlaicīgi. diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 73a46432..3dd4fbbf 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Како функционира копчето C (Clear) \? Прислушкувањето на него ќе отстрани еден лик во исто време. Долгото притискање ќе ги ресетира сите полиња одеднаш. diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index b4e83860..2e55f6d0 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin C(ക്ലിയർ ) ബട്ടൺ പ്രവർത്തിക്കുന്നത് എങ്ങനെ\? ടാപ്പ് ചെയ്യുമ്പോൾ ഒരു സമയം ഒരു പ്രതീകത്തെ നീക്കംചെയ്യും. ദീർഘനേരം അമർത്തിയാൽ എല്ലാ ഫീൽഡുകളും പുനഃസജ്ജമാക്കും. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index d6ddd496..f5e3e371 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -104,6 +104,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Bagaimana Butang C (Menghapus) Digunakan？ diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index bff0c534..85989d44 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Hoe werkt de knop C (Clear)\? Kort indrukken verwijdert één karakter per keer. Lang drukken wist direct alle velden. diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index 2d17c242..a0fd4d79 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Hvordan fungerer C (Clear)-knappen\? Å trykke på den fjerner ett tegn av gangen. Lang-trykk tilbakestiller alle felter. How does the C (Clear) button work\? Tapping on it will remove one character at a time. Long pressing it will reset all fields at once. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 27e088e2..091cd773 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Jak działa przycisk C (Wyczyść)? Naciśnięcie go usunie jeden znak naraz. Długie naciśnięcie zresetuje wszystkie pola jednocześnie. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 24b8b3d5..6a08d3ec 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Como funciona o botão C (Clear)\? Um toque remove um caractere de cada vez. Um toque longo redefine todos os campos de uma vez. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 2284610f..eb3c6a00 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Como funciona o botão C (limpar)\? Ao tocar uma vez, os caracteres serão apagados um a um. Um toque longo apaga todos os caracteres ao mesmo tempo. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 5fe7c902..99c6a83f 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Cum funcționează butonul Ș (Șterge)\? Apăsând pe el, veți elimina câte un caracter pe rând. Apăsarea lungă va reseta toate câmpurile deodată. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 13f45017..e8c2cb65 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Как работает кнопка C (Очистка)\? Нажатие на неё удалит один символ. Долгое нажатие сбросит все поля сразу. diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 85d7ae2b..c081b388 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Ako funguje tlačidlo C? Jedným stlačením viete vymazať 1 znak. Dlhé podržanie vymaže všetky polia naraz. diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index c03e4430..c3f338c0 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -99,6 +99,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Kako deluje gumb C (Clear)\? Če ga stisnete, odstranite po en lik naenkrat. Z dolgim pritiskom nanj boste odstranili vsa polja naenkrat. diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index e6eccf3e..97f14425 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Како дугме Ц (Обриши) функционише\? Додиривање на њега ће уклонити један по један знак. Дуго притискање ће успоставити почетне вредности свих поља одједном. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 86d2c30d..5c00bd46 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Hur funkar C (Rensa) knappen\? Om du trycker på den tar du bort ett tecken i taget. Om du trycker länge på den återställs alla fält på en gång. diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index fdb4e7db..6725463c 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin சி (தெளிவு) பொத்தான் எப்படி வேலை செய்கிறது\? அதைத் தட்டினால் ஒரு நேரத்தில் ஒரு எழுத்து நீக்கப்படும். நீண்ட நேரம் அழுத்தினால், எல்லாப் புலங்களையும் ஒரே நேரத்தில் மீட்டமைக்கும். diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml index 2952f4b5..b2f0709c 100644 --- a/app/src/main/res/values-te/strings.xml +++ b/app/src/main/res/values-te/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin C (క్లియర్) బటన్ ఎలా పని చేస్తుంది\? దానిపై నొక్కడం ద్వారా ఒక్కో అక్షరం తీసివేయబడుతుంది. ఎక్కువసేపు నొక్కితే, అన్ని ఫీల్డ్‌లు ఒకేసారి రీసెట్ చేయబడతాయి. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index e0ba70bc..ec945ca1 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -105,6 +105,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin How does the C (Clear) button work? diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 39aa9962..31345cad 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin C (Temizle) düğmesi nasıl çalışır? Üzerine dokunmak, bir seferde bir karakteri kaldıracaktır. Uzun basma, tüm alanları bir kerede sıfırlayacaktır. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 39a56f59..3de54fd5 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin Як працює кнопка C (Очистити)? Короткий натиск видалить один символ за раз. Тривалий натиск одразу очистить всі поля. diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml index 8ff9081a..46087ea3 100644 --- a/app/src/main/res/values-zgh/strings.xml +++ b/app/src/main/res/values-zgh/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin ⵎⴰⵎⴽ ⵜⵙⵡⵓⵔⵓⵢ ⵜⴳⵎⵎⵓⵜ C (ⴽⴽⵙ)\? ⴰⴱⴱⴰⵥ ⵅⴼ ⵓⵢⵏⵏⴰ ⴰⴷ ⵉⴽⴽⵙ ⵢⴰⵏ ⵓⵙⴽⴽⵉⵍ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. ⵎⵛ ⵉⵍⵍⴰ ⵡⴰⴱⴱⴰⵥ ⴰⵙⵓⵍⴰⵏ ⵔⴰⴷ ⵜⵜⵓⵙⵏⴼⵍⵏ ⵎⴰⵕⵕⴰ ⵉⴳⵔⴰⵏ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 42ab44b2..d3801dc6 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin 如何使用 C (清除) 按钮？ 点按它一次删除一个字母。长按它将立即重置所有字段。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 4289add6..441a6601 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -102,6 +102,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin C（清除）按鈕如何使用？ 按一次會刪除一個字元。長按會馬上重設全部欄位。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f1124040..262b5263 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -106,6 +106,16 @@ Short Ton Carat Carat (Metric) + Temperature + Celsius + Delisle + Fahrenheit + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin How does the C (Clear) button work? From aabd4ddd5e19ce7ab9249517973f0381b435a047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Tue, 12 Sep 2023 10:47:56 +0200 Subject: [PATCH 09/58] Add time unit converter --- .../calculator/helpers/converters/Base.kt | 3 +- .../helpers/converters/TimeConverter.kt | 161 ++++++++++++++++++ app/src/main/res/values-ar/strings.xml | 24 +++ app/src/main/res/values-az/strings.xml | 24 +++ app/src/main/res/values-be/strings.xml | 24 +++ app/src/main/res/values-bg/strings.xml | 24 +++ app/src/main/res/values-ca/strings.xml | 24 +++ app/src/main/res/values-cs/strings.xml | 24 +++ app/src/main/res/values-cy/strings.xml | 24 +++ app/src/main/res/values-da/strings.xml | 24 +++ app/src/main/res/values-de/strings.xml | 24 +++ app/src/main/res/values-el/strings.xml | 24 +++ app/src/main/res/values-eo/strings.xml | 24 +++ app/src/main/res/values-es/strings.xml | 24 +++ app/src/main/res/values-et/strings.xml | 24 +++ app/src/main/res/values-fi/strings.xml | 24 +++ app/src/main/res/values-fil/strings.xml | 24 +++ app/src/main/res/values-fr/strings.xml | 24 +++ app/src/main/res/values-gl/strings.xml | 24 +++ app/src/main/res/values-hi/strings.xml | 24 +++ app/src/main/res/values-hr/strings.xml | 24 +++ app/src/main/res/values-hu/strings.xml | 24 +++ app/src/main/res/values-in/strings.xml | 24 +++ app/src/main/res/values-is/strings.xml | 24 +++ app/src/main/res/values-it/strings.xml | 24 +++ app/src/main/res/values-iw/strings.xml | 24 +++ app/src/main/res/values-ja/strings.xml | 24 +++ app/src/main/res/values-kn/strings.xml | 24 +++ app/src/main/res/values-ko/strings.xml | 24 +++ app/src/main/res/values-kr/strings.xml | 24 +++ app/src/main/res/values-lt/strings.xml | 24 +++ app/src/main/res/values-lv/strings.xml | 24 +++ app/src/main/res/values-mk/strings.xml | 24 +++ app/src/main/res/values-ml/strings.xml | 24 +++ app/src/main/res/values-ms/strings.xml | 24 +++ app/src/main/res/values-nl/strings.xml | 24 +++ app/src/main/res/values-no-rNO/strings.xml | 24 +++ app/src/main/res/values-pa-rPK/strings.xml | 24 +++ app/src/main/res/values-pl/strings.xml | 24 +++ app/src/main/res/values-pt-rBR/strings.xml | 24 +++ app/src/main/res/values-pt/strings.xml | 24 +++ app/src/main/res/values-ro/strings.xml | 24 +++ app/src/main/res/values-ru/strings.xml | 24 +++ app/src/main/res/values-sk/strings.xml | 24 +++ app/src/main/res/values-sl/strings.xml | 24 +++ app/src/main/res/values-sr/strings.xml | 24 +++ app/src/main/res/values-sv/strings.xml | 24 +++ app/src/main/res/values-ta/strings.xml | 24 +++ app/src/main/res/values-te/strings.xml | 24 +++ app/src/main/res/values-th/strings.xml | 24 +++ app/src/main/res/values-tr/strings.xml | 24 +++ app/src/main/res/values-uk/strings.xml | 24 +++ app/src/main/res/values-zgh/strings.xml | 24 +++ app/src/main/res/values-zh-rCN/strings.xml | 24 +++ app/src/main/res/values-zh-rTW/strings.xml | 24 +++ app/src/main/res/values/strings.xml | 24 +++ 56 files changed, 1459 insertions(+), 1 deletion(-) create mode 100644 app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt index bfca0189..629d626a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt @@ -7,7 +7,8 @@ interface Converter { AreaConverter, VolumeConverter, MassConverter, - TemperatureConverter + TemperatureConverter, + TimeConverter ) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt new file mode 100644 index 00000000..54c3cdee --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt @@ -0,0 +1,161 @@ +package com.simplemobiletools.calculator.helpers.converters + +import com.simplemobiletools.calculator.R + +object TimeConverter : Converter { + override val nameResId: Int = R.string.unit_time + override val imageResId: Int = com.simplemobiletools.commons.R.drawable.ic_clock_vector + + sealed class Unit(nameResId: Int, factor: Double) : Converter.Unit(nameResId, factor) { + companion object { + private const val MINUTE = 60.0 + private const val HOUR = 60.0 * MINUTE + private const val DAY = HOUR * 24.0 + private const val GREGORIAN_YEAR = DAY * 365.2425 + } + + data object Hour : Unit( + nameResId = R.string.unit_time_hour, + factor = HOUR + ) + + data object Minute : Unit( + nameResId = R.string.unit_time_minute, + factor = MINUTE + ) + + data object Second : Unit( + nameResId = R.string.unit_time_second, + factor = 1.0 + ) + + data object Millisecond : Unit( + nameResId = R.string.unit_time_millisecond, + factor = 0.001 + ) + + data object Microsecond : Unit( + nameResId = R.string.unit_time_microsecond, + factor = 0.000001 + ) + + data object Nanosecond : Unit( + nameResId = R.string.unit_time_nanosecond, + factor = 0.000000001 + ) + + data object Picosecond : Unit( + nameResId = R.string.unit_time_picosecond, + factor = 0.000000000001 + ) + + data object Day : Unit( + nameResId = R.string.unit_time_day, + factor = DAY + ) + + data object Week : Unit( + nameResId = R.string.unit_time_week, + factor = DAY * 7 + ) + + data object MonthFull : Unit( + nameResId = R.string.unit_time_month_full, + factor = DAY * 30 + ) + + data object MonthHollow : Unit( + nameResId = R.string.unit_time_month_hollow, + factor = DAY * 29 + ) + + data object MonthSynodic : Unit( + nameResId = R.string.unit_time_month_synodic, + factor = DAY * 29.530589 + ) + + data object MonthGregorianAverage : Unit( + nameResId = R.string.unit_time_month_gregorian_average, + factor = DAY * 30.346875 + ) + + data object YearLeap : Unit( + nameResId = R.string.unit_time_year_leap, + factor = DAY * 366 + ) + + data object YearGregorian : Unit( + nameResId = R.string.unit_time_year_gregorian, + factor = GREGORIAN_YEAR + ) + + data object YearJulian : Unit( + nameResId = R.string.unit_time_year_julian, + factor = DAY * 365.25 + ) + + data object Jiffy : Unit( + nameResId = R.string.unit_time_jiffy, + factor = 1 / 60.0 + ) + + data object Moment : Unit( + nameResId = R.string.unit_time_moment, + factor = 90.0 + ) + + data object Fortnight : Unit( + nameResId = R.string.unit_time_fortnight, + factor = DAY * 7 * 2 + ) + + data object Decade : Unit( + nameResId = R.string.unit_time_decade, + factor = GREGORIAN_YEAR * 10 + ) + + data object Century : Unit( + nameResId = R.string.unit_time_century, + factor = GREGORIAN_YEAR * 100 + ) + + data object Millennium : Unit( + nameResId = R.string.unit_time_millennium, + factor = GREGORIAN_YEAR * 1000 + ) + + data object AtomicUnit : Unit( + nameResId = R.string.unit_time_atomic_unit, + factor = 0.00000000000000002418884254 + ) + } + + override val units: List = listOf( + Unit.Hour, + Unit.Minute, + Unit.Second, + Unit.Millisecond, + Unit.Microsecond, + Unit.Nanosecond, + Unit.Picosecond, + Unit.Day, + Unit.Week, + Unit.MonthFull, + Unit.MonthHollow, + Unit.MonthSynodic, + Unit.MonthGregorianAverage, + Unit.YearLeap, + Unit.YearGregorian, + Unit.YearJulian, + Unit.Jiffy, + Unit.Moment, + Unit.Fortnight, + Unit.Decade, + Unit.Century, + Unit.Millennium, + Unit.AtomicUnit + ) + + override val defaultTopUnit: Unit = Unit.Hour + override val defaultBottomUnit: Unit = Unit.Second +} diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 8dabcad5..1d7ca043 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit كيف يعمل الزر C (مسح)؟ النقر على ذلك سوف يزيل حرف واحد في وقت واحد. الضغط لفترة طويلة سوف إعادة تعيين جميع الحقول في وقت واحد. diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 68a5b8bb..fd076f2a 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -114,6 +114,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit C (Sil) düyməsi necə işləyir? diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 8332feb4..aa1bea02 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Як працуе кнопка C (Ачыстка)\? Крананне да яе выдаляе адзін сімвал. Доўгае націсканне на яе ачышчае адразу ўсе палі. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 7fcdc6f7..cbecdd16 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Как работи бутонът C (Clear)\? Натискането му ще премахва по един символ. Дълго натискане ще изчисти наведнъж всички полета. diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index eaffea0e..5c9ce681 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Com funciona el botó C (Esborra)\? En tocar-lo, s\'eliminarà un caràcter a la vegada. Si el premeu prolongadament, es reiniciaran tots els camps de cop. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index f7522593..2c10bb25 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Jak funguje tlačítko C? Stisknutím odmažete jeden znak. Dlouhým podržením smažete naráz všechna pole. diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index e0e12058..71061765 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Sut mae\'r botwm C (clirio) yn gweithio? Mae ei dapio yn tynnu un rhif ar y tro. Mae ei dal yn ailosod pob maes gyda\'i gilydd ar unwaith. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 339d62fb..32ff9c32 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Hvordan virker knappen C (Slet)\? Hvis du trykker på det, fjernes et tegn ad gangen. Langt tryk vil nulstille alle felter på én gang. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 470a6e84..18ae4f91 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Wie funktioniert die C-Taste (Löschen)\? Bei einmaliger Berührung wird ein Zeichen entfernt. Bei langer Berührung werden alle Felder zurück gesetzt. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 6f113d6e..58142b3e 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -114,6 +114,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Πώς λειτουργεί το κουμπί C (Καθαρισμός); diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 2c0c14df..ace0e86d 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Kiel funkcias la butono C («Forviŝi»)\? Frapetado sur ĝi forviŝos signojn po unu por frapeto. Longa premado forviŝos ĉiujn kampojn samtempe. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index fa74ebb9..ffd9af00 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit ¿Cómo funciona el botón C (Borrar)\? Presionándolo una vez eliminará un solo carácter. Mantenerlo presionado reiniciará todos los campos. diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 44c0d077..894f47ef 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Kuidas C (Clear) nupp toimib\? Üks klõpsatus kustutab ühe numbri. Pikk vajutus eemaldab kogu sisestuse. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 11865f9f..14d15058 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Miten C (Tyhjennä) -painike toimii\? Sen napautus poistaa yhden merkin kerrallaan ja pitkä painallus tyhjentää kaikki kentät. diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index 23fefcaf..92052366 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -109,6 +109,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Paano gumagana ang C (Clear) button\? Matatanggal ng isang karakter kapag pinindot ito nang isang beses. Ire-reset naman ang lahat ng mga field kapag mahabang pinindot ito. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d573c74b..aeca9b8b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Comment fonctionne le bouton C (Effacer) \? En tapotant dessus, vous retirerez un caractère à la fois. Une pression prolongée sur le bouton réinitialisera tous les champs à la fois. diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index a5d80ee6..ef69ca9c 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Como funciona o botón C (Borrar)? O premer, eliminarase un carácter á vez. O premer de forma continua, restableceranse todos os campos á vez. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index c80275b4..c067de92 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -109,6 +109,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit सी (क्लियर) बटन कैसे काम करता है\? इस पर टैप करने से एक बार में एक कैरेक्टर हट जाएगा। लंबे समय तक इसे दबाने से एक ही बार में सभी फ़ील्ड रीसेट हो जाएंगे। diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index ee0c775e..b0c3a226 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Kako funkcionira gumb C (Izbriši)\? Dodirom gumba uklanjaju se znakovi jedan po jedan. Dugim pritiskom gumba obnavljaju se sva polja. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 674dc2f0..4e3bf420 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Hogyan működik a C (törlés) gomb\? A koppintás egyszerre egy karaktert töröl. A hosszú lenyomás egyszerre állítja vissza az összes mezőt. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 3631716f..3f7c4db1 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Bagaimana tombol C (Clear) bekerja? Menyentuhnya sekali akan menghapus satu karakter. Menyentuhnya lama akan mengosongkan seluruh ruas sekaligus. diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 73d3b3ac..530535b5 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Hvernig virkar C (Hreinsa) hnappurinn\? Með því að pikka á hann verður einn stafur fjarlægður í einu. Haltu inni til þess að endurstilla alla reiti í einu. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 86276a54..24d9f74c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Come funziona il tasto C (Cancella)? Premendo il tasto una volta verrà eliminato un singolo carattere; tenendolo premuto invece eliminerà tutta la stringa. diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index a3c2c684..ebb85b64 100755 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit כיצד פועל לחצן C (ניקוי)\? הקשה עליו תסיר תו אחד בכל פעם. לחיצה ארוכה עליו תאפס את כל השדות בבת אחת. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 615b8a03..77bd83ff 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit C (クリア) ボタンはどのように機能しますか？ ボタンをタップするたびに1文字ずつ削除されます。ボタンを長押しするとすべてのフィールドがリセットされます。 diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml index 7ce294cc..0a1ae74e 100644 --- a/app/src/main/res/values-kn/strings.xml +++ b/app/src/main/res/values-kn/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit ಸಿ (ತೆರವುಗೊಳಿಸಿ) ಬಟನ್ ಹೇಗೆ ಕೆಲಸ ಮಾಡುತ್ತದೆ\? ಅದರ ಮೇಲೆ ಟ್ಯಾಪ್ ಮಾಡುವುದರಿಂದ ಒಂದು ಸಮಯದಲ್ಲಿ ಒಂದು ಅಕ್ಷರವನ್ನು ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ. ದೀರ್ಘವಾಗಿ ಒತ್ತಿದರೆ ಎಲ್ಲಾ ಕ್ಷೇತ್ರಗಳನ್ನು ಒಂದೇ ಬಾರಿಗೆ ಮರುಹೊಂದಿಸುತ್ತದೆ. diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index bc27357d..4db51702 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit C(지우기) 버튼은 어떻게 작동합니까\? 누르면 한 번에 한 문자씩 제거됩니다. 길게 누르면 모든 필드가 한 번에 재설정됩니다. diff --git a/app/src/main/res/values-kr/strings.xml b/app/src/main/res/values-kr/strings.xml index db4cb67f..4d66b36a 100644 --- a/app/src/main/res/values-kr/strings.xml +++ b/app/src/main/res/values-kr/strings.xml @@ -114,6 +114,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit C (Clear) 버튼을 어떻게 사용합니까? diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 8530cb23..cb761d0e 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Kaip veikia C (Išvalymo) mygtukas\? Kiekvieną kartą ant jo bakstelėjus, bus šalinama po vieną simbolį. Ilgai jį palaikius, bus iš karto atstatyti visi laukai. diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index da819677..6ba58ddb 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Kā darbojas poga C (Notīrīt)\? Pieskarieties tai, lai noņemtu vienu rakstzīmi vienlaikus. Ilgstoši nospiežot to, tiks atiestatīti visi lauki vienlaicīgi. diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 3dd4fbbf..7f36bbca 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Како функционира копчето C (Clear) \? Прислушкувањето на него ќе отстрани еден лик во исто време. Долгото притискање ќе ги ресетира сите полиња одеднаш. diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 2e55f6d0..e8eee4e8 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit C(ക്ലിയർ ) ബട്ടൺ പ്രവർത്തിക്കുന്നത് എങ്ങനെ\? ടാപ്പ് ചെയ്യുമ്പോൾ ഒരു സമയം ഒരു പ്രതീകത്തെ നീക്കംചെയ്യും. ദീർഘനേരം അമർത്തിയാൽ എല്ലാ ഫീൽഡുകളും പുനഃസജ്ജമാക്കും. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index f5e3e371..11fd9497 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -114,6 +114,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Bagaimana Butang C (Menghapus) Digunakan？ diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 85989d44..c4df98e0 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Hoe werkt de knop C (Clear)\? Kort indrukken verwijdert één karakter per keer. Lang drukken wist direct alle velden. diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index a0fd4d79..c31c3283 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Hvordan fungerer C (Clear)-knappen\? Å trykke på den fjerner ett tegn av gangen. Lang-trykk tilbakestiller alle felter. How does the C (Clear) button work\? Tapping on it will remove one character at a time. Long pressing it will reset all fields at once. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 091cd773..7b17fa8b 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Jak działa przycisk C (Wyczyść)? Naciśnięcie go usunie jeden znak naraz. Długie naciśnięcie zresetuje wszystkie pola jednocześnie. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 6a08d3ec..ce6e31a9 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Como funciona o botão C (Clear)\? Um toque remove um caractere de cada vez. Um toque longo redefine todos os campos de uma vez. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index eb3c6a00..4261c794 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Como funciona o botão C (limpar)\? Ao tocar uma vez, os caracteres serão apagados um a um. Um toque longo apaga todos os caracteres ao mesmo tempo. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 99c6a83f..01e7a2d7 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Cum funcționează butonul Ș (Șterge)\? Apăsând pe el, veți elimina câte un caracter pe rând. Apăsarea lungă va reseta toate câmpurile deodată. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e8c2cb65..7e691de9 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Как работает кнопка C (Очистка)\? Нажатие на неё удалит один символ. Долгое нажатие сбросит все поля сразу. diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index c081b388..9d40b5a4 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Ako funguje tlačidlo C? Jedným stlačením viete vymazať 1 znak. Dlhé podržanie vymaže všetky polia naraz. diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index c3f338c0..0b16a4a9 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -109,6 +109,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Kako deluje gumb C (Clear)\? Če ga stisnete, odstranite po en lik naenkrat. Z dolgim pritiskom nanj boste odstranili vsa polja naenkrat. diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 97f14425..04374bc6 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Како дугме Ц (Обриши) функционише\? Додиривање на њега ће уклонити један по један знак. Дуго притискање ће успоставити почетне вредности свих поља одједном. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 5c00bd46..f9759e3b 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Hur funkar C (Rensa) knappen\? Om du trycker på den tar du bort ett tecken i taget. Om du trycker länge på den återställs alla fält på en gång. diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 6725463c..9fa94237 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit சி (தெளிவு) பொத்தான் எப்படி வேலை செய்கிறது\? அதைத் தட்டினால் ஒரு நேரத்தில் ஒரு எழுத்து நீக்கப்படும். நீண்ட நேரம் அழுத்தினால், எல்லாப் புலங்களையும் ஒரே நேரத்தில் மீட்டமைக்கும். diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml index b2f0709c..5ac0f516 100644 --- a/app/src/main/res/values-te/strings.xml +++ b/app/src/main/res/values-te/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit C (క్లియర్) బటన్ ఎలా పని చేస్తుంది\? దానిపై నొక్కడం ద్వారా ఒక్కో అక్షరం తీసివేయబడుతుంది. ఎక్కువసేపు నొక్కితే, అన్ని ఫీల్డ్‌లు ఒకేసారి రీసెట్ చేయబడతాయి. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index ec945ca1..84efec90 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -115,6 +115,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit How does the C (Clear) button work? diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 31345cad..5adad50f 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit C (Temizle) düğmesi nasıl çalışır? Üzerine dokunmak, bir seferde bir karakteri kaldıracaktır. Uzun basma, tüm alanları bir kerede sıfırlayacaktır. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 3de54fd5..cb1d021d 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit Як працює кнопка C (Очистити)? Короткий натиск видалить один символ за раз. Тривалий натиск одразу очистить всі поля. diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml index 46087ea3..0f8abfda 100644 --- a/app/src/main/res/values-zgh/strings.xml +++ b/app/src/main/res/values-zgh/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit ⵎⴰⵎⴽ ⵜⵙⵡⵓⵔⵓⵢ ⵜⴳⵎⵎⵓⵜ C (ⴽⴽⵙ)\? ⴰⴱⴱⴰⵥ ⵅⴼ ⵓⵢⵏⵏⴰ ⴰⴷ ⵉⴽⴽⵙ ⵢⴰⵏ ⵓⵙⴽⴽⵉⵍ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. ⵎⵛ ⵉⵍⵍⴰ ⵡⴰⴱⴱⴰⵥ ⴰⵙⵓⵍⴰⵏ ⵔⴰⴷ ⵜⵜⵓⵙⵏⴼⵍⵏ ⵎⴰⵕⵕⴰ ⵉⴳⵔⴰⵏ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d3801dc6..d2bb81ec 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit 如何使用 C (清除) 按钮？ 点按它一次删除一个字母。长按它将立即重置所有字段。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 441a6601..1f2b5780 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -112,6 +112,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit C（清除）按鈕如何使用？ 按一次會刪除一個字元。長按會馬上重設全部欄位。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 262b5263..1fb60815 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -116,6 +116,30 @@ Rømer Regulo Gas Mark Kelvin + Time + Hour + Minute + Second + Millisecond + Microsecond + Nanosecond + Picosecond + Day + Week + Month (Full) + Month (Hollow) + Month (Synodic) + Month (Gregorian average) + Year (Leap) + Year (Gregorian) + Year (Julian) + Jiffy + Moment + Fortnight + Decade + Century + Millennium + Atomic Unit How does the C (Clear) button work? From ee7ce538043f92f973fcf93b774cb4610ef58eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Tue, 12 Sep 2023 11:02:52 +0200 Subject: [PATCH 10/58] Add croatian strings --- app/src/main/res/values-hr/strings.xml | 200 ++++++++++++------------- 1 file changed, 100 insertions(+), 100 deletions(-) diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index b0c3a226..3eec835a 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -15,95 +15,95 @@ Vibriraj prilikom pritiskanja gumba Koristi zarez kao decimalni znak - Length - Kilometer - Hectometer - Decameter - Meter - Decimeter - Centimeter - Millimeter - Micrometer - Nanometer - Picometer + Duljina + Kilometar + Hectometar + Decametar + Metar + Decimetar + Centimetar + Milimetar + Mikrometar + Nanometar + Pikometar Angstrom - Mile - Chain - Yard - Foot + Milja + Lanac + Jard + Stopa Mil - Inch + Palac Fathom Cable - Nautical Mile + Nautička milja Link - Rod - Astronomical Unit - Parsec - Light Year - Area - Square Kilometer - Square Meter - Square Centimeter - Square Millimeter - Square Mile - Square Yard - Square Mil - Square Inch - Square Rod - Acre - Are + Šipka + Astronomska jedinica + Parsek + Svjetlosna godina + Površina + Četvorni kilometar + Četvorni metar + Četvorni centimetar + Četvorni milimetar + Četvorna milja + Četvorni jard + Četvorni Mil + Četvorni palac + Četvorni Rod + Aker + Ar Dunam - Hectare - Volume - Cubic Meter - Cubic Decimeter - Cubic Centimeter - Cubic Millimeter - Liter - Centiliter - Deciliter - Milliliter - Acre Foot - Cubic Yard - Cubic Foot - Cubic Inch - Barrel (US) - Gallon (US) - Quart (US) - Pint (US) - Gill (US) - Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) - Barrel (Imperial) - Gallon (Imperial) - Quart (Imperial) - Pint (Imperial) - Gill (Imperial) - Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) - Mass + Hektar + Obujam + Kubični metar + Kubični decimetar + Kubični centimetar + Kubični milimetar + Litra + Centilitra + Decilitra + Mililitra + Aker stopa + Kubični jard + Kubična stopa + Kubični palac + Barel (SAD) + Galon (SAD) + Četvrtina (SAD) + Pinta (SAD) + Gill (SAD) + Unca tekuća(SAD) + Drop (SAD) + Čajna žlica (SAD) + Žlica (SAD) + Šalica (SAD) + Barel (Imperijalni) + Galon (Imperijalni) + Četvrtina (Imperijalna) + Pinta (Imperijalna) + Gill (Imperijalni) + Unca tekuća (Imperijalna) + Drop (Imperijalni) + Čajna žlica (Imperijalna) + Žlica (Imperijalna) + Masa Gram Kilogram - Milligram - Microgram - Tonne - Pound - Ounce + Miligram + Mikrogram + Tona + Funta + Unca Grain Dram Stone - Long Ton - Short Ton - Carat - Carat (Metric) - Temperature - Celsius + Long Tona + Short Tona + Karat + Karat (Metrični) + Temperatura + Celzijus Delisle Fahrenheit Newton @@ -112,30 +112,30 @@ Rømer Regulo Gas Mark Kelvin - Time - Hour - Minute - Second - Millisecond - Microsecond - Nanosecond - Picosecond - Day - Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) - Year (Gregorian) - Year (Julian) + Vrijeme + Sat + Minuta + Sekunda + Milisekunda + Mikrosekunda + Nanosekunda + Pikosekunda + Dan + Tjedan + Mjesec (puni) + Mjesec (kratki) + Mjesec (sinodički) + Mjesec (Gregorijanski prosječni) + Godina (prijestupna) + Godina (Gregorijanska) + Godina (Julijanska) Jiffy Moment - Fortnight - Decade - Century - Millennium - Atomic Unit + Četrnaest dana + Desetljeće + Stoljeće + Tisućljeće + Atomska jedinica Kako funkcionira gumb C (Izbriši)\? Dodirom gumba uklanjaju se znakovi jedan po jedan. Dugim pritiskom gumba obnavljaju se sva polja. From 8c881bb86f0491a171dd9149db489cc887e21863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Tue, 12 Sep 2023 11:24:53 +0200 Subject: [PATCH 11/58] Add serbian strings --- app/src/main/res/values-sr/strings.xml | 242 ++++++++++++------------- 1 file changed, 121 insertions(+), 121 deletions(-) diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 04374bc6..35bcab20 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -15,127 +15,127 @@ Вибрирајте притиснути дугметом Коришћење зареза као децималног знака - Length - Kilometer - Hectometer - Decameter - Meter - Decimeter - Centimeter - Millimeter - Micrometer - Nanometer - Picometer - Angstrom - Mile - Chain - Yard - Foot - Mil - Inch - Fathom - Cable - Nautical Mile - Link - Rod - Astronomical Unit - Parsec - Light Year - Area - Square Kilometer - Square Meter - Square Centimeter - Square Millimeter - Square Mile - Square Yard - Square Mil - Square Inch - Square Rod - Acre - Are - Dunam - Hectare - Volume - Cubic Meter - Cubic Decimeter - Cubic Centimeter - Cubic Millimeter - Liter - Centiliter - Deciliter - Milliliter - Acre Foot - Cubic Yard - Cubic Foot - Cubic Inch - Barrel (US) - Gallon (US) - Quart (US) - Pint (US) - Gill (US) - Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) - Barrel (Imperial) - Gallon (Imperial) - Quart (Imperial) - Pint (Imperial) - Gill (Imperial) - Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) - Mass - Gram - Kilogram - Milligram - Microgram - Tonne - Pound - Ounce - Grain - Dram - Stone - Long Ton - Short Ton - Carat - Carat (Metric) - Temperature - Celsius - Delisle - Fahrenheit - Newton - Rankine - Réaumur - Rømer - Regulo Gas Mark - Kelvin - Time - Hour - Minute - Second - Millisecond - Microsecond - Nanosecond - Picosecond - Day - Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) - Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit + Дужина + Километар + Хектометар + Декаметар + Метар + Дециметар + Центиметар + Милиметар + Микрометар + Нанометар + Пикометар + Ангстром + Миља + Ланац + Јард + Стопа + Мил + Палац + Фатом + Кабал + Наутичка миља + Карика + Шипка + Астрономска јединица + Парсек + Светлосна година + Површина + Квадратни километар + Квадратни метар + Квадратни центиметар + Квадратни милиметар + Квадратна милја + Квадратни јард + Квадратни мил + Квадратни палац + Квадратна шипка + Акер + Ар + Дунам + Хектар + Запремина + Кубни метар + Кубни дециметар + Кубни центиметар + Кубни милиметар + Литар + Центилитар + Децилитар + Милилитар + Акер стопа + Кубни јард + Кубна стопа + Кубни палац + Барел (САД) + Галон (САД) + Четвртина (САД) + Пинта (САД) + Гил (САД) + Текућа унца (САД) + Дроп (САД) + Чајна кашика (САД) + Кашика (САД) + Шољица (САД) + Барел (Империјални) + Галон (Империјални) + Четвртина (Империјални) + Пинта (Империјални) + Гил (Империјални) + Текућа унца (Империјални) + Дроп (Империјални) + Чајна кашика (Империјални) + Кашика (Империјални) + Маса + Грам + Килограм + Милиграм + Микрограм + Тона + Фунта + Унца + Граин + Драм + Стоне + Лонг тона + Шорт тона + Карат + Карат (Метричнки) + Температуре + Целзијус + Делил + Фаренхајт + Њутн + Ранкин + Реамур + Ромер + Регуло гас марк + Келвин + Време + Сат + Минута + Секунда + Милисекунда + Микросекунда + Наносекунда + Пикосекунда + Дан + Седмица + Месец (Пуни) + Месец (кратки) + Месец (Синодички) + Месец (Грегоријански просечни) + Година (Преступна) + Година (Грегоријанска) + Година (Јулијанска) + Ђифи + Момент + Четрнаест дана + Декада + Стољеће + Милениј + Атомска јединица Како дугме Ц (Обриши) функционише\? Додиривање на њега ће уклонити један по један знак. Дуго притискање ће успоставити почетне вредности свих поља одједном. From 754fcb7f3f41023bde838e3b0ec33d2a3ee6ce94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Tue, 12 Sep 2023 11:32:04 +0200 Subject: [PATCH 12/58] Add missing square foot area unit --- .../calculator/helpers/converters/AreaConverter.kt | 14 ++++++++++---- app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-az/strings.xml | 1 + app/src/main/res/values-be/strings.xml | 1 + app/src/main/res/values-bg/strings.xml | 1 + app/src/main/res/values-ca/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-cy/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-eo/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-et/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fil/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-gl/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-hr/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-is/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-iw/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-kn/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-kr/strings.xml | 1 + app/src/main/res/values-lt/strings.xml | 1 + app/src/main/res/values-lv/strings.xml | 1 + app/src/main/res/values-mk/strings.xml | 1 + app/src/main/res/values-ml/strings.xml | 1 + app/src/main/res/values-ms/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-no-rNO/strings.xml | 1 + app/src/main/res/values-pa-rPK/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sk/strings.xml | 1 + app/src/main/res/values-sl/strings.xml | 1 + app/src/main/res/values-sr/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-ta/strings.xml | 1 + app/src/main/res/values-te/strings.xml | 1 + app/src/main/res/values-th/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-zgh/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 55 files changed, 64 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt index f66b809f..a89fa023 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt @@ -37,9 +37,9 @@ object AreaConverter : Converter { factor = 0.83612736 ) - data object SquareMil : Unit( - nameResId = R.string.unit_area_square_mil, - factor = 0.00000000064516 + data object SquareFoot : Unit( + nameResId = R.string.unit_area_square_foot, + factor = 0.09290304 ) data object SquareInch : Unit( @@ -47,6 +47,11 @@ object AreaConverter : Converter { factor = 0.00064516 ) + data object SquareMil : Unit( + nameResId = R.string.unit_area_square_mil, + factor = 0.00000000064516 + ) + data object SquareRod : Unit( nameResId = R.string.unit_area_square_rod, factor = 25.29285264 @@ -80,8 +85,9 @@ object AreaConverter : Converter { Unit.SquareMillimeter, Unit.SquareMile, Unit.SquareYard, - Unit.SquareMil, + Unit.SquareFoot, Unit.SquareInch, + Unit.SquareMil, Unit.SquareRod, Unit.Acre, Unit.Are, diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 1d7ca043..04cb2c76 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index fd076f2a..5a939efd 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -50,6 +50,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index aa1bea02..832dc2c8 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index cbecdd16..602440cc 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 5c9ce681..0bb361b4 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 2c10bb25..a9c9a029 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 71061765..f3821dc2 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 32ff9c32..31d8c98b 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 18ae4f91..284fd7e0 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 58142b3e..c63143fe 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -50,6 +50,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index ace0e86d..0957cbf8 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ffd9af00..e5415653 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 894f47ef..22e71364 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 14d15058..be34b302 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index 92052366..a75888bc 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -45,6 +45,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index aeca9b8b..667c14ab 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index ef69ca9c..f9d39085 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index c067de92..f53e4662 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -45,6 +45,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 3eec835a..443298fc 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -48,6 +48,7 @@ Četvorni milimetar Četvorna milja Četvorni jard + Četvorna stopa Četvorni Mil Četvorni palac Četvorni Rod diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 4e3bf420..9dae20c8 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 3f7c4db1..b0231ebd 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 530535b5..8dae05f5 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 24d9f74c..7df97aa8 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index ebb85b64..f7be75e4 100755 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 77bd83ff..f31570c6 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml index 0a1ae74e..fecea3bb 100644 --- a/app/src/main/res/values-kn/strings.xml +++ b/app/src/main/res/values-kn/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 4db51702..89a8d044 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-kr/strings.xml b/app/src/main/res/values-kr/strings.xml index 4d66b36a..dc4aebe7 100644 --- a/app/src/main/res/values-kr/strings.xml +++ b/app/src/main/res/values-kr/strings.xml @@ -50,6 +50,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index cb761d0e..f0a8c300 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 6ba58ddb..a45360ab 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 7f36bbca..be3f0e01 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index e8eee4e8..6d220415 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 11fd9497..0af8f630 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -50,6 +50,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index c4df98e0..5dba04ca 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index c31c3283..2503996d 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml index a8da7b01..292d81eb 100644 --- a/app/src/main/res/values-pa-rPK/strings.xml +++ b/app/src/main/res/values-pa-rPK/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 7b17fa8b..eaf1df70 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index ce6e31a9..34b291e6 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 4261c794..5cb52940 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 01e7a2d7..bc770853 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 7e691de9..aa69f989 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 9d40b5a4..85fd0105 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 0b16a4a9..b17276e6 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -45,6 +45,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 35bcab20..267fdc2e 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -48,6 +48,7 @@ Квадратни милиметар Квадратна милја Квадратни јард + Квадратна стопа Квадратни мил Квадратни палац Квадратна шипка diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index f9759e3b..24e0229d 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 9fa94237..6433eba7 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml index 5ac0f516..7f0fee9f 100644 --- a/app/src/main/res/values-te/strings.xml +++ b/app/src/main/res/values-te/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 84efec90..0e2eba18 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -51,6 +51,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 5adad50f..7b815b22 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index cb1d021d..726c9bd0 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml index 0f8abfda..fab5f12f 100644 --- a/app/src/main/res/values-zgh/strings.xml +++ b/app/src/main/res/values-zgh/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d2bb81ec..a9b39a37 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 1f2b5780..edef0ba7 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -48,6 +48,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1fb60815..4c0212db 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -52,6 +52,7 @@ Square Millimeter Square Mile Square Yard + Square Foot Square Mil Square Inch Square Rod From 70a79a063cb3b43402525e216b2373fd936afda6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Tue, 12 Sep 2023 12:06:33 +0200 Subject: [PATCH 13/58] Set 0 as default value for converter --- .../com/simplemobiletools/calculator/views/ConverterView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt index a25a144e..912de22b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt @@ -55,7 +55,7 @@ class ConverterView @JvmOverloads constructor( topUnit = converter.defaultTopUnit bottomUnit = converter.defaultBottomUnit - binding.topUnitText.text = "1" + binding.topUnitText.text = "0" updateBottomValue() updateUnitLabels() } From 746874ff2a7ba1194660eadbf3fdbf5fef3c7c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Tue, 12 Sep 2023 12:08:31 +0200 Subject: [PATCH 14/58] Add title to UnitConverterActivity and change close to back arrow --- .../calculator/activities/UnitConverterActivity.kt | 3 ++- .../calculator/activities/UnitConverterPickerActivity.kt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt index 7d0c8181..6f5b7b6f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt @@ -52,12 +52,13 @@ class UnitConverterActivity : SimpleActivity() { } binding.viewUnitConverter.viewConverter.root.setConverter(converter) + binding.unitConverterToolbar.setTitle(converter.nameResId) } override fun onResume() { super.onResume() - setupToolbar(binding.unitConverterToolbar, NavigationIcon.Cross) + setupToolbar(binding.unitConverterToolbar, NavigationIcon.Arrow) binding.viewUnitConverter.viewConverter.root.updateColors() binding.viewUnitConverter.converterHolder.let { updateViewColors(it, getProperTextColor()) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterPickerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterPickerActivity.kt index 09306eff..dcf5b7f2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterPickerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterPickerActivity.kt @@ -37,7 +37,7 @@ class UnitConverterPickerActivity : SimpleActivity() { override fun onResume() { super.onResume() - setupToolbar(binding.unitConverterPickerToolbar, NavigationIcon.Cross) + setupToolbar(binding.unitConverterPickerToolbar, NavigationIcon.Arrow) if (config.preventPhoneFromSleeping) { window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) From 7a3d7546e7fa8763ddbcd877a53cee740c055bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Tue, 12 Sep 2023 12:10:05 +0200 Subject: [PATCH 15/58] Make current unit selected in dialog for selecting unit --- .../com/simplemobiletools/calculator/views/ConverterView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt index 912de22b..d8bc93b8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt @@ -173,7 +173,7 @@ class ConverterView @JvmOverloads constructor( val items = ArrayList(converter!!.units.mapIndexed { index, unit -> RadioItem(index, context.getString(unit.nameResId), unit) }) - RadioGroupDialog(context as Activity, items) { + RadioGroupDialog(context as Activity, items, converter!!.units.indexOf(propertyToChange.get())) { val unit = it as Converter.Unit if (unit == otherProperty.get()) { switch() From 69127532c6cc03fc915e365bb648b954df0a6a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 09:33:29 +0200 Subject: [PATCH 16/58] Add bosnian strings --- app/src/main/res/values-bs/strings.xml | 147 +++++++++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 app/src/main/res/values-bs/strings.xml diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml new file mode 100644 index 00000000..95b2b66a --- /dev/null +++ b/app/src/main/res/values-bs/strings.xml @@ -0,0 +1,147 @@ + + + Jednostavni kalkulator + Kalkulator + Naučni kalkulator + Pretvarač jedinica + + Greška: dijeljenje s nulom + + Historija + Historija je prazna + Izbriši + Historija je izbrisana + + Vibriraj prilikom pritiskanja gumba + Koristi zarez kao decimalni znak + + Dužina + Kilometar + Hectometar + Decametar + Metar + Decimetar + Centimetar + Milimetar + Mikrometar + Nanometar + Pikometar + Angstrom + Milja + Lanac + Jard + Stopa + Mil + Palac + Fathom + Cable + Nautička milja + Link + Šipka + Astronomska jedinica + Parsek + Svjetlosna godina + Površina + Kvadratni kilometar + Kvadratni metar + Kvadratni centimetar + Kvadratni milimetar + Kvadratna milja + Kvadratni jard + Kvadratna stopa + Kvadratni Mil + Kvadratni palac + Kvadratni Rod + Aker + Ar + Dunam + Hektar + Zapremina + Kubni metar + Kubni decimetar + Kubni centimetar + Kubni milimetar + Litar + Centilitar + Decilitar + Mililitar + Aker stopa + Kubni jard + Kubna stopa + Kubni palac + Barel (SAD) + Galon (SAD) + Četvrtina (SAD) + Pinta (SAD) + Gill (SAD) + Unca tekuća(SAD) + Drop (SAD) + Čajna kašika (SAD) + Kašika (SAD) + Šoljica (SAD) + Barel (Imperijalni) + Galon (Imperijalni) + Četvrtina (Imperijalna) + Pinta (Imperijalna) + Gill (Imperijalni) + Unca tekuća (Imperijalna) + Drop (Imperijalni) + Čajna kašika (Imperijalna) + Kašika (Imperijalna) + Masa + Gram + Kilogram + Miligram + Mikrogram + Tona + Funta + Unca + Grain + Dram + Stone + Long Tona + Short Tona + Karat + Karat (Metrični) + Temperatura + Celzijus + Delisle + Farenhajt + Newton + Rankine + Réaumur + Rømer + Regulo Gas Mark + Kelvin + Vrijeme + Sat + Minuta + Sekunda + Milisekunda + Mikrosekunda + Nanosekunda + Pikosekunda + Dan + Sedmica + Mjesec (puni) + Mjesec (kratki) + Mjesec (sinodički) + Mjesec (Gregorijanski prosječni) + Godina (prijestupna) + Godina (Gregorijanska) + Godina (Julijanska) + Jiffy + Moment + Četrnaest dana + Decenija + Stoljeće + Milenij + Atomska jedinica + + Kako funkcionira gumb C (Izbriši)\? + Dodirom gumba uklanjaju se znakovi jedan po jedan. Dugim pritiskom gumba brišu se svi znakovi. + + From 56bf27d83dee68f12f2a4b5fe1a9b5a053f9b737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 10:55:03 +0200 Subject: [PATCH 17/58] Add symbols for all units in converter --- .../helpers/converters/AreaConverter.kt | 16 ++- .../calculator/helpers/converters/Base.kt | 12 ++ .../helpers/converters/Converters.kt | 19 --- .../helpers/converters/LengthConverter.kt | 27 +++- .../helpers/converters/MassConverter.kt | 16 ++- .../converters/TemperatureConverter.kt | 11 +- .../helpers/converters/TimeConverter.kt | 25 +++- .../helpers/converters/VolumeConverter.kt | 33 ++++- .../calculator/views/ConverterView.kt | 44 +++++-- app/src/main/res/values/donottranslate.xml | 118 ++++++++++++++++++ 10 files changed, 283 insertions(+), 38 deletions(-) delete mode 100644 app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Converters.kt diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt index a89fa023..c056b1eb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt @@ -6,74 +6,88 @@ object AreaConverter : Converter { override val nameResId: Int = R.string.unit_area override val imageResId: Int = R.drawable.ic_box_vector - sealed class Unit(nameResId: Int, factor: Double) : Converter.Unit(nameResId, factor) { + sealed class Unit(nameResId: Int, formatResId: Int, factor: Double) : Converter.Unit(nameResId, formatResId, factor) { data object SquareKilometer : Unit( nameResId = R.string.unit_area_square_kilometer, + formatResId = R.string.unit_area_square_kilometer_format, factor = 1000000.0 ) data object SquareMeter : Unit( nameResId = R.string.unit_area_square_meter, + formatResId = R.string.unit_area_square_meter_format, factor = 1.0 ) data object SquareCentimeter : Unit( nameResId = R.string.unit_area_square_centimeter, + formatResId = R.string.unit_area_square_centimeter_format, factor = 0.0001 ) data object SquareMillimeter : Unit( nameResId = R.string.unit_area_square_millimeter, + formatResId = R.string.unit_area_square_millimeter_format, factor = 0.000001 ) data object SquareMile : Unit( nameResId = R.string.unit_area_square_mile, + formatResId = R.string.unit_area_square_mile_format, factor = 2_589_988.110336 ) data object SquareYard : Unit( nameResId = R.string.unit_area_square_yard, + formatResId = R.string.unit_area_square_yard_format, factor = 0.83612736 ) data object SquareFoot : Unit( nameResId = R.string.unit_area_square_foot, + formatResId = R.string.unit_area_square_foot_format, factor = 0.09290304 ) data object SquareInch : Unit( nameResId = R.string.unit_area_square_inch, + formatResId = R.string.unit_area_square_inch_format, factor = 0.00064516 ) data object SquareMil : Unit( nameResId = R.string.unit_area_square_mil, + formatResId = R.string.unit_area_square_mil_format, factor = 0.00000000064516 ) data object SquareRod : Unit( nameResId = R.string.unit_area_square_rod, + formatResId = R.string.unit_area_square_rod_format, factor = 25.29285264 ) data object Acre : Unit( nameResId = R.string.unit_area_acre, + formatResId = R.string.unit_area_acre_format, factor = 4_046.8564224 ) data object Are : Unit( nameResId = R.string.unit_area_are, + formatResId = R.string.unit_area_are_format, factor = 100.0 ) data object Dunam : Unit( nameResId = R.string.unit_area_dunam, + formatResId = R.string.unit_area_dunam_format, factor = 1000.0 ) data object Hectare : Unit( nameResId = R.string.unit_area_hectare, + formatResId = R.string.unit_area_hectare_format, factor = 10_000.0 ) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt index 629d626a..c4842285 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt @@ -1,5 +1,8 @@ package com.simplemobiletools.calculator.helpers.converters +import android.content.Context +import com.simplemobiletools.calculator.R + interface Converter { companion object { val ALL = listOf( @@ -24,6 +27,7 @@ interface Converter { open class Unit( val nameResId: Int, + val formatResId: Int, val factor: Double ) { @@ -32,6 +36,14 @@ interface Converter { open fun fromBase(value: Double) = value / factor fun withValue(value: Double) = ValueWithUnit(value, this) + + fun format(context: Context, value: String) = context.getString(formatResId, value) + + fun getNameWithSymbol(context: Context) = context.getString( + R.string.unit_name_with_symbol_format, + context.getString(nameResId), + format(context, "").trim() + ) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Converters.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Converters.kt deleted file mode 100644 index 29a26633..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Converters.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.simplemobiletools.calculator.helpers.converters - -object Converters { - val ALL = listOf(LengthConverter) - - object Mass - - object Temperature - - object Speed - - object Time - - object Fuel - - object Energy - - object Pressure -} diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt index a8e30c6b..bd672f5a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt @@ -6,129 +6,154 @@ object LengthConverter : Converter { override val nameResId: Int = R.string.unit_length override val imageResId: Int = R.drawable.ic_height_vector - sealed class Unit(nameResId: Int, factor: Double) : Converter.Unit(nameResId, factor) { + sealed class Unit(nameResId: Int, formatResId: Int, factor: Double) : Converter.Unit(nameResId, formatResId, factor) { data object Kilometer : Unit( nameResId = R.string.unit_length_kilometer, + formatResId = R.string.unit_length_kilometer_format, factor = 1000.0 ) data object Hectometer : Unit( nameResId = R.string.unit_length_hectometer, + formatResId = R.string.unit_length_hectometer_format, factor = 100.0 ) data object Decameter : Unit( nameResId = R.string.unit_length_decameter, + formatResId = R.string.unit_length_decameter_format, factor = 10.0 ) data object Meter : Unit( nameResId = R.string.unit_length_meter, + formatResId = R.string.unit_length_meter_format, factor = 1.0 ) data object Decimeter : Unit( nameResId = R.string.unit_length_decimeter, + formatResId = R.string.unit_length_decimeter_format, factor = 0.1 ) data object Centimeter : Unit( nameResId = R.string.unit_length_centimeter, + formatResId = R.string.unit_length_centimeter_format, factor = 0.01 ) data object Millimeter : Unit( nameResId = R.string.unit_length_millimeter, + formatResId = R.string.unit_length_millimeter_format, factor = 0.001 ) data object Micrometer : Unit( nameResId = R.string.unit_length_micrometer, + formatResId = R.string.unit_length_micrometer_format, factor = 0.000001 ) data object Nanometer : Unit( nameResId = R.string.unit_length_nanometer, + formatResId = R.string.unit_length_nanometer_format, factor = 0.000000001 ) data object Picometer : Unit( nameResId = R.string.unit_length_picometer, + formatResId = R.string.unit_length_picometer_format, factor = 0.000000000001 ) data object Angstrom : Unit( nameResId = R.string.unit_length_angstrom, + formatResId = R.string.unit_length_angstrom_format, factor = 1e-10 ) data object Mile : Unit( nameResId = R.string.unit_length_mile, + formatResId = R.string.unit_length_mile_format, factor = 1_609.344 ) data object Chain : Unit( nameResId = R.string.unit_length_chain, + formatResId = R.string.unit_length_chain_format, factor = 20.1168 ) data object Yard : Unit( nameResId = R.string.unit_length_yard, + formatResId = R.string.unit_length_yard_format, factor = 0.9144 ) data object Foot : Unit( nameResId = R.string.unit_length_foot, + formatResId = R.string.unit_length_foot_format, factor = 0.3048 ) data object Mil : Unit( nameResId = R.string.unit_length_mil, + formatResId = R.string.unit_length_mil_format, factor = 0.0000254 ) data object Inch : Unit( nameResId = R.string.unit_length_inch, + formatResId = R.string.unit_length_inch_format, factor = 0.0254 ) data object Fathom : Unit( nameResId = R.string.unit_length_fathom, + formatResId = R.string.unit_length_fathom_format, factor = 1.852 ) data object Cable : Unit( nameResId = R.string.unit_length_cable, + formatResId = R.string.unit_length_cable_format, factor = 185.2 ) data object NauticalMile : Unit( nameResId = R.string.unit_length_nautical_mile, + formatResId = R.string.unit_length_nautical_mile_format, factor = 1_852.0 ) data object Link : Unit( nameResId = R.string.unit_length_link, + formatResId = R.string.unit_length_link_format, factor = 0.201168 ) data object Rod : Unit( nameResId = R.string.unit_length_rod, + formatResId = R.string.unit_length_rod_format, factor = 5.0292 ) data object AstronomicalUnit : Unit( nameResId = R.string.unit_length_astronomical_unit, + formatResId = R.string.unit_length_astronomical_unit_format, factor = 1.495979e+11 ) data object Parsec : Unit( nameResId = R.string.unit_length_parsec, + formatResId = R.string.unit_length_parsec_format, factor = 3.0857e+16 ) data object LightYear : Unit( nameResId = R.string.unit_length_light_year, + formatResId = R.string.unit_length_light_year_format, factor = 9.4607e+15 ) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/MassConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/MassConverter.kt index 26db2863..643a7879 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/MassConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/MassConverter.kt @@ -6,74 +6,88 @@ object MassConverter : Converter { override val nameResId: Int = R.string.unit_mass override val imageResId: Int = R.drawable.ic_scale_vector - sealed class Unit(nameResId: Int, factor: Double) : Converter.Unit(nameResId, factor) { + sealed class Unit(nameResId: Int, formatResId: Int, factor: Double) : Converter.Unit(nameResId, formatResId, factor) { data object Gram : Unit( nameResId = R.string.unit_mass_gram, + formatResId = R.string.unit_mass_gram_format, factor = 0.001 ) data object Kilogram : Unit( nameResId = R.string.unit_mass_kilogram, + formatResId = R.string.unit_mass_kilogram_format, factor = 1.0 ) data object Milligram : Unit( nameResId = R.string.unit_mass_milligram, + formatResId = R.string.unit_mass_milligram_format, factor = 0.000001 ) data object Microgram : Unit( nameResId = R.string.unit_mass_microgram, + formatResId = R.string.unit_mass_microgram_format, factor = 0.000000001 ) data object Tonne : Unit( nameResId = R.string.unit_mass_tonne, + formatResId = R.string.unit_mass_tonne_format, factor = 1_000.0 ) data object Pound : Unit( nameResId = R.string.unit_mass_pound, + formatResId = R.string.unit_mass_pound_format, factor = 0.45359237 ) data object Ounce : Unit( nameResId = R.string.unit_mass_ounce, + formatResId = R.string.unit_mass_ounce_format, factor = 0.028349523125 ) data object Grain : Unit( nameResId = R.string.unit_mass_grain, + formatResId = R.string.unit_mass_grain_format, factor = 0.00006479891 ) data object Dram : Unit( nameResId = R.string.unit_mass_dram, + formatResId = R.string.unit_mass_dram_format, factor = 0.0017718451953125 ) data object Stone : Unit( nameResId = R.string.unit_mass_stone, + formatResId = R.string.unit_mass_stone_format, factor = 6.35029318 ) data object LongTon : Unit( nameResId = R.string.unit_mass_long_ton, + formatResId = R.string.unit_mass_long_ton_format, factor = 1_016.0469088 ) data object ShortTon : Unit( nameResId = R.string.unit_mass_short_ton, + formatResId = R.string.unit_mass_short_ton_format, factor = 907.18474 ) data object Carat : Unit( nameResId = R.string.unit_mass_carat, + formatResId = R.string.unit_mass_carat_format, factor = 0.0002051965483 ) data object CaratMetric : Unit( nameResId = R.string.unit_mass_carat_metric, + formatResId = R.string.unit_mass_carat_metric_format, factor = 0.0002 ) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TemperatureConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TemperatureConverter.kt index 3c7cf4b7..34afea20 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TemperatureConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TemperatureConverter.kt @@ -6,10 +6,11 @@ object TemperatureConverter : Converter { override val nameResId: Int = R.string.unit_temperature override val imageResId: Int = R.drawable.ic_thermostat_vector - sealed class Unit(nameResId: Int, factor: Double) : Converter.Unit(nameResId, factor) { + sealed class Unit(nameResId: Int, formatResId: Int, factor: Double) : Converter.Unit(nameResId, formatResId, factor) { data object Celsius : Unit( nameResId = R.string.unit_temperature_celsius, + formatResId = R.string.unit_temperature_celsius_format, factor = 1.0 ) { const val KELVIN_OFFSET = 273.15 @@ -20,6 +21,7 @@ object TemperatureConverter : Converter { data object Delisle : Unit( nameResId = R.string.unit_temperature_delisle, + formatResId = R.string.unit_temperature_delisle_format, factor = 2.0 / 3 ) { private const val KELVIN_OFFSET = 373.15 @@ -31,6 +33,7 @@ object TemperatureConverter : Converter { data object Fahrenheit : Unit( nameResId = R.string.unit_temperature_fahrenheit, + formatResId = R.string.unit_temperature_fahrenheit_format, factor = 9.0 / 5 ) { private const val CELSIUS_OFFSET = 32 @@ -42,6 +45,7 @@ object TemperatureConverter : Converter { data object Newton : Unit( nameResId = R.string.unit_temperature_newton, + formatResId = R.string.unit_temperature_newton_format, factor = 100.0 / 33 ) { private const val KELVIN_OFFSET = Celsius.KELVIN_OFFSET @@ -53,11 +57,13 @@ object TemperatureConverter : Converter { data object Rankine : Unit( nameResId = R.string.unit_temperature_rankine, + formatResId = R.string.unit_temperature_rankine_format, factor = 5.0 / 9 ) data object Reaumur : Unit( nameResId = R.string.unit_temperature_reaumur, + formatResId = R.string.unit_temperature_reaumur_format, factor = 5.0 / 4 ) { private const val KELVIN_OFFSET = Celsius.KELVIN_OFFSET @@ -69,6 +75,7 @@ object TemperatureConverter : Converter { data object Romer : Unit( nameResId = R.string.unit_temperature_romer, + formatResId = R.string.unit_temperature_romer_format, factor = 40.0 / 21 ) { private const val KELVIN_OFFSET = Celsius.KELVIN_OFFSET @@ -81,6 +88,7 @@ object TemperatureConverter : Converter { data object GasMark : Unit( nameResId = R.string.unit_temperature_gas_mark, + formatResId = R.string.unit_temperature_gas_mark_format, factor = 25.0 ) { private const val FAHRENHEIT_OFFSET = 250 @@ -92,6 +100,7 @@ object TemperatureConverter : Converter { data object Kelvin : Unit( nameResId = R.string.unit_temperature_kelvin, + formatResId = R.string.unit_temperature_kelvin_format, factor = 1.0 ) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt index 54c3cdee..93eb87d1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt @@ -6,7 +6,7 @@ object TimeConverter : Converter { override val nameResId: Int = R.string.unit_time override val imageResId: Int = com.simplemobiletools.commons.R.drawable.ic_clock_vector - sealed class Unit(nameResId: Int, factor: Double) : Converter.Unit(nameResId, factor) { + sealed class Unit(nameResId: Int, formatResId: Int, factor: Double) : Converter.Unit(nameResId, formatResId, factor) { companion object { private const val MINUTE = 60.0 private const val HOUR = 60.0 * MINUTE @@ -16,116 +16,139 @@ object TimeConverter : Converter { data object Hour : Unit( nameResId = R.string.unit_time_hour, + formatResId = R.string.unit_time_hour_format, factor = HOUR ) data object Minute : Unit( nameResId = R.string.unit_time_minute, + formatResId = R.string.unit_time_minute_format, factor = MINUTE ) data object Second : Unit( nameResId = R.string.unit_time_second, + formatResId = R.string.unit_time_second_format, factor = 1.0 ) data object Millisecond : Unit( nameResId = R.string.unit_time_millisecond, + formatResId = R.string.unit_time_millisecond_format, factor = 0.001 ) data object Microsecond : Unit( nameResId = R.string.unit_time_microsecond, + formatResId = R.string.unit_time_microsecond_format, factor = 0.000001 ) data object Nanosecond : Unit( nameResId = R.string.unit_time_nanosecond, + formatResId = R.string.unit_time_nanosecond_format, factor = 0.000000001 ) data object Picosecond : Unit( nameResId = R.string.unit_time_picosecond, + formatResId = R.string.unit_time_picosecond_format, factor = 0.000000000001 ) data object Day : Unit( nameResId = R.string.unit_time_day, + formatResId = R.string.unit_time_day_format, factor = DAY ) data object Week : Unit( nameResId = R.string.unit_time_week, + formatResId = R.string.unit_time_week_format, factor = DAY * 7 ) data object MonthFull : Unit( nameResId = R.string.unit_time_month_full, + formatResId = R.string.unit_time_month_full_format, factor = DAY * 30 ) data object MonthHollow : Unit( nameResId = R.string.unit_time_month_hollow, + formatResId = R.string.unit_time_month_hollow_format, factor = DAY * 29 ) data object MonthSynodic : Unit( nameResId = R.string.unit_time_month_synodic, + formatResId = R.string.unit_time_month_synodic_format, factor = DAY * 29.530589 ) data object MonthGregorianAverage : Unit( nameResId = R.string.unit_time_month_gregorian_average, + formatResId = R.string.unit_time_month_gregorian_average_format, factor = DAY * 30.346875 ) data object YearLeap : Unit( nameResId = R.string.unit_time_year_leap, + formatResId = R.string.unit_time_year_leap_format, factor = DAY * 366 ) data object YearGregorian : Unit( nameResId = R.string.unit_time_year_gregorian, + formatResId = R.string.unit_time_year_gregorian_format, factor = GREGORIAN_YEAR ) data object YearJulian : Unit( nameResId = R.string.unit_time_year_julian, + formatResId = R.string.unit_time_year_julian_format, factor = DAY * 365.25 ) data object Jiffy : Unit( nameResId = R.string.unit_time_jiffy, + formatResId = R.string.unit_time_jiffy_format, factor = 1 / 60.0 ) data object Moment : Unit( nameResId = R.string.unit_time_moment, + formatResId = R.string.unit_time_moment_format, factor = 90.0 ) data object Fortnight : Unit( nameResId = R.string.unit_time_fortnight, + formatResId = R.string.unit_time_fortnight_format, factor = DAY * 7 * 2 ) data object Decade : Unit( nameResId = R.string.unit_time_decade, + formatResId = R.string.unit_time_decade_format, factor = GREGORIAN_YEAR * 10 ) data object Century : Unit( nameResId = R.string.unit_time_century, + formatResId = R.string.unit_time_century_format, factor = GREGORIAN_YEAR * 100 ) data object Millennium : Unit( nameResId = R.string.unit_time_millennium, + formatResId = R.string.unit_time_millennium_format, factor = GREGORIAN_YEAR * 1000 ) data object AtomicUnit : Unit( nameResId = R.string.unit_time_atomic_unit, + formatResId = R.string.unit_time_atomic_unit_format, factor = 0.00000000000000002418884254 ) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt index 585d0afb..d50f183a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt @@ -6,159 +6,190 @@ object VolumeConverter : Converter { override val nameResId: Int = R.string.unit_volume override val imageResId: Int = R.drawable.ic_drop_vector - sealed class Unit(nameResId: Int, factor: Double) : Converter.Unit(nameResId, factor) { + sealed class Unit(nameResId: Int, formatResId: Int, factor: Double) : Converter.Unit(nameResId, formatResId, factor) { data object CubicMeter : Unit( nameResId = R.string.unit_volume_cubic_meter, + formatResId = R.string.unit_volume_cubic_meter_format, factor = 1.0 ) data object CubicDecimeter : Unit( nameResId = R.string.unit_volume_cubic_decimeter, + formatResId = R.string.unit_volume_cubic_decimeter_format, factor = 0.001 ) data object CubicCentimeter : Unit( nameResId = R.string.unit_volume_cubic_centimeter, + formatResId = R.string.unit_volume_cubic_centimeter_format, factor = 0.000001 ) data object CubicMillimeter : Unit( nameResId = R.string.unit_volume_cubic_millimeter, + formatResId = R.string.unit_volume_cubic_millimeter_format, factor = 0.000000001 ) data object Liter : Unit( nameResId = R.string.unit_volume_liter, + formatResId = R.string.unit_volume_liter_format, factor = 0.001 ) data object Centiliter : Unit( nameResId = R.string.unit_volume_centiliter, + formatResId = R.string.unit_volume_centiliter_format, factor = 0.0001 ) data object Deciliter : Unit( nameResId = R.string.unit_volume_deciliter, + formatResId = R.string.unit_volume_deciliter_format, factor = 0.00001 ) data object Milliliter : Unit( nameResId = R.string.unit_volume_milliliter, + formatResId = R.string.unit_volume_milliliter_format, factor = 0.000001 ) data object AcreFoot : Unit( nameResId = R.string.unit_volume_acre_foot, + formatResId = R.string.unit_volume_acre_foot_format, factor = 1_233.48183754752 ) data object CubicYard : Unit( nameResId = R.string.unit_volume_cubic_yard, + formatResId = R.string.unit_volume_cubic_yard_format, factor = 0.764554857984 ) data object CubicFoot : Unit( nameResId = R.string.unit_volume_cubic_foot, + formatResId = R.string.unit_volume_cubic_foot_format, factor = 0.028316846592 ) data object CubicInch : Unit( nameResId = R.string.unit_volume_cubic_inch, + formatResId = R.string.unit_volume_cubic_inch_format, factor = 0.000016387064 ) data object BarrelUS : Unit( nameResId = R.string.unit_volume_barrel_us, + formatResId = R.string.unit_volume_barrel_us_format, factor = 0.119240471196 ) data object GallonUS : Unit( nameResId = R.string.unit_volume_gallon_us, + formatResId = R.string.unit_volume_gallon_us_format, factor = 0.003785411784 ) data object QuartUS : Unit( nameResId = R.string.unit_volume_quart_us, + formatResId = R.string.unit_volume_quart_us_format, factor = 0.000946352946 ) data object PintUS : Unit( nameResId = R.string.unit_volume_pint_us, + formatResId = R.string.unit_volume_pint_us_format, factor = 0.000473176473 ) data object GillUS : Unit( nameResId = R.string.unit_volume_gill_us, + formatResId = R.string.unit_volume_gill_us_format, factor = 0.00011829411825 ) data object FluidOunceUS : Unit( nameResId = R.string.unit_volume_fluid_ounce_us, + formatResId = R.string.unit_volume_fluid_ounce_us_format, factor = 0.00003 ) data object DropUS : Unit( nameResId = R.string.unit_volume_drop_us, + formatResId = R.string.unit_volume_drop_us_format, factor = 0.00000008214869322916 ) data object TeaspoonUS : Unit( nameResId = R.string.unit_volume_teaspoon_us, + formatResId = R.string.unit_volume_teaspoon_us_format, factor = 0.000005 ) data object TablespoonUS : Unit( nameResId = R.string.unit_volume_tablespoon_us, + formatResId = R.string.unit_volume_tablespoon_us_format, factor = 0.000015 ) data object CupUS : Unit( nameResId = R.string.unit_volume_cup_us, + formatResId = R.string.unit_volume_cup_us_format, factor = 0.00024 ) data object BarrelImperial : Unit( nameResId = R.string.unit_volume_barrel_imperial, + formatResId = R.string.unit_volume_barrel_imperial_format, factor = 0.16365924 ) data object GallonImperial : Unit( nameResId = R.string.unit_volume_gallon_imperial, + formatResId = R.string.unit_volume_gallon_imperial_format, factor = 0.00454609 ) data object QuartImperial : Unit( nameResId = R.string.unit_volume_quart_imperial, + formatResId = R.string.unit_volume_quart_imperial_format, factor = 0.0011365225 ) data object PintImperial : Unit( nameResId = R.string.unit_volume_pint_imperial, + formatResId = R.string.unit_volume_pint_imperial_format, factor = 0.00056826125 ) data object GillImperial : Unit( nameResId = R.string.unit_volume_gill_imperial, + formatResId = R.string.unit_volume_gill_imperial_format, factor = 0.0001420653125 ) data object FluidOunceImperial : Unit( nameResId = R.string.unit_volume_fluid_ounce_imperial, + formatResId = R.string.unit_volume_fluid_ounce_imperial_format, factor = 0.0000284130625 ) data object DropImperial : Unit( nameResId = R.string.unit_volume_drop_imperial, + formatResId = R.string.unit_volume_drop_imperial_format, factor = 0.0000000986564670138 ) data object TeaspoonImperial : Unit( nameResId = R.string.unit_volume_teaspoon_imperial, + formatResId = R.string.unit_volume_teaspoon_imperial_format, factor = 0.00000591938802083 ) data object TablespoonImperial : Unit( nameResId = R.string.unit_volume_tablespoon_imperial, + formatResId = R.string.unit_volume_tablespoon_imperial_format, factor = 0.0000177581640625 ) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt index d8bc93b8..641878f2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt @@ -6,6 +6,7 @@ import android.content.res.ColorStateList import android.util.AttributeSet import android.view.View import android.widget.LinearLayout +import android.widget.TextView import androidx.core.widget.TextViewCompat import com.simplemobiletools.calculator.R import com.simplemobiletools.calculator.databinding.ViewConverterBinding @@ -13,6 +14,7 @@ import com.simplemobiletools.calculator.helpers.COMMA import com.simplemobiletools.calculator.helpers.DOT import com.simplemobiletools.calculator.helpers.NumberFormatHelper import com.simplemobiletools.calculator.helpers.converters.Converter +import com.simplemobiletools.calculator.helpers.converters.ValueWithUnit import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.models.RadioItem @@ -55,7 +57,7 @@ class ConverterView @JvmOverloads constructor( topUnit = converter.defaultTopUnit bottomUnit = converter.defaultBottomUnit - binding.topUnitText.text = "0" + binding.topUnitText.setFormattedUnitText(topUnit!!.withValue(0.0)) updateBottomValue() updateUnitLabels() } @@ -79,8 +81,8 @@ class ConverterView @JvmOverloads constructor( } fun clear() { - binding.topUnitText.text = "0" - binding.bottomUnitText.text = "0" + binding.topUnitText.setFormattedUnitText(topUnit!!.withValue(0.0)) + binding.bottomUnitText.setFormattedUnitText(bottomUnit!!.withValue(0.0)) } fun numpadClicked(id: Int) { @@ -102,7 +104,7 @@ class ConverterView @JvmOverloads constructor( } private fun decimalClicked() { - var value = binding.topUnitText.text.toString() + var value = binding.topUnitText.text.removeUnit() if (!value.contains(decimalSeparator)) { when (value) { "0" -> value = "0$decimalSeparator" @@ -110,30 +112,31 @@ class ConverterView @JvmOverloads constructor( else -> value += decimalSeparator } - binding.topUnitText.text = value + binding.topUnitText.text = topUnit?.format(context, value) } } private fun zeroClicked() { - val value = binding.topUnitText.text + val value = binding.topUnitText.text.removeUnit() if (value != "0" || value.contains(decimalSeparator)) { addDigit(0) } } private fun addDigit(digit: Int) { - var value = binding.topUnitText.text.toString() + var value = binding.topUnitText.text.removeUnit() if (value == "0") { value = "" } value += digit value = formatter.addGroupingSeparators(value) - binding.topUnitText.text = value + binding.topUnitText.text = topUnit!!.format(context, value) } private fun switch() { ::topUnit.swapWith(::bottomUnit) + updateTopValue() updateBottomValue() updateUnitLabels() } @@ -143,10 +146,14 @@ class ConverterView @JvmOverloads constructor( binding.bottomUnitName.text = bottomUnit?.nameResId?.let { context.getString(it) } } + private fun updateTopValue() { + binding.topUnitText.setFormattedUnitText(topUnit!!.withValue(binding.topUnitText.getValue())) + } + private fun updateBottomValue() { converter?.apply { - val converted = convert(topUnit!!.withValue(formatter.removeGroupingSeparator(binding.topUnitText.text.toString()).toDouble()), bottomUnit!!).value - binding.bottomUnitText.text = formatter.doubleToString(converted) + val converted = convert(topUnit!!.withValue(binding.topUnitText.getValue()), bottomUnit!!).value + binding.bottomUnitText.setFormattedUnitText(bottomUnit!!.withValue(converted)) } } @@ -156,11 +163,21 @@ class ConverterView @JvmOverloads constructor( this.groupingSeparator = groupingSeparator formatter.decimalSeparator = decimalSeparator formatter.groupingSeparator = groupingSeparator - binding.topUnitText.text = "0" - binding.bottomUnitText.text = "0" + binding.topUnitText.setFormattedUnitText(topUnit!!.withValue(0.0)) + binding.bottomUnitText.setFormattedUnitText(bottomUnit!!.withValue(0.0)) } } + private fun TextView.setFormattedUnitText(value: ValueWithUnit<*>) { + text = value.unit.format(context, formatter.doubleToString(value.value)) + } + + private fun TextView.getValue(): Double { + return formatter.removeGroupingSeparator(text.removeUnit()).toDouble() + } + + private fun CharSequence.removeUnit() = filter { it.isDigit() || it == '.' || it == ',' }.toString() + private fun KMutableProperty0.swapWith(other: KMutableProperty0) { this.get().also { this.set(other.get()) @@ -171,7 +188,7 @@ class ConverterView @JvmOverloads constructor( private fun View.setClickListenerForUnitSelector(propertyToChange: KMutableProperty0, otherProperty: KMutableProperty0) { setOnClickListener { val items = ArrayList(converter!!.units.mapIndexed { index, unit -> - RadioItem(index, context.getString(unit.nameResId), unit) + RadioItem(index, unit.getNameWithSymbol(context), unit) }) RadioGroupDialog(context as Activity, items, converter!!.units.indexOf(propertyToChange.get())) { val unit = it as Converter.Unit @@ -179,6 +196,7 @@ class ConverterView @JvmOverloads constructor( switch() } else if (unit != propertyToChange.get()) { propertyToChange.set(unit) + updateTopValue() updateBottomValue() } updateUnitLabels() diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 4a86eb13..636e4d37 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -2,6 +2,124 @@ com.simplemobiletools.calculator + %s (%s) + %s km + %s hm + %s dam + %s m + %s dm + %s cm + %s mm + %s μm + %s nm + %s pm + %s Å + %s mi + %s ch + %s yd + %s ft + %s mil + %s in + %s fathom + %s cable + %s NM + %s lnk + %s rd + %s au + %s pc + %s ly + %s km² + %s m² + %s cm² + %s mm² + %s sq mi + %s sq yd + %s sq ft + %s sq mil + %s sq in + %s sq rd + %s ac + %s a + %s dunam + %s ha + %s m³ + %s dm³ + %s cm³ + %s mm³ + %s l + %s cl + %s dl + %s ml + %s ac ft + %s yd³ + %s ft³ + %s in³ + %s fl bl (US) + %s gal (US) + %s qt (US) + %s pt (US fl) + %s gi (US) + %s US fl oz + %s gtt + %s tsp + %s tbsp + %s c (US) + %s bl (imp) + %s gal (imp) + %s qt (imp) + %s pt (imp) + %s gi (imp) + %s fl oz (imp) + %s gtt + %s tsp + %s tbsp + %s g + %s kg + %s mg + %s μm + %s t + %s lb + %s oz + %s gr + %s dr + %s st + %s ton + %s sh tn + %s kt + %s ct + %s°C + %s°De + %s°F + %s°N + %s°R + %s°Ré + %s°Rø + %s GM + %s K + %s h + %s m + %s s + %s ms + %s µs + %s ns + %s ps + %s d + %s wk + %s mo + %s mo + %s mo + %s mo + %s y + %s y + %s y + %s j + %s moment + %s fn + %s dec + %s c + %s millennium + %s a.u. + Allow customizing the bottom navigation bar color Added a toggle for preventing the phone from sleeping, enabled by default From 6ac47fa4642e522b39ea782146da9af3382e919c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 11:32:18 +0200 Subject: [PATCH 18/58] Add title to UnitConverterPickerActivity --- .../calculator/activities/UnitConverterPickerActivity.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterPickerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterPickerActivity.kt index dcf5b7f2..086090f8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterPickerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterPickerActivity.kt @@ -32,6 +32,8 @@ class UnitConverterPickerActivity : SimpleActivity() { startActivity(this) } } + + binding.unitConverterPickerToolbar.setTitle(R.string.unit_converter) } override fun onResume() { From 7a658dbdab60147a462a043fa5ec29958be5f094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 11:33:41 +0200 Subject: [PATCH 19/58] Add margin to unit converter grid --- app/src/main/res/layout/activity_unit_converter_picker.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/layout/activity_unit_converter_picker.xml b/app/src/main/res/layout/activity_unit_converter_picker.xml index eb4fd3fb..ec38eb1d 100644 --- a/app/src/main/res/layout/activity_unit_converter_picker.xml +++ b/app/src/main/res/layout/activity_unit_converter_picker.xml @@ -21,6 +21,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginTop="?attr/actionBarSize" + android:layout_marginStart="@dimen/activity_margin" + android:layout_marginEnd="@dimen/activity_margin" app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" tools:itemCount="20" tools:listitem="@layout/item_unit_type" From b6ba9b800ce0b3996ed19a1de832c6149fff0db7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 12:16:37 +0200 Subject: [PATCH 20/58] Add background behind unit symbols --- .../helpers/converters/AreaConverter.kt | 30 +-- .../calculator/helpers/converters/Base.kt | 6 +- .../helpers/converters/LengthConverter.kt | 52 ++-- .../helpers/converters/MassConverter.kt | 32 +-- .../converters/TemperatureConverter.kt | 22 +- .../helpers/converters/TimeConverter.kt | 48 ++-- .../helpers/converters/VolumeConverter.kt | 64 ++--- .../calculator/views/ConverterView.kt | 81 +++--- app/src/main/res/layout/view_converter.xml | 65 ++++- app/src/main/res/values/dimens.xml | 1 + app/src/main/res/values/donottranslate.xml | 232 +++++++++--------- 11 files changed, 335 insertions(+), 298 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt index c056b1eb..7f001109 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt @@ -6,88 +6,88 @@ object AreaConverter : Converter { override val nameResId: Int = R.string.unit_area override val imageResId: Int = R.drawable.ic_box_vector - sealed class Unit(nameResId: Int, formatResId: Int, factor: Double) : Converter.Unit(nameResId, formatResId, factor) { + sealed class Unit(nameResId: Int, symbolResId: Int, factor: Double) : Converter.Unit(nameResId, symbolResId, factor) { data object SquareKilometer : Unit( nameResId = R.string.unit_area_square_kilometer, - formatResId = R.string.unit_area_square_kilometer_format, + symbolResId = R.string.unit_area_square_kilometer_symbol, factor = 1000000.0 ) data object SquareMeter : Unit( nameResId = R.string.unit_area_square_meter, - formatResId = R.string.unit_area_square_meter_format, + symbolResId = R.string.unit_area_square_meter_symbol, factor = 1.0 ) data object SquareCentimeter : Unit( nameResId = R.string.unit_area_square_centimeter, - formatResId = R.string.unit_area_square_centimeter_format, + symbolResId = R.string.unit_area_square_centimeter_symbol, factor = 0.0001 ) data object SquareMillimeter : Unit( nameResId = R.string.unit_area_square_millimeter, - formatResId = R.string.unit_area_square_millimeter_format, + symbolResId = R.string.unit_area_square_millimeter_symbol, factor = 0.000001 ) data object SquareMile : Unit( nameResId = R.string.unit_area_square_mile, - formatResId = R.string.unit_area_square_mile_format, + symbolResId = R.string.unit_area_square_mile_symbol, factor = 2_589_988.110336 ) data object SquareYard : Unit( nameResId = R.string.unit_area_square_yard, - formatResId = R.string.unit_area_square_yard_format, + symbolResId = R.string.unit_area_square_yard_symbol, factor = 0.83612736 ) data object SquareFoot : Unit( nameResId = R.string.unit_area_square_foot, - formatResId = R.string.unit_area_square_foot_format, + symbolResId = R.string.unit_area_square_foot_symbol, factor = 0.09290304 ) data object SquareInch : Unit( nameResId = R.string.unit_area_square_inch, - formatResId = R.string.unit_area_square_inch_format, + symbolResId = R.string.unit_area_square_inch_symbol, factor = 0.00064516 ) data object SquareMil : Unit( nameResId = R.string.unit_area_square_mil, - formatResId = R.string.unit_area_square_mil_format, + symbolResId = R.string.unit_area_square_mil_symbol, factor = 0.00000000064516 ) data object SquareRod : Unit( nameResId = R.string.unit_area_square_rod, - formatResId = R.string.unit_area_square_rod_format, + symbolResId = R.string.unit_area_square_rod_symbol, factor = 25.29285264 ) data object Acre : Unit( nameResId = R.string.unit_area_acre, - formatResId = R.string.unit_area_acre_format, + symbolResId = R.string.unit_area_acre_symbol, factor = 4_046.8564224 ) data object Are : Unit( nameResId = R.string.unit_area_are, - formatResId = R.string.unit_area_are_format, + symbolResId = R.string.unit_area_are_symbol, factor = 100.0 ) data object Dunam : Unit( nameResId = R.string.unit_area_dunam, - formatResId = R.string.unit_area_dunam_format, + symbolResId = R.string.unit_area_dunam_symbol, factor = 1000.0 ) data object Hectare : Unit( nameResId = R.string.unit_area_hectare, - formatResId = R.string.unit_area_hectare_format, + symbolResId = R.string.unit_area_hectare_symbol, factor = 10_000.0 ) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt index c4842285..e53aeef8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/Base.kt @@ -27,7 +27,7 @@ interface Converter { open class Unit( val nameResId: Int, - val formatResId: Int, + val symbolResId: Int, val factor: Double ) { @@ -37,12 +37,10 @@ interface Converter { fun withValue(value: Double) = ValueWithUnit(value, this) - fun format(context: Context, value: String) = context.getString(formatResId, value) - fun getNameWithSymbol(context: Context) = context.getString( R.string.unit_name_with_symbol_format, context.getString(nameResId), - format(context, "").trim() + context.getString(symbolResId) ) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt index bd672f5a..c01acb73 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt @@ -6,154 +6,154 @@ object LengthConverter : Converter { override val nameResId: Int = R.string.unit_length override val imageResId: Int = R.drawable.ic_height_vector - sealed class Unit(nameResId: Int, formatResId: Int, factor: Double) : Converter.Unit(nameResId, formatResId, factor) { + sealed class Unit(nameResId: Int, symbolResId: Int, factor: Double) : Converter.Unit(nameResId, symbolResId, factor) { data object Kilometer : Unit( nameResId = R.string.unit_length_kilometer, - formatResId = R.string.unit_length_kilometer_format, + symbolResId = R.string.unit_length_kilometer_symbol, factor = 1000.0 ) data object Hectometer : Unit( nameResId = R.string.unit_length_hectometer, - formatResId = R.string.unit_length_hectometer_format, + symbolResId = R.string.unit_length_hectometer_symbol, factor = 100.0 ) data object Decameter : Unit( nameResId = R.string.unit_length_decameter, - formatResId = R.string.unit_length_decameter_format, + symbolResId = R.string.unit_length_decameter_symbol, factor = 10.0 ) data object Meter : Unit( nameResId = R.string.unit_length_meter, - formatResId = R.string.unit_length_meter_format, + symbolResId = R.string.unit_length_meter_symbol, factor = 1.0 ) data object Decimeter : Unit( nameResId = R.string.unit_length_decimeter, - formatResId = R.string.unit_length_decimeter_format, + symbolResId = R.string.unit_length_decimeter_symbol, factor = 0.1 ) data object Centimeter : Unit( nameResId = R.string.unit_length_centimeter, - formatResId = R.string.unit_length_centimeter_format, + symbolResId = R.string.unit_length_centimeter_symbol, factor = 0.01 ) data object Millimeter : Unit( nameResId = R.string.unit_length_millimeter, - formatResId = R.string.unit_length_millimeter_format, + symbolResId = R.string.unit_length_millimeter_symbol, factor = 0.001 ) data object Micrometer : Unit( nameResId = R.string.unit_length_micrometer, - formatResId = R.string.unit_length_micrometer_format, + symbolResId = R.string.unit_length_micrometer_symbol, factor = 0.000001 ) data object Nanometer : Unit( nameResId = R.string.unit_length_nanometer, - formatResId = R.string.unit_length_nanometer_format, + symbolResId = R.string.unit_length_nanometer_symbol, factor = 0.000000001 ) data object Picometer : Unit( nameResId = R.string.unit_length_picometer, - formatResId = R.string.unit_length_picometer_format, + symbolResId = R.string.unit_length_picometer_symbol, factor = 0.000000000001 ) data object Angstrom : Unit( nameResId = R.string.unit_length_angstrom, - formatResId = R.string.unit_length_angstrom_format, + symbolResId = R.string.unit_length_angstrom_symbol, factor = 1e-10 ) data object Mile : Unit( nameResId = R.string.unit_length_mile, - formatResId = R.string.unit_length_mile_format, + symbolResId = R.string.unit_length_mile_symbol, factor = 1_609.344 ) data object Chain : Unit( nameResId = R.string.unit_length_chain, - formatResId = R.string.unit_length_chain_format, + symbolResId = R.string.unit_length_chain_symbol, factor = 20.1168 ) data object Yard : Unit( nameResId = R.string.unit_length_yard, - formatResId = R.string.unit_length_yard_format, + symbolResId = R.string.unit_length_yard_symbol, factor = 0.9144 ) data object Foot : Unit( nameResId = R.string.unit_length_foot, - formatResId = R.string.unit_length_foot_format, + symbolResId = R.string.unit_length_foot_symbol, factor = 0.3048 ) data object Mil : Unit( nameResId = R.string.unit_length_mil, - formatResId = R.string.unit_length_mil_format, + symbolResId = R.string.unit_length_mil_symbol, factor = 0.0000254 ) data object Inch : Unit( nameResId = R.string.unit_length_inch, - formatResId = R.string.unit_length_inch_format, + symbolResId = R.string.unit_length_inch_symbol, factor = 0.0254 ) data object Fathom : Unit( nameResId = R.string.unit_length_fathom, - formatResId = R.string.unit_length_fathom_format, + symbolResId = R.string.unit_length_fathom_symbol, factor = 1.852 ) data object Cable : Unit( nameResId = R.string.unit_length_cable, - formatResId = R.string.unit_length_cable_format, + symbolResId = R.string.unit_length_cable_symbol, factor = 185.2 ) data object NauticalMile : Unit( nameResId = R.string.unit_length_nautical_mile, - formatResId = R.string.unit_length_nautical_mile_format, + symbolResId = R.string.unit_length_nautical_mile_symbol, factor = 1_852.0 ) data object Link : Unit( nameResId = R.string.unit_length_link, - formatResId = R.string.unit_length_link_format, + symbolResId = R.string.unit_length_link_symbol, factor = 0.201168 ) data object Rod : Unit( nameResId = R.string.unit_length_rod, - formatResId = R.string.unit_length_rod_format, + symbolResId = R.string.unit_length_rod_symbol, factor = 5.0292 ) data object AstronomicalUnit : Unit( nameResId = R.string.unit_length_astronomical_unit, - formatResId = R.string.unit_length_astronomical_unit_format, + symbolResId = R.string.unit_length_astronomical_unit_symbol, factor = 1.495979e+11 ) data object Parsec : Unit( nameResId = R.string.unit_length_parsec, - formatResId = R.string.unit_length_parsec_format, + symbolResId = R.string.unit_length_parsec_symbol, factor = 3.0857e+16 ) data object LightYear : Unit( nameResId = R.string.unit_length_light_year, - formatResId = R.string.unit_length_light_year_format, + symbolResId = R.string.unit_length_light_year_symbol, factor = 9.4607e+15 ) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/MassConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/MassConverter.kt index 643a7879..c12c8074 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/MassConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/MassConverter.kt @@ -6,88 +6,88 @@ object MassConverter : Converter { override val nameResId: Int = R.string.unit_mass override val imageResId: Int = R.drawable.ic_scale_vector - sealed class Unit(nameResId: Int, formatResId: Int, factor: Double) : Converter.Unit(nameResId, formatResId, factor) { + sealed class Unit(nameResId: Int, symbolResId: Int, factor: Double) : Converter.Unit(nameResId, symbolResId, factor) { data object Gram : Unit( nameResId = R.string.unit_mass_gram, - formatResId = R.string.unit_mass_gram_format, + symbolResId = R.string.unit_mass_gram_symbol, factor = 0.001 ) data object Kilogram : Unit( nameResId = R.string.unit_mass_kilogram, - formatResId = R.string.unit_mass_kilogram_format, + symbolResId = R.string.unit_mass_kilogram_symbol, factor = 1.0 ) data object Milligram : Unit( nameResId = R.string.unit_mass_milligram, - formatResId = R.string.unit_mass_milligram_format, + symbolResId = R.string.unit_mass_milligram_symbol, factor = 0.000001 ) data object Microgram : Unit( nameResId = R.string.unit_mass_microgram, - formatResId = R.string.unit_mass_microgram_format, + symbolResId = R.string.unit_mass_microgram_symbol, factor = 0.000000001 ) data object Tonne : Unit( nameResId = R.string.unit_mass_tonne, - formatResId = R.string.unit_mass_tonne_format, + symbolResId = R.string.unit_mass_tonne_symbol, factor = 1_000.0 ) data object Pound : Unit( nameResId = R.string.unit_mass_pound, - formatResId = R.string.unit_mass_pound_format, - factor = 0.45359237 + symbolResId = R.string.unit_mass_pound_symbol, + factor = 0.45359237 ) data object Ounce : Unit( nameResId = R.string.unit_mass_ounce, - formatResId = R.string.unit_mass_ounce_format, + symbolResId = R.string.unit_mass_ounce_symbol, factor = 0.028349523125 ) data object Grain : Unit( nameResId = R.string.unit_mass_grain, - formatResId = R.string.unit_mass_grain_format, + symbolResId = R.string.unit_mass_grain_symbol, factor = 0.00006479891 ) data object Dram : Unit( nameResId = R.string.unit_mass_dram, - formatResId = R.string.unit_mass_dram_format, + symbolResId = R.string.unit_mass_dram_symbol, factor = 0.0017718451953125 ) data object Stone : Unit( nameResId = R.string.unit_mass_stone, - formatResId = R.string.unit_mass_stone_format, + symbolResId = R.string.unit_mass_stone_symbol, factor = 6.35029318 ) data object LongTon : Unit( nameResId = R.string.unit_mass_long_ton, - formatResId = R.string.unit_mass_long_ton_format, + symbolResId = R.string.unit_mass_long_ton_symbol, factor = 1_016.0469088 ) data object ShortTon : Unit( nameResId = R.string.unit_mass_short_ton, - formatResId = R.string.unit_mass_short_ton_format, + symbolResId = R.string.unit_mass_short_ton_symbol, factor = 907.18474 ) data object Carat : Unit( nameResId = R.string.unit_mass_carat, - formatResId = R.string.unit_mass_carat_format, + symbolResId = R.string.unit_mass_carat_symbol, factor = 0.0002051965483 ) data object CaratMetric : Unit( nameResId = R.string.unit_mass_carat_metric, - formatResId = R.string.unit_mass_carat_metric_format, + symbolResId = R.string.unit_mass_carat_metric_symbol, factor = 0.0002 ) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TemperatureConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TemperatureConverter.kt index 34afea20..edbcf022 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TemperatureConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TemperatureConverter.kt @@ -6,11 +6,11 @@ object TemperatureConverter : Converter { override val nameResId: Int = R.string.unit_temperature override val imageResId: Int = R.drawable.ic_thermostat_vector - sealed class Unit(nameResId: Int, formatResId: Int, factor: Double) : Converter.Unit(nameResId, formatResId, factor) { + sealed class Unit(nameResId: Int, symbolResId: Int, factor: Double) : Converter.Unit(nameResId, symbolResId, factor) { data object Celsius : Unit( nameResId = R.string.unit_temperature_celsius, - formatResId = R.string.unit_temperature_celsius_format, + symbolResId = R.string.unit_temperature_celsius_symbol, factor = 1.0 ) { const val KELVIN_OFFSET = 273.15 @@ -21,7 +21,7 @@ object TemperatureConverter : Converter { data object Delisle : Unit( nameResId = R.string.unit_temperature_delisle, - formatResId = R.string.unit_temperature_delisle_format, + symbolResId = R.string.unit_temperature_delisle_symbol, factor = 2.0 / 3 ) { private const val KELVIN_OFFSET = 373.15 @@ -33,7 +33,7 @@ object TemperatureConverter : Converter { data object Fahrenheit : Unit( nameResId = R.string.unit_temperature_fahrenheit, - formatResId = R.string.unit_temperature_fahrenheit_format, + symbolResId = R.string.unit_temperature_fahrenheit_symbol, factor = 9.0 / 5 ) { private const val CELSIUS_OFFSET = 32 @@ -45,7 +45,7 @@ object TemperatureConverter : Converter { data object Newton : Unit( nameResId = R.string.unit_temperature_newton, - formatResId = R.string.unit_temperature_newton_format, + symbolResId = R.string.unit_temperature_newton_symbol, factor = 100.0 / 33 ) { private const val KELVIN_OFFSET = Celsius.KELVIN_OFFSET @@ -57,14 +57,14 @@ object TemperatureConverter : Converter { data object Rankine : Unit( nameResId = R.string.unit_temperature_rankine, - formatResId = R.string.unit_temperature_rankine_format, + symbolResId = R.string.unit_temperature_rankine_symbol, factor = 5.0 / 9 ) data object Reaumur : Unit( nameResId = R.string.unit_temperature_reaumur, - formatResId = R.string.unit_temperature_reaumur_format, - factor = 5.0 / 4 + symbolResId = R.string.unit_temperature_reaumur_symbol, + factor = 5.0 / 4 ) { private const val KELVIN_OFFSET = Celsius.KELVIN_OFFSET @@ -75,7 +75,7 @@ object TemperatureConverter : Converter { data object Romer : Unit( nameResId = R.string.unit_temperature_romer, - formatResId = R.string.unit_temperature_romer_format, + symbolResId = R.string.unit_temperature_romer_symbol, factor = 40.0 / 21 ) { private const val KELVIN_OFFSET = Celsius.KELVIN_OFFSET @@ -88,7 +88,7 @@ object TemperatureConverter : Converter { data object GasMark : Unit( nameResId = R.string.unit_temperature_gas_mark, - formatResId = R.string.unit_temperature_gas_mark_format, + symbolResId = R.string.unit_temperature_gas_mark_symbol, factor = 25.0 ) { private const val FAHRENHEIT_OFFSET = 250 @@ -100,7 +100,7 @@ object TemperatureConverter : Converter { data object Kelvin : Unit( nameResId = R.string.unit_temperature_kelvin, - formatResId = R.string.unit_temperature_kelvin_format, + symbolResId = R.string.unit_temperature_kelvin_symbol, factor = 1.0 ) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt index 93eb87d1..fd240bad 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt @@ -6,7 +6,7 @@ object TimeConverter : Converter { override val nameResId: Int = R.string.unit_time override val imageResId: Int = com.simplemobiletools.commons.R.drawable.ic_clock_vector - sealed class Unit(nameResId: Int, formatResId: Int, factor: Double) : Converter.Unit(nameResId, formatResId, factor) { + sealed class Unit(nameResId: Int, symbolResId: Int, factor: Double) : Converter.Unit(nameResId, symbolResId, factor) { companion object { private const val MINUTE = 60.0 private const val HOUR = 60.0 * MINUTE @@ -16,139 +16,139 @@ object TimeConverter : Converter { data object Hour : Unit( nameResId = R.string.unit_time_hour, - formatResId = R.string.unit_time_hour_format, + symbolResId = R.string.unit_time_hour_symbol, factor = HOUR ) data object Minute : Unit( nameResId = R.string.unit_time_minute, - formatResId = R.string.unit_time_minute_format, + symbolResId = R.string.unit_time_minute_symbol, factor = MINUTE ) data object Second : Unit( nameResId = R.string.unit_time_second, - formatResId = R.string.unit_time_second_format, + symbolResId = R.string.unit_time_second_symbol, factor = 1.0 ) data object Millisecond : Unit( nameResId = R.string.unit_time_millisecond, - formatResId = R.string.unit_time_millisecond_format, + symbolResId = R.string.unit_time_millisecond_symbol, factor = 0.001 ) data object Microsecond : Unit( nameResId = R.string.unit_time_microsecond, - formatResId = R.string.unit_time_microsecond_format, + symbolResId = R.string.unit_time_microsecond_symbol, factor = 0.000001 ) data object Nanosecond : Unit( nameResId = R.string.unit_time_nanosecond, - formatResId = R.string.unit_time_nanosecond_format, + symbolResId = R.string.unit_time_nanosecond_symbol, factor = 0.000000001 ) data object Picosecond : Unit( nameResId = R.string.unit_time_picosecond, - formatResId = R.string.unit_time_picosecond_format, + symbolResId = R.string.unit_time_picosecond_symbol, factor = 0.000000000001 ) data object Day : Unit( nameResId = R.string.unit_time_day, - formatResId = R.string.unit_time_day_format, + symbolResId = R.string.unit_time_day_symbol, factor = DAY ) data object Week : Unit( nameResId = R.string.unit_time_week, - formatResId = R.string.unit_time_week_format, + symbolResId = R.string.unit_time_week_symbol, factor = DAY * 7 ) data object MonthFull : Unit( nameResId = R.string.unit_time_month_full, - formatResId = R.string.unit_time_month_full_format, + symbolResId = R.string.unit_time_month_full_symbol, factor = DAY * 30 ) data object MonthHollow : Unit( nameResId = R.string.unit_time_month_hollow, - formatResId = R.string.unit_time_month_hollow_format, + symbolResId = R.string.unit_time_month_hollow_symbol, factor = DAY * 29 ) data object MonthSynodic : Unit( nameResId = R.string.unit_time_month_synodic, - formatResId = R.string.unit_time_month_synodic_format, + symbolResId = R.string.unit_time_month_synodic_symbol, factor = DAY * 29.530589 ) data object MonthGregorianAverage : Unit( nameResId = R.string.unit_time_month_gregorian_average, - formatResId = R.string.unit_time_month_gregorian_average_format, + symbolResId = R.string.unit_time_month_gregorian_average_symbol, factor = DAY * 30.346875 ) data object YearLeap : Unit( nameResId = R.string.unit_time_year_leap, - formatResId = R.string.unit_time_year_leap_format, + symbolResId = R.string.unit_time_year_leap_symbol, factor = DAY * 366 ) data object YearGregorian : Unit( nameResId = R.string.unit_time_year_gregorian, - formatResId = R.string.unit_time_year_gregorian_format, + symbolResId = R.string.unit_time_year_gregorian_symbol, factor = GREGORIAN_YEAR ) data object YearJulian : Unit( nameResId = R.string.unit_time_year_julian, - formatResId = R.string.unit_time_year_julian_format, + symbolResId = R.string.unit_time_year_julian_symbol, factor = DAY * 365.25 ) data object Jiffy : Unit( nameResId = R.string.unit_time_jiffy, - formatResId = R.string.unit_time_jiffy_format, + symbolResId = R.string.unit_time_jiffy_symbol, factor = 1 / 60.0 ) data object Moment : Unit( nameResId = R.string.unit_time_moment, - formatResId = R.string.unit_time_moment_format, + symbolResId = R.string.unit_time_moment_symbol, factor = 90.0 ) data object Fortnight : Unit( nameResId = R.string.unit_time_fortnight, - formatResId = R.string.unit_time_fortnight_format, + symbolResId = R.string.unit_time_fortnight_symbol, factor = DAY * 7 * 2 ) data object Decade : Unit( nameResId = R.string.unit_time_decade, - formatResId = R.string.unit_time_decade_format, + symbolResId = R.string.unit_time_decade_symbol, factor = GREGORIAN_YEAR * 10 ) data object Century : Unit( nameResId = R.string.unit_time_century, - formatResId = R.string.unit_time_century_format, + symbolResId = R.string.unit_time_century_symbol, factor = GREGORIAN_YEAR * 100 ) data object Millennium : Unit( nameResId = R.string.unit_time_millennium, - formatResId = R.string.unit_time_millennium_format, + symbolResId = R.string.unit_time_millennium_symbol, factor = GREGORIAN_YEAR * 1000 ) data object AtomicUnit : Unit( nameResId = R.string.unit_time_atomic_unit, - formatResId = R.string.unit_time_atomic_unit_format, + symbolResId = R.string.unit_time_atomic_unit_symbol, factor = 0.00000000000000002418884254 ) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt index d50f183a..b7244ca3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt @@ -6,190 +6,190 @@ object VolumeConverter : Converter { override val nameResId: Int = R.string.unit_volume override val imageResId: Int = R.drawable.ic_drop_vector - sealed class Unit(nameResId: Int, formatResId: Int, factor: Double) : Converter.Unit(nameResId, formatResId, factor) { + sealed class Unit(nameResId: Int, symbolResId: Int, factor: Double) : Converter.Unit(nameResId, symbolResId, factor) { data object CubicMeter : Unit( nameResId = R.string.unit_volume_cubic_meter, - formatResId = R.string.unit_volume_cubic_meter_format, + symbolResId = R.string.unit_volume_cubic_meter_symbol, factor = 1.0 ) data object CubicDecimeter : Unit( nameResId = R.string.unit_volume_cubic_decimeter, - formatResId = R.string.unit_volume_cubic_decimeter_format, + symbolResId = R.string.unit_volume_cubic_decimeter_symbol, factor = 0.001 ) data object CubicCentimeter : Unit( nameResId = R.string.unit_volume_cubic_centimeter, - formatResId = R.string.unit_volume_cubic_centimeter_format, + symbolResId = R.string.unit_volume_cubic_centimeter_symbol, factor = 0.000001 ) data object CubicMillimeter : Unit( nameResId = R.string.unit_volume_cubic_millimeter, - formatResId = R.string.unit_volume_cubic_millimeter_format, + symbolResId = R.string.unit_volume_cubic_millimeter_symbol, factor = 0.000000001 ) data object Liter : Unit( nameResId = R.string.unit_volume_liter, - formatResId = R.string.unit_volume_liter_format, + symbolResId = R.string.unit_volume_liter_symbol, factor = 0.001 ) data object Centiliter : Unit( nameResId = R.string.unit_volume_centiliter, - formatResId = R.string.unit_volume_centiliter_format, + symbolResId = R.string.unit_volume_centiliter_symbol, factor = 0.0001 ) data object Deciliter : Unit( nameResId = R.string.unit_volume_deciliter, - formatResId = R.string.unit_volume_deciliter_format, + symbolResId = R.string.unit_volume_deciliter_symbol, factor = 0.00001 ) data object Milliliter : Unit( nameResId = R.string.unit_volume_milliliter, - formatResId = R.string.unit_volume_milliliter_format, + symbolResId = R.string.unit_volume_milliliter_symbol, factor = 0.000001 ) data object AcreFoot : Unit( nameResId = R.string.unit_volume_acre_foot, - formatResId = R.string.unit_volume_acre_foot_format, + symbolResId = R.string.unit_volume_acre_foot_symbol, factor = 1_233.48183754752 ) data object CubicYard : Unit( nameResId = R.string.unit_volume_cubic_yard, - formatResId = R.string.unit_volume_cubic_yard_format, + symbolResId = R.string.unit_volume_cubic_yard_symbol, factor = 0.764554857984 ) data object CubicFoot : Unit( nameResId = R.string.unit_volume_cubic_foot, - formatResId = R.string.unit_volume_cubic_foot_format, + symbolResId = R.string.unit_volume_cubic_foot_symbol, factor = 0.028316846592 ) data object CubicInch : Unit( nameResId = R.string.unit_volume_cubic_inch, - formatResId = R.string.unit_volume_cubic_inch_format, + symbolResId = R.string.unit_volume_cubic_inch_symbol, factor = 0.000016387064 ) data object BarrelUS : Unit( nameResId = R.string.unit_volume_barrel_us, - formatResId = R.string.unit_volume_barrel_us_format, + symbolResId = R.string.unit_volume_barrel_us_symbol, factor = 0.119240471196 ) data object GallonUS : Unit( nameResId = R.string.unit_volume_gallon_us, - formatResId = R.string.unit_volume_gallon_us_format, + symbolResId = R.string.unit_volume_gallon_us_symbol, factor = 0.003785411784 ) data object QuartUS : Unit( nameResId = R.string.unit_volume_quart_us, - formatResId = R.string.unit_volume_quart_us_format, + symbolResId = R.string.unit_volume_quart_us_symbol, factor = 0.000946352946 ) data object PintUS : Unit( nameResId = R.string.unit_volume_pint_us, - formatResId = R.string.unit_volume_pint_us_format, + symbolResId = R.string.unit_volume_pint_us_symbol, factor = 0.000473176473 ) data object GillUS : Unit( nameResId = R.string.unit_volume_gill_us, - formatResId = R.string.unit_volume_gill_us_format, + symbolResId = R.string.unit_volume_gill_us_symbol, factor = 0.00011829411825 ) data object FluidOunceUS : Unit( nameResId = R.string.unit_volume_fluid_ounce_us, - formatResId = R.string.unit_volume_fluid_ounce_us_format, + symbolResId = R.string.unit_volume_fluid_ounce_us_symbol, factor = 0.00003 ) data object DropUS : Unit( nameResId = R.string.unit_volume_drop_us, - formatResId = R.string.unit_volume_drop_us_format, + symbolResId = R.string.unit_volume_drop_us_symbol, factor = 0.00000008214869322916 ) data object TeaspoonUS : Unit( nameResId = R.string.unit_volume_teaspoon_us, - formatResId = R.string.unit_volume_teaspoon_us_format, + symbolResId = R.string.unit_volume_teaspoon_us_symbol, factor = 0.000005 ) data object TablespoonUS : Unit( nameResId = R.string.unit_volume_tablespoon_us, - formatResId = R.string.unit_volume_tablespoon_us_format, + symbolResId = R.string.unit_volume_tablespoon_us_symbol, factor = 0.000015 ) data object CupUS : Unit( nameResId = R.string.unit_volume_cup_us, - formatResId = R.string.unit_volume_cup_us_format, + symbolResId = R.string.unit_volume_cup_us_symbol, factor = 0.00024 ) data object BarrelImperial : Unit( nameResId = R.string.unit_volume_barrel_imperial, - formatResId = R.string.unit_volume_barrel_imperial_format, + symbolResId = R.string.unit_volume_barrel_imperial_symbol, factor = 0.16365924 ) data object GallonImperial : Unit( nameResId = R.string.unit_volume_gallon_imperial, - formatResId = R.string.unit_volume_gallon_imperial_format, + symbolResId = R.string.unit_volume_gallon_imperial_symbol, factor = 0.00454609 ) data object QuartImperial : Unit( nameResId = R.string.unit_volume_quart_imperial, - formatResId = R.string.unit_volume_quart_imperial_format, + symbolResId = R.string.unit_volume_quart_imperial_symbol, factor = 0.0011365225 ) data object PintImperial : Unit( nameResId = R.string.unit_volume_pint_imperial, - formatResId = R.string.unit_volume_pint_imperial_format, + symbolResId = R.string.unit_volume_pint_imperial_symbol, factor = 0.00056826125 ) data object GillImperial : Unit( nameResId = R.string.unit_volume_gill_imperial, - formatResId = R.string.unit_volume_gill_imperial_format, + symbolResId = R.string.unit_volume_gill_imperial_symbol, factor = 0.0001420653125 ) data object FluidOunceImperial : Unit( nameResId = R.string.unit_volume_fluid_ounce_imperial, - formatResId = R.string.unit_volume_fluid_ounce_imperial_format, + symbolResId = R.string.unit_volume_fluid_ounce_imperial_symbol, factor = 0.0000284130625 ) data object DropImperial : Unit( nameResId = R.string.unit_volume_drop_imperial, - formatResId = R.string.unit_volume_drop_imperial_format, + symbolResId = R.string.unit_volume_drop_imperial_symbol, factor = 0.0000000986564670138 ) data object TeaspoonImperial : Unit( nameResId = R.string.unit_volume_teaspoon_imperial, - formatResId = R.string.unit_volume_teaspoon_imperial_format, + symbolResId = R.string.unit_volume_teaspoon_imperial_symbol, factor = 0.00000591938802083 ) data object TablespoonImperial : Unit( nameResId = R.string.unit_volume_tablespoon_imperial, - formatResId = R.string.unit_volume_tablespoon_imperial_format, + symbolResId = R.string.unit_volume_tablespoon_imperial_symbol, factor = 0.0000177581640625 ) } diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt index 641878f2..60936ac6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt @@ -7,6 +7,7 @@ import android.util.AttributeSet import android.view.View import android.widget.LinearLayout import android.widget.TextView +import androidx.core.content.res.ResourcesCompat import androidx.core.widget.TextViewCompat import com.simplemobiletools.calculator.R import com.simplemobiletools.calculator.databinding.ViewConverterBinding @@ -14,9 +15,9 @@ import com.simplemobiletools.calculator.helpers.COMMA import com.simplemobiletools.calculator.helpers.DOT import com.simplemobiletools.calculator.helpers.NumberFormatHelper import com.simplemobiletools.calculator.helpers.converters.Converter -import com.simplemobiletools.calculator.helpers.converters.ValueWithUnit import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.helpers.MEDIUM_ALPHA_INT import com.simplemobiletools.commons.models.RadioItem import me.grantland.widget.AutofitHelper import kotlin.reflect.KMutableProperty0 @@ -43,6 +44,8 @@ class ConverterView @JvmOverloads constructor( AutofitHelper.create(binding.topUnitText) AutofitHelper.create(binding.bottomUnitText) + AutofitHelper.create(binding.topUnitSymbol) + AutofitHelper.create(binding.bottomUnitSymbol) binding.swapButton.setOnClickListener { switch() } @@ -57,32 +60,34 @@ class ConverterView @JvmOverloads constructor( topUnit = converter.defaultTopUnit bottomUnit = converter.defaultBottomUnit - binding.topUnitText.setFormattedUnitText(topUnit!!.withValue(0.0)) + binding.topUnitText.text = "0" updateBottomValue() - updateUnitLabels() + updateUnitLabelsAndSymbols() } fun updateColors() { - binding.topUnitText.setTextColor(context.getProperTextColor()) - binding.bottomUnitText.setTextColor(context.getProperTextColor()) - binding.topUnitName.setTextColor(context.getProperTextColor()) - binding.bottomUnitName.setTextColor(context.getProperTextColor()) - TextViewCompat.setCompoundDrawableTintList( - binding.topUnitName, - ColorStateList.valueOf(context.getProperPrimaryColor()) - ) - TextViewCompat.setCompoundDrawableTintList( - binding.bottomUnitName, - ColorStateList.valueOf(context.getProperPrimaryColor()) - ) - binding.topUnitHolder.setBackgroundColor(context.getProperBackgroundColor().lightenColor()) + listOf(binding.topUnitText, binding.bottomUnitText, binding.topUnitName, binding.bottomUnitName).forEach { + it.setTextColor(context.getProperTextColor()) + } + listOf(binding.topUnitName, binding.bottomUnitName).forEach { + TextViewCompat.setCompoundDrawableTintList( + it, + ColorStateList.valueOf(context.getProperPrimaryColor()) + ) + } + binding.topUnitHolder.setBackgroundColor(context.getProperBackgroundColor().lightenColor()) binding.swapButton.applyColorFilter(context.getProperPrimaryColor()) + + listOf(binding.topUnitSymbol, binding.bottomUnitSymbol).forEach { + it.background = ResourcesCompat.getDrawable(resources, com.simplemobiletools.commons.R.drawable.pill_background, context.theme) + it.background?.alpha = MEDIUM_ALPHA_INT + } } fun clear() { - binding.topUnitText.setFormattedUnitText(topUnit!!.withValue(0.0)) - binding.bottomUnitText.setFormattedUnitText(bottomUnit!!.withValue(0.0)) + binding.topUnitText.text = "0" + binding.bottomUnitText.text = "0" } fun numpadClicked(id: Int) { @@ -104,7 +109,7 @@ class ConverterView @JvmOverloads constructor( } private fun decimalClicked() { - var value = binding.topUnitText.text.removeUnit() + var value = binding.topUnitText.text.toString() if (!value.contains(decimalSeparator)) { when (value) { "0" -> value = "0$decimalSeparator" @@ -112,48 +117,45 @@ class ConverterView @JvmOverloads constructor( else -> value += decimalSeparator } - binding.topUnitText.text = topUnit?.format(context, value) + binding.topUnitText.text = value } } private fun zeroClicked() { - val value = binding.topUnitText.text.removeUnit() + val value = binding.topUnitText.text if (value != "0" || value.contains(decimalSeparator)) { addDigit(0) } } private fun addDigit(digit: Int) { - var value = binding.topUnitText.text.removeUnit() + var value = binding.topUnitText.text.toString() if (value == "0") { value = "" } value += digit value = formatter.addGroupingSeparators(value) - binding.topUnitText.text = topUnit!!.format(context, value) + binding.topUnitText.text = value } private fun switch() { ::topUnit.swapWith(::bottomUnit) - updateTopValue() updateBottomValue() - updateUnitLabels() + updateUnitLabelsAndSymbols() } - private fun updateUnitLabels() { + private fun updateUnitLabelsAndSymbols() { binding.topUnitName.text = topUnit?.nameResId?.let { context.getString(it) } binding.bottomUnitName.text = bottomUnit?.nameResId?.let { context.getString(it) } - } - - private fun updateTopValue() { - binding.topUnitText.setFormattedUnitText(topUnit!!.withValue(binding.topUnitText.getValue())) + binding.topUnitSymbol.text = topUnit?.symbolResId?.let { context.getString(it) } + binding.bottomUnitSymbol.text = bottomUnit?.symbolResId?.let { context.getString(it) } } private fun updateBottomValue() { converter?.apply { - val converted = convert(topUnit!!.withValue(binding.topUnitText.getValue()), bottomUnit!!).value - binding.bottomUnitText.setFormattedUnitText(bottomUnit!!.withValue(converted)) + val converted = convert(topUnit!!.withValue(formatter.removeGroupingSeparator(binding.topUnitText.text.toString()).toDouble()), bottomUnit!!).value + binding.bottomUnitText.text = formatter.doubleToString(converted) } } @@ -163,21 +165,15 @@ class ConverterView @JvmOverloads constructor( this.groupingSeparator = groupingSeparator formatter.decimalSeparator = decimalSeparator formatter.groupingSeparator = groupingSeparator - binding.topUnitText.setFormattedUnitText(topUnit!!.withValue(0.0)) - binding.bottomUnitText.setFormattedUnitText(bottomUnit!!.withValue(0.0)) + binding.topUnitText.text = "0" + binding.bottomUnitText.text = "0" } } - private fun TextView.setFormattedUnitText(value: ValueWithUnit<*>) { - text = value.unit.format(context, formatter.doubleToString(value.value)) - } - private fun TextView.getValue(): Double { - return formatter.removeGroupingSeparator(text.removeUnit()).toDouble() + return formatter.removeGroupingSeparator(text.toString()).toDouble() } - private fun CharSequence.removeUnit() = filter { it.isDigit() || it == '.' || it == ',' }.toString() - private fun KMutableProperty0.swapWith(other: KMutableProperty0) { this.get().also { this.set(other.get()) @@ -196,10 +192,9 @@ class ConverterView @JvmOverloads constructor( switch() } else if (unit != propertyToChange.get()) { propertyToChange.set(unit) - updateTopValue() updateBottomValue() } - updateUnitLabels() + updateUnitLabelsAndSymbols() } } } diff --git a/app/src/main/res/layout/view_converter.xml b/app/src/main/res/layout/view_converter.xml index 7bb6d803..aef41d66 100644 --- a/app/src/main/res/layout/view_converter.xml +++ b/app/src/main/res/layout/view_converter.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + + + + - + - + + + + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index d903b3d3..01422473 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -10,4 +10,5 @@ 40sp 128dp + 64dp diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 636e4d37..0ad011c6 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -3,122 +3,122 @@ com.simplemobiletools.calculator %s (%s) - %s km - %s hm - %s dam - %s m - %s dm - %s cm - %s mm - %s μm - %s nm - %s pm - %s Å - %s mi - %s ch - %s yd - %s ft - %s mil - %s in - %s fathom - %s cable - %s NM - %s lnk - %s rd - %s au - %s pc - %s ly - %s km² - %s m² - %s cm² - %s mm² - %s sq mi - %s sq yd - %s sq ft - %s sq mil - %s sq in - %s sq rd - %s ac - %s a - %s dunam - %s ha - %s m³ - %s dm³ - %s cm³ - %s mm³ - %s l - %s cl - %s dl - %s ml - %s ac ft - %s yd³ - %s ft³ - %s in³ - %s fl bl (US) - %s gal (US) - %s qt (US) - %s pt (US fl) - %s gi (US) - %s US fl oz - %s gtt - %s tsp - %s tbsp - %s c (US) - %s bl (imp) - %s gal (imp) - %s qt (imp) - %s pt (imp) - %s gi (imp) - %s fl oz (imp) - %s gtt - %s tsp - %s tbsp - %s g - %s kg - %s mg - %s μm - %s t - %s lb - %s oz - %s gr - %s dr - %s st - %s ton - %s sh tn - %s kt - %s ct - %s°C - %s°De - %s°F - %s°N - %s°R - %s°Ré - %s°Rø - %s GM - %s K - %s h - %s m - %s s - %s ms - %s µs - %s ns - %s ps - %s d - %s wk - %s mo - %s mo - %s mo - %s mo - %s y - %s y - %s y - %s j - %s moment - %s fn - %s dec - %s c - %s millennium - %s a.u. + km + hm + dam + m + dm + cm + mm + μm + nm + pm + Å + mi + ch + yd + ft + mil + in + fathom + cable + NM + lnk + rd + au + pc + ly + km² + m² + cm² + mm² + sq mi + sq yd + sq ft + sq mil + sq in + sq rd + ac + a + dunam + ha + m³ + dm³ + cm³ + mm³ + l + cl + dl + ml + ac ft + yd³ + ft³ + in³ + fl bl (US) + gal (US) + qt (US) + pt (US fl) + gi (US) + US fl oz + gtt + tsp + tbsp + c (US) + bl (imp) + gal (imp) + qt (imp) + pt (imp) + gi (imp) + fl oz (imp) + gtt + tsp + tbsp + g + kg + mg + μm + t + lb + oz + gr + dr + st + ton + sh tn + kt + ct + °C + °De + °F + °N + °R + °Ré + °Rø + GM + K + h + m + s + ms + µs + ns + ps + d + wk + mo + mo + mo + mo + y + y + y + j + moment + fn + dec + c + millennium + a.u. Allow customizing the bottom navigation bar color From 31fcd94ecf627a3b50b88b2342c5e0f7c196b67e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 12:18:15 +0200 Subject: [PATCH 21/58] Add copy to clipboard functionality for unit converter --- .../simplemobiletools/calculator/views/ConverterView.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt index 60936ac6..4a4b64b2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt @@ -51,6 +51,14 @@ class ConverterView @JvmOverloads constructor( binding.topUnitHolder.setClickListenerForUnitSelector(::topUnit, ::bottomUnit) binding.bottomUnitHolder.setClickListenerForUnitSelector(::bottomUnit, ::topUnit) + binding.topUnitHolder.setOnLongClickListener { + context.copyToClipboard(binding.topUnitText.text.toString()) + true + } + binding.bottomUnitHolder.setOnLongClickListener { + context.copyToClipboard(binding.bottomUnitText.text.toString()) + true + } updateColors() } From 403471fd74133de2b106037bc675dabafad166e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 15:30:30 +0200 Subject: [PATCH 22/58] Remove appLaunched calls from unit converter --- .../calculator/activities/UnitConverterActivity.kt | 6 +++--- .../calculator/activities/UnitConverterPickerActivity.kt | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt index 6f5b7b6f..61691e58 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt @@ -4,14 +4,15 @@ import android.os.Bundle import android.view.View import android.view.WindowManager import androidx.core.content.res.ResourcesCompat -import com.simplemobiletools.calculator.BuildConfig import com.simplemobiletools.calculator.databinding.ActivityUnitConverterBinding import com.simplemobiletools.calculator.extensions.config import com.simplemobiletools.calculator.extensions.updateViewColors import com.simplemobiletools.calculator.helpers.COMMA import com.simplemobiletools.calculator.helpers.DOT import com.simplemobiletools.calculator.helpers.converters.Converter -import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.extensions.getProperTextColor +import com.simplemobiletools.commons.extensions.performHapticFeedback +import com.simplemobiletools.commons.extensions.viewBinding import com.simplemobiletools.commons.helpers.LOWER_ALPHA_INT import com.simplemobiletools.commons.helpers.MEDIUM_ALPHA_INT import com.simplemobiletools.commons.helpers.NavigationIcon @@ -29,7 +30,6 @@ class UnitConverterActivity : SimpleActivity() { isMaterialActivity = true super.onCreate(savedInstanceState) setContentView(binding.root) - appLaunched(BuildConfig.APPLICATION_ID) updateMaterialActivityViews(binding.unitConverterCoordinator, null, useTransparentNavigation = false, useTopSearchMenu = false) setupMaterialScrollListener(binding.nestedScrollview, binding.unitConverterToolbar) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterPickerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterPickerActivity.kt index 086090f8..47b404e0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterPickerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterPickerActivity.kt @@ -3,13 +3,11 @@ package com.simplemobiletools.calculator.activities import android.content.Intent import android.os.Bundle import android.view.WindowManager -import com.simplemobiletools.calculator.BuildConfig import com.simplemobiletools.calculator.R import com.simplemobiletools.calculator.adapters.UnitTypesAdapter import com.simplemobiletools.calculator.databinding.ActivityUnitConverterPickerBinding import com.simplemobiletools.calculator.extensions.config import com.simplemobiletools.calculator.helpers.converters.Converter -import com.simplemobiletools.commons.extensions.appLaunched import com.simplemobiletools.commons.extensions.viewBinding import com.simplemobiletools.commons.helpers.NavigationIcon import com.simplemobiletools.commons.views.AutoGridLayoutManager @@ -21,7 +19,6 @@ class UnitConverterPickerActivity : SimpleActivity() { isMaterialActivity = true super.onCreate(savedInstanceState) setContentView(binding.root) - appLaunched(BuildConfig.APPLICATION_ID) updateMaterialActivityViews(binding.unitConverterPickerCoordinator, null, useTransparentNavigation = false, useTopSearchMenu = false) setupMaterialScrollListener(binding.unitTypesGrid, binding.unitConverterPickerToolbar) From bc7a5cc388ab24be9027b5a49c5d2e26e563720b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 15:34:37 +0200 Subject: [PATCH 23/58] Reduce margins between items in UnitConverterPicker --- app/src/main/res/layout/item_unit_type.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/item_unit_type.xml b/app/src/main/res/layout/item_unit_type.xml index c3bfacd0..cf855a14 100644 --- a/app/src/main/res/layout/item_unit_type.xml +++ b/app/src/main/res/layout/item_unit_type.xml @@ -4,7 +4,7 @@ android:layout_height="@dimen/unit_type_size" android:id="@+id/unit_background" xmlns:tools="http://schemas.android.com/tools" - android:layout_margin="@dimen/small_margin" + android:layout_marginTop="@dimen/small_margin" android:background="@drawable/unit_type_background" android:padding="@dimen/normal_margin" android:gravity="center" From 8a77d256eaffbffb60ae2b300ef707c7a1c04a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 15:48:24 +0200 Subject: [PATCH 24/58] Update unit symbol background and text size --- .../simplemobiletools/calculator/views/ConverterView.kt | 9 ++++++++- app/src/main/res/layout/view_converter.xml | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt index 4a4b64b2..3b8abc32 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt @@ -3,6 +3,9 @@ package com.simplemobiletools.calculator.views import android.app.Activity import android.content.Context import android.content.res.ColorStateList +import android.graphics.drawable.GradientDrawable +import android.graphics.drawable.LayerDrawable +import android.graphics.drawable.RippleDrawable import android.util.AttributeSet import android.view.View import android.widget.LinearLayout @@ -87,8 +90,12 @@ class ConverterView @JvmOverloads constructor( binding.topUnitHolder.setBackgroundColor(context.getProperBackgroundColor().lightenColor()) binding.swapButton.applyColorFilter(context.getProperPrimaryColor()) + val drawable = ResourcesCompat.getDrawable(resources, com.simplemobiletools.commons.R.drawable.pill_background, context.theme) as RippleDrawable + val bgLayerList = drawable.findDrawableByLayerId(com.simplemobiletools.commons.R.id.button_pill_background_holder) as LayerDrawable + val bgLayer = bgLayerList.findDrawableByLayerId(com.simplemobiletools.commons.R.id.button_pill_background_shape) as GradientDrawable + bgLayer.cornerRadius = context.resources.getDimension(com.simplemobiletools.commons.R.dimen.rounded_corner_radius_big) listOf(binding.topUnitSymbol, binding.bottomUnitSymbol).forEach { - it.background = ResourcesCompat.getDrawable(resources, com.simplemobiletools.commons.R.drawable.pill_background, context.theme) + it.background = drawable it.background?.alpha = MEDIUM_ALPHA_INT } } diff --git a/app/src/main/res/layout/view_converter.xml b/app/src/main/res/layout/view_converter.xml index aef41d66..624c39ab 100644 --- a/app/src/main/res/layout/view_converter.xml +++ b/app/src/main/res/layout/view_converter.xml @@ -50,6 +50,7 @@ android:padding="@dimen/small_margin" android:singleLine="true" android:textAlignment="gravity" + android:textSize="@dimen/big_text_size" app:layout_constraintBottom_toBottomOf="@+id/top_unit_text" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/top_unit_text" /> @@ -110,6 +111,7 @@ android:padding="@dimen/small_margin" android:singleLine="true" android:textAlignment="gravity" + android:textSize="@dimen/big_text_size" app:layout_constraintBottom_toBottomOf="@+id/bottom_unit_text" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/bottom_unit_text" /> From d056d6781ce8f234756f42479cfc0eca125765a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 15:57:05 +0200 Subject: [PATCH 25/58] Fix layout of unit converter grid --- app/src/main/res/layout/item_unit_type.xml | 5 +++-- app/src/main/res/values/dimens.xml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/item_unit_type.xml b/app/src/main/res/layout/item_unit_type.xml index cf855a14..daa7ff02 100644 --- a/app/src/main/res/layout/item_unit_type.xml +++ b/app/src/main/res/layout/item_unit_type.xml @@ -1,10 +1,10 @@ diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 01422473..da10f76e 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -9,6 +9,6 @@ 20sp 40sp - 128dp + 100dp 64dp From 66652f9b4bfe681d48c909f610bd60b7a108fe1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 16:00:25 +0200 Subject: [PATCH 26/58] Adjust unit type size --- app/src/main/res/values/dimens.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index da10f76e..fa9b3ca5 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -9,6 +9,6 @@ 20sp 40sp - 100dp + 120dp 64dp From f55c40d6cde7561b0044648423659537dbc7d532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 16:07:39 +0200 Subject: [PATCH 27/58] Remove unnecessary empty line --- .../simplemobiletools/calculator/adapters/UnitTypesAdapter.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/adapters/UnitTypesAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/adapters/UnitTypesAdapter.kt index e63fd4ab..392cdb70 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/adapters/UnitTypesAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/adapters/UnitTypesAdapter.kt @@ -17,7 +17,6 @@ class UnitTypesAdapter (val activity: SimpleActivity, val items: List override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder = ViewHolder(ItemUnitTypeBinding.inflate(activity.layoutInflater, parent, false)) - override fun onBindViewHolder(holder: ViewHolder, position: Int) { val item = items[position] holder.bindView(item, position) From 128986bf7c0d4be68ab7401e4fa4d3491f56eb01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 16:07:45 +0200 Subject: [PATCH 28/58] Limit unit type labels to single line --- app/src/main/res/layout/item_unit_type.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/item_unit_type.xml b/app/src/main/res/layout/item_unit_type.xml index daa7ff02..ee372221 100644 --- a/app/src/main/res/layout/item_unit_type.xml +++ b/app/src/main/res/layout/item_unit_type.xml @@ -27,6 +27,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:textAlignment="center" + android:singleLine="true" tools:text="Temperature" /> From 89f8502a13a1739b4a8a6e33fdc894502739cf98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 16:57:45 +0200 Subject: [PATCH 29/58] Handle clear button short taps --- .../activities/UnitConverterActivity.kt | 4 ++++ .../calculator/views/ConverterView.kt | 18 +++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt index 61691e58..1039c7d8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt @@ -42,7 +42,11 @@ class UnitConverterActivity : SimpleActivity() { this.converter = converter binding.viewUnitConverter.btnClear.setVibratingOnClickListener { + binding.viewUnitConverter.viewConverter.root.deleteCharacter() + } + binding.viewUnitConverter.btnClear.setOnLongClickListener { binding.viewUnitConverter.viewConverter.root.clear() + true } getButtonIds().forEach { diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt index 3b8abc32..62ceda80 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt @@ -9,7 +9,6 @@ import android.graphics.drawable.RippleDrawable import android.util.AttributeSet import android.view.View import android.widget.LinearLayout -import android.widget.TextView import androidx.core.content.res.ResourcesCompat import androidx.core.widget.TextViewCompat import com.simplemobiletools.calculator.R @@ -105,6 +104,19 @@ class ConverterView @JvmOverloads constructor( binding.bottomUnitText.text = "0" } + fun deleteCharacter() { + var newValue = binding.topUnitText.text.dropLast(1) + newValue = newValue.trimEnd(groupingSeparator.single()) + if (newValue == "") { + newValue = "0" + } + + val value = formatter.removeGroupingSeparator(newValue.toString()).toDouble() + binding.topUnitText.text = formatter.doubleToString(value) + + updateBottomValue() + } + fun numpadClicked(id: Int) { when (id) { R.id.btn_decimal -> decimalClicked() @@ -185,10 +197,6 @@ class ConverterView @JvmOverloads constructor( } } - private fun TextView.getValue(): Double { - return formatter.removeGroupingSeparator(text.toString()).toDouble() - } - private fun KMutableProperty0.swapWith(other: KMutableProperty0) { this.get().also { this.set(other.get()) From 3dcb8fedb5d96fa4ab5baa2655aa8625d0d9e8af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 16:59:41 +0200 Subject: [PATCH 30/58] Apply smaller corner radius only on unit backgrounds --- .../com/simplemobiletools/calculator/views/ConverterView.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt index 62ceda80..8ac13847 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt @@ -89,7 +89,9 @@ class ConverterView @JvmOverloads constructor( binding.topUnitHolder.setBackgroundColor(context.getProperBackgroundColor().lightenColor()) binding.swapButton.applyColorFilter(context.getProperPrimaryColor()) - val drawable = ResourcesCompat.getDrawable(resources, com.simplemobiletools.commons.R.drawable.pill_background, context.theme) as RippleDrawable + val drawable = ResourcesCompat.getDrawable( + resources, com.simplemobiletools.commons.R.drawable.pill_background, context.theme + )?.constantState?.newDrawable()?.mutate() as RippleDrawable val bgLayerList = drawable.findDrawableByLayerId(com.simplemobiletools.commons.R.id.button_pill_background_holder) as LayerDrawable val bgLayer = bgLayerList.findDrawableByLayerId(com.simplemobiletools.commons.R.id.button_pill_background_shape) as GradientDrawable bgLayer.cornerRadius = context.resources.getDimension(com.simplemobiletools.commons.R.dimen.rounded_corner_radius_big) From 44301dd9eff616e10572bd70629a98087844acf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 17:01:02 +0200 Subject: [PATCH 31/58] Reduce size of unit symbols --- app/src/main/res/values/dimens.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index fa9b3ca5..9d5c04e9 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -10,5 +10,5 @@ 40sp 120dp - 64dp + 48dp From 5ae36c4e4f48fa27098233e4ece79450ac17c764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 17:03:17 +0200 Subject: [PATCH 32/58] Increase size of switch units button --- app/src/main/res/layout/view_converter.xml | 5 ++--- app/src/main/res/values/dimens.xml | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/view_converter.xml b/app/src/main/res/layout/view_converter.xml index 624c39ab..c151845e 100644 --- a/app/src/main/res/layout/view_converter.xml +++ b/app/src/main/res/layout/view_converter.xml @@ -59,10 +59,9 @@ diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 9d5c04e9..a907c3ec 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -11,4 +11,5 @@ 120dp 48dp + 64dp From 609ae8dd2980205a6c073f4442f8b9a2be68f897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 17:04:34 +0200 Subject: [PATCH 33/58] Add more margin to unit names --- app/src/main/res/layout/view_converter.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/view_converter.xml b/app/src/main/res/layout/view_converter.xml index c151845e..6061c368 100644 --- a/app/src/main/res/layout/view_converter.xml +++ b/app/src/main/res/layout/view_converter.xml @@ -18,7 +18,7 @@ android:id="@+id/top_unit_name" android:layout_width="wrap_content" android:layout_height="0dp" - android:layout_marginTop="@dimen/small_margin" + android:layout_marginTop="@dimen/normal_margin" android:layout_marginBottom="@dimen/small_margin" android:layout_marginStart="@dimen/activity_margin" app:layout_constraintStart_toStartOf="parent" @@ -80,6 +80,7 @@ android:layout_width="wrap_content" android:layout_height="0dp" android:layout_gravity="start|center_vertical" + android:layout_marginTop="@dimen/normal_margin" android:layout_marginStart="@dimen/activity_margin" android:layout_marginBottom="@dimen/small_margin" app:layout_constraintStart_toStartOf="parent" From 93d938152e2013d98cbc65080042de0eacc778f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 13 Sep 2023 17:18:17 +0200 Subject: [PATCH 34/58] Add ripple to switch units button --- app/src/main/res/layout/view_converter.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/layout/view_converter.xml b/app/src/main/res/layout/view_converter.xml index 6061c368..d152c995 100644 --- a/app/src/main/res/layout/view_converter.xml +++ b/app/src/main/res/layout/view_converter.xml @@ -61,6 +61,7 @@ android:id="@+id/swap_button" android:layout_width="@dimen/unit_switch_button_size" android:layout_height="@dimen/unit_switch_button_size" + android:background="@drawable/ripple_all_corners" android:layout_gravity="center" android:padding="@dimen/activity_margin" android:layout_weight="0.5" From 8982a4d41e1bfa663b4cc408fe3ea1ec07ce8364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 14 Sep 2023 07:53:03 +0200 Subject: [PATCH 35/58] Make unit backgrounds smaller --- app/src/main/res/values/dimens.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index a907c3ec..2e55331d 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -10,6 +10,6 @@ 40sp 120dp - 48dp + 40dp 64dp From 07b3579c23356b2aa7bc8a88fcaeabb39bfcd354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 14 Sep 2023 07:55:16 +0200 Subject: [PATCH 36/58] Use circle ripple for swap units button --- app/src/main/res/drawable/ripple_circle_background.xml | 8 ++++++++ app/src/main/res/layout/view_converter.xml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/drawable/ripple_circle_background.xml diff --git a/app/src/main/res/drawable/ripple_circle_background.xml b/app/src/main/res/drawable/ripple_circle_background.xml new file mode 100644 index 00000000..081e2acd --- /dev/null +++ b/app/src/main/res/drawable/ripple_circle_background.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/app/src/main/res/layout/view_converter.xml b/app/src/main/res/layout/view_converter.xml index d152c995..cef625eb 100644 --- a/app/src/main/res/layout/view_converter.xml +++ b/app/src/main/res/layout/view_converter.xml @@ -61,7 +61,7 @@ android:id="@+id/swap_button" android:layout_width="@dimen/unit_switch_button_size" android:layout_height="@dimen/unit_switch_button_size" - android:background="@drawable/ripple_all_corners" + android:background="@drawable/ripple_circle_background" android:layout_gravity="center" android:padding="@dimen/activity_margin" android:layout_weight="0.5" From 707c82208eb07134f89f375c9b33990ac8826f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 14 Sep 2023 07:58:39 +0200 Subject: [PATCH 37/58] Make keyboard on view_unit_converter smaller --- app/src/main/res/layout/view_unit_converter.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/layout/view_unit_converter.xml b/app/src/main/res/layout/view_unit_converter.xml index b3a40b9a..05d84856 100644 --- a/app/src/main/res/layout/view_unit_converter.xml +++ b/app/src/main/res/layout/view_unit_converter.xml @@ -19,7 +19,7 @@ Date: Thu, 14 Sep 2023 09:20:53 +0200 Subject: [PATCH 38/58] Update simple-commons to prevent settings crash --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fc3179ea..b588c1cb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,7 @@ exp4j = "0.4.8" #Room room = "2.5.2" #Simple tools -simple-commons = "7c1e5b5777" +simple-commons = "65105a24a2" #Gradle gradlePlugins-agp = "8.1.1" #build From 89249927fc86ea41930d38287e1d63b61c79d7c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 14 Sep 2023 09:24:08 +0200 Subject: [PATCH 39/58] Add simple primary color tint for better visibility of top converter field --- .../com/simplemobiletools/calculator/views/ConverterView.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt index 8ac13847..4e7c9304 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt @@ -19,6 +19,7 @@ import com.simplemobiletools.calculator.helpers.NumberFormatHelper import com.simplemobiletools.calculator.helpers.converters.Converter import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.helpers.LOWER_ALPHA import com.simplemobiletools.commons.helpers.MEDIUM_ALPHA_INT import com.simplemobiletools.commons.models.RadioItem import me.grantland.widget.AutofitHelper @@ -86,7 +87,7 @@ class ConverterView @JvmOverloads constructor( ) } - binding.topUnitHolder.setBackgroundColor(context.getProperBackgroundColor().lightenColor()) + binding.topUnitHolder.setBackgroundColor(context.getProperPrimaryColor().lightenColor().adjustAlpha(LOWER_ALPHA)) binding.swapButton.applyColorFilter(context.getProperPrimaryColor()) val drawable = ResourcesCompat.getDrawable( From 230c2717b0c32e7926df5f2c1eb33c2bec96c3e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 14 Sep 2023 09:52:05 +0200 Subject: [PATCH 40/58] Add ripples to unit holders --- .../calculator/views/ConverterView.kt | 4 +++- app/src/main/res/drawable/colored_ripple.xml | 14 ++++++++++++++ app/src/main/res/layout/view_converter.xml | 2 ++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/drawable/colored_ripple.xml diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt index 4e7c9304..fb6d4674 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt @@ -3,6 +3,8 @@ package com.simplemobiletools.calculator.views import android.app.Activity import android.content.Context import android.content.res.ColorStateList +import android.graphics.BlendMode +import android.graphics.PorterDuff import android.graphics.drawable.GradientDrawable import android.graphics.drawable.LayerDrawable import android.graphics.drawable.RippleDrawable @@ -87,7 +89,7 @@ class ConverterView @JvmOverloads constructor( ) } - binding.topUnitHolder.setBackgroundColor(context.getProperPrimaryColor().lightenColor().adjustAlpha(LOWER_ALPHA)) + binding.topUnitHolder.backgroundTintList = ColorStateList.valueOf(context.getProperPrimaryColor().lightenColor().adjustAlpha(LOWER_ALPHA)) binding.swapButton.applyColorFilter(context.getProperPrimaryColor()) val drawable = ResourcesCompat.getDrawable( diff --git a/app/src/main/res/drawable/colored_ripple.xml b/app/src/main/res/drawable/colored_ripple.xml new file mode 100644 index 00000000..96e937f3 --- /dev/null +++ b/app/src/main/res/drawable/colored_ripple.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/view_converter.xml b/app/src/main/res/layout/view_converter.xml index cef625eb..bb60f54b 100644 --- a/app/src/main/res/layout/view_converter.xml +++ b/app/src/main/res/layout/view_converter.xml @@ -11,6 +11,7 @@ android:layout_height="wrap_content" android:paddingStart="@dimen/activity_margin" android:paddingEnd="@dimen/activity_margin" + android:background="@drawable/colored_ripple" android:orientation="vertical" android:layout_weight="3"> @@ -72,6 +73,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="@dimen/activity_margin" + android:background="@drawable/ripple_background" android:paddingEnd="@dimen/activity_margin" android:orientation="vertical" android:layout_weight="3"> From ed2e91f036220af251fcad84b3231b8429630879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 14 Sep 2023 09:53:32 +0200 Subject: [PATCH 41/58] Remove ripple effect from bottom unit when top is tapped --- .../calculator/views/ConverterView.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt index fb6d4674..0ad03136 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt @@ -92,13 +92,13 @@ class ConverterView @JvmOverloads constructor( binding.topUnitHolder.backgroundTintList = ColorStateList.valueOf(context.getProperPrimaryColor().lightenColor().adjustAlpha(LOWER_ALPHA)) binding.swapButton.applyColorFilter(context.getProperPrimaryColor()) - val drawable = ResourcesCompat.getDrawable( - resources, com.simplemobiletools.commons.R.drawable.pill_background, context.theme - )?.constantState?.newDrawable()?.mutate() as RippleDrawable - val bgLayerList = drawable.findDrawableByLayerId(com.simplemobiletools.commons.R.id.button_pill_background_holder) as LayerDrawable - val bgLayer = bgLayerList.findDrawableByLayerId(com.simplemobiletools.commons.R.id.button_pill_background_shape) as GradientDrawable - bgLayer.cornerRadius = context.resources.getDimension(com.simplemobiletools.commons.R.dimen.rounded_corner_radius_big) listOf(binding.topUnitSymbol, binding.bottomUnitSymbol).forEach { + val drawable = ResourcesCompat.getDrawable( + resources, com.simplemobiletools.commons.R.drawable.pill_background, context.theme + )?.constantState?.newDrawable()?.mutate() as RippleDrawable + val bgLayerList = drawable.findDrawableByLayerId(com.simplemobiletools.commons.R.id.button_pill_background_holder) as LayerDrawable + val bgLayer = bgLayerList.findDrawableByLayerId(com.simplemobiletools.commons.R.id.button_pill_background_shape) as GradientDrawable + bgLayer.cornerRadius = context.resources.getDimension(com.simplemobiletools.commons.R.dimen.rounded_corner_radius_big) it.background = drawable it.background?.alpha = MEDIUM_ALPHA_INT } From 7d7697d03338b9816e559f892611e2960448d5c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 14 Sep 2023 10:07:14 +0200 Subject: [PATCH 42/58] Reduce number of length units --- .../helpers/converters/LengthConverter.kt | 63 ------------------- app/src/main/res/values-ar/strings.xml | 9 --- app/src/main/res/values-az/strings.xml | 9 --- app/src/main/res/values-be/strings.xml | 9 --- app/src/main/res/values-bg/strings.xml | 9 --- app/src/main/res/values-bs/strings.xml | 9 --- app/src/main/res/values-ca/strings.xml | 9 --- app/src/main/res/values-cs/strings.xml | 9 --- app/src/main/res/values-cy/strings.xml | 9 --- app/src/main/res/values-da/strings.xml | 9 --- app/src/main/res/values-de/strings.xml | 9 --- app/src/main/res/values-el/strings.xml | 9 --- app/src/main/res/values-eo/strings.xml | 9 --- app/src/main/res/values-es/strings.xml | 9 --- app/src/main/res/values-et/strings.xml | 9 --- app/src/main/res/values-fi/strings.xml | 9 --- app/src/main/res/values-fil/strings.xml | 9 --- app/src/main/res/values-fr/strings.xml | 9 --- app/src/main/res/values-gl/strings.xml | 9 --- app/src/main/res/values-hi/strings.xml | 9 --- app/src/main/res/values-hr/strings.xml | 9 --- app/src/main/res/values-hu/strings.xml | 9 --- app/src/main/res/values-in/strings.xml | 9 --- app/src/main/res/values-is/strings.xml | 9 --- app/src/main/res/values-it/strings.xml | 9 --- app/src/main/res/values-iw/strings.xml | 9 --- app/src/main/res/values-ja/strings.xml | 9 --- app/src/main/res/values-kn/strings.xml | 9 --- app/src/main/res/values-ko/strings.xml | 9 --- app/src/main/res/values-kr/strings.xml | 9 --- app/src/main/res/values-lt/strings.xml | 9 --- app/src/main/res/values-lv/strings.xml | 9 --- app/src/main/res/values-mk/strings.xml | 9 --- app/src/main/res/values-ml/strings.xml | 9 --- app/src/main/res/values-ms/strings.xml | 9 --- app/src/main/res/values-nl/strings.xml | 9 --- app/src/main/res/values-no-rNO/strings.xml | 9 --- app/src/main/res/values-pa-rPK/strings.xml | 9 --- app/src/main/res/values-pl/strings.xml | 9 --- app/src/main/res/values-pt-rBR/strings.xml | 9 --- app/src/main/res/values-pt/strings.xml | 9 --- app/src/main/res/values-ro/strings.xml | 9 --- app/src/main/res/values-ru/strings.xml | 9 --- app/src/main/res/values-sk/strings.xml | 9 --- app/src/main/res/values-sl/strings.xml | 9 --- app/src/main/res/values-sr/strings.xml | 9 --- app/src/main/res/values-sv/strings.xml | 9 --- app/src/main/res/values-ta/strings.xml | 9 --- app/src/main/res/values-te/strings.xml | 9 --- app/src/main/res/values-th/strings.xml | 9 --- app/src/main/res/values-tr/strings.xml | 9 --- app/src/main/res/values-uk/strings.xml | 9 --- app/src/main/res/values-zgh/strings.xml | 9 --- app/src/main/res/values-zh-rCN/strings.xml | 9 --- app/src/main/res/values-zh-rTW/strings.xml | 9 --- app/src/main/res/values/donottranslate.xml | 9 --- app/src/main/res/values/strings.xml | 9 --- 57 files changed, 567 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt index c01acb73..3df75b2e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/LengthConverter.kt @@ -13,30 +13,12 @@ object LengthConverter : Converter { factor = 1000.0 ) - data object Hectometer : Unit( - nameResId = R.string.unit_length_hectometer, - symbolResId = R.string.unit_length_hectometer_symbol, - factor = 100.0 - ) - - data object Decameter : Unit( - nameResId = R.string.unit_length_decameter, - symbolResId = R.string.unit_length_decameter_symbol, - factor = 10.0 - ) - data object Meter : Unit( nameResId = R.string.unit_length_meter, symbolResId = R.string.unit_length_meter_symbol, factor = 1.0 ) - data object Decimeter : Unit( - nameResId = R.string.unit_length_decimeter, - symbolResId = R.string.unit_length_decimeter_symbol, - factor = 0.1 - ) - data object Centimeter : Unit( nameResId = R.string.unit_length_centimeter, symbolResId = R.string.unit_length_centimeter_symbol, @@ -61,12 +43,6 @@ object LengthConverter : Converter { factor = 0.000000001 ) - data object Picometer : Unit( - nameResId = R.string.unit_length_picometer, - symbolResId = R.string.unit_length_picometer_symbol, - factor = 0.000000000001 - ) - data object Angstrom : Unit( nameResId = R.string.unit_length_angstrom, symbolResId = R.string.unit_length_angstrom_symbol, @@ -79,12 +55,6 @@ object LengthConverter : Converter { factor = 1_609.344 ) - data object Chain : Unit( - nameResId = R.string.unit_length_chain, - symbolResId = R.string.unit_length_chain_symbol, - factor = 20.1168 - ) - data object Yard : Unit( nameResId = R.string.unit_length_yard, symbolResId = R.string.unit_length_yard_symbol, @@ -97,12 +67,6 @@ object LengthConverter : Converter { factor = 0.3048 ) - data object Mil : Unit( - nameResId = R.string.unit_length_mil, - symbolResId = R.string.unit_length_mil_symbol, - factor = 0.0000254 - ) - data object Inch : Unit( nameResId = R.string.unit_length_inch, symbolResId = R.string.unit_length_inch_symbol, @@ -115,30 +79,12 @@ object LengthConverter : Converter { factor = 1.852 ) - data object Cable : Unit( - nameResId = R.string.unit_length_cable, - symbolResId = R.string.unit_length_cable_symbol, - factor = 185.2 - ) - data object NauticalMile : Unit( nameResId = R.string.unit_length_nautical_mile, symbolResId = R.string.unit_length_nautical_mile_symbol, factor = 1_852.0 ) - data object Link : Unit( - nameResId = R.string.unit_length_link, - symbolResId = R.string.unit_length_link_symbol, - factor = 0.201168 - ) - - data object Rod : Unit( - nameResId = R.string.unit_length_rod, - symbolResId = R.string.unit_length_rod_symbol, - factor = 5.0292 - ) - data object AstronomicalUnit : Unit( nameResId = R.string.unit_length_astronomical_unit, symbolResId = R.string.unit_length_astronomical_unit_symbol, @@ -160,27 +106,18 @@ object LengthConverter : Converter { override val units: List = listOf( Unit.Kilometer, - Unit.Hectometer, - Unit.Decameter, Unit.Meter, - Unit.Decimeter, Unit.Centimeter, Unit.Millimeter, Unit.Micrometer, Unit.Nanometer, - Unit.Picometer, Unit.Angstrom, Unit.Mile, - Unit.Chain, Unit.Yard, Unit.Foot, - Unit.Mil, Unit.Inch, Unit.Fathom, - Unit.Cable, Unit.NauticalMile, - Unit.Link, - Unit.Rod, Unit.AstronomicalUnit, Unit.Parsec, Unit.LightYear diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 04cb2c76..fe1997e3 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 5a939efd..dbdc5b56 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -19,27 +19,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 832dc2c8..34d06e21 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 602440cc..1fe82fe4 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml index 95b2b66a..08d90490 100644 --- a/app/src/main/res/values-bs/strings.xml +++ b/app/src/main/res/values-bs/strings.xml @@ -17,27 +17,18 @@ Dužina Kilometar - Hectometar - Decametar Metar - Decimetar Centimetar Milimetar Mikrometar Nanometar - Pikometar Angstrom Milja - Lanac Jard Stopa - Mil Palac Fathom - Cable Nautička milja - Link - Šipka Astronomska jedinica Parsek Svjetlosna godina diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 0bb361b4..2fae8a3b 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index a9c9a029..769cb73a 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index f3821dc2..3300628a 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 31d8c98b..c75848c8 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 284fd7e0..ef9dea67 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index c63143fe..f00ed007 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -19,27 +19,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 0957cbf8..8761d56f 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e5415653..419e2374 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 22e71364..b97fafc7 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index be34b302..51656854 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index a75888bc..d5722fc9 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -14,27 +14,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 667c14ab..51c33a98 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index f9d39085..28a5156f 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index f53e4662..1f0d53ef 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -14,27 +14,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 443298fc..0454964b 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -17,27 +17,18 @@ Duljina Kilometar - Hectometar - Decametar Metar - Decimetar Centimetar Milimetar Mikrometar Nanometar - Pikometar Angstrom Milja - Lanac Jard Stopa - Mil Palac Fathom - Cable Nautička milja - Link - Šipka Astronomska jedinica Parsek Svjetlosna godina diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 9dae20c8..66176006 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index b0231ebd..20386925 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 8dae05f5..cafcb542 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7df97aa8..48a255d6 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index f7be75e4..5077ade9 100755 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index f31570c6..94e899f7 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml index fecea3bb..46fea829 100644 --- a/app/src/main/res/values-kn/strings.xml +++ b/app/src/main/res/values-kn/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 89a8d044..2ceec495 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-kr/strings.xml b/app/src/main/res/values-kr/strings.xml index dc4aebe7..28914db3 100644 --- a/app/src/main/res/values-kr/strings.xml +++ b/app/src/main/res/values-kr/strings.xml @@ -19,27 +19,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index f0a8c300..b5b86fe1 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index a45360ab..bd6ff5ae 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index be3f0e01..13350f43 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 6d220415..0856a09f 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 0af8f630..68d2eb35 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -19,27 +19,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 5dba04ca..de5478e7 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index 2503996d..63cd51ee 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml index 292d81eb..65402dff 100644 --- a/app/src/main/res/values-pa-rPK/strings.xml +++ b/app/src/main/res/values-pa-rPK/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index eaf1df70..b6a7d742 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 34b291e6..b0331981 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 5cb52940..998c14e3 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index bc770853..481a2d23 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index aa69f989..fb46ab63 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 85fd0105..014df070 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index b17276e6..ca552d2e 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -14,27 +14,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 267fdc2e..5204c306 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -17,27 +17,18 @@ Дужина Километар - Хектометар - Декаметар Метар - Дециметар Центиметар Милиметар Микрометар Нанометар - Пикометар Ангстром Миља - Ланац Јард Стопа - Мил Палац Фатом - Кабал Наутичка миља - Карика - Шипка Астрономска јединица Парсек Светлосна година diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 24e0229d..dec67291 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 6433eba7..7c472dac 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml index 7f0fee9f..3f2d6e77 100644 --- a/app/src/main/res/values-te/strings.xml +++ b/app/src/main/res/values-te/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 0e2eba18..b8ac063a 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -20,27 +20,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 7b815b22..f1790183 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 726c9bd0..a3240cd8 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml index fab5f12f..9c82a821 100644 --- a/app/src/main/res/values-zgh/strings.xml +++ b/app/src/main/res/values-zgh/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index a9b39a37..913b8379 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index edef0ba7..9c21fd19 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -17,27 +17,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 0ad011c6..3f5a93da 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -4,27 +4,18 @@ %s (%s) km - hm - dam m - dm cm mm μm nm - pm Å mi - ch yd ft - mil in fathom - cable NM - lnk - rd au pc ly diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4c0212db..fe21168f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -21,27 +21,18 @@ Length Kilometer - Hectometer - Decameter Meter - Decimeter Centimeter Millimeter Micrometer Nanometer - Picometer Angstrom Mile - Chain Yard Foot - Mil Inch Fathom - Cable Nautical Mile - Link - Rod Astronomical Unit Parsec Light Year From 2c2ad8c81e65045d07ef1a7bbf32a804a9fe1425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 14 Sep 2023 10:09:28 +0200 Subject: [PATCH 43/58] Reduce number of area units --- .../helpers/converters/AreaConverter.kt | 28 ------------------- app/src/main/res/values-ar/strings.xml | 4 --- app/src/main/res/values-az/strings.xml | 4 --- app/src/main/res/values-be/strings.xml | 4 --- app/src/main/res/values-bg/strings.xml | 4 --- app/src/main/res/values-bs/strings.xml | 4 --- app/src/main/res/values-ca/strings.xml | 4 --- app/src/main/res/values-cs/strings.xml | 4 --- app/src/main/res/values-cy/strings.xml | 4 --- app/src/main/res/values-da/strings.xml | 4 --- app/src/main/res/values-de/strings.xml | 4 --- app/src/main/res/values-el/strings.xml | 4 --- app/src/main/res/values-eo/strings.xml | 4 --- app/src/main/res/values-es/strings.xml | 4 --- app/src/main/res/values-et/strings.xml | 4 --- app/src/main/res/values-fi/strings.xml | 4 --- app/src/main/res/values-fil/strings.xml | 4 --- app/src/main/res/values-fr/strings.xml | 4 --- app/src/main/res/values-gl/strings.xml | 4 --- app/src/main/res/values-hi/strings.xml | 4 --- app/src/main/res/values-hr/strings.xml | 4 --- app/src/main/res/values-hu/strings.xml | 4 --- app/src/main/res/values-in/strings.xml | 4 --- app/src/main/res/values-is/strings.xml | 4 --- app/src/main/res/values-it/strings.xml | 4 --- app/src/main/res/values-iw/strings.xml | 4 --- app/src/main/res/values-ja/strings.xml | 4 --- app/src/main/res/values-kn/strings.xml | 4 --- app/src/main/res/values-ko/strings.xml | 4 --- app/src/main/res/values-kr/strings.xml | 4 --- app/src/main/res/values-lt/strings.xml | 4 --- app/src/main/res/values-lv/strings.xml | 4 --- app/src/main/res/values-mk/strings.xml | 4 --- app/src/main/res/values-ml/strings.xml | 4 --- app/src/main/res/values-ms/strings.xml | 4 --- app/src/main/res/values-nl/strings.xml | 4 --- app/src/main/res/values-no-rNO/strings.xml | 4 --- app/src/main/res/values-pa-rPK/strings.xml | 4 --- app/src/main/res/values-pl/strings.xml | 4 --- app/src/main/res/values-pt-rBR/strings.xml | 4 --- app/src/main/res/values-pt/strings.xml | 4 --- app/src/main/res/values-ro/strings.xml | 4 --- app/src/main/res/values-ru/strings.xml | 4 --- app/src/main/res/values-sk/strings.xml | 4 --- app/src/main/res/values-sl/strings.xml | 4 --- app/src/main/res/values-sr/strings.xml | 4 --- app/src/main/res/values-sv/strings.xml | 4 --- app/src/main/res/values-ta/strings.xml | 4 --- app/src/main/res/values-te/strings.xml | 4 --- app/src/main/res/values-th/strings.xml | 4 --- app/src/main/res/values-tr/strings.xml | 4 --- app/src/main/res/values-uk/strings.xml | 4 --- app/src/main/res/values-zgh/strings.xml | 4 --- app/src/main/res/values-zh-rCN/strings.xml | 4 --- app/src/main/res/values-zh-rTW/strings.xml | 4 --- app/src/main/res/values/donottranslate.xml | 4 --- app/src/main/res/values/strings.xml | 4 --- 57 files changed, 252 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt index 7f001109..da196fe1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/AreaConverter.kt @@ -55,36 +55,12 @@ object AreaConverter : Converter { factor = 0.00064516 ) - data object SquareMil : Unit( - nameResId = R.string.unit_area_square_mil, - symbolResId = R.string.unit_area_square_mil_symbol, - factor = 0.00000000064516 - ) - - data object SquareRod : Unit( - nameResId = R.string.unit_area_square_rod, - symbolResId = R.string.unit_area_square_rod_symbol, - factor = 25.29285264 - ) - data object Acre : Unit( nameResId = R.string.unit_area_acre, symbolResId = R.string.unit_area_acre_symbol, factor = 4_046.8564224 ) - data object Are : Unit( - nameResId = R.string.unit_area_are, - symbolResId = R.string.unit_area_are_symbol, - factor = 100.0 - ) - - data object Dunam : Unit( - nameResId = R.string.unit_area_dunam, - symbolResId = R.string.unit_area_dunam_symbol, - factor = 1000.0 - ) - data object Hectare : Unit( nameResId = R.string.unit_area_hectare, symbolResId = R.string.unit_area_hectare_symbol, @@ -101,11 +77,7 @@ object AreaConverter : Converter { Unit.SquareYard, Unit.SquareFoot, Unit.SquareInch, - Unit.SquareMil, - Unit.SquareRod, Unit.Acre, - Unit.Are, - Unit.Dunam, Unit.Hectare, ) override val defaultTopUnit: Unit = Unit.SquareKilometer diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index fe1997e3..16ddb18f 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index dbdc5b56..6598cd5b 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -42,12 +42,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 34d06e21..45f91788 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 1fe82fe4..c377d66e 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml index 08d90490..d7cc1b48 100644 --- a/app/src/main/res/values-bs/strings.xml +++ b/app/src/main/res/values-bs/strings.xml @@ -40,12 +40,8 @@ Kvadratna milja Kvadratni jard Kvadratna stopa - Kvadratni Mil Kvadratni palac - Kvadratni Rod Aker - Ar - Dunam Hektar Zapremina Kubni metar diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 2fae8a3b..9c4d4123 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 769cb73a..2274d2e7 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 3300628a..db6710c1 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index c75848c8..532127c2 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ef9dea67..5420bee0 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index f00ed007..6af45b1e 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -42,12 +42,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 8761d56f..615d223b 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 419e2374..366f0b21 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index b97fafc7..7295683d 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 51656854..c73b6d58 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index d5722fc9..beb11b20 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -37,12 +37,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 51c33a98..4cd51d0f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 28a5156f..f3d53d57 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 1f0d53ef..3c1156a2 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -37,12 +37,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 0454964b..34240ee6 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -40,12 +40,8 @@ Četvorna milja Četvorni jard Četvorna stopa - Četvorni Mil Četvorni palac - Četvorni Rod Aker - Ar - Dunam Hektar Obujam Kubični metar diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 66176006..d8f2454a 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 20386925..019679ba 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index cafcb542..4fed6b70 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 48a255d6..7ae02903 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 5077ade9..231aea90 100755 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 94e899f7..cfcf236b 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml index 46fea829..54c0d5e4 100644 --- a/app/src/main/res/values-kn/strings.xml +++ b/app/src/main/res/values-kn/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 2ceec495..28438051 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-kr/strings.xml b/app/src/main/res/values-kr/strings.xml index 28914db3..732ce2c9 100644 --- a/app/src/main/res/values-kr/strings.xml +++ b/app/src/main/res/values-kr/strings.xml @@ -42,12 +42,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index b5b86fe1..87b6ce3f 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index bd6ff5ae..c9b57401 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 13350f43..5d49699e 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 0856a09f..1f56c63a 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 68d2eb35..4501bd93 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -42,12 +42,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index de5478e7..50bd7eeb 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index 63cd51ee..d5abf933 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml index 65402dff..bf0a13ce 100644 --- a/app/src/main/res/values-pa-rPK/strings.xml +++ b/app/src/main/res/values-pa-rPK/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index b6a7d742..7d1f3197 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index b0331981..5781fb58 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 998c14e3..d38edbae 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 481a2d23..67c38b11 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index fb46ab63..c31de06c 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 014df070..80bab305 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index ca552d2e..472d6bef 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -37,12 +37,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 5204c306..6248c256 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -40,12 +40,8 @@ Квадратна милја Квадратни јард Квадратна стопа - Квадратни мил Квадратни палац - Квадратна шипка Акер - Ар - Дунам Хектар Запремина Кубни метар diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index dec67291..f71ae94f 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 7c472dac..3a3bf15c 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml index 3f2d6e77..f1c41086 100644 --- a/app/src/main/res/values-te/strings.xml +++ b/app/src/main/res/values-te/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index b8ac063a..9ca40975 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -43,12 +43,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index f1790183..f079c1ba 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index a3240cd8..cd1ce05e 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml index 9c82a821..da409b1a 100644 --- a/app/src/main/res/values-zgh/strings.xml +++ b/app/src/main/res/values-zgh/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 913b8379..c5e58b6b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 9c21fd19..6a9dd0dd 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -40,12 +40,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 3f5a93da..e938ae14 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -26,12 +26,8 @@ sq mi sq yd sq ft - sq mil sq in - sq rd ac - a - dunam ha m³ dm³ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fe21168f..5d416926 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -44,12 +44,8 @@ Square Mile Square Yard Square Foot - Square Mil Square Inch - Square Rod Acre - Are - Dunam Hectare Volume Cubic Meter From cb63ddf7e8def86046d61e92dccda3410d10fdf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 14 Sep 2023 10:17:02 +0200 Subject: [PATCH 44/58] Reduce number of time units --- .../helpers/converters/TimeConverter.kt | 116 +----------------- app/src/main/res/values-ar/strings.xml | 18 +-- app/src/main/res/values-az/strings.xml | 18 +-- app/src/main/res/values-be/strings.xml | 18 +-- app/src/main/res/values-bg/strings.xml | 18 +-- app/src/main/res/values-bs/strings.xml | 16 --- app/src/main/res/values-ca/strings.xml | 18 +-- app/src/main/res/values-cs/strings.xml | 18 +-- app/src/main/res/values-cy/strings.xml | 18 +-- app/src/main/res/values-da/strings.xml | 18 +-- app/src/main/res/values-de/strings.xml | 18 +-- app/src/main/res/values-el/strings.xml | 18 +-- app/src/main/res/values-eo/strings.xml | 18 +-- app/src/main/res/values-es/strings.xml | 18 +-- app/src/main/res/values-et/strings.xml | 18 +-- app/src/main/res/values-fi/strings.xml | 18 +-- app/src/main/res/values-fil/strings.xml | 18 +-- app/src/main/res/values-fr/strings.xml | 18 +-- app/src/main/res/values-gl/strings.xml | 18 +-- app/src/main/res/values-hi/strings.xml | 18 +-- app/src/main/res/values-hr/strings.xml | 16 --- app/src/main/res/values-hu/strings.xml | 18 +-- app/src/main/res/values-in/strings.xml | 18 +-- app/src/main/res/values-is/strings.xml | 18 +-- app/src/main/res/values-it/strings.xml | 18 +-- app/src/main/res/values-iw/strings.xml | 18 +-- app/src/main/res/values-ja/strings.xml | 18 +-- app/src/main/res/values-kn/strings.xml | 18 +-- app/src/main/res/values-ko/strings.xml | 18 +-- app/src/main/res/values-kr/strings.xml | 18 +-- app/src/main/res/values-lt/strings.xml | 18 +-- app/src/main/res/values-lv/strings.xml | 18 +-- app/src/main/res/values-mk/strings.xml | 18 +-- app/src/main/res/values-ml/strings.xml | 18 +-- app/src/main/res/values-ms/strings.xml | 18 +-- app/src/main/res/values-nl/strings.xml | 18 +-- app/src/main/res/values-no-rNO/strings.xml | 18 +-- app/src/main/res/values-pa-rPK/strings.xml | 18 +-- app/src/main/res/values-pl/strings.xml | 18 +-- app/src/main/res/values-pt-rBR/strings.xml | 18 +-- app/src/main/res/values-pt/strings.xml | 18 +-- app/src/main/res/values-ro/strings.xml | 18 +-- app/src/main/res/values-ru/strings.xml | 18 +-- app/src/main/res/values-sk/strings.xml | 18 +-- app/src/main/res/values-sl/strings.xml | 18 +-- app/src/main/res/values-sr/strings.xml | 16 --- app/src/main/res/values-sv/strings.xml | 18 +-- app/src/main/res/values-ta/strings.xml | 18 +-- app/src/main/res/values-te/strings.xml | 18 +-- app/src/main/res/values-th/strings.xml | 18 +-- app/src/main/res/values-tr/strings.xml | 18 +-- app/src/main/res/values-uk/strings.xml | 18 +-- app/src/main/res/values-zgh/strings.xml | 18 +-- app/src/main/res/values-zh-rCN/strings.xml | 18 +-- app/src/main/res/values-zh-rTW/strings.xml | 18 +-- app/src/main/res/values/donottranslate.xml | 16 --- app/src/main/res/values/strings.xml | 18 +-- 57 files changed, 54 insertions(+), 1062 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt index fd240bad..0d4f26a7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt @@ -38,24 +38,6 @@ object TimeConverter : Converter { factor = 0.001 ) - data object Microsecond : Unit( - nameResId = R.string.unit_time_microsecond, - symbolResId = R.string.unit_time_microsecond_symbol, - factor = 0.000001 - ) - - data object Nanosecond : Unit( - nameResId = R.string.unit_time_nanosecond, - symbolResId = R.string.unit_time_nanosecond_symbol, - factor = 0.000000001 - ) - - data object Picosecond : Unit( - nameResId = R.string.unit_time_picosecond, - symbolResId = R.string.unit_time_picosecond_symbol, - factor = 0.000000000001 - ) - data object Day : Unit( nameResId = R.string.unit_time_day, symbolResId = R.string.unit_time_day_symbol, @@ -68,89 +50,11 @@ object TimeConverter : Converter { factor = DAY * 7 ) - data object MonthFull : Unit( - nameResId = R.string.unit_time_month_full, - symbolResId = R.string.unit_time_month_full_symbol, - factor = DAY * 30 - ) - - data object MonthHollow : Unit( - nameResId = R.string.unit_time_month_hollow, - symbolResId = R.string.unit_time_month_hollow_symbol, - factor = DAY * 29 - ) - - data object MonthSynodic : Unit( - nameResId = R.string.unit_time_month_synodic, - symbolResId = R.string.unit_time_month_synodic_symbol, - factor = DAY * 29.530589 - ) - - data object MonthGregorianAverage : Unit( - nameResId = R.string.unit_time_month_gregorian_average, - symbolResId = R.string.unit_time_month_gregorian_average_symbol, - factor = DAY * 30.346875 - ) - - data object YearLeap : Unit( - nameResId = R.string.unit_time_year_leap, - symbolResId = R.string.unit_time_year_leap_symbol, - factor = DAY * 366 - ) - - data object YearGregorian : Unit( + data object Year : Unit( nameResId = R.string.unit_time_year_gregorian, symbolResId = R.string.unit_time_year_gregorian_symbol, factor = GREGORIAN_YEAR ) - - data object YearJulian : Unit( - nameResId = R.string.unit_time_year_julian, - symbolResId = R.string.unit_time_year_julian_symbol, - factor = DAY * 365.25 - ) - - data object Jiffy : Unit( - nameResId = R.string.unit_time_jiffy, - symbolResId = R.string.unit_time_jiffy_symbol, - factor = 1 / 60.0 - ) - - data object Moment : Unit( - nameResId = R.string.unit_time_moment, - symbolResId = R.string.unit_time_moment_symbol, - factor = 90.0 - ) - - data object Fortnight : Unit( - nameResId = R.string.unit_time_fortnight, - symbolResId = R.string.unit_time_fortnight_symbol, - factor = DAY * 7 * 2 - ) - - data object Decade : Unit( - nameResId = R.string.unit_time_decade, - symbolResId = R.string.unit_time_decade_symbol, - factor = GREGORIAN_YEAR * 10 - ) - - data object Century : Unit( - nameResId = R.string.unit_time_century, - symbolResId = R.string.unit_time_century_symbol, - factor = GREGORIAN_YEAR * 100 - ) - - data object Millennium : Unit( - nameResId = R.string.unit_time_millennium, - symbolResId = R.string.unit_time_millennium_symbol, - factor = GREGORIAN_YEAR * 1000 - ) - - data object AtomicUnit : Unit( - nameResId = R.string.unit_time_atomic_unit, - symbolResId = R.string.unit_time_atomic_unit_symbol, - factor = 0.00000000000000002418884254 - ) } override val units: List = listOf( @@ -158,25 +62,9 @@ object TimeConverter : Converter { Unit.Minute, Unit.Second, Unit.Millisecond, - Unit.Microsecond, - Unit.Nanosecond, - Unit.Picosecond, Unit.Day, Unit.Week, - Unit.MonthFull, - Unit.MonthHollow, - Unit.MonthSynodic, - Unit.MonthGregorianAverage, - Unit.YearLeap, - Unit.YearGregorian, - Unit.YearJulian, - Unit.Jiffy, - Unit.Moment, - Unit.Fortnight, - Unit.Decade, - Unit.Century, - Unit.Millennium, - Unit.AtomicUnit + Unit.Year, ) override val defaultTopUnit: Unit = Unit.Hour diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 16ddb18f..d4bf0ed5 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit كيف يعمل الزر C (مسح)؟ النقر على ذلك سوف يزيل حرف واحد في وقت واحد. الضغط لفترة طويلة سوف إعادة تعيين جميع الحقول في وقت واحد. diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 6598cd5b..fff1bb2b 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -106,26 +106,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit C (Sil) düyməsi necə işləyir? diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 45f91788..cf88a2a8 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Як працуе кнопка C (Ачыстка)\? Крананне да яе выдаляе адзін сімвал. Доўгае націсканне на яе ачышчае адразу ўсе палі. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index c377d66e..0cf7deb8 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Как работи бутонът C (Clear)\? Натискането му ще премахва по един символ. Дълго натискане ще изчисти наведнъж всички полета. diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml index d7cc1b48..6ca1bfdb 100644 --- a/app/src/main/res/values-bs/strings.xml +++ b/app/src/main/res/values-bs/strings.xml @@ -105,25 +105,9 @@ Minuta Sekunda Milisekunda - Mikrosekunda - Nanosekunda - Pikosekunda Dan Sedmica - Mjesec (puni) - Mjesec (kratki) - Mjesec (sinodički) - Mjesec (Gregorijanski prosječni) - Godina (prijestupna) Godina (Gregorijanska) - Godina (Julijanska) - Jiffy - Moment - Četrnaest dana - Decenija - Stoljeće - Milenij - Atomska jedinica Kako funkcionira gumb C (Izbriši)\? Dodirom gumba uklanjaju se znakovi jedan po jedan. Dugim pritiskom gumba brišu se svi znakovi. diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 9c4d4123..91525b68 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Com funciona el botó C (Esborra)\? En tocar-lo, s\'eliminarà un caràcter a la vegada. Si el premeu prolongadament, es reiniciaran tots els camps de cop. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 2274d2e7..d38da35e 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Jak funguje tlačítko C? Stisknutím odmažete jeden znak. Dlouhým podržením smažete naráz všechna pole. diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index db6710c1..8e19d5e7 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Sut mae\'r botwm C (clirio) yn gweithio? Mae ei dapio yn tynnu un rhif ar y tro. Mae ei dal yn ailosod pob maes gyda\'i gilydd ar unwaith. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 532127c2..4677fd96 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Hvordan virker knappen C (Slet)\? Hvis du trykker på det, fjernes et tegn ad gangen. Langt tryk vil nulstille alle felter på én gang. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 5420bee0..32bb1431 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Wie funktioniert die C-Taste (Löschen)\? Bei einmaliger Berührung wird ein Zeichen entfernt. Bei langer Berührung werden alle Felder zurück gesetzt. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 6af45b1e..49f57e6b 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -106,26 +106,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Πώς λειτουργεί το κουμπί C (Καθαρισμός); diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 615d223b..b9940baa 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Kiel funkcias la butono C («Forviŝi»)\? Frapetado sur ĝi forviŝos signojn po unu por frapeto. Longa premado forviŝos ĉiujn kampojn samtempe. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 366f0b21..5110c6ca 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit ¿Cómo funciona el botón C (Borrar)\? Presionándolo una vez eliminará un solo carácter. Mantenerlo presionado reiniciará todos los campos. diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 7295683d..225dfd3d 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Kuidas C (Clear) nupp toimib\? Üks klõpsatus kustutab ühe numbri. Pikk vajutus eemaldab kogu sisestuse. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index c73b6d58..61aa67b0 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Miten C (Tyhjennä) -painike toimii\? Sen napautus poistaa yhden merkin kerrallaan ja pitkä painallus tyhjentää kaikki kentät. diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index beb11b20..bc0d0ea7 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -101,26 +101,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Paano gumagana ang C (Clear) button\? Matatanggal ng isang karakter kapag pinindot ito nang isang beses. Ire-reset naman ang lahat ng mga field kapag mahabang pinindot ito. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 4cd51d0f..111ada67 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Comment fonctionne le bouton C (Effacer) \? En tapotant dessus, vous retirerez un caractère à la fois. Une pression prolongée sur le bouton réinitialisera tous les champs à la fois. diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index f3d53d57..8f1f34b8 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Como funciona o botón C (Borrar)? O premer, eliminarase un carácter á vez. O premer de forma continua, restableceranse todos os campos á vez. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 3c1156a2..e9f86b1c 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -101,26 +101,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit सी (क्लियर) बटन कैसे काम करता है\? इस पर टैप करने से एक बार में एक कैरेक्टर हट जाएगा। लंबे समय तक इसे दबाने से एक ही बार में सभी फ़ील्ड रीसेट हो जाएंगे। diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 34240ee6..b5cc83d0 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -105,25 +105,9 @@ Minuta Sekunda Milisekunda - Mikrosekunda - Nanosekunda - Pikosekunda Dan Tjedan - Mjesec (puni) - Mjesec (kratki) - Mjesec (sinodički) - Mjesec (Gregorijanski prosječni) - Godina (prijestupna) Godina (Gregorijanska) - Godina (Julijanska) - Jiffy - Moment - Četrnaest dana - Desetljeće - Stoljeće - Tisućljeće - Atomska jedinica Kako funkcionira gumb C (Izbriši)\? Dodirom gumba uklanjaju se znakovi jedan po jedan. Dugim pritiskom gumba obnavljaju se sva polja. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index d8f2454a..9ded97ac 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Hogyan működik a C (törlés) gomb\? A koppintás egyszerre egy karaktert töröl. A hosszú lenyomás egyszerre állítja vissza az összes mezőt. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 019679ba..cf4d06bf 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Bagaimana tombol C (Clear) bekerja? Menyentuhnya sekali akan menghapus satu karakter. Menyentuhnya lama akan mengosongkan seluruh ruas sekaligus. diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 4fed6b70..a9561473 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Hvernig virkar C (Hreinsa) hnappurinn\? Með því að pikka á hann verður einn stafur fjarlægður í einu. Haltu inni til þess að endurstilla alla reiti í einu. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 7ae02903..40f4e946 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Come funziona il tasto C (Cancella)? Premendo il tasto una volta verrà eliminato un singolo carattere; tenendolo premuto invece eliminerà tutta la stringa. diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 231aea90..c24c8870 100755 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit כיצד פועל לחצן C (ניקוי)\? הקשה עליו תסיר תו אחד בכל פעם. לחיצה ארוכה עליו תאפס את כל השדות בבת אחת. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index cfcf236b..761b9763 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit C (クリア) ボタンはどのように機能しますか？ ボタンをタップするたびに1文字ずつ削除されます。ボタンを長押しするとすべてのフィールドがリセットされます。 diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml index 54c0d5e4..bfc07171 100644 --- a/app/src/main/res/values-kn/strings.xml +++ b/app/src/main/res/values-kn/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit ಸಿ (ತೆರವುಗೊಳಿಸಿ) ಬಟನ್ ಹೇಗೆ ಕೆಲಸ ಮಾಡುತ್ತದೆ\? ಅದರ ಮೇಲೆ ಟ್ಯಾಪ್ ಮಾಡುವುದರಿಂದ ಒಂದು ಸಮಯದಲ್ಲಿ ಒಂದು ಅಕ್ಷರವನ್ನು ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ. ದೀರ್ಘವಾಗಿ ಒತ್ತಿದರೆ ಎಲ್ಲಾ ಕ್ಷೇತ್ರಗಳನ್ನು ಒಂದೇ ಬಾರಿಗೆ ಮರುಹೊಂದಿಸುತ್ತದೆ. diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 28438051..9a71d15a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit C(지우기) 버튼은 어떻게 작동합니까\? 누르면 한 번에 한 문자씩 제거됩니다. 길게 누르면 모든 필드가 한 번에 재설정됩니다. diff --git a/app/src/main/res/values-kr/strings.xml b/app/src/main/res/values-kr/strings.xml index 732ce2c9..df57b690 100644 --- a/app/src/main/res/values-kr/strings.xml +++ b/app/src/main/res/values-kr/strings.xml @@ -106,26 +106,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit C (Clear) 버튼을 어떻게 사용합니까? diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 87b6ce3f..a5fe4c16 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Kaip veikia C (Išvalymo) mygtukas\? Kiekvieną kartą ant jo bakstelėjus, bus šalinama po vieną simbolį. Ilgai jį palaikius, bus iš karto atstatyti visi laukai. diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index c9b57401..93fdd38a 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Kā darbojas poga C (Notīrīt)\? Pieskarieties tai, lai noņemtu vienu rakstzīmi vienlaikus. Ilgstoši nospiežot to, tiks atiestatīti visi lauki vienlaicīgi. diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 5d49699e..f5c38d99 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Како функционира копчето C (Clear) \? Прислушкувањето на него ќе отстрани еден лик во исто време. Долгото притискање ќе ги ресетира сите полиња одеднаш. diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 1f56c63a..614b7566 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit C(ക്ലിയർ ) ബട്ടൺ പ്രവർത്തിക്കുന്നത് എങ്ങനെ\? ടാപ്പ് ചെയ്യുമ്പോൾ ഒരു സമയം ഒരു പ്രതീകത്തെ നീക്കംചെയ്യും. ദീർഘനേരം അമർത്തിയാൽ എല്ലാ ഫീൽഡുകളും പുനഃസജ്ജമാക്കും. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 4501bd93..4089cf18 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -106,26 +106,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Bagaimana Butang C (Menghapus) Digunakan？ diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 50bd7eeb..7cfc0f9a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Hoe werkt de knop C (Clear)\? Kort indrukken verwijdert één karakter per keer. Lang drukken wist direct alle velden. diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index d5abf933..4fa1b5a7 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Hvordan fungerer C (Clear)-knappen\? Å trykke på den fjerner ett tegn av gangen. Lang-trykk tilbakestiller alle felter. How does the C (Clear) button work\? Tapping on it will remove one character at a time. Long pressing it will reset all fields at once. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 7d1f3197..5f21cf1f 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Jak działa przycisk C (Wyczyść)? Naciśnięcie go usunie jeden znak naraz. Długie naciśnięcie zresetuje wszystkie pola jednocześnie. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 5781fb58..e7ca22a0 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Como funciona o botão C (Clear)\? Um toque remove um caractere de cada vez. Um toque longo redefine todos os campos de uma vez. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d38edbae..4ee75f90 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Como funciona o botão C (limpar)\? Ao tocar uma vez, os caracteres serão apagados um a um. Um toque longo apaga todos os caracteres ao mesmo tempo. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 67c38b11..a0beac5f 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Cum funcționează butonul Ș (Șterge)\? Apăsând pe el, veți elimina câte un caracter pe rând. Apăsarea lungă va reseta toate câmpurile deodată. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c31de06c..4498e551 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Как работает кнопка C (Очистка)\? Нажатие на неё удалит один символ. Долгое нажатие сбросит все поля сразу. diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 80bab305..818720bf 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Ako funguje tlačidlo C? Jedným stlačením viete vymazať 1 znak. Dlhé podržanie vymaže všetky polia naraz. diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 472d6bef..e2b797d4 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -101,26 +101,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Kako deluje gumb C (Clear)\? Če ga stisnete, odstranite po en lik naenkrat. Z dolgim pritiskom nanj boste odstranili vsa polja naenkrat. diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 6248c256..417eb194 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -105,25 +105,9 @@ Минута Секунда Милисекунда - Микросекунда - Наносекунда - Пикосекунда Дан Седмица - Месец (Пуни) - Месец (кратки) - Месец (Синодички) - Месец (Грегоријански просечни) - Година (Преступна) Година (Грегоријанска) - Година (Јулијанска) - Ђифи - Момент - Четрнаест дана - Декада - Стољеће - Милениј - Атомска јединица Како дугме Ц (Обриши) функционише\? Додиривање на њега ће уклонити један по један знак. Дуго притискање ће успоставити почетне вредности свих поља одједном. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index f71ae94f..633dea97 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Hur funkar C (Rensa) knappen\? Om du trycker på den tar du bort ett tecken i taget. Om du trycker länge på den återställs alla fält på en gång. diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 3a3bf15c..2b30af78 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit சி (தெளிவு) பொத்தான் எப்படி வேலை செய்கிறது\? அதைத் தட்டினால் ஒரு நேரத்தில் ஒரு எழுத்து நீக்கப்படும். நீண்ட நேரம் அழுத்தினால், எல்லாப் புலங்களையும் ஒரே நேரத்தில் மீட்டமைக்கும். diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml index f1c41086..4d381576 100644 --- a/app/src/main/res/values-te/strings.xml +++ b/app/src/main/res/values-te/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit C (క్లియర్) బటన్ ఎలా పని చేస్తుంది\? దానిపై నొక్కడం ద్వారా ఒక్కో అక్షరం తీసివేయబడుతుంది. ఎక్కువసేపు నొక్కితే, అన్ని ఫీల్డ్‌లు ఒకేసారి రీసెట్ చేయబడతాయి. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 9ca40975..a942e3d8 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -107,26 +107,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit How does the C (Clear) button work? diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index f079c1ba..9dc0ef9b 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit C (Temizle) düğmesi nasıl çalışır? Üzerine dokunmak, bir seferde bir karakteri kaldıracaktır. Uzun basma, tüm alanları bir kerede sıfırlayacaktır. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index cd1ce05e..0a75c179 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit Як працює кнопка C (Очистити)? Короткий натиск видалить один символ за раз. Тривалий натиск одразу очистить всі поля. diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml index da409b1a..430cf062 100644 --- a/app/src/main/res/values-zgh/strings.xml +++ b/app/src/main/res/values-zgh/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit ⵎⴰⵎⴽ ⵜⵙⵡⵓⵔⵓⵢ ⵜⴳⵎⵎⵓⵜ C (ⴽⴽⵙ)\? ⴰⴱⴱⴰⵥ ⵅⴼ ⵓⵢⵏⵏⴰ ⴰⴷ ⵉⴽⴽⵙ ⵢⴰⵏ ⵓⵙⴽⴽⵉⵍ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. ⵎⵛ ⵉⵍⵍⴰ ⵡⴰⴱⴱⴰⵥ ⴰⵙⵓⵍⴰⵏ ⵔⴰⴷ ⵜⵜⵓⵙⵏⴼⵍⵏ ⵎⴰⵕⵕⴰ ⵉⴳⵔⴰⵏ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index c5e58b6b..13b21ba1 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit 如何使用 C (清除) 按钮？ 点按它一次删除一个字母。长按它将立即重置所有字段。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 6a9dd0dd..77c66be3 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -104,26 +104,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit C（清除）按鈕如何使用？ 按一次會刪除一個字元。長按會馬上重設全部欄位。 diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index e938ae14..cdb46451 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -87,25 +87,9 @@ m s ms - µs - ns - ps d wk - mo - mo - mo - mo - y y - y - j - moment - fn - dec - c - millennium - a.u. Allow customizing the bottom navigation bar color diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5d416926..4fb870d9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -108,26 +108,10 @@ Hour Minute Second - Millisecond - Microsecond - Nanosecond - Picosecond + Microsecond Day Week - Month (Full) - Month (Hollow) - Month (Synodic) - Month (Gregorian average) - Year (Leap) Year (Gregorian) - Year (Julian) - Jiffy - Moment - Fortnight - Decade - Century - Millennium - Atomic Unit How does the C (Clear) button work? From e5751d9489ae99d2c7491f1c8798fcb0b5a3a507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 14 Sep 2023 10:19:52 +0200 Subject: [PATCH 45/58] Remove gregorian from year --- .../calculator/helpers/converters/TimeConverter.kt | 4 ++-- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-az/strings.xml | 2 +- app/src/main/res/values-be/strings.xml | 2 +- app/src/main/res/values-bg/strings.xml | 2 +- app/src/main/res/values-bs/strings.xml | 2 +- app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-cy/strings.xml | 2 +- app/src/main/res/values-da/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-eo/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-et/strings.xml | 2 +- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-fil/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-gl/strings.xml | 2 +- app/src/main/res/values-hi/strings.xml | 2 +- app/src/main/res/values-hr/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-in/strings.xml | 2 +- app/src/main/res/values-is/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-iw/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-kn/strings.xml | 2 +- app/src/main/res/values-ko/strings.xml | 2 +- app/src/main/res/values-kr/strings.xml | 2 +- app/src/main/res/values-lt/strings.xml | 2 +- app/src/main/res/values-lv/strings.xml | 2 +- app/src/main/res/values-mk/strings.xml | 2 +- app/src/main/res/values-ml/strings.xml | 2 +- app/src/main/res/values-ms/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-no-rNO/strings.xml | 2 +- app/src/main/res/values-pa-rPK/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ro/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values-sl/strings.xml | 2 +- app/src/main/res/values-sr/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-ta/strings.xml | 2 +- app/src/main/res/values-te/strings.xml | 2 +- app/src/main/res/values-th/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-zgh/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/donottranslate.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 57 files changed, 58 insertions(+), 58 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt index 0d4f26a7..88e10cc7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TimeConverter.kt @@ -51,8 +51,8 @@ object TimeConverter : Converter { ) data object Year : Unit( - nameResId = R.string.unit_time_year_gregorian, - symbolResId = R.string.unit_time_year_gregorian_symbol, + nameResId = R.string.unit_time_year, + symbolResId = R.string.unit_time_year_symbol, factor = GREGORIAN_YEAR ) } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index d4bf0ed5..2b4d8687 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year كيف يعمل الزر C (مسح)؟ النقر على ذلك سوف يزيل حرف واحد في وقت واحد. الضغط لفترة طويلة سوف إعادة تعيين جميع الحقول في وقت واحد. diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index fff1bb2b..6b4574c5 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -109,7 +109,7 @@ Microsecond Day Week - Year (Gregorian) + Year C (Sil) düyməsi necə işləyir? diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index cf88a2a8..2966ce56 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Як працуе кнопка C (Ачыстка)\? Крананне да яе выдаляе адзін сімвал. Доўгае націсканне на яе ачышчае адразу ўсе палі. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 0cf7deb8..fa43f646 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Как работи бутонът C (Clear)\? Натискането му ще премахва по един символ. Дълго натискане ще изчисти наведнъж всички полета. diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml index 6ca1bfdb..1e2f81b5 100644 --- a/app/src/main/res/values-bs/strings.xml +++ b/app/src/main/res/values-bs/strings.xml @@ -107,7 +107,7 @@ Milisekunda Dan Sedmica - Godina (Gregorijanska) + Godina Kako funkcionira gumb C (Izbriši)\? Dodirom gumba uklanjaju se znakovi jedan po jedan. Dugim pritiskom gumba brišu se svi znakovi. diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 91525b68..d3821fb5 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Com funciona el botó C (Esborra)\? En tocar-lo, s\'eliminarà un caràcter a la vegada. Si el premeu prolongadament, es reiniciaran tots els camps de cop. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index d38da35e..b7a48d06 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Jak funguje tlačítko C? Stisknutím odmažete jeden znak. Dlouhým podržením smažete naráz všechna pole. diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 8e19d5e7..2afceee7 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Sut mae\'r botwm C (clirio) yn gweithio? Mae ei dapio yn tynnu un rhif ar y tro. Mae ei dal yn ailosod pob maes gyda\'i gilydd ar unwaith. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 4677fd96..2deb275d 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Hvordan virker knappen C (Slet)\? Hvis du trykker på det, fjernes et tegn ad gangen. Langt tryk vil nulstille alle felter på én gang. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 32bb1431..79af9040 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Wie funktioniert die C-Taste (Löschen)\? Bei einmaliger Berührung wird ein Zeichen entfernt. Bei langer Berührung werden alle Felder zurück gesetzt. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 49f57e6b..b52b4061 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -109,7 +109,7 @@ Microsecond Day Week - Year (Gregorian) + Year Πώς λειτουργεί το κουμπί C (Καθαρισμός); diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index b9940baa..0112a7c0 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Kiel funkcias la butono C («Forviŝi»)\? Frapetado sur ĝi forviŝos signojn po unu por frapeto. Longa premado forviŝos ĉiujn kampojn samtempe. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 5110c6ca..d2723466 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year ¿Cómo funciona el botón C (Borrar)\? Presionándolo una vez eliminará un solo carácter. Mantenerlo presionado reiniciará todos los campos. diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 225dfd3d..8646e31d 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Kuidas C (Clear) nupp toimib\? Üks klõpsatus kustutab ühe numbri. Pikk vajutus eemaldab kogu sisestuse. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 61aa67b0..b868b6da 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Miten C (Tyhjennä) -painike toimii\? Sen napautus poistaa yhden merkin kerrallaan ja pitkä painallus tyhjentää kaikki kentät. diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index bc0d0ea7..5a7702f4 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -104,7 +104,7 @@ Microsecond Day Week - Year (Gregorian) + Year Paano gumagana ang C (Clear) button\? Matatanggal ng isang karakter kapag pinindot ito nang isang beses. Ire-reset naman ang lahat ng mga field kapag mahabang pinindot ito. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 111ada67..4e256331 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Comment fonctionne le bouton C (Effacer) \? En tapotant dessus, vous retirerez un caractère à la fois. Une pression prolongée sur le bouton réinitialisera tous les champs à la fois. diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 8f1f34b8..8e6a8def 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Como funciona o botón C (Borrar)? O premer, eliminarase un carácter á vez. O premer de forma continua, restableceranse todos os campos á vez. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index e9f86b1c..a3b78e71 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -104,7 +104,7 @@ Microsecond Day Week - Year (Gregorian) + Year सी (क्लियर) बटन कैसे काम करता है\? इस पर टैप करने से एक बार में एक कैरेक्टर हट जाएगा। लंबे समय तक इसे दबाने से एक ही बार में सभी फ़ील्ड रीसेट हो जाएंगे। diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index b5cc83d0..52ccb849 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -107,7 +107,7 @@ Milisekunda Dan Tjedan - Godina (Gregorijanska) + Godina Kako funkcionira gumb C (Izbriši)\? Dodirom gumba uklanjaju se znakovi jedan po jedan. Dugim pritiskom gumba obnavljaju se sva polja. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 9ded97ac..23d19cac 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Hogyan működik a C (törlés) gomb\? A koppintás egyszerre egy karaktert töröl. A hosszú lenyomás egyszerre állítja vissza az összes mezőt. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index cf4d06bf..ebd096ed 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Bagaimana tombol C (Clear) bekerja? Menyentuhnya sekali akan menghapus satu karakter. Menyentuhnya lama akan mengosongkan seluruh ruas sekaligus. diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index a9561473..71cedd34 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Hvernig virkar C (Hreinsa) hnappurinn\? Með því að pikka á hann verður einn stafur fjarlægður í einu. Haltu inni til þess að endurstilla alla reiti í einu. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 40f4e946..8973091f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Come funziona il tasto C (Cancella)? Premendo il tasto una volta verrà eliminato un singolo carattere; tenendolo premuto invece eliminerà tutta la stringa. diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index c24c8870..a43f3c5d 100755 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year כיצד פועל לחצן C (ניקוי)\? הקשה עליו תסיר תו אחד בכל פעם. לחיצה ארוכה עליו תאפס את כל השדות בבת אחת. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 761b9763..526444c0 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year C (クリア) ボタンはどのように機能しますか？ ボタンをタップするたびに1文字ずつ削除されます。ボタンを長押しするとすべてのフィールドがリセットされます。 diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml index bfc07171..fb5e76b9 100644 --- a/app/src/main/res/values-kn/strings.xml +++ b/app/src/main/res/values-kn/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year ಸಿ (ತೆರವುಗೊಳಿಸಿ) ಬಟನ್ ಹೇಗೆ ಕೆಲಸ ಮಾಡುತ್ತದೆ\? ಅದರ ಮೇಲೆ ಟ್ಯಾಪ್ ಮಾಡುವುದರಿಂದ ಒಂದು ಸಮಯದಲ್ಲಿ ಒಂದು ಅಕ್ಷರವನ್ನು ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ. ದೀರ್ಘವಾಗಿ ಒತ್ತಿದರೆ ಎಲ್ಲಾ ಕ್ಷೇತ್ರಗಳನ್ನು ಒಂದೇ ಬಾರಿಗೆ ಮರುಹೊಂದಿಸುತ್ತದೆ. diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 9a71d15a..1426f176 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year C(지우기) 버튼은 어떻게 작동합니까\? 누르면 한 번에 한 문자씩 제거됩니다. 길게 누르면 모든 필드가 한 번에 재설정됩니다. diff --git a/app/src/main/res/values-kr/strings.xml b/app/src/main/res/values-kr/strings.xml index df57b690..61548581 100644 --- a/app/src/main/res/values-kr/strings.xml +++ b/app/src/main/res/values-kr/strings.xml @@ -109,7 +109,7 @@ Microsecond Day Week - Year (Gregorian) + Year C (Clear) 버튼을 어떻게 사용합니까? diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index a5fe4c16..23cd1674 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Kaip veikia C (Išvalymo) mygtukas\? Kiekvieną kartą ant jo bakstelėjus, bus šalinama po vieną simbolį. Ilgai jį palaikius, bus iš karto atstatyti visi laukai. diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 93fdd38a..e556f56e 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Kā darbojas poga C (Notīrīt)\? Pieskarieties tai, lai noņemtu vienu rakstzīmi vienlaikus. Ilgstoši nospiežot to, tiks atiestatīti visi lauki vienlaicīgi. diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index f5c38d99..786a633a 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Како функционира копчето C (Clear) \? Прислушкувањето на него ќе отстрани еден лик во исто време. Долгото притискање ќе ги ресетира сите полиња одеднаш. diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 614b7566..a9983b90 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year C(ക്ലിയർ ) ബട്ടൺ പ്രവർത്തിക്കുന്നത് എങ്ങനെ\? ടാപ്പ് ചെയ്യുമ്പോൾ ഒരു സമയം ഒരു പ്രതീകത്തെ നീക്കംചെയ്യും. ദീർഘനേരം അമർത്തിയാൽ എല്ലാ ഫീൽഡുകളും പുനഃസജ്ജമാക്കും. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 4089cf18..987d4720 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -109,7 +109,7 @@ Microsecond Day Week - Year (Gregorian) + Year Bagaimana Butang C (Menghapus) Digunakan？ diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 7cfc0f9a..4af4cd0f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Hoe werkt de knop C (Clear)\? Kort indrukken verwijdert één karakter per keer. Lang drukken wist direct alle velden. diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index 4fa1b5a7..427c492b 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Hvordan fungerer C (Clear)-knappen\? Å trykke på den fjerner ett tegn av gangen. Lang-trykk tilbakestiller alle felter. How does the C (Clear) button work\? Tapping on it will remove one character at a time. Long pressing it will reset all fields at once. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 5f21cf1f..a3b6f4de 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Jak działa przycisk C (Wyczyść)? Naciśnięcie go usunie jeden znak naraz. Długie naciśnięcie zresetuje wszystkie pola jednocześnie. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index e7ca22a0..c2bd0bbd 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Como funciona o botão C (Clear)\? Um toque remove um caractere de cada vez. Um toque longo redefine todos os campos de uma vez. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 4ee75f90..aba351c3 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Como funciona o botão C (limpar)\? Ao tocar uma vez, os caracteres serão apagados um a um. Um toque longo apaga todos os caracteres ao mesmo tempo. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index a0beac5f..89ec4aa2 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Cum funcționează butonul Ș (Șterge)\? Apăsând pe el, veți elimina câte un caracter pe rând. Apăsarea lungă va reseta toate câmpurile deodată. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4498e551..5690bd40 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Как работает кнопка C (Очистка)\? Нажатие на неё удалит один символ. Долгое нажатие сбросит все поля сразу. diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 818720bf..fe81c38e 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Ako funguje tlačidlo C? Jedným stlačením viete vymazať 1 znak. Dlhé podržanie vymaže všetky polia naraz. diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index e2b797d4..d14d1a96 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -104,7 +104,7 @@ Microsecond Day Week - Year (Gregorian) + Year Kako deluje gumb C (Clear)\? Če ga stisnete, odstranite po en lik naenkrat. Z dolgim pritiskom nanj boste odstranili vsa polja naenkrat. diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 417eb194..d2e4f6c3 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -107,7 +107,7 @@ Милисекунда Дан Седмица - Година (Грегоријанска) + Година Како дугме Ц (Обриши) функционише\? Додиривање на њега ће уклонити један по један знак. Дуго притискање ће успоставити почетне вредности свих поља одједном. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 633dea97..d6cd18de 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Hur funkar C (Rensa) knappen\? Om du trycker på den tar du bort ett tecken i taget. Om du trycker länge på den återställs alla fält på en gång. diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 2b30af78..3593ae5c 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year சி (தெளிவு) பொத்தான் எப்படி வேலை செய்கிறது\? அதைத் தட்டினால் ஒரு நேரத்தில் ஒரு எழுத்து நீக்கப்படும். நீண்ட நேரம் அழுத்தினால், எல்லாப் புலங்களையும் ஒரே நேரத்தில் மீட்டமைக்கும். diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml index 4d381576..a250bca1 100644 --- a/app/src/main/res/values-te/strings.xml +++ b/app/src/main/res/values-te/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year C (క్లియర్) బటన్ ఎలా పని చేస్తుంది\? దానిపై నొక్కడం ద్వారా ఒక్కో అక్షరం తీసివేయబడుతుంది. ఎక్కువసేపు నొక్కితే, అన్ని ఫీల్డ్‌లు ఒకేసారి రీసెట్ చేయబడతాయి. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index a942e3d8..9703de75 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -110,7 +110,7 @@ Microsecond Day Week - Year (Gregorian) + Year How does the C (Clear) button work? diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 9dc0ef9b..74821624 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year C (Temizle) düğmesi nasıl çalışır? Üzerine dokunmak, bir seferde bir karakteri kaldıracaktır. Uzun basma, tüm alanları bir kerede sıfırlayacaktır. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 0a75c179..6a9e0f5c 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year Як працює кнопка C (Очистити)? Короткий натиск видалить один символ за раз. Тривалий натиск одразу очистить всі поля. diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml index 430cf062..817dec6b 100644 --- a/app/src/main/res/values-zgh/strings.xml +++ b/app/src/main/res/values-zgh/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year ⵎⴰⵎⴽ ⵜⵙⵡⵓⵔⵓⵢ ⵜⴳⵎⵎⵓⵜ C (ⴽⴽⵙ)\? ⴰⴱⴱⴰⵥ ⵅⴼ ⵓⵢⵏⵏⴰ ⴰⴷ ⵉⴽⴽⵙ ⵢⴰⵏ ⵓⵙⴽⴽⵉⵍ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. ⵎⵛ ⵉⵍⵍⴰ ⵡⴰⴱⴱⴰⵥ ⴰⵙⵓⵍⴰⵏ ⵔⴰⴷ ⵜⵜⵓⵙⵏⴼⵍⵏ ⵎⴰⵕⵕⴰ ⵉⴳⵔⴰⵏ ⴳ ⵢⴰⵏ ⵓⵣⵎⵣ. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 13b21ba1..3993707c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year 如何使用 C (清除) 按钮？ 点按它一次删除一个字母。长按它将立即重置所有字段。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 77c66be3..60edde5b 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -107,7 +107,7 @@ Microsecond Day Week - Year (Gregorian) + Year C（清除）按鈕如何使用？ 按一次會刪除一個字元。長按會馬上重設全部欄位。 diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index cdb46451..2a17b998 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -89,7 +89,7 @@ ms d wk - y + y Allow customizing the bottom navigation bar color diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4fb870d9..17eb7619 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -111,7 +111,7 @@ Microsecond Day Week - Year (Gregorian) + Year How does the C (Clear) button work? From 347a2fbaeaa6b3a8a1f14e952951841c83284055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 14 Sep 2023 10:46:12 +0200 Subject: [PATCH 46/58] Scale unit symbols --- .../calculator/views/ConverterView.kt | 24 +++++++++++++++---- app/src/main/res/layout/view_converter.xml | 4 ++-- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt index 0ad03136..cc35cf3c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt @@ -3,8 +3,6 @@ package com.simplemobiletools.calculator.views import android.app.Activity import android.content.Context import android.content.res.ColorStateList -import android.graphics.BlendMode -import android.graphics.PorterDuff import android.graphics.drawable.GradientDrawable import android.graphics.drawable.LayerDrawable import android.graphics.drawable.RippleDrawable @@ -49,8 +47,6 @@ class ConverterView @JvmOverloads constructor( AutofitHelper.create(binding.topUnitText) AutofitHelper.create(binding.bottomUnitText) - AutofitHelper.create(binding.topUnitSymbol) - AutofitHelper.create(binding.bottomUnitSymbol) binding.swapButton.setOnClickListener { switch() } @@ -180,8 +176,28 @@ class ConverterView @JvmOverloads constructor( private fun updateUnitLabelsAndSymbols() { binding.topUnitName.text = topUnit?.nameResId?.let { context.getString(it) } binding.bottomUnitName.text = bottomUnit?.nameResId?.let { context.getString(it) } + binding.topUnitSymbol.text = topUnit?.symbolResId?.let { context.getString(it) } binding.bottomUnitSymbol.text = bottomUnit?.symbolResId?.let { context.getString(it) } + + binding.topUnitSymbol.layoutParams.width = LayoutParams.WRAP_CONTENT + binding.bottomUnitSymbol.layoutParams.width = LayoutParams.WRAP_CONTENT + + val symbolHeight = context.resources.getDimensionPixelSize(R.dimen.unit_symbol_size) + binding.topUnitSymbol.measure( + MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED), + MeasureSpec.makeMeasureSpec(symbolHeight, MeasureSpec.EXACTLY) + ) + binding.bottomUnitSymbol.measure( + MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED), + MeasureSpec.makeMeasureSpec(symbolHeight, MeasureSpec.EXACTLY) + ) + + val width = listOf(symbolHeight, binding.topUnitSymbol.measuredWidth, binding.bottomUnitSymbol.measuredWidth).max() + binding.topUnitSymbol.layoutParams.width = width + binding.bottomUnitSymbol.layoutParams.width = width + binding.topUnitSymbol.requestLayout() + binding.bottomUnitSymbol.requestLayout() } private fun updateBottomValue() { diff --git a/app/src/main/res/layout/view_converter.xml b/app/src/main/res/layout/view_converter.xml index bb60f54b..6599d22a 100644 --- a/app/src/main/res/layout/view_converter.xml +++ b/app/src/main/res/layout/view_converter.xml @@ -45,7 +45,7 @@ Date: Thu, 14 Sep 2023 10:50:04 +0200 Subject: [PATCH 47/58] Fix unit symbol scaling on large font sizes --- app/src/main/res/layout/view_converter.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/view_converter.xml b/app/src/main/res/layout/view_converter.xml index 6599d22a..09aaa5c5 100644 --- a/app/src/main/res/layout/view_converter.xml +++ b/app/src/main/res/layout/view_converter.xml @@ -46,7 +46,8 @@ android:id="@+id/top_unit_symbol" style="@style/MyButton" android:layout_width="wrap_content" - android:layout_height="@dimen/unit_symbol_size" + android:layout_height="wrap_content" + android:minHeight="@dimen/unit_symbol_size" android:gravity="center" android:padding="@dimen/small_margin" android:singleLine="true" @@ -109,7 +110,8 @@ android:id="@+id/bottom_unit_symbol" style="@style/MyButton" android:layout_width="wrap_content" - android:layout_height="@dimen/unit_symbol_size" + android:layout_height="wrap_content" + android:minHeight="@dimen/unit_symbol_size" android:gravity="center" android:padding="@dimen/small_margin" android:singleLine="true" From 7e8fb70e5f96bbc9a39035b41124013baa1637d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 14 Sep 2023 10:51:18 +0200 Subject: [PATCH 48/58] Fix liter symbols --- app/src/main/res/values/donottranslate.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 2a17b998..7de42b02 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -33,10 +33,10 @@ dm³ cm³ mm³ - l - cl - dl - ml + L + cL + dL + mL ac ft yd³ ft³ From 1366cb035944f7c77ff2d37aa3f6e54e2ab26536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 14 Sep 2023 11:48:18 +0200 Subject: [PATCH 49/58] Make some more room on landscape layout --- .../activities/UnitConverterActivity.kt | 18 +++ .../calculator/views/ConverterView.kt | 6 +- .../main/res/layout-land/view_converter.xml | 118 ++++++++++++++++++ app/src/main/res/layout/view_converter.xml | 1 - .../main/res/layout/view_unit_converter.xml | 1 + app/src/main/res/menu/converter_menu.xml | 11 ++ app/src/main/res/values-ar/strings.xml | 1 + app/src/main/res/values-az/strings.xml | 1 + app/src/main/res/values-be/strings.xml | 1 + app/src/main/res/values-bg/strings.xml | 1 + app/src/main/res/values-bs/strings.xml | 1 + app/src/main/res/values-ca/strings.xml | 1 + app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-cy/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-eo/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-et/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 1 + app/src/main/res/values-fil/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-gl/strings.xml | 1 + app/src/main/res/values-hi/strings.xml | 1 + app/src/main/res/values-hr/strings.xml | 3 +- app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-in/strings.xml | 1 + app/src/main/res/values-is/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-iw/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-kn/strings.xml | 1 + app/src/main/res/values-ko/strings.xml | 1 + app/src/main/res/values-kr/strings.xml | 1 + app/src/main/res/values-lt/strings.xml | 1 + app/src/main/res/values-lv/strings.xml | 1 + app/src/main/res/values-mk/strings.xml | 1 + app/src/main/res/values-ml/strings.xml | 1 + app/src/main/res/values-ms/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-no-rNO/strings.xml | 1 + app/src/main/res/values-pa-rPK/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ro/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sk/strings.xml | 1 + app/src/main/res/values-sl/strings.xml | 1 + app/src/main/res/values-sr/strings.xml | 3 +- app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-ta/strings.xml | 1 + app/src/main/res/values-te/strings.xml | 1 + app/src/main/res/values-th/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-zgh/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 61 files changed, 208 insertions(+), 6 deletions(-) create mode 100644 app/src/main/res/layout-land/view_converter.xml create mode 100644 app/src/main/res/menu/converter_menu.xml diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt index 1039c7d8..64dd5353 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt @@ -1,9 +1,11 @@ package com.simplemobiletools.calculator.activities +import android.content.res.Configuration import android.os.Bundle import android.view.View import android.view.WindowManager import androidx.core.content.res.ResourcesCompat +import com.simplemobiletools.calculator.R import com.simplemobiletools.calculator.databinding.ActivityUnitConverterBinding import com.simplemobiletools.calculator.extensions.config import com.simplemobiletools.calculator.extensions.updateViewColors @@ -30,6 +32,12 @@ class UnitConverterActivity : SimpleActivity() { isMaterialActivity = true super.onCreate(savedInstanceState) setContentView(binding.root) + + if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) { + binding.unitConverterToolbar.inflateMenu(R.menu.converter_menu) + setupOptionsMenu() + } + updateMaterialActivityViews(binding.unitConverterCoordinator, null, useTransparentNavigation = false, useTopSearchMenu = false) setupMaterialScrollListener(binding.nestedScrollview, binding.unitConverterToolbar) @@ -59,6 +67,16 @@ class UnitConverterActivity : SimpleActivity() { binding.unitConverterToolbar.setTitle(converter.nameResId) } + private fun setupOptionsMenu() { + binding.unitConverterToolbar.setOnMenuItemClickListener { menuItem -> + when (menuItem.itemId) { + R.id.swap_units -> binding.viewUnitConverter.viewConverter.root.switch() + else -> return@setOnMenuItemClickListener false + } + return@setOnMenuItemClickListener true + } + } + override fun onResume() { super.onResume() diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt index cc35cf3c..16c44193 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt @@ -48,7 +48,7 @@ class ConverterView @JvmOverloads constructor( AutofitHelper.create(binding.topUnitText) AutofitHelper.create(binding.bottomUnitText) - binding.swapButton.setOnClickListener { switch() } + binding.swapButton?.setOnClickListener { switch() } binding.topUnitHolder.setClickListenerForUnitSelector(::topUnit, ::bottomUnit) binding.bottomUnitHolder.setClickListenerForUnitSelector(::bottomUnit, ::topUnit) @@ -86,7 +86,7 @@ class ConverterView @JvmOverloads constructor( } binding.topUnitHolder.backgroundTintList = ColorStateList.valueOf(context.getProperPrimaryColor().lightenColor().adjustAlpha(LOWER_ALPHA)) - binding.swapButton.applyColorFilter(context.getProperPrimaryColor()) + binding.swapButton?.applyColorFilter(context.getProperPrimaryColor()) listOf(binding.topUnitSymbol, binding.bottomUnitSymbol).forEach { val drawable = ResourcesCompat.getDrawable( @@ -167,7 +167,7 @@ class ConverterView @JvmOverloads constructor( binding.topUnitText.text = value } - private fun switch() { + fun switch() { ::topUnit.swapWith(::bottomUnit) updateBottomValue() updateUnitLabelsAndSymbols() diff --git a/app/src/main/res/layout-land/view_converter.xml b/app/src/main/res/layout-land/view_converter.xml new file mode 100644 index 00000000..25f3062b --- /dev/null +++ b/app/src/main/res/layout-land/view_converter.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/view_converter.xml b/app/src/main/res/layout/view_converter.xml index 09aaa5c5..78ca140e 100644 --- a/app/src/main/res/layout/view_converter.xml +++ b/app/src/main/res/layout/view_converter.xml @@ -66,7 +66,6 @@ android:background="@drawable/ripple_circle_background" android:layout_gravity="center" android:padding="@dimen/activity_margin" - android:layout_weight="0.5" android:src="@drawable/ic_swap_vertical_vector" /> + + + diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 2b4d8687..3cf08a53 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -4,6 +4,7 @@ الحاسبة الحاسبة العلمية Unit converter + Swap units خطأ: القسمة على صفر diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 6b4574c5..0335b004 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -3,6 +3,7 @@ Kalkulyator Scientific Calculator Unit converter + Swap units Səhv: sıfıra bölünmə diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 2966ce56..3b11bde7 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -4,6 +4,7 @@ Калькулятар Навуковы калькулятар Unit converter + Swap units Памылка: дзяленне на нуль diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index fa43f646..3640027f 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -4,6 +4,7 @@ Калкулатор Научен калкулатор Unit converter + Swap units Грешка: деление на нула diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml index 1e2f81b5..78ce9cbd 100644 --- a/app/src/main/res/values-bs/strings.xml +++ b/app/src/main/res/values-bs/strings.xml @@ -4,6 +4,7 @@ Kalkulator Naučni kalkulator Pretvarač jedinica + Zamijeni jedinice Greška: dijeljenje s nulom diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index d3821fb5..bdc9b4e3 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -4,6 +4,7 @@ Calculadora Calculadora científica Unit converter + Swap units Error: divisió per zero diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index b7a48d06..a8652e27 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -4,6 +4,7 @@ Kalkulačka Vědecká kalkulačka Unit converter + Swap units Chyba: dělení nulou diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 2afceee7..77283d2d 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -4,6 +4,7 @@ Cyfrifiannell Cyfrifiannell Gwyddonol Unit converter + Swap units Gwall: rhannu â sero diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 2deb275d..8d4ded58 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -4,6 +4,7 @@ Lommeregner Videnskabelig lommeregner Unit converter + Swap units Fejl: division med nul diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 79af9040..7a83cae5 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -4,6 +4,7 @@ Rechnerng> Wissenschaftlicher Rechner Unit converter + Swap units Fehler: Division durch Null diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index b52b4061..1fdc0105 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -3,6 +3,7 @@ Αριθμομηχανή Επιστημονική Αριθμομηχανή Unit converter + Swap units Σφάλμα: διαίρεση με μηδέν diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 0112a7c0..620ceba5 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -4,6 +4,7 @@ Kalkulilo Sciena kalkulilo Unit converter + Swap units Eraro: divido per nul diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index d2723466..be6da0b6 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -4,6 +4,7 @@ Calculadora Calculadora científica Unit converter + Swap units Error: división por cero diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 8646e31d..42a15cae 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -4,6 +4,7 @@ Kalkulaator Teadusrežiim Unit converter + Swap units Viga: nulliga jagamine diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index b868b6da..9e3dcfa3 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -4,6 +4,7 @@ Laskin Funktiolaskin Unit converter + Swap units Virhe: jako nollalla diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index 5a7702f4..d6c610ae 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -4,6 +4,7 @@ Calculator Scientific Calculator Unit converter + Swap units Error: paghahati sa zero Nakaraan Walang nakaraan diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 4e256331..f33de281 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -4,6 +4,7 @@ Calculatrice Calculatrice scientifique Unit converter + Swap units Erreur : division par zéro diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 8e6a8def..a2356a9a 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -4,6 +4,7 @@ Calculadora Calculadora Científica Unit converter + Swap units Erro: división por cero diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index a3b78e71..12671ec1 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -4,6 +4,7 @@ कैलकुलेटर वैज्ञानिक कैलकुलेटर Unit converter + Swap units त्रुटि: शून्य से विभाजन इतिहास इतिहास खाली है diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 52ccb849..2067e202 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -3,7 +3,8 @@ Jednostavan kalkulator Kalkulator Znanstveni kalkulator - Unit converter + Pretvarač jedinica + Zamijeni jedinice Greška: dijeljenje s nulom diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 23d19cac..1699c73b 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -4,6 +4,7 @@ Számológép Tudományos számológép Unit converter + Swap units Hiba: nullával való osztás diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index ebd096ed..4023e497 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -4,6 +4,7 @@ Kalkulator Kalkulator Sains Unit converter + Swap units Kesalahan: pembagian dengan nol diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 71cedd34..bf654581 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -4,6 +4,7 @@ Calculator Vísindareiknivél Unit converter + Swap units Error: division by zero diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 8973091f..ba75dd7e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -4,6 +4,7 @@ Calcolatrice Calcolatrice scientifica Unit converter + Swap units Errore: divisione per zero diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index a43f3c5d..381ae8d8 100755 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -4,6 +4,7 @@ מחשבון מחשבון מדעי Unit converter + Swap units שגיאה: חלוקה באפס diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 526444c0..db1b6426 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -4,6 +4,7 @@ 電卓 科学計算電卓 Unit converter + Swap units エラー：ゼロによる除算 diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml index fb5e76b9..0a2e1a55 100644 --- a/app/src/main/res/values-kn/strings.xml +++ b/app/src/main/res/values-kn/strings.xml @@ -4,6 +4,7 @@ ಕ್ಯಾಲ್ಕುಲೇಟರ್ ವೈಜ್ಞಾನಿಕ ಕ್ಯಾಲ್ಕುಲೇಟರ್ Unit converter + Swap units ದೋಷ : ಶೂನ್ಯದಿಂದ ವಿಭಜನೆ diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 1426f176..b0b0cd54 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -4,6 +4,7 @@ 계산기 과학 계산기 Unit converter + Swap units 오류: 0으로 나누기 diff --git a/app/src/main/res/values-kr/strings.xml b/app/src/main/res/values-kr/strings.xml index 61548581..9153e9eb 100644 --- a/app/src/main/res/values-kr/strings.xml +++ b/app/src/main/res/values-kr/strings.xml @@ -3,6 +3,7 @@ 계산기 공학용 계산기 Unit converter + Swap units 에러: 공으로 나눌 할수 없어요 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 23cd1674..8d019816 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -4,6 +4,7 @@ Skaičiuotuvas Mokslinis skaičiuotuvas Unit converter + Swap units Klaida: dalyba iš nulio diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index e556f56e..576d6e1c 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -4,6 +4,7 @@ Kalkulators Zinātniskais kalkulators Unit converter + Swap units Kļūda: dalīšana ar nulli diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 786a633a..7abbc1c6 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -4,6 +4,7 @@ Калкулатор Научен калкулатор Unit converter + Swap units Грешка: поделба по нула diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index a9983b90..a581ae2d 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -4,6 +4,7 @@ കാൽക്കുലേറ്റർ ശാസ്ത്രീയ കാൽക്കുലേറ്റർ Unit converter + Swap units പിശക്: 0 കൊണ്ട് ഹരിക്കാനാവില്ല diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 987d4720..73945a85 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -3,6 +3,7 @@ Kalkulator Kalkulator Saintifik Unit converter + Swap units Amaran: pembahagian dengan sifar diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 4af4cd0f..bff6429f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -4,6 +4,7 @@ Rekenmachine Wetenschappelijke Rekenmachine Unit converter + Swap units Fout: delen door nul diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index 427c492b..a30513c9 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -4,6 +4,7 @@ Kalkulator Vitenskapelig kalkulator Unit converter + Swap units FeiL: Deling på null diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml index 2f30c1c2..8bf116fa 100644 --- a/app/src/main/res/values-pa-rPK/strings.xml +++ b/app/src/main/res/values-pa-rPK/strings.xml @@ -4,6 +4,7 @@ کیلکولیٹر وگیانک کیلکولیٹر Unit converter + Swap units غلطی آئی اے، صفر نال ونڈ diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a3b6f4de..bf36ebae 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -4,6 +4,7 @@ Kalkulator Kalkulator naukowy Unit converter + Swap units Błąd: dzielenie przez zero diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index c2bd0bbd..49bde4bf 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -4,6 +4,7 @@ Calculadora Calculadora Científica Unit converter + Swap units Erro: divisão por zero diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index aba351c3..ad5a02cd 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -4,6 +4,7 @@ Calculadora Calculadora científica Unit converter + Swap units Erro: divisão por zero diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 89ec4aa2..09b854a4 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -4,6 +4,7 @@ Calculator Calculator Ştiințific Unit converter + Swap units Eroare: împărțire la zero diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5690bd40..a664f4a1 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -4,6 +4,7 @@ Калькулятор Научный калькулятор Unit converter + Swap units Ошибка: деление на ноль diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index fe81c38e..bddbb976 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -4,6 +4,7 @@ Kalkulačka Vedecká kalkulačka Unit converter + Swap units Chyba: delenie nulou diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index d14d1a96..ac201cf9 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -4,6 +4,7 @@ Kalkulator Znanstveni kalkulator Unit converter + Swap units Napaka: deljenje z ničlo Zgodovina Zgodovina je prazna diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index d2e4f6c3..91e68170 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -3,7 +3,8 @@ Једноставан калкулатор Калкулатор Научни калкулатор - Unit converter + Претварач јединица + Замијени јединице Грешка : дељење нулом diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index d6cd18de..8a575bf2 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -4,6 +4,7 @@ Kalkylator Avancerad kalkylator Unit converter + Swap units Fel: delning med noll diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 3593ae5c..080dd1a2 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -4,6 +4,7 @@ கால்குலேட்டர் அறிவியல் கால்குலேட்டர் Unit converter + Swap units பிழை: பூஜ்ஜியத்தால் வகுத்தல் diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml index a250bca1..2aeeb2aa 100644 --- a/app/src/main/res/values-te/strings.xml +++ b/app/src/main/res/values-te/strings.xml @@ -4,6 +4,7 @@ గనన యంత్రము శాస్త్రీయ గనన యంత్రము Unit converter + Swap units లోపం: సున్నాతో భాగించటం diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 9703de75..10bcc537 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -4,6 +4,7 @@ Calculator Scientific Calculator Unit converter + Swap units Error: division by zero diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 74821624..8e4a5f52 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -4,6 +4,7 @@ Hesap Makinesi Bilimsel Hesap Makinesi Unit converter + Swap units Hata: sıfıra bölme diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 6a9e0f5c..e1bce55f 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -4,6 +4,7 @@ Калькулятор Науковий Калькулятор Unit converter + Swap units Помилка: ділення на нуль diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml index 817dec6b..aa3e65e7 100644 --- a/app/src/main/res/values-zgh/strings.xml +++ b/app/src/main/res/values-zgh/strings.xml @@ -4,6 +4,7 @@ ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ ⵜⴰⵎⴰⵙⵙⴰⵏⵜ Unit converter + Swap units ⵜⴰⵣⴳⵍⵜ: ⴰⴱⵟⵟⵓ ⵅⴼ ⵓⵎⵢⴰ diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3993707c..0ffc9418 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -4,6 +4,7 @@ 计算器 科学计算器 Unit converter + Swap units 错误: 被零除 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 60edde5b..d08d630f 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -4,6 +4,7 @@ 計算機 科學計算機 Unit converter + Swap units 錯誤：除以零 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 17eb7619..698ade11 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,6 +4,7 @@ Calculator Scientific Calculator Unit converter + Swap units Error: division by zero From 9ce2b7ba2d05966f3fe6590715e02d1575bf6360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 14 Sep 2023 11:51:18 +0200 Subject: [PATCH 50/58] Make unit names in landscape more similar to portrait layout --- app/src/main/res/layout-land/view_converter.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout-land/view_converter.xml b/app/src/main/res/layout-land/view_converter.xml index 25f3062b..974fc907 100644 --- a/app/src/main/res/layout-land/view_converter.xml +++ b/app/src/main/res/layout-land/view_converter.xml @@ -23,8 +23,9 @@ android:gravity="center" android:textAlignment="gravity" android:textSize="@dimen/big_text_size" + android:layout_marginTop="@dimen/normal_margin" + android:layout_marginBottom="@dimen/small_margin" app:drawableEndCompat="@drawable/ic_arrow_drop_down_vector" - app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -80,7 +81,8 @@ android:textAlignment="gravity" android:textSize="@dimen/big_text_size" app:drawableEndCompat="@drawable/ic_arrow_drop_down_vector" - app:layout_constraintBottom_toBottomOf="parent" + android:layout_marginTop="@dimen/normal_margin" + android:layout_marginBottom="@dimen/small_margin" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> From 012066a37963f3e2cdec87291cab4fd38c86ce3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 14 Sep 2023 11:54:44 +0200 Subject: [PATCH 51/58] Reduce number of temperature units --- .../converters/TemperatureConverter.kt | 66 ------------------- app/src/main/res/values-ar/strings.xml | 5 -- app/src/main/res/values-az/strings.xml | 5 -- app/src/main/res/values-be/strings.xml | 5 -- app/src/main/res/values-bg/strings.xml | 5 -- app/src/main/res/values-bs/strings.xml | 5 -- app/src/main/res/values-ca/strings.xml | 5 -- app/src/main/res/values-cs/strings.xml | 5 -- app/src/main/res/values-cy/strings.xml | 5 -- app/src/main/res/values-da/strings.xml | 5 -- app/src/main/res/values-de/strings.xml | 5 -- app/src/main/res/values-el/strings.xml | 5 -- app/src/main/res/values-eo/strings.xml | 5 -- app/src/main/res/values-es/strings.xml | 5 -- app/src/main/res/values-et/strings.xml | 5 -- app/src/main/res/values-fi/strings.xml | 5 -- app/src/main/res/values-fil/strings.xml | 5 -- app/src/main/res/values-fr/strings.xml | 5 -- app/src/main/res/values-gl/strings.xml | 5 -- app/src/main/res/values-hi/strings.xml | 5 -- app/src/main/res/values-hr/strings.xml | 5 -- app/src/main/res/values-hu/strings.xml | 5 -- app/src/main/res/values-in/strings.xml | 5 -- app/src/main/res/values-is/strings.xml | 5 -- app/src/main/res/values-it/strings.xml | 5 -- app/src/main/res/values-iw/strings.xml | 5 -- app/src/main/res/values-ja/strings.xml | 5 -- app/src/main/res/values-kn/strings.xml | 5 -- app/src/main/res/values-ko/strings.xml | 5 -- app/src/main/res/values-kr/strings.xml | 5 -- app/src/main/res/values-lt/strings.xml | 5 -- app/src/main/res/values-lv/strings.xml | 5 -- app/src/main/res/values-mk/strings.xml | 5 -- app/src/main/res/values-ml/strings.xml | 5 -- app/src/main/res/values-ms/strings.xml | 5 -- app/src/main/res/values-nl/strings.xml | 5 -- app/src/main/res/values-no-rNO/strings.xml | 5 -- app/src/main/res/values-pa-rPK/strings.xml | 5 -- app/src/main/res/values-pl/strings.xml | 5 -- app/src/main/res/values-pt-rBR/strings.xml | 5 -- app/src/main/res/values-pt/strings.xml | 5 -- app/src/main/res/values-ro/strings.xml | 5 -- app/src/main/res/values-ru/strings.xml | 5 -- app/src/main/res/values-sk/strings.xml | 5 -- app/src/main/res/values-sl/strings.xml | 5 -- app/src/main/res/values-sr/strings.xml | 5 -- app/src/main/res/values-sv/strings.xml | 5 -- app/src/main/res/values-ta/strings.xml | 5 -- app/src/main/res/values-te/strings.xml | 5 -- app/src/main/res/values-th/strings.xml | 5 -- app/src/main/res/values-tr/strings.xml | 5 -- app/src/main/res/values-uk/strings.xml | 5 -- app/src/main/res/values-zgh/strings.xml | 5 -- app/src/main/res/values-zh-rCN/strings.xml | 5 -- app/src/main/res/values-zh-rTW/strings.xml | 5 -- app/src/main/res/values/donottranslate.xml | 5 -- app/src/main/res/values/strings.xml | 5 -- 57 files changed, 346 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TemperatureConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TemperatureConverter.kt index edbcf022..b03fffed 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TemperatureConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/TemperatureConverter.kt @@ -19,18 +19,6 @@ object TemperatureConverter : Converter { override fun fromBase(value: Double): Double = value - KELVIN_OFFSET } - data object Delisle : Unit( - nameResId = R.string.unit_temperature_delisle, - symbolResId = R.string.unit_temperature_delisle_symbol, - factor = 2.0 / 3 - ) { - private const val KELVIN_OFFSET = 373.15 - - override fun toBase(value: Double): Double = KELVIN_OFFSET - value * factor - - override fun fromBase(value: Double): Double = (KELVIN_OFFSET - value) / factor - } - data object Fahrenheit : Unit( nameResId = R.string.unit_temperature_fahrenheit, symbolResId = R.string.unit_temperature_fahrenheit_symbol, @@ -43,61 +31,12 @@ object TemperatureConverter : Converter { override fun fromBase(value: Double): Double = (Celsius.fromBase(value) * factor) + CELSIUS_OFFSET } - data object Newton : Unit( - nameResId = R.string.unit_temperature_newton, - symbolResId = R.string.unit_temperature_newton_symbol, - factor = 100.0 / 33 - ) { - private const val KELVIN_OFFSET = Celsius.KELVIN_OFFSET - - override fun toBase(value: Double): Double = (value * factor) + KELVIN_OFFSET - - override fun fromBase(value: Double): Double = (value - KELVIN_OFFSET) / factor - } - data object Rankine : Unit( nameResId = R.string.unit_temperature_rankine, symbolResId = R.string.unit_temperature_rankine_symbol, factor = 5.0 / 9 ) - data object Reaumur : Unit( - nameResId = R.string.unit_temperature_reaumur, - symbolResId = R.string.unit_temperature_reaumur_symbol, - factor = 5.0 / 4 - ) { - private const val KELVIN_OFFSET = Celsius.KELVIN_OFFSET - - override fun toBase(value: Double): Double = (value * factor) + KELVIN_OFFSET - - override fun fromBase(value: Double): Double = (value - KELVIN_OFFSET) / factor - } - - data object Romer : Unit( - nameResId = R.string.unit_temperature_romer, - symbolResId = R.string.unit_temperature_romer_symbol, - factor = 40.0 / 21 - ) { - private const val KELVIN_OFFSET = Celsius.KELVIN_OFFSET - private const val ADJUSTMENT = 7.5 - - override fun toBase(value: Double): Double = (value - ADJUSTMENT) * factor + KELVIN_OFFSET - - override fun fromBase(value: Double): Double = ((value - KELVIN_OFFSET) / factor) + ADJUSTMENT - } - - data object GasMark : Unit( - nameResId = R.string.unit_temperature_gas_mark, - symbolResId = R.string.unit_temperature_gas_mark_symbol, - factor = 25.0 - ) { - private const val FAHRENHEIT_OFFSET = 250 - - override fun toBase(value: Double): Double = Fahrenheit.toBase(value * factor + FAHRENHEIT_OFFSET) - - override fun fromBase(value: Double): Double = (Fahrenheit.fromBase(value) - FAHRENHEIT_OFFSET) / factor - } - data object Kelvin : Unit( nameResId = R.string.unit_temperature_kelvin, symbolResId = R.string.unit_temperature_kelvin_symbol, @@ -107,13 +46,8 @@ object TemperatureConverter : Converter { override val units: List = listOf( Unit.Celsius, - Unit.Delisle, Unit.Fahrenheit, - Unit.Newton, Unit.Rankine, - Unit.Reaumur, - Unit.Romer, - Unit.GasMark, Unit.Kelvin, ) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 3cf08a53..9a3f2e4d 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 0335b004..fabc74b6 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -95,13 +95,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 3b11bde7..014f41d5 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 3640027f..8a0996eb 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml index 78ce9cbd..46002b75 100644 --- a/app/src/main/res/values-bs/strings.xml +++ b/app/src/main/res/values-bs/strings.xml @@ -93,13 +93,8 @@ Karat (Metrični) Temperatura Celzijus - Delisle Farenhajt - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Vrijeme Sat diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index bdc9b4e3..49055056 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index a8652e27..5afb41ef 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 77283d2d..a73aed04 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 8d4ded58..b3dd6c96 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7a83cae5..fa285ab3 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 1fdc0105..86d3d66b 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -95,13 +95,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 620ceba5..9b8b9e08 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index be6da0b6..1a0bf1e6 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 42a15cae..bab9b23a 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 9e3dcfa3..5fa19d99 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index d6c610ae..992a6872 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -90,13 +90,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f33de281..59e42e46 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index a2356a9a..8f0ff7ac 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 12671ec1..d311bfc4 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -90,13 +90,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 2067e202..859652be 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -93,13 +93,8 @@ Karat (Metrični) Temperatura Celzijus - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Vrijeme Sat diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 1699c73b..aff90e52 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 4023e497..b1f35322 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index bf654581..5d195c88 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ba75dd7e..1152bad6 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 381ae8d8..262e0409 100755 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index db1b6426..504d17e6 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml index 0a2e1a55..f923d065 100644 --- a/app/src/main/res/values-kn/strings.xml +++ b/app/src/main/res/values-kn/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index b0b0cd54..798f5f50 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-kr/strings.xml b/app/src/main/res/values-kr/strings.xml index 9153e9eb..f00dc220 100644 --- a/app/src/main/res/values-kr/strings.xml +++ b/app/src/main/res/values-kr/strings.xml @@ -95,13 +95,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 8d019816..773f2ef2 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 576d6e1c..e27c5d50 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 7abbc1c6..7dcb31be 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index a581ae2d..fc468c48 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 73945a85..2b1f3b5a 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -95,13 +95,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index bff6429f..f820e87f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index a30513c9..deec53bb 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml index 8bf116fa..61282d7b 100644 --- a/app/src/main/res/values-pa-rPK/strings.xml +++ b/app/src/main/res/values-pa-rPK/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index bf36ebae..cae823e3 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 49bde4bf..389a9993 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index ad5a02cd..d4fc8ac6 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 09b854a4..a6f56b3c 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index a664f4a1..c559e077 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index bddbb976..da417feb 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index ac201cf9..3ce41954 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -90,13 +90,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 91e68170..72bd9963 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -93,13 +93,8 @@ Карат (Метричнки) Температуре Целзијус - Делил Фаренхајт - Њутн Ранкин - Реамур - Ромер - Регуло гас марк Келвин Време Сат diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 8a575bf2..4b038b4d 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 080dd1a2..453738f1 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml index 2aeeb2aa..26a67160 100644 --- a/app/src/main/res/values-te/strings.xml +++ b/app/src/main/res/values-te/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 10bcc537..78855114 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -96,13 +96,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 8e4a5f52..f4875ca9 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index e1bce55f..96579ea8 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml index aa3e65e7..ee77bcac 100644 --- a/app/src/main/res/values-zgh/strings.xml +++ b/app/src/main/res/values-zgh/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0ffc9418..4018b5eb 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index d08d630f..6e990526 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -93,13 +93,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 7de42b02..d7609fbe 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -75,13 +75,8 @@ kt ct °C - °De °F - °N °R - °Ré - °Rø - GM K h m diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 698ade11..066244aa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -97,13 +97,8 @@ Carat (Metric) Temperature Celsius - Delisle Fahrenheit - Newton Rankine - Réaumur - Rømer - Regulo Gas Mark Kelvin Time Hour From 381dd7af38056d353c9cd5492ed7998caa1864af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 14 Sep 2023 12:03:08 +0200 Subject: [PATCH 52/58] Reduce number of volume units --- .../helpers/converters/VolumeConverter.kt | 56 ------------------- app/src/main/res/values-ar/strings.xml | 8 --- app/src/main/res/values-az/strings.xml | 8 --- app/src/main/res/values-be/strings.xml | 8 --- app/src/main/res/values-bg/strings.xml | 8 --- app/src/main/res/values-bs/strings.xml | 8 --- app/src/main/res/values-ca/strings.xml | 8 --- app/src/main/res/values-cs/strings.xml | 8 --- app/src/main/res/values-cy/strings.xml | 8 --- app/src/main/res/values-da/strings.xml | 8 --- app/src/main/res/values-de/strings.xml | 8 --- app/src/main/res/values-el/strings.xml | 8 --- app/src/main/res/values-eo/strings.xml | 8 --- app/src/main/res/values-es/strings.xml | 8 --- app/src/main/res/values-et/strings.xml | 8 --- app/src/main/res/values-fi/strings.xml | 8 --- app/src/main/res/values-fil/strings.xml | 8 --- app/src/main/res/values-fr/strings.xml | 8 --- app/src/main/res/values-gl/strings.xml | 8 --- app/src/main/res/values-hi/strings.xml | 8 --- app/src/main/res/values-hr/strings.xml | 8 --- app/src/main/res/values-hu/strings.xml | 8 --- app/src/main/res/values-in/strings.xml | 8 --- app/src/main/res/values-is/strings.xml | 8 --- app/src/main/res/values-it/strings.xml | 8 --- app/src/main/res/values-iw/strings.xml | 8 --- app/src/main/res/values-ja/strings.xml | 8 --- app/src/main/res/values-kn/strings.xml | 8 --- app/src/main/res/values-ko/strings.xml | 8 --- app/src/main/res/values-kr/strings.xml | 8 --- app/src/main/res/values-lt/strings.xml | 8 --- app/src/main/res/values-lv/strings.xml | 8 --- app/src/main/res/values-mk/strings.xml | 8 --- app/src/main/res/values-ml/strings.xml | 8 --- app/src/main/res/values-ms/strings.xml | 8 --- app/src/main/res/values-nl/strings.xml | 8 --- app/src/main/res/values-no-rNO/strings.xml | 8 --- app/src/main/res/values-pa-rPK/strings.xml | 8 --- app/src/main/res/values-pl/strings.xml | 8 --- app/src/main/res/values-pt-rBR/strings.xml | 8 --- app/src/main/res/values-pt/strings.xml | 8 --- app/src/main/res/values-ro/strings.xml | 8 --- app/src/main/res/values-ru/strings.xml | 8 --- app/src/main/res/values-sk/strings.xml | 8 --- app/src/main/res/values-sl/strings.xml | 8 --- app/src/main/res/values-sr/strings.xml | 8 --- app/src/main/res/values-sv/strings.xml | 8 --- app/src/main/res/values-ta/strings.xml | 8 --- app/src/main/res/values-te/strings.xml | 8 --- app/src/main/res/values-th/strings.xml | 8 --- app/src/main/res/values-tr/strings.xml | 8 --- app/src/main/res/values-uk/strings.xml | 8 --- app/src/main/res/values-zgh/strings.xml | 8 --- app/src/main/res/values-zh-rCN/strings.xml | 8 --- app/src/main/res/values-zh-rTW/strings.xml | 8 --- app/src/main/res/values/donottranslate.xml | 8 --- app/src/main/res/values/strings.xml | 8 --- 57 files changed, 504 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt index b7244ca3..9327a1a5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/converters/VolumeConverter.kt @@ -61,12 +61,6 @@ object VolumeConverter : Converter { factor = 1_233.48183754752 ) - data object CubicYard : Unit( - nameResId = R.string.unit_volume_cubic_yard, - symbolResId = R.string.unit_volume_cubic_yard_symbol, - factor = 0.764554857984 - ) - data object CubicFoot : Unit( nameResId = R.string.unit_volume_cubic_foot, symbolResId = R.string.unit_volume_cubic_foot_symbol, @@ -115,30 +109,6 @@ object VolumeConverter : Converter { factor = 0.00003 ) - data object DropUS : Unit( - nameResId = R.string.unit_volume_drop_us, - symbolResId = R.string.unit_volume_drop_us_symbol, - factor = 0.00000008214869322916 - ) - - data object TeaspoonUS : Unit( - nameResId = R.string.unit_volume_teaspoon_us, - symbolResId = R.string.unit_volume_teaspoon_us_symbol, - factor = 0.000005 - ) - - data object TablespoonUS : Unit( - nameResId = R.string.unit_volume_tablespoon_us, - symbolResId = R.string.unit_volume_tablespoon_us_symbol, - factor = 0.000015 - ) - - data object CupUS : Unit( - nameResId = R.string.unit_volume_cup_us, - symbolResId = R.string.unit_volume_cup_us_symbol, - factor = 0.00024 - ) - data object BarrelImperial : Unit( nameResId = R.string.unit_volume_barrel_imperial, symbolResId = R.string.unit_volume_barrel_imperial_symbol, @@ -174,24 +144,6 @@ object VolumeConverter : Converter { symbolResId = R.string.unit_volume_fluid_ounce_imperial_symbol, factor = 0.0000284130625 ) - - data object DropImperial : Unit( - nameResId = R.string.unit_volume_drop_imperial, - symbolResId = R.string.unit_volume_drop_imperial_symbol, - factor = 0.0000000986564670138 - ) - - data object TeaspoonImperial : Unit( - nameResId = R.string.unit_volume_teaspoon_imperial, - symbolResId = R.string.unit_volume_teaspoon_imperial_symbol, - factor = 0.00000591938802083 - ) - - data object TablespoonImperial : Unit( - nameResId = R.string.unit_volume_tablespoon_imperial, - symbolResId = R.string.unit_volume_tablespoon_imperial_symbol, - factor = 0.0000177581640625 - ) } override val units: List = listOf( @@ -204,7 +156,6 @@ object VolumeConverter : Converter { Unit.Deciliter, Unit.Milliliter, Unit.AcreFoot, - Unit.CubicYard, Unit.CubicFoot, Unit.CubicInch, Unit.BarrelUS, @@ -213,19 +164,12 @@ object VolumeConverter : Converter { Unit.PintUS, Unit.GillUS, Unit.FluidOunceUS, - Unit.DropUS, - Unit.TeaspoonUS, - Unit.TablespoonUS, - Unit.CupUS, Unit.BarrelImperial, Unit.GallonImperial, Unit.QuartImperial, Unit.PintImperial, Unit.GillImperial, Unit.FluidOunceImperial, - Unit.DropImperial, - Unit.TeaspoonImperial, - Unit.TablespoonImperial, ) override val defaultTopUnit: Unit = Unit.Liter diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 9a3f2e4d..58ead1d8 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index fabc74b6..a7f00c2b 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -56,7 +56,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -65,19 +64,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 014f41d5..8819a9fd 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 8a0996eb..9f347a89 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml index 46002b75..471d5e0e 100644 --- a/app/src/main/res/values-bs/strings.xml +++ b/app/src/main/res/values-bs/strings.xml @@ -54,7 +54,6 @@ Decilitar Mililitar Aker stopa - Kubni jard Kubna stopa Kubni palac Barel (SAD) @@ -63,19 +62,12 @@ Pinta (SAD) Gill (SAD) Unca tekuća(SAD) - Drop (SAD) - Čajna kašika (SAD) - Kašika (SAD) - Šoljica (SAD) Barel (Imperijalni) Galon (Imperijalni) Četvrtina (Imperijalna) Pinta (Imperijalna) Gill (Imperijalni) Unca tekuća (Imperijalna) - Drop (Imperijalni) - Čajna kašika (Imperijalna) - Kašika (Imperijalna) Masa Gram Kilogram diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 49055056..8a4878cf 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 5afb41ef..65b03d22 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index a73aed04..60bc63ed 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index b3dd6c96..4642b7c4 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index fa285ab3..808e2fc4 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 86d3d66b..24192841 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -56,7 +56,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -65,19 +64,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 9b8b9e08..5a8643ac 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 1a0bf1e6..f08344ae 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index bab9b23a..bccf69e2 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 5fa19d99..38cde23e 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index 992a6872..e06220d7 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -51,7 +51,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -60,19 +59,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 59e42e46..dd0110c6 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 8f0ff7ac..4248f2b7 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index d311bfc4..d0040dd5 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -51,7 +51,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -60,19 +59,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 859652be..e700f69d 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -54,7 +54,6 @@ Decilitra Mililitra Aker stopa - Kubični jard Kubična stopa Kubični palac Barel (SAD) @@ -63,19 +62,12 @@ Pinta (SAD) Gill (SAD) Unca tekuća(SAD) - Drop (SAD) - Čajna žlica (SAD) - Žlica (SAD) - Šalica (SAD) Barel (Imperijalni) Galon (Imperijalni) Četvrtina (Imperijalna) Pinta (Imperijalna) Gill (Imperijalni) Unca tekuća (Imperijalna) - Drop (Imperijalni) - Čajna žlica (Imperijalna) - Žlica (Imperijalna) Masa Gram Kilogram diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index aff90e52..181e8d46 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index b1f35322..acb9b825 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 5d195c88..aae8843a 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 1152bad6..bea8d674 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 262e0409..1505a4e1 100755 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 504d17e6..4607c1e8 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml index f923d065..558157f3 100644 --- a/app/src/main/res/values-kn/strings.xml +++ b/app/src/main/res/values-kn/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 798f5f50..14109cfb 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-kr/strings.xml b/app/src/main/res/values-kr/strings.xml index f00dc220..1786fdd3 100644 --- a/app/src/main/res/values-kr/strings.xml +++ b/app/src/main/res/values-kr/strings.xml @@ -56,7 +56,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -65,19 +64,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 773f2ef2..f8b1f3e4 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index e27c5d50..9692cc07 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 7dcb31be..6b81a703 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index fc468c48..f4df9dd5 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 2b1f3b5a..01070257 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -56,7 +56,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -65,19 +64,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f820e87f..62ef147a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index deec53bb..2ec739e8 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml index 61282d7b..c8e2439a 100644 --- a/app/src/main/res/values-pa-rPK/strings.xml +++ b/app/src/main/res/values-pa-rPK/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index cae823e3..8b1946df 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 389a9993..df6e5085 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d4fc8ac6..0748a611 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index a6f56b3c..3cd0d9f5 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c559e077..e45190f0 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index da417feb..724eab36 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 3ce41954..8ea3b09c 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -51,7 +51,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -60,19 +59,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 72bd9963..84f16af4 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -54,7 +54,6 @@ Децилитар Милилитар Акер стопа - Кубни јард Кубна стопа Кубни палац Барел (САД) @@ -63,19 +62,12 @@ Пинта (САД) Гил (САД) Текућа унца (САД) - Дроп (САД) - Чајна кашика (САД) - Кашика (САД) - Шољица (САД) Барел (Империјални) Галон (Империјални) Четвртина (Империјални) Пинта (Империјални) Гил (Империјални) Текућа унца (Империјални) - Дроп (Империјални) - Чајна кашика (Империјални) - Кашика (Империјални) Маса Грам Килограм diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 4b038b4d..b3228c82 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 453738f1..234ee58a 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml index 26a67160..3d70c4ca 100644 --- a/app/src/main/res/values-te/strings.xml +++ b/app/src/main/res/values-te/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 78855114..aca49275 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -57,7 +57,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -66,19 +65,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index f4875ca9..6aef7f95 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 96579ea8..9b503eea 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml index ee77bcac..e30802ea 100644 --- a/app/src/main/res/values-zgh/strings.xml +++ b/app/src/main/res/values-zgh/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 4018b5eb..c0a73890 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 6e990526..bd82d37d 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -54,7 +54,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -63,19 +62,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index d7609fbe..3caf507b 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -38,7 +38,6 @@ dL mL ac ft - yd³ ft³ in³ fl bl (US) @@ -47,19 +46,12 @@ pt (US fl) gi (US) US fl oz - gtt - tsp - tbsp - c (US) bl (imp) gal (imp) qt (imp) pt (imp) gi (imp) fl oz (imp) - gtt - tsp - tbsp g kg mg diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 066244aa..2cc9922f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -58,7 +58,6 @@ Deciliter Milliliter Acre Foot - Cubic Yard Cubic Foot Cubic Inch Barrel (US) @@ -67,19 +66,12 @@ Pint (US) Gill (US) Fluid Ounce (US) - Drop (US) - Teaspoon (US) - Tablespoon (US) - Cup (US) Barrel (Imperial) Gallon (Imperial) Quart (Imperial) Pint (Imperial) Gill (Imperial) Fluid Ounce (Imperial) - Drop (Imperial) - Teaspoon (Imperial) - Tablespoon (Imperial) Mass Gram Kilogram From 4c5a35543172dafa69b30ae9820e6dd4112601e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 14 Sep 2023 12:14:13 +0200 Subject: [PATCH 53/58] Handle state saving in ConverterView --- .../activities/UnitConverterActivity.kt | 12 +++++++++++ .../calculator/helpers/Constants.kt | 8 ++++++++ .../calculator/views/ConverterView.kt | 20 ++++++++++++++++--- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt index 64dd5353..177e3cc8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt @@ -10,6 +10,7 @@ import com.simplemobiletools.calculator.databinding.ActivityUnitConverterBinding import com.simplemobiletools.calculator.extensions.config import com.simplemobiletools.calculator.extensions.updateViewColors import com.simplemobiletools.calculator.helpers.COMMA +import com.simplemobiletools.calculator.helpers.CONVERTER_STATE import com.simplemobiletools.calculator.helpers.DOT import com.simplemobiletools.calculator.helpers.converters.Converter import com.simplemobiletools.commons.extensions.getProperTextColor @@ -65,6 +66,12 @@ class UnitConverterActivity : SimpleActivity() { binding.viewUnitConverter.viewConverter.root.setConverter(converter) binding.unitConverterToolbar.setTitle(converter.nameResId) + + if (savedInstanceState != null) { + savedInstanceState.getBundle(CONVERTER_STATE)?.also { + binding.viewUnitConverter.viewConverter.root.restoreFromSavedState(it) + } + } } private fun setupOptionsMenu() { @@ -112,6 +119,11 @@ class UnitConverterActivity : SimpleActivity() { } } + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + outState.putBundle(CONVERTER_STATE, binding.viewUnitConverter.viewConverter.root.saveState()) + } + private fun checkHaptic(view: View) { if (vibrateOnButtonPress) { view.performHapticFeedback() diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/Constants.kt index aa4c0362..225bdcb8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/Constants.kt @@ -30,6 +30,8 @@ const val COMMA = "," // shared prefs const val USE_COMMA_AS_DECIMAL_MARK = "use_comma_as_decimal_mark" + +// calculator state const val RES = "res" const val PREVIOUS_CALCULATION = "previousCalculation" const val LAST_KEY = "lastKey" @@ -38,3 +40,9 @@ const val BASE_VALUE = "baseValue" const val SECOND_VALUE = "secondValue" const val INPUT_DISPLAYED_FORMULA = "inputDisplayedFormula" const val CALCULATOR_STATE = "calculatorState" + +// converter state +const val TOP_UNIT = "top_unit" +const val BOTTOM_UNIT = "bottom_unit" +const val CONVERTER_VALUE = "converter_value" +const val CONVERTER_STATE = "converter_state" diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt index 16c44193..5da1f2b4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt @@ -6,6 +6,7 @@ import android.content.res.ColorStateList import android.graphics.drawable.GradientDrawable import android.graphics.drawable.LayerDrawable import android.graphics.drawable.RippleDrawable +import android.os.Bundle import android.util.AttributeSet import android.view.View import android.widget.LinearLayout @@ -13,9 +14,7 @@ import androidx.core.content.res.ResourcesCompat import androidx.core.widget.TextViewCompat import com.simplemobiletools.calculator.R import com.simplemobiletools.calculator.databinding.ViewConverterBinding -import com.simplemobiletools.calculator.helpers.COMMA -import com.simplemobiletools.calculator.helpers.DOT -import com.simplemobiletools.calculator.helpers.NumberFormatHelper +import com.simplemobiletools.calculator.helpers.* import com.simplemobiletools.calculator.helpers.converters.Converter import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.* @@ -242,4 +241,19 @@ class ConverterView @JvmOverloads constructor( } } } + + fun saveState(): Bundle = Bundle().apply { + putInt(TOP_UNIT, converter!!.units.indexOf(topUnit!!)) + putInt(BOTTOM_UNIT, converter!!.units.indexOf(bottomUnit!!)) + putString(CONVERTER_VALUE, binding.topUnitText.text.toString()) + } + + fun restoreFromSavedState(state: Bundle) { + topUnit = converter!!.units[state.getInt(TOP_UNIT)] + bottomUnit = converter!!.units[state.getInt(BOTTOM_UNIT)] + binding.topUnitText.text = state.getString(CONVERTER_VALUE) + + updateBottomValue() + updateUnitLabelsAndSymbols() + } } From 3b5a5b31f850a6984291d41593949d7b821cd574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 14 Sep 2023 12:19:05 +0200 Subject: [PATCH 54/58] Make ripple more visible on top field --- .../simplemobiletools/calculator/views/ConverterView.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt index 5da1f2b4..3fa37746 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt @@ -84,7 +84,12 @@ class ConverterView @JvmOverloads constructor( ) } - binding.topUnitHolder.backgroundTintList = ColorStateList.valueOf(context.getProperPrimaryColor().lightenColor().adjustAlpha(LOWER_ALPHA)) + val rippleDrawable = ResourcesCompat.getDrawable( + resources, R.drawable.colored_ripple, context.theme + )?.constantState?.newDrawable()?.mutate() as RippleDrawable + val rippleColoredLayer = rippleDrawable.findDrawableByLayerId(R.id.colored_background) as GradientDrawable + rippleColoredLayer.applyColorFilter(context.getProperPrimaryColor().lightenColor().adjustAlpha(LOWER_ALPHA)) + binding.topUnitHolder.background = rippleDrawable binding.swapButton?.applyColorFilter(context.getProperPrimaryColor()) listOf(binding.topUnitSymbol, binding.bottomUnitSymbol).forEach { From 8e2e6ec8330b2c2922de0e255732e8043d33bf51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Mon, 18 Sep 2023 07:45:37 +0200 Subject: [PATCH 55/58] Remove rounded corners from top unit ripple --- app/src/main/res/drawable/colored_ripple.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/drawable/colored_ripple.xml b/app/src/main/res/drawable/colored_ripple.xml index 96e937f3..ab4e36e4 100644 --- a/app/src/main/res/drawable/colored_ripple.xml +++ b/app/src/main/res/drawable/colored_ripple.xml @@ -3,7 +3,6 @@ - From eede9d54f630a76e1b44afa763a86bff0d915980 Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Mon, 18 Sep 2023 09:04:33 +0200 Subject: [PATCH 56/58] translating some slovak strings --- app/src/main/res/values-sk/strings.xml | 36 +++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 724eab36..da67bda9 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -3,8 +3,8 @@ Jednoduchá kalkulačka Kalkulačka Vedecká kalkulačka - Unit converter - Swap units + Prevodník jednotiek + Vymeniť jednotky Chyba: delenie nulou @@ -16,7 +16,7 @@ Vibrovať pri stlačení tlačidla Používať čiarku na oddelenie desatinných čísel - Length + Dĺžka Kilometer Meter Centimeter @@ -24,24 +24,24 @@ Micrometer Nanometer Angstrom - Mile + Míľa Yard - Foot - Inch + Noha + Palec Fathom - Nautical Mile - Astronomical Unit + Námorná míľa + Astronomická jednotka Parsec - Light Year - Area - Square Kilometer - Square Meter - Square Centimeter - Square Millimeter - Square Mile - Square Yard - Square Foot - Square Inch + Svetelný rok + Plocha + Štvorcový kilometer + Štvorcový meter + Štvorcový centimeter + Štvorcový milimeter + Štvorcová míľa + Štvorcový yard + Štvorcová noha + Štvorcový palec Acre Hectare Volume From 5922205a1612b1fcaecb3d8ba5375a3174ca2669 Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Mon, 18 Sep 2023 09:27:59 +0200 Subject: [PATCH 57/58] translating more strings --- app/src/main/res/values-sk/strings.xml | 64 +++++++++++++------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index da67bda9..1b3404b1 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -20,8 +20,8 @@ Kilometer Meter Centimeter - Millimeter - Micrometer + Milimeter + Mikrometer Nanometer Angstrom Míľa @@ -31,43 +31,43 @@ Fathom Námorná míľa Astronomická jednotka - Parsec + Parsek Svetelný rok Plocha - Štvorcový kilometer - Štvorcový meter - Štvorcový centimeter - Štvorcový milimeter - Štvorcová míľa - Štvorcový yard - Štvorcová noha - Štvorcový palec - Acre - Hectare - Volume - Cubic Meter - Cubic Decimeter - Cubic Centimeter - Cubic Millimeter + Kilometer štvorcový + Meter štvorcový + Centimeter štvorcový + Milimeter štvorcový + Míľa štvorcová + Yard štvorcový + Noha štvorcová + Palec štvorcový + Aker + Hektár + Objem + Meter kubický + Decimeter kubický + Centimeter kubický + Milimeter kubický Liter Centiliter Deciliter - Milliliter - Acre Foot - Cubic Foot - Cubic Inch - Barrel (US) - Gallon (US) + Mililiter + Akrová noha + Noha kubická + Palec kubický + Sud (US) + Galón (US) Quart (US) - Pint (US) + Pinta (US) Gill (US) - Fluid Ounce (US) - Barrel (Imperial) - Gallon (Imperial) - Quart (Imperial) - Pint (Imperial) - Gill (Imperial) - Fluid Ounce (Imperial) + Tekutá unca (US) + Barel (Imperiálny) + Galón (Imperiálny) + Quart (Imperiálny) + Pint (Imperiálny) + Gill (Imperiálny) + Tekutá unca (Imperiálna) Mass Gram Kilogram From afa3e936a3e7dc550d18a7992a1f37b108021dac Mon Sep 17 00:00:00 2001 From: Tibor Kaputa Date: Mon, 18 Sep 2023 09:33:31 +0200 Subject: [PATCH 58/58] Update strings.xml --- app/src/main/res/values-sk/strings.xml | 44 +++++++++++++------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 1b3404b1..e88d3e24 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -68,34 +68,34 @@ Pint (Imperiálny) Gill (Imperiálny) Tekutá unca (Imperiálna) - Mass + Hmotnosť Gram Kilogram - Milligram - Microgram - Tonne - Pound - Ounce - Grain + Miligram + Mikrogram + Tona + Libra + Uncia + Zrno Dram - Stone - Long Ton - Short Ton - Carat - Carat (Metric) - Temperature - Celsius + Kameň + Dlhá tona + Krátka tona + Karát + Karát (Metrický) + Teplota + Celzius Fahrenheit Rankine Kelvin - Time - Hour - Minute - Second - Microsecond - Day - Week - Year + Čas + Hodina + Minúta + Sekunda + Mikrosekunda + Deň + Týždeň + Rok Ako funguje tlačidlo C? Jedným stlačením viete vymazať 1 znak. Dlhé podržanie vymaže všetky polia naraz.