diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/NotificationService.java | 2 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/XmppActivity.java | 2 | ||||
| -rw-r--r-- | src/main/res/layout/conversation_list_row.xml | 2 | ||||
| -rw-r--r-- | src/main/res/values-v21/themes.xml | 8 | ||||
| -rw-r--r-- | src/main/res/values/colors.xml | 6 | ||||
| -rw-r--r-- | src/main/res/values/themes.xml | 8 |
6 files changed, 15 insertions, 13 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java index 764a1d52..a71848da 100644 --- a/src/main/java/eu/siacs/conversations/services/NotificationService.java +++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java @@ -170,7 +170,7 @@ public class NotificationService { } private void setNotificationColor(final Builder mBuilder) { - mBuilder.setColor(mXmppConnectionService.getResources().getColor(R.color.primary)); + mBuilder.setColor(mXmppConnectionService.getResources().getColor(R.color.primary500)); } public void updateNotification(final boolean notify) { diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index 2d908ff8..f49cd1a4 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -387,7 +387,7 @@ public abstract class XmppActivity extends Activity { mColorRed = getResources().getColor(R.color.red800); mColorOrange = getResources().getColor(R.color.orange500); mColorGreen = getResources().getColor(R.color.green500); - mPrimaryColor = getResources().getColor(R.color.primary); + mPrimaryColor = getResources().getColor(R.color.primary500); mPrimaryBackgroundColor = getResources().getColor(R.color.grey50); mSecondaryBackgroundColor = getResources().getColor(R.color.grey200); diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index 94e922f7..cc705d3d 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -7,7 +7,7 @@ <View android:layout_width="fill_parent" android:layout_height="match_parent" - android:background="@color/primary"/> + android:background="@color/primary500"/> <FrameLayout android:id="@+id/swipeable_item" diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml index 7c521569..60880b3d 100644 --- a/src/main/res/values-v21/themes.xml +++ b/src/main/res/values-v21/themes.xml @@ -2,8 +2,8 @@ <resources> <style name="ConversationsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar"> - <item name="android:colorPrimary">@color/primary</item> - <item name="android:colorPrimaryDark">@color/primary_dark</item> + <item name="android:colorPrimary">@color/primary500</item> + <item name="android:colorPrimaryDark">@color/primary700</item> <item name="android:colorAccent">@color/accent</item> <item name="attr/color_text_primary">@color/black87</item> @@ -62,8 +62,8 @@ </style> <style name="ConversationsTheme.Dark" parent="android:Theme.Material"> - <item name="android:colorPrimary">@color/primary</item> - <item name="android:colorPrimaryDark">@color/primary_dark</item> + <item name="android:colorPrimary">@color/primary800</item> + <item name="android:colorPrimaryDark">@color/primary900</item> <item name="android:colorAccent">@color/accent</item> <item name="attr/color_text_primary">@color/white</item> diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 25b1d3b7..2d97bd41 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="primary">#ff259b24</color> - <color name="primary_dark">#ff0a7e07</color> + <color name="primary500">#ff259b24</color> + <color name="primary700">#ff0a7e07</color> + <color name="primary800">#ff026100</color> + <color name="primary900">#ff024500</color> <color name="accent">#ff0091ea</color> <color name="black87">#de000000</color> <color name="black54">#8a000000</color> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 8256f28a..82544e57 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -128,15 +128,15 @@ </style> <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse"> - <item name="android:background">@color/primary</item> - <item name="android:backgroundStacked">@color/primary_dark</item> + <item name="android:background">@color/primary500</item> + <item name="android:backgroundStacked">@color/primary700</item> <item name="android:displayOptions">showHome|homeAsUp|showTitle</item> <item name="android:icon">@android:color/transparent</item> </style> <style name="ConversationsActionBar.Dark" parent="@android:style/Widget.Holo.ActionBar.Solid"> - <item name="android:background">@color/primary</item> - <item name="android:backgroundStacked">@color/primary_dark</item> + <item name="android:background">@color/primary800</item> + <item name="android:backgroundStacked">@color/primary900</item> <item name="android:displayOptions">showHome|homeAsUp|showTitle</item> <item name="android:icon">@android:color/transparent</item> </style> |