diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 80cd38d..4d249f4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,13 +12,16 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - + + + + diff --git a/app/src/main/kotlin/jackall/moncalc/activity/MainActivity.kt b/app/src/main/kotlin/jackall/moncalc/activity/MainActivity.kt new file mode 100644 index 0000000..7fcd034 --- /dev/null +++ b/app/src/main/kotlin/jackall/moncalc/activity/MainActivity.kt @@ -0,0 +1,22 @@ +package jackall.moncalc.activity + +import android.arch.lifecycle.ViewModelProviders +import android.databinding.DataBindingUtil +import android.os.Bundle +import android.support.v7.app.AppCompatActivity +import jackall.moncalc.R +import jackall.moncalc.databinding.ActivityMainBinding +import jackall.moncalc.viewmodel.MainViewModel + +/** + * 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) } + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + mainBinding.mainViewModel = mainViewModel + lifecycle.addObserver(mainViewModel) + } +} \ No newline at end of file diff --git a/app/src/main/kotlin/jackall/moncalc/viewmodel/MainViewModel.kt b/app/src/main/kotlin/jackall/moncalc/viewmodel/MainViewModel.kt index d410cd5..f864cef 100644 --- a/app/src/main/kotlin/jackall/moncalc/viewmodel/MainViewModel.kt +++ b/app/src/main/kotlin/jackall/moncalc/viewmodel/MainViewModel.kt @@ -1,12 +1,18 @@ package jackall.moncalc.viewmodel import android.arch.lifecycle.ViewModel +import android.arch.lifecycle.ViewModelProvider /** * MainActivity恮ViewModel. * * Created by matsumoto_k on 2017/11/01. */ -class MainViewModel : ViewModel() { +class MainViewModel : LifecycleViewModel() { + class Factory() : ViewModelProvider.NewInstanceFactory() { + override fun create(modelClass: Class): T { + return MainViewModel() as T + } + } } \ 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 new file mode 100644 index 0000000..5ae9ae2 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + \ No newline at end of file