update corners and stack bubbles from last message

art/message_bubble_received.svg

@@ -151,10 +151,10 @@
       <path
          inkscape:connector-curvature="0"
          id="path2989"
-         d="M 4,4 22,16 22,4 z"
+         d="M 4,24 22,10 22,24 z"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="12"
          height="20"

art/message_bubble_received_dark.svg

@@ -151,10 +151,10 @@
       <path
          inkscape:connector-curvature="0"
          id="path2989"
-         d="M 4,4 22,16 22,4 z"
+          d="M 4,24 22,10 22,24 z"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="12"
          height="20"

art/message_bubble_received_dark_non_last.svg

@@ -149,7 +149,7 @@
          transform="translate(0,2)"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="12"
          height="20"

art/message_bubble_received_grey.svg

@@ -151,11 +151,11 @@
       <path
          inkscape:connector-curvature="0"
          id="path2989"
-         d="M 4,4 22,16 22,4 z"
+          d="M 4,24 22,10 22,24 z"
          sodipodi:nodetypes="cccc"
          style="fill:#424242;fill-opacity:1" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="12"
          height="20"

art/message_bubble_received_grey_non_last.svg

@@ -149,7 +149,7 @@
          transform="translate(0,2)"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="12"
          height="20"

art/message_bubble_received_non_last.svg

@@ -149,7 +149,7 @@
           transform="translate(0,2)"
           sodipodi:nodetypes="cccc" />
       <rect
-          ry="16"
+          ry="2"
           y="4"
           x="12"
           height="20"

art/message_bubble_received_warning.svg

@@ -151,10 +151,10 @@
       <path
          inkscape:connector-curvature="0"
          id="path2989"
-         d="M 4,4 22,16 22,4 z"
+          d="M 4,24 22,10 22,24 z"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="12"
          height="20"

art/message_bubble_received_warning_non_last.svg

@@ -149,7 +149,7 @@
          transform="translate(0,2)"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="12"
          height="20"

art/message_bubble_received_white.svg

@@ -151,10 +151,10 @@
       <path
          inkscape:connector-curvature="0"
          id="path2989"
-         d="M 4,4 22,16 22,4 z"
+          d="M 4,24 22,10 22,24 z"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="12"
          height="20"

art/message_bubble_received_white_non_last.svg

@@ -149,7 +149,7 @@
          transform="translate(0,2)"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="12"
          height="20"

art/message_bubble_sent.svg

@@ -151,10 +151,10 @@
       <path
          inkscape:connector-curvature="0"
          id="path2989"
-         d="M 32,4 14,16 14,4 z"
+         d="M 32,24 14,10 14,24 z"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="4"
          height="20"

art/message_bubble_sent_grey.svg

@@ -151,11 +151,11 @@
       <path
          inkscape:connector-curvature="0"
          id="path2989"
-          d="M 14,4 32,4 14,16 z"
+          d="M 32,24 14,10 14,24 z"
          sodipodi:nodetypes="cccc"
          style="fill:#424242;fill-opacity:1" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="4"
          height="20"

art/message_bubble_sent_grey_non_last.svg

@@ -149,7 +149,7 @@
          transform="translate(0,2)"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="4"
          height="20"

art/message_bubble_sent_non_last.svg

@@ -150,7 +150,7 @@
          sodipodi:nodetypes="cccc" />
   
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="4"
          height="20"

art/render.rb

