From 24966672506bb257d95cfd59f613f52ed9234b2e Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Sat, 10 Feb 2018 07:04:23 +0100 Subject: [PATCH] Compare id instead of item string --- .../openscale/gui/activities/DataEntryActivity.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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 c6612694..1704d24c 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 @@ -191,15 +191,13 @@ public class DataEntryActivity extends AppCompatActivity { final Drawable wrapped = DrawableCompat.wrap(drawable.mutate()); - String menuTitle = item.getTitle().toString(); - - if (menuTitle == getResources().getString(R.string.save)) { + if (item.getItemId() == R.id.saveButton) { DrawableCompat.setTint(wrapped, Color.parseColor("#FFFFFF")); - } else if (menuTitle == getResources().getString(R.string.edit)) { + } else if (item.getItemId() == R.id.editButton) { DrawableCompat.setTint(wrapped, Color.parseColor("#99CC00")); - } else if (menuTitle == getResources().getString(R.string.toggle_expand)) { + } else if (item.getItemId() == R.id.expandButton) { DrawableCompat.setTint(wrapped, Color.parseColor("#FFBB33")); - } else if (menuTitle == getResources().getString(R.string.label_delete)) { + } else if (item.getItemId() == R.id.deleteButton) { DrawableCompat.setTint(wrapped, Color.parseColor("#FF4444")); }