From efbc78a07c552628b879449935f64aa8b7a816e0 Mon Sep 17 00:00:00 2001 From: Sergey Pisarchik Date: Sat, 26 Jul 2014 20:43:28 +0300 Subject: [Tizen] Add send by email button. --- tizen/MapsWithMe/inc/AppResourceId.h | 6 ++ tizen/MapsWithMe/inc/BookMarkUtils.hpp | 2 + tizen/MapsWithMe/inc/SharePositionForm.hpp | 5 +- tizen/MapsWithMe/res/ces-CZ.xml | 10 +++ tizen/MapsWithMe/res/deu-DE.xml | 10 +++ tizen/MapsWithMe/res/eng-GB.xml | 10 +++ tizen/MapsWithMe/res/fra-FR.xml | 10 +++ tizen/MapsWithMe/res/ita-IT.xml | 10 +++ tizen/MapsWithMe/res/pol-PL.xml | 10 +++ tizen/MapsWithMe/res/por-PT.xml | 10 +++ tizen/MapsWithMe/res/rus-RU.xml | 10 +++ .../screen-size-normal/IDF_SHARE_POSITION_FORM.xml | 19 ++++-- tizen/MapsWithMe/res/spa-ES.xml | 10 +++ tizen/MapsWithMe/res/ukr-UA.xml | 10 +++ tizen/MapsWithMe/src/AppResourceId.cpp | 6 ++ tizen/MapsWithMe/src/BookMarkSplitPanel.cpp | 7 +- tizen/MapsWithMe/src/BookMarkUtils.cpp | 76 +++++++++++++++------- tizen/MapsWithMe/src/MapsWithMeForm.cpp | 7 +- tizen/MapsWithMe/src/SharePositionForm.cpp | 50 ++++++++++++-- 19 files changed, 237 insertions(+), 41 deletions(-) (limited to 'tizen/MapsWithMe') diff --git a/tizen/MapsWithMe/inc/AppResourceId.h b/tizen/MapsWithMe/inc/AppResourceId.h index d5e342fdbe..a75d21b53e 100644 --- a/tizen/MapsWithMe/inc/AppResourceId.h +++ b/tizen/MapsWithMe/inc/AppResourceId.h @@ -16,6 +16,7 @@ extern const wchar_t* IDC_COPY_MARK; extern const wchar_t* IDC_DOWNLOAD_LISTVIEW; extern const wchar_t* IDC_EDITFIELD; extern const wchar_t* IDC_EDITFIELD_NAME; +extern const wchar_t* IDC_EMAIL; extern const wchar_t* IDC_ENABLE_GPS; extern const wchar_t* IDC_ENABLE_SCALE_BUTTONS_CB; extern const wchar_t* IDC_FOOTS_CHECKBUTTON; @@ -54,6 +55,8 @@ extern const wchar_t* IDS_BANK; extern const wchar_t* IDS_BECOME_A_PRO; extern const wchar_t* IDS_BOOKMARKS; extern const wchar_t* IDS_BOOKMARK_COLOR; +extern const wchar_t* IDS_BOOKMARK_SHARE_EMAIL; +extern const wchar_t* IDS_BOOKMARK_SHARE_EMAIL_SUBJECT; extern const wchar_t* IDS_BOOKMARK_SHARE_SMS; extern const wchar_t* IDS_CANCEL; extern const wchar_t* IDS_CANCEL_DOWNLOAD; @@ -65,6 +68,7 @@ extern const wchar_t* IDS_DOWNLOAD; extern const wchar_t* IDS_DOWNLOAD_COUNTRY_FAILED; extern const wchar_t* IDS_DOWNLOAD_MAPS; extern const wchar_t* IDS_EDIT; +extern const wchar_t* IDS_EMAIL; extern const wchar_t* IDS_ENTERTAINMENT; extern const wchar_t* IDS_FOOD; extern const wchar_t* IDS_FUEL; @@ -77,6 +81,8 @@ extern const wchar_t* IDS_MEASUREMENT_UNITS; extern const wchar_t* IDS_MEASUREMENT_UNITS_SUMMARY; extern const wchar_t* IDS_MESSAGE; extern const wchar_t* IDS_MILES; +extern const wchar_t* IDS_MY_POSITION_SHARE_EMAIL; +extern const wchar_t* IDS_MY_POSITION_SHARE_EMAIL_SUBJECT; extern const wchar_t* IDS_MY_POSITION_SHARE_SMS; extern const wchar_t* IDS_NO_INTERNET_CONNECTION_DETECTED; extern const wchar_t* IDS_NO_SEARCH_RESULTS_FOUND; diff --git a/tizen/MapsWithMe/inc/BookMarkUtils.hpp b/tizen/MapsWithMe/inc/BookMarkUtils.hpp index 2d51cbadb3..653c53848d 100644 --- a/tizen/MapsWithMe/inc/BookMarkUtils.hpp +++ b/tizen/MapsWithMe/inc/BookMarkUtils.hpp @@ -75,6 +75,8 @@ public: Tizen::Base::String GetSMSTextMyPosition(double lat, double lon); Tizen::Base::String GetSMSTextMark(UserMark const * pMark); + Tizen::Base::String GetEmailTextMyPosition(double lat, double lon); + Tizen::Base::String GetEmailTextMark(UserMark const * pMark); private: shared_ptr m_pCurBookMarkCopy; diff --git a/tizen/MapsWithMe/inc/SharePositionForm.hpp b/tizen/MapsWithMe/inc/SharePositionForm.hpp index d3f8dda483..80b9558a23 100644 --- a/tizen/MapsWithMe/inc/SharePositionForm.hpp +++ b/tizen/MapsWithMe/inc/SharePositionForm.hpp @@ -25,8 +25,11 @@ public: { ID_CANCEL, ID_SEND_MESSAGE, + ID_SEND_EMAIL, ID_COPY_TO_CLIPBOARD }; - Tizen::Base::String m_message; + bool m_sharePosition; + Tizen::Base::String m_messageSMS; + Tizen::Base::String m_messageEmail; }; diff --git a/tizen/MapsWithMe/res/ces-CZ.xml b/tizen/MapsWithMe/res/ces-CZ.xml index 520fbc45d4..444333d3d1 100644 --- a/tizen/MapsWithMe/res/ces-CZ.xml +++ b/tizen/MapsWithMe/res/ces-CZ.xml @@ -79,10 +79,20 @@ Koukni na mou značku na mapě. Otevři odkaz: %1$s nebo %2$s Koukni kde jsem. Otevři odkaz: %1$s nebo %2$s + + Koukni na moji značku na mapě maps.me + + Ahoj,\n\nOznačil/a jsem: %1$s v maps.me, offline mapách celého světa. Klepni na jeden z těchto odkazů %2$s, %3$s a uvidíš toto místo na mapě.\n\nDíky. + + Podívejte se na mou aktuální polohu na mapě na maps.me + + Ahoj,\n\nPrávě jsem tady: %1$s. Klepni na jeden z těchto odkazů %2$s, %3$s a uvidíš toto místo na mapě.\n\nDíky. Sdílet Zpráva + + E-Mail Zkopírovat odkaz diff --git a/tizen/MapsWithMe/res/deu-DE.xml b/tizen/MapsWithMe/res/deu-DE.xml index f435d3dac9..59801a0270 100644 --- a/tizen/MapsWithMe/res/deu-DE.xml +++ b/tizen/MapsWithMe/res/deu-DE.xml @@ -77,10 +77,20 @@ Meine Nadel auf der Karte sehen. Klicke auf den Link %1$s oder %2$s Sieh, wo ich gerade bin. Klicke auf den Link %1$s oder %2$s + + Schau dir meine Nadel auf der maps.me-Karte an + + Hi,\n\nIch habe gepinnt: %1$s auf maps.me, Offline-Weltkarten. Klicke auf diesen Link %2$s oder diesen %3$s, um den Ort auf der Karte zu sehen.\n\nVielen Dank. + + Sieh dir meinen aktuellen Standort auf der Karte maps.me an + + Hi,\n\nich bin gerade hier: %1$s . Klicke auf diesen Link %2$s oder diesen %3$s, um meinen Standort auf der Karte zu sehen.\n\nVielen Dank. Teilen Nachricht + + E-Mail Link kopieren diff --git a/tizen/MapsWithMe/res/eng-GB.xml b/tizen/MapsWithMe/res/eng-GB.xml index 50c40e9d63..21863758a4 100644 --- a/tizen/MapsWithMe/res/eng-GB.xml +++ b/tizen/MapsWithMe/res/eng-GB.xml @@ -81,10 +81,20 @@ Hey, check out my pin at maps.me! %1$s or %2$s Don\'t have offline maps installed? Download here: http://maps.me/get Hey, check out my current location at maps.me! %1$s or %2$s Don\'t have offline maps? Download here: http://maps.me/get + + Hey, check out my pin at maps.me map! + + Hi,\n\nI pinned: %1$s at maps.me, world offline maps. Click this link %2$s or this one %3$s to see the place on the map.\n\nThanks. + + Hey, check out my current location at maps.me map! + + Hi,\n\nI\'m here now: %1$s. Click this link %2$s or this one %3$s to see the place on the map.\n\nThanks. Share Message + + E-Mail Copy Link diff --git a/tizen/MapsWithMe/res/fra-FR.xml b/tizen/MapsWithMe/res/fra-FR.xml index 50632484f5..133c663386 100644 --- a/tizen/MapsWithMe/res/fra-FR.xml +++ b/tizen/MapsWithMe/res/fra-FR.xml @@ -81,10 +81,20 @@ Regarde cette epingle sur la carte ! Ouvre %1$s ou %2$s. Pas de carte hors-ligne ? A obtenir ici http://maps.me/get Regarde ma position sur maps.me ! Ouvre %1$s ou %2$s. Pas de carte hors-ligne ? A obtenir ici http://maps.me/get + + Regarde mon épingle sur la carte maps.me + + Salut,\n\nJ\'ai épinglé %1$s sur maps.me, les cartes du monde hors ligne. Clique sur ce lien %2$s ou sur celui-ci %3$s pour voir l\'endroit sur la carte.\n\nMerci. + + Regarde ma localisation actuelle sur la carte maps.me + + Salut,\n\nJe me trouve actuellement ici : %1$s. Clique sur ce lien %2$s ou sur celui-ci %3$s pour voir l\'endroit sur la carte.\n\nMerci. Partager Message + + E-mail Copier le lien diff --git a/tizen/MapsWithMe/res/ita-IT.xml b/tizen/MapsWithMe/res/ita-IT.xml index 64153a7182..7629346a64 100644 --- a/tizen/MapsWithMe/res/ita-IT.xml +++ b/tizen/MapsWithMe/res/ita-IT.xml @@ -81,10 +81,20 @@ Vedi pin sulla mappa. Apri %1$s o %2$s Vedi dove sono ora. Apri %1$s o %2$s + + Dai uno sguardo al mio pin sulla mappa di maps.me + + Ciao,\n\nHo segnato %1$s su maps.me, le mappe del mondo offline. Clicca su questo link %2$s oppure su questo %3$s per vedere il posto sulla mappa.\n\nGrazie. + + Guarda dove mi trovo attualmente sulla mappa maps.me + + Ciao,\n\nSono qui adesso: %1$s. Clicca su questo link %2$s oppure su questo %3$s per vedere il posto sulla mappa.\n\nGrazie. Condividi Messaggio + + E-mail Copia link diff --git a/tizen/MapsWithMe/res/pol-PL.xml b/tizen/MapsWithMe/res/pol-PL.xml index 7a0c7d0057..80fe498ef0 100644 --- a/tizen/MapsWithMe/res/pol-PL.xml +++ b/tizen/MapsWithMe/res/pol-PL.xml @@ -81,10 +81,20 @@ Mój znacznik w maps.me %1$s i %2$s Zobacz gdzie jestem. Link %1$s lub %2$s + + Obejrzyj mój znacznik na mapie w maps.me + + Cześć,\n\nDodałem znacznik w: %1$s w aplikacji maps.me, mapach offline całego świata. Naciśnij ten link %2$s lub ten %3$s by zobaczyć to miejsce na mapie.\n\nDziękuję. + + Zobacz moją aktualną lokalizację na mapie przy użyciu maps.me + + Cześć,\n\nJestem teraz tutaj: %1$s. Naciśnij na ten link %2$s lub ten %3$s, aby zobaczyć to miejsce na mapie.\n\nDziękuję. Udostępnij Wiadomość + + E-mail Kopiuj link diff --git a/tizen/MapsWithMe/res/por-PT.xml b/tizen/MapsWithMe/res/por-PT.xml index d9beb0884f..89cec71497 100644 --- a/tizen/MapsWithMe/res/por-PT.xml +++ b/tizen/MapsWithMe/res/por-PT.xml @@ -81,10 +81,20 @@ Veja o meu marcador no mapa do maps.me. Abra a hiperligação: %1$s ou %2$s Veja onde estou agora. Abra a hiperligação: %1$s ou %2$s + + Veja o meu marcador no mapa do maps.me. + + Olá,\n\nFixei:%1$s na maps.me, mapas offline mundiais. Clique nesta ligação %2$s ou nesta %3$s para ver o local no mapa.\n\nObrigado. + + Veja a minha localização atual em maps.me map + + Olá,\n\n Estou aqui agora: %1$s. Clique nesta ligação %2$s ou nesta %3$s para ver o local no mapa.\n\nObrigado. Partilhar Mensagem + + E-Mail Copiar hiperligação diff --git a/tizen/MapsWithMe/res/rus-RU.xml b/tizen/MapsWithMe/res/rus-RU.xml index 4f7a0a0e1a..ebe2f0e993 100644 --- a/tizen/MapsWithMe/res/rus-RU.xml +++ b/tizen/MapsWithMe/res/rus-RU.xml @@ -81,10 +81,20 @@ Моя метка на карте. Жми %1$s или %2$s Смотри где я сейчас. Жми %1$s или %2$s + + Смотри мою метку на карте maps.me + + Привет!\n\nОткрой эту ссылку %2$s либо эту %3$s, для того, чтобы увидеть мою метку %1$s на карте maps.me.\n\nСпасибо. + + Посмотри на карте maps.me, где я сейчас нахожусь + + Привет!\n\nЯ сейчас здесь: %1$s. Чтобы увидеть это место на карте maps.me, открой эту ссылку %2$s или эту %3$s \n\nСпасибо. Поделиться Сообщение + + E-Mail Скопировать ссылку diff --git a/tizen/MapsWithMe/res/screen-size-normal/IDF_SHARE_POSITION_FORM.xml b/tizen/MapsWithMe/res/screen-size-normal/IDF_SHARE_POSITION_FORM.xml index 87cb5f4513..ff7ea6d9c1 100644 --- a/tizen/MapsWithMe/res/screen-size-normal/IDF_SHARE_POSITION_FORM.xml +++ b/tizen/MapsWithMe/res/screen-size-normal/IDF_SHARE_POSITION_FORM.xml @@ -11,24 +11,29 @@ - + + diff --git a/tizen/MapsWithMe/res/spa-ES.xml b/tizen/MapsWithMe/res/spa-ES.xml index d5ecbc7b74..9e92300151 100644 --- a/tizen/MapsWithMe/res/spa-ES.xml +++ b/tizen/MapsWithMe/res/spa-ES.xml @@ -75,10 +75,20 @@ Ve mi alfiler en mapa. Abre %1$s o %2$s Mira dónde estoy. Abre %1$s o %2$s + + Mira mi alfiler en el mapa de maps.me + + ¡Hola!\n\nMarqué con un alfiler: %1$s en maps.me, mapas del mundo sin conexión. Haz clic en este enlace %2$s o este %3$s para ver el sitio en el mapa.\n\nGracias. + + Mira mi ubicación actual en el mapa en maps.me + + Hola:\n\nAhora estoy aquí: %1$s. Haz clic en este enlace %2$s o esta %3$s para verlo en el mapa. \n\nGracias. Compartir Mensaje + + Correo electrónico Copiar enlace diff --git a/tizen/MapsWithMe/res/ukr-UA.xml b/tizen/MapsWithMe/res/ukr-UA.xml index b9717ffd35..4984ba61d3 100644 --- a/tizen/MapsWithMe/res/ukr-UA.xml +++ b/tizen/MapsWithMe/res/ukr-UA.xml @@ -81,10 +81,20 @@ Моя мітка на карті. Іди %1$s або %2$s Глянь де я зараз. Іди %1$s або %2$s + + Поглянь на мою позначку на карті maps.me + + Привіт,\n\nЯ позначив: %1$s на maps.me, офлайн картах світу. Натисни на це посилання %2$s або на це посилання %3$s, щоб побачити місце на карті. \n\nДякую. + + Поглянь на моє поточне місцезнаходження на карті maps.me + + Привіт,\n\nЯ зараз тут: %1$s. Натисни на це посилання %2$s або на це посилання %3$s щоб побачити місце на карті. \n\nДякую. Подiлитись Повідомлення + + Електронна пошта Копіювати посилання diff --git a/tizen/MapsWithMe/src/AppResourceId.cpp b/tizen/MapsWithMe/src/AppResourceId.cpp index 662b31fb0e..1aeac9f71a 100644 --- a/tizen/MapsWithMe/src/AppResourceId.cpp +++ b/tizen/MapsWithMe/src/AppResourceId.cpp @@ -17,6 +17,7 @@ const wchar_t* IDC_COPY_MARK = L"IDC_COPY_MARK"; const wchar_t* IDC_DOWNLOAD_LISTVIEW = L"IDC_DOWNLOAD_LISTVIEW"; const wchar_t* IDC_EDITFIELD = L"IDC_EDITFIELD"; const wchar_t* IDC_EDITFIELD_NAME = L"IDC_EDITFIELD_NAME"; +const wchar_t* IDC_EMAIL = L"IDC_EMAIL"; const wchar_t* IDC_ENABLE_GPS = L"IDC_ENABLE_GPS"; const wchar_t* IDC_ENABLE_SCALE_BUTTONS_CB = L"IDC_ENABLE_SCALE_BUTTONS_CB"; const wchar_t* IDC_FOOTS_CHECKBUTTON = L"IDC_FOOTS_CHECKBUTTON"; @@ -55,6 +56,8 @@ const wchar_t* IDS_BANK = L"IDS_BANK"; const wchar_t* IDS_BECOME_A_PRO = L"IDS_BECOME_A_PRO"; const wchar_t* IDS_BOOKMARKS = L"IDS_BOOKMARKS"; const wchar_t* IDS_BOOKMARK_COLOR = L"IDS_BOOKMARK_COLOR"; +const wchar_t* IDS_BOOKMARK_SHARE_EMAIL = L"IDS_BOOKMARK_SHARE_EMAIL"; +const wchar_t* IDS_BOOKMARK_SHARE_EMAIL_SUBJECT = L"IDS_BOOKMARK_SHARE_EMAIL_SUBJECT"; const wchar_t* IDS_BOOKMARK_SHARE_SMS = L"IDS_BOOKMARK_SHARE_SMS"; const wchar_t* IDS_CANCEL = L"IDS_CANCEL"; const wchar_t* IDS_CANCEL_DOWNLOAD = L"IDS_CANCEL_DOWNLOAD"; @@ -66,6 +69,7 @@ const wchar_t* IDS_DOWNLOAD = L"IDS_DOWNLOAD"; const wchar_t* IDS_DOWNLOAD_COUNTRY_FAILED = L"IDS_DOWNLOAD_COUNTRY_FAILED"; const wchar_t* IDS_DOWNLOAD_MAPS = L"IDS_DOWNLOAD_MAPS"; const wchar_t* IDS_EDIT = L"IDS_EDIT"; +const wchar_t* IDS_EMAIL = L"IDS_EMAIL"; const wchar_t* IDS_ENTERTAINMENT = L"IDS_ENTERTAINMENT"; const wchar_t* IDS_FOOD = L"IDS_FOOD"; const wchar_t* IDS_FUEL = L"IDS_FUEL"; @@ -78,6 +82,8 @@ const wchar_t* IDS_MEASUREMENT_UNITS = L"IDS_MEASUREMENT_UNITS"; const wchar_t* IDS_MEASUREMENT_UNITS_SUMMARY = L"IDS_MEASUREMENT_UNITS_SUMMARY"; const wchar_t* IDS_MESSAGE = L"IDS_MESSAGE"; const wchar_t* IDS_MILES = L"IDS_MILES"; +const wchar_t* IDS_MY_POSITION_SHARE_EMAIL = L"IDS_MY_POSITION_SHARE_EMAIL"; +const wchar_t* IDS_MY_POSITION_SHARE_EMAIL_SUBJECT = L"IDS_MY_POSITION_SHARE_EMAIL_SUBJECT"; const wchar_t* IDS_MY_POSITION_SHARE_SMS = L"IDS_MY_POSITION_SHARE_SMS"; const wchar_t* IDS_NO_INTERNET_CONNECTION_DETECTED = L"IDS_NO_INTERNET_CONNECTION_DETECTED"; const wchar_t* IDS_NO_SEARCH_RESULTS_FOUND = L"IDS_NO_SEARCH_RESULTS_FOUND"; diff --git a/tizen/MapsWithMe/src/BookMarkSplitPanel.cpp b/tizen/MapsWithMe/src/BookMarkSplitPanel.cpp index 2dd967504c..3c03b19ca5 100644 --- a/tizen/MapsWithMe/src/BookMarkSplitPanel.cpp +++ b/tizen/MapsWithMe/src/BookMarkSplitPanel.cpp @@ -129,10 +129,13 @@ void BookMarkSplitPanel::OnActionPerformed(Tizen::Ui::Control const & source, in { case ID_SHARE_BUTTON: { - String textVal = GetBMMnger().GetSMSTextMark(GetBMMnger().GetCurMark()); + String textValSMS = GetBMMnger().GetSMSTextMark(GetBMMnger().GetCurMark()); + String textValEmail = GetBMMnger().GetEmailTextMark(GetBMMnger().GetCurMark()); ArrayList * pList = new ArrayList; pList->Construct(); - pList->Add(new String(textVal)); + pList->Add(new String(textValSMS)); + pList->Add(new String(textValEmail)); + pList->Add(new Boolean(false)); //not my position but mark SceneManager * pSceneManager = SceneManager::GetInstance(); pSceneManager->GoForward(ForwardSceneTransition(SCENE_SHARE_POSITION, SCENE_TRANSITION_ANIMATION_TYPE_LEFT, SCENE_HISTORY_OPTION_ADD_HISTORY, SCENE_DESTROY_OPTION_KEEP), pList); diff --git a/tizen/MapsWithMe/src/BookMarkUtils.cpp b/tizen/MapsWithMe/src/BookMarkUtils.cpp index 0e0b2e93a8..33f4bdc156 100644 --- a/tizen/MapsWithMe/src/BookMarkUtils.cpp +++ b/tizen/MapsWithMe/src/BookMarkUtils.cpp @@ -436,43 +436,75 @@ size_t BookMarkManager::GetCategorySize(int index) return pFW->GetBmCategory(index)->GetBookmarksCount(); } -Tizen::Base::String BookMarkManager::GetSMSTextMyPosition(double lat, double lon) +namespace detail { - Framework * pFW = GetFramework(); - - String s = pFW->CodeGe0url(lat, lon, pFW->GetDrawScale(), "").c_str(); +Tizen::Base::String FormatSMSString(Tizen::Base::String message, Tizen::Base::String const & url) +{ + message.Replace("%1$s", url); + String s2 = "http://ge0.me/"; + String s3; + url.SubString(6, s3); + s2.Append(s3); + message.Replace("%2$s", s2); + return message; +} - String r = GetString(IDS_MY_POSITION_SHARE_SMS); - r.Replace("%1$s", s); +Tizen::Base::String FormatEmailString(Tizen::Base::String message, Tizen::Base::String const & description, Tizen::Base::String const & url) +{ + message.Replace("%1$s", description); + message.Replace("%2$s", url); String s2 = "http://ge0.me/"; String s3; - s.SubString(6, s3); + url.SubString(6, s3); s2.Append(s3); - r.Replace("%2$s", s2); - return r; + message.Replace("%3$s", s2); + return message; +} + +} + +Tizen::Base::String BookMarkManager::GetSMSTextMyPosition(double lat, double lon) +{ + Framework * pFW = GetFramework(); + String s = pFW->CodeGe0url(lat, lon, pFW->GetDrawScale(), "").c_str(); + String r = GetString(IDS_MY_POSITION_SHARE_SMS); + return detail::FormatSMSString(r, s); } Tizen::Base::String BookMarkManager::GetSMSTextMark(UserMark const * pMark) { if (!pMark) return ""; - - double lat; - double lon; - + double lat,lon; pMark->GetLatLon(lat, lon); Framework * pFW = GetFramework(); - String s = pFW->CodeGe0url(lat, lon, pFW->GetDrawScale(), "").c_str(); + String const s = pFW->CodeGe0url(lat, lon, pFW->GetDrawScale(), "").c_str(); + String const r = GetString(IDS_BOOKMARK_SHARE_SMS); + return detail::FormatSMSString(r, s); +} +Tizen::Base::String BookMarkManager::GetEmailTextMyPosition(double lat, double lon) +{ + search::AddressInfo info; + double y = MercatorBounds::LatToY(lat); + double x = MercatorBounds::LonToX(lon); + Framework * pFW = GetFramework(); + pFW->GetAddressInfoForGlobalPoint(m2::PointD(x, y), info); + String const & description = info.FormatNameAndAddress().c_str(); + String const s = pFW->CodeGe0url(lat, lon, pFW->GetDrawScale(), "").c_str(); + String const r = GetString(IDS_MY_POSITION_SHARE_EMAIL); + return detail::FormatEmailString(r, description, s); +} - String r = GetString(IDS_BOOKMARK_SHARE_SMS); - r.Replace("%1$s", s); - String s2 = "http://ge0.me/"; - String s3; - s.SubString(6, s3); - s2.Append(s3); - r.Replace("%2$s", s2); - return r; +Tizen::Base::String BookMarkManager::GetEmailTextMark(UserMark const * pMark) +{ + Framework * pFW = GetFramework(); + String const & description = GetMarkName(pMark); + double lat,lon; + pMark->GetLatLon(lat, lon); + String const s = pFW->CodeGe0url(lat, lon, pFW->GetDrawScale(), "").c_str(); + String const r = GetString(IDS_MY_POSITION_SHARE_EMAIL); + return detail::FormatEmailString(r, description, s); } }//bookmark diff --git a/tizen/MapsWithMe/src/MapsWithMeForm.cpp b/tizen/MapsWithMe/src/MapsWithMeForm.cpp index 6551860daa..320bb86280 100644 --- a/tizen/MapsWithMe/src/MapsWithMeForm.cpp +++ b/tizen/MapsWithMe/src/MapsWithMeForm.cpp @@ -569,10 +569,13 @@ void MapsWithMeForm::OnListViewItemStateChanged(ListView & listView, int index, double lat, lon; if (GetFramework()->GetCurrentPosition(lat, lon)) { - String textVal = bookmark::GetBMMnger().GetSMSTextMyPosition(lat, lon); + String textValSMS = bookmark::GetBMMnger().GetSMSTextMyPosition(lat, lon); + String textValEmail = bookmark::GetBMMnger().GetEmailTextMyPosition(lat, lon); ArrayList * pList = new ArrayList; pList->Construct(); - pList->Add(new String(textVal)); + pList->Add(new String(textValSMS)); + pList->Add(new String(textValEmail)); + pList->Add(new Boolean(true)); // my position not mark SceneManager * pSceneManager = SceneManager::GetInstance(); pSceneManager->GoForward(ForwardSceneTransition(SCENE_SHARE_POSITION, SCENE_TRANSITION_ANIMATION_TYPE_LEFT, SCENE_HISTORY_OPTION_ADD_HISTORY, SCENE_DESTROY_OPTION_KEEP), pList); diff --git a/tizen/MapsWithMe/src/SharePositionForm.cpp b/tizen/MapsWithMe/src/SharePositionForm.cpp index 7ac5c0d402..a4a620a928 100644 --- a/tizen/MapsWithMe/src/SharePositionForm.cpp +++ b/tizen/MapsWithMe/src/SharePositionForm.cpp @@ -36,6 +36,10 @@ result SharePositionForm::OnInitializing(void) pMessageButton->SetActionId(ID_SEND_MESSAGE); pMessageButton->AddActionEventListener(*this); + Button * pEmailButton = static_cast