From 0fab2405f8384e015f22a0fcca0f8edd3026c942 Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Sat, 18 Jan 2020 18:26:09 +0900
Subject: [PATCH] Android: Move strings to Android resource

---
 .../kichikuou/xsystem35/LauncherActivity.kt   | 34 +++++++++----------
 android/app/src/main/res/values/strings.xml   | 12 +++++++
 2 files changed, 29 insertions(+), 17 deletions(-)

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 5a1cfc2..3c18951 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
@@ -50,7 +50,7 @@ class LauncherActivity : ListActivity(), AdapterView.OnItemLongClickListener {
         gm = GameManager(filesDir)
 
         val items = gm.titles.toMutableList()
-        items.add("Install from ZIP")
+        items.add(getString(R.string.install_from_zip))
         adapter = ArrayAdapter(this, android.R.layout.simple_list_item_1, items)
         listAdapter = adapter
         listView.onItemLongClickListener = this
@@ -63,16 +63,16 @@ class LauncherActivity : ListActivity(), AdapterView.OnItemLongClickListener {
         } else {
             val i = Intent(Intent.ACTION_GET_CONTENT)
             i.type = "application/zip"
-            startActivityForResult(Intent.createChooser(i, "Choose a file"), 0)
+            startActivityForResult(Intent.createChooser(i, getString(R.string.choose_a_file)), 0)
         }
     }
 
     override fun onItemLongClick(a: AdapterView<*>?, v: View?, position: Int, id: Long): Boolean {
         if (position < gm.games.size) {
-            AlertDialog.Builder(this).setTitle("Confirm")
-                    .setMessage("Uninstall ${gm.games[position].title}?")
-                    .setPositiveButton("OK") {_, _ -> uninstall(position)}
-                    .setNegativeButton("Cancel") {_, _ -> }
+            AlertDialog.Builder(this).setTitle(R.string.uninstall_dialog_title)
+                    .setMessage(getString(R.string.uninstall_dialog_message, gm.games[position].title))
+                    .setPositiveButton(R.string.ok) {_, _ -> uninstall(position)}
+                    .setNegativeButton(R.string.cancel) {_, _ -> }
                     .show()
         }
         return true
@@ -91,7 +91,7 @@ class LauncherActivity : ListActivity(), AdapterView.OnItemLongClickListener {
             override fun handleMessage(msg: Message) {
                 when (msg.what) {
                     PROGRESS -> {
-                        dialog.setProgress(msg.obj as String)
+                        dialog.setProgress(getString(R.string.install_progress, msg.obj as String))
                     }
                     SUCCESS -> {
                         dialog.dismiss()
@@ -99,7 +99,7 @@ class LauncherActivity : ListActivity(), AdapterView.OnItemLongClickListener {
                     }
                     FAILURE -> {
                         dialog.dismiss()
-                        errorDialog(msg.obj as String)
+                        errorDialog(msg.obj as Int)
                     }
                 }
             }
@@ -110,7 +110,7 @@ class LauncherActivity : ListActivity(), AdapterView.OnItemLongClickListener {
     private fun startGame(path: File) {
         val gameRoot = findGameRoot(path)
         if (gameRoot == null) {
-            errorDialog("Cannot find game files (*.ald)")
+            errorDialog(R.string.cannot_find_ald)
             return
         }
         val i = Intent()
@@ -125,10 +125,10 @@ class LauncherActivity : ListActivity(), AdapterView.OnItemLongClickListener {
         adapter.remove(adapter.getItem(id))
     }
 
-    private fun errorDialog(msg: String) {
-        AlertDialog.Builder(this).setTitle("Error")
-                .setMessage(msg)
-                .setPositiveButton("OK") {_, _ -> }
+    private fun errorDialog(msgId: Int) {
+        AlertDialog.Builder(this).setTitle(R.string.error_dialog_title)
+                .setMessage(msgId)
+                .setPositiveButton(R.string.ok) {_, _ -> }
                 .show()
     }
 }
@@ -139,7 +139,7 @@ class ProgressDialogFragment : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         dialog = ProgressDialog(activity)
         return dialog.apply {
-            setTitle("Installing")
+            setTitle(R.string.install_dialog_title)
             setCancelable(true)
         }
     }
@@ -205,7 +205,7 @@ private class GameManager(private val rootDir: File) {
                 if (zipEntry.isDirectory)
                     continue
                 path.parentFile.mkdirs()
-                handler.sendMessage(handler.obtainMessage(PROGRESS, "Extracting ${zipEntry.name}..."))
+                handler.sendMessage(handler.obtainMessage(PROGRESS, zipEntry.name))
                 val output = FileOutputStream(path).buffered()
                 zip.copyTo(output)
                 output.close()
@@ -214,10 +214,10 @@ private class GameManager(private val rootDir: File) {
             handler.sendMessage(handler.obtainMessage(SUCCESS, outDir))
         } catch (e: UTFDataFormatException) {
             // Attempted to read Shift_JIS zip in Android < 7
-            handler.sendMessage(handler.obtainMessage(FAILURE, "This ZIP file is unsupported."))
+            handler.sendMessage(handler.obtainMessage(FAILURE, R.string.unsupported_zip))
         } catch (e: IOException) {
             Log.e("launcher", "Failed to extract ZIP", e)
-            handler.sendMessage(handler.obtainMessage(FAILURE, "Failed to extract ZIP."))
+            handler.sendMessage(handler.obtainMessage(FAILURE, R.string.zip_extraction_error))
         }
     }
 }
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index d4535a4..e5836f2 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -1,3 +1,15 @@
 <resources>
     <string name="app_name">xsystem35</string>
+    <string name="cancel">Cancel</string>
+    <string name="cannot_find_ald">Cannot find System 3.x game files (*.ald)</string>
+    <string name="choose_a_file">Choose a file</string>
+    <string name="error_dialog_title">Error</string>
+    <string name="install_dialog_title">Installing...</string>
+    <string name="install_from_zip">Install from ZIP</string>
+    <string name="install_progress">Extracting %s</string>
+    <string name="ok">OK</string>
+    <string name="uninstall_dialog_message">Uninstall \"%s\"?</string>
+    <string name="uninstall_dialog_title">Confirm</string>
+    <string name="unsupported_zip">This type of ZIP is not supported.</string>
+    <string name="zip_extraction_error">Failed to extract ZIP.</string>
 </resources>