small refactoring

This commit is contained in:
Phillip Thelen 2022-06-06 16:00:28 +02:00
parent b7d167d1ed
commit f3adb040a1
7 changed files with 35 additions and 20 deletions

View file

@ -17,8 +17,12 @@ class TaskRepository @Inject constructor(val apiClient: ApiClient, val localRepo
}
fun getTasks(taskType: TaskType): Flow<List<Task>> = localRepository.getTasks(taskType)
suspend fun scoreTask(taskID: String, direction: TaskDirection) {
val response = apiClient.scoreTask(taskID, direction.text)
}
suspend fun scoreTask(task: Task, direction: TaskDirection) {
val id = task.id ?: return
val response = apiClient.scoreTask(id, direction.text)
val response = scoreTask(id, direction)
}
}

View file

@ -0,0 +1,9 @@
package com.habitrpg.wearos.habitica.models
import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
open class Gear {
var equipped: Outfit? = null
var costume: Outfit? = null
}

View file

@ -0,0 +1,11 @@
package com.habitrpg.wearos.habitica.models
import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
class Items {
var gear: Gear? = null
var currentMount: String? = null
var currentPet: String? = null
}

View file

@ -0,0 +1,8 @@
package com.habitrpg.wearos.habitica.models
import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
class Profile {
var name: String? = null
}

View file

@ -3,25 +3,6 @@ package com.habitrpg.wearos.habitica.models
import com.habitrpg.common.habitica.models.Avatar
import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
open class Gear {
var equipped: Outfit? = null
var costume: Outfit? = null
}
@JsonClass(generateAdapter = true)
class Items {
var gear: Gear? = null
var currentMount: String? = null
var currentPet: String? = null
}
@JsonClass(generateAdapter = true)
class Profile {
var name: String? = null
}
@JsonClass(generateAdapter = true)
class User: Avatar {
override val currentMount: String?

View file

@ -2,10 +2,12 @@ package com.habitrpg.wearos.habitica.ui.viewHolders.tasks
import android.view.View
import android.widget.TextView
import com.habitrpg.common.habitica.models.responses.TaskDirection
import com.habitrpg.wearos.habitica.models.tasks.Task
import com.habitrpg.wearos.habitica.ui.viewHolders.BindableViewHolder
abstract class TaskViewHolder(itemView: View) : BindableViewHolder<Task>(itemView) {
var onTaskScored: ((TaskDirection) -> Unit)? = null
abstract val titleView: TextView
override fun bind(data: Task) {
titleView.text = data.text