diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt index 47e74595e..f627c9552 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/TaskListAdapter.kt @@ -2,10 +2,10 @@ package com.habitrpg.wearos.habitica.ui.adapters import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.habitrpg.android.habitica.databinding.RowSectionHeaderBinding +import com.habitrpg.android.habitica.databinding.RowTaskHeaderBinding import com.habitrpg.common.habitica.extensions.layoutInflater import com.habitrpg.wearos.habitica.models.tasks.Task -import com.habitrpg.wearos.habitica.ui.viewHolders.HeaderSectionViewHolder +import com.habitrpg.wearos.habitica.ui.viewHolders.HeaderTaskViewHolder import com.habitrpg.wearos.habitica.ui.viewHolders.tasks.TaskViewHolder open class TaskListAdapter : RecyclerView.Adapter(), BaseAdapter { @@ -25,7 +25,7 @@ open class TaskListAdapter : RecyclerView.Adapter(), Ba override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { val inflater = parent.context.layoutInflater - return HeaderSectionViewHolder(RowSectionHeaderBinding.inflate(inflater, parent, false).root) + return HeaderTaskViewHolder(RowTaskHeaderBinding.inflate(inflater, parent, false).root) } override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { @@ -38,14 +38,14 @@ open class TaskListAdapter : RecyclerView.Adapter(), Ba holder.itemView.setOnClickListener { onTaskTapped?.invoke(item) } - } else if (holder is HeaderSectionViewHolder){ + } else if (holder is HeaderTaskViewHolder){ if (position == 0) { - holder.bind(title) + holder.bind(title, data.firstOrNull() is String) holder.itemView.setOnClickListener { onRefresh?.invoke() } } else { - holder.bind(data[position - 1] as String) + holder.bind(data[position - 1] as String, false) } } } diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderTaskViewHolder.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderTaskViewHolder.kt new file mode 100644 index 000000000..ff3556700 --- /dev/null +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewHolders/HeaderTaskViewHolder.kt @@ -0,0 +1,15 @@ +package com.habitrpg.wearos.habitica.ui.viewHolders + +import android.view.View +import androidx.core.view.isVisible +import androidx.recyclerview.widget.RecyclerView +import com.habitrpg.android.habitica.databinding.RowTaskHeaderBinding + +class HeaderTaskViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + fun bind(title: String, showDone: Boolean) { + binding.header.textView.text = title + binding.doneView.isVisible = showDone + } + + val binding = RowTaskHeaderBinding.bind(itemView) +} diff --git a/wearos/src/main/res/drawable-mdpi/done_sparkles.png b/wearos/src/main/res/drawable-mdpi/done_sparkles.png new file mode 100644 index 000000000..8e75cfebe Binary files /dev/null and b/wearos/src/main/res/drawable-mdpi/done_sparkles.png differ diff --git a/wearos/src/main/res/drawable-xhdpi/done_sparkles.png b/wearos/src/main/res/drawable-xhdpi/done_sparkles.png new file mode 100644 index 000000000..7169deeb3 Binary files /dev/null and b/wearos/src/main/res/drawable-xhdpi/done_sparkles.png differ diff --git a/wearos/src/main/res/drawable-xxhdpi/done_sparkles.png b/wearos/src/main/res/drawable-xxhdpi/done_sparkles.png new file mode 100644 index 000000000..77d80b52b Binary files /dev/null and b/wearos/src/main/res/drawable-xxhdpi/done_sparkles.png differ diff --git a/wearos/src/main/res/layout/row_section_header.xml b/wearos/src/main/res/layout/row_section_header.xml index 1af97509d..2ca69496d 100644 --- a/wearos/src/main/res/layout/row_section_header.xml +++ b/wearos/src/main/res/layout/row_section_header.xml @@ -1,12 +1,12 @@ + android:textColor="@color/watch_purple_200" + tools:text="Header Text" + style="@style/Text.Body1" + android:layout_margin="6dp"/> diff --git a/wearos/src/main/res/layout/row_task_header.xml b/wearos/src/main/res/layout/row_task_header.xml new file mode 100644 index 000000000..afeebfabb --- /dev/null +++ b/wearos/src/main/res/layout/row_task_header.xml @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file diff --git a/wearos/src/main/res/values/strings.xml b/wearos/src/main/res/values/strings.xml index 7ae3faeb5..2d3bd641b 100644 --- a/wearos/src/main/res/values/strings.xml +++ b/wearos/src/main/res/values/strings.xml @@ -37,4 +37,5 @@ Some Food Continue on your phone You leveled up through all your hard work! + All done today! \ No newline at end of file