use darker green as background for chat bubbles in dark theme

Daniel Gultsch created

Change summary

art/message_bubble_received_dark.svg                                | 165 
art/render.rb                                                       |   3 
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java |   7 
src/main/res/drawable-hdpi/message_bubble_received.9.png            |   0 
src/main/res/drawable-hdpi/message_bubble_received_dark.9.png       |   0 
src/main/res/drawable-hdpi/message_bubble_received_grey.9.png       |   0 
src/main/res/drawable-hdpi/message_bubble_received_warning.9.png    |   0 
src/main/res/drawable-hdpi/message_bubble_received_white.9.png      |   0 
src/main/res/drawable-hdpi/message_bubble_sent.9.png                |   0 
src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png           |   0 
src/main/res/drawable-mdpi/message_bubble_received.9.png            |   0 
src/main/res/drawable-mdpi/message_bubble_received_dark.9.png       |   0 
src/main/res/drawable-mdpi/message_bubble_received_grey.9.png       |   0 
src/main/res/drawable-mdpi/message_bubble_received_warning.9.png    |   0 
src/main/res/drawable-mdpi/message_bubble_received_white.9.png      |   0 
src/main/res/drawable-mdpi/message_bubble_sent.9.png                |   0 
src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png           |   0 
src/main/res/drawable-xhdpi/message_bubble_received.9.png           |   0 
src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png      |   0 
src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png      |   0 
src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png   |   0 
src/main/res/drawable-xhdpi/message_bubble_received_white.9.png     |   0 
src/main/res/drawable-xhdpi/message_bubble_sent.9.png               |   0 
src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png          |   0 
src/main/res/drawable-xxhdpi/message_bubble_received.9.png          |   0 
src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png     |   0 
src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png     |   0 
src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png  |   0 
src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png    |   0 
src/main/res/drawable-xxhdpi/message_bubble_sent.9.png              |   0 
src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png         |   0 
src/main/res/drawable-xxxhdpi/message_bubble_received.9.png         |   0 
src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png    |   0 
src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png    |   0 
src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png |   0 
src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png   |   0 
src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png             |   0 
src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png        |   0 
src/main/res/values-v21/themes.xml                                  |   2 
src/main/res/values/attrs.xml                                       |   1 
src/main/res/values/themes.xml                                      |   2 
41 files changed, 176 insertions(+), 4 deletions(-)

Detailed changes

art/message_bubble_received_dark.svg 🔗

@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="36"
+   height="26"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="message_bubble_received.svg">
+  <defs
+     id="defs4">
+    <filter
+       x="-0.25"
+       y="-0.25"
+       width="1.5"
+       height="1.5"
+       inkscape:label="Drop Shadow"
+       id="filter3811"
+       color-interpolation-filters="sRGB">
+      <feFlood
+         flood-opacity="0.25"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood3813" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite3815" />
+      <feGaussianBlur
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur3817" />
+      <feOffset
+         dx="0"
+         dy="1"
+         result="offset"
+         id="feOffset3819" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite3821" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="25.745257"
+     inkscape:cy="9.618802"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="989"
+     inkscape:window-height="755"
+     inkscape:window-x="22"
+     inkscape:window-y="16"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     guidecolor="#000000"
+     guideopacity="0.49803922">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px"
+       originx="0px"
+       originy="0px"
+       color="#0000ff"
+       opacity="0.03137255" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="20,26"
+       id="guide3060" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="24,26"
+       id="guide3062" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="36,22"
+       id="guide3064" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="36,6"
+       id="guide3066" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="26,0"
+       id="guide3068" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="18,0"
+       id="guide3070" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="0,10"
+       id="guide3074" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="0,8"
+       id="guide3076" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer"
+     inkscape:groupmode="layer"
+     id="layer"
+     transform="translate(0,-2)">
+    <g
+       id="g3759"
+       style="fill:#326130;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
+      <path
+         style="display:none"
+         d="m 8,6 c 2,2 4,6 4,10 L 16,6 z"
+         id="path3805"
+         inkscape:connector-curvature="0"
+         transform="translate(0,2)"
+         sodipodi:nodetypes="cccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2989"
+         d="M 4,4 16,16 16,4 z"
+         sodipodi:nodetypes="cccc" />
+      <rect
+         ry="2"
+         y="4"
+         x="12"
+         height="20"
+         width="20"
+         id="rect2987" />
+    </g>
+  </g>
+</svg>

