Rename stuff

- no more childish "my..." names
- reduced the usage of app name
This commit is contained in:
Sad Ellie 2024-01-20 23:59:01 +03:00
parent 27620e86c5
commit e90c30a695
69 changed files with 903 additions and 903 deletions

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -35,7 +35,7 @@ import androidx.navigation.NavGraph.Companion.findStartDestination
import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController import androidx.navigation.compose.rememberNavController
import com.google.accompanist.systemuicontroller.rememberSystemUiController import com.google.accompanist.systemuicontroller.rememberSystemUiController
import com.sadellie.unitto.core.ui.common.UnittoNavigationDrawer import com.sadellie.unitto.core.ui.common.NavigationDrawer
import com.sadellie.unitto.core.ui.common.rememberDrawerState import com.sadellie.unitto.core.ui.common.rememberDrawerState
import com.sadellie.unitto.core.ui.model.DrawerItem import com.sadellie.unitto.core.ui.model.DrawerItem
import com.sadellie.unitto.core.ui.pushDynamicShortcut import com.sadellie.unitto.core.ui.pushDynamicShortcut
@ -48,7 +48,7 @@ import io.github.sadellie.themmo.ThemmoController
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@Composable @Composable
internal fun UnittoApp(prefs: AppPreferences?) { internal fun App(prefs: AppPreferences?) {
val mContext = LocalContext.current val mContext = LocalContext.current
val navController = rememberNavController() val navController = rememberNavController()
@ -88,7 +88,7 @@ internal fun UnittoApp(prefs: AppPreferences?) {
val backgroundColor = MaterialTheme.colorScheme.background val backgroundColor = MaterialTheme.colorScheme.background
val useDarkIcons = remember(backgroundColor) { backgroundColor.luminance() > 0.5f } val useDarkIcons = remember(backgroundColor) { backgroundColor.luminance() > 0.5f }
UnittoNavigationDrawer( NavigationDrawer(
modifier = Modifier, modifier = Modifier,
state = drawerState, state = drawerState,
gesturesEnabled = gesturesEnabled, gesturesEnabled = gesturesEnabled,

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2022-2022 Elshan Agaev * Copyright (c) 2022-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -71,7 +71,7 @@ internal class MainActivity : AppCompatActivity() {
LocalWindowSize provides calculateWindowSizeClass(this@MainActivity), LocalWindowSize provides calculateWindowSizeClass(this@MainActivity),
LocalNumberTypography provides numbersTypography LocalNumberTypography provides numbersTypography
) { ) {
UnittoApp(prefs) App(prefs)
} }
} }
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -40,7 +40,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
@Composable @Composable
fun UnittoButton( fun Button(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
onClick: () -> Unit, onClick: () -> Unit,
onLongClick: (() -> Unit)? = null, onLongClick: (() -> Unit)? = null,

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -28,7 +28,7 @@ import androidx.compose.ui.res.stringResource
import com.sadellie.unitto.core.ui.model.DrawerItem import com.sadellie.unitto.core.ui.model.DrawerItem
@Composable @Composable
internal fun UnittoDrawerItem( internal fun DrawerItem(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
destination: DrawerItem, destination: DrawerItem,
icon: ImageVector, icon: ImageVector,

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -24,6 +24,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
@Composable @Composable
fun UnittoEmptyScreen() { fun EmptyScreen() {
Spacer(modifier = Modifier.fillMaxSize()) Spacer(modifier = Modifier.fillMaxSize())
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2022-2022 Elshan Agaev * Copyright (c) 2022-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -44,7 +44,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@Composable @Composable
fun UnittoListItem( fun ListItem(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
headlineContent: @Composable () -> Unit, headlineContent: @Composable () -> Unit,
supportingContent: @Composable (() -> Unit)? = null, supportingContent: @Composable (() -> Unit)? = null,
@ -90,14 +90,14 @@ fun UnittoListItem(
} }
@Composable @Composable
fun UnittoListItem( fun ListItem(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
headlineText: String, headlineText: String,
supportingText: String? = null, supportingText: String? = null,
icon: ImageVector, icon: ImageVector,
iconDescription: String = headlineText, iconDescription: String = headlineText,
trailing: @Composable (() -> Unit)? = null, trailing: @Composable (() -> Unit)? = null,
) = UnittoListItem( ) = ListItem(
modifier = modifier, modifier = modifier,
headlineContent = { Text(headlineText) }, headlineContent = { Text(headlineText) },
supportingContent = supportingText?.let { { Text(it) } }, supportingContent = supportingText?.let { { Text(it) } },
@ -113,7 +113,7 @@ fun UnittoListItem(
) )
@Composable @Composable
fun UnittoListItem( fun ListItem(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
headlineText: String, headlineText: String,
icon: ImageVector, icon: ImageVector,
@ -121,7 +121,7 @@ fun UnittoListItem(
supportingText: String? = null, supportingText: String? = null,
switchState: Boolean, switchState: Boolean,
onSwitchChange: (Boolean) -> Unit onSwitchChange: (Boolean) -> Unit
) = UnittoListItem( ) = ListItem(
modifier = modifier modifier = modifier
.clickable( .clickable(
interactionSource = remember { MutableInteractionSource() }, interactionSource = remember { MutableInteractionSource() },
@ -143,9 +143,9 @@ fun UnittoListItem(
@Preview @Preview
@Composable @Composable
fun PreviewUnittoListItem1() { fun PreviewListItem1() {
Column { Column {
UnittoListItem( ListItem(
modifier = Modifier, modifier = Modifier,
headlineContent = { Text("Headline") }, headlineContent = { Text("Headline") },
supportingContent = { Text("Support") }, supportingContent = { Text("Support") },
@ -157,7 +157,7 @@ fun PreviewUnittoListItem1() {
}, },
) )
UnittoListItem( ListItem(
modifier = Modifier, modifier = Modifier,
headlineContent = { Text("Headline") }, headlineContent = { Text("Headline") },
leadingContent = { leadingContent = {
@ -165,7 +165,7 @@ fun PreviewUnittoListItem1() {
}, },
) )
UnittoListItem( ListItem(
icon = Icons.Default.Home, icon = Icons.Default.Home,
headlineText = "Text text", headlineText = "Text text",
supportingText = "Support text support text support text support text", supportingText = "Support text support text support text support text",
@ -174,7 +174,7 @@ fun PreviewUnittoListItem1() {
iconDescription = "" iconDescription = ""
) )
UnittoListItem( ListItem(
icon = Icons.Default.Home, icon = Icons.Default.Home,
headlineText = "Text text", headlineText = "Text text",
supportingText = "Support text support text support text support text", supportingText = "Support text support text support text support text",

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -107,7 +107,7 @@ fun rememberDrawerState(
} }
@Composable @Composable
fun UnittoNavigationDrawer( fun NavigationDrawer(
modifier: Modifier, modifier: Modifier,
gesturesEnabled: Boolean, gesturesEnabled: Boolean,
state: DrawerState = rememberDrawerState(), state: DrawerState = rememberDrawerState(),
@ -275,7 +275,7 @@ private fun PreviewUnittoModalNavigationDrawerClose() {
val corScope = rememberCoroutineScope() val corScope = rememberCoroutineScope()
val drawerState = rememberDrawerState(DrawerValue.Open) val drawerState = rememberDrawerState(DrawerValue.Open)
UnittoNavigationDrawer( NavigationDrawer(
modifier = Modifier, modifier = Modifier,
state = drawerState, state = drawerState,
gesturesEnabled = true, gesturesEnabled = true,

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2022 Elshan Agaev * Copyright (c) 2022-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -37,7 +37,7 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
* @param content See [Scaffold] * @param content See [Scaffold]
*/ */
@Composable @Composable
fun UnittoScreenWithLargeTopBar( fun ScaffoldWithLargeTopBar(
title: String, title: String,
navigationIcon: @Composable () -> Unit, navigationIcon: @Composable () -> Unit,
actions: @Composable RowScope.() -> Unit = {}, actions: @Composable RowScope.() -> Unit = {},

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2022 Elshan Agaev * Copyright (c) 2022-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -31,11 +31,11 @@ import androidx.compose.material3.Scaffold
import androidx.compose.material3.TopAppBarColors import androidx.compose.material3.TopAppBarColors
import androidx.compose.material3.TopAppBarDefaults import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.TopAppBarScrollBehavior import androidx.compose.material3.TopAppBarScrollBehavior
import com.sadellie.unitto.core.ui.WindowHeightSizeClass
import com.sadellie.unitto.core.ui.WindowWidthSizeClass
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import com.sadellie.unitto.core.ui.LocalWindowSize import com.sadellie.unitto.core.ui.LocalWindowSize
import com.sadellie.unitto.core.ui.WindowHeightSizeClass
import com.sadellie.unitto.core.ui.WindowWidthSizeClass
/** /**
* Template screen. Uses [Scaffold] and [CenterAlignedTopAppBar] * Template screen. Uses [Scaffold] and [CenterAlignedTopAppBar]
@ -50,7 +50,7 @@ import com.sadellie.unitto.core.ui.LocalWindowSize
* @param content See [Scaffold] * @param content See [Scaffold]
*/ */
@Composable @Composable
fun UnittoScreenWithTopBar( fun ScaffoldWithTopBar(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
title: @Composable () -> Unit, title: @Composable () -> Unit,
navigationIcon: @Composable () -> Unit, navigationIcon: @Composable () -> Unit,

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -76,7 +76,7 @@ import com.sadellie.unitto.core.base.R
import kotlin.math.roundToInt import kotlin.math.roundToInt
@Composable @Composable
fun UnittoSearchBar( fun SearchBar(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
query: TextFieldValue, query: TextFieldValue,
onQueryChange: (TextFieldValue) -> Unit, onQueryChange: (TextFieldValue) -> Unit,
@ -255,7 +255,7 @@ private object UnittoSearchBarTokens {
@Preview @Preview
@Composable @Composable
fun UnittoSearchBarPreview() { fun UnittoSearchBarPreview() {
UnittoSearchBar( SearchBar(
query = TextFieldValue("test"), query = TextFieldValue("test"),
onQueryChange = {}, onQueryChange = {},
navigateUp = {}, navigateUp = {},

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -81,7 +81,7 @@ internal fun ColumnScope.SheetContent(
tabs.forEach { drawerItem -> tabs.forEach { drawerItem ->
val selected = drawerItem.start == currentDestination val selected = drawerItem.start == currentDestination
UnittoDrawerItem( DrawerItem(
modifier = Modifier.padding(NavigationDrawerItemDefaults.ItemPadding), modifier = Modifier.padding(NavigationDrawerItemDefaults.ItemPadding),
destination = drawerItem, destination = drawerItem,
icon = if (selected) drawerItem.selectedIcon else drawerItem.defaultIcon, icon = if (selected) drawerItem.selectedIcon else drawerItem.defaultIcon,
@ -94,7 +94,7 @@ internal fun ColumnScope.SheetContent(
if (LocalWindowSize.current.heightSizeClass == WindowHeightSizeClass.Compact) { if (LocalWindowSize.current.heightSizeClass == WindowHeightSizeClass.Compact) {
HorizontalDivider(Modifier.padding(horizontal = 12.dp, vertical = 8.dp)) HorizontalDivider(Modifier.padding(horizontal = 12.dp, vertical = 8.dp))
UnittoDrawerItem( DrawerItem(
modifier = Modifier.padding(NavigationDrawerItemDefaults.ItemPadding), modifier = Modifier.padding(NavigationDrawerItemDefaults.ItemPadding),
destination = DrawerItem.Settings, destination = DrawerItem.Settings,
icon = DrawerItem.Settings.defaultIcon, icon = DrawerItem.Settings.defaultIcon,
@ -106,7 +106,7 @@ internal fun ColumnScope.SheetContent(
@Preview @Preview
@Composable @Composable
private fun PreviewUnittoDrawerSheet() { private fun PreviewDrawerSheet() {
Column { Column {
SheetContent( SheetContent(
tabs = listOf( tabs = listOf(

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -51,7 +51,7 @@ import kotlin.math.ceil
import kotlin.math.roundToInt import kotlin.math.roundToInt
@Composable @Composable
fun UnittoSlider( fun Slider(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
value: Float, value: Float,
valueRange: ClosedFloatingPointRange<Float>, valueRange: ClosedFloatingPointRange<Float>,
@ -162,7 +162,7 @@ private fun SquigglyTrack(
private fun PreviewNewSlider() { private fun PreviewNewSlider() {
var currentValue by remember { mutableFloatStateOf(9f) } var currentValue by remember { mutableFloatStateOf(9f) }
UnittoSlider( com.sadellie.unitto.core.ui.common.Slider(
value = currentValue, value = currentValue,
valueRange = 0f..16f, valueRange = 0f..16f,
onValueChange = { currentValue = it } onValueChange = { currentValue = it }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2022-2022 Elshan Agaev * Copyright (c) 2022-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -23,7 +23,7 @@ package com.sadellie.unitto.data.converter
* *
* NEVER CHANGE IDS THAT ARE ALREADY HERE, THESE IDS ARE USED IN DATABASE * NEVER CHANGE IDS THAT ARE ALREADY HERE, THESE IDS ARE USED IN DATABASE
*/ */
object MyUnitIDS { object UnitID {
// LENGTH // LENGTH
const val attometer = "attometer" const val attometer = "attometer"
const val nanometer = "nanometer" const val nanometer = "nanometer"

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2022-2023 Elshan Agaev * Copyright (c) 2022-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -73,7 +73,7 @@ class UnitsRepositoryImpl @Inject constructor(
private val currencyRatesDao: CurrencyRatesDao, private val currencyRatesDao: CurrencyRatesDao,
@ApplicationContext private val mContext: Context, @ApplicationContext private val mContext: Context,
) : UnitsRepository { ) : UnitsRepository {
private val myUnits = MutableStateFlow( private val _inMemoryUnits = MutableStateFlow(
lengthCollection + lengthCollection +
currencyCollection + currencyCollection +
massCollection + massCollection +
@ -100,9 +100,9 @@ class UnitsRepositoryImpl @Inject constructor(
fuelConsumptionCollection fuelConsumptionCollection
) )
override val allUnits: Flow<List<AbstractUnit>> = combine( override val units: Flow<List<AbstractUnit>> = combine(
unitsDao.getAllFlow(), unitsDao.getAllFlow(),
myUnits _inMemoryUnits
) { basedList, inMemoryList -> ) { basedList, inMemoryList ->
return@combine inMemoryList.map { inMemoryUnit -> return@combine inMemoryList.map { inMemoryUnit ->
val inBaseUnit = basedList.find { it.unitId == inMemoryUnit.id } val inBaseUnit = basedList.find { it.unitId == inMemoryUnit.id }
@ -117,11 +117,11 @@ class UnitsRepositoryImpl @Inject constructor(
.flowOn(Dispatchers.IO) .flowOn(Dispatchers.IO)
override suspend fun getById(id: String): AbstractUnit { override suspend fun getById(id: String): AbstractUnit {
return allUnits.first().first { it.id == id } return units.first().first { it.id == id }
} }
override suspend fun getCollection(group: UnitGroup): List<AbstractUnit> { override suspend fun getCollection(group: UnitGroup): List<AbstractUnit> {
return allUnits.first().filter { it.group == group } return units.first().filter { it.group == group }
} }
override suspend fun favorite(unit: AbstractUnit) = withContext(Dispatchers.IO) { override suspend fun favorite(unit: AbstractUnit) = withContext(Dispatchers.IO) {
@ -213,7 +213,7 @@ class UnitsRepositoryImpl @Inject constructor(
Log.d("UnitsRepository", "Skipped update: $e") Log.d("UnitsRepository", "Skipped update: $e")
} }
} }
myUnits.update { units -> _inMemoryUnits.update { units ->
units.map { localUnit -> units.map { localUnit ->
if (localUnit.group != UnitGroup.CURRENCY) return@map localUnit if (localUnit.group != UnitGroup.CURRENCY) return@map localUnit
if (localUnit !is ReverseUnit) return@map localUnit if (localUnit !is ReverseUnit) return@map localUnit
@ -246,7 +246,7 @@ class UnitsRepositoryImpl @Inject constructor(
): Map<UnitGroup, List<AbstractUnit>> { ): Map<UnitGroup, List<AbstractUnit>> {
// Leave only shown unit groups // Leave only shown unit groups
var units: Sequence<AbstractUnit> = if (unitGroup == null) { var units: Sequence<AbstractUnit> = if (unitGroup == null) {
allUnits.first().filter { it.group in shownUnitGroups } units.first().filter { it.group in shownUnitGroups }
} else { } else {
getCollection(unitGroup) getCollection(unitGroup)
}.asSequence() }.asSequence()

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,32 +22,32 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
internal val accelerationCollection: List<AbstractUnit> by lazy { internal val accelerationCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit(MyUnitIDS.attometer_per_square_second, BigDecimal.valueOf(1), UnitGroup.ACCELERATION, R.string.unit_attometer_per_square_second, R.string.unit_attometer_per_square_second_short), NormalUnit(UnitID.attometer_per_square_second, BigDecimal.valueOf(1), UnitGroup.ACCELERATION, R.string.unit_attometer_per_square_second, R.string.unit_attometer_per_square_second_short),
NormalUnit(MyUnitIDS.femtometer_per_square_second, BigDecimal.valueOf(1E+3), UnitGroup.ACCELERATION, R.string.unit_femtometer_per_square_second, R.string.unit_femtometer_per_square_second_short), NormalUnit(UnitID.femtometer_per_square_second, BigDecimal.valueOf(1E+3), UnitGroup.ACCELERATION, R.string.unit_femtometer_per_square_second, R.string.unit_femtometer_per_square_second_short),
NormalUnit(MyUnitIDS.picometer_per_square_second, BigDecimal.valueOf(1E+6), UnitGroup.ACCELERATION, R.string.unit_picometer_per_square_second, R.string.unit_picometer_per_square_second_short), NormalUnit(UnitID.picometer_per_square_second, BigDecimal.valueOf(1E+6), UnitGroup.ACCELERATION, R.string.unit_picometer_per_square_second, R.string.unit_picometer_per_square_second_short),
NormalUnit(MyUnitIDS.nanometer_per_square_second, BigDecimal.valueOf(1E+9), UnitGroup.ACCELERATION, R.string.unit_nanometer_per_square_second, R.string.unit_nanometer_per_square_second_short), NormalUnit(UnitID.nanometer_per_square_second, BigDecimal.valueOf(1E+9), UnitGroup.ACCELERATION, R.string.unit_nanometer_per_square_second, R.string.unit_nanometer_per_square_second_short),
NormalUnit(MyUnitIDS.micrometer_per_square_second, BigDecimal.valueOf(1E+12), UnitGroup.ACCELERATION, R.string.unit_micrometer_per_square_second, R.string.unit_micrometer_per_square_second_short), NormalUnit(UnitID.micrometer_per_square_second, BigDecimal.valueOf(1E+12), UnitGroup.ACCELERATION, R.string.unit_micrometer_per_square_second, R.string.unit_micrometer_per_square_second_short),
NormalUnit(MyUnitIDS.millimeter_per_square_second, BigDecimal.valueOf(1E+15), UnitGroup.ACCELERATION, R.string.unit_millimeter_per_square_second, R.string.unit_millimeter_per_square_second_short), NormalUnit(UnitID.millimeter_per_square_second, BigDecimal.valueOf(1E+15), UnitGroup.ACCELERATION, R.string.unit_millimeter_per_square_second, R.string.unit_millimeter_per_square_second_short),
NormalUnit(MyUnitIDS.centimeter_per_square_second, BigDecimal.valueOf(1E+16), UnitGroup.ACCELERATION, R.string.unit_centimeter_per_square_second, R.string.unit_centimeter_per_square_second_short), NormalUnit(UnitID.centimeter_per_square_second, BigDecimal.valueOf(1E+16), UnitGroup.ACCELERATION, R.string.unit_centimeter_per_square_second, R.string.unit_centimeter_per_square_second_short),
NormalUnit(MyUnitIDS.decimeter_per_square_second, BigDecimal.valueOf(1E+17), UnitGroup.ACCELERATION, R.string.unit_decimeter_per_square_second, R.string.unit_decimeter_per_square_second_short), NormalUnit(UnitID.decimeter_per_square_second, BigDecimal.valueOf(1E+17), UnitGroup.ACCELERATION, R.string.unit_decimeter_per_square_second, R.string.unit_decimeter_per_square_second_short),
NormalUnit(MyUnitIDS.meter_per_square_second, BigDecimal.valueOf(1E+18), UnitGroup.ACCELERATION, R.string.unit_meter_per_square_second, R.string.unit_meter_per_square_second_short), NormalUnit(UnitID.meter_per_square_second, BigDecimal.valueOf(1E+18), UnitGroup.ACCELERATION, R.string.unit_meter_per_square_second, R.string.unit_meter_per_square_second_short),
NormalUnit(MyUnitIDS.kilometer_per_square_second, BigDecimal.valueOf(1E+21), UnitGroup.ACCELERATION, R.string.unit_kilometer_per_square_second, R.string.unit_kilometer_per_square_second_short), NormalUnit(UnitID.kilometer_per_square_second, BigDecimal.valueOf(1E+21), UnitGroup.ACCELERATION, R.string.unit_kilometer_per_square_second, R.string.unit_kilometer_per_square_second_short),
NormalUnit(MyUnitIDS.dekameter_per_square_second, BigDecimal.valueOf(1E+19), UnitGroup.ACCELERATION, R.string.unit_dekameter_per_square_second, R.string.unit_dekameter_per_square_second_short), NormalUnit(UnitID.dekameter_per_square_second, BigDecimal.valueOf(1E+19), UnitGroup.ACCELERATION, R.string.unit_dekameter_per_square_second, R.string.unit_dekameter_per_square_second_short),
NormalUnit(MyUnitIDS.hectometer_per_square_second, BigDecimal.valueOf(1E+20), UnitGroup.ACCELERATION, R.string.unit_hectometer_per_square_second, R.string.unit_hectometer_per_square_second_short), NormalUnit(UnitID.hectometer_per_square_second, BigDecimal.valueOf(1E+20), UnitGroup.ACCELERATION, R.string.unit_hectometer_per_square_second, R.string.unit_hectometer_per_square_second_short),
NormalUnit(MyUnitIDS.gal, BigDecimal.valueOf(1E+16), UnitGroup.ACCELERATION, R.string.unit_gal, R.string.unit_gal_short), NormalUnit(UnitID.gal, BigDecimal.valueOf(1E+16), UnitGroup.ACCELERATION, R.string.unit_gal, R.string.unit_gal_short),
NormalUnit(MyUnitIDS.mercury_surface_gravity, BigDecimal.valueOf(3.7E+18), UnitGroup.ACCELERATION, R.string.unit_mercury_surface_gravity, R.string.unit_mercury_surface_gravity_short), NormalUnit(UnitID.mercury_surface_gravity, BigDecimal.valueOf(3.7E+18), UnitGroup.ACCELERATION, R.string.unit_mercury_surface_gravity, R.string.unit_mercury_surface_gravity_short),
NormalUnit(MyUnitIDS.venus_surface_gravity, BigDecimal.valueOf(8.87E+18), UnitGroup.ACCELERATION, R.string.unit_venus_surface_gravity, R.string.unit_venus_surface_gravity_short), NormalUnit(UnitID.venus_surface_gravity, BigDecimal.valueOf(8.87E+18), UnitGroup.ACCELERATION, R.string.unit_venus_surface_gravity, R.string.unit_venus_surface_gravity_short),
NormalUnit(MyUnitIDS.earth_surface_gravity, BigDecimal.valueOf(9.80655E+18), UnitGroup.ACCELERATION, R.string.unit_earth_surface_gravity, R.string.unit_earth_surface_gravity_short), NormalUnit(UnitID.earth_surface_gravity, BigDecimal.valueOf(9.80655E+18), UnitGroup.ACCELERATION, R.string.unit_earth_surface_gravity, R.string.unit_earth_surface_gravity_short),
NormalUnit(MyUnitIDS.mars_surface_gravity, BigDecimal.valueOf(3.71E+18), UnitGroup.ACCELERATION, R.string.unit_mars_surface_gravity, R.string.unit_mars_surface_gravity_short), NormalUnit(UnitID.mars_surface_gravity, BigDecimal.valueOf(3.71E+18), UnitGroup.ACCELERATION, R.string.unit_mars_surface_gravity, R.string.unit_mars_surface_gravity_short),
NormalUnit(MyUnitIDS.jupiter_surface_gravity, BigDecimal.valueOf(2.479E+19), UnitGroup.ACCELERATION, R.string.unit_jupiter_surface_gravity, R.string.unit_jupiter_surface_gravity_short), NormalUnit(UnitID.jupiter_surface_gravity, BigDecimal.valueOf(2.479E+19), UnitGroup.ACCELERATION, R.string.unit_jupiter_surface_gravity, R.string.unit_jupiter_surface_gravity_short),
NormalUnit(MyUnitIDS.saturn_surface_gravity, BigDecimal.valueOf(1.044E+19), UnitGroup.ACCELERATION, R.string.unit_saturn_surface_gravity, R.string.unit_saturn_surface_gravity_short), NormalUnit(UnitID.saturn_surface_gravity, BigDecimal.valueOf(1.044E+19), UnitGroup.ACCELERATION, R.string.unit_saturn_surface_gravity, R.string.unit_saturn_surface_gravity_short),
NormalUnit(MyUnitIDS.uranus_surface_gravity, BigDecimal.valueOf(8.87E+18), UnitGroup.ACCELERATION, R.string.unit_uranus_surface_gravity, R.string.unit_uranus_surface_gravity_short), NormalUnit(UnitID.uranus_surface_gravity, BigDecimal.valueOf(8.87E+18), UnitGroup.ACCELERATION, R.string.unit_uranus_surface_gravity, R.string.unit_uranus_surface_gravity_short),
NormalUnit(MyUnitIDS.neptune_surface_gravity, BigDecimal.valueOf(1.115E+19), UnitGroup.ACCELERATION, R.string.unit_neptune_surface_gravity, R.string.unit_neptune_surface_gravity_short), NormalUnit(UnitID.neptune_surface_gravity, BigDecimal.valueOf(1.115E+19), UnitGroup.ACCELERATION, R.string.unit_neptune_surface_gravity, R.string.unit_neptune_surface_gravity_short),
NormalUnit(MyUnitIDS.sun_surface_gravity, BigDecimal.valueOf(2.74E+20), UnitGroup.ACCELERATION, R.string.unit_sun_surface_gravity, R.string.unit_sun_surface_gravity_short), NormalUnit(UnitID.sun_surface_gravity, BigDecimal.valueOf(2.74E+20), UnitGroup.ACCELERATION, R.string.unit_sun_surface_gravity, R.string.unit_sun_surface_gravity_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,16 +22,16 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
internal val angleCollection: List<AbstractUnit> by lazy { internal val angleCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit(MyUnitIDS.angle_second, BigDecimal.valueOf(1), UnitGroup.ANGLE, R.string.unit_angle_second, R.string.unit_angle_second_short), NormalUnit(UnitID.angle_second, BigDecimal.valueOf(1), UnitGroup.ANGLE, R.string.unit_angle_second, R.string.unit_angle_second_short),
NormalUnit(MyUnitIDS.angle_minute, BigDecimal.valueOf(60), UnitGroup.ANGLE, R.string.unit_angle_minute, R.string.unit_angle_minute_short), NormalUnit(UnitID.angle_minute, BigDecimal.valueOf(60), UnitGroup.ANGLE, R.string.unit_angle_minute, R.string.unit_angle_minute_short),
NormalUnit(MyUnitIDS.degree, BigDecimal.valueOf(3600), UnitGroup.ANGLE, R.string.unit_degree, R.string.unit_degree_short), NormalUnit(UnitID.degree, BigDecimal.valueOf(3600), UnitGroup.ANGLE, R.string.unit_degree, R.string.unit_degree_short),
NormalUnit(MyUnitIDS.radian, BigDecimal.valueOf(206264.8062471), UnitGroup.ANGLE, R.string.unit_radian, R.string.unit_radian_short), NormalUnit(UnitID.radian, BigDecimal.valueOf(206264.8062471), UnitGroup.ANGLE, R.string.unit_radian, R.string.unit_radian_short),
NormalUnit(MyUnitIDS.sextant, BigDecimal.valueOf(216000), UnitGroup.ANGLE, R.string.unit_sextant, R.string.unit_sextant_short), NormalUnit(UnitID.sextant, BigDecimal.valueOf(216000), UnitGroup.ANGLE, R.string.unit_sextant, R.string.unit_sextant_short),
NormalUnit(MyUnitIDS.turn, BigDecimal.valueOf(1296000), UnitGroup.ANGLE, R.string.unit_turn, R.string.unit_turn_short), NormalUnit(UnitID.turn, BigDecimal.valueOf(1296000), UnitGroup.ANGLE, R.string.unit_turn, R.string.unit_turn_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,24 +22,24 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
internal val areaCollection: List<AbstractUnit> by lazy { internal val areaCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit(MyUnitIDS.cent, BigDecimal.valueOf(6.083246572E+33), UnitGroup.AREA, R.string.unit_cent, R.string.unit_cent_short), NormalUnit(UnitID.cent, BigDecimal.valueOf(6.083246572E+33), UnitGroup.AREA, R.string.unit_cent, R.string.unit_cent_short),
NormalUnit(MyUnitIDS.acre, BigDecimal.valueOf(6.083246572E+31), UnitGroup.AREA, R.string.unit_acre, R.string.unit_acre_short), NormalUnit(UnitID.acre, BigDecimal.valueOf(6.083246572E+31), UnitGroup.AREA, R.string.unit_acre, R.string.unit_acre_short),
NormalUnit(MyUnitIDS.hectare, BigDecimal.valueOf(1.503202964E+32), UnitGroup.AREA, R.string.unit_hectare, R.string.unit_hectare_short ), NormalUnit(UnitID.hectare, BigDecimal.valueOf(1.503202964E+32), UnitGroup.AREA, R.string.unit_hectare, R.string.unit_hectare_short ),
NormalUnit(MyUnitIDS.square_foot, BigDecimal.valueOf(1.396521251E+27), UnitGroup.AREA, R.string.unit_square_foot, R.string.unit_square_foot_short), NormalUnit(UnitID.square_foot, BigDecimal.valueOf(1.396521251E+27), UnitGroup.AREA, R.string.unit_square_foot, R.string.unit_square_foot_short),
NormalUnit(MyUnitIDS.square_mile, BigDecimal.valueOf(3.893277806E+34), UnitGroup.AREA, R.string.unit_square_mile, R.string.unit_square_mile_short), NormalUnit(UnitID.square_mile, BigDecimal.valueOf(3.893277806E+34), UnitGroup.AREA, R.string.unit_square_mile, R.string.unit_square_mile_short),
NormalUnit(MyUnitIDS.square_yard, BigDecimal.valueOf(1.256869126E+28), UnitGroup.AREA, R.string.unit_square_yard, R.string.unit_square_yard_short), NormalUnit(UnitID.square_yard, BigDecimal.valueOf(1.256869126E+28), UnitGroup.AREA, R.string.unit_square_yard, R.string.unit_square_yard_short),
NormalUnit(MyUnitIDS.square_inch, BigDecimal.valueOf(9.698064247E+24), UnitGroup.AREA, R.string.unit_square_inch, R.string.unit_square_inch_short), NormalUnit(UnitID.square_inch, BigDecimal.valueOf(9.698064247E+24), UnitGroup.AREA, R.string.unit_square_inch, R.string.unit_square_inch_short),
NormalUnit(MyUnitIDS.square_micrometer, BigDecimal.valueOf(1.503202964E+16), UnitGroup.AREA, R.string.unit_square_micrometer, R.string.unit_square_micrometer_short), NormalUnit(UnitID.square_micrometer, BigDecimal.valueOf(1.503202964E+16), UnitGroup.AREA, R.string.unit_square_micrometer, R.string.unit_square_micrometer_short),
NormalUnit(MyUnitIDS.square_millimeter, BigDecimal.valueOf(1.503202964E+22), UnitGroup.AREA, R.string.unit_square_millimeter, R.string.unit_square_millimeter_short), NormalUnit(UnitID.square_millimeter, BigDecimal.valueOf(1.503202964E+22), UnitGroup.AREA, R.string.unit_square_millimeter, R.string.unit_square_millimeter_short),
NormalUnit(MyUnitIDS.square_centimeter, BigDecimal.valueOf(1.503202964E+24), UnitGroup.AREA, R.string.unit_square_centimeter, R.string.unit_square_centimeter_short), NormalUnit(UnitID.square_centimeter, BigDecimal.valueOf(1.503202964E+24), UnitGroup.AREA, R.string.unit_square_centimeter, R.string.unit_square_centimeter_short),
NormalUnit(MyUnitIDS.square_decimeter, BigDecimal.valueOf(1.503202964E+26), UnitGroup.AREA, R.string.unit_square_decimeter, R.string.unit_square_decimeter_short), NormalUnit(UnitID.square_decimeter, BigDecimal.valueOf(1.503202964E+26), UnitGroup.AREA, R.string.unit_square_decimeter, R.string.unit_square_decimeter_short),
NormalUnit(MyUnitIDS.square_meter, BigDecimal.valueOf(1.503202964E+28), UnitGroup.AREA, R.string.unit_square_meter, R.string.unit_square_meter_short), NormalUnit(UnitID.square_meter, BigDecimal.valueOf(1.503202964E+28), UnitGroup.AREA, R.string.unit_square_meter, R.string.unit_square_meter_short),
NormalUnit(MyUnitIDS.square_kilometer, BigDecimal.valueOf(1.503202964E+34), UnitGroup.AREA, R.string.unit_square_kilometer, R.string.unit_square_kilometer_short), NormalUnit(UnitID.square_kilometer, BigDecimal.valueOf(1.503202964E+34), UnitGroup.AREA, R.string.unit_square_kilometer, R.string.unit_square_kilometer_short),
NormalUnit(MyUnitIDS.electron_cross_section, BigDecimal.valueOf(1.0), UnitGroup.AREA, R.string.unit_electron_cross_section, R.string.unit_electron_cross_section_short), NormalUnit(UnitID.electron_cross_section, BigDecimal.valueOf(1.0), UnitGroup.AREA, R.string.unit_electron_cross_section, R.string.unit_electron_cross_section_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,218 +22,218 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.ReverseUnit import com.sadellie.unitto.data.model.unit.ReverseUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
internal val currencyCollection: List<AbstractUnit> by lazy { internal val currencyCollection: List<AbstractUnit> by lazy {
listOf( listOf(
ReverseUnit(MyUnitIDS.currency_1inch, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_1inch, R.string.unit_currency_1inch_short), ReverseUnit(UnitID.currency_1inch, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_1inch, R.string.unit_currency_1inch_short),
ReverseUnit(MyUnitIDS.currency_ada, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ada, R.string.unit_currency_ada_short), ReverseUnit(UnitID.currency_ada, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ada, R.string.unit_currency_ada_short),
ReverseUnit(MyUnitIDS.currency_aed, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_aed, R.string.unit_currency_aed_short), ReverseUnit(UnitID.currency_aed, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_aed, R.string.unit_currency_aed_short),
ReverseUnit(MyUnitIDS.currency_afn, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_afn, R.string.unit_currency_afn_short), ReverseUnit(UnitID.currency_afn, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_afn, R.string.unit_currency_afn_short),
ReverseUnit(MyUnitIDS.currency_algo, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_algo, R.string.unit_currency_algo_short), ReverseUnit(UnitID.currency_algo, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_algo, R.string.unit_currency_algo_short),
ReverseUnit(MyUnitIDS.currency_all, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_all, R.string.unit_currency_all_short), ReverseUnit(UnitID.currency_all, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_all, R.string.unit_currency_all_short),
ReverseUnit(MyUnitIDS.currency_amd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_amd, R.string.unit_currency_amd_short), ReverseUnit(UnitID.currency_amd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_amd, R.string.unit_currency_amd_short),
ReverseUnit(MyUnitIDS.currency_ang, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ang, R.string.unit_currency_ang_short), ReverseUnit(UnitID.currency_ang, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ang, R.string.unit_currency_ang_short),
ReverseUnit(MyUnitIDS.currency_aoa, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_aoa, R.string.unit_currency_aoa_short), ReverseUnit(UnitID.currency_aoa, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_aoa, R.string.unit_currency_aoa_short),
ReverseUnit(MyUnitIDS.currency_ars, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ars, R.string.unit_currency_ars_short), ReverseUnit(UnitID.currency_ars, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ars, R.string.unit_currency_ars_short),
ReverseUnit(MyUnitIDS.currency_atom, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_atom, R.string.unit_currency_atom_short), ReverseUnit(UnitID.currency_atom, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_atom, R.string.unit_currency_atom_short),
ReverseUnit(MyUnitIDS.currency_aud, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_aud, R.string.unit_currency_aud_short), ReverseUnit(UnitID.currency_aud, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_aud, R.string.unit_currency_aud_short),
ReverseUnit(MyUnitIDS.currency_avax, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_avax, R.string.unit_currency_avax_short), ReverseUnit(UnitID.currency_avax, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_avax, R.string.unit_currency_avax_short),
ReverseUnit(MyUnitIDS.currency_awg, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_awg, R.string.unit_currency_awg_short), ReverseUnit(UnitID.currency_awg, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_awg, R.string.unit_currency_awg_short),
ReverseUnit(MyUnitIDS.currency_azn, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_azn, R.string.unit_currency_azn_short), ReverseUnit(UnitID.currency_azn, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_azn, R.string.unit_currency_azn_short),
ReverseUnit(MyUnitIDS.currency_bam, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bam, R.string.unit_currency_bam_short), ReverseUnit(UnitID.currency_bam, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bam, R.string.unit_currency_bam_short),
ReverseUnit(MyUnitIDS.currency_bbd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bbd, R.string.unit_currency_bbd_short), ReverseUnit(UnitID.currency_bbd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bbd, R.string.unit_currency_bbd_short),
ReverseUnit(MyUnitIDS.currency_bch, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bch, R.string.unit_currency_bch_short), ReverseUnit(UnitID.currency_bch, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bch, R.string.unit_currency_bch_short),
ReverseUnit(MyUnitIDS.currency_bdt, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bdt, R.string.unit_currency_bdt_short), ReverseUnit(UnitID.currency_bdt, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bdt, R.string.unit_currency_bdt_short),
ReverseUnit(MyUnitIDS.currency_bgn, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bgn, R.string.unit_currency_bgn_short), ReverseUnit(UnitID.currency_bgn, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bgn, R.string.unit_currency_bgn_short),
ReverseUnit(MyUnitIDS.currency_bhd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bhd, R.string.unit_currency_bhd_short), ReverseUnit(UnitID.currency_bhd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bhd, R.string.unit_currency_bhd_short),
ReverseUnit(MyUnitIDS.currency_bif, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bif, R.string.unit_currency_bif_short), ReverseUnit(UnitID.currency_bif, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bif, R.string.unit_currency_bif_short),
ReverseUnit(MyUnitIDS.currency_bmd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bmd, R.string.unit_currency_bmd_short), ReverseUnit(UnitID.currency_bmd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bmd, R.string.unit_currency_bmd_short),
ReverseUnit(MyUnitIDS.currency_bnb, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bnb, R.string.unit_currency_bnb_short), ReverseUnit(UnitID.currency_bnb, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bnb, R.string.unit_currency_bnb_short),
ReverseUnit(MyUnitIDS.currency_bnd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bnd, R.string.unit_currency_bnd_short), ReverseUnit(UnitID.currency_bnd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bnd, R.string.unit_currency_bnd_short),
ReverseUnit(MyUnitIDS.currency_bob, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bob, R.string.unit_currency_bob_short), ReverseUnit(UnitID.currency_bob, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bob, R.string.unit_currency_bob_short),
ReverseUnit(MyUnitIDS.currency_brl, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_brl, R.string.unit_currency_brl_short), ReverseUnit(UnitID.currency_brl, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_brl, R.string.unit_currency_brl_short),
ReverseUnit(MyUnitIDS.currency_bsd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bsd, R.string.unit_currency_bsd_short), ReverseUnit(UnitID.currency_bsd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bsd, R.string.unit_currency_bsd_short),
ReverseUnit(MyUnitIDS.currency_btc, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_btc, R.string.unit_currency_btc_short), ReverseUnit(UnitID.currency_btc, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_btc, R.string.unit_currency_btc_short),
ReverseUnit(MyUnitIDS.currency_btn, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_btn, R.string.unit_currency_btn_short), ReverseUnit(UnitID.currency_btn, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_btn, R.string.unit_currency_btn_short),
ReverseUnit(MyUnitIDS.currency_busd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_busd, R.string.unit_currency_busd_short), ReverseUnit(UnitID.currency_busd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_busd, R.string.unit_currency_busd_short),
ReverseUnit(MyUnitIDS.currency_bwp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bwp, R.string.unit_currency_bwp_short), ReverseUnit(UnitID.currency_bwp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bwp, R.string.unit_currency_bwp_short),
ReverseUnit(MyUnitIDS.currency_byn, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_byn, R.string.unit_currency_byn_short), ReverseUnit(UnitID.currency_byn, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_byn, R.string.unit_currency_byn_short),
ReverseUnit(MyUnitIDS.currency_byr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_byr, R.string.unit_currency_byr_short), ReverseUnit(UnitID.currency_byr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_byr, R.string.unit_currency_byr_short),
ReverseUnit(MyUnitIDS.currency_bzd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bzd, R.string.unit_currency_bzd_short), ReverseUnit(UnitID.currency_bzd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_bzd, R.string.unit_currency_bzd_short),
ReverseUnit(MyUnitIDS.currency_cad, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_cad, R.string.unit_currency_cad_short), ReverseUnit(UnitID.currency_cad, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_cad, R.string.unit_currency_cad_short),
ReverseUnit(MyUnitIDS.currency_cdf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_cdf, R.string.unit_currency_cdf_short), ReverseUnit(UnitID.currency_cdf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_cdf, R.string.unit_currency_cdf_short),
ReverseUnit(MyUnitIDS.currency_chf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_chf, R.string.unit_currency_chf_short), ReverseUnit(UnitID.currency_chf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_chf, R.string.unit_currency_chf_short),
ReverseUnit(MyUnitIDS.currency_chz, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_chz, R.string.unit_currency_chz_short), ReverseUnit(UnitID.currency_chz, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_chz, R.string.unit_currency_chz_short),
ReverseUnit(MyUnitIDS.currency_clf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_clf, R.string.unit_currency_clf_short), ReverseUnit(UnitID.currency_clf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_clf, R.string.unit_currency_clf_short),
ReverseUnit(MyUnitIDS.currency_clp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_clp, R.string.unit_currency_clp_short), ReverseUnit(UnitID.currency_clp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_clp, R.string.unit_currency_clp_short),
ReverseUnit(MyUnitIDS.currency_cny, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_cny, R.string.unit_currency_cny_short), ReverseUnit(UnitID.currency_cny, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_cny, R.string.unit_currency_cny_short),
ReverseUnit(MyUnitIDS.currency_cop, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_cop, R.string.unit_currency_cop_short), ReverseUnit(UnitID.currency_cop, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_cop, R.string.unit_currency_cop_short),
ReverseUnit(MyUnitIDS.currency_crc, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_crc, R.string.unit_currency_crc_short), ReverseUnit(UnitID.currency_crc, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_crc, R.string.unit_currency_crc_short),
ReverseUnit(MyUnitIDS.currency_cro, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_cro, R.string.unit_currency_cro_short), ReverseUnit(UnitID.currency_cro, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_cro, R.string.unit_currency_cro_short),
ReverseUnit(MyUnitIDS.currency_cuc, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_cuc, R.string.unit_currency_cuc_short), ReverseUnit(UnitID.currency_cuc, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_cuc, R.string.unit_currency_cuc_short),
ReverseUnit(MyUnitIDS.currency_cup, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_cup, R.string.unit_currency_cup_short), ReverseUnit(UnitID.currency_cup, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_cup, R.string.unit_currency_cup_short),
ReverseUnit(MyUnitIDS.currency_cve, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_cve, R.string.unit_currency_cve_short), ReverseUnit(UnitID.currency_cve, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_cve, R.string.unit_currency_cve_short),
ReverseUnit(MyUnitIDS.currency_czk, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_czk, R.string.unit_currency_czk_short), ReverseUnit(UnitID.currency_czk, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_czk, R.string.unit_currency_czk_short),
ReverseUnit(MyUnitIDS.currency_dai, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_dai, R.string.unit_currency_dai_short), ReverseUnit(UnitID.currency_dai, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_dai, R.string.unit_currency_dai_short),
ReverseUnit(MyUnitIDS.currency_djf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_djf, R.string.unit_currency_djf_short), ReverseUnit(UnitID.currency_djf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_djf, R.string.unit_currency_djf_short),
ReverseUnit(MyUnitIDS.currency_dkk, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_dkk, R.string.unit_currency_dkk_short), ReverseUnit(UnitID.currency_dkk, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_dkk, R.string.unit_currency_dkk_short),
ReverseUnit(MyUnitIDS.currency_doge, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_doge, R.string.unit_currency_doge_short), ReverseUnit(UnitID.currency_doge, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_doge, R.string.unit_currency_doge_short),
ReverseUnit(MyUnitIDS.currency_dop, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_dop, R.string.unit_currency_dop_short), ReverseUnit(UnitID.currency_dop, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_dop, R.string.unit_currency_dop_short),
ReverseUnit(MyUnitIDS.currency_dot, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_dot, R.string.unit_currency_dot_short), ReverseUnit(UnitID.currency_dot, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_dot, R.string.unit_currency_dot_short),
ReverseUnit(MyUnitIDS.currency_dzd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_dzd, R.string.unit_currency_dzd_short), ReverseUnit(UnitID.currency_dzd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_dzd, R.string.unit_currency_dzd_short),
ReverseUnit(MyUnitIDS.currency_egld, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_egld, R.string.unit_currency_egld_short), ReverseUnit(UnitID.currency_egld, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_egld, R.string.unit_currency_egld_short),
ReverseUnit(MyUnitIDS.currency_egp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_egp, R.string.unit_currency_egp_short), ReverseUnit(UnitID.currency_egp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_egp, R.string.unit_currency_egp_short),
ReverseUnit(MyUnitIDS.currency_enj, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_enj, R.string.unit_currency_enj_short), ReverseUnit(UnitID.currency_enj, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_enj, R.string.unit_currency_enj_short),
ReverseUnit(MyUnitIDS.currency_ern, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ern, R.string.unit_currency_ern_short), ReverseUnit(UnitID.currency_ern, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ern, R.string.unit_currency_ern_short),
ReverseUnit(MyUnitIDS.currency_etb, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_etb, R.string.unit_currency_etb_short), ReverseUnit(UnitID.currency_etb, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_etb, R.string.unit_currency_etb_short),
ReverseUnit(MyUnitIDS.currency_etc, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_etc, R.string.unit_currency_etc_short), ReverseUnit(UnitID.currency_etc, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_etc, R.string.unit_currency_etc_short),
ReverseUnit(MyUnitIDS.currency_eth, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_eth, R.string.unit_currency_eth_short), ReverseUnit(UnitID.currency_eth, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_eth, R.string.unit_currency_eth_short),
ReverseUnit(MyUnitIDS.currency_eur, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_eur, R.string.unit_currency_eur_short), ReverseUnit(UnitID.currency_eur, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_eur, R.string.unit_currency_eur_short),
ReverseUnit(MyUnitIDS.currency_fil, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_fil, R.string.unit_currency_fil_short), ReverseUnit(UnitID.currency_fil, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_fil, R.string.unit_currency_fil_short),
ReverseUnit(MyUnitIDS.currency_fjd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_fjd, R.string.unit_currency_fjd_short), ReverseUnit(UnitID.currency_fjd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_fjd, R.string.unit_currency_fjd_short),
ReverseUnit(MyUnitIDS.currency_fkp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_fkp, R.string.unit_currency_fkp_short), ReverseUnit(UnitID.currency_fkp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_fkp, R.string.unit_currency_fkp_short),
ReverseUnit(MyUnitIDS.currency_ftt, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ftt, R.string.unit_currency_ftt_short), ReverseUnit(UnitID.currency_ftt, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ftt, R.string.unit_currency_ftt_short),
ReverseUnit(MyUnitIDS.currency_gbp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_gbp, R.string.unit_currency_gbp_short), ReverseUnit(UnitID.currency_gbp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_gbp, R.string.unit_currency_gbp_short),
ReverseUnit(MyUnitIDS.currency_gel, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_gel, R.string.unit_currency_gel_short), ReverseUnit(UnitID.currency_gel, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_gel, R.string.unit_currency_gel_short),
ReverseUnit(MyUnitIDS.currency_ggp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ggp, R.string.unit_currency_ggp_short), ReverseUnit(UnitID.currency_ggp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ggp, R.string.unit_currency_ggp_short),
ReverseUnit(MyUnitIDS.currency_ghs, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ghs, R.string.unit_currency_ghs_short), ReverseUnit(UnitID.currency_ghs, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ghs, R.string.unit_currency_ghs_short),
ReverseUnit(MyUnitIDS.currency_gip, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_gip, R.string.unit_currency_gip_short), ReverseUnit(UnitID.currency_gip, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_gip, R.string.unit_currency_gip_short),
ReverseUnit(MyUnitIDS.currency_gmd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_gmd, R.string.unit_currency_gmd_short), ReverseUnit(UnitID.currency_gmd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_gmd, R.string.unit_currency_gmd_short),
ReverseUnit(MyUnitIDS.currency_gnf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_gnf, R.string.unit_currency_gnf_short), ReverseUnit(UnitID.currency_gnf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_gnf, R.string.unit_currency_gnf_short),
ReverseUnit(MyUnitIDS.currency_grt, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_grt, R.string.unit_currency_grt_short), ReverseUnit(UnitID.currency_grt, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_grt, R.string.unit_currency_grt_short),
ReverseUnit(MyUnitIDS.currency_gtq, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_gtq, R.string.unit_currency_gtq_short), ReverseUnit(UnitID.currency_gtq, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_gtq, R.string.unit_currency_gtq_short),
ReverseUnit(MyUnitIDS.currency_gyd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_gyd, R.string.unit_currency_gyd_short), ReverseUnit(UnitID.currency_gyd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_gyd, R.string.unit_currency_gyd_short),
ReverseUnit(MyUnitIDS.currency_hkd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_hkd, R.string.unit_currency_hkd_short), ReverseUnit(UnitID.currency_hkd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_hkd, R.string.unit_currency_hkd_short),
ReverseUnit(MyUnitIDS.currency_hnl, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_hnl, R.string.unit_currency_hnl_short), ReverseUnit(UnitID.currency_hnl, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_hnl, R.string.unit_currency_hnl_short),
ReverseUnit(MyUnitIDS.currency_hrk, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_hrk, R.string.unit_currency_hrk_short), ReverseUnit(UnitID.currency_hrk, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_hrk, R.string.unit_currency_hrk_short),
ReverseUnit(MyUnitIDS.currency_htg, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_htg, R.string.unit_currency_htg_short), ReverseUnit(UnitID.currency_htg, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_htg, R.string.unit_currency_htg_short),
ReverseUnit(MyUnitIDS.currency_huf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_huf, R.string.unit_currency_huf_short), ReverseUnit(UnitID.currency_huf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_huf, R.string.unit_currency_huf_short),
ReverseUnit(MyUnitIDS.currency_icp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_icp, R.string.unit_currency_icp_short), ReverseUnit(UnitID.currency_icp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_icp, R.string.unit_currency_icp_short),
ReverseUnit(MyUnitIDS.currency_idr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_idr, R.string.unit_currency_idr_short), ReverseUnit(UnitID.currency_idr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_idr, R.string.unit_currency_idr_short),
ReverseUnit(MyUnitIDS.currency_ils, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ils, R.string.unit_currency_ils_short), ReverseUnit(UnitID.currency_ils, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ils, R.string.unit_currency_ils_short),
ReverseUnit(MyUnitIDS.currency_imp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_imp, R.string.unit_currency_imp_short), ReverseUnit(UnitID.currency_imp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_imp, R.string.unit_currency_imp_short),
ReverseUnit(MyUnitIDS.currency_inj, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_inj, R.string.unit_currency_inj_short), ReverseUnit(UnitID.currency_inj, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_inj, R.string.unit_currency_inj_short),
ReverseUnit(MyUnitIDS.currency_inr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_inr, R.string.unit_currency_inr_short), ReverseUnit(UnitID.currency_inr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_inr, R.string.unit_currency_inr_short),
ReverseUnit(MyUnitIDS.currency_iqd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_iqd, R.string.unit_currency_iqd_short), ReverseUnit(UnitID.currency_iqd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_iqd, R.string.unit_currency_iqd_short),
ReverseUnit(MyUnitIDS.currency_irr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_irr, R.string.unit_currency_irr_short), ReverseUnit(UnitID.currency_irr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_irr, R.string.unit_currency_irr_short),
ReverseUnit(MyUnitIDS.currency_isk, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_isk, R.string.unit_currency_isk_short), ReverseUnit(UnitID.currency_isk, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_isk, R.string.unit_currency_isk_short),
ReverseUnit(MyUnitIDS.currency_jep, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_jep, R.string.unit_currency_jep_short), ReverseUnit(UnitID.currency_jep, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_jep, R.string.unit_currency_jep_short),
ReverseUnit(MyUnitIDS.currency_jmd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_jmd, R.string.unit_currency_jmd_short), ReverseUnit(UnitID.currency_jmd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_jmd, R.string.unit_currency_jmd_short),
ReverseUnit(MyUnitIDS.currency_jod, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_jod, R.string.unit_currency_jod_short), ReverseUnit(UnitID.currency_jod, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_jod, R.string.unit_currency_jod_short),
ReverseUnit(MyUnitIDS.currency_jpy, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_jpy, R.string.unit_currency_jpy_short), ReverseUnit(UnitID.currency_jpy, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_jpy, R.string.unit_currency_jpy_short),
ReverseUnit(MyUnitIDS.currency_kes, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_kes, R.string.unit_currency_kes_short), ReverseUnit(UnitID.currency_kes, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_kes, R.string.unit_currency_kes_short),
ReverseUnit(MyUnitIDS.currency_kgs, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_kgs, R.string.unit_currency_kgs_short), ReverseUnit(UnitID.currency_kgs, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_kgs, R.string.unit_currency_kgs_short),
ReverseUnit(MyUnitIDS.currency_khr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_khr, R.string.unit_currency_khr_short), ReverseUnit(UnitID.currency_khr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_khr, R.string.unit_currency_khr_short),
ReverseUnit(MyUnitIDS.currency_kmf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_kmf, R.string.unit_currency_kmf_short), ReverseUnit(UnitID.currency_kmf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_kmf, R.string.unit_currency_kmf_short),
ReverseUnit(MyUnitIDS.currency_kpw, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_kpw, R.string.unit_currency_kpw_short), ReverseUnit(UnitID.currency_kpw, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_kpw, R.string.unit_currency_kpw_short),
ReverseUnit(MyUnitIDS.currency_krw, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_krw, R.string.unit_currency_krw_short), ReverseUnit(UnitID.currency_krw, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_krw, R.string.unit_currency_krw_short),
ReverseUnit(MyUnitIDS.currency_ksm, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ksm, R.string.unit_currency_ksm_short), ReverseUnit(UnitID.currency_ksm, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ksm, R.string.unit_currency_ksm_short),
ReverseUnit(MyUnitIDS.currency_kwd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_kwd, R.string.unit_currency_kwd_short), ReverseUnit(UnitID.currency_kwd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_kwd, R.string.unit_currency_kwd_short),
ReverseUnit(MyUnitIDS.currency_kyd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_kyd, R.string.unit_currency_kyd_short), ReverseUnit(UnitID.currency_kyd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_kyd, R.string.unit_currency_kyd_short),
ReverseUnit(MyUnitIDS.currency_kzt, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_kzt, R.string.unit_currency_kzt_short), ReverseUnit(UnitID.currency_kzt, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_kzt, R.string.unit_currency_kzt_short),
ReverseUnit(MyUnitIDS.currency_lak, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_lak, R.string.unit_currency_lak_short), ReverseUnit(UnitID.currency_lak, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_lak, R.string.unit_currency_lak_short),
ReverseUnit(MyUnitIDS.currency_lbp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_lbp, R.string.unit_currency_lbp_short), ReverseUnit(UnitID.currency_lbp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_lbp, R.string.unit_currency_lbp_short),
ReverseUnit(MyUnitIDS.currency_link, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_link, R.string.unit_currency_link_short), ReverseUnit(UnitID.currency_link, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_link, R.string.unit_currency_link_short),
ReverseUnit(MyUnitIDS.currency_lkr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_lkr, R.string.unit_currency_lkr_short), ReverseUnit(UnitID.currency_lkr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_lkr, R.string.unit_currency_lkr_short),
ReverseUnit(MyUnitIDS.currency_lrd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_lrd, R.string.unit_currency_lrd_short), ReverseUnit(UnitID.currency_lrd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_lrd, R.string.unit_currency_lrd_short),
ReverseUnit(MyUnitIDS.currency_lsl, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_lsl, R.string.unit_currency_lsl_short), ReverseUnit(UnitID.currency_lsl, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_lsl, R.string.unit_currency_lsl_short),
ReverseUnit(MyUnitIDS.currency_ltc, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ltc, R.string.unit_currency_ltc_short), ReverseUnit(UnitID.currency_ltc, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ltc, R.string.unit_currency_ltc_short),
ReverseUnit(MyUnitIDS.currency_ltl, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ltl, R.string.unit_currency_ltl_short), ReverseUnit(UnitID.currency_ltl, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ltl, R.string.unit_currency_ltl_short),
ReverseUnit(MyUnitIDS.currency_luna, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_luna, R.string.unit_currency_luna_short), ReverseUnit(UnitID.currency_luna, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_luna, R.string.unit_currency_luna_short),
ReverseUnit(MyUnitIDS.currency_lvl, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_lvl, R.string.unit_currency_lvl_short), ReverseUnit(UnitID.currency_lvl, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_lvl, R.string.unit_currency_lvl_short),
ReverseUnit(MyUnitIDS.currency_lyd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_lyd, R.string.unit_currency_lyd_short), ReverseUnit(UnitID.currency_lyd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_lyd, R.string.unit_currency_lyd_short),
ReverseUnit(MyUnitIDS.currency_mad, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mad, R.string.unit_currency_mad_short), ReverseUnit(UnitID.currency_mad, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mad, R.string.unit_currency_mad_short),
ReverseUnit(MyUnitIDS.currency_matic, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_matic, R.string.unit_currency_matic_short), ReverseUnit(UnitID.currency_matic, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_matic, R.string.unit_currency_matic_short),
ReverseUnit(MyUnitIDS.currency_mdl, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mdl, R.string.unit_currency_mdl_short), ReverseUnit(UnitID.currency_mdl, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mdl, R.string.unit_currency_mdl_short),
ReverseUnit(MyUnitIDS.currency_mga, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mga, R.string.unit_currency_mga_short), ReverseUnit(UnitID.currency_mga, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mga, R.string.unit_currency_mga_short),
ReverseUnit(MyUnitIDS.currency_mkd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mkd, R.string.unit_currency_mkd_short), ReverseUnit(UnitID.currency_mkd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mkd, R.string.unit_currency_mkd_short),
ReverseUnit(MyUnitIDS.currency_mmk, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mmk, R.string.unit_currency_mmk_short), ReverseUnit(UnitID.currency_mmk, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mmk, R.string.unit_currency_mmk_short),
ReverseUnit(MyUnitIDS.currency_mnt, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mnt, R.string.unit_currency_mnt_short), ReverseUnit(UnitID.currency_mnt, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mnt, R.string.unit_currency_mnt_short),
ReverseUnit(MyUnitIDS.currency_mop, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mop, R.string.unit_currency_mop_short), ReverseUnit(UnitID.currency_mop, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mop, R.string.unit_currency_mop_short),
ReverseUnit(MyUnitIDS.currency_mro, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mro, R.string.unit_currency_mro_short), ReverseUnit(UnitID.currency_mro, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mro, R.string.unit_currency_mro_short),
ReverseUnit(MyUnitIDS.currency_mur, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mur, R.string.unit_currency_mur_short), ReverseUnit(UnitID.currency_mur, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mur, R.string.unit_currency_mur_short),
ReverseUnit(MyUnitIDS.currency_mvr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mvr, R.string.unit_currency_mvr_short), ReverseUnit(UnitID.currency_mvr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mvr, R.string.unit_currency_mvr_short),
ReverseUnit(MyUnitIDS.currency_mwk, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mwk, R.string.unit_currency_mwk_short), ReverseUnit(UnitID.currency_mwk, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mwk, R.string.unit_currency_mwk_short),
ReverseUnit(MyUnitIDS.currency_mxn, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mxn, R.string.unit_currency_mxn_short), ReverseUnit(UnitID.currency_mxn, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mxn, R.string.unit_currency_mxn_short),
ReverseUnit(MyUnitIDS.currency_myr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_myr, R.string.unit_currency_myr_short), ReverseUnit(UnitID.currency_myr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_myr, R.string.unit_currency_myr_short),
ReverseUnit(MyUnitIDS.currency_mzn, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mzn, R.string.unit_currency_mzn_short), ReverseUnit(UnitID.currency_mzn, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_mzn, R.string.unit_currency_mzn_short),
ReverseUnit(MyUnitIDS.currency_nad, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_nad, R.string.unit_currency_nad_short), ReverseUnit(UnitID.currency_nad, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_nad, R.string.unit_currency_nad_short),
ReverseUnit(MyUnitIDS.currency_ngn, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ngn, R.string.unit_currency_ngn_short), ReverseUnit(UnitID.currency_ngn, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ngn, R.string.unit_currency_ngn_short),
ReverseUnit(MyUnitIDS.currency_nio, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_nio, R.string.unit_currency_nio_short), ReverseUnit(UnitID.currency_nio, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_nio, R.string.unit_currency_nio_short),
ReverseUnit(MyUnitIDS.currency_nok, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_nok, R.string.unit_currency_nok_short), ReverseUnit(UnitID.currency_nok, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_nok, R.string.unit_currency_nok_short),
ReverseUnit(MyUnitIDS.currency_npr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_npr, R.string.unit_currency_npr_short), ReverseUnit(UnitID.currency_npr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_npr, R.string.unit_currency_npr_short),
ReverseUnit(MyUnitIDS.currency_nzd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_nzd, R.string.unit_currency_nzd_short), ReverseUnit(UnitID.currency_nzd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_nzd, R.string.unit_currency_nzd_short),
ReverseUnit(MyUnitIDS.currency_omr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_omr, R.string.unit_currency_omr_short), ReverseUnit(UnitID.currency_omr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_omr, R.string.unit_currency_omr_short),
ReverseUnit(MyUnitIDS.currency_one, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_one, R.string.unit_currency_one_short), ReverseUnit(UnitID.currency_one, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_one, R.string.unit_currency_one_short),
ReverseUnit(MyUnitIDS.currency_pab, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_pab, R.string.unit_currency_pab_short), ReverseUnit(UnitID.currency_pab, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_pab, R.string.unit_currency_pab_short),
ReverseUnit(MyUnitIDS.currency_pen, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_pen, R.string.unit_currency_pen_short), ReverseUnit(UnitID.currency_pen, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_pen, R.string.unit_currency_pen_short),
ReverseUnit(MyUnitIDS.currency_pgk, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_pgk, R.string.unit_currency_pgk_short), ReverseUnit(UnitID.currency_pgk, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_pgk, R.string.unit_currency_pgk_short),
ReverseUnit(MyUnitIDS.currency_php, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_php, R.string.unit_currency_php_short), ReverseUnit(UnitID.currency_php, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_php, R.string.unit_currency_php_short),
ReverseUnit(MyUnitIDS.currency_pkr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_pkr, R.string.unit_currency_pkr_short), ReverseUnit(UnitID.currency_pkr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_pkr, R.string.unit_currency_pkr_short),
ReverseUnit(MyUnitIDS.currency_pln, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_pln, R.string.unit_currency_pln_short), ReverseUnit(UnitID.currency_pln, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_pln, R.string.unit_currency_pln_short),
ReverseUnit(MyUnitIDS.currency_pyg, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_pyg, R.string.unit_currency_pyg_short), ReverseUnit(UnitID.currency_pyg, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_pyg, R.string.unit_currency_pyg_short),
ReverseUnit(MyUnitIDS.currency_qar, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_qar, R.string.unit_currency_qar_short), ReverseUnit(UnitID.currency_qar, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_qar, R.string.unit_currency_qar_short),
ReverseUnit(MyUnitIDS.currency_ron, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ron, R.string.unit_currency_ron_short), ReverseUnit(UnitID.currency_ron, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ron, R.string.unit_currency_ron_short),
ReverseUnit(MyUnitIDS.currency_rsd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_rsd, R.string.unit_currency_rsd_short), ReverseUnit(UnitID.currency_rsd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_rsd, R.string.unit_currency_rsd_short),
ReverseUnit(MyUnitIDS.currency_rub, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_rub, R.string.unit_currency_rub_short), ReverseUnit(UnitID.currency_rub, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_rub, R.string.unit_currency_rub_short),
ReverseUnit(MyUnitIDS.currency_rwf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_rwf, R.string.unit_currency_rwf_short), ReverseUnit(UnitID.currency_rwf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_rwf, R.string.unit_currency_rwf_short),
ReverseUnit(MyUnitIDS.currency_sar, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_sar, R.string.unit_currency_sar_short), ReverseUnit(UnitID.currency_sar, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_sar, R.string.unit_currency_sar_short),
ReverseUnit(MyUnitIDS.currency_sbd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_sbd, R.string.unit_currency_sbd_short), ReverseUnit(UnitID.currency_sbd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_sbd, R.string.unit_currency_sbd_short),
ReverseUnit(MyUnitIDS.currency_scr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_scr, R.string.unit_currency_scr_short), ReverseUnit(UnitID.currency_scr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_scr, R.string.unit_currency_scr_short),
ReverseUnit(MyUnitIDS.currency_sdg, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_sdg, R.string.unit_currency_sdg_short), ReverseUnit(UnitID.currency_sdg, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_sdg, R.string.unit_currency_sdg_short),
ReverseUnit(MyUnitIDS.currency_sek, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_sek, R.string.unit_currency_sek_short), ReverseUnit(UnitID.currency_sek, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_sek, R.string.unit_currency_sek_short),
ReverseUnit(MyUnitIDS.currency_sgd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_sgd, R.string.unit_currency_sgd_short), ReverseUnit(UnitID.currency_sgd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_sgd, R.string.unit_currency_sgd_short),
ReverseUnit(MyUnitIDS.currency_shib, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_shib, R.string.unit_currency_shib_short), ReverseUnit(UnitID.currency_shib, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_shib, R.string.unit_currency_shib_short),
ReverseUnit(MyUnitIDS.currency_shp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_shp, R.string.unit_currency_shp_short), ReverseUnit(UnitID.currency_shp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_shp, R.string.unit_currency_shp_short),
ReverseUnit(MyUnitIDS.currency_sll, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_sll, R.string.unit_currency_sll_short), ReverseUnit(UnitID.currency_sll, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_sll, R.string.unit_currency_sll_short),
ReverseUnit(MyUnitIDS.currency_sol, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_sol, R.string.unit_currency_sol_short), ReverseUnit(UnitID.currency_sol, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_sol, R.string.unit_currency_sol_short),
ReverseUnit(MyUnitIDS.currency_sos, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_sos, R.string.unit_currency_sos_short), ReverseUnit(UnitID.currency_sos, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_sos, R.string.unit_currency_sos_short),
ReverseUnit(MyUnitIDS.currency_srd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_srd, R.string.unit_currency_srd_short), ReverseUnit(UnitID.currency_srd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_srd, R.string.unit_currency_srd_short),
ReverseUnit(MyUnitIDS.currency_std, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_std, R.string.unit_currency_std_short), ReverseUnit(UnitID.currency_std, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_std, R.string.unit_currency_std_short),
ReverseUnit(MyUnitIDS.currency_svc, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_svc, R.string.unit_currency_svc_short), ReverseUnit(UnitID.currency_svc, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_svc, R.string.unit_currency_svc_short),
ReverseUnit(MyUnitIDS.currency_syp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_syp, R.string.unit_currency_syp_short), ReverseUnit(UnitID.currency_syp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_syp, R.string.unit_currency_syp_short),
ReverseUnit(MyUnitIDS.currency_szl, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_szl, R.string.unit_currency_szl_short), ReverseUnit(UnitID.currency_szl, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_szl, R.string.unit_currency_szl_short),
ReverseUnit(MyUnitIDS.currency_thb, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_thb, R.string.unit_currency_thb_short), ReverseUnit(UnitID.currency_thb, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_thb, R.string.unit_currency_thb_short),
ReverseUnit(MyUnitIDS.currency_theta, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_theta, R.string.unit_currency_theta_short), ReverseUnit(UnitID.currency_theta, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_theta, R.string.unit_currency_theta_short),
ReverseUnit(MyUnitIDS.currency_tjs, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_tjs, R.string.unit_currency_tjs_short), ReverseUnit(UnitID.currency_tjs, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_tjs, R.string.unit_currency_tjs_short),
ReverseUnit(MyUnitIDS.currency_tmt, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_tmt, R.string.unit_currency_tmt_short), ReverseUnit(UnitID.currency_tmt, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_tmt, R.string.unit_currency_tmt_short),
ReverseUnit(MyUnitIDS.currency_tnd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_tnd, R.string.unit_currency_tnd_short), ReverseUnit(UnitID.currency_tnd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_tnd, R.string.unit_currency_tnd_short),
ReverseUnit(MyUnitIDS.currency_top, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_top, R.string.unit_currency_top_short), ReverseUnit(UnitID.currency_top, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_top, R.string.unit_currency_top_short),
ReverseUnit(MyUnitIDS.currency_trx, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_trx, R.string.unit_currency_trx_short), ReverseUnit(UnitID.currency_trx, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_trx, R.string.unit_currency_trx_short),
ReverseUnit(MyUnitIDS.currency_try, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_try, R.string.unit_currency_try_short), ReverseUnit(UnitID.currency_try, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_try, R.string.unit_currency_try_short),
ReverseUnit(MyUnitIDS.currency_ttd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ttd, R.string.unit_currency_ttd_short), ReverseUnit(UnitID.currency_ttd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ttd, R.string.unit_currency_ttd_short),
ReverseUnit(MyUnitIDS.currency_twd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_twd, R.string.unit_currency_twd_short), ReverseUnit(UnitID.currency_twd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_twd, R.string.unit_currency_twd_short),
ReverseUnit(MyUnitIDS.currency_tzs, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_tzs, R.string.unit_currency_tzs_short), ReverseUnit(UnitID.currency_tzs, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_tzs, R.string.unit_currency_tzs_short),
ReverseUnit(MyUnitIDS.currency_uah, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_uah, R.string.unit_currency_uah_short), ReverseUnit(UnitID.currency_uah, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_uah, R.string.unit_currency_uah_short),
ReverseUnit(MyUnitIDS.currency_ugx, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ugx, R.string.unit_currency_ugx_short), ReverseUnit(UnitID.currency_ugx, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_ugx, R.string.unit_currency_ugx_short),
ReverseUnit(MyUnitIDS.currency_uni, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_uni, R.string.unit_currency_uni_short), ReverseUnit(UnitID.currency_uni, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_uni, R.string.unit_currency_uni_short),
ReverseUnit(MyUnitIDS.currency_usd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_usd, R.string.unit_currency_usd_short), ReverseUnit(UnitID.currency_usd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_usd, R.string.unit_currency_usd_short),
ReverseUnit(MyUnitIDS.currency_usdc, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_usdc, R.string.unit_currency_usdc_short), ReverseUnit(UnitID.currency_usdc, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_usdc, R.string.unit_currency_usdc_short),
ReverseUnit(MyUnitIDS.currency_usdt, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_usdt, R.string.unit_currency_usdt_short), ReverseUnit(UnitID.currency_usdt, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_usdt, R.string.unit_currency_usdt_short),
ReverseUnit(MyUnitIDS.currency_uyu, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_uyu, R.string.unit_currency_uyu_short), ReverseUnit(UnitID.currency_uyu, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_uyu, R.string.unit_currency_uyu_short),
ReverseUnit(MyUnitIDS.currency_uzs, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_uzs, R.string.unit_currency_uzs_short), ReverseUnit(UnitID.currency_uzs, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_uzs, R.string.unit_currency_uzs_short),
ReverseUnit(MyUnitIDS.currency_vef, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_vef, R.string.unit_currency_vef_short), ReverseUnit(UnitID.currency_vef, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_vef, R.string.unit_currency_vef_short),
ReverseUnit(MyUnitIDS.currency_vet, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_vet, R.string.unit_currency_vet_short), ReverseUnit(UnitID.currency_vet, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_vet, R.string.unit_currency_vet_short),
ReverseUnit(MyUnitIDS.currency_vnd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_vnd, R.string.unit_currency_vnd_short), ReverseUnit(UnitID.currency_vnd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_vnd, R.string.unit_currency_vnd_short),
ReverseUnit(MyUnitIDS.currency_vuv, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_vuv, R.string.unit_currency_vuv_short), ReverseUnit(UnitID.currency_vuv, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_vuv, R.string.unit_currency_vuv_short),
ReverseUnit(MyUnitIDS.currency_wbtc, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_wbtc, R.string.unit_currency_wbtc_short), ReverseUnit(UnitID.currency_wbtc, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_wbtc, R.string.unit_currency_wbtc_short),
ReverseUnit(MyUnitIDS.currency_wst, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_wst, R.string.unit_currency_wst_short), ReverseUnit(UnitID.currency_wst, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_wst, R.string.unit_currency_wst_short),
ReverseUnit(MyUnitIDS.currency_xaf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xaf, R.string.unit_currency_xaf_short), ReverseUnit(UnitID.currency_xaf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xaf, R.string.unit_currency_xaf_short),
ReverseUnit(MyUnitIDS.currency_xag, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xag, R.string.unit_currency_xag_short), ReverseUnit(UnitID.currency_xag, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xag, R.string.unit_currency_xag_short),
ReverseUnit(MyUnitIDS.currency_xau, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xau, R.string.unit_currency_xau_short), ReverseUnit(UnitID.currency_xau, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xau, R.string.unit_currency_xau_short),
ReverseUnit(MyUnitIDS.currency_xcd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xcd, R.string.unit_currency_xcd_short), ReverseUnit(UnitID.currency_xcd, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xcd, R.string.unit_currency_xcd_short),
ReverseUnit(MyUnitIDS.currency_xdr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xdr, R.string.unit_currency_xdr_short), ReverseUnit(UnitID.currency_xdr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xdr, R.string.unit_currency_xdr_short),
ReverseUnit(MyUnitIDS.currency_xlm, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xlm, R.string.unit_currency_xlm_short), ReverseUnit(UnitID.currency_xlm, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xlm, R.string.unit_currency_xlm_short),
ReverseUnit(MyUnitIDS.currency_xmr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xmr, R.string.unit_currency_xmr_short), ReverseUnit(UnitID.currency_xmr, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xmr, R.string.unit_currency_xmr_short),
ReverseUnit(MyUnitIDS.currency_xof, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xof, R.string.unit_currency_xof_short), ReverseUnit(UnitID.currency_xof, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xof, R.string.unit_currency_xof_short),
ReverseUnit(MyUnitIDS.currency_xpf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xpf, R.string.unit_currency_xpf_short), ReverseUnit(UnitID.currency_xpf, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xpf, R.string.unit_currency_xpf_short),
ReverseUnit(MyUnitIDS.currency_xrp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xrp, R.string.unit_currency_xrp_short), ReverseUnit(UnitID.currency_xrp, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_xrp, R.string.unit_currency_xrp_short),
ReverseUnit(MyUnitIDS.currency_yer, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_yer, R.string.unit_currency_yer_short), ReverseUnit(UnitID.currency_yer, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_yer, R.string.unit_currency_yer_short),
ReverseUnit(MyUnitIDS.currency_zar, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_zar, R.string.unit_currency_zar_short), ReverseUnit(UnitID.currency_zar, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_zar, R.string.unit_currency_zar_short),
ReverseUnit(MyUnitIDS.currency_zmk, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_zmk, R.string.unit_currency_zmk_short), ReverseUnit(UnitID.currency_zmk, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_zmk, R.string.unit_currency_zmk_short),
ReverseUnit(MyUnitIDS.currency_zmw, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_zmw, R.string.unit_currency_zmw_short), ReverseUnit(UnitID.currency_zmw, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_zmw, R.string.unit_currency_zmw_short),
ReverseUnit(MyUnitIDS.currency_zwl, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_zwl, R.string.unit_currency_zwl_short), ReverseUnit(UnitID.currency_zwl, BigDecimal.ZERO, UnitGroup.CURRENCY, R.string.unit_currency_zwl, R.string.unit_currency_zwl_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,30 +22,30 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
internal val dataCollection: List<AbstractUnit> by lazy { internal val dataCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit(MyUnitIDS.bit, BigDecimal.valueOf(1), UnitGroup.DATA, R.string.unit_bit, R.string.unit_bit_short), NormalUnit(UnitID.bit, BigDecimal.valueOf(1), UnitGroup.DATA, R.string.unit_bit, R.string.unit_bit_short),
NormalUnit(MyUnitIDS.kibibit, BigDecimal.valueOf(1_024), UnitGroup.DATA, R.string.unit_kibibit, R.string.unit_kibibit_short), NormalUnit(UnitID.kibibit, BigDecimal.valueOf(1_024), UnitGroup.DATA, R.string.unit_kibibit, R.string.unit_kibibit_short),
NormalUnit(MyUnitIDS.kilobit, BigDecimal.valueOf(1_000), UnitGroup.DATA, R.string.unit_kilobit, R.string.unit_kilobit_short), NormalUnit(UnitID.kilobit, BigDecimal.valueOf(1_000), UnitGroup.DATA, R.string.unit_kilobit, R.string.unit_kilobit_short),
NormalUnit(MyUnitIDS.megabit, BigDecimal.valueOf(1_000_000), UnitGroup.DATA, R.string.unit_megabit, R.string.unit_megabit_short), NormalUnit(UnitID.megabit, BigDecimal.valueOf(1_000_000), UnitGroup.DATA, R.string.unit_megabit, R.string.unit_megabit_short),
NormalUnit(MyUnitIDS.mebibit, BigDecimal.valueOf(1_048_576), UnitGroup.DATA, R.string.unit_mebibit, R.string.unit_mebibit_short), NormalUnit(UnitID.mebibit, BigDecimal.valueOf(1_048_576), UnitGroup.DATA, R.string.unit_mebibit, R.string.unit_mebibit_short),
NormalUnit(MyUnitIDS.gigabit, BigDecimal.valueOf(1_000_000_000), UnitGroup.DATA, R.string.unit_gigabit, R.string.unit_gigabit_short), NormalUnit(UnitID.gigabit, BigDecimal.valueOf(1_000_000_000), UnitGroup.DATA, R.string.unit_gigabit, R.string.unit_gigabit_short),
NormalUnit(MyUnitIDS.gibibit, BigDecimal.valueOf(1_073_741_824), UnitGroup.DATA, R.string.unit_gibibit, R.string.unit_gibibit_short), NormalUnit(UnitID.gibibit, BigDecimal.valueOf(1_073_741_824), UnitGroup.DATA, R.string.unit_gibibit, R.string.unit_gibibit_short),
NormalUnit(MyUnitIDS.terabit, BigDecimal.valueOf(1_000_000_000_000), UnitGroup.DATA, R.string.unit_terabit, R.string.unit_terabit_short), NormalUnit(UnitID.terabit, BigDecimal.valueOf(1_000_000_000_000), UnitGroup.DATA, R.string.unit_terabit, R.string.unit_terabit_short),
NormalUnit(MyUnitIDS.petabit, BigDecimal.valueOf(1_000_000_000_000_000), UnitGroup.DATA, R.string.unit_petabit, R.string.unit_petabit_short), NormalUnit(UnitID.petabit, BigDecimal.valueOf(1_000_000_000_000_000), UnitGroup.DATA, R.string.unit_petabit, R.string.unit_petabit_short),
NormalUnit(MyUnitIDS.exabit, BigDecimal.valueOf(1_000_000_000_000_000_000), UnitGroup.DATA, R.string.unit_exabit, R.string.unit_exabit_short), NormalUnit(UnitID.exabit, BigDecimal.valueOf(1_000_000_000_000_000_000), UnitGroup.DATA, R.string.unit_exabit, R.string.unit_exabit_short),
NormalUnit(MyUnitIDS.byte, BigDecimal.valueOf(8), UnitGroup.DATA, R.string.unit_byte, R.string.unit_byte_short), NormalUnit(UnitID.byte, BigDecimal.valueOf(8), UnitGroup.DATA, R.string.unit_byte, R.string.unit_byte_short),
NormalUnit(MyUnitIDS.kibibyte, BigDecimal.valueOf(8_192), UnitGroup.DATA, R.string.unit_kibibyte, R.string.unit_kibibyte_short), NormalUnit(UnitID.kibibyte, BigDecimal.valueOf(8_192), UnitGroup.DATA, R.string.unit_kibibyte, R.string.unit_kibibyte_short),
NormalUnit(MyUnitIDS.kilobyte, BigDecimal.valueOf(8_000), UnitGroup.DATA, R.string.unit_kilobyte, R.string.unit_kilobyte_short), NormalUnit(UnitID.kilobyte, BigDecimal.valueOf(8_000), UnitGroup.DATA, R.string.unit_kilobyte, R.string.unit_kilobyte_short),
NormalUnit(MyUnitIDS.megabyte, BigDecimal.valueOf(8_000_000), UnitGroup.DATA, R.string.unit_megabyte, R.string.unit_megabyte_short), NormalUnit(UnitID.megabyte, BigDecimal.valueOf(8_000_000), UnitGroup.DATA, R.string.unit_megabyte, R.string.unit_megabyte_short),
NormalUnit(MyUnitIDS.mebibyte, BigDecimal.valueOf(8_388_608), UnitGroup.DATA, R.string.unit_mebibyte, R.string.unit_mebibyte_short), NormalUnit(UnitID.mebibyte, BigDecimal.valueOf(8_388_608), UnitGroup.DATA, R.string.unit_mebibyte, R.string.unit_mebibyte_short),
NormalUnit(MyUnitIDS.gigabyte, BigDecimal.valueOf(8_000_000_000), UnitGroup.DATA, R.string.unit_gigabyte, R.string.unit_gigabyte_short), NormalUnit(UnitID.gigabyte, BigDecimal.valueOf(8_000_000_000), UnitGroup.DATA, R.string.unit_gigabyte, R.string.unit_gigabyte_short),
NormalUnit(MyUnitIDS.gibibyte, BigDecimal.valueOf(8_589_934_592), UnitGroup.DATA, R.string.unit_gibibyte, R.string.unit_gibibyte_short), NormalUnit(UnitID.gibibyte, BigDecimal.valueOf(8_589_934_592), UnitGroup.DATA, R.string.unit_gibibyte, R.string.unit_gibibyte_short),
NormalUnit(MyUnitIDS.terabyte, BigDecimal.valueOf(8_000_000_000_000), UnitGroup.DATA, R.string.unit_terabyte, R.string.unit_terabyte_short), NormalUnit(UnitID.terabyte, BigDecimal.valueOf(8_000_000_000_000), UnitGroup.DATA, R.string.unit_terabyte, R.string.unit_terabyte_short),
NormalUnit(MyUnitIDS.petabyte, BigDecimal.valueOf(8_000_000_000_000_000), UnitGroup.DATA, R.string.unit_petabyte, R.string.unit_petabyte_short), NormalUnit(UnitID.petabyte, BigDecimal.valueOf(8_000_000_000_000_000), UnitGroup.DATA, R.string.unit_petabyte, R.string.unit_petabyte_short),
NormalUnit(MyUnitIDS.exabyte, BigDecimal.valueOf(8_000_000_000_000_000_000), UnitGroup.DATA, R.string.unit_exabyte, R.string.unit_exabyte_short), NormalUnit(UnitID.exabyte, BigDecimal.valueOf(8_000_000_000_000_000_000), UnitGroup.DATA, R.string.unit_exabyte, R.string.unit_exabyte_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,30 +22,30 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
internal val dataTransferCollection: List<AbstractUnit> by lazy { internal val dataTransferCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit(MyUnitIDS.bit_per_second, BigDecimal.valueOf(1), UnitGroup.DATA_TRANSFER, R.string.unit_bit_per_second, R.string.unit_bit_per_second_short), NormalUnit(UnitID.bit_per_second, BigDecimal.valueOf(1), UnitGroup.DATA_TRANSFER, R.string.unit_bit_per_second, R.string.unit_bit_per_second_short),
NormalUnit(MyUnitIDS.kibibit_per_second, BigDecimal.valueOf(1_024), UnitGroup.DATA_TRANSFER, R.string.unit_kibibit_per_second, R.string.unit_kibibit_per_second_short), NormalUnit(UnitID.kibibit_per_second, BigDecimal.valueOf(1_024), UnitGroup.DATA_TRANSFER, R.string.unit_kibibit_per_second, R.string.unit_kibibit_per_second_short),
NormalUnit(MyUnitIDS.kilobit_per_second, BigDecimal.valueOf(1_000), UnitGroup.DATA_TRANSFER, R.string.unit_kilobit_per_second, R.string.unit_kilobit_per_second_short), NormalUnit(UnitID.kilobit_per_second, BigDecimal.valueOf(1_000), UnitGroup.DATA_TRANSFER, R.string.unit_kilobit_per_second, R.string.unit_kilobit_per_second_short),
NormalUnit(MyUnitIDS.megabit_per_second, BigDecimal.valueOf(1_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_megabit_per_second, R.string.unit_megabit_per_second_short), NormalUnit(UnitID.megabit_per_second, BigDecimal.valueOf(1_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_megabit_per_second, R.string.unit_megabit_per_second_short),
NormalUnit(MyUnitIDS.mebibit_per_second, BigDecimal.valueOf(1_048_576), UnitGroup.DATA_TRANSFER, R.string.unit_mebibit_per_second, R.string.unit_mebibit_per_second_short), NormalUnit(UnitID.mebibit_per_second, BigDecimal.valueOf(1_048_576), UnitGroup.DATA_TRANSFER, R.string.unit_mebibit_per_second, R.string.unit_mebibit_per_second_short),
NormalUnit(MyUnitIDS.gigabit_per_second, BigDecimal.valueOf(1_000_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_gigabit_per_second, R.string.unit_gigabit_per_second_short), NormalUnit(UnitID.gigabit_per_second, BigDecimal.valueOf(1_000_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_gigabit_per_second, R.string.unit_gigabit_per_second_short),
NormalUnit(MyUnitIDS.gibibit_per_second, BigDecimal.valueOf(1_073_741_824), UnitGroup.DATA_TRANSFER, R.string.unit_gibibit_per_second, R.string.unit_gibibit_per_second_short), NormalUnit(UnitID.gibibit_per_second, BigDecimal.valueOf(1_073_741_824), UnitGroup.DATA_TRANSFER, R.string.unit_gibibit_per_second, R.string.unit_gibibit_per_second_short),
NormalUnit(MyUnitIDS.terabit_per_second, BigDecimal.valueOf(1_000_000_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_terabit_per_second, R.string.unit_terabit_per_second_short), NormalUnit(UnitID.terabit_per_second, BigDecimal.valueOf(1_000_000_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_terabit_per_second, R.string.unit_terabit_per_second_short),
NormalUnit(MyUnitIDS.petabit_per_second, BigDecimal.valueOf(1_000_000_000_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_petabit_per_second, R.string.unit_petabit_per_second_short), NormalUnit(UnitID.petabit_per_second, BigDecimal.valueOf(1_000_000_000_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_petabit_per_second, R.string.unit_petabit_per_second_short),
NormalUnit(MyUnitIDS.exabit_per_second, BigDecimal.valueOf(1_000_000_000_000_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_exabit_per_second, R.string.unit_exabit_per_second_short), NormalUnit(UnitID.exabit_per_second, BigDecimal.valueOf(1_000_000_000_000_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_exabit_per_second, R.string.unit_exabit_per_second_short),
NormalUnit(MyUnitIDS.byte_per_second, BigDecimal.valueOf(8), UnitGroup.DATA_TRANSFER, R.string.unit_byte_per_second, R.string.unit_byte_per_second_short), NormalUnit(UnitID.byte_per_second, BigDecimal.valueOf(8), UnitGroup.DATA_TRANSFER, R.string.unit_byte_per_second, R.string.unit_byte_per_second_short),
NormalUnit(MyUnitIDS.kibibyte_per_second, BigDecimal.valueOf(8_192), UnitGroup.DATA_TRANSFER, R.string.unit_kibibyte_per_second, R.string.unit_kibibyte_per_second_short), NormalUnit(UnitID.kibibyte_per_second, BigDecimal.valueOf(8_192), UnitGroup.DATA_TRANSFER, R.string.unit_kibibyte_per_second, R.string.unit_kibibyte_per_second_short),
NormalUnit(MyUnitIDS.kilobyte_per_second, BigDecimal.valueOf(8_000), UnitGroup.DATA_TRANSFER, R.string.unit_kilobyte_per_second, R.string.unit_kilobyte_per_second_short), NormalUnit(UnitID.kilobyte_per_second, BigDecimal.valueOf(8_000), UnitGroup.DATA_TRANSFER, R.string.unit_kilobyte_per_second, R.string.unit_kilobyte_per_second_short),
NormalUnit(MyUnitIDS.megabyte_per_second, BigDecimal.valueOf(8_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_megabyte_per_second, R.string.unit_megabyte_per_second_short), NormalUnit(UnitID.megabyte_per_second, BigDecimal.valueOf(8_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_megabyte_per_second, R.string.unit_megabyte_per_second_short),
NormalUnit(MyUnitIDS.mebibyte_per_second, BigDecimal.valueOf(8_388_608), UnitGroup.DATA_TRANSFER, R.string.unit_mebibyte_per_second, R.string.unit_mebibyte_per_second_short), NormalUnit(UnitID.mebibyte_per_second, BigDecimal.valueOf(8_388_608), UnitGroup.DATA_TRANSFER, R.string.unit_mebibyte_per_second, R.string.unit_mebibyte_per_second_short),
NormalUnit(MyUnitIDS.gigabyte_per_second, BigDecimal.valueOf(8_000_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_gigabyte_per_second, R.string.unit_gigabyte_per_second_short), NormalUnit(UnitID.gigabyte_per_second, BigDecimal.valueOf(8_000_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_gigabyte_per_second, R.string.unit_gigabyte_per_second_short),
NormalUnit(MyUnitIDS.gibibyte_per_second, BigDecimal.valueOf(8_589_934_592), UnitGroup.DATA_TRANSFER, R.string.unit_gibibyte_per_second, R.string.unit_gibibyte_per_second_short), NormalUnit(UnitID.gibibyte_per_second, BigDecimal.valueOf(8_589_934_592), UnitGroup.DATA_TRANSFER, R.string.unit_gibibyte_per_second, R.string.unit_gibibyte_per_second_short),
NormalUnit(MyUnitIDS.terabyte_per_second, BigDecimal.valueOf(8_000_000_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_terabyte_per_second, R.string.unit_terabyte_per_second_short), NormalUnit(UnitID.terabyte_per_second, BigDecimal.valueOf(8_000_000_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_terabyte_per_second, R.string.unit_terabyte_per_second_short),
NormalUnit(MyUnitIDS.petabyte_per_second, BigDecimal.valueOf(8_000_000_000_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_petabyte_per_second, R.string.unit_petabyte_per_second_short), NormalUnit(UnitID.petabyte_per_second, BigDecimal.valueOf(8_000_000_000_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_petabyte_per_second, R.string.unit_petabyte_per_second_short),
NormalUnit(MyUnitIDS.exabyte_per_second, BigDecimal.valueOf(8_000_000_000_000_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_exabyte_per_second, R.string.unit_exabyte_per_second_short), NormalUnit(UnitID.exabyte_per_second, BigDecimal.valueOf(8_000_000_000_000_000_000), UnitGroup.DATA_TRANSFER, R.string.unit_exabyte_per_second, R.string.unit_exabyte_per_second_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,22 +22,22 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
internal val electrostaticCapacitance: List<AbstractUnit> by lazy { internal val electrostaticCapacitance: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit(MyUnitIDS.attofarad, BigDecimal.valueOf(1), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_attofarad, R.string.unit_attofarad_short), NormalUnit(UnitID.attofarad, BigDecimal.valueOf(1), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_attofarad, R.string.unit_attofarad_short),
NormalUnit(MyUnitIDS.picofarad, BigDecimal.valueOf(1E+6), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_picofarad, R.string.unit_picofarad_short), NormalUnit(UnitID.picofarad, BigDecimal.valueOf(1E+6), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_picofarad, R.string.unit_picofarad_short),
NormalUnit(MyUnitIDS.statfarad, BigDecimal.valueOf(1112650.0561), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_statfarad, R.string.unit_statfarad_short), NormalUnit(UnitID.statfarad, BigDecimal.valueOf(1112650.0561), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_statfarad, R.string.unit_statfarad_short),
NormalUnit(MyUnitIDS.nanofarad, BigDecimal.valueOf(1E+9), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_nanofarad, R.string.unit_nanofarad_short), NormalUnit(UnitID.nanofarad, BigDecimal.valueOf(1E+9), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_nanofarad, R.string.unit_nanofarad_short),
NormalUnit(MyUnitIDS.microfarad, BigDecimal.valueOf(1E+12), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_microfarad, R.string.unit_microfarad_short), NormalUnit(UnitID.microfarad, BigDecimal.valueOf(1E+12), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_microfarad, R.string.unit_microfarad_short),
NormalUnit(MyUnitIDS.millifarad, BigDecimal.valueOf(1E+15), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_millifarad, R.string.unit_millifarad_short), NormalUnit(UnitID.millifarad, BigDecimal.valueOf(1E+15), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_millifarad, R.string.unit_millifarad_short),
NormalUnit(MyUnitIDS.farad, BigDecimal.valueOf(1E+18), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_farad, R.string.unit_farad_short), NormalUnit(UnitID.farad, BigDecimal.valueOf(1E+18), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_farad, R.string.unit_farad_short),
NormalUnit(MyUnitIDS.kilofarad, BigDecimal.valueOf(1E+21), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_kilofarad, R.string.unit_kilofarad_short), NormalUnit(UnitID.kilofarad, BigDecimal.valueOf(1E+21), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_kilofarad, R.string.unit_kilofarad_short),
NormalUnit(MyUnitIDS.megafarad, BigDecimal.valueOf(1E+24), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_megafarad, R.string.unit_megafarad_short), NormalUnit(UnitID.megafarad, BigDecimal.valueOf(1E+24), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_megafarad, R.string.unit_megafarad_short),
NormalUnit(MyUnitIDS.gigafarad, BigDecimal.valueOf(1E+27), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_gigafarad, R.string.unit_gigafarad_short), NormalUnit(UnitID.gigafarad, BigDecimal.valueOf(1E+27), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_gigafarad, R.string.unit_gigafarad_short),
NormalUnit(MyUnitIDS.petafarad, BigDecimal.valueOf(1E+33), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_petafarad, R.string.unit_petafarad_short), NormalUnit(UnitID.petafarad, BigDecimal.valueOf(1E+33), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_petafarad, R.string.unit_petafarad_short),
NormalUnit(MyUnitIDS.exafarad, BigDecimal.valueOf(1E+36), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_exafarad, R.string.unit_exafarad_short), NormalUnit(UnitID.exafarad, BigDecimal.valueOf(1E+36), UnitGroup.ELECTROSTATIC_CAPACITANCE, R.string.unit_exafarad, R.string.unit_exafarad_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,23 +22,23 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
internal val energyCollection: List<AbstractUnit> by lazy { internal val energyCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit(MyUnitIDS.electron_volt, BigDecimal.valueOf(0.160217733), UnitGroup.ENERGY, R.string.unit_electron_volt, R.string.unit_electron_volt_short), NormalUnit(UnitID.electron_volt, BigDecimal.valueOf(0.160217733), UnitGroup.ENERGY, R.string.unit_electron_volt, R.string.unit_electron_volt_short),
NormalUnit(MyUnitIDS.attojoule, BigDecimal.valueOf(1), UnitGroup.ENERGY, R.string.unit_attojoule, R.string.unit_attojoule_short), NormalUnit(UnitID.attojoule, BigDecimal.valueOf(1), UnitGroup.ENERGY, R.string.unit_attojoule, R.string.unit_attojoule_short),
NormalUnit(MyUnitIDS.joule, BigDecimal.valueOf(1E+18), UnitGroup.ENERGY, R.string.unit_joule, R.string.unit_joule_short), NormalUnit(UnitID.joule, BigDecimal.valueOf(1E+18), UnitGroup.ENERGY, R.string.unit_joule, R.string.unit_joule_short),
NormalUnit(MyUnitIDS.kilojoule, BigDecimal.valueOf(1E+21), UnitGroup.ENERGY, R.string.unit_kilojoule, R.string.unit_kilojoule_short), NormalUnit(UnitID.kilojoule, BigDecimal.valueOf(1E+21), UnitGroup.ENERGY, R.string.unit_kilojoule, R.string.unit_kilojoule_short),
NormalUnit(MyUnitIDS.megajoule, BigDecimal.valueOf(1E+24), UnitGroup.ENERGY, R.string.unit_megajoule, R.string.unit_megajoule_short), NormalUnit(UnitID.megajoule, BigDecimal.valueOf(1E+24), UnitGroup.ENERGY, R.string.unit_megajoule, R.string.unit_megajoule_short),
NormalUnit(MyUnitIDS.gigajoule, BigDecimal.valueOf(1E+27), UnitGroup.ENERGY, R.string.unit_gigajoule, R.string.unit_gigajoule_short), NormalUnit(UnitID.gigajoule, BigDecimal.valueOf(1E+27), UnitGroup.ENERGY, R.string.unit_gigajoule, R.string.unit_gigajoule_short),
NormalUnit(MyUnitIDS.energy_ton, BigDecimal.valueOf(4.184E+27), UnitGroup.ENERGY, R.string.unit_energy_ton, R.string.unit_energy_ton_short), NormalUnit(UnitID.energy_ton, BigDecimal.valueOf(4.184E+27), UnitGroup.ENERGY, R.string.unit_energy_ton, R.string.unit_energy_ton_short),
NormalUnit(MyUnitIDS.kiloton, BigDecimal.valueOf(4.184E+30), UnitGroup.ENERGY, R.string.unit_kiloton, R.string.unit_kiloton_short), NormalUnit(UnitID.kiloton, BigDecimal.valueOf(4.184E+30), UnitGroup.ENERGY, R.string.unit_kiloton, R.string.unit_kiloton_short),
NormalUnit(MyUnitIDS.megaton, BigDecimal.valueOf(4.184E+33), UnitGroup.ENERGY, R.string.unit_megaton, R.string.unit_megaton_short), NormalUnit(UnitID.megaton, BigDecimal.valueOf(4.184E+33), UnitGroup.ENERGY, R.string.unit_megaton, R.string.unit_megaton_short),
NormalUnit(MyUnitIDS.gigaton, BigDecimal.valueOf(4.184E+36), UnitGroup.ENERGY, R.string.unit_gigaton, R.string.unit_gigaton_short), NormalUnit(UnitID.gigaton, BigDecimal.valueOf(4.184E+36), UnitGroup.ENERGY, R.string.unit_gigaton, R.string.unit_gigaton_short),
NormalUnit(MyUnitIDS.energy_horse_power_metric, BigDecimal.valueOf(2.6477955E+24), UnitGroup.ENERGY, R.string.unit_energy_horse_power_metric, R.string.unit_energy_horse_power_metric_short), NormalUnit(UnitID.energy_horse_power_metric, BigDecimal.valueOf(2.6477955E+24), UnitGroup.ENERGY, R.string.unit_energy_horse_power_metric, R.string.unit_energy_horse_power_metric_short),
NormalUnit(MyUnitIDS.calorie_th, BigDecimal.valueOf(4184E+15), UnitGroup.ENERGY, R.string.unit_calorie_th, R.string.unit_calorie_th_short), NormalUnit(UnitID.calorie_th, BigDecimal.valueOf(4184E+15), UnitGroup.ENERGY, R.string.unit_calorie_th, R.string.unit_calorie_th_short),
NormalUnit(MyUnitIDS.kilocalorie_th, BigDecimal.valueOf(4184E+18), UnitGroup.ENERGY, R.string.unit_kilocalorie_th, R.string.unit_kilocalorie_th_short), NormalUnit(UnitID.kilocalorie_th, BigDecimal.valueOf(4184E+18), UnitGroup.ENERGY, R.string.unit_kilocalorie_th, R.string.unit_kilocalorie_th_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,31 +22,31 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.ReverseUnit import com.sadellie.unitto.data.model.unit.ReverseUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
val flowRateCollection: List<AbstractUnit> by lazy { val flowRateCollection: List<AbstractUnit> by lazy {
listOf( listOf(
ReverseUnit(MyUnitIDS.liter_per_hour, BigDecimal.valueOf(3600000), UnitGroup.FLOW_RATE, R.string.unit_liter_per_hour, R.string.unit_liter_per_hour_short), ReverseUnit(UnitID.liter_per_hour, BigDecimal.valueOf(3600000), UnitGroup.FLOW_RATE, R.string.unit_liter_per_hour, R.string.unit_liter_per_hour_short),
ReverseUnit(MyUnitIDS.liter_per_minute, BigDecimal.valueOf(60000), UnitGroup.FLOW_RATE, R.string.unit_liter_per_minute, R.string.unit_liter_per_minute_short), ReverseUnit(UnitID.liter_per_minute, BigDecimal.valueOf(60000), UnitGroup.FLOW_RATE, R.string.unit_liter_per_minute, R.string.unit_liter_per_minute_short),
ReverseUnit(MyUnitIDS.liter_per_second, BigDecimal.valueOf(1000), UnitGroup.FLOW_RATE, R.string.unit_liter_per_second, R.string.unit_liter_per_second_short), ReverseUnit(UnitID.liter_per_second, BigDecimal.valueOf(1000), UnitGroup.FLOW_RATE, R.string.unit_liter_per_second, R.string.unit_liter_per_second_short),
ReverseUnit(MyUnitIDS.milliliter_per_hour, BigDecimal.valueOf(3600000000), UnitGroup.FLOW_RATE, R.string.unit_milliliter_per_hour, R.string.unit_milliliter_per_hour_short), ReverseUnit(UnitID.milliliter_per_hour, BigDecimal.valueOf(3600000000), UnitGroup.FLOW_RATE, R.string.unit_milliliter_per_hour, R.string.unit_milliliter_per_hour_short),
ReverseUnit(MyUnitIDS.milliliter_per_minute, BigDecimal.valueOf(60000000), UnitGroup.FLOW_RATE, R.string.unit_milliliter_per_minute, R.string.unit_milliliter_per_minute_short), ReverseUnit(UnitID.milliliter_per_minute, BigDecimal.valueOf(60000000), UnitGroup.FLOW_RATE, R.string.unit_milliliter_per_minute, R.string.unit_milliliter_per_minute_short),
ReverseUnit(MyUnitIDS.milliliter_per_second, BigDecimal.valueOf(1000000), UnitGroup.FLOW_RATE, R.string.unit_milliliter_per_second, R.string.unit_milliliter_per_second_short), ReverseUnit(UnitID.milliliter_per_second, BigDecimal.valueOf(1000000), UnitGroup.FLOW_RATE, R.string.unit_milliliter_per_second, R.string.unit_milliliter_per_second_short),
ReverseUnit(MyUnitIDS.cubic_meter_per_hour, BigDecimal.valueOf(3600), UnitGroup.FLOW_RATE, R.string.unit_cubic_meter_per_hour, R.string.unit_cubic_meter_per_hour_short), ReverseUnit(UnitID.cubic_meter_per_hour, BigDecimal.valueOf(3600), UnitGroup.FLOW_RATE, R.string.unit_cubic_meter_per_hour, R.string.unit_cubic_meter_per_hour_short),
ReverseUnit(MyUnitIDS.cubic_meter_per_minute, BigDecimal.valueOf(60), UnitGroup.FLOW_RATE, R.string.unit_cubic_meter_per_minute, R.string.unit_cubic_meter_per_minute_short), ReverseUnit(UnitID.cubic_meter_per_minute, BigDecimal.valueOf(60), UnitGroup.FLOW_RATE, R.string.unit_cubic_meter_per_minute, R.string.unit_cubic_meter_per_minute_short),
ReverseUnit(MyUnitIDS.cubic_meter_per_second, BigDecimal.valueOf(1), UnitGroup.FLOW_RATE, R.string.unit_cubic_meter_per_second, R.string.unit_cubic_meter_per_second_short), ReverseUnit(UnitID.cubic_meter_per_second, BigDecimal.valueOf(1), UnitGroup.FLOW_RATE, R.string.unit_cubic_meter_per_second, R.string.unit_cubic_meter_per_second_short),
ReverseUnit(MyUnitIDS.cubic_millimeter_per_hour, BigDecimal.valueOf(3600000000000), UnitGroup.FLOW_RATE, R.string.unit_cubic_millimeter_per_hour, R.string.unit_cubic_millimeter_per_hour_short), ReverseUnit(UnitID.cubic_millimeter_per_hour, BigDecimal.valueOf(3600000000000), UnitGroup.FLOW_RATE, R.string.unit_cubic_millimeter_per_hour, R.string.unit_cubic_millimeter_per_hour_short),
ReverseUnit(MyUnitIDS.cubic_millimeter_per_minute, BigDecimal.valueOf(60000000000), UnitGroup.FLOW_RATE, R.string.unit_cubic_millimeter_per_minute, R.string.unit_cubic_millimeter_per_minute_short), ReverseUnit(UnitID.cubic_millimeter_per_minute, BigDecimal.valueOf(60000000000), UnitGroup.FLOW_RATE, R.string.unit_cubic_millimeter_per_minute, R.string.unit_cubic_millimeter_per_minute_short),
ReverseUnit(MyUnitIDS.cubic_millimeter_per_second, BigDecimal.valueOf(1000000000), UnitGroup.FLOW_RATE, R.string.unit_cubic_millimeter_per_second, R.string.unit_cubic_millimeter_per_second_short), ReverseUnit(UnitID.cubic_millimeter_per_second, BigDecimal.valueOf(1000000000), UnitGroup.FLOW_RATE, R.string.unit_cubic_millimeter_per_second, R.string.unit_cubic_millimeter_per_second_short),
ReverseUnit(MyUnitIDS.cubic_foot_per_hour, BigDecimal.valueOf(127132.80019736), UnitGroup.FLOW_RATE, R.string.unit_cubic_foot_per_hour, R.string.unit_cubic_foot_per_hour_short), ReverseUnit(UnitID.cubic_foot_per_hour, BigDecimal.valueOf(127132.80019736), UnitGroup.FLOW_RATE, R.string.unit_cubic_foot_per_hour, R.string.unit_cubic_foot_per_hour_short),
ReverseUnit(MyUnitIDS.cubic_foot_per_minute, BigDecimal.valueOf(2118.8800032893), UnitGroup.FLOW_RATE, R.string.unit_cubic_foot_per_minute, R.string.unit_cubic_foot_per_minute_short), ReverseUnit(UnitID.cubic_foot_per_minute, BigDecimal.valueOf(2118.8800032893), UnitGroup.FLOW_RATE, R.string.unit_cubic_foot_per_minute, R.string.unit_cubic_foot_per_minute_short),
ReverseUnit(MyUnitIDS.cubic_foot_per_second, BigDecimal.valueOf(35.314666721489), UnitGroup.FLOW_RATE, R.string.unit_cubic_foot_per_second, R.string.unit_cubic_foot_per_second_short), ReverseUnit(UnitID.cubic_foot_per_second, BigDecimal.valueOf(35.314666721489), UnitGroup.FLOW_RATE, R.string.unit_cubic_foot_per_second, R.string.unit_cubic_foot_per_second_short),
ReverseUnit(MyUnitIDS.gallons_per_hour_us, BigDecimal.valueOf(951019.38848933), UnitGroup.FLOW_RATE, R.string.unit_gallon_per_hour_us, R.string.unit_gallon_per_hour_us_short), ReverseUnit(UnitID.gallons_per_hour_us, BigDecimal.valueOf(951019.38848933), UnitGroup.FLOW_RATE, R.string.unit_gallon_per_hour_us, R.string.unit_gallon_per_hour_us_short),
ReverseUnit(MyUnitIDS.gallons_per_minute_us, BigDecimal.valueOf(15850.323141489), UnitGroup.FLOW_RATE, R.string.unit_gallon_per_minute_us, R.string.unit_gallon_per_minute_us_short), ReverseUnit(UnitID.gallons_per_minute_us, BigDecimal.valueOf(15850.323141489), UnitGroup.FLOW_RATE, R.string.unit_gallon_per_minute_us, R.string.unit_gallon_per_minute_us_short),
ReverseUnit(MyUnitIDS.gallons_per_second_us, BigDecimal.valueOf(264.17205235815), UnitGroup.FLOW_RATE, R.string.unit_gallon_per_second_us, R.string.unit_gallon_per_second_us_short), ReverseUnit(UnitID.gallons_per_second_us, BigDecimal.valueOf(264.17205235815), UnitGroup.FLOW_RATE, R.string.unit_gallon_per_second_us, R.string.unit_gallon_per_second_us_short),
ReverseUnit(MyUnitIDS.gallons_per_hour_imperial, BigDecimal.valueOf(791889.29387672), UnitGroup.FLOW_RATE, R.string.unit_gallon_per_hour_imperial, R.string.unit_gallon_per_hour_imperial_short), ReverseUnit(UnitID.gallons_per_hour_imperial, BigDecimal.valueOf(791889.29387672), UnitGroup.FLOW_RATE, R.string.unit_gallon_per_hour_imperial, R.string.unit_gallon_per_hour_imperial_short),
ReverseUnit(MyUnitIDS.gallons_per_minute_imperial, BigDecimal.valueOf(13198.154897945), UnitGroup.FLOW_RATE, R.string.unit_gallon_per_minute_imperial, R.string.unit_gallon_per_minute_imperial_short), ReverseUnit(UnitID.gallons_per_minute_imperial, BigDecimal.valueOf(13198.154897945), UnitGroup.FLOW_RATE, R.string.unit_gallon_per_minute_imperial, R.string.unit_gallon_per_minute_imperial_short),
ReverseUnit(MyUnitIDS.gallons_per_second_imperial, BigDecimal.valueOf(219.96924829909), UnitGroup.FLOW_RATE, R.string.unit_gallon_per_second_imperial, R.string.unit_gallon_per_second_imperial_short), ReverseUnit(UnitID.gallons_per_second_imperial, BigDecimal.valueOf(219.96924829909), UnitGroup.FLOW_RATE, R.string.unit_gallon_per_second_imperial, R.string.unit_gallon_per_second_imperial_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,17 +22,17 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
internal val fluxCollection: List<AbstractUnit> by lazy { internal val fluxCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit(MyUnitIDS.maxwell, BigDecimal.valueOf(1), UnitGroup.FLUX, R.string.unit_maxwell, R.string.unit_maxwell_short), NormalUnit(UnitID.maxwell, BigDecimal.valueOf(1), UnitGroup.FLUX, R.string.unit_maxwell, R.string.unit_maxwell_short),
NormalUnit(MyUnitIDS.microweber, BigDecimal.valueOf(100), UnitGroup.FLUX, R.string.unit_microweber, R.string.unit_microweber_short), NormalUnit(UnitID.microweber, BigDecimal.valueOf(100), UnitGroup.FLUX, R.string.unit_microweber, R.string.unit_microweber_short),
NormalUnit(MyUnitIDS.milliweber, BigDecimal.valueOf(100000), UnitGroup.FLUX, R.string.unit_milliweber, R.string.unit_milliweber_short), NormalUnit(UnitID.milliweber, BigDecimal.valueOf(100000), UnitGroup.FLUX, R.string.unit_milliweber, R.string.unit_milliweber_short),
NormalUnit(MyUnitIDS.weber, BigDecimal.valueOf(100000000), UnitGroup.FLUX, R.string.unit_weber, R.string.unit_weber_short), NormalUnit(UnitID.weber, BigDecimal.valueOf(100000000), UnitGroup.FLUX, R.string.unit_weber, R.string.unit_weber_short),
NormalUnit(MyUnitIDS.kiloweber, BigDecimal.valueOf(100000000000), UnitGroup.FLUX, R.string.unit_kiloweber, R.string.unit_kiloweber_short), NormalUnit(UnitID.kiloweber, BigDecimal.valueOf(100000000000), UnitGroup.FLUX, R.string.unit_kiloweber, R.string.unit_kiloweber_short),
NormalUnit(MyUnitIDS.megaweber, BigDecimal.valueOf(100000000000000), UnitGroup.FLUX, R.string.unit_megaweber, R.string.unit_megaweber_short), NormalUnit(UnitID.megaweber, BigDecimal.valueOf(100000000000000), UnitGroup.FLUX, R.string.unit_megaweber, R.string.unit_megaweber_short),
NormalUnit(MyUnitIDS.gigaweber, BigDecimal.valueOf(100000000000000000), UnitGroup.FLUX, R.string.unit_gigaweber, R.string.unit_gigaweber_short), NormalUnit(UnitID.gigaweber, BigDecimal.valueOf(100000000000000000), UnitGroup.FLUX, R.string.unit_gigaweber, R.string.unit_gigaweber_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,25 +22,25 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
val forceCollection: List<AbstractUnit> by lazy { val forceCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit(MyUnitIDS.attonewton, BigDecimal.valueOf(1), UnitGroup.FORCE, R.string.unit_attonewton, R.string.unit_attonewton_short), NormalUnit(UnitID.attonewton, BigDecimal.valueOf(1), UnitGroup.FORCE, R.string.unit_attonewton, R.string.unit_attonewton_short),
NormalUnit(MyUnitIDS.dyne, BigDecimal.valueOf(1E+13), UnitGroup.FORCE, R.string.unit_dyne, R.string.unit_dyne_short), NormalUnit(UnitID.dyne, BigDecimal.valueOf(1E+13), UnitGroup.FORCE, R.string.unit_dyne, R.string.unit_dyne_short),
NormalUnit(MyUnitIDS.millinewton, BigDecimal.valueOf(1E+15), UnitGroup.FORCE, R.string.unit_millinewton, R.string.unit_millinewton_short), NormalUnit(UnitID.millinewton, BigDecimal.valueOf(1E+15), UnitGroup.FORCE, R.string.unit_millinewton, R.string.unit_millinewton_short),
NormalUnit(MyUnitIDS.joule_per_centimeter, BigDecimal.valueOf(1E+16), UnitGroup.FORCE, R.string.unit_joule_per_centimeter, R.string.unit_joule_per_centimeter_short), NormalUnit(UnitID.joule_per_centimeter, BigDecimal.valueOf(1E+16), UnitGroup.FORCE, R.string.unit_joule_per_centimeter, R.string.unit_joule_per_centimeter_short),
NormalUnit(MyUnitIDS.newton, BigDecimal.valueOf(1E+18), UnitGroup.FORCE, R.string.unit_newton, R.string.unit_newton_short), NormalUnit(UnitID.newton, BigDecimal.valueOf(1E+18), UnitGroup.FORCE, R.string.unit_newton, R.string.unit_newton_short),
NormalUnit(MyUnitIDS.joule_per_meter, BigDecimal.valueOf(1E+18), UnitGroup.FORCE, R.string.unit_joule_per_meter, R.string.unit_joule_per_meter_short), NormalUnit(UnitID.joule_per_meter, BigDecimal.valueOf(1E+18), UnitGroup.FORCE, R.string.unit_joule_per_meter, R.string.unit_joule_per_meter_short),
NormalUnit(MyUnitIDS.kilonewton, BigDecimal.valueOf(1E+21), UnitGroup.FORCE, R.string.unit_kilonewton, R.string.unit_kilonewton_short), NormalUnit(UnitID.kilonewton, BigDecimal.valueOf(1E+21), UnitGroup.FORCE, R.string.unit_kilonewton, R.string.unit_kilonewton_short),
NormalUnit(MyUnitIDS.gram_force, BigDecimal.valueOf(9.80665E+15), UnitGroup.FORCE, R.string.unit_gram_force, R.string.unit_gram_force_short), NormalUnit(UnitID.gram_force, BigDecimal.valueOf(9.80665E+15), UnitGroup.FORCE, R.string.unit_gram_force, R.string.unit_gram_force_short),
NormalUnit(MyUnitIDS.kilogram_force, BigDecimal.valueOf(9.80665E+18), UnitGroup.FORCE, R.string.unit_kilogram_force, R.string.unit_kilogram_force_short), NormalUnit(UnitID.kilogram_force, BigDecimal.valueOf(9.80665E+18), UnitGroup.FORCE, R.string.unit_kilogram_force, R.string.unit_kilogram_force_short),
NormalUnit(MyUnitIDS.ton_force, BigDecimal.valueOf(9.80665E+21), UnitGroup.FORCE, R.string.unit_ton_force, R.string.unit_ton_force_short), NormalUnit(UnitID.ton_force, BigDecimal.valueOf(9.80665E+21), UnitGroup.FORCE, R.string.unit_ton_force, R.string.unit_ton_force_short),
NormalUnit(MyUnitIDS.ounce_force, BigDecimal.valueOf(2.78013850953423008E17), UnitGroup.FORCE, R.string.unit_ounce_force, R.string.unit_ounce_force_short), NormalUnit(UnitID.ounce_force, BigDecimal.valueOf(2.78013850953423008E17), UnitGroup.FORCE, R.string.unit_ounce_force, R.string.unit_ounce_force_short),
NormalUnit(MyUnitIDS.pound_force, BigDecimal.valueOf(4.4482216152550001E18), UnitGroup.FORCE, R.string.unit_pound_force, R.string.unit_pound_force_short), NormalUnit(UnitID.pound_force, BigDecimal.valueOf(4.4482216152550001E18), UnitGroup.FORCE, R.string.unit_pound_force, R.string.unit_pound_force_short),
NormalUnit(MyUnitIDS.kilopound_force, BigDecimal.valueOf(4.448221615255E+21), UnitGroup.FORCE, R.string.unit_kilopound_force, R.string.unit_kilopound_force_short), NormalUnit(UnitID.kilopound_force, BigDecimal.valueOf(4.448221615255E+21), UnitGroup.FORCE, R.string.unit_kilopound_force, R.string.unit_kilopound_force_short),
NormalUnit(MyUnitIDS.pond, BigDecimal.valueOf(9.80665E+15), UnitGroup.FORCE, R.string.unit_pond, R.string.unit_pond_short), NormalUnit(UnitID.pond, BigDecimal.valueOf(9.80665E+15), UnitGroup.FORCE, R.string.unit_pond, R.string.unit_pond_short),
NormalUnit(MyUnitIDS.kilopond, BigDecimal.valueOf(9.80665E+18), UnitGroup.FORCE, R.string.unit_kilopond, R.string.unit_kilopond_short), NormalUnit(UnitID.kilopond, BigDecimal.valueOf(9.80665E+18), UnitGroup.FORCE, R.string.unit_kilopond, R.string.unit_kilopond_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -19,7 +19,7 @@
package com.sadellie.unitto.data.converter.collections package com.sadellie.unitto.data.converter.collections
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.BackwardUnit import com.sadellie.unitto.data.model.unit.BackwardUnit
@ -28,15 +28,15 @@ import java.math.BigDecimal
val fuelConsumptionCollection: List<AbstractUnit> by lazy { val fuelConsumptionCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit( MyUnitIDS.kilometer_per_liter, BigDecimal.valueOf(1), UnitGroup.FUEL_CONSUMPTION, R.string.unit_km_per_l, R.string.unit_km_per_l_short), NormalUnit( UnitID.kilometer_per_liter, BigDecimal.valueOf(1), UnitGroup.FUEL_CONSUMPTION, R.string.unit_km_per_l, R.string.unit_km_per_l_short),
BackwardUnit(MyUnitIDS.liter_per_kilometer, BigDecimal.valueOf(1), UnitGroup.FUEL_CONSUMPTION, R.string.unit_l_per_km, R.string.unit_l_per_km_short), BackwardUnit(UnitID.liter_per_kilometer, BigDecimal.valueOf(1), UnitGroup.FUEL_CONSUMPTION, R.string.unit_l_per_km, R.string.unit_l_per_km_short),
BackwardUnit(MyUnitIDS.liter_per_100_kilometer, BigDecimal.valueOf(100), UnitGroup.FUEL_CONSUMPTION, R.string.unit_l_per_100_km, R.string.unit_l_per_100_km_short), BackwardUnit(UnitID.liter_per_100_kilometer, BigDecimal.valueOf(100), UnitGroup.FUEL_CONSUMPTION, R.string.unit_l_per_100_km, R.string.unit_l_per_100_km_short),
NormalUnit( MyUnitIDS.mile_per_gallon_uk, BigDecimal.valueOf(0.35400619), UnitGroup.FUEL_CONSUMPTION, R.string.unit_mi_per_gallon_uk, R.string.unit_mi_per_gallon_uk_short), NormalUnit( UnitID.mile_per_gallon_uk, BigDecimal.valueOf(0.35400619), UnitGroup.FUEL_CONSUMPTION, R.string.unit_mi_per_gallon_uk, R.string.unit_mi_per_gallon_uk_short),
NormalUnit( MyUnitIDS.mile_per_gallon_us, BigDecimal.valueOf(0.4251437075), UnitGroup.FUEL_CONSUMPTION, R.string.unit_mi_per_gallon_us, R.string.unit_mi_per_gallon_us_short), NormalUnit( UnitID.mile_per_gallon_us, BigDecimal.valueOf(0.4251437075), UnitGroup.FUEL_CONSUMPTION, R.string.unit_mi_per_gallon_us, R.string.unit_mi_per_gallon_us_short),
NormalUnit( MyUnitIDS.mile_us_per_liter, BigDecimal.valueOf(1.609344), UnitGroup.FUEL_CONSUMPTION, R.string.unit_mi_us_per_l, R.string.unit_mi_us_per_l_short), NormalUnit( UnitID.mile_us_per_liter, BigDecimal.valueOf(1.609344), UnitGroup.FUEL_CONSUMPTION, R.string.unit_mi_us_per_l, R.string.unit_mi_us_per_l_short),
BackwardUnit(MyUnitIDS.gallon_us_per_mile, BigDecimal.valueOf(0.4251437075), UnitGroup.FUEL_CONSUMPTION, R.string.unit_gallon_us_per_mile, R.string.unit_gallon_us_per_mile_short), BackwardUnit(UnitID.gallon_us_per_mile, BigDecimal.valueOf(0.4251437075), UnitGroup.FUEL_CONSUMPTION, R.string.unit_gallon_us_per_mile, R.string.unit_gallon_us_per_mile_short),
BackwardUnit(MyUnitIDS.gallon_uk_per_mile, BigDecimal.valueOf(0.35400619), UnitGroup.FUEL_CONSUMPTION, R.string.unit_gallon_uk_per_mile, R.string.unit_gallon_uk_per_mile_short), BackwardUnit(UnitID.gallon_uk_per_mile, BigDecimal.valueOf(0.35400619), UnitGroup.FUEL_CONSUMPTION, R.string.unit_gallon_uk_per_mile, R.string.unit_gallon_uk_per_mile_short),
BackwardUnit(MyUnitIDS.gallon_us_per_100_mile, BigDecimal.valueOf(42.51437075), UnitGroup.FUEL_CONSUMPTION, R.string.unit_gallon_us_per_100_mile, R.string.unit_gallon_us_per_100_mile_short), BackwardUnit(UnitID.gallon_us_per_100_mile, BigDecimal.valueOf(42.51437075), UnitGroup.FUEL_CONSUMPTION, R.string.unit_gallon_us_per_100_mile, R.string.unit_gallon_us_per_100_mile_short),
BackwardUnit(MyUnitIDS.gallon_uk_per_100_mile, BigDecimal.valueOf(35.400618996), UnitGroup.FUEL_CONSUMPTION, R.string.unit_gallon_uk_per_100_mile, R.string.unit_gallon_uk_per_100_mile_short), BackwardUnit(UnitID.gallon_uk_per_100_mile, BigDecimal.valueOf(35.400618996), UnitGroup.FUEL_CONSUMPTION, R.string.unit_gallon_uk_per_100_mile, R.string.unit_gallon_uk_per_100_mile_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,36 +22,36 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
internal val lengthCollection: List<AbstractUnit> by lazy { internal val lengthCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit(MyUnitIDS.attometer, BigDecimal.valueOf(1.0), UnitGroup.LENGTH, R.string.unit_attometer, R.string.unit_attometer_short), NormalUnit(UnitID.attometer, BigDecimal.valueOf(1.0), UnitGroup.LENGTH, R.string.unit_attometer, R.string.unit_attometer_short),
NormalUnit(MyUnitIDS.nanometer, BigDecimal.valueOf(1.0E+9), UnitGroup.LENGTH, R.string.unit_nanometer, R.string.unit_nanometer_short), NormalUnit(UnitID.nanometer, BigDecimal.valueOf(1.0E+9), UnitGroup.LENGTH, R.string.unit_nanometer, R.string.unit_nanometer_short),
NormalUnit(MyUnitIDS.micrometer, BigDecimal.valueOf(1.0E+12), UnitGroup.LENGTH, R.string.unit_micrometer, R.string.unit_micrometer_short), NormalUnit(UnitID.micrometer, BigDecimal.valueOf(1.0E+12), UnitGroup.LENGTH, R.string.unit_micrometer, R.string.unit_micrometer_short),
NormalUnit(MyUnitIDS.millimeter, BigDecimal.valueOf(1.0E+15), UnitGroup.LENGTH, R.string.unit_millimeter, R.string.unit_millimeter_short), NormalUnit(UnitID.millimeter, BigDecimal.valueOf(1.0E+15), UnitGroup.LENGTH, R.string.unit_millimeter, R.string.unit_millimeter_short),
NormalUnit(MyUnitIDS.centimeter, BigDecimal.valueOf(1.0E+16), UnitGroup.LENGTH, R.string.unit_centimeter, R.string.unit_centimeter_short), NormalUnit(UnitID.centimeter, BigDecimal.valueOf(1.0E+16), UnitGroup.LENGTH, R.string.unit_centimeter, R.string.unit_centimeter_short),
NormalUnit(MyUnitIDS.decimeter, BigDecimal.valueOf(1.0E+17), UnitGroup.LENGTH, R.string.unit_decimeter, R.string.unit_decimeter_short), NormalUnit(UnitID.decimeter, BigDecimal.valueOf(1.0E+17), UnitGroup.LENGTH, R.string.unit_decimeter, R.string.unit_decimeter_short),
NormalUnit(MyUnitIDS.meter, BigDecimal.valueOf(1.0E+18), UnitGroup.LENGTH, R.string.unit_meter, R.string.unit_meter_short), NormalUnit(UnitID.meter, BigDecimal.valueOf(1.0E+18), UnitGroup.LENGTH, R.string.unit_meter, R.string.unit_meter_short),
NormalUnit(MyUnitIDS.kilometer, BigDecimal.valueOf(1.0E+21), UnitGroup.LENGTH, R.string.unit_kilometer, R.string.unit_kilometer_short), NormalUnit(UnitID.kilometer, BigDecimal.valueOf(1.0E+21), UnitGroup.LENGTH, R.string.unit_kilometer, R.string.unit_kilometer_short),
NormalUnit(MyUnitIDS.nautical_mile, BigDecimal.valueOf(1.852E+21), UnitGroup.LENGTH, R.string.unit_nautical_mile, R.string.unit_nautical_mile_short), NormalUnit(UnitID.nautical_mile, BigDecimal.valueOf(1.852E+21), UnitGroup.LENGTH, R.string.unit_nautical_mile, R.string.unit_nautical_mile_short),
NormalUnit(MyUnitIDS.inch, BigDecimal.valueOf(25_400_000_000_000_000), UnitGroup.LENGTH, R.string.unit_inch, R.string.unit_inch_short), NormalUnit(UnitID.inch, BigDecimal.valueOf(25_400_000_000_000_000), UnitGroup.LENGTH, R.string.unit_inch, R.string.unit_inch_short),
NormalUnit(MyUnitIDS.foot, BigDecimal.valueOf(304_800_000_000_002_200), UnitGroup.LENGTH, R.string.unit_foot, R.string.unit_foot_short), NormalUnit(UnitID.foot, BigDecimal.valueOf(304_800_000_000_002_200), UnitGroup.LENGTH, R.string.unit_foot, R.string.unit_foot_short),
NormalUnit(MyUnitIDS.yard, BigDecimal.valueOf(914_400_000_000_006_400), UnitGroup.LENGTH, R.string.unit_yard, R.string.unit_yard_short), NormalUnit(UnitID.yard, BigDecimal.valueOf(914_400_000_000_006_400), UnitGroup.LENGTH, R.string.unit_yard, R.string.unit_yard_short),
NormalUnit(MyUnitIDS.mile, BigDecimal.valueOf(1_609_344_000_000_010_500_000.0), UnitGroup.LENGTH, R.string.unit_mile, R.string.unit_mile_short), NormalUnit(UnitID.mile, BigDecimal.valueOf(1_609_344_000_000_010_500_000.0), UnitGroup.LENGTH, R.string.unit_mile, R.string.unit_mile_short),
NormalUnit(MyUnitIDS.light_year, BigDecimal.valueOf(9.460730472E+33), UnitGroup.LENGTH, R.string.unit_light_year, R.string.unit_light_year_short), NormalUnit(UnitID.light_year, BigDecimal.valueOf(9.460730472E+33), UnitGroup.LENGTH, R.string.unit_light_year, R.string.unit_light_year_short),
NormalUnit(MyUnitIDS.parsec, BigDecimal.valueOf(3.08567758149136E+34), UnitGroup.LENGTH, R.string.unit_parsec, R.string.unit_parsec_short), NormalUnit(UnitID.parsec, BigDecimal.valueOf(3.08567758149136E+34), UnitGroup.LENGTH, R.string.unit_parsec, R.string.unit_parsec_short),
NormalUnit(MyUnitIDS.kiloparsec, BigDecimal.valueOf(3.08567758149136E+37), UnitGroup.LENGTH, R.string.unit_kiloparsec, R.string.unit_kiloparsec_short), NormalUnit(UnitID.kiloparsec, BigDecimal.valueOf(3.08567758149136E+37), UnitGroup.LENGTH, R.string.unit_kiloparsec, R.string.unit_kiloparsec_short),
NormalUnit(MyUnitIDS.megaparsec, BigDecimal.valueOf(3.08567758149136E+40), UnitGroup.LENGTH, R.string.unit_megaparsec, R.string.unit_megaparsec_short), NormalUnit(UnitID.megaparsec, BigDecimal.valueOf(3.08567758149136E+40), UnitGroup.LENGTH, R.string.unit_megaparsec, R.string.unit_megaparsec_short),
NormalUnit(MyUnitIDS.mercury_equatorial_radius, BigDecimal.valueOf(2.4397E+24), UnitGroup.LENGTH, R.string.unit_mercury_equatorial_radius, R.string.unit_mercury_equatorial_radius_short), NormalUnit(UnitID.mercury_equatorial_radius, BigDecimal.valueOf(2.4397E+24), UnitGroup.LENGTH, R.string.unit_mercury_equatorial_radius, R.string.unit_mercury_equatorial_radius_short),
NormalUnit(MyUnitIDS.venus_equatorial_radius, BigDecimal.valueOf(6.0518E+24), UnitGroup.LENGTH, R.string.unit_venus_equatorial_radius, R.string.unit_venus_equatorial_radius_short), NormalUnit(UnitID.venus_equatorial_radius, BigDecimal.valueOf(6.0518E+24), UnitGroup.LENGTH, R.string.unit_venus_equatorial_radius, R.string.unit_venus_equatorial_radius_short),
NormalUnit(MyUnitIDS.earth_equatorial_radius, BigDecimal.valueOf(6.371E+24), UnitGroup.LENGTH, R.string.unit_earth_equatorial_radius, R.string.unit_earth_equatorial_radius_short), NormalUnit(UnitID.earth_equatorial_radius, BigDecimal.valueOf(6.371E+24), UnitGroup.LENGTH, R.string.unit_earth_equatorial_radius, R.string.unit_earth_equatorial_radius_short),
NormalUnit(MyUnitIDS.mars_equatorial_radius, BigDecimal.valueOf(3.3895E+24), UnitGroup.LENGTH, R.string.unit_mars_equatorial_radius, R.string.unit_mars_equatorial_radius_short), NormalUnit(UnitID.mars_equatorial_radius, BigDecimal.valueOf(3.3895E+24), UnitGroup.LENGTH, R.string.unit_mars_equatorial_radius, R.string.unit_mars_equatorial_radius_short),
NormalUnit(MyUnitIDS.jupiter_equatorial_radius, BigDecimal.valueOf(6.9911E+25), UnitGroup.LENGTH, R.string.unit_jupiter_equatorial_radius, R.string.unit_jupiter_equatorial_radius_short), NormalUnit(UnitID.jupiter_equatorial_radius, BigDecimal.valueOf(6.9911E+25), UnitGroup.LENGTH, R.string.unit_jupiter_equatorial_radius, R.string.unit_jupiter_equatorial_radius_short),
NormalUnit(MyUnitIDS.saturn_equatorial_radius, BigDecimal.valueOf(5.8232E+25), UnitGroup.LENGTH, R.string.unit_saturn_equatorial_radius, R.string.unit_saturn_equatorial_radius_short), NormalUnit(UnitID.saturn_equatorial_radius, BigDecimal.valueOf(5.8232E+25), UnitGroup.LENGTH, R.string.unit_saturn_equatorial_radius, R.string.unit_saturn_equatorial_radius_short),
NormalUnit(MyUnitIDS.uranus_equatorial_radius, BigDecimal.valueOf(2.5362E+25), UnitGroup.LENGTH, R.string.unit_uranus_equatorial_radius, R.string.unit_uranus_equatorial_radius_short), NormalUnit(UnitID.uranus_equatorial_radius, BigDecimal.valueOf(2.5362E+25), UnitGroup.LENGTH, R.string.unit_uranus_equatorial_radius, R.string.unit_uranus_equatorial_radius_short),
NormalUnit(MyUnitIDS.neptune_equatorial_radius, BigDecimal.valueOf(2.4622E+25), UnitGroup.LENGTH, R.string.unit_neptune_equatorial_radius, R.string.unit_neptune_equatorial_radius_short), NormalUnit(UnitID.neptune_equatorial_radius, BigDecimal.valueOf(2.4622E+25), UnitGroup.LENGTH, R.string.unit_neptune_equatorial_radius, R.string.unit_neptune_equatorial_radius_short),
NormalUnit(MyUnitIDS.sun_equatorial_radius, BigDecimal.valueOf(6.95508E+26), UnitGroup.LENGTH, R.string.unit_sun_equatorial_radius, R.string.unit_sun_equatorial_radius_short), NormalUnit(UnitID.sun_equatorial_radius, BigDecimal.valueOf(6.95508E+26), UnitGroup.LENGTH, R.string.unit_sun_equatorial_radius, R.string.unit_sun_equatorial_radius_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,29 +22,29 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
val luminanceCollection: List<AbstractUnit> by lazy { val luminanceCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit(MyUnitIDS.candela_per_square_meter, BigDecimal.valueOf(31415926.5359), UnitGroup.LUMINANCE, R.string.unit_candela_per_square_meter, R.string.unit_candela_per_square_meter_short), NormalUnit(UnitID.candela_per_square_meter, BigDecimal.valueOf(31415926.5359), UnitGroup.LUMINANCE, R.string.unit_candela_per_square_meter, R.string.unit_candela_per_square_meter_short),
NormalUnit(MyUnitIDS.candela_per_square_centimeter, BigDecimal.valueOf(314159265359), UnitGroup.LUMINANCE, R.string.unit_candela_per_square_centimeter, R.string.unit_candela_per_square_centimeter_short), NormalUnit(UnitID.candela_per_square_centimeter, BigDecimal.valueOf(314159265359), UnitGroup.LUMINANCE, R.string.unit_candela_per_square_centimeter, R.string.unit_candela_per_square_centimeter_short),
NormalUnit(MyUnitIDS.candela_per_square_foot, BigDecimal.valueOf(338158218.89), UnitGroup.LUMINANCE, R.string.unit_candela_per_square_foot, R.string.unit_candela_per_square_foot_short), NormalUnit(UnitID.candela_per_square_foot, BigDecimal.valueOf(338158218.89), UnitGroup.LUMINANCE, R.string.unit_candela_per_square_foot, R.string.unit_candela_per_square_foot_short),
NormalUnit(MyUnitIDS.candela_per_square_inch, BigDecimal.valueOf(48694783520), UnitGroup.LUMINANCE, R.string.unit_candela_per_square_inch, R.string.unit_candela_per_square_inch_short), NormalUnit(UnitID.candela_per_square_inch, BigDecimal.valueOf(48694783520), UnitGroup.LUMINANCE, R.string.unit_candela_per_square_inch, R.string.unit_candela_per_square_inch_short),
NormalUnit(MyUnitIDS.kilocandela_per_square_meter, BigDecimal.valueOf(31415926535.9), UnitGroup.LUMINANCE, R.string.unit_kilocandela_per_square_meter, R.string.unit_kilocandela_per_square_meter_short), NormalUnit(UnitID.kilocandela_per_square_meter, BigDecimal.valueOf(31415926535.9), UnitGroup.LUMINANCE, R.string.unit_kilocandela_per_square_meter, R.string.unit_kilocandela_per_square_meter_short),
NormalUnit(MyUnitIDS.stilb, BigDecimal.valueOf(314159265359), UnitGroup.LUMINANCE, R.string.unit_stilb, R.string.unit_stilb_short), NormalUnit(UnitID.stilb, BigDecimal.valueOf(314159265359), UnitGroup.LUMINANCE, R.string.unit_stilb, R.string.unit_stilb_short),
NormalUnit(MyUnitIDS.lumen_per_square_meter_per_steradian, BigDecimal.valueOf(31415926.5359), UnitGroup.LUMINANCE, R.string.unit_lumen_per_square_meter_per_steradian, R.string.unit_lumen_per_square_meter_per_steradian_short), NormalUnit(UnitID.lumen_per_square_meter_per_steradian, BigDecimal.valueOf(31415926.5359), UnitGroup.LUMINANCE, R.string.unit_lumen_per_square_meter_per_steradian, R.string.unit_lumen_per_square_meter_per_steradian_short),
NormalUnit(MyUnitIDS.lumen_per_square_centimeter_per_steradian, BigDecimal.valueOf(314159265359), UnitGroup.LUMINANCE, R.string.unit_lumen_per_square_centimeter_per_steradian, R.string.unit_lumen_per_square_centimeter_per_steradian_short), NormalUnit(UnitID.lumen_per_square_centimeter_per_steradian, BigDecimal.valueOf(314159265359), UnitGroup.LUMINANCE, R.string.unit_lumen_per_square_centimeter_per_steradian, R.string.unit_lumen_per_square_centimeter_per_steradian_short),
NormalUnit(MyUnitIDS.lumen_per_square_foot_per_steradian, BigDecimal.valueOf(338158218.89), UnitGroup.LUMINANCE, R.string.unit_lumen_per_square_foot_per_steradian, R.string.unit_lumen_per_square_foot_per_steradian_short), NormalUnit(UnitID.lumen_per_square_foot_per_steradian, BigDecimal.valueOf(338158218.89), UnitGroup.LUMINANCE, R.string.unit_lumen_per_square_foot_per_steradian, R.string.unit_lumen_per_square_foot_per_steradian_short),
NormalUnit(MyUnitIDS.watt_per_square_centimeter_per_steradian, BigDecimal.valueOf(214570778240185), UnitGroup.LUMINANCE, R.string.unit_watt_per_square_centimeter_per_steradian, R.string.unit_watt_per_square_centimeter_per_steradian_short), NormalUnit(UnitID.watt_per_square_centimeter_per_steradian, BigDecimal.valueOf(214570778240185), UnitGroup.LUMINANCE, R.string.unit_watt_per_square_centimeter_per_steradian, R.string.unit_watt_per_square_centimeter_per_steradian_short),
NormalUnit(MyUnitIDS.nit, BigDecimal.valueOf(31415926.5359), UnitGroup.LUMINANCE, R.string.unit_nit, R.string.unit_nit_short), NormalUnit(UnitID.nit, BigDecimal.valueOf(31415926.5359), UnitGroup.LUMINANCE, R.string.unit_nit, R.string.unit_nit_short),
NormalUnit(MyUnitIDS.millinit, BigDecimal.valueOf(31415.9265359), UnitGroup.LUMINANCE, R.string.unit_millinit, R.string.unit_millinit_short), NormalUnit(UnitID.millinit, BigDecimal.valueOf(31415.9265359), UnitGroup.LUMINANCE, R.string.unit_millinit, R.string.unit_millinit_short),
NormalUnit(MyUnitIDS.lambert, BigDecimal.valueOf(100000000000), UnitGroup.LUMINANCE, R.string.unit_lambert, R.string.unit_lambert_short), NormalUnit(UnitID.lambert, BigDecimal.valueOf(100000000000), UnitGroup.LUMINANCE, R.string.unit_lambert, R.string.unit_lambert_short),
NormalUnit(MyUnitIDS.millilambert, BigDecimal.valueOf(100000000), UnitGroup.LUMINANCE, R.string.unit_millilambert, R.string.unit_millilambert_short), NormalUnit(UnitID.millilambert, BigDecimal.valueOf(100000000), UnitGroup.LUMINANCE, R.string.unit_millilambert, R.string.unit_millilambert_short),
NormalUnit(MyUnitIDS.foot_lambert, BigDecimal.valueOf(107639104.167), UnitGroup.LUMINANCE, R.string.unit_foot_lambert, R.string.unit_foot_lambert_short), NormalUnit(UnitID.foot_lambert, BigDecimal.valueOf(107639104.167), UnitGroup.LUMINANCE, R.string.unit_foot_lambert, R.string.unit_foot_lambert_short),
NormalUnit(MyUnitIDS.apostilb, BigDecimal.valueOf(10000000), UnitGroup.LUMINANCE, R.string.unit_apostilb, R.string.unit_apostilb_short), NormalUnit(UnitID.apostilb, BigDecimal.valueOf(10000000), UnitGroup.LUMINANCE, R.string.unit_apostilb, R.string.unit_apostilb_short),
NormalUnit(MyUnitIDS.blondel, BigDecimal.valueOf(10000000), UnitGroup.LUMINANCE, R.string.unit_blondel, R.string.unit_blondel_short), NormalUnit(UnitID.blondel, BigDecimal.valueOf(10000000), UnitGroup.LUMINANCE, R.string.unit_blondel, R.string.unit_blondel_short),
NormalUnit(MyUnitIDS.skot, BigDecimal.valueOf(10000), UnitGroup.LUMINANCE, R.string.unit_skot, R.string.unit_skot_short), NormalUnit(UnitID.skot, BigDecimal.valueOf(10000), UnitGroup.LUMINANCE, R.string.unit_skot, R.string.unit_skot_short),
NormalUnit(MyUnitIDS.bril, BigDecimal.valueOf(1), UnitGroup.LUMINANCE, R.string.unit_bril, R.string.unit_bril_short), NormalUnit(UnitID.bril, BigDecimal.valueOf(1), UnitGroup.LUMINANCE, R.string.unit_bril, R.string.unit_bril_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -19,7 +19,7 @@
package com.sadellie.unitto.data.converter.collections package com.sadellie.unitto.data.converter.collections
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
@ -27,26 +27,26 @@ import java.math.BigDecimal
internal val massCollection: List<AbstractUnit> by lazy { internal val massCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit(MyUnitIDS.electron_mass_rest, BigDecimal.valueOf(9.1093897E-28), UnitGroup.MASS, R.string.unit_electron_mass_rest, R.string.unit_electron_mass_rest_short), NormalUnit(UnitID.electron_mass_rest, BigDecimal.valueOf(9.1093897E-28), UnitGroup.MASS, R.string.unit_electron_mass_rest, R.string.unit_electron_mass_rest_short),
NormalUnit(MyUnitIDS.atomic_mass_unit, BigDecimal.valueOf(1.6605402E-24), UnitGroup.MASS, R.string.unit_atomic_mass_unit, R.string.unit_atomic_mass_unit_short), NormalUnit(UnitID.atomic_mass_unit, BigDecimal.valueOf(1.6605402E-24), UnitGroup.MASS, R.string.unit_atomic_mass_unit, R.string.unit_atomic_mass_unit_short),
NormalUnit(MyUnitIDS.microgram, BigDecimal(1E-6), UnitGroup.MASS, R.string.unit_microgram, R.string.unit_microgram_short), NormalUnit(UnitID.microgram, BigDecimal(1E-6), UnitGroup.MASS, R.string.unit_microgram, R.string.unit_microgram_short),
NormalUnit(MyUnitIDS.milligram, BigDecimal.valueOf(1E-3), UnitGroup.MASS, R.string.unit_milligram, R.string.unit_milligram_short), NormalUnit(UnitID.milligram, BigDecimal.valueOf(1E-3), UnitGroup.MASS, R.string.unit_milligram, R.string.unit_milligram_short),
NormalUnit(MyUnitIDS.grain, BigDecimal.valueOf(0.06479891), UnitGroup.MASS, R.string.unit_grain, R.string.unit_grain_short), NormalUnit(UnitID.grain, BigDecimal.valueOf(0.06479891), UnitGroup.MASS, R.string.unit_grain, R.string.unit_grain_short),
NormalUnit(MyUnitIDS.gram, BigDecimal.valueOf(1), UnitGroup.MASS, R.string.unit_gram, R.string.unit_gram_short), NormalUnit(UnitID.gram, BigDecimal.valueOf(1), UnitGroup.MASS, R.string.unit_gram, R.string.unit_gram_short),
NormalUnit(MyUnitIDS.kilogram, BigDecimal.valueOf(1E+3), UnitGroup.MASS, R.string.unit_kilogram, R.string.unit_kilogram_short), NormalUnit(UnitID.kilogram, BigDecimal.valueOf(1E+3), UnitGroup.MASS, R.string.unit_kilogram, R.string.unit_kilogram_short),
NormalUnit(MyUnitIDS.metric_ton, BigDecimal.valueOf(1E+6), UnitGroup.MASS, R.string.unit_metric_ton, R.string.unit_metric_ton_short), NormalUnit(UnitID.metric_ton, BigDecimal.valueOf(1E+6), UnitGroup.MASS, R.string.unit_metric_ton, R.string.unit_metric_ton_short),
NormalUnit(MyUnitIDS.imperial_ton, BigDecimal.valueOf(1016046.9088), UnitGroup.MASS, R.string.unit_imperial_ton, R.string.unit_imperial_ton_short), NormalUnit(UnitID.imperial_ton, BigDecimal.valueOf(1016046.9088), UnitGroup.MASS, R.string.unit_imperial_ton, R.string.unit_imperial_ton_short),
NormalUnit(MyUnitIDS.ounce, BigDecimal.valueOf(28.349523125), UnitGroup.MASS, R.string.unit_ounce, R.string.unit_ounce_short), NormalUnit(UnitID.ounce, BigDecimal.valueOf(28.349523125), UnitGroup.MASS, R.string.unit_ounce, R.string.unit_ounce_short),
NormalUnit(MyUnitIDS.carat, BigDecimal.valueOf(0.2), UnitGroup.MASS, R.string.unit_carat, R.string.unit_carat_short), NormalUnit(UnitID.carat, BigDecimal.valueOf(0.2), UnitGroup.MASS, R.string.unit_carat, R.string.unit_carat_short),
NormalUnit(MyUnitIDS.pound, BigDecimal.valueOf(453.59237), UnitGroup.MASS, R.string.unit_pound, R.string.unit_pound_short), NormalUnit(UnitID.pound, BigDecimal.valueOf(453.59237), UnitGroup.MASS, R.string.unit_pound, R.string.unit_pound_short),
NormalUnit(MyUnitIDS.mercury_mass, BigDecimal.valueOf(3.30104E+26), UnitGroup.MASS, R.string.unit_mercury_mass, R.string.unit_mercury_mass_short), NormalUnit(UnitID.mercury_mass, BigDecimal.valueOf(3.30104E+26), UnitGroup.MASS, R.string.unit_mercury_mass, R.string.unit_mercury_mass_short),
NormalUnit(MyUnitIDS.venus_mass, BigDecimal.valueOf(4.86732E+27), UnitGroup.MASS, R.string.unit_venus_mass, R.string.unit_venus_mass_short), NormalUnit(UnitID.venus_mass, BigDecimal.valueOf(4.86732E+27), UnitGroup.MASS, R.string.unit_venus_mass, R.string.unit_venus_mass_short),
NormalUnit(MyUnitIDS.earth_mass, BigDecimal.valueOf(5.97219E+27), UnitGroup.MASS, R.string.unit_earth_mass, R.string.unit_earth_mass_short), NormalUnit(UnitID.earth_mass, BigDecimal.valueOf(5.97219E+27), UnitGroup.MASS, R.string.unit_earth_mass, R.string.unit_earth_mass_short),
NormalUnit(MyUnitIDS.mars_mass, BigDecimal.valueOf(6.41693E+26), UnitGroup.MASS, R.string.unit_mars_mass, R.string.unit_mars_mass_short), NormalUnit(UnitID.mars_mass, BigDecimal.valueOf(6.41693E+26), UnitGroup.MASS, R.string.unit_mars_mass, R.string.unit_mars_mass_short),
NormalUnit(MyUnitIDS.jupiter_mass, BigDecimal.valueOf(1.89813E+30), UnitGroup.MASS, R.string.unit_jupiter_mass, R.string.unit_jupiter_mass_short), NormalUnit(UnitID.jupiter_mass, BigDecimal.valueOf(1.89813E+30), UnitGroup.MASS, R.string.unit_jupiter_mass, R.string.unit_jupiter_mass_short),
NormalUnit(MyUnitIDS.saturn_mass, BigDecimal.valueOf(5.68319E+29), UnitGroup.MASS, R.string.unit_saturn_mass, R.string.unit_saturn_mass_short), NormalUnit(UnitID.saturn_mass, BigDecimal.valueOf(5.68319E+29), UnitGroup.MASS, R.string.unit_saturn_mass, R.string.unit_saturn_mass_short),
NormalUnit(MyUnitIDS.uranus_mass, BigDecimal.valueOf(8.68103E+28), UnitGroup.MASS, R.string.unit_uranus_mass, R.string.unit_uranus_mass_short), NormalUnit(UnitID.uranus_mass, BigDecimal.valueOf(8.68103E+28), UnitGroup.MASS, R.string.unit_uranus_mass, R.string.unit_uranus_mass_short),
NormalUnit(MyUnitIDS.neptune_mass, BigDecimal.valueOf(1.0241E+29), UnitGroup.MASS, R.string.unit_neptune_mass, R.string.unit_neptune_mass_short), NormalUnit(UnitID.neptune_mass, BigDecimal.valueOf(1.0241E+29), UnitGroup.MASS, R.string.unit_neptune_mass, R.string.unit_neptune_mass_short),
NormalUnit(MyUnitIDS.sun_mass, BigDecimal.valueOf(1.9891E+33), UnitGroup.MASS, R.string.unit_sun_mass, R.string.unit_sun_mass_short), NormalUnit(UnitID.sun_mass, BigDecimal.valueOf(1.9891E+33), UnitGroup.MASS, R.string.unit_sun_mass, R.string.unit_sun_mass_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,25 +22,25 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NumberBaseUnit import com.sadellie.unitto.data.model.unit.NumberBaseUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
internal val numberBaseCollection: List<AbstractUnit> by lazy { internal val numberBaseCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NumberBaseUnit(MyUnitIDS.binary, BigDecimal.valueOf(2.0), UnitGroup.NUMBER_BASE, R.string.unit_binary, R.string.unit_binary_short), NumberBaseUnit(UnitID.binary, BigDecimal.valueOf(2.0), UnitGroup.NUMBER_BASE, R.string.unit_binary, R.string.unit_binary_short),
NumberBaseUnit(MyUnitIDS.ternary, BigDecimal.valueOf(3.0), UnitGroup.NUMBER_BASE, R.string.unit_ternary, R.string.unit_ternary_short), NumberBaseUnit(UnitID.ternary, BigDecimal.valueOf(3.0), UnitGroup.NUMBER_BASE, R.string.unit_ternary, R.string.unit_ternary_short),
NumberBaseUnit(MyUnitIDS.quaternary, BigDecimal.valueOf(4.0), UnitGroup.NUMBER_BASE, R.string.unit_quaternary, R.string.unit_quaternary_short), NumberBaseUnit(UnitID.quaternary, BigDecimal.valueOf(4.0), UnitGroup.NUMBER_BASE, R.string.unit_quaternary, R.string.unit_quaternary_short),
NumberBaseUnit(MyUnitIDS.quinary, BigDecimal.valueOf(5.0), UnitGroup.NUMBER_BASE, R.string.unit_quinary, R.string.unit_quinary_short), NumberBaseUnit(UnitID.quinary, BigDecimal.valueOf(5.0), UnitGroup.NUMBER_BASE, R.string.unit_quinary, R.string.unit_quinary_short),
NumberBaseUnit(MyUnitIDS.senary, BigDecimal.valueOf(6.0), UnitGroup.NUMBER_BASE, R.string.unit_senary, R.string.unit_senary_short), NumberBaseUnit(UnitID.senary, BigDecimal.valueOf(6.0), UnitGroup.NUMBER_BASE, R.string.unit_senary, R.string.unit_senary_short),
NumberBaseUnit(MyUnitIDS.septenary, BigDecimal.valueOf(7.0), UnitGroup.NUMBER_BASE, R.string.unit_septenary, R.string.unit_septenary_short), NumberBaseUnit(UnitID.septenary, BigDecimal.valueOf(7.0), UnitGroup.NUMBER_BASE, R.string.unit_septenary, R.string.unit_septenary_short),
NumberBaseUnit(MyUnitIDS.octal, BigDecimal.valueOf(8.0), UnitGroup.NUMBER_BASE, R.string.unit_octal, R.string.unit_octal_short), NumberBaseUnit(UnitID.octal, BigDecimal.valueOf(8.0), UnitGroup.NUMBER_BASE, R.string.unit_octal, R.string.unit_octal_short),
NumberBaseUnit(MyUnitIDS.nonary, BigDecimal.valueOf(9.0), UnitGroup.NUMBER_BASE, R.string.unit_nonary, R.string.unit_nonary_short), NumberBaseUnit(UnitID.nonary, BigDecimal.valueOf(9.0), UnitGroup.NUMBER_BASE, R.string.unit_nonary, R.string.unit_nonary_short),
NumberBaseUnit(MyUnitIDS.decimal, BigDecimal.valueOf(10.0), UnitGroup.NUMBER_BASE, R.string.unit_decimal, R.string.unit_decimal_short), NumberBaseUnit(UnitID.decimal, BigDecimal.valueOf(10.0), UnitGroup.NUMBER_BASE, R.string.unit_decimal, R.string.unit_decimal_short),
NumberBaseUnit(MyUnitIDS.undecimal, BigDecimal.valueOf(11.0), UnitGroup.NUMBER_BASE, R.string.unit_undecimal, R.string.unit_undecimal_short), NumberBaseUnit(UnitID.undecimal, BigDecimal.valueOf(11.0), UnitGroup.NUMBER_BASE, R.string.unit_undecimal, R.string.unit_undecimal_short),
NumberBaseUnit(MyUnitIDS.duodecimal, BigDecimal.valueOf(12.0), UnitGroup.NUMBER_BASE, R.string.unit_duodecimal, R.string.unit_duodecimal_short), NumberBaseUnit(UnitID.duodecimal, BigDecimal.valueOf(12.0), UnitGroup.NUMBER_BASE, R.string.unit_duodecimal, R.string.unit_duodecimal_short),
NumberBaseUnit(MyUnitIDS.tridecimal, BigDecimal.valueOf(13.0), UnitGroup.NUMBER_BASE, R.string.unit_tridecimal, R.string.unit_tridecimal_short), NumberBaseUnit(UnitID.tridecimal, BigDecimal.valueOf(13.0), UnitGroup.NUMBER_BASE, R.string.unit_tridecimal, R.string.unit_tridecimal_short),
NumberBaseUnit(MyUnitIDS.tetradecimal, BigDecimal.valueOf(14.0), UnitGroup.NUMBER_BASE, R.string.unit_tetradecimal, R.string.unit_tetradecimal_short), NumberBaseUnit(UnitID.tetradecimal, BigDecimal.valueOf(14.0), UnitGroup.NUMBER_BASE, R.string.unit_tetradecimal, R.string.unit_tetradecimal_short),
NumberBaseUnit(MyUnitIDS.pentadecimal, BigDecimal.valueOf(15.0), UnitGroup.NUMBER_BASE, R.string.unit_pentadecimal, R.string.unit_pentadecimal_short), NumberBaseUnit(UnitID.pentadecimal, BigDecimal.valueOf(15.0), UnitGroup.NUMBER_BASE, R.string.unit_pentadecimal, R.string.unit_pentadecimal_short),
NumberBaseUnit(MyUnitIDS.hexadecimal, BigDecimal.valueOf(16.0), UnitGroup.NUMBER_BASE, R.string.unit_hexadecimal, R.string.unit_hexadecimal_short), NumberBaseUnit(UnitID.hexadecimal, BigDecimal.valueOf(16.0), UnitGroup.NUMBER_BASE, R.string.unit_hexadecimal, R.string.unit_hexadecimal_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,15 +22,15 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
internal val powerCollection: List<AbstractUnit> by lazy { internal val powerCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit(MyUnitIDS.attowatt, BigDecimal.valueOf(1), UnitGroup.POWER, R.string.unit_attowatt, R.string.unit_attowatt_short), NormalUnit(UnitID.attowatt, BigDecimal.valueOf(1), UnitGroup.POWER, R.string.unit_attowatt, R.string.unit_attowatt_short),
NormalUnit(MyUnitIDS.watt, BigDecimal.valueOf(1_000_000_000_000_000_000), UnitGroup.POWER, R.string.unit_watt, R.string.unit_watt_short), NormalUnit(UnitID.watt, BigDecimal.valueOf(1_000_000_000_000_000_000), UnitGroup.POWER, R.string.unit_watt, R.string.unit_watt_short),
NormalUnit(MyUnitIDS.kilowatt, BigDecimal.valueOf(1.0E+21), UnitGroup.POWER, R.string.unit_kilowatt, R.string.unit_kilowatt_short), NormalUnit(UnitID.kilowatt, BigDecimal.valueOf(1.0E+21), UnitGroup.POWER, R.string.unit_kilowatt, R.string.unit_kilowatt_short),
NormalUnit(MyUnitIDS.megawatt, BigDecimal.valueOf(1.0E+24), UnitGroup.POWER, R.string.unit_megawatt, R.string.unit_megawatt_short), NormalUnit(UnitID.megawatt, BigDecimal.valueOf(1.0E+24), UnitGroup.POWER, R.string.unit_megawatt, R.string.unit_megawatt_short),
NormalUnit(MyUnitIDS.horse_power_mechanical, BigDecimal.valueOf(745_699_871_582_285_700_000.0), UnitGroup.POWER, R.string.unit_horse_power_mechanical, R.string.unit_horse_power_mechanical_short), NormalUnit(UnitID.horse_power_mechanical, BigDecimal.valueOf(745_699_871_582_285_700_000.0), UnitGroup.POWER, R.string.unit_horse_power_mechanical, R.string.unit_horse_power_mechanical_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,35 +22,35 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
val prefixCollection: List<AbstractUnit> by lazy { val prefixCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit(MyUnitIDS.prefix_quetta, BigDecimal.valueOf(1E+30), UnitGroup.PREFIX, R.string.unit_prefix_quetta, R.string.unit_prefix_quetta_short), NormalUnit(UnitID.prefix_quetta, BigDecimal.valueOf(1E+30), UnitGroup.PREFIX, R.string.unit_prefix_quetta, R.string.unit_prefix_quetta_short),
NormalUnit(MyUnitIDS.prefix_ronna, BigDecimal.valueOf(1E+27), UnitGroup.PREFIX, R.string.unit_prefix_ronna, R.string.unit_prefix_ronna_short), NormalUnit(UnitID.prefix_ronna, BigDecimal.valueOf(1E+27), UnitGroup.PREFIX, R.string.unit_prefix_ronna, R.string.unit_prefix_ronna_short),
NormalUnit(MyUnitIDS.prefix_yotta, BigDecimal.valueOf(1E+24), UnitGroup.PREFIX, R.string.unit_prefix_yotta, R.string.unit_prefix_yotta_short), NormalUnit(UnitID.prefix_yotta, BigDecimal.valueOf(1E+24), UnitGroup.PREFIX, R.string.unit_prefix_yotta, R.string.unit_prefix_yotta_short),
NormalUnit(MyUnitIDS.prefix_zetta, BigDecimal.valueOf(1E+21), UnitGroup.PREFIX, R.string.unit_prefix_zetta, R.string.unit_prefix_zetta_short), NormalUnit(UnitID.prefix_zetta, BigDecimal.valueOf(1E+21), UnitGroup.PREFIX, R.string.unit_prefix_zetta, R.string.unit_prefix_zetta_short),
NormalUnit(MyUnitIDS.prefix_exa, BigDecimal.valueOf(1E+18), UnitGroup.PREFIX, R.string.unit_prefix_exa, R.string.unit_prefix_exa_short), NormalUnit(UnitID.prefix_exa, BigDecimal.valueOf(1E+18), UnitGroup.PREFIX, R.string.unit_prefix_exa, R.string.unit_prefix_exa_short),
NormalUnit(MyUnitIDS.prefix_peta, BigDecimal.valueOf(1E+15), UnitGroup.PREFIX, R.string.unit_prefix_peta, R.string.unit_prefix_peta_short), NormalUnit(UnitID.prefix_peta, BigDecimal.valueOf(1E+15), UnitGroup.PREFIX, R.string.unit_prefix_peta, R.string.unit_prefix_peta_short),
NormalUnit(MyUnitIDS.prefix_tera, BigDecimal.valueOf(1E+12), UnitGroup.PREFIX, R.string.unit_prefix_tera, R.string.unit_prefix_tera_short), NormalUnit(UnitID.prefix_tera, BigDecimal.valueOf(1E+12), UnitGroup.PREFIX, R.string.unit_prefix_tera, R.string.unit_prefix_tera_short),
NormalUnit(MyUnitIDS.prefix_giga, BigDecimal.valueOf(1E+9), UnitGroup.PREFIX, R.string.unit_prefix_giga, R.string.unit_prefix_giga_short), NormalUnit(UnitID.prefix_giga, BigDecimal.valueOf(1E+9), UnitGroup.PREFIX, R.string.unit_prefix_giga, R.string.unit_prefix_giga_short),
NormalUnit(MyUnitIDS.prefix_mega, BigDecimal.valueOf(1E+6), UnitGroup.PREFIX, R.string.unit_prefix_mega, R.string.unit_prefix_mega_short), NormalUnit(UnitID.prefix_mega, BigDecimal.valueOf(1E+6), UnitGroup.PREFIX, R.string.unit_prefix_mega, R.string.unit_prefix_mega_short),
NormalUnit(MyUnitIDS.prefix_kilo, BigDecimal.valueOf(1E+3), UnitGroup.PREFIX, R.string.unit_prefix_kilo, R.string.unit_prefix_kilo_short), NormalUnit(UnitID.prefix_kilo, BigDecimal.valueOf(1E+3), UnitGroup.PREFIX, R.string.unit_prefix_kilo, R.string.unit_prefix_kilo_short),
NormalUnit(MyUnitIDS.prefix_hecto, BigDecimal.valueOf(1E+2), UnitGroup.PREFIX, R.string.unit_prefix_hecto, R.string.unit_prefix_hecto_short), NormalUnit(UnitID.prefix_hecto, BigDecimal.valueOf(1E+2), UnitGroup.PREFIX, R.string.unit_prefix_hecto, R.string.unit_prefix_hecto_short),
NormalUnit(MyUnitIDS.prefix_deca, BigDecimal.valueOf(1E+1), UnitGroup.PREFIX, R.string.unit_prefix_deca, R.string.unit_prefix_deca_short), NormalUnit(UnitID.prefix_deca, BigDecimal.valueOf(1E+1), UnitGroup.PREFIX, R.string.unit_prefix_deca, R.string.unit_prefix_deca_short),
NormalUnit(MyUnitIDS.prefix_base, BigDecimal.valueOf(1E+0), UnitGroup.PREFIX, R.string.unit_prefix_base, R.string.unit_prefix_base_short), NormalUnit(UnitID.prefix_base, BigDecimal.valueOf(1E+0), UnitGroup.PREFIX, R.string.unit_prefix_base, R.string.unit_prefix_base_short),
NormalUnit(MyUnitIDS.prefix_deci, BigDecimal.valueOf(1E-1), UnitGroup.PREFIX, R.string.unit_prefix_deci, R.string.unit_prefix_deci_short), NormalUnit(UnitID.prefix_deci, BigDecimal.valueOf(1E-1), UnitGroup.PREFIX, R.string.unit_prefix_deci, R.string.unit_prefix_deci_short),
NormalUnit(MyUnitIDS.prefix_centi, BigDecimal.valueOf(1E-2), UnitGroup.PREFIX, R.string.unit_prefix_centi, R.string.unit_prefix_centi_short), NormalUnit(UnitID.prefix_centi, BigDecimal.valueOf(1E-2), UnitGroup.PREFIX, R.string.unit_prefix_centi, R.string.unit_prefix_centi_short),
NormalUnit(MyUnitIDS.prefix_milli, BigDecimal.valueOf(1E-3), UnitGroup.PREFIX, R.string.unit_prefix_milli, R.string.unit_prefix_milli_short), NormalUnit(UnitID.prefix_milli, BigDecimal.valueOf(1E-3), UnitGroup.PREFIX, R.string.unit_prefix_milli, R.string.unit_prefix_milli_short),
NormalUnit(MyUnitIDS.prefix_micro, BigDecimal.valueOf(1E-6), UnitGroup.PREFIX, R.string.unit_prefix_micro, R.string.unit_prefix_micro_short), NormalUnit(UnitID.prefix_micro, BigDecimal.valueOf(1E-6), UnitGroup.PREFIX, R.string.unit_prefix_micro, R.string.unit_prefix_micro_short),
NormalUnit(MyUnitIDS.prefix_nano, BigDecimal.valueOf(1E-9), UnitGroup.PREFIX, R.string.unit_prefix_nano, R.string.unit_prefix_nano_short), NormalUnit(UnitID.prefix_nano, BigDecimal.valueOf(1E-9), UnitGroup.PREFIX, R.string.unit_prefix_nano, R.string.unit_prefix_nano_short),
NormalUnit(MyUnitIDS.prefix_pico, BigDecimal.valueOf(1E-12), UnitGroup.PREFIX, R.string.unit_prefix_pico, R.string.unit_prefix_pico_short), NormalUnit(UnitID.prefix_pico, BigDecimal.valueOf(1E-12), UnitGroup.PREFIX, R.string.unit_prefix_pico, R.string.unit_prefix_pico_short),
NormalUnit(MyUnitIDS.prefix_femto, BigDecimal.valueOf(1E-15), UnitGroup.PREFIX, R.string.unit_prefix_femto, R.string.unit_prefix_femto_short), NormalUnit(UnitID.prefix_femto, BigDecimal.valueOf(1E-15), UnitGroup.PREFIX, R.string.unit_prefix_femto, R.string.unit_prefix_femto_short),
NormalUnit(MyUnitIDS.prefix_atto, BigDecimal.valueOf(1E-18), UnitGroup.PREFIX, R.string.unit_prefix_atto, R.string.unit_prefix_atto_short), NormalUnit(UnitID.prefix_atto, BigDecimal.valueOf(1E-18), UnitGroup.PREFIX, R.string.unit_prefix_atto, R.string.unit_prefix_atto_short),
NormalUnit(MyUnitIDS.prefix_zepto, BigDecimal.valueOf(1E-21), UnitGroup.PREFIX, R.string.unit_prefix_zepto, R.string.unit_prefix_zepto_short), NormalUnit(UnitID.prefix_zepto, BigDecimal.valueOf(1E-21), UnitGroup.PREFIX, R.string.unit_prefix_zepto, R.string.unit_prefix_zepto_short),
NormalUnit(MyUnitIDS.prefix_yocto, BigDecimal.valueOf(1E-24), UnitGroup.PREFIX, R.string.unit_prefix_yocto, R.string.unit_prefix_yocto_short), NormalUnit(UnitID.prefix_yocto, BigDecimal.valueOf(1E-24), UnitGroup.PREFIX, R.string.unit_prefix_yocto, R.string.unit_prefix_yocto_short),
NormalUnit(MyUnitIDS.prefix_ronto, BigDecimal.valueOf(1E-27), UnitGroup.PREFIX, R.string.unit_prefix_ronto, R.string.unit_prefix_ronto_short), NormalUnit(UnitID.prefix_ronto, BigDecimal.valueOf(1E-27), UnitGroup.PREFIX, R.string.unit_prefix_ronto, R.string.unit_prefix_ronto_short),
NormalUnit(MyUnitIDS.prefix_quecto, BigDecimal.valueOf(1E-30), UnitGroup.PREFIX, R.string.unit_prefix_quecto, R.string.unit_prefix_quecto_short), NormalUnit(UnitID.prefix_quecto, BigDecimal.valueOf(1E-30), UnitGroup.PREFIX, R.string.unit_prefix_quecto, R.string.unit_prefix_quecto_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -19,7 +19,7 @@
package com.sadellie.unitto.data.converter.collections package com.sadellie.unitto.data.converter.collections
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
@ -27,35 +27,35 @@ import java.math.BigDecimal
internal val pressureCollection: List<AbstractUnit> by lazy { internal val pressureCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit(MyUnitIDS.attopascal, BigDecimal.valueOf(1), UnitGroup.PRESSURE, R.string.unit_attopascal, R.string.unit_attopascal_short), NormalUnit(UnitID.attopascal, BigDecimal.valueOf(1), UnitGroup.PRESSURE, R.string.unit_attopascal, R.string.unit_attopascal_short),
NormalUnit(MyUnitIDS.femtopascal, BigDecimal.valueOf(1E+3), UnitGroup.PRESSURE, R.string.unit_femtopascal, R.string.unit_femtopascal_short), NormalUnit(UnitID.femtopascal, BigDecimal.valueOf(1E+3), UnitGroup.PRESSURE, R.string.unit_femtopascal, R.string.unit_femtopascal_short),
NormalUnit(MyUnitIDS.picopascal, BigDecimal.valueOf(1E+6), UnitGroup.PRESSURE, R.string.unit_picopascal, R.string.unit_picopascal_short), NormalUnit(UnitID.picopascal, BigDecimal.valueOf(1E+6), UnitGroup.PRESSURE, R.string.unit_picopascal, R.string.unit_picopascal_short),
NormalUnit(MyUnitIDS.nanopascal, BigDecimal.valueOf(1E+9), UnitGroup.PRESSURE, R.string.unit_nanopascal, R.string.unit_nanopascal_short), NormalUnit(UnitID.nanopascal, BigDecimal.valueOf(1E+9), UnitGroup.PRESSURE, R.string.unit_nanopascal, R.string.unit_nanopascal_short),
NormalUnit(MyUnitIDS.micropascal, BigDecimal.valueOf(1E+12), UnitGroup.PRESSURE, R.string.unit_micropascal, R.string.unit_micropascal_short), NormalUnit(UnitID.micropascal, BigDecimal.valueOf(1E+12), UnitGroup.PRESSURE, R.string.unit_micropascal, R.string.unit_micropascal_short),
NormalUnit(MyUnitIDS.millipascal, BigDecimal.valueOf(1E+15), UnitGroup.PRESSURE, R.string.unit_millipascal, R.string.unit_millipascal_short), NormalUnit(UnitID.millipascal, BigDecimal.valueOf(1E+15), UnitGroup.PRESSURE, R.string.unit_millipascal, R.string.unit_millipascal_short),
NormalUnit(MyUnitIDS.centipascal, BigDecimal.valueOf(1E+16), UnitGroup.PRESSURE, R.string.unit_centipascal, R.string.unit_centipascal_short), NormalUnit(UnitID.centipascal, BigDecimal.valueOf(1E+16), UnitGroup.PRESSURE, R.string.unit_centipascal, R.string.unit_centipascal_short),
NormalUnit(MyUnitIDS.decipascal, BigDecimal.valueOf(1E+17), UnitGroup.PRESSURE, R.string.unit_decipascal, R.string.unit_decipascal_short), NormalUnit(UnitID.decipascal, BigDecimal.valueOf(1E+17), UnitGroup.PRESSURE, R.string.unit_decipascal, R.string.unit_decipascal_short),
NormalUnit(MyUnitIDS.pascal, BigDecimal.valueOf(1E+18), UnitGroup.PRESSURE, R.string.unit_pascal, R.string.unit_pascal_short), NormalUnit(UnitID.pascal, BigDecimal.valueOf(1E+18), UnitGroup.PRESSURE, R.string.unit_pascal, R.string.unit_pascal_short),
NormalUnit(MyUnitIDS.dekapascal, BigDecimal.valueOf(1E+19), UnitGroup.PRESSURE, R.string.unit_dekapascal, R.string.unit_dekapascal_short), NormalUnit(UnitID.dekapascal, BigDecimal.valueOf(1E+19), UnitGroup.PRESSURE, R.string.unit_dekapascal, R.string.unit_dekapascal_short),
NormalUnit(MyUnitIDS.hectopascal, BigDecimal.valueOf(1E+20), UnitGroup.PRESSURE, R.string.unit_hectopascal, R.string.unit_hectopascal_short), NormalUnit(UnitID.hectopascal, BigDecimal.valueOf(1E+20), UnitGroup.PRESSURE, R.string.unit_hectopascal, R.string.unit_hectopascal_short),
NormalUnit(MyUnitIDS.millibar, BigDecimal.valueOf(1E+20), UnitGroup.PRESSURE, R.string.unit_millibar, R.string.unit_millibar_short), NormalUnit(UnitID.millibar, BigDecimal.valueOf(1E+20), UnitGroup.PRESSURE, R.string.unit_millibar, R.string.unit_millibar_short),
NormalUnit(MyUnitIDS.bar, BigDecimal.valueOf(1E+23), UnitGroup.PRESSURE, R.string.unit_bar, R.string.unit_bar_short), NormalUnit(UnitID.bar, BigDecimal.valueOf(1E+23), UnitGroup.PRESSURE, R.string.unit_bar, R.string.unit_bar_short),
NormalUnit(MyUnitIDS.kilopascal, BigDecimal.valueOf(1E+21), UnitGroup.PRESSURE, R.string.unit_kilopascal, R.string.unit_kilopascal_short), NormalUnit(UnitID.kilopascal, BigDecimal.valueOf(1E+21), UnitGroup.PRESSURE, R.string.unit_kilopascal, R.string.unit_kilopascal_short),
NormalUnit(MyUnitIDS.megapascal, BigDecimal.valueOf(1E+24), UnitGroup.PRESSURE, R.string.unit_megapascal, R.string.unit_megapascal_short), NormalUnit(UnitID.megapascal, BigDecimal.valueOf(1E+24), UnitGroup.PRESSURE, R.string.unit_megapascal, R.string.unit_megapascal_short),
NormalUnit(MyUnitIDS.gigapascal, BigDecimal.valueOf(1E+27), UnitGroup.PRESSURE, R.string.unit_gigapascal, R.string.unit_gigapascal_short), NormalUnit(UnitID.gigapascal, BigDecimal.valueOf(1E+27), UnitGroup.PRESSURE, R.string.unit_gigapascal, R.string.unit_gigapascal_short),
NormalUnit(MyUnitIDS.terapascal, BigDecimal.valueOf(1E+30), UnitGroup.PRESSURE, R.string.unit_terapascal, R.string.unit_terapascal_short), NormalUnit(UnitID.terapascal, BigDecimal.valueOf(1E+30), UnitGroup.PRESSURE, R.string.unit_terapascal, R.string.unit_terapascal_short),
NormalUnit(MyUnitIDS.petapascal, BigDecimal.valueOf(1E+33), UnitGroup.PRESSURE, R.string.unit_petapascal, R.string.unit_petapascal_short), NormalUnit(UnitID.petapascal, BigDecimal.valueOf(1E+33), UnitGroup.PRESSURE, R.string.unit_petapascal, R.string.unit_petapascal_short),
NormalUnit(MyUnitIDS.exapascal, BigDecimal.valueOf(1E+36), UnitGroup.PRESSURE, R.string.unit_exapascal, R.string.unit_exapascal_short), NormalUnit(UnitID.exapascal, BigDecimal.valueOf(1E+36), UnitGroup.PRESSURE, R.string.unit_exapascal, R.string.unit_exapascal_short),
NormalUnit(MyUnitIDS.psi, BigDecimal.valueOf(6.8947572931783E+21), UnitGroup.PRESSURE, R.string.unit_psi, R.string.unit_psi_short), NormalUnit(UnitID.psi, BigDecimal.valueOf(6.8947572931783E+21), UnitGroup.PRESSURE, R.string.unit_psi, R.string.unit_psi_short),
NormalUnit(MyUnitIDS.ksi, BigDecimal.valueOf(6.8947572931783E+24), UnitGroup.PRESSURE, R.string.unit_ksi, R.string.unit_ksi_short), NormalUnit(UnitID.ksi, BigDecimal.valueOf(6.8947572931783E+24), UnitGroup.PRESSURE, R.string.unit_ksi, R.string.unit_ksi_short),
NormalUnit(MyUnitIDS.standard_atmosphere, BigDecimal.valueOf(101.325E+21), UnitGroup.PRESSURE, R.string.unit_standard_atmosphere, R.string.unit_standard_atmosphere_short), NormalUnit(UnitID.standard_atmosphere, BigDecimal.valueOf(101.325E+21), UnitGroup.PRESSURE, R.string.unit_standard_atmosphere, R.string.unit_standard_atmosphere_short),
NormalUnit(MyUnitIDS.torr, BigDecimal.valueOf(1.3332236842108281E+20), UnitGroup.PRESSURE, R.string.unit_torr, R.string.unit_torr_short), NormalUnit(UnitID.torr, BigDecimal.valueOf(1.3332236842108281E+20), UnitGroup.PRESSURE, R.string.unit_torr, R.string.unit_torr_short),
NormalUnit(MyUnitIDS.micron_of_mercury, BigDecimal.valueOf(1.3332236842108281E+17), UnitGroup.PRESSURE, R.string.unit_micron_of_mercury, R.string.unit_micron_of_mercury_short), NormalUnit(UnitID.micron_of_mercury, BigDecimal.valueOf(1.3332236842108281E+17), UnitGroup.PRESSURE, R.string.unit_micron_of_mercury, R.string.unit_micron_of_mercury_short),
NormalUnit(MyUnitIDS.millimeter_of_mercury, BigDecimal.valueOf(1.3332236842108281E+20), UnitGroup.PRESSURE, R.string.unit_millimeter_of_mercury, R.string.unit_millimeter_of_mercury_short), NormalUnit(UnitID.millimeter_of_mercury, BigDecimal.valueOf(1.3332236842108281E+20), UnitGroup.PRESSURE, R.string.unit_millimeter_of_mercury, R.string.unit_millimeter_of_mercury_short),
NormalUnit(MyUnitIDS.kilogram_force_per_square_meter, BigDecimal.valueOf(9.80665E+18), UnitGroup.PRESSURE, R.string.unit_kilogram_force_per_square_meter, R.string.unit_kilogram_force_per_square_meter_short), NormalUnit(UnitID.kilogram_force_per_square_meter, BigDecimal.valueOf(9.80665E+18), UnitGroup.PRESSURE, R.string.unit_kilogram_force_per_square_meter, R.string.unit_kilogram_force_per_square_meter_short),
NormalUnit(MyUnitIDS.kilogram_force_per_square_centimeter, BigDecimal.valueOf(9.80665E+22), UnitGroup.PRESSURE, R.string.unit_kilogram_force_per_square_centimeter, R.string.unit_kilogram_force_per_square_centimeter_short), NormalUnit(UnitID.kilogram_force_per_square_centimeter, BigDecimal.valueOf(9.80665E+22), UnitGroup.PRESSURE, R.string.unit_kilogram_force_per_square_centimeter, R.string.unit_kilogram_force_per_square_centimeter_short),
NormalUnit(MyUnitIDS.gram_force_per_square_centimeter, BigDecimal.valueOf(9.80665E+19), UnitGroup.PRESSURE, R.string.unit_gram_force_per_square_centimeter, R.string.unit_gram_force_per_square_centimeter_short), NormalUnit(UnitID.gram_force_per_square_centimeter, BigDecimal.valueOf(9.80665E+19), UnitGroup.PRESSURE, R.string.unit_gram_force_per_square_centimeter, R.string.unit_gram_force_per_square_centimeter_short),
NormalUnit(MyUnitIDS.pound_force_per_square_foot, BigDecimal.valueOf(4.788025898E+19), UnitGroup.PRESSURE, R.string.unit_pound_force_per_square_foot, R.string.unit_pound_force_per_square_foot_short), NormalUnit(UnitID.pound_force_per_square_foot, BigDecimal.valueOf(4.788025898E+19), UnitGroup.PRESSURE, R.string.unit_pound_force_per_square_foot, R.string.unit_pound_force_per_square_foot_short),
NormalUnit(MyUnitIDS.pound_force_per_square_inch, BigDecimal.valueOf(6.8947572931783E+21), UnitGroup.PRESSURE, R.string.unit_pound_force_per_square_inch, R.string.unit_pound_force_per_square_inch_short), NormalUnit(UnitID.pound_force_per_square_inch, BigDecimal.valueOf(6.8947572931783E+21), UnitGroup.PRESSURE, R.string.unit_pound_force_per_square_inch, R.string.unit_pound_force_per_square_inch_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -19,7 +19,7 @@
package com.sadellie.unitto.data.converter.collections package com.sadellie.unitto.data.converter.collections
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.BackwardUnit import com.sadellie.unitto.data.model.unit.BackwardUnit
@ -28,38 +28,38 @@ import java.math.BigDecimal
internal val speedCollection: List<AbstractUnit> by lazy { internal val speedCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit( MyUnitIDS.millimeter_per_hour, BigDecimal.valueOf(1), UnitGroup.SPEED, R.string.unit_millimeter_per_hour, R.string.unit_millimeter_per_hour_short), NormalUnit( UnitID.millimeter_per_hour, BigDecimal.valueOf(1), UnitGroup.SPEED, R.string.unit_millimeter_per_hour, R.string.unit_millimeter_per_hour_short),
NormalUnit( MyUnitIDS.millimeter_per_minute, BigDecimal.valueOf(60), UnitGroup.SPEED, R.string.unit_millimeter_per_minute, R.string.unit_millimeter_per_minute_short), NormalUnit( UnitID.millimeter_per_minute, BigDecimal.valueOf(60), UnitGroup.SPEED, R.string.unit_millimeter_per_minute, R.string.unit_millimeter_per_minute_short),
NormalUnit( MyUnitIDS.millimeter_per_second, BigDecimal.valueOf(3_600), UnitGroup.SPEED, R.string.unit_millimeter_per_second, R.string.unit_millimeter_per_second_short), NormalUnit( UnitID.millimeter_per_second, BigDecimal.valueOf(3_600), UnitGroup.SPEED, R.string.unit_millimeter_per_second, R.string.unit_millimeter_per_second_short),
NormalUnit( MyUnitIDS.centimeter_per_hour, BigDecimal.valueOf(10), UnitGroup.SPEED, R.string.unit_centimeter_per_hour, R.string.unit_centimeter_per_hour_short), NormalUnit( UnitID.centimeter_per_hour, BigDecimal.valueOf(10), UnitGroup.SPEED, R.string.unit_centimeter_per_hour, R.string.unit_centimeter_per_hour_short),
NormalUnit( MyUnitIDS.centimeter_per_minute, BigDecimal.valueOf(600), UnitGroup.SPEED, R.string.unit_centimeter_per_minute, R.string.unit_centimeter_per_minute_short), NormalUnit( UnitID.centimeter_per_minute, BigDecimal.valueOf(600), UnitGroup.SPEED, R.string.unit_centimeter_per_minute, R.string.unit_centimeter_per_minute_short),
NormalUnit( MyUnitIDS.centimeter_per_second, BigDecimal.valueOf(36_000), UnitGroup.SPEED, R.string.unit_centimeter_per_second, R.string.unit_centimeter_per_second_short), NormalUnit( UnitID.centimeter_per_second, BigDecimal.valueOf(36_000), UnitGroup.SPEED, R.string.unit_centimeter_per_second, R.string.unit_centimeter_per_second_short),
NormalUnit( MyUnitIDS.meter_per_hour, BigDecimal.valueOf(1_000), UnitGroup.SPEED, R.string.unit_meter_per_hour, R.string.unit_meter_per_hour_short), NormalUnit( UnitID.meter_per_hour, BigDecimal.valueOf(1_000), UnitGroup.SPEED, R.string.unit_meter_per_hour, R.string.unit_meter_per_hour_short),
NormalUnit( MyUnitIDS.meter_per_minute, BigDecimal.valueOf(60_000), UnitGroup.SPEED, R.string.unit_meter_per_minute, R.string.unit_meter_per_minute_short), NormalUnit( UnitID.meter_per_minute, BigDecimal.valueOf(60_000), UnitGroup.SPEED, R.string.unit_meter_per_minute, R.string.unit_meter_per_minute_short),
NormalUnit( MyUnitIDS.meter_per_second, BigDecimal.valueOf(3_600_000), UnitGroup.SPEED, R.string.unit_meter_per_second, R.string.unit_meter_per_second_short), NormalUnit( UnitID.meter_per_second, BigDecimal.valueOf(3_600_000), UnitGroup.SPEED, R.string.unit_meter_per_second, R.string.unit_meter_per_second_short),
NormalUnit( MyUnitIDS.kilometer_per_hour, BigDecimal.valueOf(1_000_000), UnitGroup.SPEED, R.string.unit_kilometer_per_hour, R.string.unit_kilometer_per_hour_short), NormalUnit( UnitID.kilometer_per_hour, BigDecimal.valueOf(1_000_000), UnitGroup.SPEED, R.string.unit_kilometer_per_hour, R.string.unit_kilometer_per_hour_short),
NormalUnit( MyUnitIDS.kilometer_per_minute, BigDecimal.valueOf(60_000_000), UnitGroup.SPEED, R.string.unit_kilometer_per_minute, R.string.unit_kilometer_per_minute_short), NormalUnit( UnitID.kilometer_per_minute, BigDecimal.valueOf(60_000_000), UnitGroup.SPEED, R.string.unit_kilometer_per_minute, R.string.unit_kilometer_per_minute_short),
NormalUnit( MyUnitIDS.kilometer_per_second, BigDecimal.valueOf(3_600_000_000), UnitGroup.SPEED, R.string.unit_kilometer_per_second, R.string.unit_kilometer_per_second_short), NormalUnit( UnitID.kilometer_per_second, BigDecimal.valueOf(3_600_000_000), UnitGroup.SPEED, R.string.unit_kilometer_per_second, R.string.unit_kilometer_per_second_short),
NormalUnit( MyUnitIDS.foot_per_hour, BigDecimal.valueOf(304.8), UnitGroup.SPEED, R.string.unit_foot_per_hour, R.string.unit_foot_per_hour_short), NormalUnit( UnitID.foot_per_hour, BigDecimal.valueOf(304.8), UnitGroup.SPEED, R.string.unit_foot_per_hour, R.string.unit_foot_per_hour_short),
NormalUnit( MyUnitIDS.foot_per_minute, BigDecimal.valueOf(18_288), UnitGroup.SPEED, R.string.unit_foot_per_minute, R.string.unit_foot_per_minute_short), NormalUnit( UnitID.foot_per_minute, BigDecimal.valueOf(18_288), UnitGroup.SPEED, R.string.unit_foot_per_minute, R.string.unit_foot_per_minute_short),
NormalUnit( MyUnitIDS.foot_per_second, BigDecimal.valueOf(1_097_280), UnitGroup.SPEED, R.string.unit_foot_per_second, R.string.unit_foot_per_second_short), NormalUnit( UnitID.foot_per_second, BigDecimal.valueOf(1_097_280), UnitGroup.SPEED, R.string.unit_foot_per_second, R.string.unit_foot_per_second_short),
NormalUnit( MyUnitIDS.yard_per_hour, BigDecimal.valueOf(914.4), UnitGroup.SPEED, R.string.unit_yard_per_hour, R.string.unit_yard_per_hour_short), NormalUnit( UnitID.yard_per_hour, BigDecimal.valueOf(914.4), UnitGroup.SPEED, R.string.unit_yard_per_hour, R.string.unit_yard_per_hour_short),
NormalUnit( MyUnitIDS.yard_per_minute, BigDecimal.valueOf(54_864), UnitGroup.SPEED, R.string.unit_yard_per_minute, R.string.unit_yard_per_minute_short), NormalUnit( UnitID.yard_per_minute, BigDecimal.valueOf(54_864), UnitGroup.SPEED, R.string.unit_yard_per_minute, R.string.unit_yard_per_minute_short),
NormalUnit( MyUnitIDS.yard_per_second, BigDecimal.valueOf(3_291_840), UnitGroup.SPEED, R.string.unit_yard_per_second, R.string.unit_yard_per_second_short), NormalUnit( UnitID.yard_per_second, BigDecimal.valueOf(3_291_840), UnitGroup.SPEED, R.string.unit_yard_per_second, R.string.unit_yard_per_second_short),
NormalUnit( MyUnitIDS.mile_per_hour, BigDecimal.valueOf(1_609_344), UnitGroup.SPEED, R.string.unit_mile_per_hour, R.string.unit_mile_per_hour_short), NormalUnit( UnitID.mile_per_hour, BigDecimal.valueOf(1_609_344), UnitGroup.SPEED, R.string.unit_mile_per_hour, R.string.unit_mile_per_hour_short),
NormalUnit( MyUnitIDS.mile_per_minute, BigDecimal.valueOf(96_560_640), UnitGroup.SPEED, R.string.unit_mile_per_minute, R.string.unit_mile_per_minute_short), NormalUnit( UnitID.mile_per_minute, BigDecimal.valueOf(96_560_640), UnitGroup.SPEED, R.string.unit_mile_per_minute, R.string.unit_mile_per_minute_short),
NormalUnit( MyUnitIDS.mile_per_second, BigDecimal.valueOf(5_793_638_400), UnitGroup.SPEED, R.string.unit_mile_per_second, R.string.unit_mile_per_second_short), NormalUnit( UnitID.mile_per_second, BigDecimal.valueOf(5_793_638_400), UnitGroup.SPEED, R.string.unit_mile_per_second, R.string.unit_mile_per_second_short),
BackwardUnit(MyUnitIDS.minute_per_kilometer, BigDecimal.valueOf(60_000_000), UnitGroup.SPEED, R.string.unit_minute_per_kilometer, R.string.unit_minute_per_kilometer_short), BackwardUnit(UnitID.minute_per_kilometer, BigDecimal.valueOf(60_000_000), UnitGroup.SPEED, R.string.unit_minute_per_kilometer, R.string.unit_minute_per_kilometer_short),
BackwardUnit(MyUnitIDS.minute_per_mile, BigDecimal.valueOf(96_560_640), UnitGroup.SPEED, R.string.unit_minute_per_mile, R.string.unit_minute_per_mile_short), BackwardUnit(UnitID.minute_per_mile, BigDecimal.valueOf(96_560_640), UnitGroup.SPEED, R.string.unit_minute_per_mile, R.string.unit_minute_per_mile_short),
BackwardUnit(MyUnitIDS.hour_per_kilometer, BigDecimal.valueOf(1_000_000), UnitGroup.SPEED, R.string.unit_hour_per_kilometer, R.string.unit_hour_per_kilometer_short), BackwardUnit(UnitID.hour_per_kilometer, BigDecimal.valueOf(1_000_000), UnitGroup.SPEED, R.string.unit_hour_per_kilometer, R.string.unit_hour_per_kilometer_short),
BackwardUnit(MyUnitIDS.hour_per_mile, BigDecimal.valueOf(1_609_344), UnitGroup.SPEED, R.string.unit_hour_per_mile, R.string.unit_hour_per_mile_short), BackwardUnit(UnitID.hour_per_mile, BigDecimal.valueOf(1_609_344), UnitGroup.SPEED, R.string.unit_hour_per_mile, R.string.unit_hour_per_mile_short),
NormalUnit( MyUnitIDS.knot, BigDecimal.valueOf(1_852_000), UnitGroup.SPEED, R.string.unit_knot, R.string.unit_knot_short), NormalUnit( UnitID.knot, BigDecimal.valueOf(1_852_000), UnitGroup.SPEED, R.string.unit_knot, R.string.unit_knot_short),
NormalUnit( MyUnitIDS.velocity_of_light_in_vacuum, BigDecimal.valueOf(1_079_252_848_799_998), UnitGroup.SPEED, R.string.unit_velocity_of_light_in_vacuum, R.string.unit_velocity_of_light_in_vacuum_short), NormalUnit( UnitID.velocity_of_light_in_vacuum, BigDecimal.valueOf(1_079_252_848_799_998), UnitGroup.SPEED, R.string.unit_velocity_of_light_in_vacuum, R.string.unit_velocity_of_light_in_vacuum_short),
NormalUnit( MyUnitIDS.cosmic_velocity_first, BigDecimal.valueOf(28_440_000_000), UnitGroup.SPEED, R.string.unit_cosmic_velocity_first, R.string.unit_cosmic_velocity_first_short), NormalUnit( UnitID.cosmic_velocity_first, BigDecimal.valueOf(28_440_000_000), UnitGroup.SPEED, R.string.unit_cosmic_velocity_first, R.string.unit_cosmic_velocity_first_short),
NormalUnit( MyUnitIDS.cosmic_velocity_second, BigDecimal.valueOf(40_320_000_000), UnitGroup.SPEED, R.string.unit_cosmic_velocity_second, R.string.unit_cosmic_velocity_second_short), NormalUnit( UnitID.cosmic_velocity_second, BigDecimal.valueOf(40_320_000_000), UnitGroup.SPEED, R.string.unit_cosmic_velocity_second, R.string.unit_cosmic_velocity_second_short),
NormalUnit( MyUnitIDS.cosmic_velocity_third, BigDecimal.valueOf(60_012_000_000), UnitGroup.SPEED, R.string.unit_cosmic_velocity_third, R.string.unit_cosmic_velocity_third_short), NormalUnit( UnitID.cosmic_velocity_third, BigDecimal.valueOf(60_012_000_000), UnitGroup.SPEED, R.string.unit_cosmic_velocity_third, R.string.unit_cosmic_velocity_third_short),
NormalUnit( MyUnitIDS.earths_orbital_speed, BigDecimal.valueOf(107_154_000_000), UnitGroup.SPEED, R.string.unit_earths_orbital_speed, R.string.unit_earths_orbital_speed_short), NormalUnit( UnitID.earths_orbital_speed, BigDecimal.valueOf(107_154_000_000), UnitGroup.SPEED, R.string.unit_earths_orbital_speed, R.string.unit_earths_orbital_speed_short),
NormalUnit( MyUnitIDS.mach, BigDecimal.valueOf(1_236_960_000), UnitGroup.SPEED, R.string.unit_mach, R.string.unit_mach_short), NormalUnit( UnitID.mach, BigDecimal.valueOf(1_236_960_000), UnitGroup.SPEED, R.string.unit_mach, R.string.unit_mach_short),
NormalUnit( MyUnitIDS.mach_si_standard, BigDecimal.valueOf(1_062_167_040), UnitGroup.SPEED, R.string.unit_mach_si_standard, R.string.unit_mach_si_standard_short), NormalUnit( UnitID.mach_si_standard, BigDecimal.valueOf(1_062_167_040), UnitGroup.SPEED, R.string.unit_mach_si_standard, R.string.unit_mach_si_standard_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -23,28 +23,28 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.TemperatureUnit import com.sadellie.unitto.data.model.unit.TemperatureUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
import java.math.RoundingMode import java.math.RoundingMode
internal val temperatureCollection: List<AbstractUnit> by lazy { internal val temperatureCollection: List<AbstractUnit> by lazy {
listOf( listOf(
TemperatureUnit( TemperatureUnit(
id = MyUnitIDS.celsius, id = UnitID.celsius,
basicUnit = BigDecimal.ONE, basicUnit = BigDecimal.ONE,
group = UnitGroup.TEMPERATURE, group = UnitGroup.TEMPERATURE,
displayName = R.string.unit_celsius, displayName = R.string.unit_celsius,
shortName = R.string.unit_celsius_short, shortName = R.string.unit_celsius_short,
customConvert = { unitTo, value -> customConvert = { unitTo, value ->
when (unitTo.id) { when (unitTo.id) {
MyUnitIDS.fahrenheit -> { UnitID.fahrenheit -> {
value value
.setScale(MAX_PRECISION, RoundingMode.HALF_EVEN) .setScale(MAX_PRECISION, RoundingMode.HALF_EVEN)
.times(BigDecimal.valueOf(1.8)) .times(BigDecimal.valueOf(1.8))
.plus(BigDecimal(32)) .plus(BigDecimal(32))
} }
MyUnitIDS.kelvin -> { UnitID.kelvin -> {
value value
.setScale(MAX_PRECISION, RoundingMode.HALF_EVEN) .setScale(MAX_PRECISION, RoundingMode.HALF_EVEN)
.plus(BigDecimal.valueOf(273.15)) .plus(BigDecimal.valueOf(273.15))
@ -55,21 +55,21 @@ internal val temperatureCollection: List<AbstractUnit> by lazy {
} }
), ),
TemperatureUnit( TemperatureUnit(
id = MyUnitIDS.fahrenheit, id = UnitID.fahrenheit,
basicUnit = BigDecimal.ONE, basicUnit = BigDecimal.ONE,
group = UnitGroup.TEMPERATURE, group = UnitGroup.TEMPERATURE,
displayName = R.string.unit_fahrenheit, displayName = R.string.unit_fahrenheit,
shortName = R.string.unit_fahrenheit_short, shortName = R.string.unit_fahrenheit_short,
customConvert = { unitTo, value -> customConvert = { unitTo, value ->
when (unitTo.id) { when (unitTo.id) {
MyUnitIDS.celsius -> { UnitID.celsius -> {
value value
.setScale(MAX_PRECISION, RoundingMode.HALF_EVEN) .setScale(MAX_PRECISION, RoundingMode.HALF_EVEN)
.minus(BigDecimal(32)) .minus(BigDecimal(32))
.times(BigDecimal(5)) .times(BigDecimal(5))
.div(BigDecimal(9)) .div(BigDecimal(9))
} }
MyUnitIDS.kelvin -> { UnitID.kelvin -> {
value value
.setScale(MAX_PRECISION, RoundingMode.HALF_EVEN) .setScale(MAX_PRECISION, RoundingMode.HALF_EVEN)
.minus(BigDecimal(32)) .minus(BigDecimal(32))
@ -82,19 +82,19 @@ internal val temperatureCollection: List<AbstractUnit> by lazy {
} }
), ),
TemperatureUnit( TemperatureUnit(
id = MyUnitIDS.kelvin, id = UnitID.kelvin,
basicUnit = BigDecimal.ONE, basicUnit = BigDecimal.ONE,
group = UnitGroup.TEMPERATURE, group = UnitGroup.TEMPERATURE,
displayName = R.string.unit_kelvin, displayName = R.string.unit_kelvin,
shortName = R.string.unit_kelvin_short, shortName = R.string.unit_kelvin_short,
customConvert = { unitTo, value -> customConvert = { unitTo, value ->
when (unitTo.id) { when (unitTo.id) {
MyUnitIDS.celsius -> { UnitID.celsius -> {
value value
.setScale(MAX_PRECISION, RoundingMode.HALF_EVEN) .setScale(MAX_PRECISION, RoundingMode.HALF_EVEN)
.minus(BigDecimal(273.15)) .minus(BigDecimal(273.15))
} }
MyUnitIDS.fahrenheit -> { UnitID.fahrenheit -> {
value value
.setScale(MAX_PRECISION, RoundingMode.HALF_EVEN) .setScale(MAX_PRECISION, RoundingMode.HALF_EVEN)
.minus(BigDecimal.valueOf(273.15)) .minus(BigDecimal.valueOf(273.15))

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,20 +22,20 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
internal val timeCollection: List<AbstractUnit> by lazy { internal val timeCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit(MyUnitIDS.attosecond, BigDecimal.valueOf(1), UnitGroup.TIME, R.string.unit_attosecond, R.string.unit_attosecond_short), NormalUnit(UnitID.attosecond, BigDecimal.valueOf(1), UnitGroup.TIME, R.string.unit_attosecond, R.string.unit_attosecond_short),
NormalUnit(MyUnitIDS.nanosecond, BigDecimal.valueOf(1_000_000_000), UnitGroup.TIME, R.string.unit_nanosecond, R.string.unit_nanosecond_short), NormalUnit(UnitID.nanosecond, BigDecimal.valueOf(1_000_000_000), UnitGroup.TIME, R.string.unit_nanosecond, R.string.unit_nanosecond_short),
NormalUnit(MyUnitIDS.microsecond, BigDecimal.valueOf(1_000_000_000_000), UnitGroup.TIME, R.string.unit_microsecond, R.string.unit_microsecond_short), NormalUnit(UnitID.microsecond, BigDecimal.valueOf(1_000_000_000_000), UnitGroup.TIME, R.string.unit_microsecond, R.string.unit_microsecond_short),
NormalUnit(MyUnitIDS.millisecond, BigDecimal.valueOf(1_000_000_000_000_000), UnitGroup.TIME, R.string.unit_millisecond, R.string.unit_millisecond_short), NormalUnit(UnitID.millisecond, BigDecimal.valueOf(1_000_000_000_000_000), UnitGroup.TIME, R.string.unit_millisecond, R.string.unit_millisecond_short),
NormalUnit(MyUnitIDS.jiffy, BigDecimal.valueOf(10_000_000_000_000_000), UnitGroup.TIME, R.string.unit_jiffy, R.string.unit_jiffy_short), NormalUnit(UnitID.jiffy, BigDecimal.valueOf(10_000_000_000_000_000), UnitGroup.TIME, R.string.unit_jiffy, R.string.unit_jiffy_short),
NormalUnit(MyUnitIDS.second, BigDecimal.valueOf(1_000_000_000_000_000_000), UnitGroup.TIME, R.string.unit_second, R.string.unit_second_short), NormalUnit(UnitID.second, BigDecimal.valueOf(1_000_000_000_000_000_000), UnitGroup.TIME, R.string.unit_second, R.string.unit_second_short),
NormalUnit(MyUnitIDS.minute, BigDecimal.valueOf(60_000_000_000_000_000_000.0), UnitGroup.TIME, R.string.unit_minute, R.string.unit_minute_short), NormalUnit(UnitID.minute, BigDecimal.valueOf(60_000_000_000_000_000_000.0), UnitGroup.TIME, R.string.unit_minute, R.string.unit_minute_short),
NormalUnit(MyUnitIDS.hour, BigDecimal.valueOf(3_600_000_000_000_000_000_000.0), UnitGroup.TIME, R.string.unit_hour, R.string.unit_hour_short), NormalUnit(UnitID.hour, BigDecimal.valueOf(3_600_000_000_000_000_000_000.0), UnitGroup.TIME, R.string.unit_hour, R.string.unit_hour_short),
NormalUnit(MyUnitIDS.day, BigDecimal.valueOf(86_400_000_000_000_000_000_000.0), UnitGroup.TIME, R.string.unit_day, R.string.unit_day_short), NormalUnit(UnitID.day, BigDecimal.valueOf(86_400_000_000_000_000_000_000.0), UnitGroup.TIME, R.string.unit_day, R.string.unit_day_short),
NormalUnit(MyUnitIDS.week, BigDecimal.valueOf(604_800_000_000_000_000_000_000.0), UnitGroup.TIME, R.string.unit_week, R.string.unit_week_short), NormalUnit(UnitID.week, BigDecimal.valueOf(604_800_000_000_000_000_000_000.0), UnitGroup.TIME, R.string.unit_week, R.string.unit_week_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,27 +22,27 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import java.math.BigDecimal import java.math.BigDecimal
val torqueCollection: List<AbstractUnit> by lazy { val torqueCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit(MyUnitIDS.dyne_millimeter, BigDecimal.valueOf(1), UnitGroup.TORQUE, R.string.unit_dyne_millimeter, R.string.unit_dyne_millimeter_short), NormalUnit(UnitID.dyne_millimeter, BigDecimal.valueOf(1), UnitGroup.TORQUE, R.string.unit_dyne_millimeter, R.string.unit_dyne_millimeter_short),
NormalUnit(MyUnitIDS.dyne_centimeter, BigDecimal.valueOf(10), UnitGroup.TORQUE, R.string.unit_dyne_centimeter, R.string.unit_dyne_centimeter_short), NormalUnit(UnitID.dyne_centimeter, BigDecimal.valueOf(10), UnitGroup.TORQUE, R.string.unit_dyne_centimeter, R.string.unit_dyne_centimeter_short),
NormalUnit(MyUnitIDS.dyne_meter, BigDecimal.valueOf(1000), UnitGroup.TORQUE, R.string.unit_dyne_meter, R.string.unit_dyne_meter_short), NormalUnit(UnitID.dyne_meter, BigDecimal.valueOf(1000), UnitGroup.TORQUE, R.string.unit_dyne_meter, R.string.unit_dyne_meter_short),
NormalUnit(MyUnitIDS.newton_millimeter, BigDecimal.valueOf(100000), UnitGroup.TORQUE, R.string.unit_newton_millimeter, R.string.unit_newton_millimeter_short), NormalUnit(UnitID.newton_millimeter, BigDecimal.valueOf(100000), UnitGroup.TORQUE, R.string.unit_newton_millimeter, R.string.unit_newton_millimeter_short),
NormalUnit(MyUnitIDS.newton_centimeter, BigDecimal.valueOf(1000000), UnitGroup.TORQUE, R.string.unit_newton_centimeter, R.string.unit_newton_centimeter_short), NormalUnit(UnitID.newton_centimeter, BigDecimal.valueOf(1000000), UnitGroup.TORQUE, R.string.unit_newton_centimeter, R.string.unit_newton_centimeter_short),
NormalUnit(MyUnitIDS.newton_meter, BigDecimal.valueOf(100000000), UnitGroup.TORQUE, R.string.unit_newton_meter, R.string.unit_newton_meter_short), NormalUnit(UnitID.newton_meter, BigDecimal.valueOf(100000000), UnitGroup.TORQUE, R.string.unit_newton_meter, R.string.unit_newton_meter_short),
NormalUnit(MyUnitIDS.kilonewton_meter, BigDecimal.valueOf(100000000000), UnitGroup.TORQUE, R.string.unit_kilonewton_meter, R.string.unit_kilonewton_meter_short), NormalUnit(UnitID.kilonewton_meter, BigDecimal.valueOf(100000000000), UnitGroup.TORQUE, R.string.unit_kilonewton_meter, R.string.unit_kilonewton_meter_short),
NormalUnit(MyUnitIDS.gram_force_millimeter, BigDecimal.valueOf(980.665), UnitGroup.TORQUE, R.string.unit_gram_force_millimeter, R.string.unit_gram_force_millimeter_short), NormalUnit(UnitID.gram_force_millimeter, BigDecimal.valueOf(980.665), UnitGroup.TORQUE, R.string.unit_gram_force_millimeter, R.string.unit_gram_force_millimeter_short),
NormalUnit(MyUnitIDS.gram_force_centimeter, BigDecimal.valueOf(9806.65), UnitGroup.TORQUE, R.string.unit_gram_force_centimeter, R.string.unit_gram_force_centimeter_short), NormalUnit(UnitID.gram_force_centimeter, BigDecimal.valueOf(9806.65), UnitGroup.TORQUE, R.string.unit_gram_force_centimeter, R.string.unit_gram_force_centimeter_short),
NormalUnit(MyUnitIDS.kilogram_force_millimeter, BigDecimal.valueOf(980665), UnitGroup.TORQUE, R.string.unit_kilogram_force_millimeter, R.string.unit_kilogram_force_millimeter_short), NormalUnit(UnitID.kilogram_force_millimeter, BigDecimal.valueOf(980665), UnitGroup.TORQUE, R.string.unit_kilogram_force_millimeter, R.string.unit_kilogram_force_millimeter_short),
NormalUnit(MyUnitIDS.gram_force_meter, BigDecimal.valueOf(980665), UnitGroup.TORQUE, R.string.unit_gram_force_meter, R.string.unit_gram_force_meter_short), NormalUnit(UnitID.gram_force_meter, BigDecimal.valueOf(980665), UnitGroup.TORQUE, R.string.unit_gram_force_meter, R.string.unit_gram_force_meter_short),
NormalUnit(MyUnitIDS.kilogram_force_centimeter, BigDecimal.valueOf(9806650), UnitGroup.TORQUE, R.string.unit_kilogram_force_centimeter, R.string.unit_kilogram_force_centimeter_short), NormalUnit(UnitID.kilogram_force_centimeter, BigDecimal.valueOf(9806650), UnitGroup.TORQUE, R.string.unit_kilogram_force_centimeter, R.string.unit_kilogram_force_centimeter_short),
NormalUnit(MyUnitIDS.kilogram_force_meter, BigDecimal.valueOf(980665000), UnitGroup.TORQUE, R.string.unit_kilogram_force_meter, R.string.unit_kilogram_force_meter_short), NormalUnit(UnitID.kilogram_force_meter, BigDecimal.valueOf(980665000), UnitGroup.TORQUE, R.string.unit_kilogram_force_meter, R.string.unit_kilogram_force_meter_short),
NormalUnit(MyUnitIDS.ounce_force_foot, BigDecimal.valueOf(8473862.4), UnitGroup.TORQUE, R.string.unit_ounce_force_foot, R.string.unit_ounce_force_foot_short), NormalUnit(UnitID.ounce_force_foot, BigDecimal.valueOf(8473862.4), UnitGroup.TORQUE, R.string.unit_ounce_force_foot, R.string.unit_ounce_force_foot_short),
NormalUnit(MyUnitIDS.ounce_force_inch, BigDecimal.valueOf(706155.2), UnitGroup.TORQUE, R.string.unit_ounce_force_inch, R.string.unit_ounce_force_inch_short), NormalUnit(UnitID.ounce_force_inch, BigDecimal.valueOf(706155.2), UnitGroup.TORQUE, R.string.unit_ounce_force_inch, R.string.unit_ounce_force_inch_short),
NormalUnit(MyUnitIDS.pound_force_foot, BigDecimal.valueOf(135581800), UnitGroup.TORQUE, R.string.unit_pound_force_foot, R.string.unit_pound_force_foot_short), NormalUnit(UnitID.pound_force_foot, BigDecimal.valueOf(135581800), UnitGroup.TORQUE, R.string.unit_pound_force_foot, R.string.unit_pound_force_foot_short),
NormalUnit(MyUnitIDS.pound_force_inch, BigDecimal.valueOf(1.1298483333333334E7), UnitGroup.TORQUE, R.string.unit_pound_force_inch, R.string.unit_pound_force_inch_short), NormalUnit(UnitID.pound_force_inch, BigDecimal.valueOf(1.1298483333333334E7), UnitGroup.TORQUE, R.string.unit_pound_force_inch, R.string.unit_pound_force_inch_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -19,7 +19,7 @@
package com.sadellie.unitto.data.converter.collections package com.sadellie.unitto.data.converter.collections
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
@ -27,30 +27,30 @@ import java.math.BigDecimal
internal val volumeCollection: List<AbstractUnit> by lazy { internal val volumeCollection: List<AbstractUnit> by lazy {
listOf( listOf(
NormalUnit(MyUnitIDS.attoliter, BigDecimal.valueOf(1), UnitGroup.VOLUME, R.string.unit_attoliter, R.string.unit_attoliter_short), NormalUnit(UnitID.attoliter, BigDecimal.valueOf(1), UnitGroup.VOLUME, R.string.unit_attoliter, R.string.unit_attoliter_short),
NormalUnit(MyUnitIDS.milliliter, BigDecimal.valueOf(1_000_000_000_000_000), UnitGroup.VOLUME, R.string.unit_milliliter, R.string.unit_milliliter_short), NormalUnit(UnitID.milliliter, BigDecimal.valueOf(1_000_000_000_000_000), UnitGroup.VOLUME, R.string.unit_milliliter, R.string.unit_milliliter_short),
NormalUnit(MyUnitIDS.liter, BigDecimal.valueOf(1_000_000_000_000_000_000), UnitGroup.VOLUME, R.string.unit_liter, R.string.unit_liter_short), NormalUnit(UnitID.liter, BigDecimal.valueOf(1_000_000_000_000_000_000), UnitGroup.VOLUME, R.string.unit_liter, R.string.unit_liter_short),
NormalUnit(MyUnitIDS.us_liquid_gallon, BigDecimal.valueOf(3_785_411_783_999_977_000), UnitGroup.VOLUME, R.string.unit_us_liquid_gallon, R.string.unit_us_liquid_gallon_short), NormalUnit(UnitID.us_liquid_gallon, BigDecimal.valueOf(3_785_411_783_999_977_000), UnitGroup.VOLUME, R.string.unit_us_liquid_gallon, R.string.unit_us_liquid_gallon_short),
NormalUnit(MyUnitIDS.us_liquid_quart, BigDecimal.valueOf(946_352_945_999_994_200), UnitGroup.VOLUME, R.string.unit_us_liquid_quart, R.string.unit_us_liquid_quart_short), NormalUnit(UnitID.us_liquid_quart, BigDecimal.valueOf(946_352_945_999_994_200), UnitGroup.VOLUME, R.string.unit_us_liquid_quart, R.string.unit_us_liquid_quart_short),
NormalUnit(MyUnitIDS.us_liquid_pint, BigDecimal.valueOf(473_176_472_999_997_100), UnitGroup.VOLUME, R.string.unit_us_liquid_pint, R.string.unit_us_liquid_pint_short), NormalUnit(UnitID.us_liquid_pint, BigDecimal.valueOf(473_176_472_999_997_100), UnitGroup.VOLUME, R.string.unit_us_liquid_pint, R.string.unit_us_liquid_pint_short),
NormalUnit(MyUnitIDS.us_legal_cup, BigDecimal.valueOf(236_588_236_499_998_560), UnitGroup.VOLUME, R.string.unit_us_legal_cup, R.string.unit_us_legal_cup_short), NormalUnit(UnitID.us_legal_cup, BigDecimal.valueOf(236_588_236_499_998_560), UnitGroup.VOLUME, R.string.unit_us_legal_cup, R.string.unit_us_legal_cup_short),
NormalUnit(MyUnitIDS.us_fluid_ounce, BigDecimal.valueOf(29_573_529_562_499_996), UnitGroup.VOLUME, R.string.unit_us_fluid_ounce, R.string.unit_us_fluid_ounce_short), NormalUnit(UnitID.us_fluid_ounce, BigDecimal.valueOf(29_573_529_562_499_996), UnitGroup.VOLUME, R.string.unit_us_fluid_ounce, R.string.unit_us_fluid_ounce_short),
NormalUnit(MyUnitIDS.us_tablespoon, BigDecimal.valueOf(14_786_764_781_249_998), UnitGroup.VOLUME, R.string.unit_us_tablespoon, R.string.unit_us_tablespoon_short), NormalUnit(UnitID.us_tablespoon, BigDecimal.valueOf(14_786_764_781_249_998), UnitGroup.VOLUME, R.string.unit_us_tablespoon, R.string.unit_us_tablespoon_short),
NormalUnit(MyUnitIDS.us_teaspoon, BigDecimal.valueOf(4_928_921_593_749_952), UnitGroup.VOLUME, R.string.unit_us_teaspoon, R.string.unit_us_teaspoon_short), NormalUnit(UnitID.us_teaspoon, BigDecimal.valueOf(4_928_921_593_749_952), UnitGroup.VOLUME, R.string.unit_us_teaspoon, R.string.unit_us_teaspoon_short),
NormalUnit(MyUnitIDS.imperial_gallon, BigDecimal.valueOf(4_546_089_999_999_954_400), UnitGroup.VOLUME, R.string.unit_imperial_gallon, R.string.unit_imperial_gallon_short), NormalUnit(UnitID.imperial_gallon, BigDecimal.valueOf(4_546_089_999_999_954_400), UnitGroup.VOLUME, R.string.unit_imperial_gallon, R.string.unit_imperial_gallon_short),
NormalUnit(MyUnitIDS.imperial_quart, BigDecimal.valueOf(1_136_522_500_000_001_400), UnitGroup.VOLUME, R.string.unit_imperial_quart, R.string.unit_imperial_quart_short), NormalUnit(UnitID.imperial_quart, BigDecimal.valueOf(1_136_522_500_000_001_400), UnitGroup.VOLUME, R.string.unit_imperial_quart, R.string.unit_imperial_quart_short),
NormalUnit(MyUnitIDS.imperial_pint, BigDecimal.valueOf(568_261_250_000_000_700), UnitGroup.VOLUME, R.string.unit_imperial_pint, R.string.unit_imperial_pint_short), NormalUnit(UnitID.imperial_pint, BigDecimal.valueOf(568_261_250_000_000_700), UnitGroup.VOLUME, R.string.unit_imperial_pint, R.string.unit_imperial_pint_short),
NormalUnit(MyUnitIDS.imperial_cup, BigDecimal.valueOf(284_130_625_000_000_350), UnitGroup.VOLUME, R.string.unit_imperial_cup, R.string.unit_imperial_cup_short), NormalUnit(UnitID.imperial_cup, BigDecimal.valueOf(284_130_625_000_000_350), UnitGroup.VOLUME, R.string.unit_imperial_cup, R.string.unit_imperial_cup_short),
NormalUnit(MyUnitIDS.imperial_fluid_ounce, BigDecimal.valueOf(28_413_062_500_000_036), UnitGroup.VOLUME, R.string.unit_imperial_fluid_ounce, R.string.unit_imperial_fluid_ounce_short), NormalUnit(UnitID.imperial_fluid_ounce, BigDecimal.valueOf(28_413_062_500_000_036), UnitGroup.VOLUME, R.string.unit_imperial_fluid_ounce, R.string.unit_imperial_fluid_ounce_short),
NormalUnit(MyUnitIDS.imperial_tablespoon, BigDecimal.valueOf(17_758_164_062_500_148), UnitGroup.VOLUME, R.string.unit_imperial_tablespoon, R.string.unit_imperial_tablespoon_short), NormalUnit(UnitID.imperial_tablespoon, BigDecimal.valueOf(17_758_164_062_500_148), UnitGroup.VOLUME, R.string.unit_imperial_tablespoon, R.string.unit_imperial_tablespoon_short),
NormalUnit(MyUnitIDS.imperial_teaspoon, BigDecimal.valueOf(5_919_388_020_833_314), UnitGroup.VOLUME, R.string.unit_imperial_teaspoon, R.string.unit_imperial_teaspoon_short), NormalUnit(UnitID.imperial_teaspoon, BigDecimal.valueOf(5_919_388_020_833_314), UnitGroup.VOLUME, R.string.unit_imperial_teaspoon, R.string.unit_imperial_teaspoon_short),
NormalUnit(MyUnitIDS.cubic_millimeter, BigDecimal.valueOf(1_000_000_000_000), UnitGroup.VOLUME, R.string.unit_cubic_millimeter, R.string.unit_cubic_millimeter_short), NormalUnit(UnitID.cubic_millimeter, BigDecimal.valueOf(1_000_000_000_000), UnitGroup.VOLUME, R.string.unit_cubic_millimeter, R.string.unit_cubic_millimeter_short),
NormalUnit(MyUnitIDS.cubic_centimeter, BigDecimal.valueOf(1_000_000_000_000_000), UnitGroup.VOLUME, R.string.unit_cubic_centimeter, R.string.unit_cubic_centimeter_short), NormalUnit(UnitID.cubic_centimeter, BigDecimal.valueOf(1_000_000_000_000_000), UnitGroup.VOLUME, R.string.unit_cubic_centimeter, R.string.unit_cubic_centimeter_short),
NormalUnit(MyUnitIDS.cubic_meter, BigDecimal.valueOf(1.0E+21), UnitGroup.VOLUME, R.string.unit_cubic_meter, R.string.unit_cubic_meter_short), NormalUnit(UnitID.cubic_meter, BigDecimal.valueOf(1.0E+21), UnitGroup.VOLUME, R.string.unit_cubic_meter, R.string.unit_cubic_meter_short),
NormalUnit(MyUnitIDS.cubic_kilometer, BigDecimal.valueOf(1.0E+30), UnitGroup.VOLUME, R.string.unit_cubic_kilometer, R.string.unit_cubic_kilometer_short), NormalUnit(UnitID.cubic_kilometer, BigDecimal.valueOf(1.0E+30), UnitGroup.VOLUME, R.string.unit_cubic_kilometer, R.string.unit_cubic_kilometer_short),
NormalUnit(MyUnitIDS.cubic_inch, BigDecimal.valueOf(1.6387064E+16), UnitGroup.VOLUME, R.string.unit_cubic_inch, R.string.unit_cubic_inch_short), NormalUnit(UnitID.cubic_inch, BigDecimal.valueOf(1.6387064E+16), UnitGroup.VOLUME, R.string.unit_cubic_inch, R.string.unit_cubic_inch_short),
NormalUnit(MyUnitIDS.cubic_foot, BigDecimal.valueOf(2.831684659E+19), UnitGroup.VOLUME, R.string.unit_cubic_foot, R.string.unit_cubic_foot_short), NormalUnit(UnitID.cubic_foot, BigDecimal.valueOf(2.831684659E+19), UnitGroup.VOLUME, R.string.unit_cubic_foot, R.string.unit_cubic_foot_short),
NormalUnit(MyUnitIDS.cubic_yard, BigDecimal.valueOf(7.645548579839955E+20), UnitGroup.VOLUME, R.string.unit_cubic_yard, R.string.unit_cubic_yard_short), NormalUnit(UnitID.cubic_yard, BigDecimal.valueOf(7.645548579839955E+20), UnitGroup.VOLUME, R.string.unit_cubic_yard, R.string.unit_cubic_yard_short),
NormalUnit(MyUnitIDS.cubic_mile, BigDecimal.valueOf(4.168181825440539E+30), UnitGroup.VOLUME, R.string.unit_cubic_mile, R.string.unit_cubic_mile_short), NormalUnit(UnitID.cubic_mile, BigDecimal.valueOf(4.168181825440539E+30), UnitGroup.VOLUME, R.string.unit_cubic_mile, R.string.unit_cubic_mile_short),
) )
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2022-2023 Elshan Agaev * Copyright (c) 2022-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -619,5 +619,5 @@ class AllUnitsTest {
if (testedCount != totalCount) throw Exception("Didn't cover all units") if (testedCount != totalCount) throw Exception("Didn't cover all units")
} }
private fun testWithUnits(block: MyUnitIDS.() -> Unit): Unit = with(MyUnitIDS, block = block) private fun testWithUnits(block: UnitID.() -> Unit): Unit = with(UnitID, block = block)
} }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -25,7 +25,7 @@ import kotlinx.coroutines.flow.Flow
import java.time.LocalDate import java.time.LocalDate
interface UnitsRepository { interface UnitsRepository {
val allUnits: Flow<List<AbstractUnit>> val units: Flow<List<AbstractUnit>>
suspend fun getById(id: String): AbstractUnit suspend fun getById(id: String): AbstractUnit

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -22,7 +22,7 @@ import androidx.datastore.preferences.core.Preferences
import com.sadellie.unitto.core.base.OutputFormat import com.sadellie.unitto.core.base.OutputFormat
import com.sadellie.unitto.core.base.Separator import com.sadellie.unitto.core.base.Separator
import com.sadellie.unitto.core.base.TopLevelDestinations import com.sadellie.unitto.core.base.TopLevelDestinations
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import com.sadellie.unitto.data.model.ALL_UNIT_GROUPS import com.sadellie.unitto.data.model.ALL_UNIT_GROUPS
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.UnitsListSorting import com.sadellie.unitto.data.model.UnitsListSorting
@ -123,11 +123,11 @@ fun Preferences.getUnitConverterFavoritesOnly(): Boolean {
} }
fun Preferences.getLatestLeftSide(): String { fun Preferences.getLatestLeftSide(): String {
return this[PrefsKeys.LATEST_LEFT_SIDE] ?: MyUnitIDS.kilometer return this[PrefsKeys.LATEST_LEFT_SIDE] ?: UnitID.kilometer
} }
fun Preferences.getLatestRightSide(): String { fun Preferences.getLatestRightSide(): String {
return this[PrefsKeys.LATEST_RIGHT_SIDE] ?: MyUnitIDS.mile return this[PrefsKeys.LATEST_RIGHT_SIDE] ?: UnitID.mile
} }
fun Preferences.getAcButton(): Boolean { fun Preferences.getAcButton(): Boolean {

View File

@ -54,8 +54,8 @@ import com.sadellie.unitto.core.ui.common.MenuButton
import com.sadellie.unitto.core.ui.common.SegmentedButton import com.sadellie.unitto.core.ui.common.SegmentedButton
import com.sadellie.unitto.core.ui.common.SegmentedButtonsRow import com.sadellie.unitto.core.ui.common.SegmentedButtonsRow
import com.sadellie.unitto.core.ui.common.SettingsButton import com.sadellie.unitto.core.ui.common.SettingsButton
import com.sadellie.unitto.core.ui.common.UnittoEmptyScreen import com.sadellie.unitto.core.ui.common.EmptyScreen
import com.sadellie.unitto.core.ui.common.UnittoScreenWithTopBar import com.sadellie.unitto.core.ui.common.ScaffoldWithTopBar
import com.sadellie.unitto.core.ui.common.textfield.ExpressionTransformer import com.sadellie.unitto.core.ui.common.textfield.ExpressionTransformer
import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
import com.sadellie.unitto.core.ui.openLink import com.sadellie.unitto.core.ui.openLink
@ -71,7 +71,7 @@ internal fun BodyMassRoute(
viewModel: BodyMassViewModel = hiltViewModel() viewModel: BodyMassViewModel = hiltViewModel()
) { ) {
when (val uiState = viewModel.uiState.collectAsStateWithLifecycle().value) { when (val uiState = viewModel.uiState.collectAsStateWithLifecycle().value) {
UIState.Loading -> UnittoEmptyScreen() UIState.Loading -> EmptyScreen()
is UIState.Ready -> BodyMassScreen( is UIState.Ready -> BodyMassScreen(
uiState = uiState, uiState = uiState,
updateHeight1 = viewModel::updateHeight1, updateHeight1 = viewModel::updateHeight1,
@ -104,7 +104,7 @@ private fun BodyMassScreen(
) )
} }
UnittoScreenWithTopBar( ScaffoldWithTopBar(
title = { Text(stringResource(R.string.body_mass_title)) }, title = { Text(stringResource(R.string.body_mass_title)) },
navigationIcon = { MenuButton(openDrawer) }, navigationIcon = { MenuButton(openDrawer) },
actions = { SettingsButton(navigateToSettings) } actions = { SettingsButton(navigateToSettings) }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -69,8 +69,8 @@ import com.sadellie.unitto.core.ui.LocalWindowSize
import com.sadellie.unitto.core.ui.WindowHeightSizeClass import com.sadellie.unitto.core.ui.WindowHeightSizeClass
import com.sadellie.unitto.core.ui.common.MenuButton import com.sadellie.unitto.core.ui.common.MenuButton
import com.sadellie.unitto.core.ui.common.SettingsButton import com.sadellie.unitto.core.ui.common.SettingsButton
import com.sadellie.unitto.core.ui.common.UnittoEmptyScreen import com.sadellie.unitto.core.ui.common.EmptyScreen
import com.sadellie.unitto.core.ui.common.UnittoScreenWithTopBar import com.sadellie.unitto.core.ui.common.ScaffoldWithTopBar
import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
import com.sadellie.unitto.data.model.HistoryItem import com.sadellie.unitto.data.model.HistoryItem
import com.sadellie.unitto.feature.calculator.components.CalculatorKeyboard import com.sadellie.unitto.feature.calculator.components.CalculatorKeyboard
@ -120,7 +120,7 @@ internal fun CalculatorScreen(
clearHistory: () -> Unit clearHistory: () -> Unit
) { ) {
when (uiState) { when (uiState) {
is CalculatorUIState.Loading -> UnittoEmptyScreen() is CalculatorUIState.Loading -> EmptyScreen()
is CalculatorUIState.Ready -> Ready( is CalculatorUIState.Ready -> Ready(
uiState = uiState, uiState = uiState,
navigateToMenu = navigateToMenu, navigateToMenu = navigateToMenu,
@ -155,7 +155,7 @@ private fun Ready(
var showClearHistoryDialog by rememberSaveable { mutableStateOf(false) } var showClearHistoryDialog by rememberSaveable { mutableStateOf(false) }
var showClearHistoryButton by rememberSaveable { mutableStateOf(false) } var showClearHistoryButton by rememberSaveable { mutableStateOf(false) }
UnittoScreenWithTopBar( ScaffoldWithTopBar(
title = { Text(stringResource(R.string.calculator_title)) }, title = { Text(stringResource(R.string.calculator_title)) },
navigationIcon = { MenuButton { navigateToMenu() } }, navigationIcon = { MenuButton { navigateToMenu() } },
colors = TopAppBarDefaults.topAppBarColors(MaterialTheme.colorScheme.surfaceVariant), colors = TopAppBarDefaults.topAppBarColors(MaterialTheme.colorScheme.surfaceVariant),

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -38,8 +38,8 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.LocalWindowSize import com.sadellie.unitto.core.ui.LocalWindowSize
import com.sadellie.unitto.core.ui.common.MenuButton import com.sadellie.unitto.core.ui.common.MenuButton
import com.sadellie.unitto.core.ui.common.SettingsButton import com.sadellie.unitto.core.ui.common.SettingsButton
import com.sadellie.unitto.core.ui.common.UnittoEmptyScreen import com.sadellie.unitto.core.ui.common.EmptyScreen
import com.sadellie.unitto.core.ui.common.UnittoScreenWithTopBar import com.sadellie.unitto.core.ui.common.ScaffoldWithTopBar
import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
import io.github.sadellie.evaluatto.RPNCalculation import io.github.sadellie.evaluatto.RPNCalculation
import java.math.BigDecimal import java.math.BigDecimal
@ -51,7 +51,7 @@ internal fun RPNCalculatorRoute(
viewModel: RPNCalculatorViewModel = hiltViewModel(), viewModel: RPNCalculatorViewModel = hiltViewModel(),
) { ) {
when (val uiState = viewModel.uiState.collectAsStateWithLifecycle().value) { when (val uiState = viewModel.uiState.collectAsStateWithLifecycle().value) {
RPNCalculatorUIState.Loading -> UnittoEmptyScreen() RPNCalculatorUIState.Loading -> EmptyScreen()
is RPNCalculatorUIState.Ready -> RPNCalculatorScreen( is RPNCalculatorUIState.Ready -> RPNCalculatorScreen(
uiState = uiState, uiState = uiState,
openDrawer = openDrawer, openDrawer = openDrawer,
@ -72,7 +72,7 @@ internal fun RPNCalculatorScreen(
onCalculationClick: (RPNCalculation) -> Unit, onCalculationClick: (RPNCalculation) -> Unit,
onInputEditClick: (RPNInputEdit) -> Unit, onInputEditClick: (RPNInputEdit) -> Unit,
) { ) {
UnittoScreenWithTopBar( ScaffoldWithTopBar(
title = { Text(stringResource(id = R.string.calculator_title)) }, title = { Text(stringResource(id = R.string.calculator_title)) },
navigationIcon = { MenuButton(openDrawer) }, navigationIcon = { MenuButton(openDrawer) },
actions = { SettingsButton(navigateToSettings) } actions = { SettingsButton(navigateToSettings) }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2022-2023 Elshan Agaev * Copyright (c) 2022-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -76,17 +76,17 @@ import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.base.Token import com.sadellie.unitto.core.base.Token
import com.sadellie.unitto.core.ui.LocalLocale import com.sadellie.unitto.core.ui.LocalLocale
import com.sadellie.unitto.core.ui.common.ColumnWithConstraints import com.sadellie.unitto.core.ui.common.ColumnWithConstraints
import com.sadellie.unitto.core.ui.common.EmptyScreen
import com.sadellie.unitto.core.ui.common.MenuButton import com.sadellie.unitto.core.ui.common.MenuButton
import com.sadellie.unitto.core.ui.common.PortraitLandscape import com.sadellie.unitto.core.ui.common.PortraitLandscape
import com.sadellie.unitto.core.ui.common.ScaffoldWithTopBar
import com.sadellie.unitto.core.ui.common.SettingsButton import com.sadellie.unitto.core.ui.common.SettingsButton
import com.sadellie.unitto.core.ui.common.UnittoEmptyScreen
import com.sadellie.unitto.core.ui.common.UnittoScreenWithTopBar
import com.sadellie.unitto.core.ui.common.textfield.ExpressionTextField import com.sadellie.unitto.core.ui.common.textfield.ExpressionTextField
import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
import com.sadellie.unitto.core.ui.common.textfield.UnformattedTextField import com.sadellie.unitto.core.ui.common.textfield.UnformattedTextField
import com.sadellie.unitto.core.ui.datetime.formatDateWeekDayMonthYear import com.sadellie.unitto.core.ui.datetime.formatDateWeekDayMonthYear
import com.sadellie.unitto.data.common.format import com.sadellie.unitto.data.common.format
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.feature.converter.components.DefaultKeyboard import com.sadellie.unitto.feature.converter.components.DefaultKeyboard
@ -138,7 +138,7 @@ private fun ConverterScreen(
addBracket: () -> Unit, addBracket: () -> Unit,
) { ) {
when (uiState) { when (uiState) {
UnitConverterUIState.Loading -> UnittoEmptyScreen() UnitConverterUIState.Loading -> EmptyScreen()
is UnitConverterUIState.NumberBase -> { is UnitConverterUIState.NumberBase -> {
UnitConverterTopBar( UnitConverterTopBar(
@ -189,7 +189,7 @@ private fun UnitConverterTopBar(
navigateToSettings: () -> Unit, navigateToSettings: () -> Unit,
content: @Composable (PaddingValues) -> Unit content: @Composable (PaddingValues) -> Unit
) { ) {
UnittoScreenWithTopBar( ScaffoldWithTopBar(
title = { Text(stringResource(R.string.unit_converter_title)) }, title = { Text(stringResource(R.string.unit_converter_title)) },
navigationIcon = { MenuButton { navigateToMenu() } }, navigationIcon = { MenuButton { navigateToMenu() } },
actions = { actions = {
@ -319,7 +319,7 @@ private fun Default(
) )
} }
if (uiState.unitFrom.id == MyUnitIDS.foot) { if (uiState.unitFrom.id == UnitID.foot) {
Row( Row(
modifier = textFieldModifier, modifier = textFieldModifier,
horizontalArrangement = Arrangement.spacedBy(8.dp) horizontalArrangement = Arrangement.spacedBy(8.dp)

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2022-2023 Elshan Agaev * Copyright (c) 2022-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -32,7 +32,7 @@ import com.sadellie.unitto.core.ui.common.textfield.getTextField
import com.sadellie.unitto.data.common.combine import com.sadellie.unitto.data.common.combine
import com.sadellie.unitto.data.common.isExpression import com.sadellie.unitto.data.common.isExpression
import com.sadellie.unitto.data.common.stateIn import com.sadellie.unitto.data.common.stateIn
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.UnitsListSorting import com.sadellie.unitto.data.model.UnitsListSorting
import com.sadellie.unitto.data.model.repository.UnitsRepository import com.sadellie.unitto.data.model.repository.UnitsRepository
@ -169,7 +169,7 @@ internal class ConverterViewModel @Inject constructor(
_leftUnits, _leftUnits,
_leftUnitGroup, _leftUnitGroup,
userPrefsRepository.converterPrefs, userPrefsRepository.converterPrefs,
unitsRepo.allUnits unitsRepo.units
) { unitFrom, query, units, unitGroup, prefs, _ -> ) { unitFrom, query, units, unitGroup, prefs, _ ->
unitFrom ?: return@combine LeftSideUIState.Loading unitFrom ?: return@combine LeftSideUIState.Loading
@ -206,7 +206,7 @@ internal class ConverterViewModel @Inject constructor(
_rightUnits, _rightUnits,
userPrefsRepository.converterPrefs, userPrefsRepository.converterPrefs,
_currenciesState, _currenciesState,
unitsRepo.allUnits, unitsRepo.units,
) { unitFrom, unitTo, input, calculation, query, units, prefs, currenciesState, _ -> ) { unitFrom, unitTo, input, calculation, query, units, prefs, currenciesState, _ ->
unitFrom ?: return@combine RightSideUIState.Loading unitFrom ?: return@combine RightSideUIState.Loading
unitTo ?: return@combine RightSideUIState.Loading unitTo ?: return@combine RightSideUIState.Loading
@ -440,7 +440,7 @@ internal class ConverterViewModel @Inject constructor(
input2: TextFieldValue, input2: TextFieldValue,
formatTime: Boolean, formatTime: Boolean,
) = viewModelScope.launch(Dispatchers.Default) { ) = viewModelScope.launch(Dispatchers.Default) {
val footInchInput = unitFrom.id == MyUnitIDS.foot val footInchInput = unitFrom.id == UnitID.foot
if (footInchInput) { _calculation.update { null } } if (footInchInput) { _calculation.update { null } }
@ -470,12 +470,12 @@ internal class ConverterViewModel @Inject constructor(
var conversion = unitFrom.convert(unitTo, calculated1) var conversion = unitFrom.convert(unitTo, calculated1)
if (footInchInput) { if (footInchInput) {
// Converted from second text field too // Converted from second text field too
val inches = unitsRepo.getById(MyUnitIDS.inch) as DefaultUnit val inches = unitsRepo.getById(UnitID.inch) as DefaultUnit
conversion += inches.convert(unitTo, calculated2) conversion += inches.convert(unitTo, calculated2)
} }
when { when {
(unitFrom.group == UnitGroup.TIME) and (formatTime) -> formatTime(calculated1.multiply(unitFrom.basicUnit)) (unitFrom.group == UnitGroup.TIME) and (formatTime) -> formatTime(calculated1.multiply(unitFrom.basicUnit))
unitTo.id == MyUnitIDS.foot -> formatFootInch(conversion, unitTo, unitsRepo.getById(MyUnitIDS.inch) as DefaultUnit) unitTo.id == UnitID.foot -> formatFootInch(conversion, unitTo, unitsRepo.getById(UnitID.inch) as DefaultUnit)
else -> ConverterResult.Default(conversion) else -> ConverterResult.Default(conversion)
} }
} catch (e: Exception) { } catch (e: Exception) {
@ -511,8 +511,8 @@ internal class ConverterViewModel @Inject constructor(
_unitTo.update { unitTo } _unitTo.update { unitTo }
if (unitFrom.group == UnitGroup.CURRENCY) updateCurrencyRates(unitFrom) if (unitFrom.group == UnitGroup.CURRENCY) updateCurrencyRates(unitFrom)
} catch (e: NoSuchElementException) { } catch (e: NoSuchElementException) {
val unitFrom = unitsRepo.getById(MyUnitIDS.kilometer) val unitFrom = unitsRepo.getById(UnitID.kilometer)
val unitTo = unitsRepo.getById(MyUnitIDS.mile) val unitTo = unitsRepo.getById(UnitID.mile)
_unitFrom.update { unitFrom } _unitFrom.update { unitFrom }
_unitTo.update { unitTo } _unitTo.update { unitTo }

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -39,9 +39,9 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.common.SearchPlaceholder import com.sadellie.unitto.core.ui.common.SearchPlaceholder
import com.sadellie.unitto.core.ui.common.UnittoEmptyScreen import com.sadellie.unitto.core.ui.common.EmptyScreen
import com.sadellie.unitto.core.ui.common.UnittoSearchBar import com.sadellie.unitto.core.ui.common.SearchBar
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import com.sadellie.unitto.data.model.UnitGroup import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.model.UnitsListSorting import com.sadellie.unitto.data.model.UnitsListSorting
import com.sadellie.unitto.data.model.unit.AbstractUnit import com.sadellie.unitto.data.model.unit.AbstractUnit
@ -61,7 +61,7 @@ internal fun LeftSideRoute(
when ( when (
val uiState = viewModel.leftSideUIState.collectAsStateWithLifecycle().value val uiState = viewModel.leftSideUIState.collectAsStateWithLifecycle().value
) { ) {
is LeftSideUIState.Loading -> UnittoEmptyScreen() is LeftSideUIState.Loading -> EmptyScreen()
is LeftSideUIState.Ready -> LeftSideScreen( is LeftSideUIState.Ready -> LeftSideScreen(
uiState = uiState, uiState = uiState,
onQueryChange = viewModel::queryChangeLeft, onQueryChange = viewModel::queryChangeLeft,
@ -107,7 +107,7 @@ private fun LeftSideScreen(
Column( Column(
Modifier.background(MaterialTheme.colorScheme.surface) Modifier.background(MaterialTheme.colorScheme.surface)
) { ) {
UnittoSearchBar( SearchBar(
query = uiState.query, query = uiState.query,
onQueryChange = onQueryChange, onQueryChange = onQueryChange,
navigateUp = navigateUp, navigateUp = navigateUp,
@ -174,13 +174,13 @@ private fun LeftSideScreen(
private fun LeftSideScreenPreview() { private fun LeftSideScreenPreview() {
val units: Map<UnitGroup, List<AbstractUnit>> = mapOf( val units: Map<UnitGroup, List<AbstractUnit>> = mapOf(
UnitGroup.LENGTH to listOf( UnitGroup.LENGTH to listOf(
NormalUnit(MyUnitIDS.meter, BigDecimal.valueOf(1.0E+18), UnitGroup.LENGTH, R.string.unit_meter, R.string.unit_meter_short), NormalUnit(UnitID.meter, BigDecimal.valueOf(1.0E+18), UnitGroup.LENGTH, R.string.unit_meter, R.string.unit_meter_short),
NormalUnit(MyUnitIDS.kilometer, BigDecimal.valueOf(1.0E+21), UnitGroup.LENGTH, R.string.unit_kilometer, R.string.unit_kilometer_short), NormalUnit(UnitID.kilometer, BigDecimal.valueOf(1.0E+21), UnitGroup.LENGTH, R.string.unit_kilometer, R.string.unit_kilometer_short),
NormalUnit(MyUnitIDS.nautical_mile, BigDecimal.valueOf(1.852E+21), UnitGroup.LENGTH, R.string.unit_nautical_mile, R.string.unit_nautical_mile_short), NormalUnit(UnitID.nautical_mile, BigDecimal.valueOf(1.852E+21), UnitGroup.LENGTH, R.string.unit_nautical_mile, R.string.unit_nautical_mile_short),
NormalUnit(MyUnitIDS.inch, BigDecimal.valueOf(25_400_000_000_000_000), UnitGroup.LENGTH, R.string.unit_inch, R.string.unit_inch_short), NormalUnit(UnitID.inch, BigDecimal.valueOf(25_400_000_000_000_000), UnitGroup.LENGTH, R.string.unit_inch, R.string.unit_inch_short),
NormalUnit(MyUnitIDS.foot, BigDecimal.valueOf(304_800_000_000_002_200), UnitGroup.LENGTH, R.string.unit_foot, R.string.unit_foot_short), NormalUnit(UnitID.foot, BigDecimal.valueOf(304_800_000_000_002_200), UnitGroup.LENGTH, R.string.unit_foot, R.string.unit_foot_short),
NormalUnit(MyUnitIDS.yard, BigDecimal.valueOf(914_400_000_000_006_400), UnitGroup.LENGTH, R.string.unit_yard, R.string.unit_yard_short), NormalUnit(UnitID.yard, BigDecimal.valueOf(914_400_000_000_006_400), UnitGroup.LENGTH, R.string.unit_yard, R.string.unit_yard_short),
NormalUnit(MyUnitIDS.mile, BigDecimal.valueOf(1_609_344_000_000_010_500_000.0), UnitGroup.LENGTH, R.string.unit_mile, R.string.unit_mile_short), NormalUnit(UnitID.mile, BigDecimal.valueOf(1_609_344_000_000_010_500_000.0), UnitGroup.LENGTH, R.string.unit_mile, R.string.unit_mile_short),
) )
) )

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -35,8 +35,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.sadellie.unitto.core.base.OutputFormat import com.sadellie.unitto.core.base.OutputFormat
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.common.SearchPlaceholder import com.sadellie.unitto.core.ui.common.SearchPlaceholder
import com.sadellie.unitto.core.ui.common.UnittoEmptyScreen import com.sadellie.unitto.core.ui.common.EmptyScreen
import com.sadellie.unitto.core.ui.common.UnittoSearchBar import com.sadellie.unitto.core.ui.common.SearchBar
import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
import com.sadellie.unitto.core.ui.common.textfield.formatExpression import com.sadellie.unitto.core.ui.common.textfield.formatExpression
import com.sadellie.unitto.data.common.format import com.sadellie.unitto.data.common.format
@ -46,7 +46,7 @@ import com.sadellie.unitto.data.model.unit.AbstractUnit
import com.sadellie.unitto.data.model.unit.DefaultUnit import com.sadellie.unitto.data.model.unit.DefaultUnit
import com.sadellie.unitto.data.model.unit.NormalUnit import com.sadellie.unitto.data.model.unit.NormalUnit
import com.sadellie.unitto.data.model.unit.NumberBaseUnit import com.sadellie.unitto.data.model.unit.NumberBaseUnit
import com.sadellie.unitto.data.converter.MyUnitIDS import com.sadellie.unitto.data.converter.UnitID
import com.sadellie.unitto.feature.converter.components.BasicUnitListItem import com.sadellie.unitto.feature.converter.components.BasicUnitListItem
import com.sadellie.unitto.feature.converter.components.FavoritesButton import com.sadellie.unitto.feature.converter.components.FavoritesButton
import com.sadellie.unitto.feature.converter.components.UnitGroupHeader import com.sadellie.unitto.feature.converter.components.UnitGroupHeader
@ -61,7 +61,7 @@ internal fun RightSideRoute(
when ( when (
val uiState = viewModel.rightSideUIState.collectAsStateWithLifecycle().value val uiState = viewModel.rightSideUIState.collectAsStateWithLifecycle().value
) { ) {
is RightSideUIState.Loading -> UnittoEmptyScreen() is RightSideUIState.Loading -> EmptyScreen()
is RightSideUIState.Ready -> is RightSideUIState.Ready ->
RightSideScreen( RightSideScreen(
uiState = uiState, uiState = uiState,
@ -90,7 +90,7 @@ private fun RightSideScreen(
Scaffold( Scaffold(
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
topBar = { topBar = {
UnittoSearchBar( SearchBar(
query = uiState.query, query = uiState.query,
onQueryChange = onQueryChange, onQueryChange = onQueryChange,
navigateUp = navigateUp, navigateUp = navigateUp,
@ -198,13 +198,13 @@ private fun formatUnitToSupportLabel(
private fun RightSideScreenPreview() { private fun RightSideScreenPreview() {
val units: Map<UnitGroup, List<AbstractUnit>> = mapOf( val units: Map<UnitGroup, List<AbstractUnit>> = mapOf(
UnitGroup.LENGTH to listOf( UnitGroup.LENGTH to listOf(
NormalUnit(MyUnitIDS.meter, BigDecimal.valueOf(1.0E+18), UnitGroup.LENGTH, R.string.unit_meter, R.string.unit_meter_short), NormalUnit(UnitID.meter, BigDecimal.valueOf(1.0E+18), UnitGroup.LENGTH, R.string.unit_meter, R.string.unit_meter_short),
NormalUnit(MyUnitIDS.kilometer, BigDecimal.valueOf(1.0E+21), UnitGroup.LENGTH, R.string.unit_kilometer, R.string.unit_kilometer_short), NormalUnit(UnitID.kilometer, BigDecimal.valueOf(1.0E+21), UnitGroup.LENGTH, R.string.unit_kilometer, R.string.unit_kilometer_short),
NormalUnit(MyUnitIDS.nautical_mile, BigDecimal.valueOf(1.852E+21), UnitGroup.LENGTH, R.string.unit_nautical_mile, R.string.unit_nautical_mile_short), NormalUnit(UnitID.nautical_mile, BigDecimal.valueOf(1.852E+21), UnitGroup.LENGTH, R.string.unit_nautical_mile, R.string.unit_nautical_mile_short),
NormalUnit(MyUnitIDS.inch, BigDecimal.valueOf(25_400_000_000_000_000), UnitGroup.LENGTH, R.string.unit_inch, R.string.unit_inch_short), NormalUnit(UnitID.inch, BigDecimal.valueOf(25_400_000_000_000_000), UnitGroup.LENGTH, R.string.unit_inch, R.string.unit_inch_short),
NormalUnit(MyUnitIDS.foot, BigDecimal.valueOf(304_800_000_000_002_200), UnitGroup.LENGTH, R.string.unit_foot, R.string.unit_foot_short), NormalUnit(UnitID.foot, BigDecimal.valueOf(304_800_000_000_002_200), UnitGroup.LENGTH, R.string.unit_foot, R.string.unit_foot_short),
NormalUnit(MyUnitIDS.yard, BigDecimal.valueOf(914_400_000_000_006_400), UnitGroup.LENGTH, R.string.unit_yard, R.string.unit_yard_short), NormalUnit(UnitID.yard, BigDecimal.valueOf(914_400_000_000_006_400), UnitGroup.LENGTH, R.string.unit_yard, R.string.unit_yard_short),
NormalUnit(MyUnitIDS.mile, BigDecimal.valueOf(1_609_344_000_000_010_500_000.0), UnitGroup.LENGTH, R.string.unit_mile, R.string.unit_mile_short), NormalUnit(UnitID.mile, BigDecimal.valueOf(1_609_344_000_000_010_500_000.0), UnitGroup.LENGTH, R.string.unit_mile, R.string.unit_mile_short),
) )
) )

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2022-2022 Elshan Agaev * Copyright (c) 2022-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -34,7 +34,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.sadellie.unitto.core.ui.common.UnittoButton import com.sadellie.unitto.core.ui.common.Button
/** /**
* Button to select a unit * Button to select a unit
@ -51,7 +51,7 @@ internal fun UnitSelectionButton(
label: String, label: String,
enabled: Boolean = true enabled: Boolean = true
) { ) {
UnittoButton( Button(
modifier = modifier, modifier = modifier,
onClick = onClick, onClick = onClick,
enabled = enabled, enabled = enabled,
@ -63,10 +63,10 @@ internal fun UnitSelectionButton(
transitionSpec = { transitionSpec = {
if (targetState > initialState) { if (targetState > initialState) {
(slideInVertically { height -> height } + fadeIn()) togetherWith (slideInVertically { height -> height } + fadeIn()) togetherWith
slideOutVertically { height -> -height } + fadeOut() slideOutVertically { height -> -height } + fadeOut()
} else { } else {
(slideInVertically { height -> -height } + fadeIn()) togetherWith (slideInVertically { height -> -height } + fadeIn()) togetherWith
slideOutVertically { height -> height } + fadeOut() slideOutVertically { height -> height } + fadeOut()
}.using( }.using(
SizeTransform(clip = false) SizeTransform(clip = false)
) )

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -37,7 +37,7 @@ import androidx.compose.ui.tooling.preview.Preview
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.common.MenuButton import com.sadellie.unitto.core.ui.common.MenuButton
import com.sadellie.unitto.core.ui.common.SettingsButton import com.sadellie.unitto.core.ui.common.SettingsButton
import com.sadellie.unitto.core.ui.common.UnittoScreenWithTopBar import com.sadellie.unitto.core.ui.common.ScaffoldWithTopBar
import com.sadellie.unitto.feature.datecalculator.addsubtract.AddSubtractPage import com.sadellie.unitto.feature.datecalculator.addsubtract.AddSubtractPage
import com.sadellie.unitto.feature.datecalculator.difference.DateDifferencePage import com.sadellie.unitto.feature.datecalculator.difference.DateDifferencePage
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
@ -66,7 +66,7 @@ internal fun DateCalculatorScreen(
val pagerState = rememberPagerState { allTabs.size } val pagerState = rememberPagerState { allTabs.size }
val coroutineScope = rememberCoroutineScope() val coroutineScope = rememberCoroutineScope()
UnittoScreenWithTopBar( ScaffoldWithTopBar(
modifier = Modifier, modifier = Modifier,
title = { Text(stringResource(R.string.date_calculator_title)) }, title = { Text(stringResource(R.string.date_calculator_title)) },
navigationIcon = { MenuButton(navigateToMenu) }, navigationIcon = { MenuButton(navigateToMenu) },

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -123,7 +123,7 @@ private fun AddSubtractView(
floatingActionButton = { floatingActionButton = {
FloatingActionButton( FloatingActionButton(
onClick = { onClick = {
mContext.addEvent(uiState.start, uiState.result) mContext.createEvent(uiState.start, uiState.result)
} }
) { ) {
Icon( Icon(
@ -277,7 +277,7 @@ private fun AddSubtractView(
) )
} }
private fun Context.addEvent(start: ZonedDateTime, end: ZonedDateTime) { private fun Context.createEvent(start: ZonedDateTime, end: ZonedDateTime) {
val startMillis: Long = start.toEpochSecond() * 1000 val startMillis: Long = start.toEpochSecond() * 1000
val endMillis: Long = end.toEpochSecond() * 1000 val endMillis: Long = end.toEpochSecond() * 1000
val intent = Intent(Intent.ACTION_INSERT) val intent = Intent(Intent.ACTION_INSERT)

View File

@ -19,7 +19,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> <manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application> <application>
<receiver android:name=".glance.UnittoCalculatorWidgetReceiver" <receiver android:name=".glance.CalculatorWidgetReceiver"
android:exported="true"> android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

View File

@ -63,7 +63,7 @@ import dagger.hilt.EntryPoints
import dagger.hilt.InstallIn import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent import dagger.hilt.components.SingletonComponent
class UnittoCalculatorWidget : GlanceAppWidget() { class CalculatorWidget : GlanceAppWidget() {
@EntryPoint @EntryPoint
@InstallIn(SingletonComponent::class) @InstallIn(SingletonComponent::class)
@ -123,9 +123,9 @@ private fun ReadyUI(
appPrefs: CalculatorPreferences, appPrefs: CalculatorPreferences,
) { ) {
val glancePrefs = currentState<Preferences>() val glancePrefs = currentState<Preferences>()
val input = glancePrefs[UnittoCalculatorWidget.inputPrefKey] ?: "" val input = glancePrefs[CalculatorWidget.inputPrefKey] ?: ""
val output = glancePrefs[UnittoCalculatorWidget.outputPrefKey] ?: "" val output = glancePrefs[CalculatorWidget.outputPrefKey] ?: ""
val equalClicked = glancePrefs[UnittoCalculatorWidget.equalClickedPrefKey] ?: false val equalClicked = glancePrefs[CalculatorWidget.equalClickedPrefKey] ?: false
val formatterSymbols = AllFormatterSymbols.getById(appPrefs.separator) val formatterSymbols = AllFormatterSymbols.getById(appPrefs.separator)
fun runCalculateAction( fun runCalculateAction(

View File

@ -21,6 +21,6 @@ package com.sadellie.unitto.feature.glance.glance
import androidx.glance.appwidget.GlanceAppWidget import androidx.glance.appwidget.GlanceAppWidget
import androidx.glance.appwidget.GlanceAppWidgetReceiver import androidx.glance.appwidget.GlanceAppWidgetReceiver
class UnittoCalculatorWidgetReceiver : GlanceAppWidgetReceiver() { class CalculatorWidgetReceiver : GlanceAppWidgetReceiver() {
override val glanceAppWidget: GlanceAppWidget = UnittoCalculatorWidget() override val glanceAppWidget: GlanceAppWidget = CalculatorWidget()
} }

View File

@ -44,10 +44,10 @@ internal class UpdateInputAction : ActionCallback {
parameters: ActionParameters parameters: ActionParameters
) = withContext(Dispatchers.Default) { ) = withContext(Dispatchers.Default) {
// Get new input // Get new input
val input = parameters[UnittoCalculatorWidget.inputKey] ?: return@withContext val input = parameters[CalculatorWidget.inputKey] ?: return@withContext
val equalClicked = parameters[UnittoCalculatorWidget.equalClickedKey] ?: return@withContext val equalClicked = parameters[CalculatorWidget.equalClickedKey] ?: return@withContext
val precision = parameters[UnittoCalculatorWidget.precisionKey] ?: return@withContext val precision = parameters[CalculatorWidget.precisionKey] ?: return@withContext
val outputFormat = parameters[UnittoCalculatorWidget.outputFormatKey] ?: return@withContext val outputFormat = parameters[CalculatorWidget.outputFormatKey] ?: return@withContext
// calculate // calculate
val output = try { val output = try {
@ -61,13 +61,13 @@ internal class UpdateInputAction : ActionCallback {
glanceId = glanceId, glanceId = glanceId,
) { preferences -> ) { preferences ->
preferences.apply { preferences.apply {
this[UnittoCalculatorWidget.inputPrefKey] = input this[CalculatorWidget.inputPrefKey] = input
this[UnittoCalculatorWidget.outputPrefKey] = output this[CalculatorWidget.outputPrefKey] = output
this[UnittoCalculatorWidget.equalClickedPrefKey] = equalClicked this[CalculatorWidget.equalClickedPrefKey] = equalClicked
} }
} }
UnittoCalculatorWidget().update(context, glanceId) CalculatorWidget().update(context, glanceId)
} }
} }
@ -77,7 +77,7 @@ internal class CopyResultAction : ActionCallback {
glanceId: GlanceId, glanceId: GlanceId,
parameters: ActionParameters, parameters: ActionParameters,
) { ) {
val output = parameters[UnittoCalculatorWidget.outputKey] val output = parameters[CalculatorWidget.outputKey]
if (output.isNullOrEmpty()) return if (output.isNullOrEmpty()) return
val cm = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager val cm = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
@ -91,7 +91,7 @@ internal class RestartWidget : ActionCallback {
glanceId: GlanceId, glanceId: GlanceId,
parameters: ActionParameters parameters: ActionParameters
) { ) {
UnittoCalculatorWidget().update(context, glanceId) CalculatorWidget().update(context, glanceId)
} }
} }
@ -102,10 +102,10 @@ internal fun updateInputAction(
outputFormat: Int outputFormat: Int
): Action = actionRunCallback<UpdateInputAction>( ): Action = actionRunCallback<UpdateInputAction>(
actionParametersOf( actionParametersOf(
UnittoCalculatorWidget.inputKey to input, CalculatorWidget.inputKey to input,
UnittoCalculatorWidget.equalClickedKey to equalClicked, CalculatorWidget.equalClickedKey to equalClicked,
UnittoCalculatorWidget.precisionKey to precision, CalculatorWidget.precisionKey to precision,
UnittoCalculatorWidget.outputFormatKey to outputFormat CalculatorWidget.outputFormatKey to outputFormat
) )
) )
@ -114,7 +114,7 @@ internal fun copyAction(
fractional: String fractional: String
): Action = actionRunCallback<CopyResultAction>( ): Action = actionRunCallback<CopyResultAction>(
actionParametersOf( actionParametersOf(
UnittoCalculatorWidget.outputKey to output.replace(Token.Digit.dot, fractional) CalculatorWidget.outputKey to output.replace(Token.Digit.dot, fractional)
) )
) )

View File

@ -77,9 +77,9 @@ import com.sadellie.unitto.core.base.BuildConfig
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.common.Header import com.sadellie.unitto.core.ui.common.Header
import com.sadellie.unitto.core.ui.common.NavigateUpButton import com.sadellie.unitto.core.ui.common.NavigateUpButton
import com.sadellie.unitto.core.ui.common.UnittoEmptyScreen import com.sadellie.unitto.core.ui.common.EmptyScreen
import com.sadellie.unitto.core.ui.common.UnittoListItem import com.sadellie.unitto.core.ui.common.ListItem
import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar import com.sadellie.unitto.core.ui.common.ScaffoldWithLargeTopBar
import com.sadellie.unitto.core.ui.openLink import com.sadellie.unitto.core.ui.openLink
import com.sadellie.unitto.core.ui.showToast import com.sadellie.unitto.core.ui.showToast
import com.sadellie.unitto.feature.settings.components.AnnoyingBox import com.sadellie.unitto.feature.settings.components.AnnoyingBox
@ -111,7 +111,7 @@ internal fun SettingsRoute(
} }
when (uiState) { when (uiState) {
SettingsUIState.Loading -> UnittoEmptyScreen() SettingsUIState.Loading -> EmptyScreen()
is SettingsUIState.Ready -> SettingsScreen( is SettingsUIState.Ready -> SettingsScreen(
uiState = uiState, uiState = uiState,
@ -156,7 +156,7 @@ private fun SettingsScreen(
BackHandler(uiState.backupInProgress) {} BackHandler(uiState.backupInProgress) {}
UnittoScreenWithLargeTopBar( ScaffoldWithLargeTopBar(
title = stringResource(R.string.settings_title), title = stringResource(R.string.settings_title),
navigationIcon = { NavigateUpButton(navigateUp) }, navigationIcon = { NavigateUpButton(navigateUp) },
actions = { actions = {
@ -211,35 +211,35 @@ private fun SettingsScreen(
} }
} }
UnittoListItem( ListItem(
icon = Icons.Default.Palette, icon = Icons.Default.Palette,
headlineText = stringResource(R.string.settings_display), headlineText = stringResource(R.string.settings_display),
supportingText = stringResource(R.string.settings_display_support), supportingText = stringResource(R.string.settings_display_support),
modifier = Modifier.clickable { navControllerAction(displayRoute) } modifier = Modifier.clickable { navControllerAction(displayRoute) }
) )
UnittoListItem( ListItem(
icon = Icons.Default.Home, icon = Icons.Default.Home,
headlineText = stringResource(R.string.settings_starting_screen), headlineText = stringResource(R.string.settings_starting_screen),
supportingText = stringResource(R.string.settings_starting_screen_support), supportingText = stringResource(R.string.settings_starting_screen_support),
modifier = Modifier.clickable { navControllerAction(startingScreenRoute) } modifier = Modifier.clickable { navControllerAction(startingScreenRoute) }
) )
UnittoListItem( ListItem(
icon = Icons.Default._123, icon = Icons.Default._123,
headlineText = stringResource(R.string.settings_formatting), headlineText = stringResource(R.string.settings_formatting),
supportingText = stringResource(R.string.settings_formatting_support), supportingText = stringResource(R.string.settings_formatting_support),
modifier = Modifier.clickable { navControllerAction(formattingRoute) } modifier = Modifier.clickable { navControllerAction(formattingRoute) }
) )
UnittoListItem( ListItem(
icon = Icons.Default.Calculate, icon = Icons.Default.Calculate,
headlineText = stringResource(R.string.calculator_title), headlineText = stringResource(R.string.calculator_title),
supportingText = stringResource(R.string.settings_calculator_support), supportingText = stringResource(R.string.settings_calculator_support),
modifier = Modifier.clickable { navControllerAction(calculatorSettingsRoute) } modifier = Modifier.clickable { navControllerAction(calculatorSettingsRoute) }
) )
UnittoListItem( ListItem(
icon = Icons.Default.SwapHoriz, icon = Icons.Default.SwapHoriz,
headlineText = stringResource(R.string.unit_converter_title), headlineText = stringResource(R.string.unit_converter_title),
supportingText = stringResource(R.string.settings_converter_support), supportingText = stringResource(R.string.settings_converter_support),
@ -248,7 +248,7 @@ private fun SettingsScreen(
Header(stringResource(R.string.settings_additional)) Header(stringResource(R.string.settings_additional))
UnittoListItem( ListItem(
icon = Icons.Default.Vibration, icon = Icons.Default.Vibration,
headlineText = stringResource(R.string.settings_vibrations), headlineText = stringResource(R.string.settings_vibrations),
supportingText = stringResource(R.string.settings_vibrations_support), supportingText = stringResource(R.string.settings_vibrations_support),
@ -262,7 +262,7 @@ private fun SettingsScreen(
enter = expandVertically() + fadeIn(), enter = expandVertically() + fadeIn(),
exit = shrinkVertically() + fadeOut(), exit = shrinkVertically() + fadeOut(),
) { ) {
UnittoListItem( ListItem(
headlineText = stringResource(R.string.settings_clear_cache), headlineText = stringResource(R.string.settings_clear_cache),
icon = Icons.Default.Cached, icon = Icons.Default.Cached,
modifier = Modifier.clickable { clearCache(); showToast(mContext, "👌") }, modifier = Modifier.clickable { clearCache(); showToast(mContext, "👌") },
@ -270,14 +270,14 @@ private fun SettingsScreen(
} }
if (BuildConfig.STORE_LINK.isNotEmpty()) { if (BuildConfig.STORE_LINK.isNotEmpty()) {
UnittoListItem( ListItem(
icon = Icons.Default.RateReview, icon = Icons.Default.RateReview,
headlineText = stringResource(R.string.settings_rate_this_app), headlineText = stringResource(R.string.settings_rate_this_app),
modifier = Modifier.clickable { openLink(mContext, BuildConfig.STORE_LINK) } modifier = Modifier.clickable { openLink(mContext, BuildConfig.STORE_LINK) }
) )
} }
UnittoListItem( ListItem(
icon = Icons.Default.Info, icon = Icons.Default.Info,
headlineText = stringResource(R.string.settings_about_unitto), headlineText = stringResource(R.string.settings_about_unitto),
supportingText = stringResource(R.string.settings_about_unitto_support), supportingText = stringResource(R.string.settings_about_unitto_support),

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2022-2023 Elshan Agaev * Copyright (c) 2022-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -47,9 +47,9 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.sadellie.unitto.core.base.BuildConfig import com.sadellie.unitto.core.base.BuildConfig
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.common.NavigateUpButton import com.sadellie.unitto.core.ui.common.NavigateUpButton
import com.sadellie.unitto.core.ui.common.UnittoEmptyScreen import com.sadellie.unitto.core.ui.common.EmptyScreen
import com.sadellie.unitto.core.ui.common.UnittoListItem import com.sadellie.unitto.core.ui.common.ListItem
import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar import com.sadellie.unitto.core.ui.common.ScaffoldWithLargeTopBar
import com.sadellie.unitto.core.ui.openLink import com.sadellie.unitto.core.ui.openLink
import com.sadellie.unitto.core.ui.showToast import com.sadellie.unitto.core.ui.showToast
import com.sadellie.unitto.data.model.userprefs.AboutPreferences import com.sadellie.unitto.data.model.userprefs.AboutPreferences
@ -62,7 +62,7 @@ internal fun AboutRoute(
navigateToThirdParty: () -> Unit, navigateToThirdParty: () -> Unit,
) { ) {
when (val prefs = viewModel.prefs.collectAsStateWithLifecycle().value) { when (val prefs = viewModel.prefs.collectAsStateWithLifecycle().value) {
null -> UnittoEmptyScreen() null -> EmptyScreen()
else -> { else -> {
AboutScreen( AboutScreen(
prefs = prefs, prefs = prefs,
@ -85,14 +85,14 @@ private fun AboutScreen(
var aboutItemClick: Int by rememberSaveable { mutableIntStateOf(0) } var aboutItemClick: Int by rememberSaveable { mutableIntStateOf(0) }
var showDialog: Boolean by rememberSaveable { mutableStateOf(false) } var showDialog: Boolean by rememberSaveable { mutableStateOf(false) }
UnittoScreenWithLargeTopBar( ScaffoldWithLargeTopBar(
title = stringResource(R.string.settings_about_unitto), title = stringResource(R.string.settings_about_unitto),
navigationIcon = { NavigateUpButton(navigateUpAction) } navigationIcon = { NavigateUpButton(navigateUpAction) }
) { padding -> ) { padding ->
LazyColumn(contentPadding = padding) { LazyColumn(contentPadding = padding) {
// CURRENCY RATE NOTE // CURRENCY RATE NOTE
item { item {
UnittoListItem( ListItem(
icon = Icons.AutoMirrored.Filled.Help, icon = Icons.AutoMirrored.Filled.Help,
headlineText = stringResource(R.string.settings_currency_rates_note_title), headlineText = stringResource(R.string.settings_currency_rates_note_title),
modifier = Modifier.clickable { showDialog = true } modifier = Modifier.clickable { showDialog = true }
@ -101,7 +101,7 @@ private fun AboutScreen(
// TERMS AND CONDITIONS // TERMS AND CONDITIONS
item { item {
UnittoListItem( ListItem(
icon = Icons.Default.PrivacyTip, icon = Icons.Default.PrivacyTip,
headlineText = stringResource(R.string.settings_terms_and_conditions), headlineText = stringResource(R.string.settings_terms_and_conditions),
modifier = Modifier.clickable { modifier = Modifier.clickable {
@ -115,7 +115,7 @@ private fun AboutScreen(
// PRIVACY POLICY // PRIVACY POLICY
item { item {
UnittoListItem( ListItem(
icon = Icons.Default.Policy, icon = Icons.Default.Policy,
headlineText = stringResource(R.string.settings_privacy_policy), headlineText = stringResource(R.string.settings_privacy_policy),
modifier = Modifier.clickable { modifier = Modifier.clickable {
@ -129,7 +129,7 @@ private fun AboutScreen(
// OPEN SOURCE // OPEN SOURCE
item { item {
UnittoListItem( ListItem(
icon = Icons.Default.Code, icon = Icons.Default.Code,
headlineText = stringResource(R.string.settings_view_source_code), headlineText = stringResource(R.string.settings_view_source_code),
modifier = Modifier.clickable { modifier = Modifier.clickable {
@ -143,7 +143,7 @@ private fun AboutScreen(
// THIRD PARTY // THIRD PARTY
item { item {
UnittoListItem( ListItem(
icon = Icons.Default.Copyright, icon = Icons.Default.Copyright,
headlineText = stringResource(R.string.settings_third_party_licenses), headlineText = stringResource(R.string.settings_third_party_licenses),
modifier = Modifier.clickable { navigateToThirdParty() } modifier = Modifier.clickable { navigateToThirdParty() }
@ -152,7 +152,7 @@ private fun AboutScreen(
// APP VERSION // APP VERSION
item { item {
UnittoListItem( ListItem(
icon = Icons.Default.Info, icon = Icons.Default.Info,
headlineText = stringResource(R.string.settings_version_name), headlineText = stringResource(R.string.settings_version_name),
supportingText = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})", supportingText = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})",

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -31,9 +31,9 @@ import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.common.NavigateUpButton import com.sadellie.unitto.core.ui.common.NavigateUpButton
import com.sadellie.unitto.core.ui.common.UnittoEmptyScreen import com.sadellie.unitto.core.ui.common.EmptyScreen
import com.sadellie.unitto.core.ui.common.UnittoListItem import com.sadellie.unitto.core.ui.common.ListItem
import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar import com.sadellie.unitto.core.ui.common.ScaffoldWithLargeTopBar
@Composable @Composable
internal fun CalculatorSettingsRoute( internal fun CalculatorSettingsRoute(
@ -41,7 +41,7 @@ internal fun CalculatorSettingsRoute(
navigateUpAction: () -> Unit, navigateUpAction: () -> Unit,
) { ) {
when (val prefs = viewModel.uiState.collectAsStateWithLifecycle().value) { when (val prefs = viewModel.uiState.collectAsStateWithLifecycle().value) {
CalculatorSettingsUIState.Loading -> UnittoEmptyScreen() CalculatorSettingsUIState.Loading -> EmptyScreen()
else -> { else -> {
CalculatorSettingsScreen( CalculatorSettingsScreen(
uiState = prefs, uiState = prefs,
@ -61,7 +61,7 @@ private fun CalculatorSettingsScreen(
updatePartialHistoryView: (Boolean) -> Unit, updatePartialHistoryView: (Boolean) -> Unit,
updateRpnMode: (Boolean) -> Unit, updateRpnMode: (Boolean) -> Unit,
) { ) {
UnittoScreenWithLargeTopBar( ScaffoldWithLargeTopBar(
title = stringResource(R.string.calculator_title), title = stringResource(R.string.calculator_title),
navigationIcon = { NavigateUpButton(navigateUpAction) } navigationIcon = { NavigateUpButton(navigateUpAction) }
) { padding -> ) { padding ->
@ -94,7 +94,7 @@ private fun CalculatorSettingsScreen(
when (state) { when (state) {
is CalculatorSettingsUIState.Standard -> { is CalculatorSettingsUIState.Standard -> {
Column { Column {
UnittoListItem( ListItem(
headlineText = stringResource(R.string.settings_partial_history_view), headlineText = stringResource(R.string.settings_partial_history_view),
icon = Icons.Default.Timer, icon = Icons.Default.Timer,
supportingText = stringResource(R.string.settings_partial_history_view_support), supportingText = stringResource(R.string.settings_partial_history_view_support),

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -38,9 +38,9 @@ import com.sadellie.unitto.core.base.OutputFormat
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.base.Separator import com.sadellie.unitto.core.base.Separator
import com.sadellie.unitto.core.ui.common.NavigateUpButton import com.sadellie.unitto.core.ui.common.NavigateUpButton
import com.sadellie.unitto.core.ui.common.UnittoEmptyScreen import com.sadellie.unitto.core.ui.common.EmptyScreen
import com.sadellie.unitto.core.ui.common.UnittoListItem import com.sadellie.unitto.core.ui.common.ListItem
import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar import com.sadellie.unitto.core.ui.common.ScaffoldWithLargeTopBar
import com.sadellie.unitto.data.model.ALL_UNIT_GROUPS import com.sadellie.unitto.data.model.ALL_UNIT_GROUPS
import com.sadellie.unitto.data.model.UnitsListSorting import com.sadellie.unitto.data.model.UnitsListSorting
import com.sadellie.unitto.data.model.userprefs.ConverterPreferences import com.sadellie.unitto.data.model.userprefs.ConverterPreferences
@ -54,7 +54,7 @@ internal fun ConverterSettingsRoute(
navigateToUnitsGroup: () -> Unit, navigateToUnitsGroup: () -> Unit,
) { ) {
when (val prefs = viewModel.prefs.collectAsStateWithLifecycle().value) { when (val prefs = viewModel.prefs.collectAsStateWithLifecycle().value) {
null -> UnittoEmptyScreen() null -> EmptyScreen()
else -> { else -> {
ConverterSettingsScreen( ConverterSettingsScreen(
prefs = prefs, prefs = prefs,
@ -77,13 +77,13 @@ private fun ConverterSettingsScreen(
) { ) {
var showDialog: Boolean by rememberSaveable { mutableStateOf(false) } var showDialog: Boolean by rememberSaveable { mutableStateOf(false) }
UnittoScreenWithLargeTopBar( ScaffoldWithLargeTopBar(
title = stringResource(R.string.unit_converter_title), title = stringResource(R.string.unit_converter_title),
navigationIcon = { NavigateUpButton(navigateUpAction) } navigationIcon = { NavigateUpButton(navigateUpAction) }
) { padding -> ) { padding ->
LazyColumn(contentPadding = padding) { LazyColumn(contentPadding = padding) {
item("unit group") { item("unit group") {
UnittoListItem( ListItem(
icon = Icons.AutoMirrored.Filled.Rule, icon = Icons.AutoMirrored.Filled.Rule,
headlineText = stringResource(R.string.settings_unit_groups_title), headlineText = stringResource(R.string.settings_unit_groups_title),
supportingText = stringResource(R.string.settings_unit_groups_support), supportingText = stringResource(R.string.settings_unit_groups_support),
@ -92,7 +92,7 @@ private fun ConverterSettingsScreen(
} }
item("units sorting") { item("units sorting") {
UnittoListItem( ListItem(
icon = Icons.AutoMirrored.Filled.Sort, icon = Icons.AutoMirrored.Filled.Sort,
headlineText = stringResource(R.string.settings_units_sorting), headlineText = stringResource(R.string.settings_units_sorting),
supportingText = stringResource(R.string.settings_units_sorting_support), supportingText = stringResource(R.string.settings_units_sorting_support),
@ -101,7 +101,7 @@ private fun ConverterSettingsScreen(
} }
item("format time") { item("format time") {
UnittoListItem( ListItem(
icon = Icons.Default.Timer, icon = Icons.Default.Timer,
headlineText = stringResource(R.string.settings_format_time), headlineText = stringResource(R.string.settings_format_time),
supportingText = stringResource(R.string.settings_format_time_support), supportingText = stringResource(R.string.settings_format_time_support),

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2022-2023 Elshan Agaev * Copyright (c) 2022-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -60,9 +60,9 @@ import com.sadellie.unitto.core.ui.common.Header
import com.sadellie.unitto.core.ui.common.NavigateUpButton import com.sadellie.unitto.core.ui.common.NavigateUpButton
import com.sadellie.unitto.core.ui.common.SegmentedButton import com.sadellie.unitto.core.ui.common.SegmentedButton
import com.sadellie.unitto.core.ui.common.SegmentedButtonsRow import com.sadellie.unitto.core.ui.common.SegmentedButtonsRow
import com.sadellie.unitto.core.ui.common.UnittoEmptyScreen import com.sadellie.unitto.core.ui.common.EmptyScreen
import com.sadellie.unitto.core.ui.common.UnittoListItem import com.sadellie.unitto.core.ui.common.ListItem
import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar import com.sadellie.unitto.core.ui.common.ScaffoldWithLargeTopBar
import com.sadellie.unitto.core.ui.common.icons.IconPack import com.sadellie.unitto.core.ui.common.icons.IconPack
import com.sadellie.unitto.core.ui.common.icons.iconpack.Clear import com.sadellie.unitto.core.ui.common.icons.iconpack.Clear
import com.sadellie.unitto.feature.settings.components.ColorSelector import com.sadellie.unitto.feature.settings.components.ColorSelector
@ -80,7 +80,7 @@ internal fun DisplayRoute(
navigateToLanguages: () -> Unit, navigateToLanguages: () -> Unit,
) { ) {
when (val prefs = viewModel.prefs.collectAsStateWithLifecycle().value) { when (val prefs = viewModel.prefs.collectAsStateWithLifecycle().value) {
null -> UnittoEmptyScreen() null -> EmptyScreen()
else -> { else -> {
DisplayScreen( DisplayScreen(
navigateUp = navigateUp, navigateUp = navigateUp,
@ -149,7 +149,7 @@ private fun DisplayScreen(
updateMiddleZero: (Boolean) -> Unit, updateMiddleZero: (Boolean) -> Unit,
navigateToLanguages: () -> Unit, navigateToLanguages: () -> Unit,
) { ) {
UnittoScreenWithLargeTopBar( ScaffoldWithLargeTopBar(
title = stringResource(R.string.settings_display), title = stringResource(R.string.settings_display),
navigationIcon = { NavigateUpButton(navigateUp) } navigationIcon = { NavigateUpButton(navigateUp) }
) { paddingValues -> ) { paddingValues ->
@ -159,7 +159,7 @@ private fun DisplayScreen(
.verticalScroll(rememberScrollState()) .verticalScroll(rememberScrollState())
.padding(paddingValues) .padding(paddingValues)
) { ) {
UnittoListItem( ListItem(
leadingContent = { leadingContent = {
Icon( Icon(
Icons.Default.Palette, Icons.Default.Palette,
@ -202,7 +202,7 @@ private fun DisplayScreen(
enter = expandVertically() + fadeIn(), enter = expandVertically() + fadeIn(),
exit = shrinkVertically() + fadeOut(), exit = shrinkVertically() + fadeOut(),
) { ) {
UnittoListItem( ListItem(
icon = Icons.Default.DarkMode, icon = Icons.Default.DarkMode,
headlineText = stringResource(R.string.settings_amoled_dark), headlineText = stringResource(R.string.settings_amoled_dark),
supportingText = stringResource(R.string.settings_amoled_dark_support), supportingText = stringResource(R.string.settings_amoled_dark_support),
@ -212,7 +212,7 @@ private fun DisplayScreen(
} }
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
UnittoListItem( ListItem(
icon = Icons.Default.Colorize, icon = Icons.Default.Colorize,
headlineText = stringResource(R.string.settings_dynamic_colors), headlineText = stringResource(R.string.settings_dynamic_colors),
supportingText = stringResource(R.string.settings_dynamic_colors_support), supportingText = stringResource(R.string.settings_dynamic_colors_support),
@ -225,7 +225,7 @@ private fun DisplayScreen(
enter = expandVertically() + fadeIn(), enter = expandVertically() + fadeIn(),
exit = shrinkVertically() + fadeOut(), exit = shrinkVertically() + fadeOut(),
) { ) {
UnittoListItem( ListItem(
headlineContent = { Text(stringResource(R.string.settings_selected_color)) }, headlineContent = { Text(stringResource(R.string.settings_selected_color)) },
supportingContent = { supportingContent = {
ColorSelector( ColorSelector(
@ -245,7 +245,7 @@ private fun DisplayScreen(
enter = expandVertically() + fadeIn(), enter = expandVertically() + fadeIn(),
exit = shrinkVertically() + fadeOut(), exit = shrinkVertically() + fadeOut(),
) { ) {
UnittoListItem( ListItem(
headlineContent = { Text(stringResource(R.string.settings_selected_style)) }, headlineContent = { Text(stringResource(R.string.settings_selected_style)) },
supportingContent = { supportingContent = {
MonetModeSelector( MonetModeSelector(
@ -264,7 +264,7 @@ private fun DisplayScreen(
Header(stringResource(R.string.settings_additional)) Header(stringResource(R.string.settings_additional))
UnittoListItem( ListItem(
icon = Icons.Default.FontDownload, icon = Icons.Default.FontDownload,
headlineText = stringResource(R.string.settings_system_font), headlineText = stringResource(R.string.settings_system_font),
supportingText = stringResource(R.string.settings_system_font_support), supportingText = stringResource(R.string.settings_system_font_support),
@ -272,7 +272,7 @@ private fun DisplayScreen(
onSwitchChange = updateSystemFont onSwitchChange = updateSystemFont
) )
UnittoListItem( ListItem(
icon = IconPack.Clear, icon = IconPack.Clear,
headlineText = stringResource(R.string.settings_ac_button), headlineText = stringResource(R.string.settings_ac_button),
supportingText = stringResource(R.string.settings_ac_button_support), supportingText = stringResource(R.string.settings_ac_button_support),
@ -280,7 +280,7 @@ private fun DisplayScreen(
onSwitchChange = updateAcButton onSwitchChange = updateAcButton
) )
UnittoListItem( ListItem(
icon = Icons.Default.ExposureZero, icon = Icons.Default.ExposureZero,
headlineText = stringResource(R.string.settings_middle_zero), headlineText = stringResource(R.string.settings_middle_zero),
supportingText = stringResource(R.string.settings_middle_zero_support), supportingText = stringResource(R.string.settings_middle_zero_support),
@ -288,7 +288,7 @@ private fun DisplayScreen(
onSwitchChange = updateMiddleZero onSwitchChange = updateMiddleZero
) )
UnittoListItem( ListItem(
icon = Icons.Default.Language, icon = Icons.Default.Language,
headlineText = stringResource(R.string.settings_language), headlineText = stringResource(R.string.settings_language),
supportingText = stringResource(R.string.settings_language_support), supportingText = stringResource(R.string.settings_language_support),

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -56,10 +56,10 @@ import com.sadellie.unitto.core.ui.common.NavigateUpButton
import com.sadellie.unitto.core.ui.common.PagedIsland import com.sadellie.unitto.core.ui.common.PagedIsland
import com.sadellie.unitto.core.ui.common.SegmentedButton import com.sadellie.unitto.core.ui.common.SegmentedButton
import com.sadellie.unitto.core.ui.common.SegmentedButtonsRow import com.sadellie.unitto.core.ui.common.SegmentedButtonsRow
import com.sadellie.unitto.core.ui.common.UnittoEmptyScreen import com.sadellie.unitto.core.ui.common.EmptyScreen
import com.sadellie.unitto.core.ui.common.UnittoListItem import com.sadellie.unitto.core.ui.common.ListItem
import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar import com.sadellie.unitto.core.ui.common.ScaffoldWithLargeTopBar
import com.sadellie.unitto.core.ui.common.UnittoSlider import com.sadellie.unitto.core.ui.common.Slider
import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols import com.sadellie.unitto.core.ui.common.textfield.FormatterSymbols
import com.sadellie.unitto.core.ui.common.textfield.formatExpression import com.sadellie.unitto.core.ui.common.textfield.formatExpression
import com.sadellie.unitto.core.ui.theme.LocalNumberTypography import com.sadellie.unitto.core.ui.theme.LocalNumberTypography
@ -73,7 +73,7 @@ fun FormattingRoute(
navigateUpAction: () -> Unit, navigateUpAction: () -> Unit,
) { ) {
when (val uiState = viewModel.uiState.collectAsStateWithLifecycle().value) { when (val uiState = viewModel.uiState.collectAsStateWithLifecycle().value) {
null -> UnittoEmptyScreen() null -> EmptyScreen()
else -> { else -> {
FormattingScreen( FormattingScreen(
navigateUpAction = navigateUpAction, navigateUpAction = navigateUpAction,
@ -110,7 +110,7 @@ fun FormattingScreen(
} }
} }
UnittoScreenWithLargeTopBar( ScaffoldWithLargeTopBar(
title = stringResource(R.string.settings_formatting), title = stringResource(R.string.settings_formatting),
navigationIcon = { NavigateUpButton(navigateUpAction) }, navigationIcon = { NavigateUpButton(navigateUpAction) },
) { paddingValues -> ) { paddingValues ->
@ -149,7 +149,7 @@ fun FormattingScreen(
} }
item("precision_label") { item("precision_label") {
UnittoListItem( ListItem(
leadingContent = { leadingContent = {
Icon( Icon(
Icons.Default.Architecture, Icons.Default.Architecture,
@ -172,7 +172,7 @@ fun FormattingScreen(
} }
item("precision_slider") { item("precision_slider") {
UnittoSlider( Slider(
modifier = Modifier.padding(start = 56.dp, end = 16.dp), modifier = Modifier.padding(start = 56.dp, end = 16.dp),
value = uiState.precision.toFloat(), value = uiState.precision.toFloat(),
valueRange = precisions, valueRange = precisions,
@ -181,7 +181,7 @@ fun FormattingScreen(
} }
item("separator_label") { item("separator_label") {
UnittoListItem( ListItem(
leadingContent = { leadingContent = {
Icon(Icons.Default._123, stringResource(R.string.settings_separator)) Icon(Icons.Default._123, stringResource(R.string.settings_separator))
}, },
@ -218,7 +218,7 @@ fun FormattingScreen(
} }
item("output_format_label") { item("output_format_label") {
UnittoListItem( ListItem(
leadingContent = { leadingContent = {
Icon(Icons.Default.EMobiledata, stringResource(R.string.settings_precision)) Icon(Icons.Default.EMobiledata, stringResource(R.string.settings_precision))
}, },

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -37,8 +37,8 @@ import androidx.compose.ui.unit.dp
import androidx.core.os.LocaleListCompat import androidx.core.os.LocaleListCompat
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.common.NavigateUpButton import com.sadellie.unitto.core.ui.common.NavigateUpButton
import com.sadellie.unitto.core.ui.common.UnittoListItem import com.sadellie.unitto.core.ui.common.ListItem
import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar import com.sadellie.unitto.core.ui.common.ScaffoldWithLargeTopBar
import com.sadellie.unitto.core.ui.openLink import com.sadellie.unitto.core.ui.openLink
import com.sadellie.unitto.feature.settings.components.AnnoyingBox import com.sadellie.unitto.feature.settings.components.AnnoyingBox
@ -68,7 +68,7 @@ private fun LanguageScreen(
navigateUp() navigateUp()
} }
UnittoScreenWithLargeTopBar( ScaffoldWithLargeTopBar(
title = stringResource(R.string.settings_language), title = stringResource(R.string.settings_language),
navigationIcon = { NavigateUpButton(navigateUp) } navigationIcon = { NavigateUpButton(navigateUp) }
) { padding -> ) { padding ->
@ -87,7 +87,7 @@ private fun LanguageScreen(
languages.forEach { (key, res) -> languages.forEach { (key, res) ->
item(key) { item(key) {
UnittoListItem( ListItem(
modifier = Modifier.clickable { changeLanguage(key) }, modifier = Modifier.clickable { changeLanguage(key) },
headlineContent = { headlineContent = {
Text(stringResource(res)) Text(stringResource(res))

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -38,9 +38,9 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.addShortcut import com.sadellie.unitto.core.ui.addShortcut
import com.sadellie.unitto.core.ui.common.NavigateUpButton import com.sadellie.unitto.core.ui.common.NavigateUpButton
import com.sadellie.unitto.core.ui.common.UnittoEmptyScreen import com.sadellie.unitto.core.ui.common.EmptyScreen
import com.sadellie.unitto.core.ui.common.UnittoListItem import com.sadellie.unitto.core.ui.common.ListItem
import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar import com.sadellie.unitto.core.ui.common.ScaffoldWithLargeTopBar
import com.sadellie.unitto.core.ui.model.DrawerItem import com.sadellie.unitto.core.ui.model.DrawerItem
@Composable @Composable
@ -49,7 +49,7 @@ internal fun StartingScreenRoute(
navigateUp: () -> Unit navigateUp: () -> Unit
) { ) {
when (val prefs = viewModel.prefs.collectAsStateWithLifecycle().value) { when (val prefs = viewModel.prefs.collectAsStateWithLifecycle().value) {
null -> UnittoEmptyScreen() null -> EmptyScreen()
else -> { else -> {
StartingScreenScreen( StartingScreenScreen(
startingScreen = prefs.startingScreen, startingScreen = prefs.startingScreen,
@ -68,13 +68,13 @@ private fun StartingScreenScreen(
) { ) {
val mContext = LocalContext.current val mContext = LocalContext.current
UnittoScreenWithLargeTopBar( ScaffoldWithLargeTopBar(
title = stringResource(R.string.settings_starting_screen), title = stringResource(R.string.settings_starting_screen),
navigationIcon = { NavigateUpButton(navigateUp) } navigationIcon = { NavigateUpButton(navigateUp) }
) { padding -> ) { padding ->
LazyColumn(contentPadding = padding) { LazyColumn(contentPadding = padding) {
items(DrawerItem.main, { it.graph }) { destination -> items(DrawerItem.main, { it.graph }) { destination ->
UnittoListItem( ListItem(
modifier = Modifier.clickable { updateStartingScreen(destination.graph) }, modifier = Modifier.clickable { updateStartingScreen(destination.graph) },
headlineContent = { headlineContent = {
Text(stringResource(destination.name)) Text(stringResource(destination.name))

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2022-2023 Elshan Agaev * Copyright (c) 2022-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -38,7 +38,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.common.NavigateUpButton import com.sadellie.unitto.core.ui.common.NavigateUpButton
import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar import com.sadellie.unitto.core.ui.common.ScaffoldWithLargeTopBar
import com.sadellie.unitto.core.ui.openLink import com.sadellie.unitto.core.ui.openLink
import com.sadellie.unitto.data.licenses.ALL_THIRD_PARTY import com.sadellie.unitto.data.licenses.ALL_THIRD_PARTY
@ -54,7 +54,7 @@ internal fun ThirdPartyLicensesScreen(
) { ) {
val mContext = LocalContext.current val mContext = LocalContext.current
UnittoScreenWithLargeTopBar( ScaffoldWithLargeTopBar(
title = stringResource(R.string.settings_third_party_licenses), title = stringResource(R.string.settings_third_party_licenses),
navigationIcon = { NavigateUpButton(navigateUpAction) } navigationIcon = { NavigateUpButton(navigateUpAction) }
) { padding -> ) { padding ->

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2022-2023 Elshan Agaev * Copyright (c) 2022-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -51,7 +51,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.common.Header import com.sadellie.unitto.core.ui.common.Header
import com.sadellie.unitto.core.ui.common.NavigateUpButton import com.sadellie.unitto.core.ui.common.NavigateUpButton
import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar import com.sadellie.unitto.core.ui.common.ScaffoldWithLargeTopBar
import org.burnoutcrew.reorderable.ReorderableItem import org.burnoutcrew.reorderable.ReorderableItem
import org.burnoutcrew.reorderable.detectReorder import org.burnoutcrew.reorderable.detectReorder
import org.burnoutcrew.reorderable.detectReorderAfterLongPress import org.burnoutcrew.reorderable.detectReorderAfterLongPress
@ -63,7 +63,7 @@ internal fun UnitGroupsScreen(
viewModel: UnitGroupsViewModel = hiltViewModel(), viewModel: UnitGroupsViewModel = hiltViewModel(),
navigateUpAction: () -> Unit, navigateUpAction: () -> Unit,
) { ) {
UnittoScreenWithLargeTopBar( ScaffoldWithLargeTopBar(
title = stringResource(R.string.settings_unit_groups_title), title = stringResource(R.string.settings_unit_groups_title),
navigationIcon = { NavigateUpButton(navigateUpAction) } navigationIcon = { NavigateUpButton(navigateUpAction) }
) { paddingValues -> ) { paddingValues ->

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -48,9 +48,9 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.LocalLocale import com.sadellie.unitto.core.ui.LocalLocale
import com.sadellie.unitto.core.ui.common.SearchPlaceholder import com.sadellie.unitto.core.ui.common.SearchPlaceholder
import com.sadellie.unitto.core.ui.common.UnittoEmptyScreen import com.sadellie.unitto.core.ui.common.EmptyScreen
import com.sadellie.unitto.core.ui.common.UnittoListItem import com.sadellie.unitto.core.ui.common.ListItem
import com.sadellie.unitto.core.ui.common.UnittoSearchBar import com.sadellie.unitto.core.ui.common.SearchBar
import com.sadellie.unitto.core.ui.datetime.formatTime import com.sadellie.unitto.core.ui.datetime.formatTime
import com.sadellie.unitto.core.ui.openLink import com.sadellie.unitto.core.ui.openLink
import com.sadellie.unitto.data.common.displayName import com.sadellie.unitto.data.common.displayName
@ -67,7 +67,7 @@ internal fun AddTimeZoneRoute(
userTime: ZonedDateTime, userTime: ZonedDateTime,
) { ) {
when (val uiState = viewModel.uiState.collectAsStateWithLifecycle().value) { when (val uiState = viewModel.uiState.collectAsStateWithLifecycle().value) {
AddTimeZoneUIState.Loading -> UnittoEmptyScreen() AddTimeZoneUIState.Loading -> EmptyScreen()
is AddTimeZoneUIState.Ready -> AddTimeZoneScreen( is AddTimeZoneUIState.Ready -> AddTimeZoneScreen(
uiState = uiState, uiState = uiState,
navigateUp = navigateUp, navigateUp = navigateUp,
@ -95,7 +95,7 @@ fun AddTimeZoneScreen(
Scaffold( Scaffold(
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
topBar = { topBar = {
UnittoSearchBar( SearchBar(
query = uiState.query, query = uiState.query,
onQueryChange = onQueryChange, onQueryChange = onQueryChange,
navigateUp = navigateUp, navigateUp = navigateUp,
@ -117,7 +117,7 @@ fun AddTimeZoneScreen(
} else { } else {
LazyColumn(Modifier.fillMaxSize()) { LazyColumn(Modifier.fillMaxSize()) {
items(uiState.list, { it.timeZone.id }) { items(uiState.list, { it.timeZone.id }) {
UnittoListItem( ListItem(
modifier = Modifier modifier = Modifier
.animateItemPlacement() .animateItemPlacement()
.clickable { .clickable {

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -75,8 +75,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.common.MenuButton import com.sadellie.unitto.core.ui.common.MenuButton
import com.sadellie.unitto.core.ui.common.SettingsButton import com.sadellie.unitto.core.ui.common.SettingsButton
import com.sadellie.unitto.core.ui.common.UnittoEmptyScreen import com.sadellie.unitto.core.ui.common.EmptyScreen
import com.sadellie.unitto.core.ui.common.UnittoScreenWithTopBar import com.sadellie.unitto.core.ui.common.ScaffoldWithTopBar
import com.sadellie.unitto.core.ui.common.datetimepicker.TimePickerDialog import com.sadellie.unitto.core.ui.common.datetimepicker.TimePickerDialog
import com.sadellie.unitto.data.model.timezone.FavoriteZone import com.sadellie.unitto.data.model.timezone.FavoriteZone
import com.sadellie.unitto.feature.timezone.components.FavoriteTimeZoneItem import com.sadellie.unitto.feature.timezone.components.FavoriteTimeZoneItem
@ -99,7 +99,7 @@ internal fun TimeZoneRoute(
navigateToAddTimeZone: (ZonedDateTime) -> Unit, navigateToAddTimeZone: (ZonedDateTime) -> Unit,
) { ) {
when (val uiState = viewModel.uiState.collectAsStateWithLifecycle().value) { when (val uiState = viewModel.uiState.collectAsStateWithLifecycle().value) {
TimeZoneUIState.Loading -> UnittoEmptyScreen() TimeZoneUIState.Loading -> EmptyScreen()
is TimeZoneUIState.Ready -> { is TimeZoneUIState.Ready -> {
TimeZoneScreen( TimeZoneScreen(
uiState = uiState, uiState = uiState,
@ -177,7 +177,7 @@ private fun TimeZoneScreen(
} }
) )
UnittoScreenWithTopBar( ScaffoldWithTopBar(
title = { Text(stringResource(R.string.time_zone_title)) }, title = { Text(stringResource(R.string.time_zone_title)) },
navigationIcon = { MenuButton(openMenu) }, navigationIcon = { MenuButton(openMenu) },
actions = { SettingsButton(navigateToSettings) }, actions = { SettingsButton(navigateToSettings) },

View File

@ -1,6 +1,6 @@
/* /*
* Unitto is a unit converter for Android * Unitto is a unit converter for Android
* Copyright (c) 2023 Elshan Agaev * Copyright (c) 2023-2024 Elshan Agaev
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -25,7 +25,7 @@ import androidx.navigation.NavHostController
import androidx.navigation.NavType import androidx.navigation.NavType
import androidx.navigation.navArgument import androidx.navigation.navArgument
import androidx.navigation.navDeepLink import androidx.navigation.navDeepLink
import com.sadellie.unitto.core.ui.common.UnittoEmptyScreen import com.sadellie.unitto.core.ui.common.EmptyScreen
import com.sadellie.unitto.core.ui.model.DrawerItem import com.sadellie.unitto.core.ui.model.DrawerItem
import com.sadellie.unitto.core.ui.unittoComposable import com.sadellie.unitto.core.ui.unittoComposable
import com.sadellie.unitto.core.ui.unittoNavigation import com.sadellie.unitto.core.ui.unittoNavigation
@ -63,7 +63,7 @@ fun NavGraphBuilder.timeZoneGraph(
) { ) {
unittoComposable(start) { unittoComposable(start) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
UnittoEmptyScreen() EmptyScreen()
return@unittoComposable return@unittoComposable
} }
@ -85,7 +85,7 @@ fun NavGraphBuilder.timeZoneGraph(
) )
) { stackEntry -> ) { stackEntry ->
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
UnittoEmptyScreen() EmptyScreen()
return@unittoComposable return@unittoComposable
} }