mint

diff --git a/workspace/JuggleMaster/bin/JuggleMaster.apk b/workspace/JuggleMaster/bin/JuggleMaster.apk
index ddfdc5f..fc8935d 100644 (file)
Binary files a/workspace/JuggleMaster/bin/JuggleMaster.apk and b/workspace/JuggleMaster/bin/JuggleMaster.apk differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/Edit$6.class b/workspace/JuggleMaster/bin/classes/com/jm/Edit$6.class
index a13296d..d8fef5e 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/Edit$6.class and b/workspace/JuggleMaster/bin/classes/com/jm/Edit$6.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/GenPattern.class b/workspace/JuggleMaster/bin/classes/com/jm/GenPattern.class
index 7e98c6c..b643a95 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/GenPattern.class and b/workspace/JuggleMaster/bin/classes/com/jm/GenPattern.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/Menu1.class b/workspace/JuggleMaster/bin/classes/com/jm/Menu1.class
index 12fa512..8f6490b 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/Menu1.class and b/workspace/JuggleMaster/bin/classes/com/jm/Menu1.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/R$string.class b/workspace/JuggleMaster/bin/classes/com/jm/R$string.class
index f01dbd5..66d37ad 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/R$string.class and b/workspace/JuggleMaster/bin/classes/com/jm/R$string.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/utility/AsyncTaskCommand.class b/workspace/JuggleMaster/bin/classes/com/jm/utility/AsyncTaskCommand.class
index 2d4e1ff..af69905 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/utility/AsyncTaskCommand.class and b/workspace/JuggleMaster/bin/classes/com/jm/utility/AsyncTaskCommand.class differ

diff --git a/workspace/JuggleMaster/bin/classes/com/jm/utility/BaseActivity.class b/workspace/JuggleMaster/bin/classes/com/jm/utility/BaseActivity.class
index a65cb32..023291b 100644 (file)
Binary files a/workspace/JuggleMaster/bin/classes/com/jm/utility/BaseActivity.class and b/workspace/JuggleMaster/bin/classes/com/jm/utility/BaseActivity.class differ

diff --git a/workspace/JuggleMaster/bin/resources.ap_ b/workspace/JuggleMaster/bin/resources.ap_
index 5e151fb..37047d5 100644 (file)
Binary files a/workspace/JuggleMaster/bin/resources.ap_ and b/workspace/JuggleMaster/bin/resources.ap_ differ

