mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-12-16 04:09:39 +00:00
Merge pull request #14098 from Simonx22/android/dolphin-application-kotlin
Android: Convert DolphinApplication to Kotlin
This commit is contained in:
commit
099ea79c43
@ -1,45 +0,0 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
package org.dolphinemu.dolphinemu;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.Application;
|
||||
import android.content.Context;
|
||||
import android.hardware.usb.UsbManager;
|
||||
|
||||
import org.dolphinemu.dolphinemu.utils.ActivityTracker;
|
||||
import org.dolphinemu.dolphinemu.utils.DirectoryInitialization;
|
||||
import org.dolphinemu.dolphinemu.utils.GCAdapter;
|
||||
import org.dolphinemu.dolphinemu.utils.WiimoteAdapter;
|
||||
|
||||
public class DolphinApplication extends Application
|
||||
{
|
||||
private static DolphinApplication application;
|
||||
private static ActivityTracker sActivityTracker;
|
||||
|
||||
@Override
|
||||
public void onCreate()
|
||||
{
|
||||
super.onCreate();
|
||||
application = this;
|
||||
sActivityTracker = new ActivityTracker();
|
||||
registerActivityLifecycleCallbacks(sActivityTracker);
|
||||
System.loadLibrary("main");
|
||||
|
||||
GCAdapter.manager = (UsbManager) getSystemService(Context.USB_SERVICE);
|
||||
WiimoteAdapter.manager = (UsbManager) getSystemService(Context.USB_SERVICE);
|
||||
|
||||
if (DirectoryInitialization.shouldStart(getApplicationContext()))
|
||||
DirectoryInitialization.start(getApplicationContext());
|
||||
}
|
||||
|
||||
public static Context getAppContext()
|
||||
{
|
||||
return application.getApplicationContext();
|
||||
}
|
||||
|
||||
public static Activity getAppActivity()
|
||||
{
|
||||
return sActivityTracker.getCurrentActivity();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
package org.dolphinemu.dolphinemu
|
||||
|
||||
import android.app.Activity
|
||||
import android.app.Application
|
||||
import android.content.Context
|
||||
import android.hardware.usb.UsbManager
|
||||
import org.dolphinemu.dolphinemu.utils.ActivityTracker
|
||||
import org.dolphinemu.dolphinemu.utils.DirectoryInitialization
|
||||
import org.dolphinemu.dolphinemu.utils.GCAdapter
|
||||
import org.dolphinemu.dolphinemu.utils.WiimoteAdapter
|
||||
|
||||
class DolphinApplication : Application() {
|
||||
private val activityTracker = ActivityTracker()
|
||||
|
||||
override fun onCreate() {
|
||||
super.onCreate()
|
||||
instance = this
|
||||
registerActivityLifecycleCallbacks(activityTracker)
|
||||
System.loadLibrary("main")
|
||||
|
||||
val usbManager = getSystemService(USB_SERVICE) as UsbManager
|
||||
GCAdapter.manager = usbManager
|
||||
WiimoteAdapter.manager = usbManager
|
||||
|
||||
if (DirectoryInitialization.shouldStart(applicationContext)) {
|
||||
DirectoryInitialization.start(applicationContext)
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
@JvmStatic
|
||||
lateinit var instance: DolphinApplication
|
||||
private set
|
||||
|
||||
@JvmStatic
|
||||
fun getAppContext(): Context = instance.applicationContext
|
||||
|
||||
@JvmStatic
|
||||
fun getAppActivity(): Activity? = instance.activityTracker.currentActivity
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user