[Nocontent] Apply Dark & Light theme UX v0.7, v0.8. New style added.

Change-Id: Ib18e16e05ff3ce390e90b49fb0261bbeb3876e8c

diff --git a/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_album.png b/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_album.png
new file mode 100644 (file)
index 0000000..097ee75
Binary files /dev/null and b/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_album.png differ

diff --git a/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_devices.png b/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_devices.png
old mode 100755 (executable)
new mode 100644 (file)
index d0befd0..a8fc9ea
Binary files a/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_devices.png and b/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_devices.png differ

diff --git a/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_multimedia.png b/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_multimedia.png
old mode 100755 (executable)
new mode 100644 (file)
index 7eebcd6..f996f5a
Binary files a/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_multimedia.png and b/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_multimedia.png differ

diff --git a/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_picture.png b/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_picture.png
old mode 100755 (executable)
new mode 100644 (file)
index d717e58..57e6382
Binary files a/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_picture.png and b/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_picture.png differ

diff --git a/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_unnamed.png b/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_unnamed.png
old mode 100755 (executable)
new mode 100644 (file)
index 7534b67..d559c97
Binary files a/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_unnamed.png and b/themes/images/HD/dark/GUI_Style_Guide/00_nocontents_unnamed.png differ

diff --git a/themes/images/HD/light/GUI_Style_Guide/00_nocontents_album.png b/themes/images/HD/light/GUI_Style_Guide/00_nocontents_album.png
new file mode 100644 (file)
index 0000000..097ee75
Binary files /dev/null and b/themes/images/HD/light/GUI_Style_Guide/00_nocontents_album.png differ

diff --git a/themes/inc/tizen-dark-inc.edc b/themes/inc/tizen-dark-inc.edc
index 1e21569..1729323 100755 (executable)
--- a/themes/inc/tizen-dark-inc.edc
+++ b/themes/inc/tizen-dark-inc.edc
@@ -955,15 +955,27 @@
 #define PROGRESS_BAR_IMAGE_BORDER_INC  17 17 0 0
 #define PROGRESS_BAR_IMAGE_PADDING_SIZE_INC  0 0
 
-#define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC 128 128 128 255
-#define NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC   28
-#define NOCONTENT_MIDDLE_PADDING_INC         38
-#define NOCONTENT_BASE_SEARCH_PADDING_INC    40
-#define NOCONTENT_IMAGE_WIDTH_HEIGHT_INC     288 288
+#define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC "#FAFAFA"
+#define NOCONTENT_HELP_TEXT_BLOCK_STYLE_COLOR_INC "#6E6F76"
+#define NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC   36
+#define NOCONTENT_HELP_TEXT_BLOCK_TEXT_SIZE_INC 32
+#define NOCONTENT_IMAGE_WIDTH_HEIGHT_INC     244 244
 #define NOCONTENT_BG_COLOR_INC               0 0 0 0
-#define NOCONTENT_TEXT_STYLE_BG_MIN_INC      0 76
-#define NO_CONTENT_TEXT_STYLE_BG_HEIGHT_INC  76
-#define NOCONTENT_IMAGE_COLOR_INC            128 128 128 255
+#define NOCONTENT_TEXT_STYLE_BG_MIN_INC      0 68
+#define NOCONTENT_BASE_SEARCH_PADDING_INC    40
+#define NOCONTENT_PORTRAIT_HELP_TEXT_STYLE_BG_MIN_INC 580 152
+#define NOCONTENT_LANDSCAPE_HELP_TEXT_STYLE_BG_MIN_INC 920 78
+#define NOCONTENT_IMAGE_COLOR_INC            250 250 250 255
+#define NOCONTENT_BASE_BOTTOM_PADDING_MIN_INC    40 112
+#define NOCONTENT_PORTRAIT_SWALLOW_AREA_MIN_INC    580 74
+#define NOCONTENT_LANDSCAPE_SWALLOW_AREA_MIN_INC   920 74
+#define NOCONTENT_PORTRAIT_AFTER_HELP_TEXT_PADDING_INC 0 50
+#define NOCONTENT_LANDSCAPE_AFTER_HELP_TEXT_PADDING_INC 0 18
+#define NOCONTENT_PORTRAIT_AFTER_TEXT_PADDING_INC    0 96
+#define NOCONTENT_LANDSCAPE_AFTER_TEXT_PADDING_INC    0 11
+#define NOCONTENT_BASE_MIN_WIDTH_HEIGHT_INC 312 312
+#define NOCONTENT_PRTRAIT_BG_MIN_WIDTH_HEIGHT_INC 720 1280
+#define NOCONTENT_LANDSCAPE_BG_MIN_WIDTH_HEIGHT_INC 1280 720
 
 #define ENTRY_TEXT_SIZE_INC 44
 #define ENTRY_TEXT_COLOR_INC "#FAFAFA"

