From b7534c749527affda0805328056e655b718238e2 Mon Sep 17 00:00:00 2001 From: George Kaklamanos Date: Mon, 4 Sep 2017 22:12:24 +0300 Subject: [PATCH 1/3] Make getStorageConversions() more readable and make bit the base unit --- .../util/Conversions.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/physphil/android/unitconverterultimate/util/Conversions.java b/app/src/main/java/com/physphil/android/unitconverterultimate/util/Conversions.java index bc3856f5..32fd4add 100644 --- a/app/src/main/java/com/physphil/android/unitconverterultimate/util/Conversions.java +++ b/app/src/main/java/com/physphil/android/unitconverterultimate/util/Conversions.java @@ -173,18 +173,18 @@ public void updateCurrencyConversions(Context context) { } private void getStorageConversions() { - //Base Unit = megabyte + //Base Unit = bit List units = new ArrayList(); - units.add(new Unit(BIT, R.string.bit, 0.00000011920928955078, 8388608.0)); - units.add(new Unit(BYTE, R.string.Byte, 0.00000095367431640625, 1048576.0)); - units.add(new Unit(KILOBIT, R.string.kilobit, 0.0001220703125, 8192.0)); - units.add(new Unit(KILOBYTE, R.string.kilobyte, 0.0009765625, 1024.0)); - units.add(new Unit(MEGABIT, R.string.megabit, 0.125, 8.0)); - units.add(new Unit(MEGABYTE, R.string.megabyte, 1.0, 1.0)); - units.add(new Unit(GIGABIT, R.string.gigabit, 128.0, 0.0078125)); - units.add(new Unit(GIGABYTE, R.string.gigabyte, 1024.0, 0.0009765625)); - units.add(new Unit(TERABIT, R.string.terabit, 131072.0, 0.00000762939453125)); - units.add(new Unit(TERABYTE, R.string.terabyte, 1048576.0, 0.00000095367431640625)); + units.add(new Unit(BIT, R.string.bit, 1.0*1, 1.0/(1.0*1))); + units.add(new Unit(BYTE, R.string.Byte, 8.0*1, 1.0/(8.0*1))); + units.add(new Unit(KILOBIT, R.string.kilobit, 1.0*1000, 1.0/(1.0*1000))); + units.add(new Unit(KILOBYTE, R.string.kilobyte, 8.0*1000, 1.0/(8.0*1000))); + units.add(new Unit(MEGABIT, R.string.megabit, 1.0*1000*1000, 1.0/(1.0*1000*1000))); + units.add(new Unit(MEGABYTE, R.string.megabyte, 8.0*1000*1000, 1.0/(8.0*1000*1000))); + units.add(new Unit(GIGABIT, R.string.gigabit, 1.0*1000*1000*1000, 1.0/(1.0*1000*1000*1000))); + units.add(new Unit(GIGABYTE, R.string.gigabyte, 8.0*1000*1000*1000, 1.0/(8.0*1000*1000*1000))); + units.add(new Unit(TERABIT, R.string.terabit, 1.0*1000*1000*1000*1000, 1.0/(1.0*1000*1000*1000*1000))); + units.add(new Unit(TERABYTE, R.string.terabyte, 8.0*1000*1000*1000*1000, 1.0/(8.0*1000*1000*1000*1000))); addConversion(Conversion.STORAGE, new Conversion(Conversion.STORAGE, R.string.storage, units)); } From 1e4ea2568d66a584bcbdde27a89af77c1f800d68 Mon Sep 17 00:00:00 2001 From: George Kaklamanos Date: Tue, 5 Sep 2017 00:26:42 +0300 Subject: [PATCH 2/3] Add strings for storage binary prefixes --- app/src/main/res/values-de/strings.xml | 8 ++++++++ app/src/main/res/values-es/strings.xml | 8 ++++++++ app/src/main/res/values-fa/strings.xml | 10 +++++++++- app/src/main/res/values-fr/strings.xml | 8 ++++++++ app/src/main/res/values-hr/strings.xml | 10 +++++++++- app/src/main/res/values-hu/strings.xml | 8 ++++++++ app/src/main/res/values-ja/strings.xml | 10 +++++++++- app/src/main/res/values-pt-rBR/strings.xml | 10 +++++++++- app/src/main/res/values-ru/strings.xml | 10 +++++++++- app/src/main/res/values-tr/strings.xml | 10 +++++++++- app/src/main/res/values/strings.xml | 8 ++++++++ 11 files changed, 94 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 26f35053..99fb49a1 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -102,12 +102,20 @@ Byte Kilobit Kilobyte + Kibibit + Kibibyte Megabit Megabyte + Mebibit + Mebibyte Gigabit Gigabyte + Gibibit + Gibibyte Terabit Terabyte + Tebibit + Tebibyte Joule diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 22e93b9a..ad624c43 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -102,12 +102,20 @@ Byte Kilobit Kilobyte + Kibibit + Kibibyte Megabit Megabyte + Mebibit + Mebibyte Gigabit Gigabyte + Gibibit + Gibibyte Terabit Terabyte + Tebibit + Tebibyte Julio diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 810628df..93c3ca57 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -102,12 +102,20 @@ بایت کیلوبیت کیلوبایت + Kibibit + Kibibyte مگابیت مگابایت + Mebibit + Mebibyte گیگابیت گیگابایت + Gibibit + Gibibyte ترابیت ترابایت + Tebibit + Tebibyte ژول @@ -265,4 +273,4 @@ دلار آمریکا رند آفریقای جنوبی - \ No newline at end of file + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 6a8c742d..04c50e89 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -102,12 +102,20 @@ Byte Kilobit Kilobyte + Kibibit + Kibibyte Mégabit Mégabyte + Mebibit + Mebibyte Gigabit Gigabyte + Gibibit + Gibibyte Térabit Térabyte + Tebibit + Tebibyte Joule diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 9dfbf04b..e38668a1 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -102,12 +102,20 @@ Bajt Kilobit Kilobajt + Kibibit + Kibibyte Megabit Megabajt + Mebibit + Mebibyte Gigabit Gigabajt + Gibibit + Gibibyte Terabit Terabajt + Tebibit + Tebibyte Džul @@ -265,4 +273,4 @@ Američki dolar Južnoafrički rand - \ No newline at end of file + diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 48a8da0d..4bef28fb 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -102,12 +102,20 @@ Byte Kilobit Kilobyte + Kibibit + Kibibyte Megabit Megabyte + Mebibit + Mebibyte Gigabit Gigabyte + Gibibit + Gibibyte Terabit Terabyte + Tebibit + Tebibyte Joule diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 0ab71c97..071ccb4d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -102,12 +102,20 @@ バイト キロビット キロバイト + Kibibit + Kibibyte メガビット メガバイト + Mebibit + Mebibyte ギガビット ギガバイト + Gibibit + Gibibyte テラビット テラバイト + Tebibit + Tebibyte ジュール @@ -265,4 +273,4 @@ 米ドル 南アフリカ・ランド - \ No newline at end of file + diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 45f9ea99..aca83a2f 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -103,12 +103,20 @@ Byte Kilobit Kilobyte + Kibibit + Kibibyte Megabit Megabyte + Mebibit + Mebibyte Gigabit Gigabyte + Gibibit + Gibibyte Terabit Terabyte + Tebibit + Tebibyte Joule @@ -267,4 +275,4 @@ Dólar dos Estados Unidos Rand Sul Africano - \ No newline at end of file + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 2b703f8e..24c77d18 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -102,12 +102,20 @@ Байт Килобит Килобайт + Kibibit + Kibibyte Мегабит Мегабайт + Mebibit + Mebibyte Гигабит Гигабайт + Gibibit + Gibibyte Терабит Терабайт + Tebibit + Tebibyte Джоуль @@ -265,4 +273,4 @@ Доллар США Южноафриканский рэнд - \ No newline at end of file + diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index d320b893..9b0c9da6 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -102,12 +102,20 @@ Bayt Kilobit Kilobayt + Kibibit + Kibibyte Megabit Megabayt + Mebibit + Mebibyte Gigabit Gigabayt + Gibibit + Gibibyte Terabit Terabayt + Tebibit + Tebibyte Jul @@ -265,4 +273,4 @@ Amerikan Doları Güney Afrika Randı - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d7e26337..95a5ef58 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -102,12 +102,20 @@ Byte Kilobit Kilobyte + Kibibit + Kibibyte Megabit Megabyte + Mebibit + Mebibyte Gigabit Gigabyte + Gibibit + Gibibyte Terabit Terabyte + Tebibit + Tebibyte Joule From 0cf859a07da28418de493541facdbc0d8fde680c Mon Sep 17 00:00:00 2001 From: George Kaklamanos Date: Tue, 5 Sep 2017 00:37:31 +0300 Subject: [PATCH 3/3] Add binary prefixes for storage --- .../unitconverterultimate/models/Unit.java | 20 +++++++++++++------ .../util/Conversions.java | 8 ++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/physphil/android/unitconverterultimate/models/Unit.java b/app/src/main/java/com/physphil/android/unitconverterultimate/models/Unit.java index f8e0bbb5..66b29430 100644 --- a/app/src/main/java/com/physphil/android/unitconverterultimate/models/Unit.java +++ b/app/src/main/java/com/physphil/android/unitconverterultimate/models/Unit.java @@ -71,12 +71,20 @@ public class Unit { public static final int BYTE = 101; public static final int KILOBIT = 102; public static final int KILOBYTE = 103; - public static final int MEGABIT = 104; - public static final int MEGABYTE = 105; - public static final int GIGABIT = 106; - public static final int GIGABYTE = 107; - public static final int TERABIT = 108; - public static final int TERABYTE = 109; + public static final int KIBIBIT = 104; + public static final int KIBIBYTE = 105; + public static final int MEGABIT = 106; + public static final int MEGABYTE = 107; + public static final int MEBIBIT = 108; + public static final int MEBIBYTE = 109; + public static final int GIGABIT = 110; + public static final int GIGABYTE = 111; + public static final int GIBIBIT = 112; + public static final int GIBIBYTE = 113; + public static final int TERABIT = 114; + public static final int TERABYTE = 115; + public static final int TEBIBIT = 116; + public static final int TEBIBYTE = 117; public static final int JOULE = 200; public static final int KILOJOULE = 201; diff --git a/app/src/main/java/com/physphil/android/unitconverterultimate/util/Conversions.java b/app/src/main/java/com/physphil/android/unitconverterultimate/util/Conversions.java index 32fd4add..d38ba547 100644 --- a/app/src/main/java/com/physphil/android/unitconverterultimate/util/Conversions.java +++ b/app/src/main/java/com/physphil/android/unitconverterultimate/util/Conversions.java @@ -179,12 +179,20 @@ private void getStorageConversions() { units.add(new Unit(BYTE, R.string.Byte, 8.0*1, 1.0/(8.0*1))); units.add(new Unit(KILOBIT, R.string.kilobit, 1.0*1000, 1.0/(1.0*1000))); units.add(new Unit(KILOBYTE, R.string.kilobyte, 8.0*1000, 1.0/(8.0*1000))); + units.add(new Unit(KIBIBIT, R.string.kibibit, 1.0*1024, 1.0/(1.0*1024))); + units.add(new Unit(KIBIBYTE, R.string.kibibyte, 8.0*1024, 1.0/(8.0*1024))); units.add(new Unit(MEGABIT, R.string.megabit, 1.0*1000*1000, 1.0/(1.0*1000*1000))); units.add(new Unit(MEGABYTE, R.string.megabyte, 8.0*1000*1000, 1.0/(8.0*1000*1000))); + units.add(new Unit(MEBIBIT, R.string.mebibit, 1.0*1024*1024, 1.0/(1.0*1024*1024))); + units.add(new Unit(MEBIBYTE, R.string.mebibyte, 8.0*1024*1024, 1.0/(8.0*1024*1024))); units.add(new Unit(GIGABIT, R.string.gigabit, 1.0*1000*1000*1000, 1.0/(1.0*1000*1000*1000))); units.add(new Unit(GIGABYTE, R.string.gigabyte, 8.0*1000*1000*1000, 1.0/(8.0*1000*1000*1000))); + units.add(new Unit(GIBIBIT, R.string.gibibit, 1.0*1024*1024*1024, 1.0/(1.0*1024*1024*1024))); + units.add(new Unit(GIBIBYTE, R.string.gibibyte, 8.0*1024*1024*1024, 1.0/(8.0*1024*1024*1024))); units.add(new Unit(TERABIT, R.string.terabit, 1.0*1000*1000*1000*1000, 1.0/(1.0*1000*1000*1000*1000))); units.add(new Unit(TERABYTE, R.string.terabyte, 8.0*1000*1000*1000*1000, 1.0/(8.0*1000*1000*1000*1000))); + units.add(new Unit(TEBIBIT, R.string.tebibit, 1.0*1024*1024*1024*1024, 1.0/(1.0*1024*1024*1024*1024))); + units.add(new Unit(TEBIBYTE, R.string.tebibyte, 8.0*1024*1024*1024*1024, 1.0/(8.0*1024*1024*1024*1024))); addConversion(Conversion.STORAGE, new Conversion(Conversion.STORAGE, R.string.storage, units)); }