diff --git a/workspace/JuggleMaster/gen/com/jm/R.java b/workspace/JuggleMaster/gen/com/jm/R.java
index 23a97ac..49d32eb 100644 (file)
--- a/workspace/JuggleMaster/gen/com/jm/R.java
+++ b/workspace/JuggleMaster/gen/com/jm/R.java
@@ -75,46 +75,46 @@ public final class R {
         public static final int menu2=0x7f030006;
     }
     public static final class string {
-        public static final int app_name=0x7f040001;
-        public static final int bheight=0x7f040018;
-        public static final int calculating=0x7f040013;
-        public static final int cancel=0x7f040009;
-        public static final int close=0x7f04000a;
-        public static final int common_settings=0x7f040010;
-        public static final int create=0x7f040012;
-        public static final int delete=0x7f040008;
-        public static final int error_unexpected=0x7f040020;
-        public static final int generate=0x7f04001b;
-        public static final int handling=0x7f04000d;
-        public static final int height=0x7f04000e;
-        public static final int help=0x7f040006;
-        public static final int help1=0x7f040002;
-        public static final int help2=0x7f040003;
-        public static final int help3=0x7f040004;
-        public static final int help4=0x7f040005;
-        public static final int hold=0x7f04000f;
-        public static final int lang=0x7f040000;
-        public static final int list0_1=0x7f040021;
-        public static final int list0_2=0x7f040022;
-        public static final int list0_3=0x7f040023;
-        public static final int list0_4=0x7f040024;
-        public static final int list0_5=0x7f040025;
-        public static final int list0_6=0x7f040026;
-        public static final int list0_7=0x7f040027;
-        public static final int list0_8=0x7f040028;
-        public static final int message_delete_pattern=0x7f04001e;
-        public static final int message_nopattern=0x7f04001f;
-        public static final int normal=0x7f040015;
-        public static final int number=0x7f040017;
-        public static final int patternMax=0x7f04001a;
-        public static final int patternTypes=0x7f040014;
-        public static final int pattern_name=0x7f04000b;
-        public static final int period=0x7f040019;
-        public static final int save=0x7f040007;
-        public static final int siteswap=0x7f04000c;
-        public static final int speed=0x7f040011;
-        public static final int synchronization=0x7f040016;
-        public static final int title_delete=0x7f04001d;
-        public static final int title_system_error=0x7f04001c;
+        public static final int app_name=0x7f040000;
+        public static final int bheight=0x7f040017;
+        public static final int calculating=0x7f040012;
+        public static final int cancel=0x7f040008;
+        public static final int close=0x7f040009;
+        public static final int common_settings=0x7f04000f;
+        public static final int create=0x7f040011;
+        public static final int delete=0x7f040007;
+        public static final int error_unexpected=0x7f04001f;
+        public static final int generate=0x7f04001a;
+        public static final int handling=0x7f04000c;
+        public static final int height=0x7f04000d;
+        public static final int help=0x7f040005;
+        public static final int help1=0x7f040001;
+        public static final int help2=0x7f040002;
+        public static final int help3=0x7f040003;
+        public static final int help4=0x7f040004;
+        public static final int hold=0x7f04000e;
+        public static final int lang=0x7f040028;
+        public static final int list0_1=0x7f040020;
+        public static final int list0_2=0x7f040021;
+        public static final int list0_3=0x7f040022;
+        public static final int list0_4=0x7f040023;
+        public static final int list0_5=0x7f040024;
+        public static final int list0_6=0x7f040025;
+        public static final int list0_7=0x7f040026;
+        public static final int list0_8=0x7f040027;
+        public static final int message_delete_pattern=0x7f04001d;
+        public static final int message_nopattern=0x7f04001e;
+        public static final int normal=0x7f040014;
+        public static final int number=0x7f040016;
+        public static final int patternMax=0x7f040019;
+        public static final int patternTypes=0x7f040013;
+        public static final int pattern_name=0x7f04000a;
+        public static final int period=0x7f040018;
+        public static final int save=0x7f040006;
+        public static final int siteswap=0x7f04000b;
+        public static final int speed=0x7f040010;
+        public static final int synchronization=0x7f040015;
+        public static final int title_delete=0x7f04001c;
+        public static final int title_system_error=0x7f04001b;
     }
 }

diff --git a/workspace/JuggleMaster/res/values/strings.xml b/workspace/JuggleMaster/res/values/strings.xml
index d33209d..e6b8156 100644 (file)
--- a/workspace/JuggleMaster/res/values/strings.xml
+++ b/workspace/JuggleMaster/res/values/strings.xml
@@ -1,48 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="lang">1</string>
-    
     <string name="app_name">JuggleMaster</string>
-    <string name="help1">●By holding down the list, you can edit the pattern.</string>
-    <string name="help2">●By selecting 「[7]マイパターン」→「[新規作成]」, you can register a new pattern.</string>
-    <string name="help3">●By selecting 「[8]パターン生成」, you can generate new patterns.</string>
-    <string name="help4">●By touching the screen, you can change the juggler\'s perspective.</string>
+    <string name="help1">●You can change the figure by pressing a few seconds on its name</string>
+    <string name="help2">●You can create a new figure by going into the menu [7] My patterns</string>
+    <string name="help3">●You can generate patterns by going to the menu [8] generator patterns</string>
+    <string name="help4">●You can change your point of view by draging the juggler</string>
     <string name="help">Help</string>
-    <string name="save">save</string>
-    <string name="delete">delete</string>
-    <string name="cancel">cancel</string>
-    <string name="close">close</string>
-    <string name="pattern_name">name</string>
-    <string name="siteswap">siteswap</string>
-    <string name="handling">handling</string>
-    <string name="height">height</string>
-    <string name="hold">hold</string>
-    <string name="common_settings">[common settings]</string>
-    <string name="speed">speed</string>
-    <string name="create">new</string>
-    <string name="calculating">calculating・・・</string>
+    <string name="save">Save</string>
+    <string name="delete">Delete</string>
+    <string name="cancel">Cancel</string>
+    <string name="close">Close</string>
+    <string name="pattern_name">Pattern name</string>
+    <string name="siteswap">Siteswap</string>
+    <string name="handling">Handling</string>
+    <string name="height">Height</string>
+    <string name="hold">Retention time</string>
+    <string name="common_settings">[Common Settings]</string>
+    <string name="speed">Speed</string>
+    <string name="create">New</string>
+    <string name="calculating">During the calculation・・・</string>
     
