From 54363e5573d13ff607fd46b55342e38ed2ed5b43 Mon Sep 17 00:00:00 2001 From: stom79 Date: Sat, 15 Dec 2018 11:05:09 +0100 Subject: [PATCH] Change links colors #633 --- .../etalab/mastodon/client/Entities/Status.java | 14 +++++++------- app/src/main/res/values/colors.xml | 7 +++++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java index 7fa8e5801..8c822eab4 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java @@ -784,7 +784,7 @@ public class Status implements Parcelable{ else if (theme == THEME_BLACK) ds.setColor(ContextCompat.getColor(context, R.color.black_link_toot)); else if (theme == THEME_LIGHT) - ds.setColor(ContextCompat.getColor(context, R.color.mastodonC4)); + ds.setColor(ContextCompat.getColor(context, R.color.light_link_toot)); } }, matchStart, matchEnd, @@ -824,7 +824,7 @@ public class Status implements Parcelable{ else if (theme == THEME_BLACK) ds.setColor(ContextCompat.getColor(context, R.color.black_link_toot)); else if (theme == THEME_LIGHT) - ds.setColor(ContextCompat.getColor(context, R.color.mastodonC4)); + ds.setColor(ContextCompat.getColor(context, R.color.light_link_toot)); } }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); } @@ -851,7 +851,7 @@ public class Status implements Parcelable{ else if (theme == THEME_BLACK) ds.setColor(ContextCompat.getColor(context, R.color.black_link_toot)); else if (theme == THEME_LIGHT) - ds.setColor(ContextCompat.getColor(context, R.color.mastodonC4)); + ds.setColor(ContextCompat.getColor(context, R.color.light_link_toot)); } }, startPosition, endPosition, @@ -918,7 +918,7 @@ public class Status implements Parcelable{ else if (theme == THEME_BLACK) ds.setColor(ContextCompat.getColor(context, R.color.black_link_toot)); else if (theme == THEME_LIGHT) - ds.setColor(ContextCompat.getColor(context, R.color.mastodonC4)); + ds.setColor(ContextCompat.getColor(context, R.color.light_link_toot)); } }, startPosition, endPosition, @@ -961,7 +961,7 @@ public class Status implements Parcelable{ else if (theme == THEME_BLACK) ds.setColor(ContextCompat.getColor(context, R.color.black_link_toot)); else if (theme == THEME_LIGHT) - ds.setColor(ContextCompat.getColor(context, R.color.mastodonC4)); + ds.setColor(ContextCompat.getColor(context, R.color.light_link_toot)); } }, startPosition, endPosition, @@ -992,7 +992,7 @@ public class Status implements Parcelable{ else if (theme == THEME_BLACK) ds.setColor(ContextCompat.getColor(context, R.color.black_link_toot)); else if (theme == THEME_LIGHT) - ds.setColor(ContextCompat.getColor(context, R.color.mastodonC4)); + ds.setColor(ContextCompat.getColor(context, R.color.light_link_toot)); } }, startPosition, endPosition, @@ -1025,7 +1025,7 @@ public class Status implements Parcelable{ else if (theme == THEME_BLACK) ds.setColor(ContextCompat.getColor(context, R.color.black_link_toot)); else if (theme == THEME_LIGHT) - ds.setColor(ContextCompat.getColor(context, R.color.mastodonC4)); + ds.setColor(ContextCompat.getColor(context, R.color.light_link_toot)); } }, matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 996e79503..fb3be6620 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -12,10 +12,10 @@ #607D8B #d9d9d9 - #0099ff + #d9d9d9 - #0099ff + #f3f3f3 #606984 @@ -96,4 +96,7 @@ #d9d9d9 + #27a7fc + #27a7fc + #27a7fc