diff --git a/themes/inc/tizen-light-inc.edc b/themes/inc/tizen-light-inc.edc
index fc91953..e33173f 100755 (executable)
--- a/themes/inc/tizen-light-inc.edc
+++ b/themes/inc/tizen-light-inc.edc
@@ -956,15 +956,27 @@
 #define PROGRESS_BAR_IMAGE_BORDER_INC  17 17 0 0
 #define PROGRESS_BAR_IMAGE_PADDING_SIZE_INC  0 0
 
-#define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC 128 128 128 255
-#define NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC   28
-#define NOCONTENT_MIDDLE_PADDING_INC         38
-#define NOCONTENT_BASE_SEARCH_PADDING_INC    40
-#define NOCONTENT_IMAGE_WIDTH_HEIGHT_INC     288 288
+#define NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC "#6E6F76"
+#define NOCONTENT_HELP_TEXT_BLOCK_STYLE_COLOR_INC "#808080"
+#define NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC   36
+#define NOCONTENT_HELP_TEXT_BLOCK_TEXT_SIZE_INC 32
+#define NOCONTENT_IMAGE_WIDTH_HEIGHT_INC     244 244
 #define NOCONTENT_BG_COLOR_INC               0 0 0 0
-#define NOCONTENT_TEXT_STYLE_BG_MIN_INC      0 76
-#define NO_CONTENT_TEXT_STYLE_BG_HEIGHT_INC  76
+#define NOCONTENT_TEXT_STYLE_BG_MIN_INC      0 68
+#define NOCONTENT_BASE_SEARCH_PADDING_INC    40
+#define NOCONTENT_PORTRAIT_HELP_TEXT_STYLE_BG_MIN_INC 580 152
+#define NOCONTENT_LANDSCAPE_HELP_TEXT_STYLE_BG_MIN_INC 920 78
 #define NOCONTENT_IMAGE_COLOR_INC            128 128 128 255
+#define NOCONTENT_BASE_BOTTOM_PADDING_MIN_INC    40 112
+#define NOCONTENT_PORTRAIT_SWALLOW_AREA_MIN_INC    580 74
+#define NOCONTENT_LANDSCAPE_SWALLOW_AREA_MIN_INC   920 74
+#define NOCONTENT_PORTRAIT_AFTER_HELP_TEXT_PADDING_INC 0 50
+#define NOCONTENT_LANDSCAPE_AFTER_HELP_TEXT_PADDING_INC 0 18
+#define NOCONTENT_PORTRAIT_AFTER_TEXT_PADDING_INC    0 96
+#define NOCONTENT_LANDSCAPE_AFTER_TEXT_PADDING_INC    0 11
+#define NOCONTENT_BASE_MIN_WIDTH_HEIGHT_INC 312 312
+#define NOCONTENT_PRTRAIT_BG_MIN_WIDTH_HEIGHT_INC 720 1280
+#define NOCONTENT_LANDSCAPE_BG_MIN_WIDTH_HEIGHT_INC 1280 720
 
 #define ENTRY_TEXT_SIZE_INC 44
 #define ENTRY_TEXT_COLOR_INC "#000000"

