mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-23 00:33:09 +02:00
Code Issues Releases Wiki Activity

Merge pull request #209 from erijo/misc

Browse Source 
Misc
This commit is contained in:
OliE
2018-02-28 17:43:20 +01:00
committed by GitHub
parent 6d77ac3ef0 29e1a14aab
commit 4b40035895
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
View File

@@ -256,13 +256,15 @@ public abstract class MeasurementView extends TableLayout {
public void setEditMode(MeasurementViewMode mode) { public void setEditMode(MeasurementViewMode mode) {
measurementMode = mode; measurementMode = mode;
nameView.setGravity(Gravity.LEFT | (mode == ADD ? Gravity.CENTER : Gravity.TOP));
valueView.setGravity(Gravity.CENTER | (mode == STATISTIC ? 0 : Gravity.RIGHT));
switch (mode) { switch (mode) {
case VIEW: case VIEW:
indicatorView.setVisibility(View.VISIBLE); indicatorView.setVisibility(View.VISIBLE);
editModeView.setVisibility(View.GONE); editModeView.setVisibility(View.GONE);
incDecLayout.setVisibility(View.GONE); incDecLayout.setVisibility(View.GONE);
nameView.setVisibility(View.VISIBLE); nameView.setVisibility(View.VISIBLE);
valueView.setGravity(Gravity.RIGHT | Gravity.CENTER);
break; break;
case EDIT: case EDIT:
case ADD: case ADD:
@@ -270,7 +272,6 @@ public abstract class MeasurementView extends TableLayout {
editModeView.setVisibility(View.VISIBLE); editModeView.setVisibility(View.VISIBLE);
incDecLayout.setVisibility(View.VISIBLE); incDecLayout.setVisibility(View.VISIBLE);
nameView.setVisibility(View.VISIBLE); nameView.setVisibility(View.VISIBLE);
valueView.setGravity(Gravity.RIGHT | Gravity.CENTER);
if (!isEditable()) { if (!isEditable()) {
editModeView.setVisibility(View.INVISIBLE); editModeView.setVisibility(View.INVISIBLE);
@@ -281,7 +282,6 @@ public abstract class MeasurementView extends TableLayout {
incDecLayout.setVisibility(View.GONE); incDecLayout.setVisibility(View.GONE);
editModeView.setVisibility(View.GONE); editModeView.setVisibility(View.GONE);
nameView.setVisibility(View.GONE); nameView.setVisibility(View.GONE);
valueView.setGravity(Gravity.CENTER);
break; break;
} }
} }

1
android_app/app/src/main/res/values-sv/strings.xml
View File

@@ -186,6 +186,7 @@
<string name="label_set_default_order">Ställ in standardordning</string> <string name="label_set_default_order">Ställ in standardordning</string>
<string name="label_weeks_view">Veckovy</string> <string name="label_weeks_view">Veckovy</string>
<string name="label_mergeWithLastMeasurement">Sammanfläta med föregående mätning</string>
<string name="label_export_overwrite">Skriv över föregående export \"%s\"?</string> <string name="label_export_overwrite">Skriv över föregående export \"%s\"?</string>
</resources> </resources>