From d616452ce996bc27293e812ce9e87004cc31e25d Mon Sep 17 00:00:00 2001
From: Jean-Philip Desjardins <jean-philip.desjardins@polymtl.ca>
Date: Wed, 20 Dec 2017 14:47:48 -0500
Subject: [PATCH] Move localized strings in proper file.

---
 .../res/layout-zh/activity_gameinfo_edit.xml  | 128 ------------------
 .../res/layout/activity_gameinfo_edit.xml     |  10 +-
 build_android/src/main/res/menu-zh/editor.xml |  22 ---
 build_android/src/main/res/menu/editor.xml    |   6 +-
 .../src/main/res/values-zh/strings.xml        |  13 ++
 build_android/src/main/res/values/strings.xml |  13 ++
 6 files changed, 34 insertions(+), 158 deletions(-)
 delete mode 100644 build_android/src/main/res/layout-zh/activity_gameinfo_edit.xml
 delete mode 100644 build_android/src/main/res/menu-zh/editor.xml

diff --git a/build_android/src/main/res/layout-zh/activity_gameinfo_edit.xml b/build_android/src/main/res/layout-zh/activity_gameinfo_edit.xml
deleted file mode 100644
index 7703168f..00000000
--- a/build_android/src/main/res/layout-zh/activity_gameinfo_edit.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context="com.virtualapplications.play.CoverEditActivity"
-    android:orientation="vertical">
-
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/my_awesome_toolbar"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:background="?attr/colorPrimary"
-        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/scrollView"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin"
-        android:paddingBottom="@dimen/activity_vertical_margin">
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="游戏标题"
-                    android:id="@+id/textView" />
-
-                <EditText
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/editText" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" >
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="游戏概述"
-                    android:id="@+id/textView2" />
-
-                <EditText
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/editText2"
-                    android:minLines="3"
-                    android:maxLines="6" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/coverlayout">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="游戏封面"
-                    android:id="@+id/textView3" />
-
-                <LinearLayout
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:layout_width="175dp"
-                        android:layout_height="250dp"
-                        android:id="@+id/game_icon"
-                        android:layout_gravity="center_horizontal"
-                        android:scaleType="fitXY" />
-
-                    <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:gravity="center">
-
-                        <Button
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="更改"
-                            android:id="@+id/button" />
-
-                        <Button
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="默认"
-                            android:id="@+id/button2" />
-                    </LinearLayout>
-
-                </LinearLayout>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text=""
-                    android:id="@+id/game_text" />
-
-                <TextView
-                    android:id="@+id/currentPosition"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="0"
-                    android:visibility="gone" />
-            </LinearLayout>
-
-        </LinearLayout>
-    </ScrollView>
-
-</LinearLayout>
diff --git a/build_android/src/main/res/layout/activity_gameinfo_edit.xml b/build_android/src/main/res/layout/activity_gameinfo_edit.xml
index a50c81b5..4b42a03f 100644
--- a/build_android/src/main/res/layout/activity_gameinfo_edit.xml
+++ b/build_android/src/main/res/layout/activity_gameinfo_edit.xml
@@ -35,7 +35,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Game Title"
+                    android:text="@string/gameinfo_edit_activity_gametitle"
                     android:id="@+id/textView" />
 
                 <EditText
@@ -52,7 +52,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Game Overview"
+                    android:text="@string/gameinfo_edit_activity_gameoverview"
                     android:id="@+id/textView2" />
 
                 <EditText
@@ -72,7 +72,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Game Cover"
+                    android:text="@string/gameinfo_edit_activity_gamecover"
                     android:id="@+id/textView3" />
 
                 <LinearLayout
@@ -96,13 +96,13 @@
                         <Button
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="Change"
+                            android:text="@string/gameinfo_edit_activity_gamecover_change"
                             android:id="@+id/button" />
 
                         <Button
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="Default"
+                            android:text="@string/gameinfo_edit_activity_gamecover_default"
                             android:id="@+id/button2" />
                     </LinearLayout>
 
