PWA homescreen data transmit to added.

Change-Id: Ie2dc16407245b7a0f1ccca6f74945a8bf4865b36
Signed-off-by: Lim DoHyung <delight.lim@samsung.com>

diff --git a/manifest.xml.in.mb b/manifest.xml.in.mb
index 08f4375bf395a7048e59f96a26f4f7d0dabf4c85..92f6dca0582cc187a18757918b5e22bda73c4d97 100755 (executable)
--- a/manifest.xml.in.mb
+++ b/manifest.xml.in.mb
@@ -125,6 +125,10 @@
             <operation name="http://tizen.org/appcontrol/operation/view" />
             <mime name="application/xml" />
         </app-control>
+        <app-control>
+            <operation name="http://tizen.org/appcontrol/operation/view" />
+            <uri name="browser_shortcut" />
+        </app-control>
     </ui-application>
     <privileges>
         <privilege>http://tizen.org/privilege/bookmark.admin</privilege>

diff --git a/services/WebPageUI/WebPageUI.cpp b/services/WebPageUI/WebPageUI.cpp
index b6ffaa29a2d540c44222ed59e536465ac23ac11f..eabd4248aa1a0565b3319498e610564fec7d5aeb 100755 (executable)
--- a/services/WebPageUI/WebPageUI.cpp
+++ b/services/WebPageUI/WebPageUI.cpp
@@ -48,7 +48,7 @@ WebPageUI::WebPageUI()
     , m_urlHistoryList(std::make_shared<UrlHistoryList>(getStatesMgr()))
     , m_webviewLocked(false)
     , m_WebPageUIvisible(false)
-    , m_wpaInfo(nullptr)
+    , m_pwaInfo(nullptr)
 #if GESTURE
     , m_gestureLayer(nullptr)
     , m_uriBarHidden(false)
@@ -484,17 +484,36 @@ void WebPageUI::_cm_add_to_hs_clicked(void* data, Evas_Object*, void* )
 
     if (data) {
         WebPageUI* webPageUI = static_cast<WebPageUI*>(data);
-        webPageUI->m_wpaInfo = std::make_shared<wpaInfo>();
+        webPageUI->m_pwaInfo = std::make_shared<pwaInfo>();
         _cm_dismissed(nullptr, webPageUI->m_ctxpopup, nullptr);
 
         std::string uri = webPageUI->getURI();
 
-        webPageUI->m_wpaInfo->uri = uri.c_str();
-        webPageUI->m_wpaInfo->orientation = portrait_secondary;
-        webPageUI->m_wpaInfo->displayMode = WebDisplayModeMinimalUi;
-
-       if (shortcut_add_to_home("Shortcut", LAUNCH_BY_APP, NULL, NULL, 0,
-               result_cb, webPageUI) != SHORTCUT_ERROR_NONE) {
+        // TODO just test or temporary code. after will fixing from engine data receive.
+        webPageUI->m_pwaInfo->id = "test";
+        webPageUI->m_pwaInfo->decodedIcon = "Icon";
+        webPageUI->m_pwaInfo->uri = uri.c_str();
+        webPageUI->m_pwaInfo->name = "ProgressiveWebApp";
+        webPageUI->m_pwaInfo->shortName = "pwa";
+        webPageUI->m_pwaInfo->orientation = portrait_secondary;
+        webPageUI->m_pwaInfo->displayMode = WebDisplayModeMinimalUi;
+        webPageUI->m_pwaInfo->themeColor = 1.1;
+        webPageUI->m_pwaInfo->backgroundColor = 2.2;
+
+        std::string str = std::string("browser_shortcut:://")
+            + "pwd_id:" + (webPageUI->m_pwaInfo->id) + "/"
+            + "pwa_decodedIcon:" + (webPageUI->m_pwaInfo->decodedIcon) + "/"
+            + "pwa_uri:" + (webPageUI->m_pwaInfo->uri) + "/"
+            + "pwa_name:" + (webPageUI->m_pwaInfo->name) + "/"
+            + "pwa_shortName:" + (webPageUI->m_pwaInfo->shortName) + "/"
+            + "pwa_orientation:" + std::to_string(webPageUI->m_pwaInfo->orientation) + "/"
+            + "pwa_displayMode:" + std::to_string(webPageUI->m_pwaInfo->displayMode) + "/"
+            + "pwa_themeColor:" + std::to_string(webPageUI->m_pwaInfo->themeColor) + "/"
+            + "pwa_backgroundColor:" + std::to_string(webPageUI->m_pwaInfo->backgroundColor) + "/";
+
+        BROWSER_LOGD("[%s:%d] str : %s", __PRETTY_FUNCTION__, __LINE__, str.c_str());
+
+        if (shortcut_add_to_home("Shortcut", LAUNCH_BY_URI, str.c_str(), NULL, 0, result_cb, NULL) != SHORTCUT_ERROR_NONE) {
             BROWSER_LOGE("[%s:%d] Fail to add to homescreen", __PRETTY_FUNCTION__, __LINE__);
         }
     }
@@ -506,15 +525,7 @@ void WebPageUI::_cm_add_to_hs_clicked(void* data, Evas_Object*, void* )
 int WebPageUI::result_cb(int ret, void *data) {
 
     if (data) {
-        WebPageUI* webPageUI = static_cast<WebPageUI*>(data);
-        _cm_dismissed(nullptr, webPageUI->m_ctxpopup, nullptr);
-
-    BROWSER_LOGD("[%s:%d]", __PRETTY_FUNCTION__, __LINE__);
-    BROWSER_LOGD("[%s:%d] ret : %d, data : %s", __PRETTY_FUNCTION__, __LINE__, ret, data);
-
-    BROWSER_LOGD("[%s:%d] uri : %s", __PRETTY_FUNCTION__, __LINE__, (webPageUI->m_wpaInfo->uri).c_str());
-    BROWSER_LOGD("[%s:%d] orientation : %d", __PRETTY_FUNCTION__, __LINE__, webPageUI->m_wpaInfo->orientation);
-    BROWSER_LOGD("[%s:%d] displayMode : %d", __PRETTY_FUNCTION__, __LINE__, webPageUI->m_wpaInfo->displayMode);
+        BROWSER_LOGD("[%s:%d] ret : %d, data : %s", __PRETTY_FUNCTION__, __LINE__, ret, data);
     }
     else {
         BROWSER_LOGW("[%s] data = nullptr", __PRETTY_FUNCTION__);

diff --git a/services/WebPageUI/WebPageUI.h b/services/WebPageUI/WebPageUI.h
index 748016002ba0a4620396b7ce6036f9d450fcdb49..9bf87d747c3f886be001babc4119cbb4ffaba835 100644 (file)
--- a/services/WebPageUI/WebPageUI.h
+++ b/services/WebPageUI/WebPageUI.h
@@ -59,7 +59,7 @@ public:
         WebDisplayModeLast = WebDisplayModeFullscreen
     } webDisplayMode;
 
-    struct wpaInfo {
+    struct pwaInfo {
         std::string     id;
         std::string     decodedIcon; // needs to src, type, sizes.
         std::string     uri;
@@ -208,7 +208,7 @@ private:
     sharedAction m_bookmarks;
     sharedAction m_tabs;
 
-    std::shared_ptr<wpaInfo> m_wpaInfo;
+    std::shared_ptr<pwaInfo> m_pwaInfo;
 #if GESTURE
     Evas_Object* m_gestureLayer;
     bool m_uriBarHidden;