projects / profile / tv / apps / native / air_home.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f7502df)
modify min size and color value according to modified GUI 14/42014/1
authorSoohye Shin <soohye.shin@samsung.com>
Mon, 22 Jun 2015 02:14:53 +0000 (11:14 +0900)
committerSoohye Shin <soohye.shin@samsung.com>
Mon, 22 Jun 2015 02:14:53 +0000 (11:14 +0900)
Change-Id: I677113c14f646c39f8529d788b614e3f9b693dc7
Signed-off-by: Soohye Shin <soohye.shin@samsung.com>
edje/view/home.edc patch | blob | history
edje/view/recent.edc patch | blob | history
include/defs.h patch | blob | history

diff --git a/edje/view/home.edc b/edje/view/home.edc
index 326edc0..73ebe13 100644 (file)
--- a/edje/view/home.edc
+++ b/edje/view/home.edc
@@ -25,7 +25,7 @@ group{
                        description {
                                state, "default" 0.0;
                                rel2.relative, 1.0 0.0;
-                               min, 0 97;
+                               min, 0 98;
                                align, 0.5 1.0;
                                fixed, 0 1;
                                visible, 0;
@@ -51,7 +51,7 @@ group{
                                }
                                fixed, 1 1;
                                align, 0.5 0.0;
-                               min, 97 97;
+                               min, 98 98;
                        }
                }
                part {
@@ -61,7 +61,7 @@ group{
                        description {
                                state, "default" 0.0;
                                rel1.relative, 0.0 1.0;
-                               min, 0 97;
+                               min, 0 98;
                                align, 0.5 0.0;
                                fixed, 0 1;
                                visible, 0;
@@ -87,7 +87,7 @@ group{
                                rel2.to, "clip.down.arrow";
                                fixed, 1 1;
                                align, 0.5 1.0;
-                               min, 97 97;
+                               min, 98 98;
                        }
                }
                part {
@@ -157,7 +157,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 97 97;
+                               min, 98 98;
                                visible, 0;
                        }
                }
@@ -167,7 +167,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 97 30;
+                               min, 98 32;
                                rel1.relative, 0.5 0.0;
                                rel2.relative, 0.5 0.0;
                                align, 0.5 0.0;
@@ -177,7 +177,7 @@ group {
                                        font, "TizenSans";
                                        text, "Recent";
                                }
-                               color, 124 124 124 255;
+                               color, 255 255 255 178;
                        }
                }
                part {
@@ -186,7 +186,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 0 11;
+                               min, 0 10;
                                rel1 {
                                        to, "text";
                                        relative, 0.5 1.0;
@@ -206,7 +206,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 97 34;
+                               min, 98 34;
                                rel1 {
                                        relative, 1.0 1.0;
                                        to, "pad.arrow";
@@ -235,7 +235,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 97 97;
+                               min, 98 98;
                                visible, 0;
                        }
                }
@@ -245,7 +245,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 97 30;
+                               min, 98 32;
                                rel1.relative, 0.5 1.0;
                                rel2.relative, 0.5 1.0;
                                align, 0.5 1.0;
@@ -255,7 +255,7 @@ group {
                                        font, "TizenSans";
                                        text, "ETG";
                                }
-                               color, 124 124 124 255;
+                               color, 255 255 255 178;
                        }
                }
                part {
@@ -264,7 +264,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 0 11;
+                               min, 0 10;
                                rel1 {
                                        to, "text";
                                        relative, 0.5 0.0;
@@ -284,7 +284,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 97 34;
+                               min, 98 34;
                                rel1 {
                                        relative, 0.0 0.0;
                                        to, "pad.arrow";
@@ -415,7 +415,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 0 23;
+                               min, 0 24;
                                rel1.relative, 0.5 1.0;
                                rel2.relative, 0.5 1.0;
                                align, 0.5 1.0;
@@ -439,7 +439,7 @@ group {
                                }
                                align, 0.5 1.0;
                                fixed, 1 1;
-                               min, 128 38;
+                               min, 130 22;
                        }
                }
                part {
@@ -474,7 +474,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 42 15;
+                               min, 40 14;
                                rel1.relative, 1.0 0.0;
                                rel2.relative, 1.0 0.0;
                                align, 1.0 0.0;
diff --git a/edje/view/recent.edc b/edje/view/recent.edc
index 910fa7d..35a9f32 100644 (file)
--- a/edje/view/recent.edc
+++ b/edje/view/recent.edc
@@ -94,7 +94,7 @@ group {
                                }
                                rel2.to, "bg";
                                fixed, 1 1;
-                               color, 242 242 242 255;
+                               color, 244 244 244 255;
                        }
                }
                part {
@@ -143,7 +143,7 @@ group {
                                        to, "pad.title";
                                        relative, 0.0 1.0;
                                }
-                               min, 70 70;
+                               min, 62 62;
                                fixed, 1 1;
                                align, 0.0 0.0;
                                visible, 0;
@@ -159,7 +159,7 @@ group {
                                        to, "bg";
                                        relative, 1.0 1.0;
                                }
-                               min, 0 70;
+                               min, 0 62;
                                fixed, 1 1;
                                align, 1.0 1.0;
                                visible, 0;
@@ -176,11 +176,11 @@ group {
                                        relative, 0.0 1.0;
                                }
                                text {
-                                       size, 50;
+                                       size, 32;
                                        font, "TizenSans";
                                }
                                fixed, 1 1;
-                               color, 51 51 51 255;
+                               color, 0 0 0 178;
                        }
                }
                part {
@@ -273,7 +273,7 @@ group {
                        description {
                                state, "focus" 0.0;
                                inherit, "default" 0.0;
-                               color, 22 120 224 255;
+                               color, 0 119 246 255;
                        }
                }
                part {
@@ -282,7 +282,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 1 1;
+                               min, 3 3;
                                rel2.relative, 0.0 0.0;
                                align, 0.0 0.0;
                                fixed, 1 1;
@@ -295,7 +295,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 1 1;
+                               min, 3 3;
                                rel1.relative, 1.0 0.0;
                                rel2.relative, 1.0 0.0;
                                align, 1.0 0.0;
@@ -317,7 +317,7 @@ group {
                                        to, "pad.thumbnail.right";
                                        relative, 0.0 1.0;
                                }
-                               min, 0 198;
+                               min, 0 196;
                                fixed, 0 1;
                                align, 0.5 0.0;
                        }
@@ -336,7 +336,7 @@ group {
                                        to, PART_RECENT_THUMBNAIL;
                                        relative, 0.0 0.0;
                                }
-                               min, 3 3;
+                               min, 4 4;
                                fixed, 1 1;
                                align, 0.0 0.0;
                                visible, 0;
@@ -375,7 +375,7 @@ group {
                                        to, PART_RECENT_THUMBNAIL;
                                        relative, 1.0 0.0;
                                }
-                               min, 3 3;
+                               min, 4 4;
                                fixed, 1 1;
                                align, 1.0 0.0;
                                visible, 0;
@@ -406,7 +406,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 16 18;
+                               min, 15 18;
                                rel1 {
                                        to, PART_RECENT_THUMBNAIL;
                                        relative, 0.0 1.0;
@@ -426,7 +426,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 16 18;
+                               min, 15 18;
                                rel1 {
                                        to, PART_RECENT_THUMBNAIL;
                                        relative, 1.0 1.0;
@@ -454,7 +454,7 @@ group {
                                        to, "pad.text.right";
                                        relative, 0.0 1.0;
                                }
-                               min, 0 27;
+                               min, 0 28;
                                fixed, 0 1;
                                align, 0.5 0.0;
                        }
@@ -473,7 +473,7 @@ group {
                                        to, PART_RECENT_TITLE;
                                        relative, 1.0 1.0;
                                }
-                               min, 0 9;
+                               min, 0 8;
                                fixed, 0 1;
                                align, 0.5 0.0;
                                visible, 0;
@@ -528,13 +528,13 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 235 294;
+                               min, 236 294;
                                color, 0 0 0 70;
                        }
                        description {
                                state, "focus" 0.0;
                                inherit, "default" 0.0;
-                               color, 22 120 224 255;
+                               color, 0 119 246 255;
                        }
                }
                part {
@@ -543,7 +543,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 1 1;
+                               min, 3 3;
                                rel2.relative, 0.0 0.0;
                                align, 0.0 0.0;
                                fixed, 1 1;
@@ -556,7 +556,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 1 1;
+                               min, 3 3;
                                rel1.relative, 1.0 0.0;
                                rel2.relative, 1.0 0.0;
                                align, 1.0 0.0;
@@ -578,7 +578,7 @@ group {
                                        to, "pad.thumbnail.right";
                                        relative, 0.0 1.0;
                                }
-                               min, 0 198;
+                               min, 0 196;
                                fixed, 0 1;
                                align, 0.5 0.0;
                        }