diff --git a/build_android/src/main/res/menu-zh/editor.xml b/build_android/src/main/res/menu-zh/editor.xml
deleted file mode 100644
index 9ee72a88..00000000
--- a/build_android/src/main/res/menu-zh/editor.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/action_save"
-        android:icon="@drawable/ic_cab_done_holo_dark"
-        android:title="保存"
-        app:showAsAction="ifRoom"
-        android:orderInCategory="1"/>
-
-    <item
-        android:id="@+id/action_reset"
-        android:icon="@drawable/ic_menu_refresh"
-        android:orderInCategory="2"
-        android:title="重置"
-        app:showAsAction="ifRoom"/>
-    <item
-        android:id="@+id/action_clear_cancel"
-        android:icon="@drawable/abc_ic_clear_mtrl_alpha"
-        android:orderInCategory="3"
-        android:title="取消"
-        app:showAsAction="ifRoom"/>
-</menu>
diff --git a/build_android/src/main/res/menu/editor.xml b/build_android/src/main/res/menu/editor.xml
index d2e37306..6217a1fa 100644
--- a/build_android/src/main/res/menu/editor.xml
+++ b/build_android/src/main/res/menu/editor.xml
@@ -4,19 +4,19 @@
     <item 
         android:id="@+id/action_save"
         android:icon="@drawable/ic_cab_done_holo_dark"
-        android:title="Save"
+        android:title="@string/editor_menu_save"
         app:showAsAction="ifRoom"
         android:orderInCategory="1"/>
     <item
         android:id="@+id/action_reset"
         android:icon="@drawable/ic_menu_refresh"
         android:orderInCategory="2"
-        android:title="Reset"
+        android:title="@string/editor_menu_reset"
         app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/action_clear_cancel"
         android:icon="@drawable/abc_ic_clear_mtrl_alpha"
         android:orderInCategory="3"
-        android:title="Cancel"
+        android:title="@string/editor_menu_cancel"
         app:showAsAction="ifRoom"/>
 </menu>
\ No newline at end of file
diff --git a/build_android/src/main/res/values-zh/strings.xml b/build_android/src/main/res/values-zh/strings.xml
index 67355541..d5f2f9c7 100644
--- a/build_android/src/main/res/values-zh/strings.xml
+++ b/build_android/src/main/res/values-zh/strings.xml
@@ -104,4 +104,17 @@
 	<string name="platform">将 logcat 内容复制到剪贴板\n请在问题报告中粘贴</string>
 	<string name="log_saved">日志保存到 \"Files Dir\" 路径</string>
 	<string name="no_recent_adapter">最近没有玩过PS2游戏。</string>
+	
+	<!-- Editor Menu -->
+	<string name="editor_menu_save">保存</string>
+	<string name="editor_menu_reset">重置</string>
+	<string name="editor_menu_cancel">取消</string>
+	
+	<!-- Game Info Edit Activity -->
+	<string name="gameinfo_edit_activity_gametitle">游戏标题</string>
+	<string name="gameinfo_edit_activity_gameoverview">游戏概述</string>
+	<string name="gameinfo_edit_activity_gamecover">游戏封面</string>
+	<string name="gameinfo_edit_activity_gamecover_change">更改</string>
+	<string name="gameinfo_edit_activity_gamecover_default">默认</string>
+	
 </resources>
diff --git a/build_android/src/main/res/values/strings.xml b/build_android/src/main/res/values/strings.xml
index f70adfc8..21fb1a14 100644
--- a/build_android/src/main/res/values/strings.xml
+++ b/build_android/src/main/res/values/strings.xml
@@ -104,4 +104,17 @@
 	<string name="platform">Copying logcat content to clipboard\nPlease paste in the issue report</string>
 	<string name="log_saved">Log saved to \"Files Dir\" path</string>
 	<string name="no_recent_adapter">No recently played PS2 game found.</string>
+	
+	<!-- Editor Menu -->
+	<string name="editor_menu_save">Save</string>
+	<string name="editor_menu_reset">Reset</string>
+	<string name="editor_menu_cancel">Cancel</string>
+	
+	<!-- Game Info Edit Activity -->
+	<string name="gameinfo_edit_activity_gametitle">Game Title</string>
+	<string name="gameinfo_edit_activity_gameoverview">Game Overview</string>
+	<string name="gameinfo_edit_activity_gamecover">Game Cover</string>
+	<string name="gameinfo_edit_activity_gamecover_change">Change</string>
+	<string name="gameinfo_edit_activity_gamecover_default">Default</string>
+	
 </resources>