[Naviframe] Remove effect name parameter

[Model] Noblesse
[BinType] N/A
[Customer] N/A
[Issue#] FWGOVERSEA-1393
[Request] N/A
[Occurrence Version] N/A
[Problem] Remove effect name parameter and use seamless effect as default for push_from API
[Cause & Measure] N/A
[Checking Method] N/A
[Team] (UIFW/EFL)
[Developer] Godly T.Alias
[Solution company] Samsung
[Change Type] New Feature

Change-Id: I478b72a41344cd29a0802284da29831fa7984eee
Signed-off-by: Godly Thekkethottiyil Alias <godly.talias@samsung.com>

diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 912223ec3d7063cebde8608260b7a47dbb54ac47..c5b2bd7f89c9b6f21275516e3a5c86e77298cbc3 100644 (file)
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -81,10 +81,10 @@ _nf_mod_init(void)
       _elm_module_symbol_get(mod, "tizen_pop_deferred_effect");
 
    //TIZEN_ONLY(28Jan2020): Seamless Transition
-   ((Elm_Naviframe_Mod_Api *)(mod->api))->tizen_animated_push_deferred_effect =
-      _elm_module_symbol_get(mod, "tizen_animated_push_deferred_effect");
-   ((Elm_Naviframe_Mod_Api *)(mod->api))->tizen_animated_pop_deferred_effect =
-      _elm_module_symbol_get(mod, "tizen_animated_pop_deferred_effect");
+   ((Elm_Naviframe_Mod_Api *)(mod->api))->tizen_seamless_push_deferred_effect =
+      _elm_module_symbol_get(mod, "tizen_seamless_push_deferred_effect");
+   ((Elm_Naviframe_Mod_Api *)(mod->api))->tizen_seamless_pop_deferred_effect =
+      _elm_module_symbol_get(mod, "tizen_seamless_pop_deferred_effect");
    //
 
    ((Elm_Naviframe_Mod_Api *)(mod->api))->tizen_effect_enabled_get =
@@ -265,7 +265,6 @@ _perspective_object_del_cb(void *data,
 
    if (!item) return;
    item->perspective_obj = NULL;
-   item->effect_name = NULL;
    return;
 }
 //
@@ -283,7 +282,6 @@ _item_free(Elm_Naviframe_Item_Data *it)
      {
         evas_object_event_callback_del(it->perspective_obj, EVAS_CALLBACK_DEL, _perspective_object_del_cb);
      }
-   eina_stringshare_del(it->effect_name);
    //
 
 
@@ -1761,10 +1759,10 @@ _deferred(void *data, const Efl_Event *event EINA_UNUSED)
              if (nfo->push)
                {
                   //TIZEN_ONLY(28Jan2020): Seamless Transition
-                  if (other->effect_name)
+                  if (other->perspective_obj)
                     {
-                       if (nf_mod->tizen_animated_push_deferred_effect)
-                         nf_mod->tizen_animated_push_deferred_effect(WIDGET(cur), VIEW(cur), EINA_TRUE, other->effect_name, other->perspective_obj);
+                       if (nf_mod->tizen_seamless_push_deferred_effect)
+                         nf_mod->tizen_seamless_push_deferred_effect(WIDGET(cur), VIEW(cur), EINA_TRUE, other->perspective_obj);
                     }
                   //
                   else if (nf_mod->tizen_push_deferred_effect)
@@ -1774,10 +1772,10 @@ _deferred(void *data, const Efl_Event *event EINA_UNUSED)
              else
                {
                   //TIZEN_ONLY(28Jan2020): Seamless Transition
-                  if (cur->effect_name)
+                  if (cur->perspective_obj)
                     {
-                       if (nf_mod->tizen_animated_pop_deferred_effect)
-                         nf_mod->tizen_animated_pop_deferred_effect(WIDGET(cur), VIEW(cur), EINA_TRUE, cur->effect_name, cur->perspective_obj);
+                       if (nf_mod->tizen_seamless_pop_deferred_effect)
+                         nf_mod->tizen_seamless_pop_deferred_effect(WIDGET(cur), VIEW(cur), EINA_TRUE, cur->perspective_obj);
                     }
                   //
                   else if (nf_mod->tizen_pop_deferred_effect)
@@ -1793,10 +1791,10 @@ _deferred(void *data, const Efl_Event *event EINA_UNUSED)
              if (nfo->push)
                {
                   //TIZEN_ONLY(28Jan2020): Seamless Transition
-                  if (other->effect_name)
+                  if (other->perspective_obj)
                     {
-                       if (nf_mod->tizen_animated_push_deferred_effect)
-                         nf_mod->tizen_animated_push_deferred_effect(WIDGET(other), VIEW(other), EINA_FALSE, other->effect_name, other->perspective_obj);
+                       if (nf_mod->tizen_seamless_push_deferred_effect)
+                         nf_mod->tizen_seamless_push_deferred_effect(WIDGET(other), VIEW(other), EINA_FALSE, other->perspective_obj);
                     }
                   //
                   else if (nf_mod->tizen_push_deferred_effect)
@@ -1806,10 +1804,10 @@ _deferred(void *data, const Efl_Event *event EINA_UNUSED)
              else
                {
                   //TIZEN_ONLY(28Jan2020): Seamless Transition
-                  if (cur->effect_name)
+                  if (cur->perspective_obj)
                     {
-                       if (nf_mod->tizen_animated_pop_deferred_effect)
-                         nf_mod->tizen_animated_pop_deferred_effect(WIDGET(other), VIEW(other), EINA_FALSE, cur->effect_name, cur->perspective_obj);
+                       if (nf_mod->tizen_seamless_pop_deferred_effect)
+                         nf_mod->tizen_seamless_pop_deferred_effect(WIDGET(other), VIEW(other), EINA_FALSE, cur->perspective_obj);
                     }
                   //
                   else if (nf_mod->tizen_pop_deferred_effect)
@@ -1993,9 +1991,9 @@ _item_push_helper(Elm_Naviframe_Item_Data *item)
              if (nf_mod->tizen_push_effect)
                nf_mod->tizen_push_effect(obj, VIEW(item), EINA_FALSE);
              //TIZEN_ONLY(28Jan2020): Seamless Transition
-             if (item->effect_name)
+             if (item->perspective_obj)
                {
-                  elm_object_signal_emit(VIEW(item), "elm,state,new,anim,pushed", "elm");
+                  elm_object_signal_emit(VIEW(item), "elm,state,new,from,pushed", "elm");
                   edje_object_message_signal_process(elm_layout_edje_get(VIEW(item)));
                }
              //
@@ -2092,7 +2090,7 @@ _elm_naviframe_item_push_from(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const
    Elm_Object_Item *top_item, *eo_item;
 
    //Tizen Only: for test automation
-   evas_object_smart_callback_call(obj, "item,animated,pushing,internal", NULL );
+   evas_object_smart_callback_call(obj, "item,pushing,internal", NULL );
    //
    top_item = elm_naviframe_top_item_get(obj);
    eo_item = _item_new(obj, top_item,
@@ -2103,10 +2101,9 @@ _elm_naviframe_item_push_from(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED, const
         return NULL;
      }
 
-   item->effect_name = eina_stringshare_add(item_style);
    item->perspective_obj = target;
    /* TIZEN_ONLY(20160523): give the new item's view to decorate it */
-   evas_object_smart_callback_call(obj, "item,animated,pushed,internal", VIEW(item));
+   evas_object_smart_callback_call(obj, "item,pushed,internal", VIEW(item));
    /* END */
 
    _item_push_helper(item);
@@ -2321,9 +2318,9 @@ _elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd)
              if (nf_mod->tizen_pop_effect)
                nf_mod->tizen_pop_effect(obj, VIEW(it), EINA_TRUE);
              //TIZEN_ONLY(31Jan2020): Seamless Transition
-             if (it->effect_name)
+             if (it->perspective_obj)
                {
-                  elm_object_signal_emit(VIEW(it), "elm,state,cur,anim,popped", "elm");
+                  elm_object_signal_emit(VIEW(it), "elm,state,cur,from,popped", "elm");
                   edje_object_message_signal_process(elm_layout_edje_get(VIEW(it)));
                }
              //

diff --git a/src/lib/elementary/elm_widget_naviframe.h b/src/lib/elementary/elm_widget_naviframe.h
index cbf6318d52784d4359cbf93f3ae253f627956514..6e752ecb0b487ca5dbd24c2f3b608828efaba08f 100644 (file)
--- a/src/lib/elementary/elm_widget_naviframe.h
+++ b/src/lib/elementary/elm_widget_naviframe.h
@@ -59,7 +59,6 @@ struct _Elm_Naviframe_Item_Data
    const char  *title_label;
    const char  *subtitle_label;
    //TIZEN_ONLY(28Jan2020): Seamless Transition
-   const char  *effect_name;
    Evas_Object *perspective_obj;
    //
 
@@ -106,10 +105,10 @@ struct _Elm_Naviframe_Mod_Api
    void (*tizen_push_deferred_effect)(Evas_Object *nf, Evas_Object *view, Eina_Bool is_cur_view);
    void (*tizen_pop_deferred_effect)(Evas_Object *nf, Evas_Object *view, Eina_Bool is_cur_view);
    //TIZEN_ONLY(28Jan2020): Seamless Transition
-   void (*tizen_animated_push_deferred_effect)(Evas_Object *nf, Evas_Object *view, Eina_Bool is_cur_view,
-                                               const char *effect_name, Evas_Object *perspective_obj);
-   void (*tizen_animated_pop_deferred_effect)(Evas_Object *nf, Evas_Object *view, Eina_Bool is_cur_view,
-                                              const char *effect_name, Evas_Object *perspective_obj);
+   void (*tizen_seamless_push_deferred_effect)(Evas_Object *nf, Evas_Object *view, Eina_Bool is_cur_view,
+                                               Evas_Object *perspective_obj);
+   void (*tizen_seamless_pop_deferred_effect)(Evas_Object *nf, Evas_Object *view, Eina_Bool is_cur_view,
+                                              Evas_Object *perspective_obj);
    //
 
    Eina_Bool (*tizen_effect_enabled_get)(Evas_Object *view);