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

Android: Convert EmulationActivity to Kotlin

This commit is contained in:
Charles Lombardo 2023-06-03 22:23:30 -04:00
parent 252d3f353a
commit 03675f7677
5 changed files with 1075 additions and 1308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

1071
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt Normal file
View File

File diff suppressed because it is too large Load Diff

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/riivolution/ui/RiivolutionBootActivity.kt
View File

@ -50,7 +50,7 @@ class RiivolutionBootActivity : AppCompatActivity() {
binding.textSdRoot.text = getString(R.string.riivolution_sd_root, "$loadPath/Riivolution")
binding.buttonStart.setOnClickListener {
if (patches != null) patches!!.saveConfig()
EmulationActivity.launch(this, path, true)
EmulationActivity.launch(this, path!!, true)
}
lifecycleScope.launch {

3
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java
View File

@ -319,7 +319,8 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C
}
else
{
if (!EmulationActivity.getHasUserPausedEmulation() && !NativeLibrary.IsShowingAlertMessage())
if (!EmulationActivity.Companion.getHasUserPausedEmulation() &&
!NativeLibrary.IsShowingAlertMessage())
{
Log.debug("[EmulationFragment] Resuming emulation.");
NativeLibrary.UnPauseEmulation();

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.java
View File

@ -196,7 +196,7 @@ public final class MenuFragment extends Fragment implements View.OnClickListener
private void updatePauseUnpauseVisibility()
{
boolean paused = EmulationActivity.getHasUserPausedEmulation();
boolean paused = EmulationActivity.Companion.getHasUserPausedEmulation();
mBinding.menuUnpauseEmulation.setVisibility(paused ? View.VISIBLE : View.GONE);
mBinding.menuPauseEmulation.setVisibility(paused ? View.GONE : View.VISIBLE);