From 56d49e75c99eacfa509a080c5fbd91b37cf961de Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Thu, 14 Apr 2022 21:11:50 +0300 Subject: [PATCH] Added new units --- .../java/com/sadellie/unitto/data/units/MyUnitIDS.kt | 10 ++++++++++ .../unitto/data/units/collections/DataTransfer.kt | 4 +++- .../sadellie/unitto/data/units/collections/FileSize.kt | 4 +++- .../com/sadellie/unitto/data/units/collections/Time.kt | 1 + app/src/main/res/values/strings.xml | 10 ++++++++++ 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt b/app/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt index f146761f..8b436af6 100644 --- a/app/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt +++ b/app/src/main/java/com/sadellie/unitto/data/units/MyUnitIDS.kt @@ -1,5 +1,10 @@ package com.sadellie.unitto.data.units +/** + * All UnitIDs. Long file. + * + * NEVER CHANGE IDS THAT ARE ALREADY HERE, THESE IDS ARE USED IN DATABASE + */ object MyUnitIDS { // LENGTH @@ -70,6 +75,7 @@ object MyUnitIDS { const val kibibit = "kibibit" const val kilobit = "kilobit" const val megabit = "megabit" + const val mebibit = "mebibit" const val gigabit = "gigabit" const val terabit = "terabit" const val petabit = "petabit" @@ -78,6 +84,7 @@ object MyUnitIDS { const val kibibyte = "kibibyte" const val kilobyte = "kilobyte" const val megabyte = "megabyte" + const val mebibyte = "mebibyte" const val gigabyte = "gigabyte" const val terabyte = "terabyte" const val petabyte = "petabyte" @@ -111,6 +118,7 @@ object MyUnitIDS { const val nanosecond = "nanosecond" const val microsecond = "microsecond" const val millisecond = "millisecond" + const val jiffy = "jiffy" const val second = "second" const val minute = "minute" const val hour = "hour" @@ -167,6 +175,7 @@ object MyUnitIDS { const val kibibit_per_second = "kibibit_per_second" const val kilobit_per_second = "kilobit_per_second" const val megabit_per_second = "megabit_per_second" + const val mebibit_per_second = "mebibit_per_second" const val gigabit_per_second = "gigabit_per_second" const val terabit_per_second = "terabit_per_second" const val petabit_per_second = "petabit_per_second" @@ -175,6 +184,7 @@ object MyUnitIDS { const val kibibyte_per_second = "kibibyte_per_second" const val kilobyte_per_second = "kilobyte_per_second" const val megabyte_per_second = "megabyte_per_second" + const val mebibyte_per_second = "mebibyte_per_second" const val gigabyte_per_second = "gigabyte_per_second" const val terabyte_per_second = "terabyte_per_second" const val petabyte_per_second = "petabyte_per_second" diff --git a/app/src/main/java/com/sadellie/unitto/data/units/collections/DataTransfer.kt b/app/src/main/java/com/sadellie/unitto/data/units/collections/DataTransfer.kt index c8bdca5b..88a9a68a 100644 --- a/app/src/main/java/com/sadellie/unitto/data/units/collections/DataTransfer.kt +++ b/app/src/main/java/com/sadellie/unitto/data/units/collections/DataTransfer.kt @@ -13,6 +13,7 @@ val DATA_TRANSFER_COLLECTION: List by lazy { MyUnit(MyUnitIDS.kibibit_per_second, BigDecimal.valueOf(1_024), UnitGroup.DATA_TRANSFER, R.string.kibibit_per_second, R.string.kibibit_per_second_short), MyUnit(MyUnitIDS.kilobit_per_second, BigDecimal.valueOf(1_000), UnitGroup.DATA_TRANSFER, R.string.kilobit_per_second, R.string.kilobit_per_second_short), MyUnit(MyUnitIDS.megabit_per_second, BigDecimal.valueOf(1_000_000), UnitGroup.DATA_TRANSFER, R.string.megabit_per_second, R.string.megabit_per_second_short), + MyUnit(MyUnitIDS.mebibit_per_second, BigDecimal.valueOf(1_048_576), UnitGroup.DATA_TRANSFER, R.string.mebibit_per_second, R.string.mebibit_per_second_short), MyUnit(MyUnitIDS.gigabit_per_second, BigDecimal.valueOf(1_000_000_000), UnitGroup.DATA_TRANSFER, R.string.gigabit_per_second, R.string.gigabit_per_second_short), MyUnit(MyUnitIDS.terabit_per_second, BigDecimal.valueOf(1_000_000_000_000), UnitGroup.DATA_TRANSFER, R.string.terabit_per_second, R.string.terabit_per_second_short), MyUnit(MyUnitIDS.petabit_per_second, BigDecimal.valueOf(1_000_000_000_000_000), UnitGroup.DATA_TRANSFER, R.string.petabit_per_second, R.string.petabit_per_second_short), @@ -21,9 +22,10 @@ val DATA_TRANSFER_COLLECTION: List by lazy { MyUnit(MyUnitIDS.kibibyte_per_second, BigDecimal.valueOf(8_192), UnitGroup.DATA_TRANSFER, R.string.kibibyte_per_second, R.string.kibibyte_per_second_short), MyUnit(MyUnitIDS.kilobyte_per_second, BigDecimal.valueOf(8_000), UnitGroup.DATA_TRANSFER, R.string.kilobyte_per_second, R.string.kilobyte_per_second_short), MyUnit(MyUnitIDS.megabyte_per_second, BigDecimal.valueOf(8_000_000), UnitGroup.DATA_TRANSFER, R.string.megabyte_per_second, R.string.megabyte_per_second_short), + MyUnit(MyUnitIDS.mebibyte_per_second, BigDecimal.valueOf(8_388_608), UnitGroup.DATA_TRANSFER, R.string.mebibyte_per_second, R.string.mebibyte_per_second_short), MyUnit(MyUnitIDS.gigabyte_per_second, BigDecimal.valueOf(8_000_000_000), UnitGroup.DATA_TRANSFER, R.string.gigabyte_per_second, R.string.gigabyte_per_second_short), MyUnit(MyUnitIDS.terabyte_per_second, BigDecimal.valueOf(8_000_000_000_000), UnitGroup.DATA_TRANSFER, R.string.terabyte_per_second, R.string.terabyte_per_second_short), MyUnit(MyUnitIDS.petabyte_per_second, BigDecimal.valueOf(8_000_000_000_000_000), UnitGroup.DATA_TRANSFER, R.string.petabyte_per_second, R.string.petabyte_per_second_short), MyUnit(MyUnitIDS.exabyte_per_second, BigDecimal.valueOf(8_000_000_000_000_000_000), UnitGroup.DATA_TRANSFER, R.string.exabyte_per_second, R.string.exabyte_per_second_short), ) -} +} \ No newline at end of file diff --git a/app/src/main/java/com/sadellie/unitto/data/units/collections/FileSize.kt b/app/src/main/java/com/sadellie/unitto/data/units/collections/FileSize.kt index 888b5e98..dc10e339 100644 --- a/app/src/main/java/com/sadellie/unitto/data/units/collections/FileSize.kt +++ b/app/src/main/java/com/sadellie/unitto/data/units/collections/FileSize.kt @@ -13,6 +13,7 @@ val DATA_COLLECTION: List by lazy { MyUnit(MyUnitIDS.kibibit, BigDecimal.valueOf(1_024), UnitGroup.DATA, R.string.kibibit, R.string.kibibit_short), MyUnit(MyUnitIDS.kilobit, BigDecimal.valueOf(1_000), UnitGroup.DATA, R.string.kilobit, R.string.kilobit_short), MyUnit(MyUnitIDS.megabit, BigDecimal.valueOf(1_000_000), UnitGroup.DATA, R.string.megabit, R.string.megabit_short), + MyUnit(MyUnitIDS.mebibit, BigDecimal.valueOf(1_048_576), UnitGroup.DATA, R.string.mebibit, R.string.mebibit_short), MyUnit(MyUnitIDS.gigabit, BigDecimal.valueOf(1_000_000_000), UnitGroup.DATA, R.string.gigabit, R.string.gigabit_short), MyUnit(MyUnitIDS.terabit, BigDecimal.valueOf(1_000_000_000_000), UnitGroup.DATA, R.string.terabit, R.string.terabit_short), MyUnit(MyUnitIDS.petabit, BigDecimal.valueOf(1_000_000_000_000_000), UnitGroup.DATA, R.string.petabit, R.string.petabit_short), @@ -21,9 +22,10 @@ val DATA_COLLECTION: List by lazy { MyUnit(MyUnitIDS.kibibyte, BigDecimal.valueOf(8_192), UnitGroup.DATA, R.string.kibibyte, R.string.kibibyte_short), MyUnit(MyUnitIDS.kilobyte, BigDecimal.valueOf(8_000), UnitGroup.DATA, R.string.kilobyte, R.string.kilobyte_short), MyUnit(MyUnitIDS.megabyte, BigDecimal.valueOf(8_000_000), UnitGroup.DATA, R.string.megabyte, R.string.megabyte_short), + MyUnit(MyUnitIDS.mebibyte, BigDecimal.valueOf(8_388_608), UnitGroup.DATA, R.string.mebibyte, R.string.mebibyte_short), MyUnit(MyUnitIDS.gigabyte, BigDecimal.valueOf(8_000_000_000), UnitGroup.DATA, R.string.gigabyte, R.string.gigabyte_short), MyUnit(MyUnitIDS.terabyte, BigDecimal.valueOf(8_000_000_000_000), UnitGroup.DATA, R.string.terabyte, R.string.terabyte_short), MyUnit(MyUnitIDS.petabyte, BigDecimal.valueOf(8_000_000_000_000_000), UnitGroup.DATA, R.string.petabyte, R.string.petabyte_short), MyUnit(MyUnitIDS.exabyte, BigDecimal.valueOf(8_000_000_000_000_000_000), UnitGroup.DATA, R.string.exabyte, R.string.exabyte_short), ) -} +} \ No newline at end of file diff --git a/app/src/main/java/com/sadellie/unitto/data/units/collections/Time.kt b/app/src/main/java/com/sadellie/unitto/data/units/collections/Time.kt index 5a4d93a2..cfb63895 100644 --- a/app/src/main/java/com/sadellie/unitto/data/units/collections/Time.kt +++ b/app/src/main/java/com/sadellie/unitto/data/units/collections/Time.kt @@ -13,6 +13,7 @@ val TIME_COLLECTION: List by lazy { MyUnit(MyUnitIDS.nanosecond, BigDecimal.valueOf(1_000_000_000), UnitGroup.TIME, R.string.nanosecond, R.string.nanosecond_short), MyUnit(MyUnitIDS.microsecond, BigDecimal.valueOf(1_000_000_000_000), UnitGroup.TIME, R.string.microsecond, R.string.microsecond_short), MyUnit(MyUnitIDS.millisecond, BigDecimal.valueOf(1_000_000_000_000_000), UnitGroup.TIME, R.string.millisecond, R.string.millisecond_short), + MyUnit(MyUnitIDS.jiffy, BigDecimal.valueOf(10_000_000_000_000_000), UnitGroup.TIME, R.string.jiffy, R.string.jiffy_short), MyUnit(MyUnitIDS.second, BigDecimal.valueOf(1_000_000_000_000_000_000), UnitGroup.TIME, R.string.second, R.string.second_short), MyUnit(MyUnitIDS.minute, BigDecimal.valueOf(60_000_000_000_000_000_000.0), UnitGroup.TIME, R.string.minute, R.string.minute_short), MyUnit(MyUnitIDS.hour, BigDecimal.valueOf(3_600_000_000_000_000_000_000.0), UnitGroup.TIME, R.string.hour, R.string.hour_short), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 83df0c87..ebb9c54e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -128,6 +128,8 @@ Kb Megabit Mb + Mebibit + Mib Gigabit Gb Terabit @@ -144,6 +146,8 @@ KB Megabyte MB + Mebibyte + MiB Gigabyte GB Terabyte @@ -162,6 +166,8 @@ Kb/s Megabit per second Mb/s + Mebibit per second + Mib/s Gigabit per second Gb/s Terabit per second @@ -178,6 +184,8 @@ KB/s Megabyte per second MB/s + Mebibyte per second + MiB/s Gigabyte per second GB/s Terabyte per second @@ -240,6 +248,8 @@ µs Millisecond ms + Jiffy + j Second s Minute