m3 theming for unified search results

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchHeaderViewHolder.kt

@@ -25,17 +25,17 @@ import android.content.Context
 import com.afollestad.sectionedrecyclerview.SectionedViewHolder
 import com.owncloud.android.databinding.UnifiedSearchHeaderBinding
 import com.owncloud.android.ui.unifiedsearch.UnifiedSearchSection
-import com.owncloud.android.utils.theme.ThemeColorUtils
+import com.owncloud.android.utils.theme.newm3.ViewThemeUtils
 
 class UnifiedSearchHeaderViewHolder(
     val binding: UnifiedSearchHeaderBinding,
-    val themeColorUtils: ThemeColorUtils,
+    val viewThemeUtils: ViewThemeUtils,
     val context: Context
 ) :
     SectionedViewHolder(binding.root) {
 
     fun bind(section: UnifiedSearchSection) {
         binding.title.text = section.name
-        binding.title.setTextColor(themeColorUtils.primaryColor(context))
+        viewThemeUtils.platform.colorPrimaryTextViewElement(binding.title)
     }
 }

app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchItemViewHolder.kt

@@ -23,8 +23,6 @@ package com.owncloud.android.ui.adapter
 
 import android.content.Context
 import android.graphics.Bitmap
-import android.graphics.PorterDuff
-import android.graphics.PorterDuffColorFilter
 import android.graphics.drawable.Drawable
 import android.view.View
 import androidx.core.content.res.ResourcesCompat
@@ -42,7 +40,6 @@ import com.owncloud.android.ui.interfaces.UnifiedSearchListInterface
 import com.owncloud.android.utils.BitmapUtils
 import com.owncloud.android.utils.MimeTypeUtil
 import com.owncloud.android.utils.glide.CustomGlideStreamLoader
-import com.owncloud.android.utils.theme.ThemeColorUtils
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils
 
 @Suppress("LongParameterList")
@@ -53,7 +50,6 @@ class UnifiedSearchItemViewHolder(
     private val storageManager: FileDataStorageManager,
     private val listInterface: UnifiedSearchListInterface,
     val context: Context,
-    private val themeColorUtils: ThemeColorUtils,
     private val viewThemeUtils: ViewThemeUtils
 ) :
     SectionedViewHolder(binding.root) {
@@ -104,9 +100,7 @@ class UnifiedSearchItemViewHolder(
                     MimeTypeUtil.getFileTypeIcon(mimetype, entry.title, context, viewThemeUtils)
             }
         }
-        val color = themeColorUtils.primaryColor(context)
-        drawable!!.colorFilter = PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP)
-        return drawable
+        return viewThemeUtils.platform.tintPrimaryDrawable(context, drawable)!!
     }
 
     private inner class RoundIfNeededListener(private val entry: SearchResultEntry) :

app/src/main/java/com/owncloud/android/ui/adapter/UnifiedSearchListAdapter.kt

@@ -40,7 +40,6 @@ import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.ThumbnailsCacheManager.InitDiskCacheTask
 import com.owncloud.android.ui.interfaces.UnifiedSearchListInterface
 import com.owncloud.android.ui.unifiedsearch.UnifiedSearchSection
-import com.owncloud.android.utils.theme.ThemeColorUtils
 import com.owncloud.android.utils.theme.newm3.ViewThemeUtils
 
 /**
@@ -53,7 +52,6 @@ class UnifiedSearchListAdapter(
     private val user: User,
     private val clientFactory: ClientFactory,
     private val context: Context,
-    private val themeColorUtils: ThemeColorUtils,
     private val viewThemeUtils: ViewThemeUtils
 ) : SectionedRecyclerViewAdapter<SectionedViewHolder>() {
     companion object {
@@ -71,7 +69,7 @@ class UnifiedSearchListAdapter(
                     parent,
                     false
                 )
-                UnifiedSearchHeaderViewHolder(binding, themeColorUtils, context)
+                UnifiedSearchHeaderViewHolder(binding, viewThemeUtils, context)
             }
             VIEW_TYPE_FOOTER -> {
                 val binding = UnifiedSearchFooterBinding.inflate(
@@ -94,7 +92,6 @@ class UnifiedSearchListAdapter(
                     storageManager,
                     listInterface,
                     context,
-                    themeColorUtils,
                     viewThemeUtils
                 )
             }

app/src/main/java/com/owncloud/android/ui/fragment/UnifiedSearchFragment.kt

@@ -187,7 +187,6 @@ class UnifiedSearchFragment : Fragment(), Injectable, UnifiedSearchListInterface
             currentAccountProvider.user,
             clientFactory,
             requireContext(),
-            themeColorUtils,
             viewThemeUtils
         )
         adapter.shouldShowFooters(true)