diff --git a/themes/widgets/layout.edc b/themes/widgets/layout.edc
index 729cda4..c230e09 100644 (file)
--- a/themes/widgets/layout.edc
+++ b/themes/widgets/layout.edc
@@ -1419,12 +1419,19 @@ group {
    alias: "elm/nocontents/base/default";
    styles{
       style { name: "nocontent_style";
-         base: "font=Tizen:style=Regular font_size="NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC" align=center color=#ffffff wrap=mixed ellipsis=1.0 text_class=tizen";
+         base: "font=Tizen:style=Bold font_size="NOCONTENT_TEXT_BLOCK_TEXT_SIZE_INC" align=center color="NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC" wrap=mixed ellipsis=1.0 text_class=tizen";
          tag:  "br" "\n";
          tag:  "hilight" "+ font=Tizen:style=Bold";
          tag:  "b" "+ font=Tizen:style=Bold";
          tag:  "tab" "\t";
       }
+      style { name: "nocontent_help_text";
+         base: "font=Tizen:style=Regular font_size="NOCONTENT_HELP_TEXT_BLOCK_TEXT_SIZE_INC" align=left color="NOCONTENT_HELP_TEXT_BLOCK_STYLE_COLOR_INC" wrap=mixed ellipsis=1.0 text_class=tizen";
+         tag:  "br" "\n";
+         tag:  "hilight" "+ font=Tizen:style=Regular";
+         tag:  "b" "+ font=Tizen:style=Regular";
+         tag:  "tab" "\t";
+      }
    }
    images {
       image: "00_nocontents_picture.png" COMP;
@@ -1435,24 +1442,44 @@ group {
          scale: 1;
          description { state: "default" 0.0;
             color: NOCONTENT_BG_COLOR_INC;
+            align: 0.5 1.0;
+            fixed: 0 1;
+            min: NOCONTENT_PRTRAIT_BG_MIN_WIDTH_HEIGHT_INC;
+            rel1.relative: 0.0 1.0;
+         }
+         description { state: "landscape" 0.0;
+            inherit: "default" 0.0;
+            min: NOCONTENT_LANDSCAPE_BG_MIN_WIDTH_HEIGHT_INC;
+         }
+      }
+      part { name: "base";
+         type: RECT;
+         description { state: "default" 0.0;
+            visible: 0;
+            fixed: 1 1;
+            min: NOCONTENT_BASE_MIN_WIDTH_HEIGHT_INC;
+            rel1 {
+               relative: 0.5 0.5;
+               to_y: "bg";
+            }
             rel2 {
-               relative: 1.0 1.0;
-               to_y: "pad_b";
+               relative: 0.5 0.5;
+               to_y: "bg";
             }
          }
       }
       part { name: "nocontents.image";
-         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
             min: NOCONTENT_IMAGE_WIDTH_HEIGHT_INC;
+            align: 0.5 0.0;
             rel1 {
-               relative: 0.5 0.5;
-               to: "bg";
+               relative: 0.5 0.0;
+               to: "base";
             }
             rel2 {
-               relative: 0.5 0.5;
-               to: "bg";
+               relative: 0.5 0.0;
+               to: "base";
             }
             image {
                normal: "00_nocontents_picture.png";
@@ -1462,61 +1489,159 @@ group {
             aspect_preference: BOTH;
          }
       }
-      part { name: "middle.padding";
+      part { name: "elm.text";
+         type: TEXTBLOCK;
+         description { state: "default" 0.0;
+            min: NOCONTENT_TEXT_STYLE_BG_MIN_INC;
+            align: 0.5 1.0;
+            fixed: 0 1;
+            rel1 {
+               relative: 0.0 1.0;
+               to: "base";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               to: "base";
+            }
+            text {
+               style: "nocontent_style";
+               min: 0 1;
+               max: 0 1;
+            }
+         }
+      }
+      part { name: "padding_after_text";
+         mouse_events: 0;
          type: RECT;
-         scale: 1;
          description { state: "default" 0.0;
-            visible: 0;
-            min: 0 NOCONTENT_MIDDLE_PADDING_INC;
             align: 0.5 0.0;
+            min: NOCONTENT_PORTRAIT_AFTER_TEXT_PADDING_INC;
+            visible: 0;
             fixed: 0 1;
             rel1 {
                relative: 0.0 1.0;
-               to: "nocontents.image";
+               to: "elm.text";
             }
             rel2 {
                relative: 1.0 1.0;
-               to: "nocontents.image";
+               to: "elm.text";
             }
          }
+         description { state: "landscape" 0.0;
+            inherit: "default" 0.0;
+            min: NOCONTENT_LANDSCAPE_AFTER_TEXT_PADDING_INC;
+         }
       }
-      part { name: "elm.text";
+      part { name: "elm.help.text";
          type: TEXTBLOCK;
-         scale: 1;
          description { state: "default" 0.0;
-            min: NOCONTENT_TEXT_STYLE_BG_MIN_INC;
-            max: 9999 NO_CONTENT_TEXT_STYLE_BG_HEIGHT_INC;
+            align: 0.5 0.0;
+            min: NOCONTENT_PORTRAIT_HELP_TEXT_STYLE_BG_MIN_INC;
             fixed: 1 1;
             rel1 {
-               relative: 0.14 1.0;
-               to_x: "bg";
-               to_y: "middle.padding";
+               relative: 0.5 1.0;
+               to: "padding_after_text";
             }
             rel2 {
-               relative: 0.86 1.0;
-               to_x: "bg";
-               to_y: "middle.padding";
+               relative: 0.5 1.0;
+               to: "padding_after_text";
             }
-            color: NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC;
             text {
-               style: "nocontent_style";
+               style: "nocontent_help_text";
+               align: 0.0 0.5;
                min: 0 1;
                max: 0 1;
             }
          }
+         description { state: "landscape" 0.0;
+            inherit: "default" 0.0;
+            min: NOCONTENT_LANDSCAPE_HELP_TEXT_STYLE_BG_MIN_INC;
+         }
       }
-      part { name: "pad_b";
-         scale : 1;
+      part { name: "pad_after_help_text";
          mouse_events: 0;
          type: RECT;
          description { state: "default" 0.0;
-            align: 0.0 1.0;
-            min: 0 0;
             visible: 0;
+            align: 0.5 0.0;
+            min: NOCONTENT_PORTRAIT_AFTER_HELP_TEXT_PADDING_INC;
             fixed: 0 1;
-            rel1.relative: 0.0 1.0;
+            rel1 {
+               relative: 0.0 1.0;
+               to: "elm.help.text";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               to: "elm.help.text";
+            }
+         }
+         description { state: "landscape" 0.0;
+            inherit: "default" 0.0;
+            min: NOCONTENT_LANDSCAPE_AFTER_HELP_TEXT_PADDING_INC;
          }
       }
+      part { name: "swallow_area";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            min: NOCONTENT_PORTRAIT_SWALLOW_AREA_MIN_INC;
+            fixed: 1 1;
+            align: 0.5 0.0;
+            rel1 {
+               relative: 0.5 1.0;
+               to: "pad_after_help_text";
+            }
+            rel2 {
+               relative: 0.5 1.0;
+               to: "pad_after_help_text";
+            }
+         }
+         description { state: "landscape" 0.0;
+            inherit: "default" 0.0;
+            min: NOCONTENT_LANDSCAPE_SWALLOW_AREA_MIN_INC;
+         }
+      }
+   }
+   programs {
+      program { name: "landscape_mode";
+         source: "elm";
+         signal: "elm,state,orient,90";
+         action: STATE_SET "landscape" 0.0;
+         target: "bg";
+         target: "swallow_area";
+         target: "elm.help.text";
+         target: "padding_after_text";
+         target: "pad_after_help_text";
+      }
+      program { name: "landscape_mode2";
+         source: "elm";
+         signal: "elm,state,orient,270";
+         action: STATE_SET "landscape" 0.0;
+         target: "bg";
+         target: "swallow_area";
+         target: "elm.help.text";
+         target: "padding_after_text";
+         target: "pad_after_help_text";
+      }
+      program { name: "portrait_mode";
+         source: "elm";
+         signal: "elm,state,orient,0";
+         action: STATE_SET "default" 0.0;
+         target: "bg";
+         target: "swallow_area";
+         target: "elm.help.text";
+         target: "padding_after_text";
+         target: "pad_after_help_text";
+      }
+      program { name: "portrait_mode2";
+         source: "elm";
+         signal: "elm,state,orient,180";
+         action: STATE_SET "default" 0.0;
+         target: "bg";
+         target: "swallow_area";
+         target: "elm.help.text";
+         target: "padding_after_text";
+         target: "pad_after_help_text";
+      }
    }
 }
 
@@ -1593,65 +1718,54 @@ group {
 }
 
 group {
-   name: "elm/layout/nocontents/search";
-   alias: "elm/nocontents/base/search";
+   name: "elm/layout/nocontents/album";
+   alias: "elm/nocontents/base/album";
+   inherit: "elm/layout/nocontents/full";
+   images {
+      image: "00_nocontents_album.png" COMP;
+   }
    parts {
-      part { name: "bg";
-         mouse_events: 0;
-         type: RECT;
+      part { name: "nocontents.image";
          description { state: "default" 0.0;
-            visible: 1;
-            rel1 {
-               relative: 0.0 0.0;
-            }
-            rel2 {
-               relative: 1.0 1.0;
+            image {
+               normal: "00_nocontents_album.png";
             }
-            color: 0 0 0 0;
          }
       }
-      part { name: "top_padding";
-         mouse_events: 0;
+   }
+}
+
+group {
+   name: "elm/layout/nocontents/search";
+   alias: "elm/nocontents/base/search";
+   parts {
+      part { name: "bg";
          type: RECT;
          scale: 1;
          description { state: "default" 0.0;
-            min: 0 NOCONTENT_BASE_SEARCH_PADDING_INC;
-            fixed: 0 1;
-            align: 0 0;
-            visible: 1;
-            rel1 {
-               relative: 0.0 0.0;
-            }
-            rel2 {
-               relative: 1.0 0.0;
-            }
-            color: 0 0 0 0;
+            visible: 0;
          }
       }
       part { name: "elm.text";
          mouse_events: 0;
-         type: TEXT;
+         type: TEXTBLOCK;
          scale: 1;
          description { state: "default" 0.0;
-            //min: 0 30;
             fixed: 0 1;
-            align: 0 0;
-            visible: 1;
+            align: 0.5 0.5;
+            min: NOCONTENT_TEXT_STYLE_BG_MIN_INC;
             rel1 {
-               relative: 0.0 1.0;
-               to:"top_padding";
+               relative: 0.0 0.5;
+               to:"bg";
             }
             rel2 {
-               relative: 1.0 1.0;
-               to:"top_padding";
+               relative: 1.0 0.5;
+               to:"bg";
             }
-            color: NOCONTENT_TEXT_BLOCK_STYLE_COLOR_INC;
             text {
-               font: "Tizen:style=Roman";
-               size: 30;
-               text: "";
-               align: 0.5 0.5;
-               text_class: "tizen";
+               style: "nocontent_style";
+               min: 0 1;
+               max: 0 1;
             }
          }
       }
@@ -1662,7 +1776,7 @@ group {
          description { state: "default" 0.0;
             min: 0 NOCONTENT_BASE_SEARCH_PADDING_INC;
             fixed: 0 1;
-            align: 0 0;
+            align: 0.5 0.0;
             visible: 0;
             rel1 {
                relative: 0.0 1.0;
@@ -1679,9 +1793,8 @@ group {
          type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            min: 0 0;
             fixed: 0 1;
-            align: 0 0;
+            align: 0.5 0.0;
             visible: 1;
             rel1 {
                relative: 0.0 1.0;