From 7effced15ab34346c7d50ea315c87ea04b7bf19e Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Tue, 27 Feb 2018 22:39:58 +0100
Subject: [PATCH 1/2] Update swedish translation

---
 android_app/app/src/main/res/values-sv/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android_app/app/src/main/res/values-sv/strings.xml b/android_app/app/src/main/res/values-sv/strings.xml
index 768de44e..f7f5e4fb 100644
--- a/android_app/app/src/main/res/values-sv/strings.xml
+++ b/android_app/app/src/main/res/values-sv/strings.xml
@@ -187,5 +187,6 @@
     <string name="label_set_default_order">Ställ in standardordning</string>
 
     <string name="label_weeks_view">Veckovy</string>
+    <string name="label_mergeWithLastMeasurement">Sammanfläta med föregående mätning</string>
 
 </resources>

From 7f197a058c4e96f93e5972399d4cf37c088ff57b Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Tue, 27 Feb 2018 22:40:17 +0100
Subject: [PATCH 2/2] Center name when in ADD mode

---
 .../com/health/openscale/gui/views/MeasurementView.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
index 1c78743c..29bdc05a 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
@@ -256,13 +256,15 @@ public abstract class MeasurementView extends TableLayout {
     public void setEditMode(MeasurementViewMode mode) {
         measurementMode = mode;
 
+        nameView.setGravity(Gravity.LEFT | (mode == ADD ? Gravity.CENTER : Gravity.TOP));
+        valueView.setGravity(Gravity.CENTER | (mode == STATISTIC ? 0 : Gravity.RIGHT));
+
         switch (mode) {
             case VIEW:
                 indicatorView.setVisibility(View.VISIBLE);
                 editModeView.setVisibility(View.GONE);
                 incDecLayout.setVisibility(View.GONE);
                 nameView.setVisibility(View.VISIBLE);
-                valueView.setGravity(Gravity.RIGHT | Gravity.CENTER);
                 break;
             case EDIT:
             case ADD:
@@ -270,7 +272,6 @@ public abstract class MeasurementView extends TableLayout {
                 editModeView.setVisibility(View.VISIBLE);
                 incDecLayout.setVisibility(View.VISIBLE);
                 nameView.setVisibility(View.VISIBLE);
-                valueView.setGravity(Gravity.RIGHT | Gravity.CENTER);
 
                 if (!isEditable()) {
                     editModeView.setVisibility(View.INVISIBLE);
@@ -281,7 +282,6 @@ public abstract class MeasurementView extends TableLayout {
                 incDecLayout.setVisibility(View.GONE);
                 editModeView.setVisibility(View.GONE);
                 nameView.setVisibility(View.GONE);
-                valueView.setGravity(Gravity.CENTER);
                 break;
         }
     }