@@ -71,19 +71,19 @@ images = {
   'ic_verified_fingerprint.svg' => ['ic_verified_fingerprint', 36],
   'qrcode-scan.svg' => ['ic_qr_code_scan_white_24dp', 24],
   'message_bubble_received.svg' => ['message_bubble_received.9', 0],
-  'message_bubble_received_non_first.svg' => ['message_bubble_received_non_first.9', 0],
+  'message_bubble_received_non_last.svg' => ['message_bubble_received_non_last.9', 0],
   'message_bubble_received_grey.svg' => ['message_bubble_received_grey.9', 0],
-  'message_bubble_received_grey_non_first.svg' => ['message_bubble_received_grey_non_first.9', 0],
+  'message_bubble_received_grey_non_last.svg' => ['message_bubble_received_grey_non_last.9', 0],
   'message_bubble_received_dark.svg' => ['message_bubble_received_dark.9', 0],
-  'message_bubble_received_dark_non_first.svg' => ['message_bubble_received_dark_non_first.9', 0],
+  'message_bubble_received_dark_non_last.svg' => ['message_bubble_received_dark_non_last.9', 0],
   'message_bubble_received_warning.svg' => ['message_bubble_received_warning.9', 0],
-  'message_bubble_received_warning_non_first.svg' => ['message_bubble_received_warning_non_first.9', 0],
+  'message_bubble_received_warning_non_last.svg' => ['message_bubble_received_warning_non_last.9', 0],
   'message_bubble_received_white.svg' => ['message_bubble_received_white.9', 0],
-  'message_bubble_received_white_non_first.svg' => ['message_bubble_received_white_non_first.9', 0],
+  'message_bubble_received_white_non_last.svg' => ['message_bubble_received_white_non_last.9', 0],
   'message_bubble_sent.svg' => ['message_bubble_sent.9', 0],
-  'message_bubble_sent_non_first.svg' => ['message_bubble_sent_non_first.9', 0],
+  'message_bubble_sent_non_last.svg' => ['message_bubble_sent_non_last.9', 0],
   'message_bubble_sent_grey.svg' => ['message_bubble_sent_grey.9', 0],
-  'message_bubble_sent_grey_non_first.svg' => ['message_bubble_send_grey_non_first.9', 0],
+  'message_bubble_sent_grey_non_last.svg' => ['message_bubble_send_grey_non_last.9', 0],
   'date_bubble_white.svg' => ['date_bubble_white.9', 0],
   'date_bubble_grey.svg' => ['date_bubble_grey.9', 0],
   'marker.svg' => ['marker', 0]

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

@@ -911,14 +911,14 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             if (isInValidSession) {
                 int bubble;
                 if (!mUseGreenBackground) {
-                    if (mergeableWithPrev) {
+                    if (mergeableWithNext) {
-                        bubble = activity.getThemeResource(R.attr.message_bubble_received_monochrome_non_first, R.drawable.message_bubble_received_white_non_first);
+                        bubble = activity.getThemeResource(R.attr.message_bubble_received_monochrome_non_last, R.drawable.message_bubble_received_white_non_last);
                     } else {
                         bubble = activity.getThemeResource(R.attr.message_bubble_received_monochrome, R.drawable.message_bubble_received_white);
                     }
                 } else {
-                    if (mergeableWithPrev) {
+                    if (mergeableWithNext) {
-                        bubble = activity.getThemeResource(R.attr.message_bubble_received_green_non_first, R.drawable.message_bubble_received_white_non_first);
+                        bubble = activity.getThemeResource(R.attr.message_bubble_received_green_non_last, R.drawable.message_bubble_received_non_last);
                     } else {
                         bubble = activity.getThemeResource(R.attr.message_bubble_received_green, R.drawable.message_bubble_received);
                     }
@@ -926,8 +926,8 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                 viewHolder.message_box.setBackgroundResource(bubble);
                 viewHolder.encryption.setVisibility(View.GONE);
             } else {
-                if (mergeableWithPrev) {
+                if (mergeableWithNext) {
-                    viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_warning_non_first);
+                    viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_warning_non_last);
                 } else {
                     viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_warning);
                 }
@@ -942,8 +942,8 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
         if (type == SENT) {
             int bubble;
-            if (mergeableWithPrev) {
+            if (mergeableWithNext) {
-                bubble = activity.getThemeResource(R.attr.message_bubble_sent_non_first, R.drawable.message_bubble_sent_non_first);
+                bubble = activity.getThemeResource(R.attr.message_bubble_sent_non_last, R.drawable.message_bubble_sent_non_last);
             } else {
                 bubble = activity.getThemeResource(R.attr.message_bubble_sent, R.drawable.message_bubble_sent);
             }
@@ -954,7 +954,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         displayStatus(viewHolder, message, type, darkBackground);
 
         if (viewHolder.contact_picture != null)
-            viewHolder.contact_picture.setVisibility(mergeableWithPrev ? View.INVISIBLE : View.VISIBLE);
+            viewHolder.contact_picture.setVisibility(mergeableWithNext ? View.INVISIBLE : View.VISIBLE);
         if (viewHolder.edit_indicator != null)
             viewHolder.edit_indicator.setVisibility(mergeableWithNext ? View.GONE : viewHolder.edit_indicator.getVisibility());
         if (viewHolder.encryption != null)