Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add binary prefixes for digital storage #90

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Add binary prefixes for digital storage #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7534c7
Make getStorageConversions() more readable and make bit the base unit
gkaklas Sep 4, 2017
1e4ea25
Add strings for storage binary prefixes
gkaklas Sep 4, 2017
0cf859a
Add binary prefixes for storage
gkaklas Sep 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions app/src/main/java/com/physphil/android/unitconverterultimate/models/Unit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
30 changes: 19 additions & 11 deletions app/src/main/java/com/physphil/android/unitconverterultimate/util/Conversions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,18 +173,26 @@ public void updateCurrencyConversions(Context context) {
}

private void getStorageConversions() {
//Base Unit = megabyte
//Base Unit = bit
List<Unit> units = new ArrayList<Unit>();
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(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));
}

Expand Down
8 changes: 8 additions & 0 deletions app/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,20 @@
<string name="Byte">Byte</string>
<string name="kilobit">Kilobit</string>
<string name="kilobyte">Kilobyte</string>
<string name="kibibit">Kibibit</string>
<string name="kibibyte">Kibibyte</string>
<string name="megabit">Megabit</string>
<string name="megabyte">Megabyte</string>
<string name="mebibit">Mebibit</string>
<string name="mebibyte">Mebibyte</string>
<string name="gigabit">Gigabit</string>
<string name="gigabyte">Gigabyte</string>
<string name="gibibit">Gibibit</string>
<string name="gibibyte">Gibibyte</string>
<string name="terabit">Terabit</string>
<string name="terabyte">Terabyte</string>
<string name="tebibit">Tebibit</string>
<string name="tebibyte">Tebibyte</string>

<!-- Energy -->
<string name="joule">Joule</string>
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/res/values-es/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,20 @@
<string name="Byte">Byte</string>
<string name="kilobit">Kilobit</string>
<string name="kilobyte">Kilobyte</string>
<string name="kibibit">Kibibit</string>
<string name="kibibyte">Kibibyte</string>
<string name="megabit">Megabit</string>
<string name="megabyte">Megabyte</string>
<string name="mebibit">Mebibit</string>
<string name="mebibyte">Mebibyte</string>
<string name="gigabit">Gigabit</string>
<string name="gigabyte">Gigabyte</string>
<string name="gibibit">Gibibit</string>
<string name="gibibyte">Gibibyte</string>
<string name="terabit">Terabit</string>
<string name="terabyte">Terabyte</string>
<string name="tebibit">Tebibit</string>
<string name="tebibyte">Tebibyte</string>

<!-- Energy -->
<string name="joule">Julio</string>
Expand Down
10 changes: 9 additions & 1 deletion app/src/main/res/values-fa/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,20 @@
<string name="Byte">بایت</string>
<string name="kilobit">کیلوبیت</string>
<string name="kilobyte">کیلوبایت</string>
<string name="kibibit">Kibibit</string>
<string name="kibibyte">Kibibyte</string>
<string name="megabit">مگابیت</string>
<string name="megabyte">مگابایت</string>
<string name="mebibit">Mebibit</string>
<string name="mebibyte">Mebibyte</string>
<string name="gigabit">گیگابیت</string>
<string name="gigabyte">گیگابایت</string>
<string name="gibibit">Gibibit</string>
<string name="gibibyte">Gibibyte</string>
<string name="terabit">ترابیت</string>
<string name="terabyte">ترابایت</string>
<string name="tebibit">Tebibit</string>
<string name="tebibyte">Tebibyte</string>

<!-- انرژی -->
<string name="joule">ژول</string>
Expand Down Expand Up @@ -265,4 +273,4 @@
<string name="usd">دلار آمریکا</string>
<string name="zar">رند آفریقای جنوبی</string>

