set title image and fix text

diff --git a/ECC/res/drawable-hdpi/title.png b/ECC/res/drawable-hdpi/title.png
new file mode 100644 (file)
index 0000000..15c727a
Binary files /dev/null and b/ECC/res/drawable-hdpi/title.png differ

diff --git a/ECC/res/drawable-ldpi/title.png b/ECC/res/drawable-ldpi/title.png
new file mode 100644 (file)
index 0000000..15c727a
Binary files /dev/null and b/ECC/res/drawable-ldpi/title.png differ

diff --git a/ECC/res/drawable-mdpi/title.png b/ECC/res/drawable-mdpi/title.png
new file mode 100644 (file)
index 0000000..15c727a
Binary files /dev/null and b/ECC/res/drawable-mdpi/title.png differ

diff --git a/ECC/res/drawable-xhdpi/title.png b/ECC/res/drawable-xhdpi/title.png
new file mode 100644 (file)
index 0000000..15c727a
Binary files /dev/null and b/ECC/res/drawable-xhdpi/title.png differ

diff --git a/ECC/res/values/code.xml b/ECC/res/values/code.xml
index 80060e1..ce59252 100644 (file)
--- a/ECC/res/values/code.xml
+++ b/ECC/res/values/code.xml
@@ -4,6 +4,7 @@
     <array name="questions">
         <item>@array/q1</item>
         <item>@array/q2</item>
+        <item>@array/q3</item>
     </array>
     <array name="q1">
         <item>@integer/q1_row</item>
@@ -120,74 +121,136 @@
         <item>0</item>
         <item>1</item>
         <item>0</item>
-        <item>1</item>
-        <item>1</item>
         <item>0</item>
         <item>0</item>
+        <item>1</item>
+        <item>1</item>
     </string-array>
     <string-array name="q2_row2">
-        <item>0</item>
+        <item>1</item>
         <item>1</item>
         <item>0</item>
         <item>0</item>
         <item>1</item>
-        <item>0</item>
         <item>1</item>
         <item>0</item>
+        <item>1</item>
     </string-array>
     <string-array name="q2_row3">
-        <item>0</item>
-        <item>0</item>
-        <item>1</item>
         <item>1</item>
         <item>1</item>
         <item>0</item>
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-    <string-array name="q2_row4">
         <item>1</item>
         <item>0</item>
+        <item>1</item>
         <item>0</item>
         <item>0</item>
+    </string-array>
+    <string-array name="q2_row4">
         <item>0</item>
         <item>0</item>
         <item>1</item>
         <item>1</item>
+        <item>1</item>
+        <item>0</item>
+        <item>1</item>
+        <item>0</item>
     </string-array>
     <string-array name="q2_row5">
         <item>0</item>
         <item>1</item>
         <item>1</item>
-        <item>1</item>
-        <item>1</item>
         <item>0</item>
+        <item>1</item>
         <item>0</item>
         <item>0</item>
+        <item>1</item>
     </string-array>
     <string-array name="q2_row6">
-        <item>0</item>
         <item>1</item>
         <item>1</item>
         <item>1</item>
-        <item>1</item>
-        <item>0</item>
         <item>0</item>
+        <item>1</item>
+        <item>1</item>
         <item>0</item>
+        <item>1</item>
     </string-array>
 
     <array name="q2_answer">
         <item>@array/q2_ans1</item>
         <item>@array/q2_ans2</item>
+        <item>@array/q2_ans3</item>
     </array>
 
     <integer-array name="q2_ans1">
         <item>2</item>
-        <item>3</item>
+        <item>6</item>
     </integer-array>
     <integer-array name="q2_ans2">
         <item>4</item>
-        <item>6</item>
+        <item>5</item>
     </integer-array>
+       <integer-array name="q2_ans3">
+        <item>5</item>
+        <item>2</item>
+    </integer-array>
+    
+    <array name="q3">
+        <item>@integer/q3_row</item>
+        <item>@integer/q3_col</item>
+        <item>@integer/q3_checkrow</item>
+        <item>@integer/q3_checkcol</item>
+        <item>@array/q3_code</item>
+        <item>@array/q3_answer</item>
+    </array>
+
+    <integer name="q3_row">4</integer>
+    <integer name="q3_col">6</integer>
+    <integer name="q3_checkrow">4</integer>
+    <integer name="q3_checkcol">6</integer>
+
+    <array name="q3_code">
+        <item>@array/q3_row1</item>
+        <item>@array/q3_row2</item>
+        <item>@array/q3_row3</item>
+        <item>@array/q3_row4</item>
+    </array>
 
