From 45d1ec1fc82a6155402115b558b4e20618c57d63 Mon Sep 17 00:00:00 2001
From: Nereo <lovetuzitong@gmail.com>
Date: Thu, 16 Apr 2015 13:34:06 +0800
Subject: [PATCH] modify demo app

---
 app/src/main/AndroidManifest.xml               |  6 +++++-
 .../nereo/multiimageselector/MainActivity.java |  8 ++++++++
 app/src/main/res/layout/activity_main.xml      | 18 +++++++++---------
 app/src/main/res/values-zh/strings.xml         | 16 +++++++++++++---
 app/src/main/res/values/strings.xml            | 11 ++++++++++-
 5 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 911b777..fdccbb1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,11 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="me.nereo.multi_image_selector.MultiImageSelectorActivity" />
+        <activity
+            android:configChanges="orientation|screenSize"
+            android:name="me.nereo.multi_image_selector.MultiImageSelectorActivity" />
+
+        <activity android:name=".GestureImageActivity" />
 
     </application>
 
diff --git a/app/src/main/java/me/nereo/multiimageselector/MainActivity.java b/app/src/main/java/me/nereo/multiimageselector/MainActivity.java
index 1667963..2b7d23f 100644
--- a/app/src/main/java/me/nereo/multiimageselector/MainActivity.java
+++ b/app/src/main/java/me/nereo/multiimageselector/MainActivity.java
@@ -84,6 +84,14 @@ public class MainActivity extends ActionBarActivity {
 
             }
         });
+
+/*        findViewById(R.id.button2).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(MainActivity.this, GestureImageActivity.class);
+                startActivity(intent);
+            }
+        });*/
     }
 
     @Override
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c00b711..a87f667 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,7 +10,7 @@
     <TextView
         android:focusableInTouchMode="true"
         android:focusable="true"
-        android:text="选择模式："
+        android:text="@string/select_mode"
         android:textSize="16sp"
         android:textStyle="bold"
         android:textColor="@android:color/black"
@@ -26,19 +26,19 @@
 
         <RadioButton
             android:id="@+id/single"
-            android:text="单选"
+            android:text="@string/mode_single"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
         <RadioButton
             android:id="@+id/multi"
-            android:text="多选"
+            android:text="@string/mode_multi"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
         </RadioGroup>
 
     <TextView
-        android:text="最大选择数量："
+        android:text="@string/max_select_amount"
         android:textSize="16sp"
         android:textStyle="bold"
         android:textColor="@android:color/black"
@@ -47,14 +47,14 @@
 
     <EditText
         android:id="@+id/request_num"
-        android:hint="默认数量为9"
+        android:hint="@string/hint_default_amount"
         android:enabled="false"
         android:inputType="number"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
     <TextView
-        android:text="是否显示Camera："
+        android:text="@string/enable_camera"
         android:textSize="16sp"
         android:textStyle="bold"
         android:textColor="@android:color/black"
@@ -70,12 +70,12 @@
 
         <RadioButton
             android:id="@+id/show"
-            android:text="是"
+            android:text="@string/enable"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
         <RadioButton
             android:id="@+id/no_show"
-            android:text="否"
+            android:text="@string/disable"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
@@ -84,7 +84,7 @@
     <Button
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="图片选择"
+        android:text="@string/go_select"
         android:id="@+id/button"/>
 
     <ScrollView
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 2399710..1815366 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -1,6 +1,16 @@
 <resources>
-    <string name="app_name">MultiImageSelector</string>
+    <string name="app_name">多图选择</string>
+
+    <string name="action_settings">设置</string>
+
+    <string name="select_mode">选择模式</string>
+    <string name="mode_single">单选</string>
+    <string name="mode_multi">多选</string>
+    <string name="max_select_amount">最大选择数量</string>
+    <string name="hint_default_amount">默认数量为9</string>
+    <string name="enable_camera">是否启用照相机</string>
+    <string name="enable">是</string>
+    <string name="disable">否</string>
+    <string name="go_select">图片选择</string>
 
-    <string name="hello_world">Hello world!</string>
-    <string name="action_settings">Settings</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2399710..fd04af9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,15 @@
 <resources>
     <string name="app_name">MultiImageSelector</string>
 
-    <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
+    <string name="select_mode">Select Mode</string>
+    <string name="mode_single">Single-Choice</string>
+    <string name="mode_multi">Multi-Choice</string>
+    <string name="max_select_amount">Max Selected Amount</string>
+    <string name="hint_default_amount">default amount is 9</string>
+    <string name="enable_camera">Enable Camera</string>
+    <string name="enable">Enable</string>
+    <string name="disable">Disable</string>
+    <string name="go_select">Select</string>
+
 </resources>