diff --git a/.idea/misc.xml b/.idea/misc.xml index ff15b97..b0e4557 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,7 @@ +<<<<<<< HEAD <<<<<<< Updated upstream ======= @@ -13,6 +14,11 @@ >>>>>>> Stashed changes +======= + + + +>>>>>>> 4db7a8f (update MainActivity) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index aa14496..8f692d2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,7 +14,7 @@ android:theme="@style/Theme.WordBook" tools:targetApi="31"> diff --git a/app/src/main/java/com/example/wordbook/StudyActivity.kt b/app/src/main/java/com/example/wordbook/StudyActivity.kt index de4c4ae..6a4645b 100644 --- a/app/src/main/java/com/example/wordbook/StudyActivity.kt +++ b/app/src/main/java/com/example/wordbook/StudyActivity.kt @@ -6,6 +6,6 @@ import android.os.Bundle class StudyActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) + setContentView(R.layout.activity_study) } } \ No newline at end of file diff --git a/app/src/main/java/com/example/wordbook/TestActivity.kt b/app/src/main/java/com/example/wordbook/TestActivity.kt index 64b1a4a..f8004b0 100644 --- a/app/src/main/java/com/example/wordbook/TestActivity.kt +++ b/app/src/main/java/com/example/wordbook/TestActivity.kt @@ -6,6 +6,6 @@ import android.os.Bundle class TestActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) + setContentView(R.layout.activity_test) } } \ No newline at end of file diff --git a/app/src/main/java/com/example/wordbook/VocaListActivity.kt b/app/src/main/java/com/example/wordbook/VocaListActivity.kt index 149d06f..5a5679a 100644 --- a/app/src/main/java/com/example/wordbook/VocaListActivity.kt +++ b/app/src/main/java/com/example/wordbook/VocaListActivity.kt @@ -6,6 +6,6 @@ import android.os.Bundle class VocaListActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) + setContentView(R.layout.activity_voca_list) } } \ No newline at end of file diff --git a/app/src/main/java/com/example/wordbook/main/MainActivity.kt b/app/src/main/java/com/example/wordbook/main/MainActivity.kt new file mode 100644 index 0000000..3cd4714 --- /dev/null +++ b/app/src/main/java/com/example/wordbook/main/MainActivity.kt @@ -0,0 +1,43 @@ +package com.example.wordbook.main + +import android.content.Intent +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import androidx.databinding.DataBindingUtil +import androidx.lifecycle.ViewModelProvider +import com.example.wordbook.R +import com.example.wordbook.StudyActivity +import com.example.wordbook.TestActivity +import com.example.wordbook.VocaListActivity +import com.example.wordbook.databinding.ActivityMainBinding + +class MainActivity : AppCompatActivity() { + private lateinit var mBinding: ActivityMainBinding + private lateinit var mViewModel: MainViewModel + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + mBinding = DataBindingUtil.setContentView(this, R.layout.activity_main) + mViewModel = ViewModelProvider(this).get(MainViewModel::class.java) + + mBinding.viewModel = mViewModel + + mViewModel.mMoveToStudy.observe(this) { + if (it) { + startActivity(Intent(this, StudyActivity::class.java)) + } + } + + mViewModel.mMoveToTest.observe(this) { + if (it) { + startActivity(Intent(this, TestActivity::class.java)) + } + } + + mViewModel.mMoveToVocaList.observe(this) { + if (it) { + startActivity(Intent(this, VocaListActivity::class.java)) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/wordbook/main/MainViewModel.kt b/app/src/main/java/com/example/wordbook/main/MainViewModel.kt new file mode 100644 index 0000000..78592b2 --- /dev/null +++ b/app/src/main/java/com/example/wordbook/main/MainViewModel.kt @@ -0,0 +1,38 @@ +package com.example.wordbook.main + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.ViewModel + +class MainViewModel: ViewModel() { + private val _mMoveToStudy = MutableLiveData() + val mMoveToStudy: LiveData + get() = _mMoveToStudy + + private val _mMoveToTest = MutableLiveData() + val mMoveToTest: LiveData + get() = _mMoveToTest + + private val _mMoveToVocaList= MutableLiveData() + val mMoveToVocaList: LiveData + get() = _mMoveToVocaList + + init { + _mMoveToStudy.value = false + _mMoveToTest.value = false + _mMoveToVocaList.value = false + } + + + fun moveToStudy() { + _mMoveToStudy.value = true + } + + fun moveToTest() { + _mMoveToTest.value = true + } + + fun moveToVocaList() { + _mMoveToVocaList.value = true + } +} \ 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 177177b..5d79d58 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -2,6 +2,12 @@ + + + +