Skip to content

Commit

Permalink
Changed appcolor from blue to purple. Added conversation colors.
Browse files Browse the repository at this point in the history
  • Loading branch information
@johanw666
johanw666 committed Sep 12, 2018
1 parent ffcf096 commit 08ce878
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 73 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ android {

defaultConfig {
versionCode 142
versionName "0.15.13"
versionName "0.15.13.2-JW"

minSdkVersion 9
targetSdkVersion 22
Expand Down
30 changes: 15 additions & 15 deletions res/drawable/info_round.xml
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape>
<corners android:radius="2dp" />
<solid android:color="#ff145c95" />
</shape>
</item>

<item>
<shape>
<corners android:radius="2dp" />
<solid android:color="#ff2090ea" />
</shape>
</item>
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape>
<corners android:radius="2dp" />
<solid android:color="#ff7365ad" />
</shape>
</item>

<item>
<shape>
<corners android:radius="2dp" />
<solid android:color="#ff7365ad" />
</shape>
</item>
</selector>
99 changes: 51 additions & 48 deletions res/values/colors.xml
View file
Original file line number Diff line number Diff line change
@@ -1,48 +1,51 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<color name="silence_primary">#ff2090ea</color>
<color name="silence_primary_dark">#ff1c7ac5</color>
<color name="silence_primary_alpha33">#552090ea</color>
<color name="silence_primary_alpha_focus">#882090ea</color>

<color name="white">#ffffffff</color>
<color name="black">#ff000000</color>
<color name="gray5">#ffeeeeee</color>
<color name="gray10">#ffdddddd</color>
<color name="gray12">#ffe0e0e0</color>
<color name="gray13">#ffababab</color>
<color name="gray20">#ffcccccc</color>
<color name="gray27">#ffbbbbbb</color>
<color name="gray50">#ff808080</color>
<color name="gray65">#ff595959</color>
<color name="gray70">#ff4d4d4d</color>
<color name="gray78">#ff383838</color>
<color name="gray95">#ff111111</color>

<color name="gray95_transparent50">#7F111111</color>

<color name="conversation_compose_divider">#32000000</color>

<color name="conversation_list_item_background_read_light">@color/gray5</color>
<color name="conversation_list_item_background_unread_light">#ffffffff</color>
<color name="conversation_list_item_background_read_dark">#ff000000</color>
<color name="conversation_list_item_background_unread_dark">#ff333333</color>

<color name="conversation_list_divider_light">#15000000</color>
<color name="conversation_list_divider_dark">#22ffffff</color>

<color name="textsecure_holo_blue_light">#ff33b5e5</color>

<color name="dark_action_bar">#ff111111</color>
<color name="action_mode_status_bar">#ff1f1f1f</color>
<color name="touch_highlight">#400099cc</color>
<color name="light_button">#33ffffff</color>
<color name="light_button_highlight">#66ffffff</color>

<color name="import_export_item_background_light">#ffeeeeee</color>
<color name="import_export_item_background_dark">#ff333333</color>
<color name="import_export_item_background_shadow_light">#ffd5d5d5</color>
<color name="import_export_item_background_shadow_dark">#ff222222</color>
<color name="import_export_touch_highlight_light">#400099cc</color>
<color name="import_export_touch_highlight_dark">#40ffffff</color>
</resources>
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<!-- JW: change silence_primary, silence_primary_dark, silence_primary_alpha33, silence_primary_alpha_focus -->
<color name="silence_primary">#ff7365ad</color>
<color name="silence_primary_dark">#ff7365ad</color>
<color name="silence_primary_alpha33">#b9b2da</color>
<color name="silence_primary_alpha_focus">#9575cd</color>

<color name="white">#ffffffff</color>
<color name="black">#ff000000</color>
<color name="gray5">#ffeeeeee</color>
<color name="gray10">#ffdddddd</color>
<color name="gray12">#ffe0e0e0</color>
<color name="gray13">#ffababab</color>
<color name="gray20">#ffcccccc</color>
<color name="gray27">#ffbbbbbb</color>
<color name="gray50">#ff808080</color>
<color name="gray65">#ff595959</color>
<color name="gray70">#ff4d4d4d</color>
<color name="gray78">#ff383838</color>
<color name="gray95">#ff111111</color>

<color name="gray95_transparent50">#7F111111</color>

<color name="conversation_compose_divider">#32000000</color>

<color name="conversation_list_item_background_read_light">@color/gray5</color>
<color name="conversation_list_item_background_unread_light">#ffffffff</color>
<color name="conversation_list_item_background_read_dark">#ff000000</color>
<color name="conversation_list_item_background_unread_dark">#ff333333</color>

<color name="conversation_list_divider_light">#15000000</color>
<color name="conversation_list_divider_dark">#22ffffff</color>

<!-- JW: change textsecure_holo_blue_light -->
<color name="textsecure_holo_blue_light">#7c4dff</color>

<color name="dark_action_bar">#ff111111</color>
<color name="action_mode_status_bar">#ff1f1f1f</color>
<color name="touch_highlight">#400099cc</color>
<color name="light_button">#33ffffff</color>
<color name="light_button_highlight">#66ffffff</color>

<color name="import_export_item_background_light">#ffeeeeee</color>
<color name="import_export_item_background_dark">#ff333333</color>
<color name="import_export_item_background_shadow_light">#ffd5d5d5</color>
<color name="import_export_item_background_shadow_dark">#ff222222</color>
<!-- JW: change import_export_touch_highlight_light -->
<color name="import_export_touch_highlight_light">#b39ddb</color>
<color name="import_export_touch_highlight_dark">#40ffffff</color>
</resources>
1 change: 1 addition & 0 deletions src/org/smssecure/smssecure/color/MaterialColor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public enum MaterialColor {
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"),
BLACK (R.color.black, R.color.black, R.color.black, R.color.black, "black"),

GROUP (GREY.conversationColorLight, R.color.silence_primary, R.color.silence_primary_dark,
GREY.conversationColorDark, R.color.gray95, R.color.black,
Expand Down
16 changes: 7 additions & 9 deletions src/org/smssecure/smssecure/color/MaterialColors.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,23 @@ public class MaterialColors {
MaterialColor.RED,
MaterialColor.PINK,
MaterialColor.PURPLE,

MaterialColor.DEEP_PURPLE,
MaterialColor.INDIGO,
MaterialColor.BLUE,

MaterialColor.LIGHT_BLUE,
MaterialColor.CYAN,
MaterialColor.TEAL,
MaterialColor.GREEN,
MaterialColor.LIGHT_GREEN,
// Lime
// Yellow
// Amber
MaterialColor.LIME,
MaterialColor.YELLOW,
MaterialColor.AMBER,
MaterialColor.ORANGE,
MaterialColor.DEEP_ORANGE,
// MaterialColor.BROWN,
MaterialColor.AMBER,
// Grey
MaterialColor.BLUE_GREY
MaterialColor.BROWN,
MaterialColor.GREY,
MaterialColor.BLUE_GREY,
MaterialColor.BLACK
)));

public static class MaterialColorList {
Expand Down

0 comments on commit 08ce878

Please sign in to comment.