Skip to content

Commit

Permalink
Fixed messages in group add/edit dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
dgudim committed Sep 3, 2023
1 parent 88ee75b commit d896d33
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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> {

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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 cant be empty</string>
<string name="edit_event">Edit event</string>
<string name="overwrite">Overwrite</string>
<string name="reset">Reset</string>
Expand Down

0 comments on commit d896d33

Please sign in to comment.