mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-20 07:21:40 +02:00
Code Issues Releases Wiki Activity

show a title on add measurement dialog

Browse Source
This commit is contained in:
OliE
2018-05-19 15:28:57 +02:00
parent 2ba8b1706a
commit 774786dffc
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java
View File

@@ -86,7 +86,6 @@ public class DataEntryActivity extends BaseAppCompatActivity {
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setTitle("");
context = this; context = this;
@@ -320,6 +319,8 @@ public class DataEntryActivity extends BaseAppCompatActivity {
switch (viewMode) { switch (viewMode) {
case VIEW: case VIEW:
getSupportActionBar().setTitle("");
saveButton.setVisible(false); saveButton.setVisible(false);
editButton.setVisible(true); editButton.setVisible(true);
expandButton.setVisible(true); expandButton.setVisible(true);
@@ -334,6 +335,8 @@ public class DataEntryActivity extends BaseAppCompatActivity {
dateTimeVisibility = View.GONE; dateTimeVisibility = View.GONE;
break; break;
case EDIT: case EDIT:
getSupportActionBar().setTitle("");
saveButton.setVisible(true); saveButton.setVisible(true);
editButton.setVisible(false); editButton.setVisible(false);
expandButton.setVisible(true); expandButton.setVisible(true);
@@ -346,6 +349,8 @@ public class DataEntryActivity extends BaseAppCompatActivity {
btnRight.setEnabled(false); btnRight.setEnabled(false);
break; break;
case ADD: case ADD:
getSupportActionBar().setTitle(R.string.label_add_measurement);
saveButton.setVisible(true); saveButton.setVisible(true);
editButton.setVisible(false); editButton.setVisible(false);
expandButton.setVisible(false); expandButton.setVisible(false);

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

@@ -63,6 +63,7 @@
<string name="title_overview">Übersicht</string> <string name="title_overview">Übersicht</string>
<string name="title_users">Benutzer</string> <string name="title_users">Benutzer</string>
<string name="label_add_user">Benutzer hinzufügen</string> <string name="label_add_user">Benutzer hinzufügen</string>
<string name="label_add_measurement">Messung hinzufügen</string>
<string name="error_goal_weight_required">Fehler: Zielgewicht ist erforderlich</string> <string name="error_goal_weight_required">Fehler: Zielgewicht ist erforderlich</string>
<string name="info_is_not_enable">ausgeschaltet</string> <string name="info_is_not_enable">ausgeschaltet</string>
<string name="info_is_enable">eingeschaltet</string> <string name="info_is_enable">eingeschaltet</string>

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

@@ -22,6 +22,7 @@
<string name="label_no">No</string> <string name="label_no">No</string>
<string name="label_delete">Delete</string> <string name="label_delete">Delete</string>
<string name="label_add_user">Add user</string> <string name="label_add_user">Add user</string>
<string name="label_add_measurement">Add measurement</string>
<string name="label_share">Share</string> <string name="label_share">Share</string>
<string name="label_share_subject">CSV data export (%s)</string> <string name="label_share_subject">CSV data export (%s)</string>