Browse Source

Use new theme utils for classes from master rebase

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Álvaro Brey 2 years ago
parent
commit
7245e2a7b7

+ 7 - 7
app/src/main/java/com/nextcloud/client/widget/DashboardWidgetConfigurationActivity.kt

@@ -44,7 +44,7 @@ import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.ui.adapter.DashboardWidgetListAdapter
 import com.owncloud.android.ui.dialog.AccountChooserInterface
 import com.owncloud.android.ui.dialog.MultipleAccountsDialog
-import com.owncloud.android.utils.theme.ThemeDrawableUtils
+import com.owncloud.android.utils.theme.ViewThemeUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -61,7 +61,7 @@ class DashboardWidgetConfigurationActivity :
     private lateinit var currentUser: User
 
     @Inject
-    lateinit var themeDrawableUtils: ThemeDrawableUtils
+    lateinit var viewThemeUtils: ViewThemeUtils
 
     @Inject
     lateinit var accountManager: UserAccountManager
@@ -87,11 +87,11 @@ class DashboardWidgetConfigurationActivity :
         binding = DashboardWidgetConfigurationLayoutBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        themeDrawableUtils.tintDrawable(binding.icon.drawable, getColor(R.color.dark))
+        viewThemeUtils.platform.colorDrawable(binding.icon.drawable, getColor(R.color.dark))
 
         val layoutManager = LinearLayoutManager(this)
         // TODO follow our new architecture
-        mAdapter = DashboardWidgetListAdapter(themeDrawableUtils, accountManager, clientFactory, this, this)
+        mAdapter = DashboardWidgetListAdapter(accountManager, clientFactory, this, this)
         binding.list.apply {
             setHasFooter(false)
             setAdapter(mAdapter)
@@ -107,12 +107,12 @@ class DashboardWidgetConfigurationActivity :
                 setCompoundDrawablesWithIntrinsicBounds(
                     null,
                     null,
-                    themeDrawableUtils.tintDrawable(
+                    viewThemeUtils.platform.colorDrawable(
                         AppCompatResources.getDrawable(
                             context,
                             R.drawable.ic_baseline_arrow_drop_down_24
-                        ),
-                        R.color.black
+                        )!!,
+                        getColor(R.color.black)
                     ),
                     null
                 )

+ 0 - 3
app/src/main/java/com/owncloud/android/ui/adapter/DashboardWidgetListAdapter.kt

@@ -32,10 +32,8 @@ import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.network.ClientFactory
 import com.nextcloud.client.widget.DashboardWidgetConfigurationInterface
 import com.owncloud.android.databinding.WidgetListItemBinding
-import com.owncloud.android.utils.theme.ThemeDrawableUtils
 
 class DashboardWidgetListAdapter(
-    val themeDrawableUtils: ThemeDrawableUtils,
     val accountManager: UserAccountManager,
     val clientFactory: ClientFactory,
     val context: Context,
@@ -47,7 +45,6 @@ class DashboardWidgetListAdapter(
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return WidgetListItemViewHolder(
             WidgetListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false),
-            themeDrawableUtils,
             accountManager,
             clientFactory,
             context

+ 0 - 2
app/src/main/java/com/owncloud/android/ui/adapter/WidgetListItemViewHolder.kt

@@ -35,11 +35,9 @@ import com.nextcloud.client.widget.DashboardWidgetConfigurationInterface
 import com.owncloud.android.R
 import com.owncloud.android.databinding.WidgetListItemBinding
 import com.owncloud.android.utils.DisplayUtils
-import com.owncloud.android.utils.theme.ThemeDrawableUtils
 
 class WidgetListItemViewHolder(
     val binding: WidgetListItemBinding,
-    val themeDrawableUtils: ThemeDrawableUtils,
     val accountManager: UserAccountManager,
     val clientFactory: ClientFactory,
     val context: Context