@@ -597,7 +597,7 @@ group {
                                        to, PART_RECENT_THUMBNAIL;
                                        relative, 0.0 0.0;
                                }
-                               min, 3 3;
+                               min, 4 4;
                                fixed, 1 1;
                                align, 0.0 0.0;
                                visible, 0;
@@ -636,7 +636,7 @@ group {
                                        to, PART_RECENT_THUMBNAIL;
                                        relative, 1.0 0.0;
                                }
-                               min, 3 3;
+                               min, 4 4;
                                fixed, 1 1;
                                align, 1.0 0.0;
                                visible, 0;
@@ -667,7 +667,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 16 18;
+                               min, 15 18;
                                rel1 {
                                        to, PART_RECENT_THUMBNAIL;
                                        relative, 0.0 1.0;
@@ -687,7 +687,7 @@ group {
                        scale, 1;
                        description {
                                state, "default" 0.0;
-                               min, 16 18;
+                               min, 15 18;
                                rel1 {
                                        to, PART_RECENT_THUMBNAIL;
                                        relative, 1.0 1.0;
@@ -715,7 +715,7 @@ group {
                                        to, "pad.text.right";
                                        relative, 0.0 1.0;
                                }
-                               min, 0 27;
+                               min, 0 28;
                                fixed, 0 1;
                                align, 0.5 0.0;
                        }
@@ -734,7 +734,7 @@ group {
                                        to, PART_RECENT_TITLE;
                                        relative, 1.0 1.0;
                                }
-                               min, 0 9;
+                               min, 0 8;
                                fixed, 0 1;
                                align, 0.5 0.0;
                                visible, 0;
diff --git a/include/defs.h b/include/defs.h
index 34204ce..8d87f09 100644 (file)
--- a/include/defs.h
+++ b/include/defs.h
@@ -85,9 +85,9 @@
 #define STYLE_LABEL_TITLE "slide_home_title"
 #define STYLE_LABEL_TITLE_FOCUS "slide_home_title_focus"
 
-#define COLOR_DEFAULT_R 22
-#define COLOR_DEFAULT_G 120
-#define COLOR_DEFAULT_B 224
+#define COLOR_DEFAULT_R 0
+#define COLOR_DEFAULT_G 119
+#define COLOR_DEFAULT_B 246
 #define COLOR_DEFAULT_A 255
 
 #define IMAGE_BADGE IMAGEDIR"/badge_bg.png"
Domain: Applications / TV App;