Skip to content

Commit 2ec1704

Browse files
Tag: sort case-insensitive
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
1 parent 39f8292 commit 2ec1704

3 files changed

Lines changed: 6 additions & 9 deletions

File tree

app/src/main/java/com/nextcloud/ui/tags/adapter/TagListAdapter.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package com.nextcloud.ui.tags.adapter
88

99
import android.view.LayoutInflater
1010
import android.view.ViewGroup
11+
import androidx.compose.ui.text.toLowerCase
1112
import androidx.recyclerview.widget.RecyclerView
1213
import com.nextcloud.ui.tags.adapter.viewholder.CreateTagViewHolder
1314
import com.nextcloud.ui.tags.adapter.viewholder.TagViewHolder
@@ -35,7 +36,7 @@ class TagListAdapter(private val onTagChecked: (Tag, Boolean) -> Unit, private v
3536
allTags
3637
} else {
3738
allTags.filter { it.name.contains(searchQuery, ignoreCase = true) }
38-
}
39+
}.sortedBy { it.name.lowercase() }
3940

4041
showCreateItem = searchQuery.isNotBlank() && tags.none { it.name.equals(searchQuery, ignoreCase = true) }
4142

app/src/main/java/com/nextcloud/ui/tags/adapter/viewholder/CreateTagViewHolder.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ import android.widget.TextView
1212
import androidx.recyclerview.widget.RecyclerView
1313
import com.owncloud.android.R
1414

15-
class CreateTagViewHolder(
16-
itemView: View,
17-
private val onCreateTag: (String) -> Unit
18-
) : RecyclerView.ViewHolder(itemView) {
15+
class CreateTagViewHolder(itemView: View, private val onCreateTag: (String) -> Unit) :
16+
RecyclerView.ViewHolder(itemView) {
1917
private val colorDot: View = itemView.findViewById(R.id.tag_color_dot)
2018
private val tagName: TextView = itemView.findViewById(R.id.tag_name)
2119
private val checkBox: CheckBox = itemView.findViewById(R.id.tag_checkbox)

app/src/main/java/com/nextcloud/ui/tags/adapter/viewholder/TagViewHolder.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ import androidx.recyclerview.widget.RecyclerView
1515
import com.owncloud.android.R
1616
import com.owncloud.android.lib.resources.tags.Tag
1717

18-
class TagViewHolder(
19-
itemView: View,
20-
private val onTagChecked: (Tag, Boolean) -> Unit
21-
) : RecyclerView.ViewHolder(itemView) {
18+
class TagViewHolder(itemView: View, private val onTagChecked: (Tag, Boolean) -> Unit) :
19+
RecyclerView.ViewHolder(itemView) {
2220
private val colorDot: View = itemView.findViewById(R.id.tag_color_dot)
2321
private val tagName: TextView = itemView.findViewById(R.id.tag_name)
2422
private val checkBox: CheckBox = itemView.findViewById(R.id.tag_checkbox)

0 commit comments

Comments
 (0)