sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use darker accent color in light theme

This commit is contained in:
Daniel Gultsch 2020-08-31 11:19:27 +02:00
parent 064264c20b
commit 3c0773c6e7
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/utils/StylingHelper.java
View File

@ -129,7 +129,7 @@ public class StylingHelper {
int start = indexOfIgnoreCase(string, needle, 0); int start = indexOfIgnoreCase(string, needle, 0);
while (start != -1) { while (start != -1) {
int end = start + length; int end = start + length;
editable.setSpan(new BackgroundColorSpan(ContextCompat.getColor(context, dark ? R.color.blue_a100 : R.color.blue_a200)), start, end, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE); editable.setSpan(new BackgroundColorSpan(ContextCompat.getColor(context, dark ? R.color.blue_a100 : R.color.blue_a400)), start, end, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
editable.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, dark ? R.color.black87 : R.color.white)), start, end, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE); editable.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, dark ? R.color.black87 : R.color.white)), start, end, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
start = indexOfIgnoreCase(string, needle, start + length); start = indexOfIgnoreCase(string, needle, start + length);
} }

2
src/main/res/values/colors.xml
View File

@ -26,6 +26,8 @@
<color name="orange500">#ffff9800</color> <color name="orange500">#ffff9800</color>
<color name="blue_a100">#ff82B1FF</color> <color name="blue_a100">#ff82B1FF</color>
<color name="blue_a200">#ff448AFF</color> <color name="blue_a200">#ff448AFF</color>
<color name="blue_a400">#ff2979FF</color>
<color name="blue_a700">#ff2962FF</color>
<color name="green500">#ff4CAF50</color> <color name="green500">#ff4CAF50</color>
<color name="green600">#ff43A047</color> <color name="green600">#ff43A047</color>
<color name="green700">#ff388E3C</color> <color name="green700">#ff388E3C</color>

4
src/main/res/values/themes.xml
View File

@ -4,7 +4,7 @@
<style name="ConversationsTheme" parent="Theme.AppCompat.Light.NoActionBar"> <style name="ConversationsTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/green600</item> <item name="colorPrimary">@color/green600</item>
<item name="colorPrimaryDark">@color/green800</item> <item name="colorPrimaryDark">@color/green800</item>
<item name="colorAccent">@color/blue_a200</item> <item name="colorAccent">@color/blue_a400</item>
<item name="popupOverlayStyle">@style/ThemeOverlay.AppCompat.Light</item> <item name="popupOverlayStyle">@style/ThemeOverlay.AppCompat.Light</item>
<item name="color_background_primary">@color/grey50</item> <item name="color_background_primary">@color/grey50</item>
@ -371,7 +371,7 @@
<style name="ConversationsTheme.Dialog" parent="@style/Theme.AppCompat.Light.Dialog"> <style name="ConversationsTheme.Dialog" parent="@style/Theme.AppCompat.Light.Dialog">
<item name="colorPrimary">@color/green600</item> <item name="colorPrimary">@color/green600</item>
<item name="colorPrimaryDark">@color/green700</item> <item name="colorPrimaryDark">@color/green700</item>
<item name="colorAccent">@color/blue_a200</item> <item name="colorAccent">@color/blue_a400</item>
<item name="color_background_primary">@color/grey50</item> <item name="color_background_primary">@color/grey50</item>
<item name="divider">@color/black12</item> <item name="divider">@color/black12</item>
<item name="TextSizeTitle">18sp</item> <item name="TextSizeTitle">18sp</item>