ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9068 from Ebola16/Fixes5 

Android: Minor cleanup
This commit is contained in:
LC 2020-09-08 09:47:29 -04:00 committed by GitHub
parent 3d33b1c2c5 1aacb575de
commit 365e812f6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
View File

@ -857,17 +857,16 @@ public final class EmulationActivity extends AppCompatActivity
.putBoolean("buttonToggleWii" + indexSelected, isChecked)); .putBoolean("buttonToggleWii" + indexSelected, isChecked));
} }
} }
builder.setNeutralButton(getString(R.string.emulation_toggle_all), builder.setNeutralButton(R.string.emulation_toggle_all,
(dialogInterface, i) -> mEmulationFragment.toggleInputOverlayVisibility()); (dialogInterface, i) -> mEmulationFragment.toggleInputOverlayVisibility());
builder.setPositiveButton(getString(R.string.ok), (dialogInterface, i) -> builder.setPositiveButton(R.string.ok, (dialogInterface, i) ->
{ {
editor.apply(); editor.apply();
mEmulationFragment.refreshInputOverlay(); mEmulationFragment.refreshInputOverlay();
}); });
AlertDialog alertDialog = builder.create(); builder.show();
alertDialog.show();
} }
public void chooseDoubleTapButton() public void chooseDoubleTapButton()
@ -893,14 +892,13 @@ public final class EmulationActivity extends AppCompatActivity
builder.setSingleChoiceItems(buttonList, currentValue, (DialogInterface dialog, int which) -> builder.setSingleChoiceItems(buttonList, currentValue, (DialogInterface dialog, int which) ->
editor.putInt("doubleTapButton", InputOverlayPointer.DOUBLE_TAP_OPTIONS.get(which))); editor.putInt("doubleTapButton", InputOverlayPointer.DOUBLE_TAP_OPTIONS.get(which)));
builder.setPositiveButton(getString(R.string.ok), (dialogInterface, i) -> builder.setPositiveButton(R.string.ok, (dialogInterface, i) ->
{ {
editor.commit(); editor.commit();
mEmulationFragment.initInputPointer(); mEmulationFragment.initInputPointer();
}); });
AlertDialog alertDialog = builder.create(); builder.show();
alertDialog.show();
} }
private void adjustScale() private void adjustScale()
@ -938,7 +936,7 @@ public final class EmulationActivity extends AppCompatActivity
AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.DolphinDialogBase); AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.DolphinDialogBase);
builder.setTitle(R.string.emulation_control_scale); builder.setTitle(R.string.emulation_control_scale);
builder.setView(view); builder.setView(view);
builder.setPositiveButton(getString(R.string.ok), (dialogInterface, i) -> builder.setPositiveButton(R.string.ok, (dialogInterface, i) ->
{ {
SharedPreferences.Editor editor = mPreferences.edit(); SharedPreferences.Editor editor = mPreferences.edit();
editor.putInt("controlScale", seekbar.getProgress()); editor.putInt("controlScale", seekbar.getProgress());
@ -947,8 +945,7 @@ public final class EmulationActivity extends AppCompatActivity
mEmulationFragment.refreshInputOverlay(); mEmulationFragment.refreshInputOverlay();
}); });
AlertDialog alertDialog = builder.create(); builder.show();
alertDialog.show();
} }
private void chooseController() private void chooseController()
@ -971,14 +968,13 @@ public final class EmulationActivity extends AppCompatActivity
NativeLibrary.ReloadWiimoteConfig(); NativeLibrary.ReloadWiimoteConfig();
}); });
builder.setPositiveButton(getString(R.string.ok), (dialogInterface, i) -> builder.setPositiveButton(R.string.ok, (dialogInterface, i) ->
{ {
editor.apply(); editor.apply();
mEmulationFragment.refreshInputOverlay(); mEmulationFragment.refreshInputOverlay();
}); });
AlertDialog alertDialog = builder.create(); builder.show();
alertDialog.show();
} }
private void showMotionControlsOptions() private void showMotionControlsOptions()
@ -1004,10 +1000,9 @@ public final class EmulationActivity extends AppCompatActivity
NativeLibrary.ReloadWiimoteConfig(); NativeLibrary.ReloadWiimoteConfig();
}); });
builder.setPositiveButton(getString(R.string.ok), (dialogInterface, i) -> editor.apply()); builder.setPositiveButton(R.string.ok, (dialogInterface, i) -> editor.apply());
AlertDialog alertDialog = builder.create(); builder.show();
alertDialog.show();
} }
private void chooseOrientation() private void chooseOrientation()
@ -1031,14 +1026,13 @@ public final class EmulationActivity extends AppCompatActivity
int orientation = orientationValues[indexSelected]; int orientation = orientationValues[indexSelected];
editor.putInt("emulationActivityOrientation", orientation); editor.putInt("emulationActivityOrientation", orientation);
}); });
builder.setPositiveButton(getString(R.string.ok), (dialogInterface, i) -> builder.setPositiveButton(R.string.ok, (dialogInterface, i) ->
{ {
editor.apply(); editor.apply();
updateOrientation(); updateOrientation();
}); });
AlertDialog alertDialog = builder.create(); builder.show();
alertDialog.show();
} }
private void setIRSensitivity() private void setIRSensitivity()
@ -1180,7 +1174,6 @@ public final class EmulationActivity extends AppCompatActivity
.setNegativeButton(R.string.cancel, (dialogInterface, i) -> .setNegativeButton(R.string.cancel, (dialogInterface, i) ->
{ {
}) })
.create()
.show(); .show();
} }

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java
View File

@ -186,7 +186,6 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
.setMessage(getString(R.string.game_ini_junk_question)) .setMessage(getString(R.string.game_ini_junk_question))
.setPositiveButton(R.string.yes, (dialogInterface, i) -> mPresenter.clearSettings()) .setPositiveButton(R.string.yes, (dialogInterface, i) -> mPresenter.clearSettings())
.setNegativeButton(R.string.no, null) .setNegativeButton(R.string.no, null)
.create()
.show(); .show();
} }

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Analytics.java
View File

@ -59,7 +59,6 @@ public class Analytics
sPrefsEditor.apply(); sPrefsEditor.apply();
SettingsFile.firstAnalyticsAdd(false); SettingsFile.firstAnalyticsAdd(false);
}) })
.create()
.show(); .show();
} }

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/PermissionsHandler.java
View File

@ -68,7 +68,6 @@ public class PermissionsHandler
.setNegativeButton(android.R.string.cancel, (dialogInterface, i) -> .setNegativeButton(android.R.string.cancel, (dialogInterface, i) ->
Toast.makeText(activity, R.string.write_permission_needed, Toast.LENGTH_SHORT) Toast.makeText(activity, R.string.write_permission_needed, Toast.LENGTH_SHORT)
.show()) .show())
.create()
.show(); .show();
} }
} }