</resources>
</resources>
8 changes: 8 additions & 0 deletions app/src/main/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,20 @@
<string name="Byte">Byte</string>
<string name="kilobit">Kilobit</string>
<string name="kilobyte">Kilobyte</string>
<string name="kibibit">Kibibit</string>
<string name="kibibyte">Kibibyte</string>
<string name="megabit">Mégabit</string>
<string name="megabyte">Mégabyte</string>
<string name="mebibit">Mebibit</string>
<string name="mebibyte">Mebibyte</string>
<string name="gigabit">Gigabit</string>
<string name="gigabyte">Gigabyte</string>
<string name="gibibit">Gibibit</string>
<string name="gibibyte">Gibibyte</string>
<string name="terabit">Térabit</string>
<string name="terabyte">Térabyte</string>
<string name="tebibit">Tebibit</string>
<string name="tebibyte">Tebibyte</string>

<!-- Energy -->
<string name="joule">Joule</string>
Expand Down
10 changes: 9 additions & 1 deletion app/src/main/res/values-hr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,20 @@
<string name="Byte">Bajt</string>
<string name="kilobit">Kilobit</string>
<string name="kilobyte">Kilobajt</string>
<string name="kibibit">Kibibit</string>
<string name="kibibyte">Kibibyte</string>
<string name="megabit">Megabit</string>
<string name="megabyte">Megabajt</string>
<string name="mebibit">Mebibit</string>
<string name="mebibyte">Mebibyte</string>
<string name="gigabit">Gigabit</string>
<string name="gigabyte">Gigabajt</string>
<string name="gibibit">Gibibit</string>
<string name="gibibyte">Gibibyte</string>
<string name="terabit">Terabit</string>
<string name="terabyte">Terabajt</string>
<string name="tebibit">Tebibit</string>
<string name="tebibyte">Tebibyte</string>

<!-- Energy -->
<string name="joule">Džul</string>
Expand Down Expand Up @@ -265,4 +273,4 @@
<string name="usd">Američki dolar</string>
<string name="zar">Južnoafrički rand</string>

</resources>
</resources>
8 changes: 8 additions & 0 deletions app/src/main/res/values-hu/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,20 @@
<string name="Byte">Byte</string>
<string name="kilobit">Kilobit</string>
<string name="kilobyte">Kilobyte</string>
<string name="kibibit">Kibibit</string>
<string name="kibibyte">Kibibyte</string>
<string name="megabit">Megabit</string>
<string name="megabyte">Megabyte</string>
<string name="mebibit">Mebibit</string>
<string name="mebibyte">Mebibyte</string>
<string name="gigabit">Gigabit</string>
<string name="gigabyte">Gigabyte</string>
<string name="gibibit">Gibibit</string>
<string name="gibibyte">Gibibyte</string>
<string name="terabit">Terabit</string>
<string name="terabyte">Terabyte</string>
<string name="tebibit">Tebibit</string>
<string name="tebibyte">Tebibyte</string>

<!-- Energy -->
<string name="joule">Joule</string>
Expand Down
10 changes: 9 additions & 1 deletion app/src/main/res/values-ja/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,20 @@
<string name="Byte">バイト</string>
<string name="kilobit">キロビット</string>
<string name="kilobyte">キロバイト</string>
<string name="kibibit">Kibibit</string>
<string name="kibibyte">Kibibyte</string>
<string name="megabit">メガビット</string>
<string name="megabyte">メガバイト</string>
<string name="mebibit">Mebibit</string>
<string name="mebibyte">Mebibyte</string>
<string name="gigabit">ギガビット</string>
<string name="gigabyte">ギガバイト</string>
<string name="gibibit">Gibibit</string>
<string name="gibibyte">Gibibyte</string>
<string name="terabit">テラビット</string>
<string name="terabyte">テラバイト</string>
<string name="tebibit">Tebibit</string>
<string name="tebibyte">Tebibyte</string>

<!-- Energy -->
<string name="joule">ジュール</string>
Expand Down Expand Up @@ -265,4 +273,4 @@
<string name="usd">米ドル</string>
<string name="zar">南アフリカ・ランド</string>

