Fork: 0
KeijuMatsumoto / MonCalc
Browse code
[add] extra stage, wakurin
master
1 parent 1599a2d commit fd3cc2e2d583b359bb22e8bd4a2aae688001cb5c
KeijuMatsumoto authored on 7 Nov 2017
Patch
Unified Split
Showing 6 changed files
View
5
■■■■■
 app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt
 
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
import android.view.View
val gradeRank = ObservableInt(mySharedPref.getValue(PreferenceKeys.GRADEPOS, Int::class.java, 0) as Int)
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))
}
QuestRecord(
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()
)
View
6
■■■■■
 app/src/main/kotlin/jackall/moncalc/vo/QuestRecord.kt
open class QuestRecord(
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<Drop> = RealmList<Drop>(),
open var createAt: Date = Date()
) : RealmObject()
View
50
■■■■■
 app/src/main/res/layout/regist_overlay.xml
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/temple_spinner_layout" />
 
<TextView
android:id="@+id/regist_extra_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginTop="4dp"
android:text="@string/extra"
android:textColor="#ffffff"
android:textSize="18dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/regist_list" />
 
<CheckBox
android:id="@+id/regist_extra_check_box"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="@={registViewModel.checkExtra}"
android:theme="@style/OverlayCheckBox"
app:layout_constraintBottom_toBottomOf="@id/regist_extra_text"
app:layout_constraintStart_toEndOf="@id/regist_extra_text"
app:layout_constraintTop_toTopOf="@id/regist_extra_text" />
 
<TextView
android:id="@+id/regist_wakurin_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="@string/wakurin"
android:textColor="#ffffff"
android:textSize="18dp"
app:layout_constraintBottom_toBottomOf="@id/regist_extra_text"
app:layout_constraintStart_toEndOf="@id/regist_extra_check_box"
app:layout_constraintTop_toTopOf="@id/regist_extra_text" />
 
<Spinner
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_marginStart="4dp"
android:background="#ffffff"
android:entries="@array/wakurin_count"
android:selectedItemPosition="@={registViewModel.wakurinRank}"
app:layout_constraintBottom_toBottomOf="@id/regist_extra_text"
app:layout_constraintStart_toEndOf="@id/regist_wakurin_text"
app:layout_constraintTop_toTopOf="@id/regist_extra_text" />
 
<Button
android:id="@+id/regist_add_list"
android:layout_width="@dimen/regist_button_width"
android:layout_height="@dimen/regist_button_height"
android:onClick="@{registViewModel.onClickAdd}"
android:text="追加"
android:textColor="#ffffff"
app:layout_constraintStart_toEndOf="@+id/regist_remove_list"
app:layout_constraintTop_toBottomOf="@+id/regist_list" />
app:layout_constraintTop_toTopOf="@id/regist_remove_list" />
 
<Button
android:id="@+id/regist_remove_list"
android:layout_width="@dimen/regist_button_width"
android:layout_height="@dimen/regist_button_height"
android:layout_marginStart="8dp"
android:layout_marginTop="12dp"
android:background="@drawable/shape_service_button"
android:onClick="@{registViewModel.onClickRemove}"
android:text="削除"
android:textColor="#ffffff"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/regist_add_list" />
app:layout_constraintTop_toBottomOf="@id/regist_extra_text" />
 
<FrameLayout
android:id="@+id/temple_spinner_layout"
android:layout_width="0dp"
View
7
■■■■■
 app/src/main/res/values/arrays.xml
<item>樹縛の神殿</item>
<item>光明の神殿</item>
<item>常闇の神殿</item>
</string-array>
 
<string-array name="wakurin_count">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
</string-array>
</resources>
View
app/src/main/res/values/strings.xml
View
app/src/main/res/values/styles.xml