Skip to content

Commit 5d9d5ec

Browse files
FerfouiFerfoui
committed
Add new distance units
1 parent 04c1a35 commit 5d9d5ec

File tree

6 files changed

+28
-7
lines changed

6 files changed

+28
-7
lines changed

‎app/src/main/java/fr/ferfoui/america2goat/Constants.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,16 @@ public class Constants {
1818

1919

2020
// Conversion factors
21+
public static final double KILOMETER_TO_METER = 1000d;
22+
public static final double CM_TO_METER = 0.01d;
23+
public static final double MILE_TO_METER = 1609.344d;
24+
public static final double YARD_TO_METER = 0.9144d;
2125
public static final double INCH_TO_METER = 0.0254d;
2226
public static final double FEET_TO_METER = 12 * INCH_TO_METER;
23-
public static final double CM_TO_METER = 0.01d;
2427

28+
public static final double KILOGRAM_TO_GRAM = 1000d;
2529
public static final double POUND_TO_GRAM = 453.59237d;
2630
public static final double OUNCE_TO_GRAM = POUND_TO_GRAM / 16d;
27-
public static final double KILOGRAM_TO_GRAM = 1000d;
2831

2932
public static final double CUBIC_METER_TO_LITER = 1000d;
3033
public static final double MILLILITER_TO_LITER = 0.001d;

‎app/src/main/java/fr/ferfoui/america2goat/unit/DistanceUnit.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77
* Enum representing the distance units.
88
*/
99
public enum DistanceUnit implements Unit {
10+
KILOMETER(Constants.KILOMETER_TO_METER, R.string.kilometer, R.string.kilometer_abbreviation),
1011
METER(1d, R.string.meter, R.string.meter_abbreviation),
1112
CENTIMETER(Constants.CM_TO_METER, R.string.centimeter, R.string.centimeter_abbreviation),
12-
INCH(Constants.INCH_TO_METER, R.string.inch, R.string.inch_abbreviation),
13-
FOOT(Constants.FEET_TO_METER, R.string.foot, R.string.foot_abbreviation);
13+
MILE(Constants.MILE_TO_METER, R.string.mile, R.string.mile_abbreviation),
14+
YARD(Constants.YARD_TO_METER, R.string.yard, R.string.yard_abbreviation),
15+
FOOT(Constants.FEET_TO_METER, R.string.foot, R.string.foot_abbreviation),
16+
INCH(Constants.INCH_TO_METER, R.string.inch, R.string.inch_abbreviation);
1417

1518
private final double factor;
1619
private final int resourceNameId;

‎app/src/main/res/values-fr/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,7 @@
3535
<string name="cup">tasse</string>
3636
<string name="fluid_ounce">once liquide</string>
3737
<string name="volume_unit_name">volume</string>
38+
<string name="kilometer">kilomètre</string>
39+
<string name="mile">mile</string>
40+
<string name="yard">yard</string>
3841
</resources>

‎app/src/main/res/values-zh-rTW/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,7 @@
3535
<string name="cup">杯</string>
3636
<string name="fluid_ounce">液盎司</string>
3737
<string name="volume_unit_name">體積</string>
38+
<string name="kilometer">公里</string>
39+
<string name="mile">英里</string>
40+
<string name="yard">码</string>
3841
</resources>

‎app/src/main/res/values-zh/strings.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,7 @@
3535
<string name="cup">杯</string>
3636
<string name="fluid_ounce">液盎司</string>
3737
<string name="volume_unit_name">体积</string>
38+
<string name="kilometer">公里</string>
39+
<string name="mile">英里</string>
40+
<string name="yard">码</string>
3841
</resources>

‎app/src/main/res/values/strings.xml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@
66
<string name="title_app_info">App</string>
77
<string name="conversion_output" translatable="false">0</string>
88
<string name="unit">unit</string>
9+
<string name="kilometer_abbreviation" translatable="false">km</string>
910
<string name="meter_abbreviation" translatable="false">m</string>
1011
<string name="centimeter_abbreviation" translatable="false">cm</string>
11-
<string name="inch_abbreviation" translatable="false">in</string>
12+
<string name="mile_abbreviation" translatable="false">mi</string>
13+
<string name="yard_abbreviation" translatable="false">yd</string>
1214
<string name="foot_abbreviation" translatable="false">ft</string>
13-
<string name="gram_abbreviation" translatable="false">g</string>
15+
<string name="inch_abbreviation" translatable="false">in</string>
1416
<string name="kilogram_abbreviation" translatable="false">kg</string>
17+
<string name="gram_abbreviation" translatable="false">g</string>
1518
<string name="pound_abbreviation" translatable="false">lb</string>
1619
<string name="ounce_abbreviation" translatable="false">oz</string>
1720
<string name="cubic_meter_abbreviation" translatable="false">m³</string>
@@ -22,12 +25,15 @@
2225
<string name="pint_abbreviation" translatable="false">pt</string>
2326
<string name="cup_abbreviation" translatable="false">cup</string>
2427
<string name="fluid_ounce_abbreviation" translatable="false">fl oz</string>
28+
<string name="kilometer">kilometer</string>
2529
<string name="meter">meter</string>
2630
<string name="centimeter">centimeter</string>
31+
<string name="mile">mile</string>
32+
<string name="yard">yard</string>
2733
<string name="inch">inch</string>
2834
<string name="foot">foot</string>
29-
<string name="gram">gram</string>
3035
<string name="kilogram">kilogram</string>
36+
<string name="gram">gram</string>
3137
<string name="pound">pound</string>
3238
<string name="ounce">ounce</string>
3339
<string name="cubic_meter">cubic meter</string>

0 commit comments

Comments
 (0)