summaryrefslogtreecommitdiff
path: root/app/src/main/java/foundation
diff options
context:
space:
mode:
authorRomain Hunault <romain.hunault@e.email>2022-03-23 15:36:21 +0000
committerRomain Hunault <romain.hunault@e.email>2022-03-23 15:36:21 +0000
commit82a45020557916da2a133df297eafc92f9f7c3db (patch)
tree2e12b5e39ac53ae05474c35bd16e2c2070d4a094 /app/src/main/java/foundation
parent335e504715d6730f701f5897e4cbc49cfdb9f69c (diff)
parenta9d8b2e6a4c45a62ae0b5cbf1e7682886f4360d1 (diff)
Merge branch 'use_system_resources' into 'main'
Use system theme colors. #5082 See merge request e/privacy-central/privacycentralapp!31
Diffstat (limited to 'app/src/main/java/foundation')
-rw-r--r--app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt6
-rw-r--r--app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt2
2 files changed, 4 insertions, 4 deletions
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt
index 4d191bd..f0eda52 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt
@@ -160,7 +160,7 @@ class DashboardFragment :
binding.stateTrackers.setTextColor(
getColor(
requireContext(),
- if (trackersEnabled) R.color.green_on
+ if (trackersEnabled) R.color.green_valid
else R.color.red_off
)
)
@@ -173,7 +173,7 @@ class DashboardFragment :
binding.stateGeolocation.setTextColor(
getColor(
requireContext(),
- if (geolocEnabled) R.color.green_on
+ if (geolocEnabled) R.color.green_valid
else R.color.red_off
)
)
@@ -194,7 +194,7 @@ class DashboardFragment :
binding.stateIpAddress.setTextColor(
getColor(
requireContext(),
- if (ipAddressEnabled) R.color.green_on
+ if (ipAddressEnabled) R.color.green_valid
else R.color.red_off
)
)
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt
index e77b61f..9ffdd12 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/apptrackers/ToggleTrackersAdapter.kt
@@ -52,7 +52,7 @@ class ToggleTrackersAdapter(
spannable.setSpan(UnderlineSpan(), 0, spannable.length, 0)
title.text = spannable
} else {
- title.setTextColor(ContextCompat.getColor(title.context, R.color.black))
+ title.setTextColor(ContextCompat.getColor(title.context, R.color.primary_text))
title.text = text
}