From: Michal Skorupinski <m.skorupinsk@samsung.com>
Date: Thu, 18 May 2017 10:15:45 +0000 (+0200)
Subject: [GUI] 'Cancel' and 'done' button's style used in clock view updated.
X-Git-Tag: submit/tizen/20170614.011152~24^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d148e075e85b92600161c021b4707bed6f31e570;p=profile%2Ftv%2Fapps%2Fnative%2Fair_settings.git

[GUI] 'Cancel' and 'done' button's style used in clock view updated.

Change-Id: Ie336b2a5e055842500847895e10518c608ffec90
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>
---

diff --git a/res/view/system/clock.edc b/res/view/system/clock.edc
index b06897d..2c8c190 100755
--- a/res/view/system/clock.edc
+++ b/res/view/system/clock.edc
@@ -36,42 +36,35 @@ group {
 
 	images {
 		image, IC_ADD_SCHEDULE_COLON_PNG COMP;
+		image, "4.0/bg_settings_gray.#.png" COMP;
 	}
 
 	parts {
 		part {
 			name, "bg";
-			type, RECT;
+			type, IMAGE;
 			mouse_events: 1;
 			scale, 1;
 			description {
 				state, "default" 0.0;
 				color, 244 244 244 255;
 				min, 860 596;
+				image.normal: "4.0/bg_settings_gray.#.png";
 			}
 		}
-
 		part {
-			name, "title.bg";
-			type, RECT;
+			name, PART_TOP_TITLE;
+			type, TEXT;
 			scale, 1;
 			description {
 				state, "default" 0.0;
+				color, 51 51 51 255;
 				rel1.relative, 0.0 0.0;
 				rel2.relative, 1.0 TITLE_BG_Y2;
-			}
-			part {
-				name, PART_TOP_TITLE;
-				type, TEXT;
-				scale, 1;
-				description {
-					state, "default" 0.0;
-					color, 51 51 51 255;
-					text {
-						font, FONT_REGULAR;
-						size, 46;
-						align, 0.5 0.5;
-					}
+				text {
+					font, FONT_REGULAR;
+					size, 46;
+					align, 0.5 0.5;
 				}
 			}
 		}
@@ -157,86 +150,30 @@ group {
 			}
 		}
 		part {
-			name, "padding.bottom";
-			type, SPACER;
-			scale, 1;
-			description {
-				state, "default" 0.0;
-				min, 0 76;
-				align, 0.5 1.0;
-				fixed, 0 1;
-				rel1 {
-					to, "part.bottom.bg";
-					relative, 0.0 1.0;
-				}
-				rel2 {
-					to, "part.bottom.bg";
-					relative, 1.0 0.0;
-				}
-			}
-		}
-		part {
-			name, "part.bottom.bg";
-			type, RECT;
-			scale, 1;
-			description {
-				state, "default" 0.0;
-				min, 0 86;
-				fixed, 0 1;
-				align, 0.5 1.0;
-				rel1.relative, 0.0 1.0;
-				rel2.relative, 1.0 1.0;
-				color, 255 255 255 255;
-			}
-		}
-		part {
-			name, "part.bottom.pad";
-			type, SPACER;
-			scale, 1;
-			description {
-				state, "default" 0.0;
-				min, 24 64;
-				fixed, 1 1;
-				rel1 {
-					to, "part.bottom.bg";
-					relative, 0.5 0.5;
-				}
-				rel2 {
-					to, "part.bottom.bg";
-					relative, 0.5 0.5;
-				}
-			}
-		}
-		part {
 			name, PART_VIEW_BOTTOM_BTN1;
 			type, SWALLOW;
 			scale, 1;
 			description {
 				state, "default" 0.0;
-				min, 308 64;
+				min, 308 80;
 				fixed, 1 1;
 				align, 1.0 0.5;
-				rel1.to, "part.bottom.pad";
-				rel2 {
-					to, "part.bottom.pad";
-					relative, 0.0 1.0;
-				}
+				rel1.relative: 0.20 0.8;
+				rel2.relative: 0.45 0.9;
 			}
 		}
+
 		part {
 			name, PART_VIEW_BOTTOM_BTN2;
 			type, SWALLOW;
 			scale, 1;
 			description {
 				state, "default" 0.0;
-				min, 308 64;
+				min, 308 80;
 				fixed, 1 1;
 				align, 0.0 0.5;
-				rel1 {
-					to, "part.bottom.pad";
-					relative, 1.0 0.0;
-				}
-				rel2.to, "part.bottom.pad";
+				rel1.relative: 0.55 0.8;
+				rel2.relative: 0.80 0.9;
 			}
 		}
 	}
diff --git a/res/widget/button.edc b/res/widget/button.edc
index 6b5da8a..d6e150b 100755
--- a/res/widget/button.edc
+++ b/res/widget/button.edc
@@ -47,7 +47,7 @@ group {
 			description {
 				state, "default" 0.0;
 				min, 160 36;
-				}
+			}
 		}
 		part {
 			name, "part.bg";
@@ -847,7 +847,7 @@ group {
 			scale: 0;
 			description {
 				state: "default" 0.0;
-				min: 388 80;
+				min: 0 0;
 				color: 0 0 0 0;
 				align: 0.0 0.0;
 			}
@@ -908,7 +908,7 @@ group {
 			scale: 0;
 			description {
 				state, "default" 0.0;
-				max, 388 254;
+				max, -1 -1;
 				rel1.to, "bg";
 				rel2.to, "bg";
 				align, 0.5 0.5;
diff --git a/src/view/system/view_clock.c b/src/view/system/view_clock.c
index d162597..e074271 100755
--- a/src/view/system/view_clock.c
+++ b/src/view/system/view_clock.c
@@ -203,13 +203,13 @@ static bool _add_clock_setting(clock_view_priv_data *priv)
 	elm_object_part_text_set(priv->base, PART_MAIN_LABEL_TIME, STR_TIME);
 
 	/* Add screen bottom buttons */
-	done = utils_add_button(priv->base, PART_VIEW_BOTTOM_BTN2, "elm/button/base/style.normal.button", STR_DONE);
+	done = utils_add_button(priv->base, PART_VIEW_BOTTOM_BTN2, "style.date_time.button", STR_DONE);
 	if (!done) {
 		_ERR("failed to add done btn");
 		return false;
 	}
 
-	cancel = utils_add_button(priv->base, PART_VIEW_BOTTOM_BTN1, NULL, STR_CANCEL);
+	cancel = utils_add_button(priv->base, PART_VIEW_BOTTOM_BTN1, "style.date_time.button", STR_CANCEL);
 	if (!cancel) {
 		_ERR("failed to add cancel btn");
 		evas_object_del(done);