Skip to content

Commit

Permalink
moves "‰" after bac
Browse files Browse the repository at this point in the history
  • Loading branch information
dieechtenilente committed Apr 2, 2018
1 parent 84d1b13 commit 046a757
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

}


Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
<string name="weight_with_unit">Körpergewicht (kg)</string>
<string name="height_with_unit">Körpergröße (cm)</string>
<string name="image">Bild</string>
<string name="bac">Promille (‰)</string>
<string name="bac">Promille</string>
<string name="per_mille">‰</string>
<string name="bacNoChar">Promille</string>
<string name="create_user">Benutzer erstellen</string>
<string name="save_user">Benutzer speichern</string>
Expand Down

0 comments on commit 046a757

Please sign in to comment.