From d896d33a0199f4abc2ca0d09fe46f14b75a9b1d3 Mon Sep 17 00:00:00 2001
From: kloud <dgudim@gmail.com>
Date: Sun, 3 Sep 2023 17:08:35 +0300
Subject: [PATCH] Fixed messages in group add/edit dialog

---
 .../fragments/dialogs/AddEditGroupDialogFragment.java          | 2 +-
 .../xd/scheduler/views/settings/PopupSettingsView.java         | 1 +
 app/src/main/res/values-ru/strings.xml                         | 1 +
 app/src/main/res/values/strings.xml                            | 3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/prototype/xd/scheduler/fragments/dialogs/AddEditGroupDialogFragment.java b/app/src/main/java/prototype/xd/scheduler/fragments/dialogs/AddEditGroupDialogFragment.java
index d271215..1644348 100644
--- a/app/src/main/java/prototype/xd/scheduler/fragments/dialogs/AddEditGroupDialogFragment.java
+++ b/app/src/main/java/prototype/xd/scheduler/fragments/dialogs/AddEditGroupDialogFragment.java
@@ -44,7 +44,7 @@ protected void buildDialogStatic(@NonNull AddEditGroupDialogFragmentBinding bind
     protected void buildDialogDynamic(@NonNull AddEditGroupDialogFragmentBinding binding, @NonNull AlertDialog dialog) {
         dialog.setTitle(group == null ? R.string.add_current_config_as_group_prompt : R.string.edit_group);
         dialog.setIcon(group == null ? R.drawable.ic_library_add_24 : R.drawable.ic_edit_24);
-        dialog.setMessage(group == null ? wrapper.getString(R.string.add_current_config_as_group_message) : "");
+        dialog.setMessage(wrapper.getString(group == null ? R.string.add_current_config_as_group_message : R.string.edit_group_message));
         
         setupEditText(binding.entryNameEditText, group == null ? "" : group.getRawName());
         
diff --git a/app/src/main/java/prototype/xd/scheduler/views/settings/PopupSettingsView.java b/app/src/main/java/prototype/xd/scheduler/views/settings/PopupSettingsView.java
index bce6455..2f239bc 100644
--- a/app/src/main/java/prototype/xd/scheduler/views/settings/PopupSettingsView.java
+++ b/app/src/main/java/prototype/xd/scheduler/views/settings/PopupSettingsView.java
@@ -21,6 +21,7 @@
 import prototype.xd.scheduler.utilities.Static;
 import prototype.xd.scheduler.utilities.TodoEntryManager;
 
+// TODO: use ViewModel and savedInstanceState to transfer data instead of using the constructor for proper config updates
 @MainThread
 public abstract class PopupSettingsView extends BaseCachedDialogFragment<EntrySettingsBinding, ComponentDialog> {
     
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 3b56c76..7495e31 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -14,6 +14,7 @@
     <string name="are_you_sure">Вы уверены?</string>
     <string name="save">Сохранить</string>
     <string name="edit_group">Редактировать группу</string>
+    <string name="edit_group_message">Группа будет переименована без изменения параметров</string>
     <string name="edit_event">Редактировать событие</string>
     <string name="item_global">(Глобальное)</string>
     <plurals name="item_N_days_ago">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f1a84e3..7f3510e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -92,6 +92,7 @@
     <string name="enable_per_day_wallpapers">Enable per day wallpapers</string>
     <string name="dynamic_wallpaper_off_warning">You have selected a wallpaper for a single day but “per day wallpapers” is not enabled</string>
     <string name="edit_group">Edit group</string>
+    <string name="edit_group_message">The group will be renamed, no parameters will be changed</string>
     <string name="add_group">Add group</string>
     <string name="null_group_edit_message">Nothing to edit, assign a group first</string>
     <string name="delete">Delete</string>
@@ -135,7 +136,7 @@
     <string name="app_theme_system">System default</string>
     <string name="xiaomi_message">It looks like you are using a xiaomi phone, some version of miui don\'t allow setting lockscreen wallpaper programmatically, so the app will most probably not work. Sorry, i can\'t do anything about it.</string>
     <string name="blank_group_name">No group</string>
-    <string name="input_cant_be_empty">Input can\'t be empty</string>
+    <string name="input_cant_be_empty">Input can’t be empty</string>
     <string name="edit_event">Edit event</string>
     <string name="overwrite">Overwrite</string>
     <string name="reset">Reset</string>