Skip to content

fix(tags): apply server theme colors to manage tags UI #17587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 1 commit into from
Sep 9, 2026
Merged

fix(tags): apply server theme colors to manage tags UI #17587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/src/main/java/com/nextcloud/ui/tags/TagManagementBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ class TagManagementBottomSheet :
bottomSheetDialog.behavior.skipCollapsed = true

viewThemeUtils.platform.colorViewBackground(binding.bottomSheet, ColorRole.SURFACE)
viewThemeUtils.material.colorTextInputLayout(binding.searchInputLayout)
viewThemeUtils.material.colorProgressBar(binding.loadingIndicator)

setupAdapter()
setupSearch()
Expand All @@ -71,6 +73,7 @@ class TagManagementBottomSheet :

private fun setupAdapter() {
tagAdapter = TagListAdapter(
viewThemeUtils = viewThemeUtils,
onTagChecked = { tag, isChecked ->
if (isChecked) {
viewModel.assignTag(tag)
Expand Down
10 changes: 7 additions & 3 deletions app/src/main/java/com/nextcloud/ui/tags/adapter/TagListAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@ import com.nextcloud.ui.tags.adapter.viewholder.CreateTagViewHolder
import com.nextcloud.ui.tags.adapter.viewholder.TagViewHolder
import com.owncloud.android.R
import com.owncloud.android.lib.resources.tags.Tag
import com.owncloud.android.utils.theme.ViewThemeUtils

class TagListAdapter(private val onTagChecked: (Tag, Boolean) -> Unit, private val onCreateTag: (String) -> Unit) :
RecyclerView.Adapter<RecyclerView.ViewHolder>() {
class TagListAdapter(
private val viewThemeUtils: ViewThemeUtils,
private val onTagChecked: (Tag, Boolean) -> Unit,
private val onCreateTag: (String) -> Unit
) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {

private var tags: List<Tag> = emptyList()
private var assignedTagIds: Set<String> = emptySet()
Expand Down Expand Up @@ -56,7 +60,7 @@ class TagListAdapter(private val onTagChecked: (Tag, Boolean) -> Unit, private v
CreateTagViewHolder(view, onCreateTag)
} else {
val view = inflater.inflate(R.layout.tag_list_item, parent, false)
TagViewHolder(view, onTagChecked)
TagViewHolder(view, viewThemeUtils, onTagChecked)
}
}

Expand Down
9 changes: 7 additions & 2 deletions app/src/main/java/com/nextcloud/ui/tags/adapter/viewholder/TagViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,20 @@ import androidx.core.graphics.toColorInt
import androidx.recyclerview.widget.RecyclerView
import com.owncloud.android.R
import com.owncloud.android.lib.resources.tags.Tag
import com.owncloud.android.utils.theme.ViewThemeUtils

class TagViewHolder(itemView: View, private val onTagChecked: (Tag, Boolean) -> Unit) :
RecyclerView.ViewHolder(itemView) {
class TagViewHolder(
itemView: View,
private val viewThemeUtils: ViewThemeUtils,
private val onTagChecked: (Tag, Boolean) -> Unit
) : RecyclerView.ViewHolder(itemView) {
private val colorDot: View = itemView.findViewById(R.id.tag_color_dot)
private val tagName: TextView = itemView.findViewById(R.id.tag_name)
private val checkBox: CheckBox = itemView.findViewById(R.id.tag_checkbox)

fun bind(tag: Tag, isAssigned: Boolean) {
tagName.text = tag.name
viewThemeUtils.platform.themeCheckbox(checkBox)

val tagColor = tag.color
if (tagColor != null) {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@ private void refreshTagChips(Context context) {
.build());
editChip.setEnsureMinTouchTargetSize(false);
viewThemeUtils.material.themeChipSuggestion(editChip);
editChip.setChipIconTint(editChip.getTextColors());
editChip.setOnClickListener(v -> {
TagManagementBottomSheet bottomSheet = TagManagementBottomSheet.Companion.newInstance(
getFile().getLocalId(),
Expand Down
Loading