diff --git a/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt b/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt index 0cb2bd1..1640536 100644 --- a/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt +++ b/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt @@ -3,6 +3,7 @@ import android.content.Context import android.databinding.BaseObservable import android.databinding.BindingAdapter +import android.databinding.ObservableBoolean import android.databinding.ObservableInt import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.RecyclerView @@ -38,6 +39,8 @@ val fruitSpinnerAdapter = CustomSpinnerAdapter(context, monstDataRealmHelper.findNames(Fruit::class.java)) val gradeSpinnerAdapter = CustomSpinnerAdapter(context, monstDataRealmHelper.findNames(Grade::class.java)) val registAdapter = RegistAdapter(context, arrayListOf(RegistItemViewModel(fruitSpinnerAdapter, gradeSpinnerAdapter))) + val checkExtra = ObservableBoolean(false) + val wakurinRank = ObservableInt() fun onClickAdd(view: View) { registAdapter.add(RegistItemViewModel(fruitSpinnerAdapter, gradeSpinnerAdapter)) @@ -66,6 +69,8 @@ attribute = monstDataRealmHelper.findTempleAttributeByRank(templeRank.get()), templeId = monstDataRealmHelper.findIdByRank(Temple::class.java, templeRank.get()), specialCount = count, + extra = checkExtra.get(), + wakurin = wakurinRank.get(), dropCount = drops.count(), drops = drops, createAt = Date() diff --git a/app/src/main/kotlin/jackall/moncalc/vo/QuestRecord.kt b/app/src/main/kotlin/jackall/moncalc/vo/QuestRecord.kt index 2405258..baddf5f 100644 --- a/app/src/main/kotlin/jackall/moncalc/vo/QuestRecord.kt +++ b/app/src/main/kotlin/jackall/moncalc/vo/QuestRecord.kt @@ -11,7 +11,9 @@ open var attribute: Int = -1, open var templeId: Int = -1, open var specialCount: Int = -1, - open var dropCount:Int = -1, + open var dropCount: Int = -1, + open var extra: Boolean = false, + open var wakurin: Int = -1, open var drops: RealmList = RealmList(), open var createAt: Date = Date() ) : RealmObject() \ No newline at end of file diff --git a/app/src/main/res/layout/regist_overlay.xml b/app/src/main/res/layout/regist_overlay.xml index d989e5d..6b02793 100644 --- a/app/src/main/res/layout/regist_overlay.xml +++ b/app/src/main/res/layout/regist_overlay.xml @@ -76,6 +76,51 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/temple_spinner_layout" /> + + + + + + + +