art/render.rb 🔗

@@ -12,7 +12,7 @@ resolutions = {
 
 images = {
 	'conversations_baloon.svg' => ['ic_launcher', 48],
-    'conversations_baloon.svg' => ['main_logo', 200],
+   'conversations_baloon.svg' => ['main_logo', 200],
 	'conversations_mono.svg' => ['ic_notification', 24],
 	'ic_received_indicator.svg' => ['ic_received_indicator', 12],
 	'ic_send_text_offline.svg' => ['ic_send_text_offline', 36],
@@ -56,6 +56,7 @@ images = {
 	'md_switch_thumb_on_pressed.svg' => ['switch_thumb_on_pressed', 48],
 	'message_bubble_received.svg' => ['message_bubble_received.9', 0],
 	'message_bubble_received_grey.svg' => ['message_bubble_received_grey.9', 0],
+   'message_bubble_received_dark.svg' => ['message_bubble_received_dark.9', 0],
 	'message_bubble_received_warning.svg' => ['message_bubble_received_warning.9', 0],
 	'message_bubble_received_white.svg' => ['message_bubble_received_white.9', 0],
 	'message_bubble_sent.svg' => ['message_bubble_sent.9', 0],

src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java 🔗

@@ -678,12 +678,13 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
 		if (type == RECEIVED) {
 			if(isInValidSession) {
+				int bubble;
 				if (!mUseGreenBackground) {
-					int bubble = activity.getThemeResource(R.attr.message_bubble_received_monochrome, R.drawable.message_bubble_received_white);
-					viewHolder.message_box.setBackgroundResource(bubble);
+					bubble = activity.getThemeResource(R.attr.message_bubble_received_monochrome, R.drawable.message_bubble_received_white);
 				} else {
-					viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received);
+					bubble = activity.getThemeResource(R.attr.message_bubble_received_green, R.drawable.message_bubble_received);
 				}
+				viewHolder.message_box.setBackgroundResource(bubble);
 				viewHolder.encryption.setVisibility(View.GONE);
 			} else {
 				viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_warning);

src/main/res/values-v21/themes.xml 🔗

@@ -31,6 +31,7 @@
 
         <item name="attr/message_bubble_received_monochrome">@drawable/message_bubble_received_white</item>
         <item name="attr/message_bubble_sent">@drawable/message_bubble_sent</item>
+        <item name="attr/message_bubble_received_green">@drawable/message_bubble_received</item>
 
         <item name="attr/icon_alpha">0.54</item>
 
@@ -91,6 +92,7 @@
 
         <item name="attr/message_bubble_received_monochrome">@drawable/message_bubble_received_grey</item>
         <item name="attr/message_bubble_sent">@drawable/message_bubble_sent_grey</item>
+        <item name="attr/message_bubble_received_green">@drawable/message_bubble_received_dark</item>
 
         <item name="attr/icon_alpha">1.0</item>
 

src/main/res/values/attrs.xml 🔗

@@ -21,6 +21,7 @@
 
     <attr name="message_bubble_received_monochrome" format="reference"/>
     <attr name="message_bubble_sent" format="reference"/>
+    <attr name="message_bubble_received_green" format="reference"/>
 
     <attr name="icon_alpha" format="float"/>
 

src/main/res/values/themes.xml 🔗

@@ -37,6 +37,7 @@
 
         <item name="attr/message_bubble_received_monochrome">@drawable/message_bubble_received_white</item>
         <item name="attr/message_bubble_sent">@drawable/message_bubble_sent</item>
+        <item name="attr/message_bubble_received_green">@drawable/message_bubble_received</item>
 
         <item name="attr/icon_alpha">1.0</item>
 
@@ -84,6 +85,7 @@
 
         <item name="attr/message_bubble_received_monochrome">@drawable/message_bubble_received_grey</item>
         <item name="attr/message_bubble_sent">@drawable/message_bubble_sent_grey</item>
+        <item name="attr/message_bubble_received_green">@drawable/message_bubble_received_dark</item>
 
         <item name="attr/icon_alpha">1.0</item>