Fix RadioDialog view's selection method

Mahmud0808 · Apr 27, 2023 · 730a2dd · 730a2dd
1 parent 6082394
commit 730a2dd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/fragments/Settings.java b/app/src/main/java/com/drdisagree/iconify/ui/fragments/Settings.java
@@ -270,16 +270,12 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
     public void onItemSelected(int dialogId, int selectedIndex) {
         switch (dialogId) {
             case 0:
-                if (!getResources().getConfiguration().getLocales().get(0).getLanguage().equals(Arrays.asList(getResources().getStringArray(R.array.locale_code)).get(selectedIndex))) {
-                    Prefs.putString(APP_LANGUAGE, Arrays.asList(getResources().getStringArray(R.array.locale_code)).get(selectedIndex));
-                    restartApplication(requireActivity());
-                }
+                Prefs.putString(APP_LANGUAGE, Arrays.asList(getResources().getStringArray(R.array.locale_code)).get(selectedIndex));
+                restartApplication(requireActivity());
                 break;
             case 1:
-                if (selectedIndex != Prefs.getInt(APP_THEME, 2)) {
-                    Prefs.putInt(APP_THEME, selectedIndex);
-                    restartApplication(requireActivity());
-                }
+                Prefs.putInt(APP_THEME, selectedIndex);
+                restartApplication(requireActivity());
                 break;
             case 2:
                 Prefs.putInt(FORCE_APPLY_XPOSED_CHOICE, selectedIndex == 2 ? -1 : selectedIndex);

diff --git a/app/src/main/java/com/drdisagree/iconify/ui/views/RadioDialog.java b/app/src/main/java/com/drdisagree/iconify/ui/views/RadioDialog.java
@@ -56,6 +56,8 @@ public void show(int title, int items, TextView output) {
             radioGroup.addView(radioButton);
         }
 
+        ((RadioButton) radioGroup.getChildAt(selectedIndex)).setChecked(true);
+
         radioGroup.setOnCheckedChangeListener((group, checkedId) -> {
             selectedIndex = checkedId;
             dialog.hide();
@@ -66,8 +68,6 @@ public void show(int title, int items, TextView output) {
             }
         });
 
-        ((RadioButton) radioGroup.getChildAt(selectedIndex)).setChecked(true);
-
         dialog.create();
         dialog.show();