oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

swap statusbar color in dark theme 

Fixes #5242
Closes #5240
// FREEBIE
This commit is contained in:
agrajaghh 2016-02-16 19:37:11 +01:00 committed by Moxie Marlinspike
parent 8cf574bb32
commit ca2457db8d
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/org/thoughtcrime/securesms/color/MaterialColor.java
View File

@ -7,26 +7,25 @@ import android.util.TypedValue;
import org.thoughtcrime.securesms.R;
public enum MaterialColor {
RED (R.color.red_400, R.color.red_900, R.color.red_700, "red"),
PINK (R.color.pink_400, R.color.pink_900, R.color.pink_700, "pink"),
PURPLE (R.color.purple_400, R.color.purple_900, R.color.purple_700, "purple"),
DEEP_PURPLE(R.color.deep_purple_400, R.color.deep_purple_900, R.color.deep_purple_700, "deep_purple"),
INDIGO (R.color.indigo_400, R.color.indigo_900, R.color.indigo_700, "indigo"),
BLUE (R.color.blue_500, R.color.blue_900, R.color.blue_700, "blue"),
LIGHT_BLUE (R.color.light_blue_500, R.color.light_blue_900, R.color.light_blue_700, "light_blue"),
CYAN (R.color.cyan_500, R.color.cyan_900, R.color.cyan_700, "cyan"),
TEAL (R.color.teal_500, R.color.teal_900, R.color.teal_700, "teal"),
GREEN (R.color.green_500, R.color.green_900, R.color.green_700, "green"),
LIGHT_GREEN(R.color.light_green_600, R.color.light_green_900, R.color.light_green_700, "light_green"),
LIME (R.color.lime_500, R.color.lime_900, R.color.lime_700, "lime"),
YELLOW (R.color.yellow_500, R.color.yellow_900, R.color.yellow_700, "yellow"),
AMBER (R.color.amber_600, R.color.amber_900, R.color.amber_700, "amber"),
ORANGE (R.color.orange_500, R.color.orange_900, R.color.orange_700, "orange"),
DEEP_ORANGE(R.color.deep_orange_500, R.color.deep_orange_900, R.color.deep_orange_700, "deep_orange"),
BROWN (R.color.brown_500, R.color.brown_900, R.color.brown_700, "brown"),
GREY (R.color.grey_500, R.color.grey_900, R.color.grey_700, "grey"),
BLUE_GREY (R.color.blue_grey_500, R.color.blue_grey_900, R.color.blue_grey_700, "blue_grey"),
RED (R.color.red_400, R.color.red_700, R.color.red_700, R.color.red_900, "red"),
PINK (R.color.pink_400, R.color.pink_700, R.color.pink_700, R.color.pink_900, "pink"),
PURPLE (R.color.purple_400, R.color.purple_700, R.color.purple_700, R.color.purple_900, "purple"),
DEEP_PURPLE(R.color.deep_purple_400, R.color.deep_purple_700, R.color.deep_purple_700, R.color.deep_purple_900, "deep_purple"),
INDIGO (R.color.indigo_400, R.color.indigo_700, R.color.indigo_700, R.color.indigo_900, "indigo"),
BLUE (R.color.blue_500, R.color.blue_700, R.color.blue_700, R.color.blue_900, "blue"),
LIGHT_BLUE (R.color.light_blue_500, R.color.light_blue_700, R.color.light_blue_700, R.color.light_blue_900, "light_blue"),
CYAN (R.color.cyan_500, R.color.cyan_700, R.color.cyan_700, R.color.cyan_900, "cyan"),
TEAL (R.color.teal_500, R.color.teal_700, R.color.teal_700, R.color.teal_900, "teal"),
GREEN (R.color.green_500, R.color.green_700, R.color.green_700, R.color.green_900, "green"),
LIGHT_GREEN(R.color.light_green_600, R.color.light_green_700, R.color.light_green_700, R.color.light_green_900, "light_green"),
LIME (R.color.lime_500, R.color.lime_700, R.color.lime_700, R.color.lime_900, "lime"),
YELLOW (R.color.yellow_500, R.color.yellow_700, R.color.yellow_700, R.color.yellow_900, "yellow"),
AMBER (R.color.amber_600, R.color.amber_700, R.color.amber_700, R.color.amber_900, "amber"),
ORANGE (R.color.orange_500, R.color.orange_700, R.color.orange_700, R.color.orange_900, "orange"),
DEEP_ORANGE(R.color.deep_orange_500, R.color.deep_orange_700, R.color.deep_orange_700, R.color.deep_orange_900, "deep_orange"),
BROWN (R.color.brown_500, R.color.brown_700, R.color.brown_700, R.color.brown_900, "brown"),
GREY (R.color.grey_500, R.color.grey_700, R.color.grey_700, R.color.grey_900, "grey"),
BLUE_GREY (R.color.blue_grey_500, R.color.blue_grey_700, R.color.blue_grey_700, R.color.blue_grey_900, "blue_grey"),
GROUP (GREY.conversationColorLight, R.color.textsecure_primary, R.color.textsecure_primary_dark,
GREY.conversationColorDark, R.color.gray95, R.color.black,
@ -54,8 +53,11 @@ public enum MaterialColor {
this.serialized = serialized;
}
MaterialColor(int lightColor, int darkColor, int statusBarColor, String serialized) {
this(lightColor, lightColor, statusBarColor, darkColor, darkColor, statusBarColor, serialized);
MaterialColor(int lightColor, int darkColor,
int lightStatusBarColor, int darkStatusBarColor, String serialized)
{
this(lightColor, lightColor, lightStatusBarColor,
darkColor, darkColor, darkStatusBarColor, serialized);
}
public int toConversationColor(@NonNull Context context) {