diff options
Diffstat (limited to 'src/main/res')
23 files changed, 24 insertions, 217 deletions
diff --git a/src/main/res/drawable/message_bubble_received_light.xml b/src/main/res/drawable/message_bubble_received_light.xml index c1a8b456b..a895b4bda 100644 --- a/src/main/res/drawable/message_bubble_received_light.xml +++ b/src/main/res/drawable/message_bubble_received_light.xml @@ -10,5 +10,5 @@ android:left="6dp" android:right="6dp" android:top="2dp" /> - <solid android:color="@color/lightwhite" /> + <solid android:color="@color/lightblue" /> </shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_light_dark.xml b/src/main/res/drawable/message_bubble_received_light_dark.xml deleted file mode 100644 index 301f634bc..000000000 --- a/src/main/res/drawable/message_bubble_received_light_dark.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <corners - android:topLeftRadius="0dp" - android:topRightRadius="5dp" - android:bottomRightRadius="5dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="2dp" - android:left="6dp" - android:right="6dp" - android:top="2dp" /> - <solid android:color="@color/darkwhite" /> -</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_light_dark_private.xml b/src/main/res/drawable/message_bubble_received_light_dark_private.xml deleted file mode 100644 index 28bdb9b15..000000000 --- a/src/main/res/drawable/message_bubble_received_light_dark_private.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <stroke android:width="2dp" android:color="@color/accent"/> - <corners - android:topLeftRadius="0dp" - android:topRightRadius="5dp" - android:bottomRightRadius="5dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="2dp" - android:left="6dp" - android:right="6dp" - android:top="2dp" /> - <solid android:color="@color/darkwhite" /> -</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_light_orange_dark_private.xml b/src/main/res/drawable/message_bubble_received_light_orange_dark_private.xml deleted file mode 100644 index cf7d44c87..000000000 --- a/src/main/res/drawable/message_bubble_received_light_orange_dark_private.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <stroke android:width="2dp" android:color="@color/accent_orange"/> - <corners - android:topLeftRadius="0dp" - android:topRightRadius="5dp" - android:bottomRightRadius="5dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="2dp" - android:left="6dp" - android:right="6dp" - android:top="2dp" /> - <solid android:color="@color/darkwhite" /> -</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_light_orange_private.xml b/src/main/res/drawable/message_bubble_received_light_orange_private.xml deleted file mode 100644 index e22a46996..000000000 --- a/src/main/res/drawable/message_bubble_received_light_orange_private.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <stroke android:width="2dp" android:color="@color/accent_orange"/> - <corners - android:topLeftRadius="0dp" - android:topRightRadius="5dp" - android:bottomRightRadius="5dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="2dp" - android:left="6dp" - android:right="6dp" - android:top="2dp" /> - <solid android:color="@color/lightwhite" /> -</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_light_private.xml b/src/main/res/drawable/message_bubble_received_light_private.xml index 6752d9393..657f8dad0 100644 --- a/src/main/res/drawable/message_bubble_received_light_private.xml +++ b/src/main/res/drawable/message_bubble_received_light_private.xml @@ -11,5 +11,5 @@ android:left="6dp" android:right="6dp" android:top="2dp" /> - <solid android:color="@color/lightwhite" /> + <solid android:color="@color/lightblue" /> </shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_warning.xml b/src/main/res/drawable/message_bubble_received_warning.xml index cd47cf948..42e7e8f71 100644 --- a/src/main/res/drawable/message_bubble_received_warning.xml +++ b/src/main/res/drawable/message_bubble_received_warning.xml @@ -10,5 +10,5 @@ android:left="6dp" android:right="6dp" android:top="4dp" /> - <solid android:color="@color/lightred" /> + <solid android:color="?attr/color_bubble_warning" /> </shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_warning_dark.xml b/src/main/res/drawable/message_bubble_received_warning_dark.xml deleted file mode 100644 index e25ef23a2..000000000 --- a/src/main/res/drawable/message_bubble_received_warning_dark.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <corners - android:topLeftRadius="0dp" - android:topRightRadius="5dp" - android:bottomRightRadius="5dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="4dp" - android:left="6dp" - android:right="6dp" - android:top="4dp" /> - <solid android:color="@color/darkred" /> -</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_warning_dark_private.xml b/src/main/res/drawable/message_bubble_received_warning_dark_private.xml deleted file mode 100644 index 758d6d2e8..000000000 --- a/src/main/res/drawable/message_bubble_received_warning_dark_private.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <stroke android:width="2dp" android:color="@color/accent"/> - <corners - android:topLeftRadius="0dp" - android:topRightRadius="5dp" - android:bottomRightRadius="5dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="4dp" - android:left="6dp" - android:right="6dp" - android:top="4dp" /> - <solid android:color="@color/darkred" /> -</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_warning_orange_dark_private.xml b/src/main/res/drawable/message_bubble_received_warning_orange_dark_private.xml deleted file mode 100644 index 5f0525113..000000000 --- a/src/main/res/drawable/message_bubble_received_warning_orange_dark_private.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <stroke android:width="2dp" android:color="@color/accent_orange"/> - <corners - android:topLeftRadius="0dp" - android:topRightRadius="5dp" - android:bottomRightRadius="5dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="4dp" - android:left="6dp" - android:right="6dp" - android:top="4dp" /> - <solid android:color="@color/darkred" /> -</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_warning_orange_private.xml b/src/main/res/drawable/message_bubble_received_warning_orange_private.xml deleted file mode 100644 index 08bd30406..000000000 --- a/src/main/res/drawable/message_bubble_received_warning_orange_private.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <stroke android:width="2dp" android:color="@color/accent_orange"/> - <corners - android:topLeftRadius="0dp" - android:topRightRadius="5dp" - android:bottomRightRadius="5dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="4dp" - android:left="6dp" - android:right="6dp" - android:top="4dp" /> - <solid android:color="@color/lightred" /> -</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_warning_private.xml b/src/main/res/drawable/message_bubble_received_warning_private.xml index 6aef6105e..c5c4ce4ac 100644 --- a/src/main/res/drawable/message_bubble_received_warning_private.xml +++ b/src/main/res/drawable/message_bubble_received_warning_private.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <stroke android:width="2dp" android:color="@color/accent"/> + <stroke android:width="2dp" android:color="?attr/colorAccent"/> <corners android:topLeftRadius="0dp" android:topRightRadius="5dp" @@ -11,5 +11,5 @@ android:left="6dp" android:right="6dp" android:top="4dp" /> - <solid android:color="@color/lightred" /> + <solid android:color="?attr/color_bubble_warning" /> </shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_sent.xml b/src/main/res/drawable/message_bubble_sent.xml index 677c1fe43..3cbe163ec 100644 --- a/src/main/res/drawable/message_bubble_sent.xml +++ b/src/main/res/drawable/message_bubble_sent.xml @@ -10,5 +10,5 @@ android:left="6dp" android:right="6dp" android:top="4dp" /> - <solid android:color="@color/lightblue" /> + <solid android:color="@color/darkblue" /> </shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_sent_dark.xml b/src/main/res/drawable/message_bubble_sent_dark.xml deleted file mode 100644 index 3cbe163ec..000000000 --- a/src/main/res/drawable/message_bubble_sent_dark.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <corners - android:topLeftRadius="5dp" - android:topRightRadius="5dp" - android:bottomRightRadius="0dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="4dp" - android:left="6dp" - android:right="6dp" - android:top="4dp" /> - <solid android:color="@color/darkblue" /> -</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_sent_dark_orange.xml b/src/main/res/drawable/message_bubble_sent_dark_orange.xml deleted file mode 100644 index 6e81cabe7..000000000 --- a/src/main/res/drawable/message_bubble_sent_dark_orange.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <corners - android:topLeftRadius="5dp" - android:topRightRadius="5dp" - android:bottomRightRadius="0dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="4dp" - android:left="6dp" - android:right="6dp" - android:top="4dp" /> - <solid android:color="@color/darkorange" /> -</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_sent_dark_orange_private.xml b/src/main/res/drawable/message_bubble_sent_dark_orange_private.xml deleted file mode 100644 index 33b726220..000000000 --- a/src/main/res/drawable/message_bubble_sent_dark_orange_private.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <stroke android:width="2dp" android:color="@color/accent_orange"/> - <corners - android:topLeftRadius="5dp" - android:topRightRadius="5dp" - android:bottomRightRadius="0dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="4dp" - android:left="6dp" - android:right="6dp" - android:top="4dp" /> - <solid android:color="@color/darkorange" /> -</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_sent_dark_private.xml b/src/main/res/drawable/message_bubble_sent_dark_private.xml deleted file mode 100644 index e37c43ad3..000000000 --- a/src/main/res/drawable/message_bubble_sent_dark_private.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <stroke android:width="2dp" android:color="@color/accent"/> - <corners - android:topLeftRadius="5dp" - android:topRightRadius="5dp" - android:bottomRightRadius="0dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="4dp" - android:left="6dp" - android:right="6dp" - android:top="4dp" /> - <solid android:color="@color/darkblue" /> -</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_sent_orange.xml b/src/main/res/drawable/message_bubble_sent_orange.xml deleted file mode 100644 index a6ab35a46..000000000 --- a/src/main/res/drawable/message_bubble_sent_orange.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <corners - android:topLeftRadius="5dp" - android:topRightRadius="5dp" - android:bottomRightRadius="0dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="4dp" - android:left="6dp" - android:right="6dp" - android:top="4dp" /> - <solid android:color="@color/lightorange" /> -</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_sent_orange_private.xml b/src/main/res/drawable/message_bubble_sent_orange_private.xml deleted file mode 100644 index fca639dfd..000000000 --- a/src/main/res/drawable/message_bubble_sent_orange_private.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <stroke android:width="2dp" android:color="@color/accent_orange"/> - <corners - android:topLeftRadius="5dp" - android:topRightRadius="5dp" - android:bottomRightRadius="0dp" - android:bottomLeftRadius="5dp" /> - <padding - android:bottom="4dp" - android:left="6dp" - android:right="6dp" - android:top="4dp" /> - <solid android:color="@color/lightorange" /> -</shape>
\ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_sent_private.xml b/src/main/res/drawable/message_bubble_sent_private.xml index e83ded310..e37c43ad3 100644 --- a/src/main/res/drawable/message_bubble_sent_private.xml +++ b/src/main/res/drawable/message_bubble_sent_private.xml @@ -11,5 +11,5 @@ android:left="6dp" android:right="6dp" android:top="4dp" /> - <solid android:color="@color/lightblue" /> + <solid android:color="@color/darkblue" /> </shape>
\ No newline at end of file diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index d51172093..16a35eb2b 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -113,7 +113,7 @@ <attr name="popupOverlayStyle" format="reference" /> <attr name="color_bubble_light" format="reference|color" /> - <attr name="color_bubble_blue" format="reference|color" /> + <attr name="color_bubble_dark" format="reference|color" /> <attr name="color_bubble_date" format="reference|color" /> <attr name="color_bubble_warning" format="reference|color" /> diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index e8f3b0d79..67ffc3423 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -8,7 +8,7 @@ <color name="primary_dark_orange">#ffB27300</color> <color name="primary_orange_dark">#ffce8500</color> <color name="primary_dark_orange_dark">#ffa06700</color> - <color name="accent_orange">#ffffa500 </color> + <color name="accent_orange">#ffffa500</color> <color name="accent">#ff0091ea</color> <!-- light blue accent --> <color name="black">#ff000000</color> @@ -51,7 +51,9 @@ <color name="darkred">#ffb71c1c</color> <!-- red 900 --> <color name="darkgreen">#ff1b5e20</color> <!-- green 900 --> - <color name="lightorange">#fffff6e5</color> <!-- blue 100 --> + <color name="lightorange">#ffffb732</color> + <color name="lightorange2">#ffcc8400</color> + <color name="middleorange">#ff996300</color> <color name="darkorange">#ff4c3100</color> <color name="online">#ff388e3c</color> <!-- green 700 --> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index de539df44..ea5230cef 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -26,7 +26,7 @@ <item name="EmojiColor">@color/realblack</item> <item name="color_bubble_light">@color/lightwhite</item> - <item name="color_bubble_blue">@color/lightblue</item> + <item name="color_bubble_dark">@color/lightblue</item> <item name="color_bubble_date">@color/lightgreen</item> <item name="color_bubble_warning">@color/lightred</item> @@ -185,7 +185,7 @@ <item name="EmojiColor">@color/realwhite</item> <item name="color_bubble_light">@color/darkwhite</item> - <item name="color_bubble_blue">@color/darkblue</item> + <item name="color_bubble_dark">@color/darkblue</item> <item name="color_bubble_date">@color/darkgreen</item> <item name="color_bubble_warning">@color/darkred</item> @@ -325,6 +325,11 @@ <item name="colorAccent">@color/accent_orange</item> <item name="colorControlNormal">@color/accent_orange</item> <item name="colorControlActivated">@color/accent_orange</item> + + <item name="color_bubble_light">@color/lightorange</item> + <item name="color_bubble_dark">@color/lightorange2</item> + <item name="color_bubble_date">@color/darkred</item> + <item name="color_bubble_warning">@color/darkgreen</item> </style> <style name="ConversationsTheme.Orange.Dark" parent="ConversationsTheme.Dark"> @@ -333,6 +338,11 @@ <item name="colorAccent">@color/accent_orange</item> <item name="colorControlNormal">@color/accent_orange</item> <item name="colorControlActivated">@color/accent_orange</item> + + <item name="color_bubble_light">@color/middleorange</item> + <item name="color_bubble_dark">@color/darkorange</item> + <item name="color_bubble_date">@color/darkred</item> + <item name="color_bubble_warning">@color/darkgreen</item> </style> <style name="ConversationsTheme.Dialog" parent="@style/Theme.AppCompat.Light.Dialog"> |