Minor Update + Change

Minor code update for theme changer and Appearance update to Exit Emulation button
dolphin-emu · Jan 26, 2022 · 4e0687d · 4e0687d
1 parent 97ebb6a
commit 4e0687d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java
@@ -162,7 +162,7 @@ public void onDirectorySelected(Intent result)
     if (Arrays.stream(childNames).noneMatch((name) -> FileBrowserHelper.GAME_EXTENSIONS.contains(
             FileBrowserHelper.getExtension(name, false))))
     {
-      AlertDialog.Builder builder = new AlertDialog.Builder(mActivity, R.style.DolphinDialogBase);
+      AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
       builder.setMessage(mActivity.getString(R.string.wrong_file_extension_in_directory,
               FileBrowserHelper.setToSortedDelimitedString(FileBrowserHelper.GAME_EXTENSIONS)));
       builder.setPositiveButton(R.string.ok, null);
@@ -201,7 +201,7 @@ public void importWiiSave(String path)
         mActivity.runOnUiThread(() ->
         {
           AlertDialog.Builder builder =
-                  new AlertDialog.Builder(mActivity, R.style.DolphinDialogBase);
+            new AlertDialog.Builder(mActivity);
           builder.setMessage(R.string.wii_save_exists);
           builder.setCancelable(false);
           builder.setPositiveButton(R.string.yes, (dialog, i) -> canOverwriteFuture.complete(true));
@@ -269,7 +269,7 @@ public void importNANDBin(String path)
 
   private void runOnThreadAndShowResult(int progressTitle, int progressMessage, Supplier<String> f)
   {
-    AlertDialog progressDialog = new AlertDialog.Builder(mActivity, R.style.DolphinDialogBase)
+    AlertDialog progressDialog = new AlertDialog.Builder(mActivity)
             .create();
     progressDialog.setTitle(progressTitle);
     if (progressMessage != 0)
@@ -287,7 +287,7 @@ private void runOnThreadAndShowResult(int progressTitle, int progressMessage, Su
         if (result != null)
         {
           AlertDialog.Builder builder =
-                  new AlertDialog.Builder(mActivity, R.style.DolphinDialogBase);
+            new AlertDialog.Builder(mActivity);
           builder.setMessage(result);
           builder.setPositiveButton(R.string.ok, (dialog, i) -> dialog.dismiss());
           builder.show();

diff --git a/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml b/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml
@@ -108,10 +108,14 @@
 
     <Button
         android:id="@+id/menu_exit"
-        android:text="@string/emulation_exit"
         style="@style/InGameMenuOption"
-        android:fontFamily="sans-serif"
+        android:layout_width="210dp"
+        android:layout_gravity="center"
+        android:background="@drawable/button_primary_gradient_shadow"
+        android:text="@string/emulation_exit"
         android:textColor="?attr/colorOnGradientPrimary"
-        android:background="@drawable/button_primary_gradient_shadow"/>
+        android:fontFamily="sans-serif"
+        android:textAlignment="center"
+        android:textStyle="bold" />
 
 </LinearLayout>