TizenRefApp-5090 Implement style for successfully sent message

Change-Id: Ic9392d18c5e047c7eae37a4fd4ef07cb19839a87
Signed-off-by: Dmytro Dragan <dm.dragan@samsung.com>

diff --git a/edje/images/messages_bubble_bg.#.png b/edje/images/messages_bubble_bg.#.png
new file mode 100644 (file)
index 0000000..d4817db
Binary files /dev/null and b/edje/images/messages_bubble_bg.#.png differ

diff --git a/edje/images/messages_bubble_bg_ef.#.png b/edje/images/messages_bubble_bg_ef.#.png
new file mode 100644 (file)
index 0000000..b252f73
Binary files /dev/null and b/edje/images/messages_bubble_bg_ef.#.png differ

diff --git a/res/edje/bubble_theme.edc b/res/edje/bubble_theme.edc
index e676f64..376f6ea 100755 (executable)
--- a/res/edje/bubble_theme.edc
+++ b/res/edje/bubble_theme.edc
@@ -71,7 +71,7 @@
 
 collections {
 
-    base_scale: 1.8;
+    base_scale: 2.6;
 
 images {
        image: "messagebubble_bg_receive_bg.#.png" COMP;
@@ -81,6 +81,8 @@ images {
        image: "messagebubble_bg_send_bg_ef.#.png" COMP;
        image: "bubble_with_search_result_send.#.png" COMP;
        image: "badge_bg_draft.png" COMP;
+       image: "messages_bubble_bg.#.png" COMP;
+       image: "messages_bubble_bg_ef.#.png" COMP;
 }
 
 group {
@@ -115,7 +117,7 @@ group {
 styles {
        style {
                name: "entry_bubble_sent_textblock_style";
-               base: "font=Tizen:style=Roman font_size="ENTRY_BUBBLE_TEXT_SIZE" color=#000000 left_margin=1 right_margin=2 wrap=mixed";
+               base: "font=Tizen:style=Roman font_size="ENTRY_BUBBLE_TEXT_SIZE" color=#000000 left_margin=1 right_margin=2 wrap=mixed align=right";
                tag:  "tab" "\t";
                tag:  "em" "+ font=Tizen:style=Oblique";
                tag:  "b" "+ font=Tizen:style=Bold";
@@ -1847,369 +1849,301 @@ BUBBLE_SENT_MESSAGE_STYLE("sent_style_01_failed", "messagebubble_bg_send_bg.#.pn
 
 BUBBLE_SENT_MESSAGE_STYLE("sent_style_01_failed_focus", "messagebubble_bg_send_bg.#.png", "bubble_with_search_result_send.#.png", "messagebubble_bg_send_bg_ef.#.png", 255, 255, 255, 204, B042, 15, 32, 15)
 
-group { name: "elm/genlist/item/sentbubble/default";
-   alias: "elm/genlist/item_compress/sentbubble/default";
-
-   data.item: "banded_bg_area" "elm.swallow.bg";
+//TODO: clean odl defines and move new defines to their places
+#define BUBBLE_INFO_HEIGHT 88
+#define BUBBLE_CONTENT_WIDTH_MAX 340
+#define BUBBLE_BG_IMAGE_MIN_WIDTH 120
+#define BUBBLE_BG_IMAGE_MIN_HEIGHT 122
+#define BUBBLE_CONTENT_PAD_TOP_HEIGHT 10
+#define BUBBLE_CONTENT_PAD_BOTTOM_HEIGHT 16
+#define BUBBLE_CONTENT_PAD_LEFT_WIDTH 34
+#define BUBBLE_CONTENT_PAD_RIGHT_WIDTH 34
+#define BUBBLE_PAD_BOTTOM_HEIGHT 17
+#define BUBBLE_PAD_LEFT_WIDTH 32
+#define BUBBLE_PAD_RIGHT_WIDTH 32
+#define BUBBLE_PAD_CHECK_WIDTH 32
+#define BUBBLE_CHECK_WIDTH 50
+#define BUBBLE_CHECK_HEIGHT 50
+#define BUBBLE_INFO_THUMB_HEIGHT 80
+#define BUBBLE_INFO_THUMB_WIDTH 80
+#define BUBBLE_INFO_THUMB_PAD_WIDTH 13
+#define BUBBLE_INFO_PAD_TOP_HEIGHT 9
+#define BUBBLE_INFO_STATUS_HEIGHT 38
+#define BUBBLE_INFO_STATUS_WIDTH 30
+#define BUBBLE_INFO_STATUS_PAD_WIDTH 4
+#define BUBBLE_INFO_TEXT_HEIGHT 38
 
-   data.item: "texts" "elm.text elm.text.multiline";
-   data.item: "contents" "elm.swallow.icon elm.swallow.icon.0 elm.swallow.icon.1 elm.swallow.icon.2 elm.swallow.end";
+#define BUBBLE_BG_COLOR 90 111 199 230
+#define BUBBLE_BG_COLOR_PRESSED 78 97 173 230
 
-   script {
-      public main_text_visible = 0;
-      public multiline_text_visible = 0;
-   }
+group { name: "elm/genlist/item/sentbubble/default";
+    alias: "elm/genlist/item_compress/sentbubble/default";
 
-   parts {
-      swallow { "elm.swallow.bg"; scale;
-         desc { "default";
-         }
-      }
-      part { name: "bg";
-         type: RECT;
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-         description { state: "pressed" 0.0;
-            inherit: "default" 0.0;
-            color: 0 0 0 10;
-         }
-         description { state: "disabled" 0.0;
-            color: 0 0 0 0;
-         }
-      }
-      spacer { "base"; scale;
-         desc { "default";
-            min: 0 GENLIST_ITEM_MULTILINE_1LINE_HEIGHT_INC;
-            align: 0.5 0.5;
-         }
-      }
-      image { "image.bg"; scale;
-         desc{ "default";
-            image.normal: "messagebubble_bg_send_bg.#.png";
-            color: 169 182 148 255;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 1.0;
-            rel2.offset: 0 -5;
-         }
-         desc{ "pressed";
-            inherit: "default";
-            color: 140 150 122 255;
-         }
-      }
-      spacer { "elm.padding.left"; scale;
-         desc { "default";
-            min: GENLIST_ITEM_LR_PADDING_INC 0;
-            align: 0.0 0.5;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 0.0 1.0;
-         }
-      }
-      spacer { "elm.padding.right"; scale;
-         desc { "default";
-            min: GENLIST_ITEM_LR_PADDING_INC 0;
-            align: 1.0 0.5;
-            rel1.relative: 1.0 0.0;
-            rel2.relative: 1.0 1.0;
-         }
-      }
-      spacer { "elm.padding.top"; scale;
-         desc { "default";
-            min: 0 GENLIST_ITEM_TOP_PADDING_INC;
-            max: -1 GENLIST_ITEM_TOP_PADDING_INC;
-            align: 0.5 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-         }
-      }
-      spacer { "elm.padding.bottom"; scale;
-         desc { "default";
-            min: 0 GENLIST_ITEM_BOTTOM_PADDING_INC;
-            max: -1 GENLIST_ITEM_BOTTOM_PADDING_INC;
-            align: 0.5 1.0;
-            rel1.relative: 0.0 1.0;
-            rel2.relative: 1.0 1.0;
-         }
-      }
-      swallow { "elm.swallow.icon"; scale;
-         desc { state: "default";
-            align: 0.0 0.5;
-            rel1 { to: "elm.padding.left"; relative: 1.0 0.5; }
-            rel2 { to: "elm.padding.left"; relative: 1.0 0.5; }
-         }
-      }
-      spacer { "elm.padding.B.A"; scale;
-         desc { "default";
-            min: 0 0;
-            align: 0.0 0.5;
-            rel1 { to: "elm.swallow.icon"; relative: 1.0 0.5; }
-            rel2 { to: "elm.swallow.icon"; relative: 1.0 0.5; }
-         }
-         desc { "icon_visible"; inherit: "default";
-            min: GENLIST_ITEM_TYPE_BA_PADDING_INC 0;
-         }
-      }
-      swallow { "elm.swallow.end"; scale;
-         desc { state: "default";
-            align: 1.0 0.5;
-            rel1 { to: "elm.padding.right"; relative: 0.0 0.5; }
-            rel2 { to: "elm.padding.right"; relative: 0.0 0.5; }
-         }
-      }
-      spacer { "elm.padding.D.C"; scale;
-         desc { "default";
-            min: 0 0;
-            align: 1.0 0.5;
-            rel1 { to: "elm.swallow.end"; relative: 0.0 0.5; }
-            rel2 { to: "elm.swallow.end"; relative: 0.0 0.5; }
-         }
-         desc { "icon_visible"; inherit: "default";
-            min: GENLIST_ITEM_TYPE_DC_PADDING_INC 0;
-         }
-      }
-      swallow { "elm.swallow.icon.2"; scale;
-         desc { state: "default";
-            align: 1.0 0.5;
-            rel1 { to: "elm.padding.D.C"; relative: 0.0 0.5; }
-            rel2 { to: "elm.padding.D.C"; relative: 0.0 0.5; }
-         }
-      }
-      spacer { "elm.padding.A.D"; scale;
-         desc { "default";
-            min: 0 0;
-            align: 1.0 0.5;
-            rel1 { to: "elm.swallow.icon.2"; relative: 0.0 0.5; }
-            rel2 { to: "elm.swallow.icon.2"; relative: 0.0 0.5; }
-         }
-         desc { "icon_visible"; inherit: "default";
-            min: GENLIST_ITEM_TYPE_AD_PADDING_INC 0;
-         }
-      }
-      swallow { "elm.swallow.icon.0"; scale;
-         desc { "default";
-            align: 0.0 0.5;
-            rel1 { to_x: "elm.padding.B.A"; to_y: "elm.padding.main.icon.text"; relative: 1.0 0.5; }
-            rel2 { to_x: "elm.padding.B.A"; to_y: "elm.padding.main.icon.text"; relative: 1.0 0.5; }
-         }
-      }
-      spacer { "elm.padding.main.icon.text"; scale;
-         desc { "default";
-            min: 0 0;
-            align: 0.0 0.5;
-            rel1 { to_x: "elm.swallow.icon.0"; relative: 1.0 0.5; }
-            rel2 { to_x: "elm.swallow.icon.0"; relative: 1.0 0.5; }
-         }
-         desc { "icon_visible"; inherit: "default";
-            min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0;
-         }
-      }
-      textblock { "elm.text"; scale;
-         desc { "default";
-            align: 0.5 0.0;
-            rel1 { to_x: "elm.padding.main.icon.text"; to_y: "elm.padding.top"; relative: 1.0 1.0; }
-            rel2 { to_x: "elm.padding.main.text.end"; to_y: "base_line"; relative: 0.0 0.0; }
-            text.style: "entry_bubble_sent_textblock_style";
-            text.min: 0 1;
-         }
-         desc { "pressed"; inherit: "default";
-            text.style: "entry_bubble_sent_textblock_style";
-         }
-         desc { "disabled"; inherit: "default";
-            text.style: "list_text_main_dim";
-         }
-      }
-      spacer { "base_line";
-         desc { "default";
-            rel1 { to: "elm.padding.top"; relative: 0.0 0.0; }
-            rel2 { to: "elm.padding.top"; relative: 1.0 0.0; }
-         }
-         desc { "main_text_visible";
-            rel1 { to: "elm.padding.bottom"; relative: 0.0 0.0; }
-            rel2 { to: "elm.padding.bottom"; relative: 1.0 0.0; }
-         }
-         desc { "multiline_text_visible";
-            rel1 { to: "elm.text.multiline"; relative: 0.0 0.0; }
-            rel2 { to: "elm.text.multiline"; relative: 1.0 0.0; }
-         }
-      }
-      spacer { "elm.padding.main.text.end"; scale;
-         desc { "default";
-            min: 0 0;
-            align: 1.0 0.5;
-            rel1 { to_x: "elm.swallow.icon.1"; relative: 0.0 0.5; }
-            rel2 { to_x: "elm.swallow.icon.1"; relative: 0.0 0.5; }
-         }
-         desc { "icon_visible"; inherit: "default";
-            min: GENLIST_ITEM_MAIN_LINE_TEXT_END_PADDING_INC 0;
-         }
-      }
-      swallow { "elm.swallow.icon.1"; scale;
-         desc { "default";
-            align: 1.0 0.5;
-            rel1 { to_x: "elm.padding.A.D"; to_y: "elm.padding.main.text.end"; relative: 0.0 0.5; }
-            rel2 { to_x: "elm.padding.A.D"; to_y: "elm.padding.main.text.end"; relative: 0.0 0.5; }
-         }
-      }
-      spacer { "multiline_base_line";
-         desc { "default";
-            rel1 { to: "elm.padding.top"; relative: 0.0 1.0; }
-            rel2 { to: "elm.padding.top"; relative: 1.0 1.0; }
-         }
-         desc { "main_text_visible";
-            rel1 { to: "elm.padding.bottom"; relative: 0.0 0.0; }
-            rel2 { to: "elm.padding.bottom"; relative: 1.0 0.0; }
-         }
-      }
-      textblock { "elm.text.multiline"; scale;
-         desc { "default";
-            align: 0.5 1.0;
-            rel1 { to_x: "elm.padding.main.icon.text"; to_y: "multiline_base_line"; relative: 1.0 1.0; }
-            rel2 { to_x: "elm.padding.main.text.end"; to_y: "elm.padding.bottom"; relative: 0.0 0.0; }
-            text.style: "entry_bubble_sent_textblock_style";
-            text.min: 0 1;
-         }
-         desc { "pressed"; inherit: "default";
-            text.style: "entry_bubble_sent_textblock_style";
-         }
-         desc { "disabled"; inherit: "default";
-            text.style: "list_text_multiline_dim";
-         }
-      }
-      rect { "elm.bottomline"; scale;
-         desc { "default";
-            min: 0 LIST_BOTTOMLINE_HEIGHT;
-            max: -1  LIST_BOTTOMLINE_HEIGHT;
-            align: 0.5 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            color: 204 204 204 255;
-         }
-         desc { "hidden"; inherit: "default";
-            visible: 0;
-         }
-      }
-   }
-   programs {
-      program {
-         signal: "elm,state,elm.swallow.bg,visible";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "elm.bottomline";
-      }
-      program {
-         signal: "elm,state,elm.swallow.icon,visible";
-         source: "elm";
-         action: STATE_SET "icon_visible" 0.0;
-         target: "elm.padding.B.A";
-      }
-      program {
-         signal: "elm,state,elm.swallow.icon.2,visible";
-         source: "elm";
-         action: STATE_SET "icon_visible" 0.0;
-         target: "elm.padding.A.D";
-      }
-      program {
-         signal: "elm,state,elm.swallow.end,visible";
-         source: "elm";
-         action: STATE_SET "icon_visible" 0.0;
-         target: "elm.padding.D.C";
-      }
-      program {
-         signal: "elm,state,elm.swallow.icon.0,visible";
-         source: "elm";
-         action: STATE_SET "icon_visible" 0.0;
-         target: "elm.padding.main.icon.text";
-      }
-      program {
-         signal: "elm,state,elm.swallow.icon.1,visible";
-         source: "elm";
-         action: STATE_SET "icon_visible" 0.0;
-         target: "elm.padding.main.text.end";
-      }
-      program { name: "main_text_visible";
-         signal: "elm,state,elm.text,visible";
-         source: "elm";
-         script {
-            if (get_int(multiline_text_visible) == 1) {
-               set_state(PART:"base_line", "multiline_text_visible", 0.0);
-               set_state(PART:"multiline_base_line", "main_text_visible", 0.0);
+    data.item: "banded_bg_area" "elm.swallow.bg";
+    data.item: "texts" "info.time";
+    data.item: "contents" "bubble.content info.thumbnail info.status info.status1 bubble.check";
+    parts{
+        rect { "base"; scale;
+            desc { "default";
+                rel1.to_y: "info.pad";
+                rel2.to_y: "pad.bottom";
+                align: 0.0 0.0;
+                color: 0 0 0 0;
             }
-            else {
-               set_state(PART:"base_line", "main_text_visible", 0.0);
-               set_state(PART:"multiline_base_line", "default", 0.0);
+        }
+        swallow { "elm.swallow.bg"; scale;
+            desc { "default";
             }
-            set_int(main_text_visible, 1);
-         }
-      }
-      program { name: "multiline_text_visible";
-         signal: "elm,state,elm.text.multiline,visible";
-         source: "elm";
-          script {
-            if (get_int(main_text_visible) == 1) {
-               set_state(PART:"base_line", "multiline_text_visible", 0.0);
-               set_state(PART:"multiline_base_line", "main_text_visible", 0.0);
+        }
+        spacer { "info.pad"; scale;
+            desc { "default";
+                min: 0 BUBBLE_INFO_HEIGHT;
+                max: -1 BUBBLE_INFO_HEIGHT;
+                rel1.to_x: "pad.left";
+                rel1.relative: 1.0 0.0;
+                rel2.to_x: "pad.right";
+                rel2.relative: 0.0 1.0;
+                align: 0.0 0.0;
+                fixed: 0 1;
             }
-            else {
-               set_state(PART:"base_line", "main_text_visible", 0.0);
-               set_state(PART:"multiline_base_line", "default", 0.0);
+        }
+        swallow { "info.thumbnail"; scale;
+            desc { "default";
+                min: BUBBLE_INFO_THUMB_WIDTH BUBBLE_INFO_THUMB_HEIGHT;
+                max: BUBBLE_INFO_THUMB_WIDTH BUBBLE_INFO_THUMB_HEIGHT;
+                align: 1.0 0.0;
+                rel1.to_y: "info.pad";
+                rel2.to_x: "info.pad";
+                fixed: 1 1;
             }
-            set_int(multiline_text_visible, 1);
-         }
-      }
-      program { name: "default";
-         signal: "elm,state,default";
-         source: "elm";
-         script {
-            set_state(PART:"base_line", "default", 0.0);
-            set_state(PART:"multiline_base_line", "default", 0.0);
-            set_state(PART:"elm.padding.B.A", "default", 0.0);
-            set_state(PART:"elm.padding.A.D", "default", 0.0);
-            set_state(PART:"elm.padding.D.C", "default", 0.0);
-            set_state(PART:"elm.padding.main.icon.text", "default", 0.0);
-            set_state(PART:"elm.padding.main.text.end", "default", 0.0);
-            set_state(PART:"elm.bottomline", "default", 0.0);
-            set_state(PART:"bg", "default", 0.0);
-            set_state(PART:"elm.text", "default", 0.0);
-            set_state(PART:"elm.text.multiline", "default", 0.0);
-            set_int(main_text_visible, 0);
-            set_int(multiline_text_visible, 0);
-         }
-      }
-      program { name: "pressed";
-         signal: "elm,state,selected";
-         source: "elm";
-         action: STATE_SET "pressed" 0.0;
-         target: "bg";
-         target: "elm.text";
-         target: "elm.text.multiline";
-         target: "image.bg";
-      }
-      program { name: "unpressed";
-         signal: "elm,state,unselected";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "bg";
-         target: "elm.text";
-         target: "elm.text.multiline";
-         target: "image.bg";
-      }
-      program { name: "enabled";
-         signal: "elm,state,enabled";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "bg";
-         target: "elm.text";
-         target: "elm.text.multiline";
-      }
-      program { name: "disabled";
-         signal: "elm,state,disabled";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "bg";
-         target: "elm.text";
-         target: "elm.text.multiline";
-      }
-   }
+        }
+        spacer { "info.thumb.pad"; scale;
+            desc { "default"
+                min: BUBBLE_INFO_THUMB_PAD_WIDTH 0;
+                max: BUBBLE_INFO_THUMB_PAD_WIDTH -1;
+                align: 1.0 0.0;
+                rel2.to_x: "info.thumbnail";
+                rel2.relative: 0.0 1.0;
+                fixed: 1 0;
+            }
+        }
+        spacer { "info.pad.top"; scale;
+            desc { "default"
+                min: 0 BUBBLE_INFO_PAD_TOP_HEIGHT;
+                max: -1 BUBBLE_INFO_PAD_TOP_HEIGHT;
+                align: 0.0 0.0;
+                rel1.to: "info.pad";
+                fixed: 0 1;
+            }
+        }
+        swallow { "info.status"; scale;
+            desc { "default";
+                min: BUBBLE_INFO_STATUS_WIDTH BUBBLE_INFO_STATUS_HEIGHT;
+                max: BUBBLE_INFO_STATUS_WIDTH BUBBLE_INFO_STATUS_HEIGHT;
+                align: 1.0 0.0;
+                rel1.to_y: "info.pad.top";
+                rel2.to_x: "info.thumb.pad";
+                rel2.relative: 0.0 1.0;
+                fixed: 1 1;
+            }
+        }
+        spacer { "info.status.pad"; scale;
+            desc { "default"
+                min: BUBBLE_INFO_STATUS_PAD_WIDTH 0;
+                max: BUBBLE_INFO_STATUS_PAD_WIDTH -1;
+                align: 1.0 0.0;
+                rel2.to_x: "info.status";
+                rel2.relative: 0.0 1.0;
+                fixed: 1 0;
+            }
+        }
+        swallow { "info.status1"; scale;
+            desc { "default";
+                min: BUBBLE_INFO_STATUS_WIDTH BUBBLE_INFO_STATUS_HEIGHT;
+                max: BUBBLE_INFO_STATUS_WIDTH BUBBLE_INFO_STATUS_HEIGHT;
+                align: 1.0 0.0;
+                rel1.to_y: "info.pad.top";
+                rel2.to_x: "info.status.pad";
+                rel2.relative: 0.0 1.0;
+                fixed: 1 1;
+            }
+        }
+        textblock { "info.time"; scale;
+            desc { "default";
+                align: 1.0 0.0;
+                min: 0 BUBBLE_INFO_TEXT_HEIGHT;
+                max: -1 BUBBLE_INFO_TEXT_HEIGHT;
+                rel1.to_y: "info.status";
+                rel1.relative: 0.0 1.0;
+                rel2.to_x: "info.thumb.pad";
+                rel2.relative: 0.0 1.0;
+                text.style: "entry_bubble_sent_textblock_style";
+            }
+        }
+        spacer { "pad.left"; scale;
+            desc { "default";
+                min: BUBBLE_PAD_LEFT_WIDTH 0;
+                rel2.to_x: "bubble.pad.left";
+                rel2.relative: 0.0 0.0;
+                align: 0.0 0.0;
+            }
+        }
+        spacer { "pad.right"; scale;
+            desc { "default";
+                min: BUBBLE_PAD_RIGHT_WIDTH 0;
+                max: BUBBLE_PAD_RIGHT_WIDTH -1;
+                align: 1.0 0.0;
+                rel2.to_x: "bubble.check";
+                rel2.relative: 0.0 1.0;
+                fixed: 1 0;
+            }
+        }
+        spacer { "pad.check"; scale;
+            desc { "default";
+                min: 0 0;
+                max: 0 -1;
+                align: 1.0 0.0;
+                fixed: 1 0;
+            }
+            desc { "selection";
+                inherit: "default";
+                min: BUBBLE_PAD_CHECK_WIDTH 0;
+                max: BUBBLE_PAD_CHECK_WIDTH -1;
+            }
+        }
+        swallow { "bubble.check"; scale;
+            desc { "default";
+                min: 0 BUBBLE_CHECK_HEIGHT;
+                max: 0 BUBBLE_CHECK_HEIGHT;
+                align: 1.0 0.5;
+                rel1.to_y: "bubble.bg.image";
+                rel2.to_x: "pad.check";
+                rel2.to_y: "bubble.bg.image";
+                rel2.relative: 0.0 1.0;
+            }
+            desc { "selection";
+                inherit: "default";
+                min: BUBBLE_CHECK_WIDTH BUBBLE_CHECK_HEIGHT;
+                max: BUBBLE_CHECK_WIDTH BUBBLE_CHECK_HEIGHT;
+            }
+        }
+        image { "bubble.bg.image"; scale;
+            desc { "default";
+                image.normal: "messages_bubble_bg.#.png";
+                rel1.to_x: "bubble.pad.left";
+                rel1.to_y: "bubble.pad.top";
+                rel2.to_x: "bubble.pad.right";
+                rel2.to_y: "bubble.pad.bottom";
+                min: BUBBLE_BG_IMAGE_MIN_WIDTH BUBBLE_BG_IMAGE_MIN_HEIGHT;
+                color: BUBBLE_BG_COLOR;
+            }
+            desc { "pressed";
+                inherit: "default";
+                color: BUBBLE_BG_COLOR_PRESSED;
+            }
+        }
+        image { "bubble.bg.effect"; scale;
+            desc { "default";
+                image.normal: "messages_bubble_bg_ef.#.png";
+                rel1.to: "bubble.bg.image";
+                rel2.to: "bubble.bg.image";
+            }
+        }
+        spacer { "bubble.pad.top"; scale;
+            desc { "default";
+                min: 0 BUBBLE_CONTENT_PAD_TOP_HEIGHT;
+                max: -1 BUBBLE_CONTENT_PAD_TOP_HEIGHT;
+                rel1.to_y: "info.pad";
+                rel1.relative: 0.0 1.0;
+                align: 0.0 0.0;
+                fixed: 0 1;
+            }
+        }
+        spacer { "bubble.pad.left"; scale;
+            desc { "default";
+                min: BUBBLE_CONTENT_PAD_LEFT_WIDTH 0;
+                max: BUBBLE_CONTENT_PAD_LEFT_WIDTH -1;
+                rel2.to_x: "bubble.content";
+                rel2.relative: 0.0 1.0;
+                align: 1.0 0.0;
+                fixed: 1 0;
+            }
+        }
+        swallow { "bubble.content"; scale;
+            desc { "default";
+                max: BUBBLE_CONTENT_WIDTH_MAX -1;
+                rel1.to_y: "bubble.pad.top";
+                rel1.relative: 0.0 1.0;
+                rel2.to_x: "bubble.pad.right";
+                rel2.to_y: "bubble.pad.bottom";
+                rel2.relative: 0.0 0.0;
+                align: 1.0 0.0;
+            }
+        }
+        spacer { "bubble.pad.right"; scale;
+            desc { "default";
+                min: BUBBLE_CONTENT_PAD_RIGHT_WIDTH 0;
+                max: BUBBLE_CONTENT_PAD_RIGHT_WIDTH -1;
+                rel2.to_x: "pad.right";
+                rel2.relative: 0.0 0.0;
+                align: 1.0 0.0;
+                fixed: 1 0;
+            }
+        }
+        spacer { "bubble.pad.bottom"; scale;
+            desc { "default";
+                min: 0 BUBBLE_CONTENT_PAD_BOTTOM_HEIGHT;
+                max: -1 BUBBLE_CONTENT_PAD_BOTTOM_HEIGHT;
+                rel2.to_y: "pad.bottom";
+                rel2.relative: 1.0 0.0;
+                align: 0.0 1.0;
+                fixed: 0 1;
+            }
+        }
+        spacer { "pad.bottom"; scale;
+            desc { "default";
+                min: 0 BUBBLE_PAD_BOTTOM_HEIGHT;
+                max: -1 BUBBLE_PAD_BOTTOM_HEIGHT;
+                rel1.relative: 0.0 1.0;
+                align: 0.0 1.0;
+                fixed: 0 1;
+            }
+        }
+    }
+    programs{
+        program { name: "pressed";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "pressed" 0.0;
+            target: "bubble.bg.image";
+        }
+        program { name: "unpressed";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bubble.bg.image";
+        }
+        program { name: "selection_mode";
+            signal: "elm,state,bubble.check,visible";
+            source: "elm";
+            action: STATE_SET "selection" 0.0;
+            target: "bubble.check";
+            target: "pad.check";
+        }
+        program { name: "default_mode";
+            signal: "elm,state,default";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bubble.check";
+            target: "pad.check";
+        }
+    }
+}
+
+group { name: "elm/genlist/item/draft/default";
+    alias: "elm/genlist/item_compress/draft/default";
+    inherit: "elm/genlist/item/sentbubble/default";
+    //TODO: implement in next commit
 }
 
 group { name: "elm/genlist/item/receivebubble/default";

diff --git a/res/edje/select_all.edc b/res/edje/select_all.edc
index 11c1094..96776f6 100644 (file)
--- a/res/edje/select_all.edc
+++ b/res/edje/select_all.edc
@@ -1,6 +1,6 @@
 #define BACKGROUND_COLOR 250 250 250 255
 #define LEFT_PADDING 32
-#define RIGHT_PADDING 45
+#define RIGHT_PADDING 32
 #define CHECKBOX_SIZE 50
 #define BUBBLE_NAVI_TITLE_SELECT_ALL_COLOR 61 185 204 255
 

diff --git a/src/Common/View/inc/View.h b/src/Common/View/inc/View.h
index 71cf966..ded3fff 100644 (file)
--- a/src/Common/View/inc/View.h
+++ b/src/Common/View/inc/View.h
@@ -43,7 +43,7 @@ namespace Msg
             void setSizeHintWeight(double x = EVAS_HINT_EXPAND, double y = EVAS_HINT_EXPAND);
             void setSizeHintAlign(double x = EVAS_HINT_FILL, double y = EVAS_HINT_FILL);
             void expand();
-            void expand(Evas_Object *obj);
+            static void expand(Evas_Object *obj);
             void setSizeHintMin(Evas_Coord w, Evas_Coord h);
             void setSizeHintMax(Evas_Coord w, Evas_Coord h);
             Evas_Object *setContent(Evas_Object *content, const char *part = nullptr, bool saveOldContent = false);

diff --git a/src/Conversation/ConvList/Controller/inc/ConvListItem.h b/src/Conversation/ConvList/Controller/inc/ConvListItem.h
index 463767a..d3a1f15 100644 (file)
--- a/src/Conversation/ConvList/Controller/inc/ConvListItem.h
+++ b/src/Conversation/ConvList/Controller/inc/ConvListItem.h
@@ -48,10 +48,13 @@ namespace Msg
 
         protected:
             virtual Evas_Object *getBubble();
+            virtual Evas_Object *getThumbnail();
             virtual std::string getText();
             virtual std::string getTime();
 
         private:
+            ConvListViewItem::ConvItemType getConvItemType(MsgConversationItem &item);
+
             // Create Popup when message is clicked
             void showMainCtxPopup();
             void showDraftCtxPopup();
@@ -65,6 +68,8 @@ namespace Msg
             void onCopyToSimCardItemPressed(ContextPopupItem &item);
             void onViewDetailsItemPressed(ContextPopupItem &item);
 
+            void onBubbleResized(Evas_Object *obj, void *data);
+
         private:
             App &m_App;
             MsgId m_MsgId;
@@ -72,6 +77,10 @@ namespace Msg
             bool m_IsDraft;
             Message::Status m_Status;
             Message::Type m_Type;
+
+            //Fixme: temporary fix caused by genlist resize issue
+            Evas_Coord m_Width;
+            Evas_Coord m_Height;
     };
 }
 

diff --git a/src/Conversation/ConvList/Controller/src/ConvListItem.cpp b/src/Conversation/ConvList/Controller/src/ConvListItem.cpp
index 6ab2da2..1135f31 100644 (file)
--- a/src/Conversation/ConvList/Controller/src/ConvListItem.cpp
+++ b/src/Conversation/ConvList/Controller/src/ConvListItem.cpp
@@ -19,30 +19,89 @@
 #include "MsgConversationItem.h"
 #include "BubbleView.h"
 #include "ListView.h"
+#include "CallbackAssist.h"
+#include "ThumbnailMaker.h"
 
 using namespace Msg;
 
 ConvListItem::ConvListItem(MsgConversationItem &item, App &app)
-    : ConvListViewItem(item.getDirection() == Message::Direction::MD_Sent ? ConvItemType::Sent : ConvItemType::Received)
+    : ConvListViewItem(getConvItemType(item))
     , m_App(app)
     , m_MsgId(item.getMsgId())
     , m_MessageText(item.getText())
     , m_IsDraft(item.isDraft())
     , m_Status(item.getStatus())
     , m_Type(item.getType())
+    , m_Width(0)
+    , m_Height(0)
 {
-
 }
 
 ConvListItem::~ConvListItem()
 {
+}
 
+ConvListViewItem::ConvItemType ConvListItem::getConvItemType(MsgConversationItem &item)
+{
+    return item.getDirection() == Message::Direction::MD_Sent ? (!item.isDraft() ? ConvItemType::Sent : ConvItemType::Draft) : ConvItemType::Received;
+}
+
+void ConvListItem::onBubbleResized(Evas_Object *obj, void *data)
+{
+    MSG_LOG("");
+    Evas_Coord w,h;
+    evas_object_geometry_get(obj, nullptr, nullptr, &w, &h);
+    if(m_Height < h || m_Width < w)
+    {
+        m_Width = w;
+        m_Height = h;
+        MSG_LOG("sizes: ", m_Height, " ",m_Width);
+        elm_genlist_item_update(this->getElmObjItem());
+    }
 }
 
 Evas_Object *ConvListItem::getBubble()
 {
-    //TODO: implement getting of multimedia
-    return nullptr;
+    //TODO: implement getting of multimedia instead dummy content. Split to separate class (or update BubbleView)
+    //Only for demo
+    Evas_Object *box = elm_box_add(*getOwner());
+    evas_object_event_callback_add(box, EVAS_CALLBACK_RESIZE, EVAS_EVENT_CALLBACK(ConvListItem, onBubbleResized), this);
+    View::expand(box);
+
+    Evas_Object *label = elm_label_add(box);
+    elm_label_line_wrap_set(label, ELM_WRAP_MIXED);
+    elm_object_part_text_set(label, nullptr, m_MessageText.c_str());
+    View::expand(label);
+    evas_object_show(label);
+    elm_box_pack_end(box, label);
+
+    //Dummy image
+    Evas_Object *image = elm_image_add(box);
+    elm_image_file_set(image, PathUtils::getResourcePath(TEST_IMG_PATH).c_str(), nullptr);
+    evas_object_size_hint_min_set(image, 0, 150);
+    View::expand(image);
+    evas_object_show(image);
+    elm_box_pack_end(box, image);
+
+    MSG_LOG("sizes: ", m_Height, " ",m_Width);
+    if(m_Height > 0 && m_Width > 0)
+    {
+        evas_object_size_hint_min_set(box, m_Width, m_Height);
+        evas_object_size_hint_max_set(box, m_Width, m_Height);
+    }
+    return box;
+}
+
+Evas_Object *ConvListItem::getThumbnail()
+{
+    //TODO: fetch thumb from contacts
+    const int thumbSize = 80;
+    Evas_Object *thumb = nullptr;
+    std::string thumbPath = PathUtils::getResourcePath(THUMB_CONTACT_IMG_PATH);
+    thumb = ThumbnailMaker::make(*getOwner(), ThumbnailMaker::MsgType, thumbPath);
+    evas_object_size_hint_min_set(thumb, thumbSize, thumbSize);
+    evas_object_size_hint_max_set(thumb, thumbSize, thumbSize);
+    return thumb;
 }
 
 std::string ConvListItem::getText()

diff --git a/src/Conversation/ConvList/View/inc/ConvListViewItem.h b/src/Conversation/ConvList/View/inc/ConvListViewItem.h
index 4e46996..63b3258 100644 (file)
--- a/src/Conversation/ConvList/View/inc/ConvListViewItem.h
+++ b/src/Conversation/ConvList/View/inc/ConvListViewItem.h
@@ -30,6 +30,7 @@ namespace Msg
             {
                 Sent,
                 Received,
+                Draft
             };
 
             ConvListViewItem(ConvItemType type);
@@ -37,6 +38,7 @@ namespace Msg
 
         protected:
             virtual Evas_Object *getBubble() = 0;
+            virtual Evas_Object *getThumbnail() = 0;
             virtual std::string getText() = 0;
             virtual std::string getTime() = 0;
 

diff --git a/src/Conversation/ConvList/View/src/ConvListViewItem.cpp b/src/Conversation/ConvList/View/src/ConvListViewItem.cpp
index a9c1b0b..ecc18a1 100644 (file)
--- a/src/Conversation/ConvList/View/src/ConvListViewItem.cpp
+++ b/src/Conversation/ConvList/View/src/ConvListViewItem.cpp
@@ -24,8 +24,12 @@ namespace
     //TODO: Implement different styles
     ListItemStyleRef sentStyle = ListItemStyle::create("sentbubble");
     ListItemStyleRef receivedStyle = ListItemStyle::create("receivebubble");
+    ListItemStyleRef draftStyle = ListItemStyle::create("draft");
 
-    const char *checkBoxPart = "elm.swallow.icon.2";
+    const char *checkBoxPart = "bubble.check";
+    const char *bubbleContentPart = "bubble.content";
+    const char *thumbContentPart = "info.thumbnail";
+    const char *timeTextPart = "info.time";
 }
 
 ConvListViewItem::ConvListViewItem(ConvItemType type)
@@ -39,6 +43,9 @@ ConvListViewItem::ConvListViewItem(ConvItemType type)
         case Received:
             setStyle(receivedStyle);
             break;
+        case Draft:
+            setStyle(draftStyle);
+            break;
         default:
             break;
     }
@@ -53,7 +60,7 @@ std::string ConvListViewItem::getText(ListItem &item, const char *part)
 {
     if(!strcmp(part, "elm.text"))
         return getText();
-    else if(!strcmp(part, "elm.text.multiline"))
+    else if(!strcmp(part, timeTextPart))
         return getTime();
     else
         return "";
@@ -61,8 +68,10 @@ std::string ConvListViewItem::getText(ListItem &item, const char *part)
 
 Evas_Object *ConvListViewItem::getContent(ListItem &item, const char *part)
 {
-    if(!strcmp(part, "elm.swallow.end"))
+    if(!strcmp(part, bubbleContentPart))
         return getBubble();
+    else if(!strcmp(part, thumbContentPart))
+        return getThumbnail();
     else
         return nullptr;
 }