narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

use darker colors for actionbar on dark theme

Browse source
This commit is contained in:
Daniel Gultsch 2016-06-10 20:15:09 +02:00
parent e2a803ee04
commit 4bf9a1e809
6 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/services/NotificationService.java
View file

@ -170,7 +170,7 @@ public class NotificationService {
} }
private void setNotificationColor(final Builder mBuilder) { 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) { public void updateNotification(final boolean notify) {

2
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
View file

@ -387,7 +387,7 @@ public abstract class XmppActivity extends Activity {
mColorRed = getResources().getColor(R.color.red800); mColorRed = getResources().getColor(R.color.red800);
mColorOrange = getResources().getColor(R.color.orange500); mColorOrange = getResources().getColor(R.color.orange500);
mColorGreen = getResources().getColor(R.color.green500); mColorGreen = getResources().getColor(R.color.green500);
mPrimaryColor = getResources().getColor(R.color.primary); mPrimaryColor = getResources().getColor(R.color.primary500);
mPrimaryBackgroundColor = getResources().getColor(R.color.grey50); mPrimaryBackgroundColor = getResources().getColor(R.color.grey50);
mSecondaryBackgroundColor = getResources().getColor(R.color.grey200); mSecondaryBackgroundColor = getResources().getColor(R.color.grey200);

2
src/main/res/layout/conversation_list_row.xml
View file

@ -7,7 +7,7 @@
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/primary"/> android:background="@color/primary500"/>
<FrameLayout <FrameLayout
android:id="@+id/swipeable_item" android:id="@+id/swipeable_item"

8
src/main/res/values-v21/themes.xml
View file

@ -2,8 +2,8 @@
<resources> <resources>
<style name="ConversationsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar"> <style name="ConversationsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
<item name="android:colorPrimary">@color/primary</item> <item name="android:colorPrimary">@color/primary500</item>
<item name="android:colorPrimaryDark">@color/primary_dark</item> <item name="android:colorPrimaryDark">@color/primary700</item>
<item name="android:colorAccent">@color/accent</item> <item name="android:colorAccent">@color/accent</item>
<item name="attr/color_text_primary">@color/black87</item> <item name="attr/color_text_primary">@color/black87</item>
@ -62,8 +62,8 @@
</style> </style>
<style name="ConversationsTheme.Dark" parent="android:Theme.Material"> <style name="ConversationsTheme.Dark" parent="android:Theme.Material">
<item name="android:colorPrimary">@color/primary</item> <item name="android:colorPrimary">@color/primary800</item>
<item name="android:colorPrimaryDark">@color/primary_dark</item> <item name="android:colorPrimaryDark">@color/primary900</item>
<item name="android:colorAccent">@color/accent</item> <item name="android:colorAccent">@color/accent</item>
<item name="attr/color_text_primary">@color/white</item> <item name="attr/color_text_primary">@color/white</item>

6
src/main/res/values/colors.xml
View file

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="primary">#ff259b24</color> <color name="primary500">#ff259b24</color>
<color name="primary_dark">#ff0a7e07</color> <color name="primary700">#ff0a7e07</color>
<color name="primary800">#ff026100</color>
<color name="primary900">#ff024500</color>
<color name="accent">#ff0091ea</color> <color name="accent">#ff0091ea</color>
<color name="black87">#de000000</color> <color name="black87">#de000000</color>
<color name="black54">#8a000000</color> <color name="black54">#8a000000</color>

8
src/main/res/values/themes.xml
View file

@ -128,15 +128,15 @@
</style> </style>
<style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse"> <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
<item name="android:background">@color/primary</item> <item name="android:background">@color/primary500</item>
<item name="android:backgroundStacked">@color/primary_dark</item> <item name="android:backgroundStacked">@color/primary700</item>
<item name="android:displayOptions">showHome|homeAsUp|showTitle</item> <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
<item name="android:icon">@android:color/transparent</item> <item name="android:icon">@android:color/transparent</item>
</style> </style>
<style name="ConversationsActionBar.Dark" parent="@android:style/Widget.Holo.ActionBar.Solid"> <style name="ConversationsActionBar.Dark" parent="@android:style/Widget.Holo.ActionBar.Solid">
<item name="android:background">@color/primary</item> <item name="android:background">@color/primary800</item>
<item name="android:backgroundStacked">@color/primary_dark</item> <item name="android:backgroundStacked">@color/primary900</item>
<item name="android:displayOptions">showHome|homeAsUp|showTitle</item> <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
<item name="android:icon">@android:color/transparent</item> <item name="android:icon">@android:color/transparent</item>
</style> </style>