diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b04564c..7c528cf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,6 +29,8 @@ android:name=".SettingsActivity" android:label="@string/title_activity_setting" > + + diff --git a/app/src/main/java/com/example/rssreader/MainActivity.java b/app/src/main/java/com/example/rssreader/MainActivity.java index d0ab134..08e2cbf 100644 --- a/app/src/main/java/com/example/rssreader/MainActivity.java +++ b/app/src/main/java/com/example/rssreader/MainActivity.java @@ -15,6 +15,7 @@ import android.widget.ListView; import com.example.rssreader.db.FeedItemEntity; +import com.example.rssreader.lesson25.Lesson25Activity; import java.util.ArrayList; import java.util.List; @@ -94,6 +95,12 @@ public boolean onOptionsItemSelected(MenuItem item) { return true; } + if (id == R.id.action_lesson25) { + Intent intent = new Intent(this, Lesson25Activity.class); + startActivity(intent); + return true; + } + return super.onOptionsItemSelected(item); } diff --git a/app/src/main/java/com/example/rssreader/lesson25/Lesson25Activity.java b/app/src/main/java/com/example/rssreader/lesson25/Lesson25Activity.java new file mode 100644 index 0000000..116e8ac --- /dev/null +++ b/app/src/main/java/com/example/rssreader/lesson25/Lesson25Activity.java @@ -0,0 +1,93 @@ +package com.example.rssreader.lesson25; + +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.util.Log; +import android.widget.CheckBox; +import android.widget.EditText; + +import com.example.rssreader.R; + +public class Lesson25Activity extends AppCompatActivity { + + private static final String TAG = Lesson25Activity.class.getSimpleName(); + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_lesson25); + + // TODO: [1] onCreate Log + Log.d(TAG, "onCreate が呼ばれた"); + + // TODO: [2]savedInstanceState からデータを復元しよう + if (savedInstanceState != null) { + + String editTextString = savedInstanceState.getString("EDIT_TEXT"); + EditText editText = (EditText) findViewById(R.id.lessonEditText); + editText.setText(editTextString); + + boolean isChecked = savedInstanceState.getBoolean("CHECK_BOX"); + CheckBox checkBox = (CheckBox) findViewById(R.id.lessonCheckBox); + checkBox.setChecked(isChecked); + } + } + + // TODO: [1] onStart + @Override + protected void onStart() { + super.onStart(); + Log.d(TAG, "_onStart が呼ばれた"); + } + + // TODO: [1] onResume + + @Override + protected void onResume() { + super.onResume(); + Log.d(TAG, "__onResume が呼ばれた"); + } + + // TODO: [1] onRestart + @Override + protected void onRestart() { + super.onRestart(); + Log.d(TAG, "*onRestart が呼ばれた"); + } + + // TODO: [1] onPause + @Override + protected void onPause() { + Log.d(TAG, "__onPause が呼ばれた"); + super.onPause(); + } + + // TODO: [1] onStop + @Override + protected void onStop() { + Log.d(TAG, "_onStop が呼ばれた"); + super.onStop(); + } + + // TODO: [1] onDestroy + @Override + protected void onDestroy() { + Log.d(TAG, "onDestroy が呼ばれた"); + super.onDestroy(); + } + + // TODO: [2] onSaveInstanceState でデータを格納しよう + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + + EditText editText = (EditText) findViewById(R.id.lessonEditText); + outState.putString("EDIT_TEXT", editText.getText().toString()); + + CheckBox checkBox = (CheckBox) findViewById(R.id.lessonCheckBox); + outState.putBoolean("CHECK_BOX", checkBox.isChecked()); + } + + + +} diff --git a/app/src/main/java/com/example/rssreader/lesson25/LessonItem.java b/app/src/main/java/com/example/rssreader/lesson25/LessonItem.java new file mode 100644 index 0000000..f833bd5 --- /dev/null +++ b/app/src/main/java/com/example/rssreader/lesson25/LessonItem.java @@ -0,0 +1,7 @@ +package com.example.rssreader.lesson25; + +/** + * Created by akkuma on 2015/10/21. + */ +public class LessonItem { +} diff --git a/app/src/main/res/layout/activity_lesson25.xml b/app/src/main/res/layout/activity_lesson25.xml new file mode 100644 index 0000000..af43848 --- /dev/null +++ b/app/src/main/res/layout/activity_lesson25.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index b1cb908..8636604 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -3,4 +3,6 @@ xmlns:tools="http://schemas.android.com/tools" tools:context=".MainActivity"> +