diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskRepository.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskRepository.kt index c26419fbf..61ac2af02 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskRepository.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/data/repositories/TaskRepository.kt @@ -17,8 +17,12 @@ class TaskRepository @Inject constructor(val apiClient: ApiClient, val localRepo } fun getTasks(taskType: TaskType): Flow> = 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) } } \ No newline at end of file diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/Gear.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/Gear.kt new file mode 100644 index 000000000..7faef561b --- /dev/null +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/Gear.kt @@ -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 +} \ No newline at end of file diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/Items.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/Items.kt new file mode 100644 index 000000000..2550ffda1 --- /dev/null +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/Items.kt @@ -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 +} \ No newline at end of file diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/Profile.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/Profile.kt new file mode 100644 index 000000000..7c510caa6 --- /dev/null +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/Profile.kt @@ -0,0 +1,8 @@ +package com.habitrpg.wearos.habitica.models + +import com.squareup.moshi.JsonClass + +@JsonClass(generateAdapter = true) +class Profile { + var name: String? = null +} \ No newline at end of file diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/User.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/User.kt index 53e619712..679c79170 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/models/User.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/models/User.kt @@ -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? diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/RewardViewHolder.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/RewardListAdapter.kt similarity index 100% rename from wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/RewardViewHolder.kt rename to wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/RewardListAdapter.kt diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/TaskViewHolder.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/TaskViewHolder.kt index bcb1e3af9..9dd3af23d 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/TaskViewHolder.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/tasks/TaskViewHolder.kt @@ -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(itemView) { + var onTaskScored: ((TaskDirection) -> Unit)? = null abstract val titleView: TextView override fun bind(data: Task) { titleView.text = data.text