diff --git a/app/src/main/kotlin/jackall/moncalc/activity/MainActivity.kt b/app/src/main/kotlin/jackall/moncalc/activity/MainActivity.kt index 7fcd034..2a0d9d8 100644 --- a/app/src/main/kotlin/jackall/moncalc/activity/MainActivity.kt +++ b/app/src/main/kotlin/jackall/moncalc/activity/MainActivity.kt @@ -5,18 +5,23 @@ import android.os.Bundle import android.support.v7.app.AppCompatActivity import jackall.moncalc.R +import jackall.moncalc.adapter.MainFragmentPagerAdapter import jackall.moncalc.databinding.ActivityMainBinding import jackall.moncalc.viewmodel.MainViewModel +import kotlinx.android.synthetic.main.activity_main.view.* /** * Created by matsumoto_k on 2017/11/03. */ class MainActivity : AppCompatActivity() { val mainBinding by lazy { DataBindingUtil.setContentView(this, R.layout.activity_main) } - val mainViewModel by lazy { ViewModelProviders.of(this, MainViewModel.Factory()).get(MainViewModel::class.java) } + val mainViewModel by lazy { ViewModelProviders.of(this, MainViewModel.Factory(this)).get(MainViewModel::class.java) } + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) mainBinding.mainViewModel = mainViewModel lifecycle.addObserver(mainViewModel) + mainBinding.root.main_view_pager.adapter = MainFragmentPagerAdapter(supportFragmentManager, this) + mainBinding.root.main_tab_layout.setupWithViewPager(mainBinding.root.main_view_pager) } } \ No newline at end of file diff --git a/app/src/main/kotlin/jackall/moncalc/adapter/MainFragmentPagerAdapter.kt b/app/src/main/kotlin/jackall/moncalc/adapter/MainFragmentPagerAdapter.kt new file mode 100644 index 0000000..eb65389 --- /dev/null +++ b/app/src/main/kotlin/jackall/moncalc/adapter/MainFragmentPagerAdapter.kt @@ -0,0 +1,35 @@ +package jackall.moncalc.adapter + +import android.content.Context +import android.support.v4.app.Fragment +import android.support.v4.app.FragmentManager +import android.support.v4.app.FragmentPagerAdapter +import jackall.moncalc.fragment.AnalyzeFragment +import jackall.moncalc.fragment.HistoryFragment + +/** + * Created by matsumoto_k on 2017/11/03. + */ +class MainFragmentPagerAdapter(fragmentManager: FragmentManager, val context: Context) : FragmentPagerAdapter(fragmentManager) { + val pageCount = 2 + val titles = arrayOf("履歴", "解析") + override fun getItem(position: Int): Fragment? { + when (position) { + 0 -> { + return HistoryFragment() + } + 1 -> { + return AnalyzeFragment() + } + } + return null + } + + override fun getCount(): Int { + return pageCount + } + + override fun getPageTitle(position: Int): CharSequence { + return titles.get(position) + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/jackall/moncalc/fragment/AnalyzeFragment.kt b/app/src/main/kotlin/jackall/moncalc/fragment/AnalyzeFragment.kt new file mode 100644 index 0000000..c1b2710 --- /dev/null +++ b/app/src/main/kotlin/jackall/moncalc/fragment/AnalyzeFragment.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 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/HistoryFragment.kt b/app/src/main/kotlin/jackall/moncalc/fragment/HistoryFragment.kt new file mode 100644 index 0000000..b9c9e43 --- /dev/null +++ b/app/src/main/kotlin/jackall/moncalc/fragment/HistoryFragment.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 HistoryFragment : 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_history, container, false) + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_analyze.xml b/app/src/main/res/layout/fragment_analyze.xml new file mode 100644 index 0000000..d8fb324 --- /dev/null +++ b/app/src/main/res/layout/fragment_analyze.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml new file mode 100644 index 0000000..d8fb324 --- /dev/null +++ b/app/src/main/res/layout/fragment_history.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 043debf..e736a44 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,4 +4,6 @@ 最大化 最小化 終了 + 常駐開始 + 常駐終了 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 2a7d63d..de686e5 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ -