Max/kichikuou_xsystem35-sdl2
1
0
Fork 0
mirror of https://github.com/kichikuou/xsystem35-sdl2.git synced 2026-10-05 13:18:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Android: Simplify intent parameters for GameActivity

Browse Source
This commit is contained in:
kichikuou
2020-01-28 21:54:02 +09:00
parent c98a11dc0e
commit f4b301a28d
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/src/main/java/io/github/kichikuou/xsystem35/GameActivity.kt
+5 -7
View File
@@ -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.
android/app/src/main/java/io/github/kichikuou/xsystem35/LauncherActivity.kt
-2
View File
@@ -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)
}