From: hyunho Date: Mon, 17 Jun 2019 07:36:55 +0000 (+0900) Subject: Add Get/Set background info to Style X-Git-Tag: submit/tizen/20190627.022129~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a350e20a3dffe710415e331726595ad5566cfda0;p=platform%2Fcore%2Fapi%2Fnotification.git Add Get/Set background info to Style Change-Id: I97d5cd4b6c7dfe0462e7f6c695c0739a1153c9d5 Signed-off-by: hyunho --- diff --git a/notification-ex/abstract_item.cc b/notification-ex/abstract_item.cc index f5206b9d..c24cd172 100644 --- a/notification-ex/abstract_item.cc +++ b/notification-ex/abstract_item.cc @@ -60,6 +60,11 @@ #define ABSTRACT_ITEM_STYLE_COLOR_R_KEY "__ABSTRACT_ITEM_STYLE_COLOR_R_KEY__" #define ABSTRACT_ITEM_STYLE_COLOR_G_KEY "__ABSTRACT_ITEM_STYLE_COLOR_G_KEY__" #define ABSTRACT_ITEM_STYLE_COLOR_B_KEY "__ABSTRACT_ITEM_STYLE_COLOR_B_KEY__" +#define ABSTRACT_ITEM_STYLE_BG_COLOR_A_KEY "__ABSTRACT_ITEM_STYLE_BG_COLOR_A_KEY__" +#define ABSTRACT_ITEM_STYLE_BG_COLOR_R_KEY "__ABSTRACT_ITEM_STYLE_BG_COLOR_R_KEY__" +#define ABSTRACT_ITEM_STYLE_BG_COLOR_G_KEY "__ABSTRACT_ITEM_STYLE_BG_COLOR_G_KEY__" +#define ABSTRACT_ITEM_STYLE_BG_COLOR_B_KEY "__ABSTRACT_ITEM_STYLE_BG_COLOR_B_KEY__" +#define ABSTRACT_ITEM_STYLE_BG_IMAGE_PATH_KEY "__ABSTRACT_ITEM_STYLE_BG_IMAGE_PATH_KEY__" #define ABSTRACT_ITEM_STYLE_GEOMETRY_X_KEY "__ABSTRACT_ITEM_STYLE_GEOMETRY_X_KEY__" #define ABSTRACT_ITEM_STYLE_GEOMETRY_Y_KEY "__ABSTRACT_ITEM_STYLE_GEOMETRY_Y_KEY__" #define ABSTRACT_ITEM_STYLE_GEOMETRY_WIDTH_KEY "__ABSTRACT_ITEM_STYLE_GEOMETRY_WIDTH_KEY__" @@ -175,28 +180,51 @@ Bundle AbstractItem::Serialize() const { } if (impl_->style_ != nullptr) { - Padding padding = impl_->style_->GetPadding(); - b.Add(ABSTRACT_ITEM_STYLE_PADDING_LEFT_KEY, to_string(padding.GetLeft())); - b.Add(ABSTRACT_ITEM_STYLE_PADDING_TOP_KEY, to_string(padding.GetTop())); - b.Add(ABSTRACT_ITEM_STYLE_PADDING_RIGHT_KEY, to_string(padding.GetRight())); - b.Add(ABSTRACT_ITEM_STYLE_PADDING_BOTTOM_KEY, to_string(padding.GetBottom())); - - Color color = impl_->style_->GetColor(); - b.Add(ABSTRACT_ITEM_STYLE_COLOR_A_KEY, - to_string(static_cast(color.GetAVal()))); - b.Add(ABSTRACT_ITEM_STYLE_COLOR_R_KEY, - to_string(static_cast(color.GetRVal()))); - b.Add(ABSTRACT_ITEM_STYLE_COLOR_G_KEY, - to_string(static_cast(color.GetGVal()))); - b.Add(ABSTRACT_ITEM_STYLE_COLOR_B_KEY, - to_string(static_cast(color.GetBVal()))); - - Geometry geometry = impl_->style_->GetGeometry(); - b.Add(ABSTRACT_ITEM_STYLE_GEOMETRY_X_KEY, to_string(geometry.GetX())); - b.Add(ABSTRACT_ITEM_STYLE_GEOMETRY_Y_KEY, to_string(geometry.GetY())); - b.Add(ABSTRACT_ITEM_STYLE_GEOMETRY_WIDTH_KEY, to_string(geometry.GetWidth())); - b.Add(ABSTRACT_ITEM_STYLE_GEOMETRY_HEIGHT_KEY, to_string(geometry.GetHeight())); + shared_ptr padding = impl_->style_->GetPadding(); + if (padding.get() != nullptr) { + b.Add(ABSTRACT_ITEM_STYLE_PADDING_LEFT_KEY, to_string(padding->GetLeft())); + b.Add(ABSTRACT_ITEM_STYLE_PADDING_TOP_KEY, to_string(padding->GetTop())); + b.Add(ABSTRACT_ITEM_STYLE_PADDING_RIGHT_KEY, + to_string(padding->GetRight())); + b.Add(ABSTRACT_ITEM_STYLE_PADDING_BOTTOM_KEY, + to_string(padding->GetBottom())); + } + + shared_ptr color = impl_->style_->GetColor(); + if (color.get() != nullptr) { + b.Add(ABSTRACT_ITEM_STYLE_COLOR_A_KEY, + to_string(static_cast(color->GetAVal()))); + b.Add(ABSTRACT_ITEM_STYLE_COLOR_R_KEY, + to_string(static_cast(color->GetRVal()))); + b.Add(ABSTRACT_ITEM_STYLE_COLOR_G_KEY, + to_string(static_cast(color->GetGVal()))); + b.Add(ABSTRACT_ITEM_STYLE_COLOR_B_KEY, + to_string(static_cast(color->GetBVal()))); + } + + shared_ptr geometry = impl_->style_->GetGeometry(); + if (geometry.get() != nullptr) { + b.Add(ABSTRACT_ITEM_STYLE_GEOMETRY_X_KEY, to_string(geometry->GetX())); + b.Add(ABSTRACT_ITEM_STYLE_GEOMETRY_Y_KEY, to_string(geometry->GetY())); + b.Add(ABSTRACT_ITEM_STYLE_GEOMETRY_WIDTH_KEY, + to_string(geometry->GetWidth())); + b.Add(ABSTRACT_ITEM_STYLE_GEOMETRY_HEIGHT_KEY, + to_string(geometry->GetHeight())); + } + shared_ptr bg_color = impl_->style_->GetBackgroundColor(); + if (bg_color.get() != nullptr) { + b.Add(ABSTRACT_ITEM_STYLE_BG_COLOR_A_KEY, + to_string(static_cast(bg_color->GetAVal()))); + b.Add(ABSTRACT_ITEM_STYLE_BG_COLOR_R_KEY, + to_string(static_cast(bg_color->GetRVal()))); + b.Add(ABSTRACT_ITEM_STYLE_BG_COLOR_G_KEY, + to_string(static_cast(bg_color->GetGVal()))); + b.Add(ABSTRACT_ITEM_STYLE_BG_COLOR_B_KEY, + to_string(static_cast(bg_color->GetBVal()))); + } + b.Add(ABSTRACT_ITEM_STYLE_BG_IMAGE_PATH_KEY, + impl_->style_->GetBackgroundImage()); b.Add(ABSTRACT_ITEM_STYLE_IS_EXIST_KEY, ABSTRACT_ITEM_TRUE); } @@ -204,13 +232,13 @@ Bundle AbstractItem::Serialize() const { b.Add(ABSTRACT_ITEM_LED_ON_PERIOD_KEY, to_string(impl_->led_->GetOnPeriod())); b.Add(ABSTRACT_ITEM_LED_OFF_PERIOD_KEY, to_string(impl_->led_->GetOffPeriod())); b.Add(ABSTRACT_ITEM_LED_COLOR_A_KEY, - to_string(static_cast(impl_->led_->GetColor().GetAVal()))); + to_string(static_cast(impl_->led_->GetColor()->GetAVal()))); b.Add(ABSTRACT_ITEM_LED_COLOR_R_KEY, - to_string(static_cast(impl_->led_->GetColor().GetRVal()))); + to_string(static_cast(impl_->led_->GetColor()->GetRVal()))); b.Add(ABSTRACT_ITEM_LED_COLOR_G_KEY, - to_string(static_cast(impl_->led_->GetColor().GetGVal()))); + to_string(static_cast(impl_->led_->GetColor()->GetGVal()))); b.Add(ABSTRACT_ITEM_LED_COLOR_B_KEY, - to_string(static_cast(impl_->led_->GetColor().GetBVal()))); + to_string(static_cast(impl_->led_->GetColor()->GetBVal()))); b.Add(ABSTRACT_ITEM_LED_IS_EXIST_KEY, ABSTRACT_ITEM_TRUE); } @@ -273,33 +301,66 @@ void AbstractItem::Deserialize(Bundle b) { } if (!b.GetString(ABSTRACT_ITEM_STYLE_IS_EXIST_KEY).compare(ABSTRACT_ITEM_TRUE)) { - Padding padding(stoi(b.GetString(ABSTRACT_ITEM_STYLE_PADDING_LEFT_KEY)), - stoi(b.GetString(ABSTRACT_ITEM_STYLE_PADDING_TOP_KEY)), - stoi(b.GetString(ABSTRACT_ITEM_STYLE_PADDING_RIGHT_KEY)), - stoi(b.GetString(ABSTRACT_ITEM_STYLE_PADDING_BOTTOM_KEY))); - - Color color( - static_cast(stoi(b.GetString(ABSTRACT_ITEM_STYLE_COLOR_A_KEY))), - static_cast(stoi(b.GetString(ABSTRACT_ITEM_STYLE_COLOR_R_KEY))), - static_cast(stoi(b.GetString(ABSTRACT_ITEM_STYLE_COLOR_G_KEY))), - static_cast(stoi(b.GetString(ABSTRACT_ITEM_STYLE_COLOR_B_KEY)))); - - Geometry geometry(stoi(b.GetString(ABSTRACT_ITEM_STYLE_GEOMETRY_X_KEY)), - stoi(b.GetString(ABSTRACT_ITEM_STYLE_GEOMETRY_Y_KEY)), - stoi(b.GetString(ABSTRACT_ITEM_STYLE_GEOMETRY_WIDTH_KEY)), - stoi(b.GetString(ABSTRACT_ITEM_STYLE_GEOMETRY_HEIGHT_KEY))); - - impl_->style_ = make_shared