From f4b301a28d7c15de477e0e1a71696936bba03147 Mon Sep 17 00:00:00 2001 From: kichikuou Date: Tue, 28 Jan 2020 21:52:19 +0900 Subject: [PATCH] Android: Simplify intent parameters for GameActivity --- .../io/github/kichikuou/xsystem35/GameActivity.kt | 12 +++++------- .../github/kichikuou/xsystem35/LauncherActivity.kt | 2 -- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/android/app/src/main/java/io/github/kichikuou/xsystem35/GameActivity.kt b/android/app/src/main/java/io/github/kichikuou/xsystem35/GameActivity.kt index e26606b..20eb41a 100644 --- a/android/app/src/main/java/io/github/kichikuou/xsystem35/GameActivity.kt +++ b/android/app/src/main/java/io/github/kichikuou/xsystem35/GameActivity.kt @@ -25,23 +25,21 @@ import org.libsdl.app.SDLActivity import java.io.File import java.io.IOException -// Intent for this activity must have two extras: +// Intent for this activity must have the following extra: // - EXTRA_GAME_ROOT (string): A path to the game installation. -// - EXTRA_TITLE_FILE (string): A file to which the game title will be written. -// - EXTRA_PLAYLIST_FILE (string): A path to the BGM playlist file. class GameActivity : SDLActivity() { companion object { const val EXTRA_GAME_ROOT = "GAME_ROOT" - const val EXTRA_TITLE_FILE = "TITLE_FILE" - const val EXTRA_PLAYLIST_FILE = "PLAYLIST_FILE" } + private lateinit var gameRoot: File private lateinit var cdda: CddaPlayer private val midi = MidiPlayer() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - cdda = CddaPlayer(File(intent.getStringExtra(EXTRA_PLAYLIST_FILE))) + gameRoot = File(intent.getStringExtra(EXTRA_GAME_ROOT)) + cdda = CddaPlayer(File(gameRoot, Launcher.PLAYLIST_FILE)) } override fun onStop() { @@ -69,7 +67,7 @@ class GameActivity : SDLActivity() { val str = title?.toString()?.substringAfter(':', "") if (str.isNullOrEmpty()) return - intent.getStringExtra(EXTRA_TITLE_FILE)?.let { File(it).writeText(str) } + File(gameRoot, Launcher.TITLE_FILE).writeText(str) } // These functions are called in the SDL thread by JNI. diff --git a/android/app/src/main/java/io/github/kichikuou/xsystem35/LauncherActivity.kt b/android/app/src/main/java/io/github/kichikuou/xsystem35/LauncherActivity.kt index 8ba31f6..78d6fbb 100644 --- a/android/app/src/main/java/io/github/kichikuou/xsystem35/LauncherActivity.kt +++ b/android/app/src/main/java/io/github/kichikuou/xsystem35/LauncherActivity.kt @@ -101,8 +101,6 @@ class LauncherActivity : ListActivity(), AdapterView.OnItemLongClickListener, La val i = Intent() i.setClass(applicationContext, GameActivity::class.java) i.putExtra(GameActivity.EXTRA_GAME_ROOT, path.path) - i.putExtra(GameActivity.EXTRA_TITLE_FILE, File(path, Launcher.TITLE_FILE).path) - i.putExtra(GameActivity.EXTRA_PLAYLIST_FILE, File(path, Launcher.PLAYLIST_FILE).path) startActivity(i) }