fix: use material theme for dialog

Xtr126 · Feb 26, 2024 · c6c51ed · c6c51ed
1 parent cde8c7b
commit c6c51ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/src/main/java/xtr/keymapper/editor/EditorActivity.java b/app/src/main/java/xtr/keymapper/editor/EditorActivity.java
@@ -53,7 +53,8 @@ public void onCreate(Bundle savedInstanceState) {
                 Log.e("editorActivity", e.getMessage(), e);
             }
         else {
-            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(new ContextThemeWrapper(this, R.style.Theme_XtMapper));
+            Context dialogContext = new ContextThemeWrapper(this, R.style.Theme_XtMapper);
+            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(dialogContext);
 
             builder.setMessage(R.string.dialog_alert_editor)
                     .setPositiveButton(R.string.ok, (dialog, which) -> {})

diff --git a/app/src/main/java/xtr/keymapper/editor/EditorUI.java b/app/src/main/java/xtr/keymapper/editor/EditorUI.java
@@ -14,6 +14,7 @@
 import android.view.WindowManager;
 
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.view.ContextThemeWrapper;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
@@ -197,7 +198,8 @@ else if (id == R.id.save) {
             }
             else if (id == R.id.dpad) {
                 final CharSequence[] items = { "Arrow Keys", "WASD Keys"};
-                MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context);
+                Context dialogContext = new ContextThemeWrapper(context, R.style.Theme_XtMapper);
+                MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(dialogContext);
                 builder.setTitle("Select Dpad").setItems(items, (dialog, i) -> {
                     if (i == 0) addArrowKeysDpad(defaultX, defaultY);
                     else addWasdDpad(defaultX, defaultY);