Skip to content

Commit 01d76d5

Browse files
committed
Updated support for colors in test results fragment and add prefix when fetching preferences in RunTestsActivity
1 parent b78e42f commit 01d76d5

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

app/src/main/java/org/openobservatory/ooniprobe/activity/runtests/RunTestsActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ class RunTestsActivity : AbstractActivity() {
146146
}
147147
else -> group.nettests.forEach { nettest ->
148148
when(nettest.selected) {
149-
true -> preferenceManager.enableTest(nettest.name)
150-
false -> preferenceManager.disableTest(nettest.name)
149+
true -> preferenceManager.enableTest(nettest.name, group.preferencePrefix())
150+
false -> preferenceManager.disableTest(nettest.name, group.preferencePrefix())
151151
}
152152
}
153153
}

app/src/main/java/org/openobservatory/ooniprobe/adapters/DashboardAdapter.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import org.openobservatory.ooniprobe.common.AbstractDescriptor
1212
import org.openobservatory.ooniprobe.common.PreferenceManager
1313
import org.openobservatory.ooniprobe.databinding.ItemSeperatorBinding
1414
import org.openobservatory.ooniprobe.databinding.ItemTestsuiteBinding
15+
import org.openobservatory.ooniprobe.model.database.InstalledDescriptor
1516

1617
class DashboardAdapter(
1718
private val items: List<Any>,
@@ -58,7 +59,11 @@ class DashboardAdapter(
5859
cardHolder.binding.apply {
5960
title.setText(item.title)
6061
desc.setText(item.shortDescription)
61-
icon.setImageResource(item.getDisplayIcon(holder.itemView.context))
62+
icon.setImageResource(item.getDisplayIcon(holder.itemView.context)).also {
63+
if (item is InstalledDescriptor){
64+
icon.setColorFilter(item.color)
65+
}
66+
}
6267
}
6368
holder.itemView.tag = item
6469
if (!item.isEnabled(preferenceManager)) {

app/src/main/java/org/openobservatory/ooniprobe/item/RunItem.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ class RunItem(
1414
viewHolder?.itemView?.context?.let { context ->
1515
extra.getDescriptor(context).get().let { descriptor ->
1616
viewHolder.binding?.icon?.setImageResource(descriptor.getDisplayIcon(context))
17+
viewHolder.binding?.icon?.setColorFilter(descriptor.color)
1718
viewHolder.binding?.name?.text = descriptor.title
19+
viewHolder.binding?.name?.setTextColor(descriptor.color)
1820
}
1921
}
2022
}
21-
}
23+
}

0 commit comments

Comments
 (0)