diff --git a/Kasasasu/app/src/main/AndroidManifest.xml b/Kasasasu/app/src/main/AndroidManifest.xml index 0c31c91..67947dd 100644 --- a/Kasasasu/app/src/main/AndroidManifest.xml +++ b/Kasasasu/app/src/main/AndroidManifest.xml @@ -20,6 +20,18 @@ + + + + + + diff --git a/Kasasasu/app/src/main/java/com/example/kasasasu/AreaActivity.java b/Kasasasu/app/src/main/java/com/example/kasasasu/AreaActivity.java new file mode 100644 index 0000000..fda6077 --- /dev/null +++ b/Kasasasu/app/src/main/java/com/example/kasasasu/AreaActivity.java @@ -0,0 +1,58 @@ +package com.example.kasasasu; + +import android.app.Activity; +import android.content.Intent; +import android.os.Bundle; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.ListView; +import android.widget.Toast; + + +public class AreaActivity extends Activity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_area); + + // リストビューにアイテム (adapter) を追加 + ListView prefListView = (ListView)findViewById(R.id.listView2); + + // アイテムクリック時ののイベントを追加 + prefListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + public void onItemClick(AdapterView parent, + View view, int pos, long id) { + Intent intent = new Intent(AreaActivity.this, PrefActivity.class); + intent.putExtra("area", pos); + startActivity(intent); + } + }); + } + + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.menu_area, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } +} diff --git a/Kasasasu/app/src/main/java/com/example/kasasasu/CityActivity.java b/Kasasasu/app/src/main/java/com/example/kasasasu/CityActivity.java new file mode 100644 index 0000000..26ad379 --- /dev/null +++ b/Kasasasu/app/src/main/java/com/example/kasasasu/CityActivity.java @@ -0,0 +1,101 @@ +package com.example.kasasasu; + +import android.app.Activity; +import android.content.Intent; +import android.location.Address; +import android.location.Geocoder; +import android.os.Bundle; +import android.util.Log; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.ListView; +import android.widget.Toast; + +import java.io.IOException; +import java.util.List; +import java.util.Locale; + + +public class CityActivity extends Activity { + + private KasasasuSQLiteOpenHelper DBHelper; + private String pref; + private String prefRoman; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_city); + + Intent intent = getIntent(); + pref = intent.getStringExtra("pref"); + + Geocoder geocoder = new Geocoder(this, Locale.US); + try{ + List
addressList = geocoder.getFromLocationName(pref, 1); + Address address = addressList.get(0); + Log.d("geocode", address.toString()); + prefRoman = address.getAdminArea().split(" ")[0].toLowerCase(); + }catch(IOException e){ + e.printStackTrace(); + } + + Log.d("city id", pref); + String[] cities = getResources().getStringArray(getResources().getIdentifier(prefRoman + "_cities", "array", getPackageName())); + + ArrayAdapter adapter = new ArrayAdapter( + this, android.R.layout.simple_list_item_1, cities); + + // リストビューにアイテム (adapter) を追加 + ListView cityListView = (ListView)findViewById(R.id.cityListView); + cityListView.setAdapter(adapter); + + // アイテムクリック時ののイベントを追加 + cityListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + public void onItemClick(AdapterView parent, + View view, int pos, long id) { + // 選択アイテムを取得 + ListView listView = (ListView)parent; + String city = (String)listView.getItemAtPosition(pos); + + DBHelper.add("prefecture", pref); + DBHelper.add("city", city); + + Intent intent = new Intent(CityActivity.this, MainActivity.class); + intent.putExtra("fragment", 1); + startActivity(intent); + + // 通知ダイアログを表示 + Toast.makeText(CityActivity.this, city, Toast.LENGTH_LONG).show(); + } + }); + + DBHelper = new KasasasuSQLiteOpenHelper(this); + } + + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.menu_city, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } +} diff --git a/Kasasasu/app/src/main/java/com/example/kasasasu/FragmentSetting.java b/Kasasasu/app/src/main/java/com/example/kasasasu/FragmentSetting.java index 8e4ba2e..858638a 100644 --- a/Kasasasu/app/src/main/java/com/example/kasasasu/FragmentSetting.java +++ b/Kasasasu/app/src/main/java/com/example/kasasasu/FragmentSetting.java @@ -1,93 +1,97 @@ package com.example.kasasasu; + +import android.app.Activity; +import android.content.Intent; import android.os.Bundle; import android.support.v4.app.Fragment; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; +import android.widget.AdapterView; import android.widget.CompoundButton; -import android.widget.EditText; +import android.widget.ListView; import android.widget.Switch; +import java.util.ArrayList; import java.util.HashMap; -public class FragmentSetting extends Fragment implements CompoundButton.OnCheckedChangeListener, View.OnClickListener { - +public class FragmentSetting extends Fragment implements CompoundButton.OnCheckedChangeListener { private View v; - private EditText prefectureEditText, cityEditText; - private Button saveButton; - private KasasasuSQLiteOpenHelper DBHelper; - private boolean swIsChecked; + private Activity activity; private HashMap settings; + private KasasasuSQLiteOpenHelper DBHelper; private Switch switch1; + private boolean swIsChecked; + private ArrayList settingArrayList; + private SettingAdapter adapter; + private String address; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - v = inflater.inflate(R.layout.fragment_setting, null); - prefectureEditText = (EditText)v.findViewById(R.id.prefecureText); - cityEditText = (EditText)v.findViewById(R.id.cityText); + //フラグメントのビューを取得 + v = inflater.inflate(R.layout.fragment_setting2, null); - saveButton = (Button)v.findViewById(R.id.saveButton); - saveButton.setOnClickListener(this); + //MainActivityを取得 + activity = getActivity(); switch1 = (Switch)v.findViewById(R.id.switch1); switch1.setOnCheckedChangeListener(this); + //設定内容をDBから取得 DBHelper = new KasasasuSQLiteOpenHelper(getActivity()); settings = DBHelper.get(); - Log.d("show", settings.toString()); - if (settings.containsKey("prefecture")) prefectureEditText.setText(settings.get("prefecture")); - if (settings.containsKey("city")) cityEditText.setText(settings.get("city")); - if (settings.containsKey("textSetting") && settings.get("textSetting").equals("on")){ - //Log.d("show", settings.get("prefecture")); - switch1 = (Switch)v.findViewById(R.id.switch1); + //住所文字列を設定内容から取得 + address = ""; + if (settings.containsKey("prefecture")) address += settings.get("prefecture"); + if (settings.containsKey("city")) address += settings.get("city"); + + //ListViewのアダプターを生成 + settingArrayList = new ArrayList<>(); + if (swIsChecked) settingArrayList.add(new Setting("地域", address)); + adapter = new SettingAdapter(activity, settingArrayList); + + // リストビューにアイテム (adapter) を追加 + ListView listView1 = (ListView)v.findViewById(R.id.listView1); + listView1.setAdapter(adapter); + + // アイテムクリック時ののイベントを追加 + listView1.setOnItemClickListener(new AdapterView.OnItemClickListener() { + public void onItemClick(AdapterView parent, + View view, int pos, long id) { + // 選択アイテムを取得 + ListView listView = (ListView)parent; + String item = ((Setting)listView.getItemAtPosition(pos)).getName(); + + switch (item) { + case "地域": + //スイッチが有効状態であれば住所選択画面へ + if (swIsChecked) { + Intent intent = new Intent(activity, AreaActivity.class); + startActivity(intent); + } + break; + } + } + }); + + //スイッチのオン・オフをDBから取得 + if (settings.containsKey("selfAreaSetting") && settings.get("selfAreaSetting").equals("true")) { switch1.setChecked(true); + swIsChecked = true; } else { - prefectureEditText.setFocusable(false); - prefectureEditText.setFocusableInTouchMode(false); - cityEditText.setFocusable(false); - cityEditText.setFocusableInTouchMode(false); + swIsChecked = false; } return v; } - @Override - public void onStart() { - super.onStart(); - } - - @Override - public void onClick(View v) { - //Log.d("frag", "onclick"); - boolean settingIsText = false; - String on_or_off = "off"; - if (swIsChecked) { - settingIsText = true; - on_or_off = "on"; - } - DBHelper.add("textSetting", on_or_off); - - prefectureEditText = (EditText)getActivity().findViewById(R.id.prefecureText); - cityEditText = (EditText)getActivity().findViewById(R.id.cityText); - DBHelper.add("prefecture", prefectureEditText.getText().toString()); - DBHelper.add("city", cityEditText.getText().toString()); - ((FragmentMain)getTargetFragment()).updateLatLon(settingIsText, prefectureEditText.getText().toString() + cityEditText.getText().toString()); - } - @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - if ((swIsChecked = isChecked) == true) { - prefectureEditText.setFocusable(true); - prefectureEditText.setFocusableInTouchMode(true); - cityEditText.setFocusable(true); - cityEditText.setFocusableInTouchMode(true); - } else { - prefectureEditText.setFocusable(false); - prefectureEditText.setFocusableInTouchMode(false); - cityEditText.setFocusable(false); - cityEditText.setFocusableInTouchMode(false); - } + swIsChecked = isChecked; + DBHelper.add("selfAreaSetting", String.valueOf(isChecked)); + + if (isChecked) adapter.add(new Setting("地域", address)); + else adapter.delete("地域"); + adapter.notifyDataSetChanged(); } } \ No newline at end of file diff --git a/Kasasasu/app/src/main/java/com/example/kasasasu/MainActivity.java b/Kasasasu/app/src/main/java/com/example/kasasasu/MainActivity.java index f020e02..ab4c6b0 100644 --- a/Kasasasu/app/src/main/java/com/example/kasasasu/MainActivity.java +++ b/Kasasasu/app/src/main/java/com/example/kasasasu/MainActivity.java @@ -1,8 +1,10 @@ package com.example.kasasasu; import android.app.ActionBar; +import android.content.Intent; import android.os.Bundle; import android.support.v4.view.ViewPager; +import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.support.v4.app.FragmentActivity; @@ -21,7 +23,15 @@ protected void onCreate(Bundle savedInstanceState) { actionBar.setDisplayUseLogoEnabled(true); viewPager = (ViewPager) findViewById(R.id.pager); - viewPager.setAdapter( new KasasasuFragmentStatePagerAdapter( getSupportFragmentManager())); + viewPager.setAdapter(new KasasasuFragmentStatePagerAdapter(getSupportFragmentManager())); + + Intent intent = getIntent(); + Log.d("intent" , intent.toString()); + if (intent != null) { + int fragment; + fragment = intent.getIntExtra("fragment", 0); + viewPager.setCurrentItem(fragment); + } } @Override diff --git a/Kasasasu/app/src/main/java/com/example/kasasasu/PrefActivity.java b/Kasasasu/app/src/main/java/com/example/kasasasu/PrefActivity.java new file mode 100644 index 0000000..2f958d5 --- /dev/null +++ b/Kasasasu/app/src/main/java/com/example/kasasasu/PrefActivity.java @@ -0,0 +1,101 @@ +package com.example.kasasasu; + +import android.app.Activity; +import android.content.Intent; +import android.os.Bundle; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.ListView; +import android.widget.Toast; + +import java.util.HashMap; + + +public class PrefActivity extends Activity { + + private HashMap prefToRoman = new HashMap<>(); + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_pref); + + Intent intent = getIntent(); + int pos = intent.getIntExtra("area", 0); + + String[] prefs = {}; + switch (pos) { + case 0: + prefs = getResources().getStringArray(R.array.tohoku_prefecture); + break; + case 1: + prefs = getResources().getStringArray(R.array.kanto_prefecture); + break; + case 2: + prefs = getResources().getStringArray(R.array.hokurikukoshinetsu_prefecture); + break; + case 3: + prefs = getResources().getStringArray(R.array.chubu_prefecture); + break; + case 4: + prefs = getResources().getStringArray(R.array.kinki_prefecture); + break; + case 5: + prefs = getResources().getStringArray(R.array.chugoku_prefecture); + break; + case 6: + prefs = getResources().getStringArray(R.array.shikoku_prefecture); + break; + case 7: + prefs = getResources().getStringArray(R.array.kyushu_prefecture); + break; + } + + ArrayAdapter adapter = new ArrayAdapter( + this, android.R.layout.simple_list_item_1, prefs); + + // リストビューにアイテム (adapter) を追加 + ListView prefListView = (ListView)findViewById(R.id.prefListView); + prefListView.setAdapter(adapter); + + // アイテムクリック時ののイベントを追加 + prefListView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + public void onItemClick(AdapterView parent, + View view, int pos, long id) { + // 選択アイテムを取得 + ListView listView = (ListView)parent; + String item = (String)listView.getItemAtPosition(pos); + + + Intent intent = new Intent(PrefActivity.this, CityActivity.class); + intent.putExtra("pref", item); + startActivity(intent); + } + }); + } + + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.menu_pref, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } +} diff --git a/Kasasasu/app/src/main/java/com/example/kasasasu/Setting.java b/Kasasasu/app/src/main/java/com/example/kasasasu/Setting.java new file mode 100644 index 0000000..c78ddd2 --- /dev/null +++ b/Kasasasu/app/src/main/java/com/example/kasasasu/Setting.java @@ -0,0 +1,26 @@ +package com.example.kasasasu; + +/** + * Created by 真史 on 2016/08/27. + */ +public class Setting { + // 名前 + private String name; + // 内容 + private String content; + + public Setting(String name, String content){ + super(); + + this.name = name; + this.content = content; + } + + public String getName(){ + return this.name; + } + + public String getContent(){ + return this.content; + } +} diff --git a/Kasasasu/app/src/main/java/com/example/kasasasu/SettingAdapter.java b/Kasasasu/app/src/main/java/com/example/kasasasu/SettingAdapter.java new file mode 100644 index 0000000..a395091 --- /dev/null +++ b/Kasasasu/app/src/main/java/com/example/kasasasu/SettingAdapter.java @@ -0,0 +1,66 @@ +package com.example.kasasasu; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.TextView; + +import java.util.ArrayList; +import java.util.HashMap; + +/** + * Created by 真史 on 2016/08/27. + */ +public class SettingAdapter extends BaseAdapter { + Context context; + LayoutInflater layoutInflater; + ArrayList settings; + + public SettingAdapter(Context context, ArrayList settings){ + this.context = context; + this.layoutInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + this.settings = settings; + } + + public void add(Setting setting) { + boolean isContained = false; + for (Setting s: settings) + if (s.getName().equals(setting.getName())) isContained = true; + + if (! isContained) settings.add(setting); + } + + public void delete(String itemName) { + for (Setting s: settings) + if (s.getName().equals(itemName)) settings.remove(s); + } + + @Override + public int getCount(){ + return settings.size(); + } + + @Override + public Object getItem(int position){ + return settings.get(position); + } + + @Override + public long getItemId(int position){ + return 0; + } + + @Override + public View getView(int position, View convertView, ViewGroup parent){ + convertView = layoutInflater.inflate(R.layout.setting_listview, parent, false); + TextView nameView = (TextView)convertView.findViewById(R.id.itemNameTextView); + nameView.setText(settings.get(position).getName()); + + TextView hobbyView = (TextView)convertView.findViewById(R.id.itemContentTextView); + hobbyView.setText(settings.get(position).getContent()); + + return convertView; + } +} \ No newline at end of file diff --git a/Kasasasu/app/src/main/res/layout/activity_area.xml b/Kasasasu/app/src/main/res/layout/activity_area.xml new file mode 100644 index 0000000..6c666d3 --- /dev/null +++ b/Kasasasu/app/src/main/res/layout/activity_area.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/Kasasasu/app/src/main/res/layout/activity_city.xml b/Kasasasu/app/src/main/res/layout/activity_city.xml new file mode 100644 index 0000000..ec54848 --- /dev/null +++ b/Kasasasu/app/src/main/res/layout/activity_city.xml @@ -0,0 +1,16 @@ + + + + + diff --git a/Kasasasu/app/src/main/res/layout/activity_pref.xml b/Kasasasu/app/src/main/res/layout/activity_pref.xml new file mode 100644 index 0000000..99479bc --- /dev/null +++ b/Kasasasu/app/src/main/res/layout/activity_pref.xml @@ -0,0 +1,16 @@ + + + + + diff --git a/Kasasasu/app/src/main/res/layout/fragment_setting2.xml b/Kasasasu/app/src/main/res/layout/fragment_setting2.xml new file mode 100644 index 0000000..487a35d --- /dev/null +++ b/Kasasasu/app/src/main/res/layout/fragment_setting2.xml @@ -0,0 +1,26 @@ + + + + + + + + \ No newline at end of file diff --git a/Kasasasu/app/src/main/res/layout/setting_listview.xml b/Kasasasu/app/src/main/res/layout/setting_listview.xml new file mode 100644 index 0000000..f10600c --- /dev/null +++ b/Kasasasu/app/src/main/res/layout/setting_listview.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/Kasasasu/app/src/main/res/menu/menu_area.xml b/Kasasasu/app/src/main/res/menu/menu_area.xml new file mode 100644 index 0000000..f2c88e2 --- /dev/null +++ b/Kasasasu/app/src/main/res/menu/menu_area.xml @@ -0,0 +1,8 @@ + + + diff --git a/Kasasasu/app/src/main/res/menu/menu_city.xml b/Kasasasu/app/src/main/res/menu/menu_city.xml new file mode 100644 index 0000000..9f3a05f --- /dev/null +++ b/Kasasasu/app/src/main/res/menu/menu_city.xml @@ -0,0 +1,8 @@ + + + diff --git a/Kasasasu/app/src/main/res/menu/menu_pref.xml b/Kasasasu/app/src/main/res/menu/menu_pref.xml new file mode 100644 index 0000000..fd8f35a --- /dev/null +++ b/Kasasasu/app/src/main/res/menu/menu_pref.xml @@ -0,0 +1,8 @@ + + + diff --git a/Kasasasu/app/src/main/res/values/array.xml b/Kasasasu/app/src/main/res/values/array.xml index ea7d0cd..912e595 100644 --- a/Kasasasu/app/src/main/res/values/array.xml +++ b/Kasasasu/app/src/main/res/values/array.xml @@ -1,6 +1,17 @@ - + + 北海道・東北 + 関東 + 北陸・甲信越 + 中部 + 近畿 + 中国 + 四国 + 九州・沖縄 + + + 北海道 青森県 岩手県 @@ -8,6 +19,9 @@ 秋田県 山形県 福島県 + + + 茨城県 栃木県 群馬県 @@ -15,15 +29,24 @@ 千葉県 東京都 神奈川県 + + + 新潟県 富山県 石川県 福井県 山梨県 + + + 長野県 岐阜県 静岡県 愛知県 + + + 三重県 滋賀県 京都府 @@ -31,15 +54,24 @@ 兵庫県 奈良県 和歌山県 + + + 鳥取県 島根県 岡山県 広島県 山口県 + + + 徳島県 香川県 愛媛県 高知県 + + + 福岡県 佐賀県 長崎県 diff --git a/Kasasasu/app/src/main/res/values/strings.xml b/Kasasasu/app/src/main/res/values/strings.xml index ba0f90f..35f8619 100644 --- a/Kasasasu/app/src/main/res/values/strings.xml +++ b/Kasasasu/app/src/main/res/values/strings.xml @@ -3,4 +3,7 @@ Hello world! 設定 + AreaActivity + PrefActivity + CityActivity