wip

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

Author: tobiasKaminsky

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

@@ -17,10 +17,8 @@ import androidx.recyclerview.widget.RecyclerView
 import com.owncloud.android.R
 import com.owncloud.android.lib.resources.tags.Tag
 
-class TagListAdapter(
-    private val onTagChecked: (Tag, Boolean) -> Unit,
-    private val onCreateTag: (String) -> Unit
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class TagListAdapter(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()
@@ -49,9 +47,8 @@ class TagListAdapter(
 
     override fun getItemCount(): Int = tags.size + if (showCreateItem) 1 else 0
 
-    override fun getItemViewType(position: Int): Int {
-        return if (showCreateItem && position == tags.size) VIEW_TYPE_CREATE else VIEW_TYPE_TAG
-    }
+    override fun getItemViewType(position: Int): Int =
+        if (showCreateItem && position == tags.size) VIEW_TYPE_CREATE else VIEW_TYPE_TAG
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         val inflater = LayoutInflater.from(parent.context)
@@ -70,6 +67,7 @@ class TagListAdapter(
                 val tag = tags[position]
                 holder.bind(tag, tag.id in assignedTagIds)
             }
+
             is CreateTagViewHolder -> {
                 holder.bind(query)
             }

app/src/main/java/com/nextcloud/ui/tags/TagManagementBottomSheet.kt

@@ -30,7 +30,9 @@ import com.owncloud.android.utils.theme.ViewThemeUtils
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-class TagManagementBottomSheet : BottomSheetDialogFragment(), Injectable {
+class TagManagementBottomSheet :
+    BottomSheetDialogFragment(),
+    Injectable {
 
     @Inject
     lateinit var vmFactory: ViewModelFactory
@@ -101,11 +103,13 @@ class TagManagementBottomSheet : BottomSheetDialogFragment(), Injectable {
                             binding.loadingIndicator.visibility = View.VISIBLE
                             binding.tagList.visibility = View.GONE
                         }
+
                         is TagManagementViewModel.TagUiState.Loaded -> {
                             binding.loadingIndicator.visibility = View.GONE
                             binding.tagList.visibility = View.VISIBLE
                             tagAdapter.update(state.allTags, state.assignedTagIds, state.query)
                         }
+
                         is TagManagementViewModel.TagUiState.Error -> {
                             binding.loadingIndicator.visibility = View.GONE
                             binding.tagList.visibility = View.GONE
@@ -130,13 +134,12 @@ class TagManagementBottomSheet : BottomSheetDialogFragment(), Injectable {
         private const val ARG_FILE_ID = "ARG_FILE_ID"
         private const val ARG_CURRENT_TAGS = "ARG_CURRENT_TAGS"
 
-        fun newInstance(fileId: Long, currentTags: List<Tag>): TagManagementBottomSheet {
-            return TagManagementBottomSheet().apply {
+        fun newInstance(fileId: Long, currentTags: List<Tag>): TagManagementBottomSheet =
+            TagManagementBottomSheet().apply {
                 arguments = bundleOf(
                     ARG_FILE_ID to fileId,
                     ARG_CURRENT_TAGS to ArrayList(currentTags)
                 )
             }
-        }
     }
 }

app/src/main/java/com/nextcloud/ui/tags/TagManagementViewModel.kt

@@ -29,11 +29,7 @@ class TagManagementViewModel @Inject constructor(
 
     sealed interface TagUiState {
         object Loading : TagUiState
-        data class Loaded(
-            val allTags: List<Tag>,
-            val assignedTagIds: Set<String>,
-            val query: String = ""
-        ) : TagUiState
+        data class Loaded(val allTags: List<Tag>, val assignedTagIds: Set<String>, val query: String = "") : TagUiState
 
         data class Error(val message: String) : TagUiState
     }
@@ -45,14 +41,19 @@ class TagManagementViewModel @Inject constructor(
 
     fun load(fileId: Long, currentTags: List<Tag>) {
         this.fileId = fileId
-        val assignedIds = currentTags.map { it.id }.toSet()
+        val assignedTagNames = currentTags.map { it.name }.toSet()
 
         viewModelScope.launch(Dispatchers.IO) {
             try {
                 val client = clientFactory.create(currentAccountProvider.user)
                 val result = GetTagsRemoteOperation().execute(client)
 
                 if (result.isSuccess) {
+                    val assignedIds = result.resultData
+                        .filter { it.name in assignedTagNames }
+                        .map { it.id }
+                        .toSet()
+
                     _uiState.update {
                         TagUiState.Loaded(
                             allTags = result.resultData,

app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -331,7 +331,7 @@ private void refreshTagChips(Context context) {
         viewThemeUtils.material.themeChipSuggestion(editChip);
         editChip.setOnClickListener(v -> {
             TagManagementBottomSheet bottomSheet = TagManagementBottomSheet.Companion.newInstance(
-                getFile().getFileId(),
+                getFile().getLocalId(),
                 getFile().getTags()
             );
 //            FileActionsBottomSheet bottomSheet =  FileActionsBottomSheet.Companion.newInstance(getFile(), false);