diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..8505da6
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d8dab4c..c2f0469 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,4 +1,4 @@
-
+
-
+ android:targetSdkVersion="22" />
+
+
+
+
diff --git a/bin/AndroidManifest.xml b/bin/AndroidManifest.xml
index d8dab4c..c2f0469 100644
--- a/bin/AndroidManifest.xml
+++ b/bin/AndroidManifest.xml
@@ -1,4 +1,4 @@
-
+
-
+ android:targetSdkVersion="22" />
+
+
+
+
diff --git a/bin/Survey2015.apk b/bin/Survey2015.apk
index 4d832a6..31ca87d 100644
Binary files a/bin/Survey2015.apk and b/bin/Survey2015.apk differ
diff --git a/bin/classes.dex b/bin/classes.dex
index bf660da..5b212ad 100644
Binary files a/bin/classes.dex and b/bin/classes.dex differ
diff --git a/bin/classes/com/joken/survey2015/MainActivity$1.class b/bin/classes/com/joken/survey2015/MainActivity$1.class
index 45ee4f6..8531191 100644
Binary files a/bin/classes/com/joken/survey2015/MainActivity$1.class and b/bin/classes/com/joken/survey2015/MainActivity$1.class differ
diff --git a/bin/classes/com/joken/survey2015/MainActivity$2.class b/bin/classes/com/joken/survey2015/MainActivity$2.class
index ef0f8a5..85d5bab 100644
Binary files a/bin/classes/com/joken/survey2015/MainActivity$2.class and b/bin/classes/com/joken/survey2015/MainActivity$2.class differ
diff --git a/bin/classes/com/joken/survey2015/MainActivity.class b/bin/classes/com/joken/survey2015/MainActivity.class
index 39bc15d..a00bb8a 100644
Binary files a/bin/classes/com/joken/survey2015/MainActivity.class and b/bin/classes/com/joken/survey2015/MainActivity.class differ
diff --git a/bin/classes/com/joken/survey2015/R$array.class b/bin/classes/com/joken/survey2015/R$array.class
index 4605704..8087d77 100644
Binary files a/bin/classes/com/joken/survey2015/R$array.class and b/bin/classes/com/joken/survey2015/R$array.class differ
diff --git a/bin/classes/com/joken/survey2015/R$attr.class b/bin/classes/com/joken/survey2015/R$attr.class
index 6253358..ee3c184 100644
Binary files a/bin/classes/com/joken/survey2015/R$attr.class and b/bin/classes/com/joken/survey2015/R$attr.class differ
diff --git a/bin/classes/com/joken/survey2015/R$color.class b/bin/classes/com/joken/survey2015/R$color.class
index 552272e..8638eb3 100644
Binary files a/bin/classes/com/joken/survey2015/R$color.class and b/bin/classes/com/joken/survey2015/R$color.class differ
diff --git a/bin/classes/com/joken/survey2015/R$dimen.class b/bin/classes/com/joken/survey2015/R$dimen.class
index e4d5af6..4b0d39f 100644
Binary files a/bin/classes/com/joken/survey2015/R$dimen.class and b/bin/classes/com/joken/survey2015/R$dimen.class differ
diff --git a/bin/classes/com/joken/survey2015/R$drawable.class b/bin/classes/com/joken/survey2015/R$drawable.class
index 0b72f14..ba128e9 100644
Binary files a/bin/classes/com/joken/survey2015/R$drawable.class and b/bin/classes/com/joken/survey2015/R$drawable.class differ
diff --git a/bin/classes/com/joken/survey2015/R$id.class b/bin/classes/com/joken/survey2015/R$id.class
index 911572b..fadbd7e 100644
Binary files a/bin/classes/com/joken/survey2015/R$id.class and b/bin/classes/com/joken/survey2015/R$id.class differ
diff --git a/bin/classes/com/joken/survey2015/R$layout.class b/bin/classes/com/joken/survey2015/R$layout.class
index a683365..4e32e96 100644
Binary files a/bin/classes/com/joken/survey2015/R$layout.class and b/bin/classes/com/joken/survey2015/R$layout.class differ
diff --git a/bin/classes/com/joken/survey2015/R$menu.class b/bin/classes/com/joken/survey2015/R$menu.class
index fa2be1c..c297790 100644
Binary files a/bin/classes/com/joken/survey2015/R$menu.class and b/bin/classes/com/joken/survey2015/R$menu.class differ
diff --git a/bin/classes/com/joken/survey2015/R$string.class b/bin/classes/com/joken/survey2015/R$string.class
index 5243d46..6c487bb 100644
Binary files a/bin/classes/com/joken/survey2015/R$string.class and b/bin/classes/com/joken/survey2015/R$string.class differ
diff --git a/bin/classes/com/joken/survey2015/R$style.class b/bin/classes/com/joken/survey2015/R$style.class
index c8cdd72..b7ddd09 100644
Binary files a/bin/classes/com/joken/survey2015/R$style.class and b/bin/classes/com/joken/survey2015/R$style.class differ
diff --git a/bin/resources.ap_ b/bin/resources.ap_
index 912ac93..0588790 100644
Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ
diff --git a/gen/com/joken/survey2015/R.java b/gen/com/joken/survey2015/R.java
index 107e8a3..6338eab 100644
--- a/gen/com/joken/survey2015/R.java
+++ b/gen/com/joken/survey2015/R.java
@@ -9,8 +9,9 @@
public final class R {
public static final class array {
- public static final int quest_day1=0x7f040001;
- public static final int quest_day2=0x7f040002;
+ public static final int day_list=0x7f040001;
+ public static final int quest_day1=0x7f040002;
+ public static final int quest_day2=0x7f040003;
public static final int sex_list=0x7f040000;
}
public static final class attr {
@@ -37,51 +38,64 @@ public static final class drawable {
public static final class id {
public static final int TextView01=0x7f0a000c;
public static final int TextView02=0x7f0a000e;
- public static final int action_settings=0x7f0a0016;
- public static final int answerBar=0x7f0a0015;
- public static final int item=0x7f0a0012;
+ public static final int action_settings=0x7f0a001b;
+ public static final int answerBar=0x7f0a001a;
+ public static final int day_spinner=0x7f0a0012;
+ public static final int id_edit=0x7f0a0013;
+ public static final int id_enter_button=0x7f0a0014;
+ public static final int item=0x7f0a0017;
public static final int myagearea=0x7f0a0005;
public static final int mysexarea=0x7f0a000d;
public static final int namearea=0x7f0a0002;
- public static final int questList=0x7f0a0011;
- public static final int questText=0x7f0a0014;
+ public static final int questList=0x7f0a0010;
+ public static final int questText=0x7f0a0019;
+ public static final int questcount_edit=0x7f0a0015;
+ public static final int questcount_enter_button=0x7f0a0016;
public static final int tableLayout1=0x7f0a0000;
public static final int tableRow1=0x7f0a0001;
public static final int tableRow2=0x7f0a0003;
public static final int tableRow3=0x7f0a0006;
public static final int tableRow4=0x7f0a000b;
- public static final int text1=0x7f0a0013;
+ public static final int text1=0x7f0a0018;
public static final int textView1=0x7f0a0004;
public static final int textView2=0x7f0a0009;
public static final int textView3=0x7f0a0007;
- public static final int textView4=0x7f0a0010;
+ public static final int textView4=0x7f0a0011;
public static final int tgtagearea1=0x7f0a0008;
public static final int tgtagearea2=0x7f0a000a;
public static final int tgtsexarea=0x7f0a000f;
}
public static final class layout {
public static final int activity_main=0x7f030000;
- public static final int dropdown_list=0x7f030001;
- public static final int list=0x7f030002;
- public static final int questitem=0x7f030003;
+ public static final int activity_propaty=0x7f030001;
+ public static final int dropdown_list=0x7f030002;
+ public static final int list=0x7f030003;
+ public static final int questitem=0x7f030004;
}
public static final class menu {
public static final int main=0x7f090000;
+ public static final int propaty=0x7f090001;
}
public static final class string {
public static final int action_settings=0x7f060001;
public static final int app_name=0x7f060000;
+ public static final int day_prop=0x7f06000f;
public static final int dialog_defmsg=0x7f06000b;
public static final int dialog_no=0x7f06000a;
public static final int dialog_ok=0x7f060009;
public static final int exp_success_tit=0x7f06000c;
public static final int from=0x7f060007;
+ public static final int hello_propaty=0x7f06000e;
+ public static final int id_prop=0x7f060010;
public static final int myage=0x7f060004;
public static final int mysex=0x7f060003;
public static final int name=0x7f060002;
+ public static final int prop_enter=0x7f060011;
+ public static final int questcount_prop=0x7f060012;
public static final int summary=0x7f060008;
public static final int tgtage=0x7f060006;
public static final int tgtsex=0x7f060005;
+ public static final int title_activity_propaty=0x7f06000d;
}
public static final class style {
/**
diff --git a/lint.xml b/lint.xml
new file mode 100644
index 0000000..ede6e40
--- /dev/null
+++ b/lint.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/release.keystore b/release.keystore
new file mode 100644
index 0000000..5b5b054
Binary files /dev/null and b/release.keystore differ
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index c36db80..b5a3160 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -145,15 +145,6 @@
-
-
+
\ No newline at end of file
diff --git a/res/layout/activity_propaty.xml b/res/layout/activity_propaty.xml
new file mode 100644
index 0000000..b5e98df
--- /dev/null
+++ b/res/layout/activity_propaty.xml
@@ -0,0 +1,101 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/menu/propaty.xml b/res/menu/propaty.xml
new file mode 100644
index 0000000..afbb840
--- /dev/null
+++ b/res/menu/propaty.xml
@@ -0,0 +1,11 @@
+
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 3abb1be..1a9469c 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -6,6 +6,11 @@
おんなのこ
+
+ 1にちめ
+ 2にちめ
+
+
自分は逃げ腰だみんながやるものは自分もやる。
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a6602d8..c716e3b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,18 +1,24 @@
-
+
恋人探しアンケート2015
- Settings
- おなまえ
- じぶんの性別
- じぶんの年齢
- あいての性別
- あいての年齢(最小～最大)
- ～
- 全くそう思わない(星1)~とてもそう思う(星5)の5段階で回答してください
- いいよ
- Noooooo!
+ Settings
+ おなまえ
+ じぶんの性別
+ じぶんの年齢
+ あいての性別
+ あいての年齢(最小～最大)
+ ～
+ 全くそう思わない(星1)~とてもそう思う(星5)の5段階で回答してください
+ いいよ
+ Noooooo!これでok?
- 入力せいこう！
+ 入力せいこう！
+ ぷろぱてぃ
+ Preferenceのあたいをいじるよ(関係者がさわってね！！！)
+ なんにちめ？
+ SaveされるIDは？
+ 適用
+ 1こうもくのもんだいすうは？
diff --git a/src/com/joken/survey2015/CollectionUtils.java b/src/com/joken/survey2015/CollectionUtils.java
new file mode 100644
index 0000000..0dc7292
--- /dev/null
+++ b/src/com/joken/survey2015/CollectionUtils.java
@@ -0,0 +1,29 @@
+package com.joken.survey2015;
+
+import java.util.ArrayList;
+
+public class CollectionUtils {
+
+ /**
+ * ArrayListを指定したサイズ毎に分割します。
+ *
+ * @param origin 分割元のArrayList
+ * @param size ArrayListの分割単位
+ * @return サイズ毎に分割されたArrayArrayList。但し、ArrayListがnullまたは空の場合、もしくはsizeが0以下の場合は空のArrayListを返す。
+ */
+ public static ArrayList> devide(ArrayList origin, int size) {
+ if (origin == null || origin.isEmpty() || size <= 0) {
+ return new ArrayList>(0);
+ }
+
+ int block = origin.size() / size + (origin.size() % size > 0 ? 1 : 0 );
+
+ ArrayList> devidedList = new ArrayList>(block);
+ for (int i = 0; i < block; i ++) {
+ int start = i * size;
+ int end = Math.min(start + size, origin.size());
+ devidedList.add(new ArrayList(origin.subList(start, end)));
+ }
+ return devidedList;
+ }
+}
diff --git a/src/com/joken/survey2015/MainActivity.java b/src/com/joken/survey2015/MainActivity.java
index e2c6968..c09058b 100644
--- a/src/com/joken/survey2015/MainActivity.java
+++ b/src/com/joken/survey2015/MainActivity.java
@@ -8,6 +8,7 @@
import java.util.ArrayList;
import android.app.Activity;
+import android.content.Intent;
import android.content.SharedPreferences.Editor;
import android.os.Bundle;
import android.os.Environment;
@@ -62,8 +63,9 @@ private void setQuest(){
break;
case 2:
questres = getResources().getStringArray(R.array.quest_day2);
+ break;
default:
- questres = new String[40];
+ questres = new String[1];
questres[0] = "could not get quest string";
}
ArrayList q = new ArrayList();
@@ -107,7 +109,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
switch(id) {
case R.id.action_settings:
- return true;
+ Intent it = new Intent(this.getApplicationContext(), PropatyActivity.class);
+ this.startActivity(it);
}
return super.onOptionsItemSelected(item);
}
diff --git a/src/com/joken/survey2015/PropatyActivity.java b/src/com/joken/survey2015/PropatyActivity.java
new file mode 100644
index 0000000..3c5eb9a
--- /dev/null
+++ b/src/com/joken/survey2015/PropatyActivity.java
@@ -0,0 +1,127 @@
+package com.joken.survey2015;
+
+import android.app.Activity;
+import android.content.SharedPreferences.Editor;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Spinner;
+import android.widget.Toast;
+
+public class PropatyActivity extends Activity {
+ private static final String SUCCESS = "success changes";
+ private static final String FAILED = "failed changes";
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_propaty);
+ setSpinner();
+ setButton();
+ setEditor();
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ //めにゅーはないです！
+ // Inflate the menu; this adds items to the action bar if it is present.
+ //getMenuInflater().inflate(R.menu.propaty, menu);
+ return false;
+ }
+
+ private void setSpinner(){
+ final String[] daylist = this.getResources().getStringArray(R.array.day_list);
+ ArrayAdapter ad = new ArrayAdapter(
+ this.getApplicationContext(),
+ R.layout.list,
+ daylist);
+ ad.setDropDownViewResource(R.layout.dropdown_list);
+ Spinner s = (Spinner)findViewById(R.id.day_spinner);
+ s.setAdapter(ad);
+ s.setOnItemSelectedListener(new OnItemSelectedListener(){
+ @Override
+ public void onItemSelected(AdapterView parent, View v, int pos, long id){
+ Editor e = getSharedPreferences(MainActivity.MAIN_PREF, MODE_PRIVATE).edit();
+ Spinner s = (Spinner)parent;
+ String day = (String)s.getSelectedItem();
+ int i;
+ if(day.equals(daylist[0])){
+ i = 1;
+ }else if(day.equals(daylist[1])){
+ i = 2;
+ }else{i = 1;}
+ e.putInt(MainActivity.DAY_VAL, i);
+ editorCommit(e);
+ }
+ @Override
+ public void onNothingSelected(AdapterView parent){}
+ });
+ }
+
+ private void setButton(){
+ Button idbtn = (Button)findViewById(R.id.id_enter_button);
+ idbtn.setOnClickListener(new OnClickListener(){
+ @Override
+ public void onClick(View v){
+ EditText id = (EditText)findViewById(R.id.id_edit);
+ if(id.getText() == null){
+ showtoast("null");
+ return;
+ }
+ Editor e = getSharedPreferences(MainActivity.MAIN_PREF, MODE_PRIVATE).edit();
+ try {
+ e.putInt(MainActivity.CURRENT_ID,
+ Integer.parseInt(id.getText().toString()));
+ } catch (NumberFormatException e2) {
+ // TODO: handle exception
+ showtoast("NumberFormatExceptionがでてるゾ");
+ }
+ editorCommit(e);
+ }
+ });
+ Button countbtn = (Button)findViewById(R.id.questcount_enter_button);
+ countbtn.setOnClickListener(new OnClickListener(){
+ @Override
+ public void onClick(View v){
+ EditText count = (EditText)findViewById(R.id.questcount_edit);
+ if(count.getText() == null){
+ showtoast("null");
+ return;
+ }
+ Editor e = getSharedPreferences(MainActivity.MAIN_PREF, MODE_PRIVATE).edit();
+ try{
+ e.putInt(MainActivity.QUEST_COUNT, Integer.parseInt(count.getText().toString()));
+ }catch(NumberFormatException e2){
+ showtoast("NumberFormatExceptionがでてるゾ");
+ }
+ editorCommit(e);
+ }
+ });
+ }
+
+ private void setEditor(){
+ EditText id = (EditText)findViewById(R.id.id_edit),
+ count = (EditText)findViewById(R.id.questcount_edit);
+ id.setText(String.valueOf(this.getSharedPreferences(MainActivity.MAIN_PREF, MODE_PRIVATE).getInt(MainActivity.CURRENT_ID, 500)));
+ count.setText(String.valueOf(this.getSharedPreferences(MainActivity.MAIN_PREF, MODE_PRIVATE).getInt(MainActivity.QUEST_COUNT, 10)));
+ }
+
+ private void showtoast(String msg){
+ Toast.makeText(this.getApplicationContext(), msg, Toast.LENGTH_SHORT).show();
+ }
+
+ private void editorCommit(Editor e) {
+ if(e.commit()){
+ showtoast(SUCCESS);
+ }else{
+ showtoast(FAILED);
+ }
+ }
+
+}