</resources>
</resources>
10 changes: 9 additions & 1 deletion app/src/main/res/values-pt-rBR/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,20 @@
<string name="Byte">Byte</string>
<string name="kilobit">Kilobit</string>
<string name="kilobyte">Kilobyte</string>
<string name="kibibit">Kibibit</string>
<string name="kibibyte">Kibibyte</string>
<string name="megabit">Megabit</string>
<string name="megabyte">Megabyte</string>
<string name="mebibit">Mebibit</string>
<string name="mebibyte">Mebibyte</string>
<string name="gigabit">Gigabit</string>
<string name="gigabyte">Gigabyte</string>
<string name="gibibit">Gibibit</string>
<string name="gibibyte">Gibibyte</string>
<string name="terabit">Terabit</string>
<string name="terabyte">Terabyte</string>
<string name="tebibit">Tebibit</string>
<string name="tebibyte">Tebibyte</string>

<!-- Energia -->
<string name="joule">Joule</string>
Expand Down Expand Up @@ -267,4 +275,4 @@
<string name="usd">Dólar dos Estados Unidos</string>
<string name="zar">Rand Sul Africano</string>

</resources>
</resources>
10 changes: 9 additions & 1 deletion app/src/main/res/values-ru/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,20 @@
<string name="Byte">Байт</string>
<string name="kilobit">Килобит</string>
<string name="kilobyte">Килобайт</string>
<string name="kibibit">Kibibit</string>
<string name="kibibyte">Kibibyte</string>
<string name="megabit">Мегабит</string>
<string name="megabyte">Мегабайт</string>
<string name="mebibit">Mebibit</string>
<string name="mebibyte">Mebibyte</string>
<string name="gigabit">Гигабит</string>
<string name="gigabyte">Гигабайт</string>
<string name="gibibit">Gibibit</string>
<string name="gibibyte">Gibibyte</string>
<string name="terabit">Терабит</string>
<string name="terabyte">Терабайт</string>
<string name="tebibit">Tebibit</string>
<string name="tebibyte">Tebibyte</string>

<!-- Energy -->
<string name="joule">Джоуль</string>
Expand Down Expand Up @@ -265,4 +273,4 @@
<string name="usd">Доллар США</string>
<string name="zar">Южноафриканский рэнд</string>

</resources>
</resources>
10 changes: 9 additions & 1 deletion app/src/main/res/values-tr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,20 @@
<string name="Byte">Bayt</string>
<string name="kilobit">Kilobit</string>
<string name="kilobyte">Kilobayt</string>
<string name="kibibit">Kibibit</string>
<string name="kibibyte">Kibibyte</string>
<string name="megabit">Megabit</string>
<string name="megabyte">Megabayt</string>
<string name="mebibit">Mebibit</string>
<string name="mebibyte">Mebibyte</string>
<string name="gigabit">Gigabit</string>
<string name="gigabyte">Gigabayt</string>
<string name="gibibit">Gibibit</string>
<string name="gibibyte">Gibibyte</string>
<string name="terabit">Terabit</string>
<string name="terabyte">Terabayt</string>
<string name="tebibit">Tebibit</string>
<string name="tebibyte">Tebibyte</string>

<!-- Energy -->
<string name="joule">Jul</string>
Expand Down Expand Up @@ -265,4 +273,4 @@
<string name="usd">Amerikan Doları</string>
<string name="zar">Güney Afrika Randı</string>

</resources>
</resources>
8 changes: 8 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,20 @@
<string name="Byte">Byte</string>
<string name="kilobit">Kilobit</string>
<string name="kilobyte">Kilobyte</string>
<string name="kibibit">Kibibit</string>
<string name="kibibyte">Kibibyte</string>
<string name="megabit">Megabit</string>
<string name="megabyte">Megabyte</string>
<string name="mebibit">Mebibit</string>
<string name="mebibyte">Mebibyte</string>
<string name="gigabit">Gigabit</string>
<string name="gigabyte">Gigabyte</string>
<string name="gibibit">Gibibit</string>
<string name="gibibyte">Gibibyte</string>
<string name="terabit">Terabit</string>
<string name="terabyte">Terabyte</string>
<string name="tebibit">Tebibit</string>
<string name="tebibyte">Tebibyte</string>

<!-- Energy -->
<string name="joule">Joule</string>
Expand Down