Skip to content
Snippets Groups Projects
Commit c1059adb authored by Julian Catoni's avatar Julian Catoni
Browse files

Some code cleanup, added strings

parent 4676c6ab
Branches
No related tags found
No related merge requests found
...@@ -1005,22 +1005,21 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder ...@@ -1005,22 +1005,21 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
} }
private final static Handler mSnackbarHandler = new Handler(); 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); mSnackbarHandler.removeCallbacksAndMessages(null);
final View currentView = v.getRootView(); final View currentView = v.getRootView();
Snackbar snackbar = Snackbar.make(currentView, "Manuelle Änderung als neuen Standardwert setzen?", Snackbar.LENGTH_LONG); Snackbar snackbar = Snackbar.make(currentView, currentView.getContext().getString(R.string.snackbar_set_default, item.label()), Snackbar.LENGTH_LONG);
snackbar.setAction("Setze als\nStandard", v1 -> { snackbar.setAction(currentView.getContext().getString(R.string.snackbar_btn_set_default), v1 -> {
Toast.makeText(currentView.getContext(), "Änderung wurde als neuer Standardwert gesetzt!", Toast.LENGTH_SHORT).show();
try { try {
GetDataService service = RetrofitClientInstance.getRetrofitInstance(currentView.getContext()).create(GetDataService.class); 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>() { call.enqueue(new Callback<ResponseBody>() {
@Override @Override
public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) { 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 @Override
...@@ -1074,7 +1073,7 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder ...@@ -1074,7 +1073,7 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
if (v.getTag() instanceof String) { if (v.getTag() instanceof String) {
final String cmd = (String) v.getTag(); final String cmd = (String) v.getTag();
Util.sendItemCommand(mConnection.getAsyncHttpClient(), mBoundItem, cmd); Util.sendItemCommand(mConnection.getAsyncHttpClient(), mBoundItem, cmd);
WidgetAdapter.showSnackbar(itemView, DELAY_SNACKBAR, mBoundItem.name()); WidgetAdapter.showSnackbar(itemView, DELAY_SNACKBAR, mBoundItem);
} else { } else {
showColorPickerDialog(); showColorPickerDialog();
} }
...@@ -1124,7 +1123,7 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder ...@@ -1124,7 +1123,7 @@ public class WidgetAdapter extends RecyclerView.Adapter<WidgetAdapter.ViewHolder
.setView(contentView) .setView(contentView)
.setOnDismissListener(dialog -> { .setOnDismissListener(dialog -> {
if (mColorChanged) { if (mColorChanged) {
WidgetAdapter.showSnackbar(itemView, 0, mBoundItem.name()); WidgetAdapter.showSnackbar(itemView, 0, mBoundItem);
mColorChanged = false; mColorChanged = false;
} }
}) })
......
...@@ -232,4 +232,8 @@ ...@@ -232,4 +232,8 @@
<string name="app_intro_skip_button">SKIP</string> <string name="app_intro_skip_button">SKIP</string>
<!-- Intro "DONE" button --> <!-- Intro "DONE" button -->
<string name="app_intro_done_button">DONE</string> <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> </resources>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment