From 774786dffcea9f5c3ab8afda46c5c710c4da77f9 Mon Sep 17 00:00:00 2001 From: OliE Date: Sat, 19 May 2018 15:28:57 +0200 Subject: [PATCH] show a title on add measurement dialog --- .../health/openscale/gui/activities/DataEntryActivity.java | 7 ++++++- android_app/app/src/main/res/values-de/strings.xml | 1 + android_app/app/src/main/res/values/strings.xml | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java index aa1289c4..47bd818e 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java @@ -86,7 +86,6 @@ public class DataEntryActivity extends BaseAppCompatActivity { setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - getSupportActionBar().setTitle(""); context = this; @@ -320,6 +319,8 @@ public class DataEntryActivity extends BaseAppCompatActivity { switch (viewMode) { case VIEW: + getSupportActionBar().setTitle(""); + saveButton.setVisible(false); editButton.setVisible(true); expandButton.setVisible(true); @@ -334,6 +335,8 @@ public class DataEntryActivity extends BaseAppCompatActivity { dateTimeVisibility = View.GONE; break; case EDIT: + getSupportActionBar().setTitle(""); + saveButton.setVisible(true); editButton.setVisible(false); expandButton.setVisible(true); @@ -346,6 +349,8 @@ public class DataEntryActivity extends BaseAppCompatActivity { btnRight.setEnabled(false); break; case ADD: + getSupportActionBar().setTitle(R.string.label_add_measurement); + saveButton.setVisible(true); editButton.setVisible(false); expandButton.setVisible(false); diff --git a/android_app/app/src/main/res/values-de/strings.xml b/android_app/app/src/main/res/values-de/strings.xml index 35851da9..a68a9e56 100644 --- a/android_app/app/src/main/res/values-de/strings.xml +++ b/android_app/app/src/main/res/values-de/strings.xml @@ -63,6 +63,7 @@ Übersicht Benutzer Benutzer hinzufügen + Messung hinzufügen Fehler: Zielgewicht ist erforderlich ausgeschaltet eingeschaltet diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml index 66365b2a..b17733f7 100644 --- a/android_app/app/src/main/res/values/strings.xml +++ b/android_app/app/src/main/res/values/strings.xml @@ -22,6 +22,7 @@ No Delete Add user + Add measurement Share CSV data export (%s)