diff --git a/app/src/main/kotlin/jackall/moncalc/service/MainService.kt b/app/src/main/kotlin/jackall/moncalc/service/MainService.kt index 78102f8..6471b9c 100644 --- a/app/src/main/kotlin/jackall/moncalc/service/MainService.kt +++ b/app/src/main/kotlin/jackall/moncalc/service/MainService.kt @@ -111,15 +111,19 @@ PixelFormat.TRANSLUCENT) } - registBinding.registViewModel = OverlayRegistViewModel(this as MainServiceContract) + setSpinnerConfig() + + registViewParams?.gravity = Gravity.TOP + } + + fun setSpinnerConfig() { + registBinding.registViewModel = OverlayRegistViewModel(this as MainServiceContract, this) val templeSpinnerAdapter = CustomSpinnerAdapter(this, monstDataRealmHelper.findNames(Temple::class.java)) val fruitSpinnerAdapter = CustomSpinnerAdapter(this, monstDataRealmHelper.findNames(Fruit::class.java)) val gradeSpinnerAdapter = CustomSpinnerAdapter(this, monstDataRealmHelper.findNames(Grade::class.java)) registBinding.templeSpinner.adapter = templeSpinnerAdapter registBinding.fruitSpinner.adapter = fruitSpinnerAdapter registBinding.gradeSpinner.adapter = gradeSpinnerAdapter - - registViewParams?.gravity = Gravity.TOP } override fun showMoveView() { diff --git a/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt b/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt index 8db0562..a3fa5bf 100644 --- a/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt +++ b/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt @@ -1,13 +1,17 @@ package jackall.moncalc.viewmodel +import android.content.Context import android.databinding.BaseObservable import android.databinding.ObservableInt import android.view.View import android.widget.Toast import jackall.moncalc.App +import jackall.moncalc.common.PreferenceKeys +import jackall.moncalc.common.PreferenceNames import jackall.moncalc.contract.MainServiceContract import jackall.moncalc.db.MonstDataRealmHelper import jackall.moncalc.db.QuestRecordRealmHelper +import jackall.moncalc.utils.MySharedPref import jackall.moncalc.vo.Fruit import jackall.moncalc.vo.Grade import jackall.moncalc.vo.QuestRecord @@ -17,12 +21,13 @@ /** * Created by matsumoto_k on 2017/11/01. */ -class OverlayRegistViewModel(val mainServiceContract: MainServiceContract) : BaseObservable() { +class OverlayRegistViewModel(val mainServiceContract: MainServiceContract, val context: Context) : BaseObservable() { private val monstDataRealmHelper = MonstDataRealmHelper() private val questRecordRealmHelper = QuestRecordRealmHelper() - val templeRank = ObservableInt(0) - val fruitRank = ObservableInt(0) - val gradeRank = ObservableInt(0) + private val mySharedPref by lazy { MySharedPref(context, PreferenceNames.CONFIG) } + val templeRank = ObservableInt(mySharedPref.getValue(PreferenceKeys.TEMPLEPOS, Int::class.java, 0) as Int) + val fruitRank = ObservableInt(mySharedPref.getValue(PreferenceKeys.FRUITPOS, Int::class.java, 0) as Int) + val gradeRank = ObservableInt(mySharedPref.getValue(PreferenceKeys.GRADEPOS, Int::class.java, 0) as Int) fun onClickRegist(view: View) { questRecordRealmHelper.insert( @@ -33,6 +38,7 @@ createAt = Date() ) ) + recordSpinnerPosition(templeRank.get(), fruitRank.get(), gradeRank.get()) Toast.makeText(App.instance, "記録しました", Toast.LENGTH_LONG).show() mainServiceContract.showMoveView() } @@ -49,4 +55,10 @@ monstDataRealmHelper.close() questRecordRealmHelper.close() } + + fun recordSpinnerPosition(templePos: Int, fruitPos: Int, gradePos: Int) { + mySharedPref.putValue(PreferenceKeys.TEMPLEPOS, Int::class.java, templePos) + mySharedPref.putValue(PreferenceKeys.FRUITPOS, Int::class.java, fruitPos) + mySharedPref.putValue(PreferenceKeys.GRADEPOS, Int::class.java, gradePos) + } } \ No newline at end of file