TizenRefApp-6757: Remove bg images from bubble genlist.

Change-Id: I9bf9d6016c9c26b12f98e1d3493ff895a660a6e4
Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>

diff --git a/inc/Resource.h b/inc/Resource.h
index 00197a3..4db242a 100644 (file)
--- a/inc/Resource.h
+++ b/inc/Resource.h
@@ -37,7 +37,7 @@
 #define BUTTON_THEME_EDJ_PATH            EDJ_PATH"/button_theme.edj"
 #define THREAD_THEME_EDJ_PATH            EDJ_PATH"/thread_genlist_theme.edj"
 
-#define BUBBLE_THEME_EDJ_PATH            EDJ_PATH"/bubble_theme.edj"
+#define BUBBLE_GENLIST_THEME_EDJ_PATH    EDJ_PATH"/bubble_genlist_theme.edj"
 #define MSG_INPUT_PANEL_EDJ_PATH         EDJ_PATH"/msg_input_panel.edj"
 #define RECIPIENT_PANEL_EDJ_PATH         EDJ_PATH"/recipient_panel.edj"
 

diff --git a/res/edje/bubble_theme.edc b/res/edje/bubble_genlist_theme.edc
similarity index 88%
rename from res/edje/bubble_theme.edc
rename to res/edje/bubble_genlist_theme.edc
index fddbe0c..dbe5fe7 100755 (executable)
--- a/res/edje/bubble_theme.edc
+++ b/res/edje/bubble_genlist_theme.edc
@@ -1,15 +1,16 @@
+#include "macros.inl"
 #include "colors_define.inl"
 #define ENTRY_BUBBLE_TEXT_SIZE 30
 
 #define BUBBLE_MSG_TYPE_PAD_WIDTH 8
 #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_BG_IMAGE_MIN_WIDTH 0
+#define BUBBLE_BG_IMAGE_MIN_HEIGHT 0
+#define BUBBLE_CONTENT_PAD_TOP_HEIGHT 0
+#define BUBBLE_CONTENT_PAD_BOTTOM_HEIGHT 0
+#define BUBBLE_CONTENT_PAD_LEFT_WIDTH 0
+#define BUBBLE_CONTENT_PAD_RIGHT_WIDTH 0
 #define BUBBLE_PAD_BOTTOM_HEIGHT 17
 #define BUBBLE_PAD_LEFT_WIDTH 32
 #define BUBBLE_PAD_RIGHT_WIDTH 32
@@ -32,14 +33,7 @@
 #define BUBBLE_FAILED_BUTTON_WIDTH 56
 #define BUBBLE_FAILED_BUTTON_HEIGHT 56
 
-#define BUBBLE_BG_COLOR 90 111 199 230
-#define BUBBLE_BG_COLOR_PRESSED 78 97 173 230
-#define BUBBLE_BG_DRAFT_COLOR 106 126 204 255
-#define BUBBLE_BG_DRAFT_COLOR_PRESSED 80 94 153 255
-#define BUBBLE_BG_FAILED_COLOR 0 0 0 102
-#define BUBBLE_BG_FAILED_COLOR_PRESSED 0 0 0 133
-#define BUBBLE_BG_RECEIVED_COLOR 65 197 217 255
-#define BUBBLE_BG_RECEIVED_COLOR_PRESSED 50 150 166 255
+#define BUBBLE_BG_COLOR 90 111 199 64
 
 #define DATELINE_TEXT_SIZE 28
 #define DATELINE_TOP_PADDING 16
