diff --git a/app/src/main/kotlin/jackall/moncalc/fragment/HistoryFragment.kt b/app/src/main/kotlin/jackall/moncalc/fragment/HistoryFragment.kt index b9c9e43..50a7df8 100644 --- a/app/src/main/kotlin/jackall/moncalc/fragment/HistoryFragment.kt +++ b/app/src/main/kotlin/jackall/moncalc/fragment/HistoryFragment.kt @@ -1,21 +1,29 @@ package jackall.moncalc.fragment +import android.arch.lifecycle.ViewModelProviders +import android.databinding.DataBindingUtil 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 +import jackall.moncalc.databinding.FragmentHistoryBinding /** * Created by matsumoto_k on 2017/11/03. */ class HistoryFragment : Fragment() { + lateinit var binding: FragmentHistoryBinding + val historyViewModel by lazy { ViewModelProviders.of(this, HistoryViewModel.Factory()).get(HistoryViewModel::class.java) } 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) + binding = DataBindingUtil.inflate(layoutInflater, R.layout.fragment_history, container, false) + binding.historyViewModel = historyViewModel + lifecycle.addObserver(historyViewModel) + return binding.root } } \ No newline at end of file diff --git a/app/src/main/kotlin/jackall/moncalc/fragment/HistoryViewModel.kt b/app/src/main/kotlin/jackall/moncalc/fragment/HistoryViewModel.kt new file mode 100644 index 0000000..97b53b6 --- /dev/null +++ b/app/src/main/kotlin/jackall/moncalc/fragment/HistoryViewModel.kt @@ -0,0 +1,16 @@ +package jackall.moncalc.fragment + +import android.arch.lifecycle.ViewModel +import android.arch.lifecycle.ViewModelProvider +import jackall.moncalc.viewmodel.LifecycleViewModel + +/** + * Created by matsumoto_k on 2017/11/03. + */ +class HistoryViewModel : LifecycleViewModel() { + class Factory() : ViewModelProvider.NewInstanceFactory() { + override fun create(modelClass: Class): T { + return HistoryViewModel() as T + } + } +} \ 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 index d8fb324..e749cdb 100644 --- a/app/src/main/res/layout/fragment_history.xml +++ b/app/src/main/res/layout/fragment_history.xml @@ -1,6 +1,16 @@ - + - \ No newline at end of file + + + + + + + + + \ No newline at end of file