Skip to content

Commit 7245e2a

Browse files
committed
Use new theme utils for classes from master rebase
Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
1 parent 12dc5eb commit 7245e2a

3 files changed

Lines changed: 7 additions & 12 deletions

File tree

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import com.owncloud.android.lib.common.utils.Log_OC
4444
import com.owncloud.android.ui.adapter.DashboardWidgetListAdapter
4545
import com.owncloud.android.ui.dialog.AccountChooserInterface
4646
import com.owncloud.android.ui.dialog.MultipleAccountsDialog
47-
import com.owncloud.android.utils.theme.ThemeDrawableUtils
47+
import com.owncloud.android.utils.theme.ViewThemeUtils
4848
import kotlinx.coroutines.CoroutineScope
4949
import kotlinx.coroutines.Dispatchers
5050
import kotlinx.coroutines.launch
@@ -61,7 +61,7 @@ class DashboardWidgetConfigurationActivity :
6161
private lateinit var currentUser: User
6262

6363
@Inject
64-
lateinit var themeDrawableUtils: ThemeDrawableUtils
64+
lateinit var viewThemeUtils: ViewThemeUtils
6565

6666
@Inject
6767
lateinit var accountManager: UserAccountManager
@@ -87,11 +87,11 @@ class DashboardWidgetConfigurationActivity :
8787
binding = DashboardWidgetConfigurationLayoutBinding.inflate(layoutInflater)
8888
setContentView(binding.root)
8989

90-
themeDrawableUtils.tintDrawable(binding.icon.drawable, getColor(R.color.dark))
90+
viewThemeUtils.platform.colorDrawable(binding.icon.drawable, getColor(R.color.dark))
9191

9292
val layoutManager = LinearLayoutManager(this)
9393
// TODO follow our new architecture
94-
mAdapter = DashboardWidgetListAdapter(themeDrawableUtils, accountManager, clientFactory, this, this)
94+
mAdapter = DashboardWidgetListAdapter(accountManager, clientFactory, this, this)
9595
binding.list.apply {
9696
setHasFooter(false)
9797
setAdapter(mAdapter)
@@ -107,12 +107,12 @@ class DashboardWidgetConfigurationActivity :
107107
setCompoundDrawablesWithIntrinsicBounds(
108108
null,
109109
null,
110-
themeDrawableUtils.tintDrawable(
110+
viewThemeUtils.platform.colorDrawable(
111111
AppCompatResources.getDrawable(
112112
context,
113113
R.drawable.ic_baseline_arrow_drop_down_24
114-
),
115-
R.color.black
114+
)!!,
115+
getColor(R.color.black)
116116
),
117117
null
118118
)

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@ import com.nextcloud.client.account.UserAccountManager
3232
import com.nextcloud.client.network.ClientFactory
3333
import com.nextcloud.client.widget.DashboardWidgetConfigurationInterface
3434
import com.owncloud.android.databinding.WidgetListItemBinding
35-
import com.owncloud.android.utils.theme.ThemeDrawableUtils
3635

3736
class DashboardWidgetListAdapter(
38-
val themeDrawableUtils: ThemeDrawableUtils,
3937
val accountManager: UserAccountManager,
4038
val clientFactory: ClientFactory,
4139
val context: Context,
@@ -47,7 +45,6 @@ class DashboardWidgetListAdapter(
4745
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
4846
return WidgetListItemViewHolder(
4947
WidgetListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false),
50-
themeDrawableUtils,
5148
accountManager,
5249
clientFactory,
5350
context

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@ import com.nextcloud.client.widget.DashboardWidgetConfigurationInterface
3535
import com.owncloud.android.R
3636
import com.owncloud.android.databinding.WidgetListItemBinding
3737
import com.owncloud.android.utils.DisplayUtils
38-
import com.owncloud.android.utils.theme.ThemeDrawableUtils
3938

4039
class WidgetListItemViewHolder(
4140
val binding: WidgetListItemBinding,
42-
val themeDrawableUtils: ThemeDrawableUtils,
4341
val accountManager: UserAccountManager,
4442
val clientFactory: ClientFactory,
4543
val context: Context

0 commit comments

Comments
 (0)