+    <string-array name="q3_row1">
+        <item>1</item>
+        <item>0</item>
+        <item>1</item>
+        <item>0</item>
+        <item>1</item>
+        <item>1</item>
+    </string-array>
+    <string-array name="q3_row2">
+        <item>0</item>
+        <item>1</item>
+        <item>1</item>
+        <item>1</item>
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+    <string-array name="q3_row3">
+        <item>0</item>
+        <item>0</item>
+        <item>1</item>
+        <item>0</item>
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+    <string-array name="q3_row4">
+        <item>1</item>
+        <item>1</item>
+        <item>1</item>
+        <item>1</item>
+        <item>1</item>
+        <item>1</item>
+    </string-array>
+
+    <array name="q3_answer">
+    </array>
+    
 </resources>
\ No newline at end of file

diff --git a/ECC/res/values/strings.xml b/ECC/res/values/strings.xml
index d804574..d6fb910 100644 (file)
--- a/ECC/res/values/strings.xml
+++ b/ECC/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">ECC</string>
-    <string name="text">符号！</string>
+    <string name="text">次のパリティチェック符号の誤りを訂正せよ。</string>
 </resources>
\ No newline at end of file

diff --git a/ECC/src/jp/ac/titech/sharp4k/cuten/sampletask/ECCTask.java b/ECC/src/jp/ac/titech/sharp4k/cuten/sampletask/ECCTask.java
index 7b251d2..5ec7acc 100644 (file)
--- a/ECC/src/jp/ac/titech/sharp4k/cuten/sampletask/ECCTask.java
+++ b/ECC/src/jp/ac/titech/sharp4k/cuten/sampletask/ECCTask.java
@@ -8,11 +8,13 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 public class ECCTask extends BaseApp {
        final private int TEXT_VIEW = 1;
+       final private int IMAGE_VIEW = 1;
        final private int MATRIX_VIEW = 2;
        final private int RESET_BUTTON = 3;
        final private int NEXT_BUTTON = 4;
@@ -33,17 +35,16 @@ public class ECCTask extends BaseApp {
                // set layout
                reLay = new RelativeLayout(ctx);
 
-               // textview
-               TextView tv = new TextView(ctx);
-               tv.setText("たいとる");
-               tv.setTextSize(50);
-               tv.setId(TEXT_VIEW);
-               RelativeLayout.LayoutParams tvParam = new RelativeLayout.LayoutParams(
+               // imageview
+               ImageView iv = new ImageView(ctx);
+               iv.setImageResource(R.drawable.title);
+               iv.setId(IMAGE_VIEW);
+               RelativeLayout.LayoutParams ivParam = new RelativeLayout.LayoutParams(
                                ViewGroup.LayoutParams.WRAP_CONTENT,
                                ViewGroup.LayoutParams.WRAP_CONTENT);
-               tvParam.addRule(RelativeLayout.ALIGN_PARENT_TOP, -1);
-               tvParam.addRule(RelativeLayout.CENTER_HORIZONTAL, -1);
-               reLay.addView(tv, tvParam);
+               ivParam.addRule(RelativeLayout.ALIGN_PARENT_TOP, -1);
+               ivParam.addRule(RelativeLayout.CENTER_HORIZONTAL, -1);
+               reLay.addView(iv, ivParam);
 
                // button
                Button start = new Button(ctx);
@@ -51,7 +52,7 @@ public class ECCTask extends BaseApp {
                RelativeLayout.LayoutParams startParam = new RelativeLayout.LayoutParams(
                                ViewGroup.LayoutParams.WRAP_CONTENT,
                                ViewGroup.LayoutParams.WRAP_CONTENT);
-               startParam.addRule(RelativeLayout.BELOW, TEXT_VIEW);
+               startParam.addRule(RelativeLayout.BELOW, IMAGE_VIEW);
                startParam.addRule(RelativeLayout.CENTER_HORIZONTAL, -1);
                reLay.addView(start, startParam);