From c1059adbb35ddccc3ebb3424c3a1078130a526e1 Mon Sep 17 00:00:00 2001
From: Julian Catoni <julian.catoni@tu-dresden.de>
Date: Mon, 2 Sep 2019 11:36:36 +0200
Subject: [PATCH] Some code cleanup, added strings
---
.../org/openhab/habdroid/ui/WidgetAdapter.java | 17 ++++++++---------
mobile/src/main/res/values/strings.xml | 4 ++++
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.java b/mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.java
index 3f8f0619..bbeef3f0 100644
--- a/mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.java
+++ b/mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.java
@@ -1005,22 +1005,21 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
}
private final static Handler mSnackbarHandler = new Handler();
- private final static int DELAY_SNACKBAR = 2000;
+ private final static int DELAY_SNACKBAR = 1500;
- private static void showSnackbar(View v, int delay, String identifier) {
+ private static void showSnackbar(View v, int delay, Item item) {
mSnackbarHandler.removeCallbacksAndMessages(null);
final View currentView = v.getRootView();
- Snackbar snackbar = Snackbar.make(currentView, "Manuelle Änderung als neuen Standardwert setzen?", Snackbar.LENGTH_LONG);
- snackbar.setAction("Setze als\nStandard", v1 -> {
- Toast.makeText(currentView.getContext(), "Änderung wurde als neuer Standardwert gesetzt!", Toast.LENGTH_SHORT).show();
+ Snackbar snackbar = Snackbar.make(currentView, currentView.getContext().getString(R.string.snackbar_set_default, item.label()), Snackbar.LENGTH_LONG);
+ snackbar.setAction(currentView.getContext().getString(R.string.snackbar_btn_set_default), v1 -> {
try {
GetDataService service = RetrofitClientInstance.getRetrofitInstance(currentView.getContext()).create(GetDataService.class);
- Call<ResponseBody> call = service.setNewDefaultValue(identifier);
+ Call<ResponseBody> call = service.setNewDefaultValue(item.name());
call.enqueue(new Callback<ResponseBody>() {
@Override
public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
- Toast.makeText(currentView.getContext(), "Success", Toast.LENGTH_LONG).show();
+ Toast.makeText(currentView.getContext(), currentView.getContext().getString(R.string.toast_set_default_success), Toast.LENGTH_LONG).show();
}
@Override
@@ -1074,7 +1073,7 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
if (v.getTag() instanceof String) {
final String cmd = (String) v.getTag();
Util.sendItemCommand(mConnection.getAsyncHttpClient(), mBoundItem, cmd);
- WidgetAdapter.showSnackbar(itemView, DELAY_SNACKBAR, mBoundItem.name());
+ WidgetAdapter.showSnackbar(itemView, DELAY_SNACKBAR, mBoundItem);
} else {
showColorPickerDialog();
}
@@ -1124,7 +1123,7 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
.setView(contentView)
.setOnDismissListener(dialog -> {
if (mColorChanged) {
- WidgetAdapter.showSnackbar(itemView, 0, mBoundItem.name());
+ WidgetAdapter.showSnackbar(itemView, 0, mBoundItem);
mColorChanged = false;
}
})
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index f8638800..d620c64f 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -232,4 +232,8 @@
<string name="app_intro_skip_button">SKIP</string>
<!-- Intro "DONE" button -->
<string name="app_intro_done_button">DONE</string>
+
+ <string name="snackbar_set_default">Set manual change as new default value for %1$s?</string>
+ <string name="toast_set_default_success">Manual change was set as new default value!</string>
+ <string name="snackbar_btn_set_default">Set as\ndefault</string>
</resources>
--
GitLab