-    <string name="patternTypes">pattern types</string>
-    <string name="normal">normal</string>
-    <string name="synchronization">synchronization</string>
-    <string name="number">number of balls</string>
-    <string name="bheight">height</string>
-    <string name="period">period</string>
-    <string name="patternMax">max</string>
-    <string name="generate">generate</string>
+    <string name="patternTypes">The type of pattern</string>
+    <string name="normal">Usually</string>
+    <string name="synchronization">Synchro</string>
+    <string name="number">Number of balls</string>
+    <string name="bheight">The height of the ball</string>
+    <string name="period">Period of the pattern</string>
+    <string name="patternMax">The maximum number of patterns</string>
+    <string name="generate">Generation</string>
 
     <string name="title_system_error">System Error</string>
     <string name="title_delete">Delete</string>
-    <string name="message_delete_pattern">Do you want to remove this pattern?</string>
-    <string name="message_nopattern">Pattern was not found</string>
+    <string name="message_delete_pattern">Are you sure you want to delete this pattern</string>
+    <string name="message_nopattern">There is no pattern</string>
     <string name="error_unexpected">An unexpected error has occurred</string>
     
-    <string name="list0_1">[1] 3ball part1</string>
-    <string name="list0_2">[2] 3ボール その2</string>
-    <string name="list0_3">[3] 4ボール</string>
-    <string name="list0_4">[4] 5ボール</string>
-    <string name="list0_5">[5] 6ボール以上</string>
-    <string name="list0_6">[6] トレーニング</string>
-    <string name="list0_7">[7] マイパターン</string>
-    <string name="list0_8">[8] パターン生成</string>
+    <string name="list0_1">[1] 3 Balls Part 1</string>
+    <string name="list0_2">[2] 3 Balls Part 2</string>
+    <string name="list0_3">[3] 4 Balls</string>
+    <string name="list0_4">[4] 5 Balls</string>
+    <string name="list0_5">[5] 6 Balls and more</string>
+    <string name="list0_6">[6] Education</string>
+    <string name="list0_7">[7] My patterns</string>
+    <string name="list0_8">[8] Patterns generator</string>
 </resources>

diff --git a/workspace/JuggleMaster/src/com/jm/Menu1.java b/workspace/JuggleMaster/src/com/jm/Menu1.java
index ddd8290..57f09c0 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/Menu1.java
+++ b/workspace/JuggleMaster/src/com/jm/Menu1.java
@@ -20,16 +20,16 @@ public class Menu1 extends BaseActivity {
         setContentView(R.layout.menu1);\r
 \r
                //CharSequence[] list = PatternList.PACKAGE_INDEX;\r
-        CharSequence[] list = new CharSequence[8];\r
-        list[0] = getString(com.jm.R.string.list0_1);\r
-        list[1] = getString(com.jm.R.string.list0_2);\r
-        list[2] = getString(com.jm.R.string.list0_3);\r
-        list[3] = getString(com.jm.R.string.list0_4);\r
-        list[4] = getString(com.jm.R.string.list0_5);\r
-        list[5] = getString(com.jm.R.string.list0_6);\r
-        list[6] = getString(com.jm.R.string.list0_7);\r
-        list[7] = getString(com.jm.R.string.list0_8);\r
-        \r
+               CharSequence[] list = {\r
+                               getString(R.string.list0_1),\r
+                               getString(R.string.list0_2),\r
+                               getString(R.string.list0_3),\r
+                               getString(R.string.list0_4),\r
+                               getString(R.string.list0_5),\r
+                               getString(R.string.list0_6),\r
+                               getString(R.string.list0_7),\r
+                               getString(R.string.list0_8)\r
+               };\r
                ArrayAdapter<CharSequence> adapter = new ArrayAdapter<CharSequence>(this, android.R.layout.simple_list_item_1, list);\r
                ListView listView = (ListView)findViewById(R.id.Menu1);\r
                listView.setAdapter(adapter);\r