diff --git a/app/src/main/java/de/klaushackner/breathalyzer/MainActivity.java b/app/src/main/java/de/klaushackner/breathalyzer/MainActivity.java index 862b06e..0450a32 100644 --- a/app/src/main/java/de/klaushackner/breathalyzer/MainActivity.java +++ b/app/src/main/java/de/klaushackner/breathalyzer/MainActivity.java @@ -32,7 +32,7 @@ import java.util.TimerTask; public class MainActivity extends AppCompatActivity { - private final DecimalFormat format = new DecimalFormat("#.###"); + private final DecimalFormat format = new DecimalFormat(); private boolean doubleBackToExitPressedOnce; private MainActivity ma; private Context c; @@ -203,12 +203,11 @@ private void updateDrinkList() { //Updating the bac of the current user after calculating the total bac //At startup it is negative (for some reason) if (totalBac >= 0) { - tvBac.setText(format.format(totalBac)); + tvBac.setText(String.format("%s %s", format.format(totalBac), getResources().getString(R.string.per_mille))); } //Saving user in case there was a depleted drink removed currentUser.saveUser(this); - } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7130e69..e6934e6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -27,7 +27,8 @@ Körpergewicht (kg) Körpergröße (cm) Bild - Promille (‰) + Promille + Promille Benutzer erstellen Benutzer speichern