@@ -53,14 +47,10 @@
 
 collections {
 
-    base_scale: 2.6;
+    BASE_SCALE;
 
 images {
-    image: "messages_bubble_bg.#.png" COMP;
-    image: "messages_bubble_bg_ef.#.png" COMP;
-    image: "messages_bubble_bg_search.#.png" COMP;
-    image: "messages_bubble_line_draft.#.png" COMP;
-    image: "messages_date_divider.#.png" COMP;
+    image: "messages_date_divider.#.png" RAW;
 }
 
 styles {
@@ -265,9 +255,8 @@ group { name: "elm/genlist/item/sentbubble/default";
                 max: BUBBLE_CHECK_WIDTH BUBBLE_CHECK_HEIGHT;
             }
         }
-        image { "bubble.bg.image"; scale;
+        rect { "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";
@@ -275,29 +264,6 @@ group { name: "elm/genlist/item/sentbubble/default";
                 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";
-            }
-        }
-        image { "bubble.bg.search"; scale;
-            desc { "default";
-                visible: 0;
-            }
-            desc { "show_search";
-                inherit: "default";
-                visible: 1;
-                image.normal: "messages_bubble_bg_search.#.png";
-                rel1.to: "bubble.bg.image";
-                rel2.to: "bubble.bg.image";
-            }
         }
         spacer { "bubble.pad.top"; scale;
             desc { "default";
@@ -381,18 +347,6 @@ group { name: "elm/genlist/item/sentbubble/default";
             target: "bubble.check";
             target: "pad.check";
         }
-        program { name: "show_search";
-            signal: "show_search";
-            source: "*";
-            action: STATE_SET "show_search" 0.0;
-            target: "bubble.bg.search";
-        }
-        program { name: "hide_search";
-            signal: "hide_search";
-            source: "*";
-            action: STATE_SET "default" 0.0;
-            target: "bubble.bg.search";
-        }
         program { name: "default_mode";
             signal: "elm,state,default";
             source: "elm";
@@ -410,16 +364,6 @@ group { name: "elm/genlist/item/draft/default";
     data.item: "contents" "bubble.content info.status info.status1 bubble.check draft.button";
 
     parts {
-        image { "bubble.bg.image"; scale;
-            desc { "default";
-                image.normal: "messages_bubble_line_draft.#.png";
-                color: BUBBLE_BG_DRAFT_COLOR;
-            }
-            desc { "pressed";
-                inherit: "default";
-                color: BUBBLE_BG_DRAFT_COLOR_PRESSED;
-            }
-        }
         spacer { "bubble.pad.right"; scale;
             desc { "default";
                 rel2.to_x: "draft.pad";
@@ -464,15 +408,6 @@ group { name: "elm/genlist/item/failed/default";
     data.item: "contents" "bubble.content info.status info.status1 bubble.check failed.button";
 
     parts {
-        image { "bubble.bg.image"; scale;
-            desc { "default";
-                color: BUBBLE_BG_FAILED_COLOR;
-            }
-            desc { "pressed";
-                inherit: "default";
-                color: BUBBLE_BG_FAILED_COLOR_PRESSED;
-            }
-        }
         swallow { "failed.button"; scale;
             desc { "default";
                 min: BUBBLE_FAILED_BUTTON_WIDTH BUBBLE_FAILED_BUTTON_HEIGHT;
@@ -587,15 +522,6 @@ group { name: "elm/genlist/item/receivebubble/default";
                 rel1.relative: 1.0 0.0;
             }
         }
-        image { "bubble.bg.image"; scale;
-            desc { "default";
-                color: BUBBLE_BG_RECEIVED_COLOR;
-            }
-            desc { "pressed";
-                inherit: "default";
-                color: BUBBLE_BG_RECEIVED_COLOR_PRESSED;
-            }
-        }
         spacer { "bubble.pad.left"; scale;
             desc { "default";
                 rel1.to_x: "pad.left";

diff --git a/res/edje/conv_list.edc b/res/edje/conv_list.edc
index 8b8fab6..11c0174 100644 (file)
--- a/res/edje/conv_list.edc
+++ b/res/edje/conv_list.edc
@@ -58,6 +58,7 @@ collections {
             action: STATE_SET "selection" 0.0;
             target: "swl.select";
             target: "swl.list";
+            transition: LINEAR  0.3;
          }
          program { name: "hide.select";
             signal: "hide.select";
@@ -65,6 +66,7 @@ collections {
             action: STATE_SET "default" 0.0;
             target: "swl.select";
             target: "swl.list";
+            transition: LINEAR  0.3;
          }
       }
    }

diff --git a/src/Common/Controller/src/App.cpp b/src/Common/Controller/src/App.cpp
index b882711..8eaa291 100644 (file)
--- a/src/Common/Controller/src/App.cpp
+++ b/src/Common/Controller/src/App.cpp
@@ -55,7 +55,7 @@ bool App::init()
     std::string imagesPath = PathUtils::getResourcePath(IMAGES_EDJ_PATH);
     elm_theme_extension_add(nullptr, imagesPath.c_str());
 
-    std::string bubbleThemePath = PathUtils::getResourcePath(BUBBLE_THEME_EDJ_PATH);
+    std::string bubbleThemePath = PathUtils::getResourcePath(BUBBLE_GENLIST_THEME_EDJ_PATH);
     elm_theme_extension_add(nullptr, bubbleThemePath.c_str());
 
     std::string buttonThemePath = PathUtils::getResourcePath(BUTTON_THEME_EDJ_PATH);