diff --git a/app/src/main/kotlin/jackall/moncalc/adapter/MainFragmentPagerAdapter.kt b/app/src/main/kotlin/jackall/moncalc/adapter/MainFragmentPagerAdapter.kt
index 2df497f..7c6b34f 100644
--- a/app/src/main/kotlin/jackall/moncalc/adapter/MainFragmentPagerAdapter.kt
+++ b/app/src/main/kotlin/jackall/moncalc/adapter/MainFragmentPagerAdapter.kt
@@ -5,23 +5,21 @@
import android.support.v4.app.FragmentManager
import android.support.v4.app.FragmentPagerAdapter
import jackall.moncalc.R
-import jackall.moncalc.fragment.AnalyzeFragment
+import jackall.moncalc.fragment.FruitAnalyze
import jackall.moncalc.fragment.HistoryFragment
+import jackall.moncalc.fragment.TempleAnalyze
/**
* Created by matsumoto_k on 2017/11/03.
*/
class MainFragmentPagerAdapter(fragmentManager: FragmentManager, val context: Context) : FragmentPagerAdapter(fragmentManager) {
- val pageCount = 2
- val titles = arrayOf(context.resources.getString(R.string.history), context.resources.getString(R.string.analyze))
+ val pageCount = 3
+ val titles = arrayOf(context.resources.getString(R.string.history), context.resources.getString(R.string.temple_analyze), context.resources.getString(R.string.fruit_analyze))
override fun getItem(position: Int): Fragment? {
when (position) {
- 0 -> {
- return HistoryFragment()
- }
- 1 -> {
- return AnalyzeFragment()
- }
+ 0 -> return HistoryFragment()
+ 1 -> return TempleAnalyze()
+ 2 -> return FruitAnalyze()
}
return null
}
diff --git a/app/src/main/kotlin/jackall/moncalc/fragment/AnalyzeFragment.kt b/app/src/main/kotlin/jackall/moncalc/fragment/AnalyzeFragment.kt
deleted file mode 100644
index c1b2710..0000000
--- a/app/src/main/kotlin/jackall/moncalc/fragment/AnalyzeFragment.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package jackall.moncalc.fragment
-
-import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import jackall.moncalc.R
-
-/**
- * Created by matsumoto_k on 2017/11/03.
- */
-class AnalyzeFragment : Fragment() {
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- }
-
- override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
- return inflater.inflate(R.layout.fragment_analyze, container, false)
- }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/jackall/moncalc/fragment/FruitAnalyze.kt b/app/src/main/kotlin/jackall/moncalc/fragment/FruitAnalyze.kt
new file mode 100644
index 0000000..daa17fd
--- /dev/null
+++ b/app/src/main/kotlin/jackall/moncalc/fragment/FruitAnalyze.kt
@@ -0,0 +1,21 @@
+package jackall.moncalc.fragment
+
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import jackall.moncalc.R
+
+/**
+ * Created by matsumoto_k on 2017/11/04.
+ */
+class FruitAnalyze : Fragment() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ }
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ return inflater.inflate(R.layout.fragment_analyze_fruit, container, false)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/jackall/moncalc/fragment/TempleAnalyze.kt b/app/src/main/kotlin/jackall/moncalc/fragment/TempleAnalyze.kt
new file mode 100644
index 0000000..00aa32d
--- /dev/null
+++ b/app/src/main/kotlin/jackall/moncalc/fragment/TempleAnalyze.kt
@@ -0,0 +1,21 @@
+package jackall.moncalc.fragment
+
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import jackall.moncalc.R
+
+/**
+ * Created by matsumoto_k on 2017/11/03.
+ */
+class TempleAnalyze : Fragment() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ }
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ return inflater.inflate(R.layout.fragment_analyze_temple, container, false)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8ff472d..70c038b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,7 +26,9 @@
+ android:layout_height="50dp"
+ app:tabMinWidth="100dp"
+ app:tabMode="scrollable" />
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_analyze_fruit.xml b/app/src/main/res/layout/fragment_analyze_fruit.xml
new file mode 100644
index 0000000..d8fb324
--- /dev/null
+++ b/app/src/main/res/layout/fragment_analyze_fruit.xml
@@ -0,0 +1,6 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_analyze_temple.xml b/app/src/main/res/layout/fragment_analyze_temple.xml
new file mode 100644
index 0000000..d8fb324
--- /dev/null
+++ b/app/src/main/res/layout/fragment_analyze_temple.xml
@@ -0,0 +1,6 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0d53898..92ee9ca 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,5 +7,6 @@
常駐開始
常駐終了
履歴
- 解析
+ 神殿解析
+ わくわく解析