TizenRefApp-8532 [Gallery] Add naviframe item custom style 17/130517/1
authorIgor Nazarov <i.nazarov@samsung.com>
Mon, 22 May 2017 14:10:37 +0000 (17:10 +0300)
committerIgor Nazarov <i.nazarov@samsung.com>
Mon, 22 May 2017 14:17:00 +0000 (17:17 +0300)
- Added "gallery_no_clip" naviframe item style;
- Typo fixed in VidePlayerPage class.

Change-Id: I709040c86281cc0f78640c7ac4b6204afb670804

edc/naviframe.edc [new file with mode: 0644]
inc/presenters/VideoPlayerPage.h
res/edje/theme.edc
src/presenters/NoContentPage.cpp
src/presenters/PreviewPage.cpp
src/presenters/ThumbnailPage.cpp
src/presenters/VideoPlayerPage.cpp
src/presenters/ViewerPage.cpp
src/view/common.h

diff --git a/edc/naviframe.edc b/edc/naviframe.edc
new file mode 100644 (file)
index 0000000..aab9ff8
--- /dev/null
@@ -0,0 +1,233 @@
+/*
+ * Copyright 2017 Samsung Electronics Co., Ltd
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define NAVIFRAME_TITLE_TRANS_TIME 0.5
+
+group { "elm/naviframe/item/event/default";
+   inherit_only: 1;
+   programs {
+      program { "deferred_pushed_new";
+         signal: "elm,state,new,pushed,deferred";
+         source: "elm";
+         after: "on_deferred_pushed_new";
+      }
+      program { "deferred_pushed_cur";
+         signal: "elm,state,cur,pushed,deferred";
+         source: "elm";
+         after: "on_deferred_pushed_cur";
+      }
+      program { "deferred_popped_prev";
+         signal: "elm,state,prev,popped,deferred";
+         source: "elm";
+         after: "on_deferred_popped_prev";
+      }
+      program { "deferred_popped_cur";
+         signal: "elm,state,cur,popped,deferred";
+         source: "elm";
+         after: "on_deferred_popped_cur";
+      }
+      program { "pushed_new";
+         signal: "elm,state,new,pushed";
+         source: "elm";
+         after: "on_pushed_new";
+      }
+      program { "popped_prev";
+         signal: "elm,state,prev,popped";
+         source: "elm";
+         after: "on_popped_prev";
+      }
+      program { "finished_show";
+         action: SIGNAL_EMIT "elm,action,show,finished" "";
+      }
+      program { "finished_pushed";
+         action: SIGNAL_EMIT "elm,action,pushed,finished" "";
+      }
+      program { "finished_popped";
+         action: SIGNAL_EMIT "elm,action,popped,finished" "";
+      }
+      program { "visible";
+         signal: "elm,state,visible";
+         source: "elm";
+         after: "on_visible";
+      }
+      program { "invisible";
+         signal: "elm,state,invisible";
+         source: "elm";
+         after: "on_invisible";
+      }
+   }
+}
+
+group { "elm/naviframe/item/gallery_no_clip/default";
+   inherit: "elm/naviframe/item/event/default";
+   data.item: "tizen_effect" 1;
+   images {
+      image: "tw_popup_bg.png" COMP;
+   }
+   parts {
+      spacer { "base";
+         desc { "default";
+         }
+      }
+      rect { "bg";
+         nomouse;
+         scale;
+         desc { "default";
+            color: 0 0 0 255;
+         }
+      }
+      rect { "clipper_title";
+         desc { "default";
+            vis;
+            rel.to: "title";
+         }
+         desc { "hidden";
+            inherit: "default";
+            hid;
+         }
+      }
+      swallow { "title";
+         scale;
+         clip: "clipper_title";
+         desc { "default";
+            hid;
+            min: 0 0;
+            max: -1 0;
+            fixed: 0 1;
+            align: 0.5 0.0;
+            rel1 { relative: 0.0 0.0; to: "base"; }
+            rel2 { relative: 1.0 0.0; to: "base"; }
+         }
+         desc { "hidden_trans";
+            inherit: "default";
+            vis;
+            max: -1 -1;
+            align: 0.5 1.0;
+         }
+         desc { "visible";
+            inherit: "default";
+            vis;
+            max: -1 -1;
+         }
+      }
+      swallow { "elm.swallow.content";
+         scale;
+         desc { "default";
+            rel1 { relative: 0.0 1.0; to_x: "base"; to_y: "title"; }
+            rel2 { relative: 1.0 1.0; to: "base"; }
+         }
+      }
+      swallow { "elm.swallow.prev_btn";
+         scale;
+         desc { "default";
+            min: 0 0;
+            max: 0 0;
+            fixed: 1 1;
+            hid;
+         }
+      }
+      swallow { "elm.swallow.circle";
+         nomouse;
+         scale;
+         desc { "default";
+         }
+      }
+   }
+   programs {
+      program { "on_deferred_pushed_new";
+         after: "finished_show";
+      }
+      program { "on_deferred_pushed_cur";
+         after: "finished_pushed";
+      }
+      program { "on_deferred_popped_prev";
+         after: "finished_show";
+      }
+      program { "on_deferred_popped_cur";
+         after: "finished_popped";
+      }
+      program { "on_pushed_new";
+      }
+      program { "on_popped_prev";
+      }
+      program { "on_visible";
+      }
+      program { "on_invisible";
+      }
+      program { "hide_title";
+         signal: "elm,state,title,hide";
+         source: "elm";
+         script {
+            set_state(PART:"title", "default", 0.0);
+            set_state(PART:"clipper_title", "hidden", 0.0);
+         }
+      }
+      program { "hide_title_trans";
+         signal: "elm,action,title,hide";
+         source: "elm";
+         script {
+            new st[32];
+            new Float:vl;
+            get_state(PART:"title", st, 32, vl);
+            if (!strcmp(st, "visible"))
+               run_program(PROGRAM:"hide_title_trans2");
+         }
+      }
+      program { "hide_title_trans2";
+         action: STATE_SET "hidden_trans";
+         target: "title";
+         transition: CUBIC_BEZIER NAVIFRAME_TITLE_TRANS_TIME 0.25 0.46 0.45 1.0;
+         after: "hide_title_trans3";
+      }
+      program { "hide_title_trans3";
+         script {
+            run_program(PROGRAM:"hide_title");
+         }
+         after: "finished_title_trans";
+      }
+      program { "finished_title_trans";
+         action: SIGNAL_EMIT "elm,action,title,transition,finished" "";
+      }
+      program { "show_title";
+         signal: "elm,state,title,show";
+         source: "elm";
+         script {
+            set_state(PART:"title", "visible", 0.0);
+            set_state(PART:"clipper_title", "default", 0.0);
+         }
+      }
+      program { "show_title_trans";
+         signal: "elm,action,title,show";
+         source: "elm";
+         script {
+            new st[32];
+            new Float:vl;
+            get_state(PART:"title", st, 32, vl);
+            if (!strcmp(st, "default")) {
+               set_state(PART:"title", "hidden_trans", 0.0);
+               set_state(PART:"clipper_title", "default", 0.0);
+               run_program(PROGRAM:"show_title_trans2");
+            }
+         }
+      }
+      program { "show_title_trans2";
+         action: STATE_SET "visible";
+         target: "title";
+         transition: CUBIC_BEZIER NAVIFRAME_TITLE_TRANS_TIME 0.25 0.46 0.45 1.0;
+         after: "finished_title_trans";
+      }
+   }
+}
index e3b5fc8ff4cc856704059a7a8899a7054a0b3b3a..23f3656e6f688080b7555efdd7ad4c691327c0a0 100644 (file)
@@ -79,7 +79,7 @@ namespace gallery {
                void startPlayback();
                void pausePlayback();
 
-               void setScreenOlwaysOn(bool isAlwaysOn);
+               void setScreenAlwaysOn(bool isAlwaysOn);
 
                ucl::Result launchVolumeSettings();
 
index ea47dffcbb3e65e925844bdce0ddac1a7b099c91..ceb51c9957c445f76e8330490254881758efe12b 100644 (file)
@@ -39,4 +39,5 @@ collections {
    #include "../../edc/image-grid.edc"
    #include "../../edc/button.edc"
    #include "../../edc/layouts.edc"
+   #include "../../edc/naviframe.edc"
 }
index 535b6e99582a51e0c94ff5b744f4898fab5dc487..5b6c9c71044851d75fbe9e39433468a390b8167f 100644 (file)
@@ -97,7 +97,7 @@ namespace gallery {
                FAIL_RETURN(Page::prepare(
                        [this, &layout]()
                        {
-                               return getNaviframe().push(*layout, NAVIFRAME_EMPTY);
+                               return getNaviframe().push(*layout, NAVIFRAME_NO_CLIP);
                        }),
                        "Page::prepare() failed!");
 
index e58c949996985218925dcfd16a3aa85361a47d57..f0a0b65db15d2dac9c7efaa9b13ff2d721a83bf6 100644 (file)
@@ -328,7 +328,7 @@ namespace gallery {
                FAIL_RETURN(Page::prepare(
                        [this]()
                        {
-                               return getNaviframe().push(*m_content, NAVIFRAME_EMPTY);
+                               return getNaviframe().push(*m_content, NAVIFRAME_NO_CLIP);
                        }),
                        "Page::prepare() failed!");
 
index a3b308f4e7d319b1bee6fab26d1170315a7757a3..a097aaa49a388740c48ae27be4ae957f49115aae 100644 (file)
@@ -202,7 +202,7 @@ namespace gallery {
                FAIL_RETURN(Page::prepare(
                        [this]()
                        {
-                               return getNaviframe().push(*m_content, NAVIFRAME_EMPTY);
+                               return getNaviframe().push(*m_content, NAVIFRAME_NO_CLIP);
                        }),
                        "Page::prepare() failed!");
 
index 63eba9360eb52d63afc41946c424c37515c5e595..37b1a8c941fae2bcc2bbd4180333e6abb0fb7c60 100644 (file)
@@ -152,7 +152,7 @@ namespace gallery {
 
        VideoPlayerPage::~VideoPlayerPage()
        {
-               setScreenOlwaysOn(false);
+               setScreenAlwaysOn(false);
 
                delRotaryEventHandler(CALLBACK_A(VideoPlayerPage::onRotary), this);
 
@@ -185,7 +185,7 @@ namespace gallery {
                FAIL_RETURN(Page::prepare(
                        [this]()
                        {
-                               return getNaviframe().push(*m_content, NAVIFRAME_EMPTY);
+                               return getNaviframe().push(*m_content, NAVIFRAME_NO_CLIP);
                        }),
                        "Page::prepare() failed!");
 
@@ -474,7 +474,7 @@ namespace gallery {
                        break;
                }
 
-               setScreenOlwaysOn(true);
+               setScreenAlwaysOn(true);
                resetTickTimer();
                stopTimer(m_autoStartTimer);
                m_needAutoStart = false;
@@ -502,7 +502,7 @@ namespace gallery {
                        break;
                }
 
-               setScreenOlwaysOn(false);
+               setScreenAlwaysOn(false);
                stopTimer(m_tickTimer);
                updatePlayTimeText();
 
@@ -511,7 +511,7 @@ namespace gallery {
                }
        }
 
-       void VideoPlayerPage::setScreenOlwaysOn(bool isAlwaysOn)
+       void VideoPlayerPage::setScreenAlwaysOn(bool isAlwaysOn)
        {
                efl_util_set_window_screen_mode(getWindow(),
                                (isAlwaysOn ? EFL_UTIL_SCREEN_MODE_ALWAYS_ON :
index ffa378425368c680818df02623f73e682a5f2d0a..5d4fcbc330ef98baba5e0f66650687dd1c69215b 100644 (file)
@@ -188,9 +188,9 @@ namespace gallery {
                                const auto topItem = getNaviframe().getTopItem();
                                if (topItem) {
                                        return getNaviframe().insertAfter(topItem,
-                                                       *rootWidget, NAVIFRAME_EMPTY);
+                                                       *rootWidget, NAVIFRAME_NO_CLIP);
                                }
-                               return getNaviframe().push(*rootWidget, NAVIFRAME_EMPTY);
+                               return getNaviframe().push(*rootWidget, NAVIFRAME_NO_CLIP);
                        }),
                        "Page::prepare() failed!");
 
index d1ba510113355f29942ab303d3b81f1a0ca9c769..e1d87b0267cdb09266011fd0ba91e19741595306 100644 (file)
@@ -30,6 +30,8 @@ namespace gallery {
        constexpr ucl::SmartEvent POPUP_DISMISSED {"dismissed"};
 
        constexpr ucl::ElmStyle SCROLLER_STYLE {"effect"};
+
+       constexpr ucl::ElmStyle NAVIFRAME_NO_CLIP {"gallery_no_clip"};
 }
 
 #endif // __GALLERY_VIEW_COMMON_H__