diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f4349bf..0b1002b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -26,6 +26,8 @@
+
+
@@ -52,58 +54,28 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -136,12 +108,12 @@
@@ -177,6 +149,8 @@
+
+
@@ -336,8 +310,6 @@
-
-
@@ -386,6 +358,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -413,19 +398,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -531,7 +503,7 @@
-
+
@@ -540,7 +512,7 @@
-
+
@@ -557,8 +529,8 @@
-
+
@@ -894,13 +866,6 @@
-
-
-
-
-
-
-
@@ -920,14 +885,6 @@
-
-
-
-
-
-
-
-
@@ -965,32 +922,32 @@
-
+
-
-
+
+
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
-
@@ -1000,18 +957,34 @@
-
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
diff --git a/out/production/ManekkoDance/ManekkoDance.apk b/out/production/ManekkoDance/ManekkoDance.apk
index 498feda..febd1af 100644
Binary files a/out/production/ManekkoDance/ManekkoDance.apk and b/out/production/ManekkoDance/ManekkoDance.apk differ
diff --git a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/DragViewListener.class b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/DragViewListener.class
index 631312e..1d5c9fc 100644
Binary files a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/DragViewListener.class and b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/DragViewListener.class differ
diff --git a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$1$1$1.class b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$1$1$1.class
index 01e7f1c..6e033a2 100644
Binary files a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$1$1$1.class and b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$1$1$1.class differ
diff --git a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$1$1.class b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$1$1.class
index cc12548..295a7d9 100644
Binary files a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$1$1.class and b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$1$1.class differ
diff --git a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$1.class b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$1.class
index baed111..d3a3f33 100644
Binary files a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$1.class and b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$1.class differ
diff --git a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$2.class b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$2.class
index 0a9deac..4a8f199 100644
Binary files a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$2.class and b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$2.class differ
diff --git a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$3.class b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$3.class
index 6a5b261..df12fcf 100644
Binary files a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$3.class and b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$3.class differ
diff --git a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$CommandExecutor$1$1.class b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$CommandExecutor$1$1.class
index 3e9b434..5ae59bb 100644
Binary files a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$CommandExecutor$1$1.class and b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$CommandExecutor$1$1.class differ
diff --git a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$CommandExecutor$1.class b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$CommandExecutor$1.class
index 9028068..0c5fc18 100644
Binary files a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$CommandExecutor$1.class and b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$CommandExecutor$1.class differ
diff --git a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$CommandExecutor$2.class b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$CommandExecutor$2.class
index 115341a..f30388c 100644
Binary files a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$CommandExecutor$2.class and b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$CommandExecutor$2.class differ
diff --git a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$CommandExecutor.class b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$CommandExecutor.class
index d92a03c..06d12b4 100644
Binary files a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$CommandExecutor.class and b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity$CommandExecutor.class differ
diff --git a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity.class b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity.class
index cf0504c..04b8b19 100644
Binary files a/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity.class and b/out/production/ManekkoDance/net/exkazuu/ManekkoDance/activities/MainActivity.class differ
diff --git a/src/net/exkazuu/ManekkoDance/activities/DragViewListener.java b/src/net/exkazuu/ManekkoDance/activities/DragViewListener.java
index cd68255..afcfe2c 100644
--- a/src/net/exkazuu/ManekkoDance/activities/DragViewListener.java
+++ b/src/net/exkazuu/ManekkoDance/activities/DragViewListener.java
@@ -19,11 +19,12 @@ public class DragViewListener implements OnTouchListener {
private int flag[][];
private int resb[][];
private ImageView[][] canwrite;
+ private String lessonNumber;
private int oldx;
private int oldy;
public DragViewListener(ImageView dragView, ImageView[][] cells,
- String[][] program, TextView text, int[][] flag, int[][] resb, ImageView[][] canwrite) {
+ String[][] program, TextView text, int[][] flag, int[][] resb, ImageView[][] canwrite, String lessonNumber) {
this.dragView = dragView;
this.cells = cells;
this.program = program;
@@ -31,6 +32,7 @@ public DragViewListener(ImageView dragView, ImageView[][] cells,
this.flag = flag;
this.resb = resb;
this.canwrite = canwrite;
+ this.lessonNumber = lessonNumber;
}
public boolean onTouch(View view, MotionEvent event) {
@@ -136,6 +138,23 @@ public boolean onTouch(View view, MotionEvent event) {
}
}
}
+
+ if (lessonNumber.equals("4")) {
+ for (int i = 0; i < 3; i++) {
+ for (int j = 8; j < 12; j++) {
+ program[i][j] = "";
+ }
+ }
+ } else if (lessonNumber.equals("2")) {
+ } else {
+ for (int i = 0; i < 3; i++) {
+ for (int j = 10; j < 12; j++) {
+ program[i][j] = "";
+ }
+ }
+ }
+
+ //アイコンに変更
for (int i = 0; i < 3; i++) {
for (int j = 0; j < 12; j++) {
if (program[i][j] == "右腕を上げる") {
@@ -185,6 +204,8 @@ public boolean onTouch(View view, MotionEvent event) {
}
}
}
+
+ //次の入力場所の表示
for (int j = 0; j < 12; j++) {
int flag = 0;
for (int i = 0; i < 3; i++) {
@@ -192,7 +213,7 @@ public boolean onTouch(View view, MotionEvent event) {
if (flag == 0) {
canwrite[i][j].setImageResource(R.drawable.haikei2);
flag = 1;
- }else{
+ } else {
canwrite[i][j].setImageResource(R.drawable.haikei);
}
} else {
diff --git a/src/net/exkazuu/ManekkoDance/activities/MainActivity.java b/src/net/exkazuu/ManekkoDance/activities/MainActivity.java
index f230023..293431e 100644
--- a/src/net/exkazuu/ManekkoDance/activities/MainActivity.java
+++ b/src/net/exkazuu/ManekkoDance/activities/MainActivity.java
@@ -115,6 +115,9 @@ public void onCreate(Bundle savedInstanceState) {
}
// 背景たち
+ Intent intent = getIntent();
+ message = intent.getStringExtra("message");
+ String lessonNumber = message;
int[][] resb = new int[3][12];
ImageView[][] cells = new ImageView[3][12];
DragViewListener[][] backgroundlistener = new DragViewListener[3][12];
@@ -129,7 +132,7 @@ public void onCreate(Bundle savedInstanceState) {
resb[i][j] = this.getResources().getIdentifier("image" + i + "_" + j, "id", this.getPackageName());
cells[i][j] = (ImageView) findViewById(resb[i][j]);
backgroundlistener[i][j] = new DragViewListener(cells[i][j], cells,
- program, text, flag, resb, canwrite);
+ program, text, flag, resb, canwrite, lessonNumber);
cells[i][j].setOnTouchListener(backgroundlistener[i][j]);
}
}
@@ -146,7 +149,7 @@ public void onCreate(Bundle savedInstanceState) {
res[0][i] = this.getResources().getIdentifier("imageView" + (i + 1), "id", this.getPackageName());
dragView[0][i] = (ImageView) findViewById(res[0][i]);
listener[0][i] = new DragViewListener(dragView[0][i], cells,
- program, text, flag, resb, canwrite);
+ program, text, flag, resb, canwrite, lessonNumber);
dragView[0][i].setOnTouchListener(listener[0][i]);
}
//アイコンたち(数字達)
@@ -154,7 +157,7 @@ public void onCreate(Bundle savedInstanceState) {
res[1][i] = this.getResources().getIdentifier("imageView" + 0 + i, "id", this.getPackageName());
dragView[1][i] = (ImageView) findViewById(res[1][i]);
listener[1][i] = new DragViewListener(dragView[1][i], cells,
- program, text, flag, resb, canwrite);
+ program, text, flag, resb, canwrite, lessonNumber);
dragView[1][i].setOnTouchListener(listener[1][i]);
}
@@ -167,9 +170,9 @@ public void onCreate(Bundle savedInstanceState) {
}
/********** Lesson data の 取得 **************/
- Intent intent = getIntent();
+ // Intent intent = getIntent();
lesson = intent.getStringExtra("lesson");
- message = intent.getStringExtra("message");
+ // message = intent.getStringExtra("message");
text_data = intent.getStringExtra("text_data");
Log.v("my_debug", "" + text_data);
if (text_data != null) {