From d9fa12effd052e6786ffb0a6f66bd4a58e8b00ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=93=D1=80=D0=B5=D1=87=D1=83?= =?UTF-8?q?=D1=85=D0=B8=D0=BD?= Date: Thu, 19 Nov 2015 14:16:18 +0300 Subject: [PATCH 1/3] [ios] Updated navigation bar appearance. --- iphone/Maps/Classes/MapsAppDelegate.mm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 248b597879..a35d3412a9 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -10,6 +10,8 @@ #import "Preferences.h" #import "RouteState.h" #import "Statistics.h" +#import "UIColor+MapsMeColor.h" +#import "UIFont+MapsMeFonts.h" #import #import #import @@ -376,18 +378,18 @@ void InitLocalizedStrings() - (void)customizeAppearance { - NSMutableDictionary * attributes = [[NSMutableDictionary alloc] init]; - attributes[NSForegroundColorAttributeName] = [UIColor whiteColor]; + NSDictionary * attributes = @{ + NSForegroundColorAttributeName : [UIColor whiteColor], + NSFontAttributeName : [UIFont regular18] + }; - Class const navigationControllerClass = [NavigationController class]; - [[UINavigationBar appearanceWhenContainedIn:navigationControllerClass, nil] setTintColor:[UIColor whiteColor]]; - [[UIBarButtonItem appearance] setTitleTextAttributes:attributes forState:UIControlStateNormal]; - [[UINavigationBar appearanceWhenContainedIn:navigationControllerClass, nil] setBarTintColor:[UIColor colorWithColorCode:@"0e8639"]]; - attributes[NSFontAttributeName] = [UIFont fontWithName:@"HelveticaNeue" size:17.5]; - - UINavigationBar * navBar = [UINavigationBar appearanceWhenContainedIn:navigationControllerClass, nil]; - navBar.shadowImage = [[UIImage alloc] init]; + UINavigationBar * navBar = [UINavigationBar appearance]; + navBar.tintColor = [UIColor primary]; + navBar.barTintColor = [UIColor primary]; + navBar.shadowImage = [UIImage imageWithColor:[UIColor fadeBackground]]; navBar.titleTextAttributes = attributes; + + [[UIBarButtonItem appearance] setTitleTextAttributes:attributes forState:UIControlStateNormal]; } - (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification From 3b48ae0ccb043ffed9856d0497ff8f4a742399c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=93=D1=80=D0=B5=D1=87=D1=83?= =?UTF-8?q?=D1=85=D0=B8=D0=BD?= Date: Thu, 19 Nov 2015 14:17:35 +0300 Subject: [PATCH 2/3] [ios] Added tts now to set up voice. --- .../general@2x.png | Bin 0 -> 1065 bytes .../settings@2x.png | Bin 0 -> 1029 bytes .../tts-how-to-set-up-voice-img/switch@2x.png | Bin 0 -> 764 bytes data/tts-how-to-set-up-voice.html | 1041 +++++++++++++++++ iphone/Common/WebViewController.mm | 1 + iphone/Maps/MWMTTSSettingsViewController.mm | 15 +- iphone/Maps/Maps.xcodeproj/project.pbxproj | 14 + 7 files changed, 1066 insertions(+), 5 deletions(-) create mode 100644 data/tts-how-to-set-up-voice-img/general@2x.png create mode 100644 data/tts-how-to-set-up-voice-img/settings@2x.png create mode 100644 data/tts-how-to-set-up-voice-img/switch@2x.png create mode 100644 data/tts-how-to-set-up-voice.html diff --git a/data/tts-how-to-set-up-voice-img/general@2x.png b/data/tts-how-to-set-up-voice-img/general@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..86210a28409cdc593726048a52e80c195dcd948b GIT binary patch literal 1065 zcmV+^1lIeBP)Px#U{Fj{MNDaN@bB^Q^74+2lkM&A_4f9xtgqkS@XpTB z{QUfnj+Bs(mW_;&|NsAwj+c;-l#7aw{QUfslbGY<`SK=<+^1 zan3|mUuZd$-LIvrelNVV&{Mk6i9CmgpgsyYWk_`6@*?GoK=~M}efxM8U9we$`qQA{#!c6j4gjugZf)Ks z0FS&~Qv%XS2rnSX5#wcvwo*hvO`CkYygzIXpd$?T&1hxCy~pVfv-06V}8Zg`- zG*G7|g);ZYYixqafOTOY=OPJHz>q8>MzkK=-Q`kO8zat$G9GQm+Kd;=2>6WZd~C|3 zo8JW!0wp80{&;=?nblH8zuI^uUsDzh0wEc(aa~MCy%`LJO1S)1Oc=VyO(lR6N@epG zq>6;WGGc^j*=w9N;go2FB1#WA{k1O%oij3`y=B5IYE!{jRcBwPS5#0|rv=HxfDXVK zYjdWk@B>(HAUa0ZPF>1#1!oMMhp^TrS`^po>Fb^|CTKwH3y~%?Baj};?l(1tp?7F* z%Gz7gK0-&JCr+SY1U;82t8Z9>=GJCC-_1C^37;W9G`cIvq;!koOk|>9Nh3rdCW>Az*Z|OavHn+FvmOyL!@(#p2xxaDwaPot zu9m=ue+d^|a-lR&{lS4#@axE~Mh;C_g$$MdScPP(pxtW1knSbqyihrPU#{AhD`G1o z=cLI>Nkjf#SMBS%8YJ4@`l(-rVWI0hJi5a;D|)Ff1DLx3OfUfRGr}0sV|Z#$X#T`= z7PAzU72+gVN`NV0wV=!=OzPf4aBSWuFex#U61fejXC#=^*J%@jmBEX;A!TC&Ul7Rc zhe%?!2P1WAo^6g`!LM@*vWlRE_UpE0rI!u-8wTT0+S}*1*<(dne*7);U>L<8v%mj7 j9!tUs$-j}l|2}>Liy&6~N-}(900000NkvXXu0mjf#P$3) literal 0 HcmV?d00001 diff --git a/data/tts-how-to-set-up-voice-img/settings@2x.png b/data/tts-how-to-set-up-voice-img/settings@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..11690a274dd0849f3974182fa5b80f1db937ac10 GIT binary patch literal 1029 zcmV+g1p51lP)Px#U{Fj{MNDaNnxUqZouO1zRqO2RxxK%VmzwnT_5c6> z|NsAAU}0KWT9TNYZf|kh-QZ(BPwe}Ufc{@ng7?(xRv{TQ*7IF1{6bw4J#?caJnuNIs!QX1nzKb}7$8}fS|-;Wn3 zAhaZnBzt|29M3Pdy}3$?jHlpyaDlwRV|$YudmPYy?88e#&hs?lb;Ve9AZKK__G9V6 z%H4<#c0mucdaXSk*8ob&kJmW6@54zV-uFGiMk#3=k9+0F)n6}g-7my-dLRR@5q+GnbH!>ZQSzyGZxGSQ}SbVTK+u(rW@p2?-EO3l5 z1N#V0N`Ay@wYIf!x5(m*3Kt-NS25D*3)vZ;3d%w;6k3{O7}`k_uLTaR48<;$bQp~s z#!4xw6+e-^kWqFz#xWc!9Mdp&5*jnA7TGy0{Rjq^5m}6gOgtJG7O#{kX=0EsuryI) z-D8|!0@5>VYy~1*3^yp7p0OKA*#MTv1-!ISrr`qRhOIVbD>g|1sB$a-^#r{@QhtKM z^I$ooYq7kSPEyzjmj6KQxt>a$>oy$)FNO69QVTz!d729dp@Hn{bSxd91z5QdC`Jhs z1LGytG@er?q}@Af9kt3(rBE{gA(Os2f$32~HZO7MjkVTDNZ;JF>~#8S7IsqCQV2Ie z>aDTbW(_h=AF9cvS75XW;klJcgay`Sl`t;36TwrO!zj#S*_AlaZ3JevR+eh5bPD2J zo{k~4?2@rFO33r z8f^^>{X$rVk~Qcioo%M`Tf%Wo=%>8I?i<2l4Smi*ibY|MTTe4QUjS#Hu(1}vsZJuS zaPSU?3ho9q&NT6^S^LR8>{1Shg8aw@AAuApU2h}q_=lu_bzVx^c z@vZBL>h<|ot4H&4ANK3-<0H(jU&O=5{rB+~3D949O&@0h00000NkvXXu0mjf!h_$8 literal 0 HcmV?d00001 diff --git a/data/tts-how-to-set-up-voice-img/switch@2x.png b/data/tts-how-to-set-up-voice-img/switch@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..fdb4bd7c6df9494ccb970345be212077dde236da GIT binary patch literal 764 zcmVPx#U{Fj{MgRZ*O4DIU&R<5@UrpF$`uqC#`1efNWJ}j$ z{{H^+^z`WW>yPK2@9*zFty0GB&9UdY-SFUF*>pp=S9IQnM#fy{=jU|GgUi{@h{%)O z;ND=hZl}<$WXN@y=%$g@o#&{EDF6ThI!Q!9R7l62mRXX7AP_`t6%3KZ2))#W}tvAmUNL7GR;S zaa&@xM%V)6U;z_z4y*`sY}>F+5E!6#2G9{YDUcy-TaYAB0#^r&c*st`vxP?mo?|J( z85;uBf;9Eaz%kR4%1(fK13sU+^8rXJ4PY%2OBg_XkCrRImEadZ;Q(y@PwnjiUVDIm zCY}J_F3@So@D3mx0)zwiJbYQr@d*%d3IM7la|4!|oqzyen{Wc!-aQ6GOD_Pzp%Ut9 z#4f;C@$3Q!uFsPbP!3;L3x`SE0EC@gH~?W)Iz|C?6)$c8eVzb7U6mu$M>3XOli6K7 z&nwNJ1pOka%W^E<>yPF1EuH{E^CSf#l&>R2yUl+GXu=#v4}c{Mw-A^QW&3UR0Jl-Y zOxagsdWle179rOCL}DEDzrHyFkk`vOj-uUfBUplFv|ZP=gZ|NdwZGW?&tWH+%}UC6 z)qz+cWi@o8wi~|-utMlAVbu5EUA>mIuYT{hj=qKv#yHE0qG+1lsxhnE<##{vdDs5p}L!RVO)0000 + + + + + + + + + + + +
+To improve the quality of speaking the navigation instructions, please, download an enhanced voice package.


+To do that, follow the following instructions:
+
    +
  • + Open the device Settings. +
    • +
  • + Go to the General section. +
    • +
  • + Tap on Accessibility. +
    • +
  • + Tap on Speech. +
    • +
  • + Turn Speak Selection on. +
    • +
  • + Tap on Voices. +
    • +
  • + Select your language. +
    • +
  • + Download an enhanced voice package. +
    • +
+
+Now the quality of speaking the navigation instructions will be better. +
+ +
+नेविगेशन निर्देश बोलने की गुणवत्ता में सुधार करने के लिए, एक परिष्कृत आवाज का पैकेज डाउनलोड करें।


+ऐसा करने के लिए, निम्न निर्देशों का पालन करें:
+
    +
  • + डिवाइस की सेटिंग खोलें +
    • +
  • + जनरल सैक्शन पर जाएं। +
    • +
  • + अक्सेसिबिलिटी पर टैप करें। +
    • +
  • + स्पीच पर टैप करें। +
    • +
  • + बोलने के चयन को ऑन करें। +
    • +
  • + आवाज़ें पर टैप करें। +
    • +
  • + अपनी भाषा का चयन करें। +
    • +
  • + एक परिष्कृत आवाज का पैकेज डाउनलोड करें। +
    • +
+
+अब नेविगेशन निर्देशों को बोलने की गुणवत्ता बेहतर हो जाएगी। +
+ +
+Чтобы улучшить качество проговаривания голосовых подсказок во время навигации скачайте улучшенный голосовой пакет.


+Для этого выполните следующие действия:
+
    +
  • + Откройте Настройки устройства. +
    • +
  • + Перейдите в раздел Основные. +
    • +
  • + Нажмите Универсальный доступ. +
    • +
  • + Нажмите Речь. +
    • +
  • + Включите Проговаривание. +
    • +
  • + Нажмите Голоса. +
    • +
  • + Выберите ваш язык. +
    • +
  • + Скачайте улучшеный голосовой пакет. +
    • +
+
+Теперь качество проговаривания голосовых подсказок стало лучше. +
+ +
+Chcete-li zlepšit kvalitu hlasové navigace, pak si prosím stáhněte rozšířený hlasový balíček.


+Chcete-li to provést, pak postupujte podle následujících pokynů:
+
    +
  • + Otevřete Nastavení zařízení. +
    • +
  • + Přejděte do sekce Obecné. +
    • +
  • + Klepněte na Zpřístupnost. +
    • +
  • + Klepněte na Čtení. +
    • +
  • + Zapněte Výběr řeči. +
    • +
  • + Klepněte na Hlasy. +
    • +
  • + Выберите ваш язык. +
    • +
  • + Vyberte svůj jazyk. +
    • +
+
+Stáhněte si rozšířený hlasový balíček. +
+ + + + +
+Aby polepszyć jakość głosowych instrukcji nawigacji, pobierz pakiet poprawionych głosów.


+W tym celu postępuj zgodnie z poniższymi instrukcjami:
+
    +
  • + Wejdź w Ustawienia urządzenia. +
    • +
  • + Wejdź w sekcję Ogólne. +
    • +
  • + Stuknij Dostępność. +
    • +
  • + Stuknij Mowa. +
    • +
  • + Włącz Mów zaznaczone. +
    • +
  • + Stuknij Głosy. +
    • +
  • + Wybierz swój język. +
    • +
  • + Pobierz pakiet poprawionych głosów. +
    • +
+
+Dzięki temu jakość głosowych instrukcji nawigacji polepszy się. +
+ +
+Förbättra röstkvaliteten på navigationsanvisningarna genom att hämta ett paket med förbättrad röst.


+Följ nedanstående anvisningar för att göra det:
+
    +
  • + Öppna enhetens Inställningar. +
    • +
  • + Gå till sektionen Allmänt. +
    • +
  • + Gå till Hjälpmedel. +
    • +
  • + Tryck på Tal. +
    • +
  • + Aktivera Läs upp markering. +
    • +
  • + Tryck på Röster. +
    • +
  • + Välj ditt språk. +
    • +
  • + Hämta ett paket med förbättrad röst. +
    • +
+
+Nu blir kvaliteten på talet i navigationsanvisningarna bättre. +
+ +
+Navigasyon talimatlarının konuşma kalitesini geliştirmek için lütfen iyileştirilmiş ses paketini indir.


+Bunu yapmak için aşağıdaki talimatları izle:
+
    +
  • + Cihaz Ayarlarını aç. +
    • +
  • + Genel bölümüne git. +
    • +
  • + Erişilebilirlik alanına dokun. +
    • +
  • + Konuşma alanına dokun. +
    • +
  • + Konuşma Seçimi alanını aç. +
    • +
  • + Sesler alanına dokun. +
    • +
  • + Dilini seç. +
    • +
  • + İyileştirilmiş ses paketini indir. +
    • +
+
+Artık navigasyon talimatlarının konuşma kalitesi daha iyi olacak. +
+ +
+Afin d'améliorer la qualité vocale des instructions de navigation, veuillez, je vous prie, télécharger un logiciel vocal haute définition.


+Pour ce faire, veuillez suivre les instructions suivantes:
+
    +
  • + Sur votre appareil, allez dans Réglages. +
    • +
  • + Allez à la section Général. +
    • +
  • + Allez dans Accessibilité. +
    • +
  • + Allez dans Parole. +
    • +
  • + Activez Énoncer la sélection. +
    • +
  • + Allez dans Voix. +
    • +
  • + Sélectionnez votre langue. +
    • +
  • + Téléchargez un logiciel vocal haute définition. +
    • +
+
+Dès lors, la qualité vocale des instructions de navigation s'en trouvera améliorée. +
+ +
+Om de kwaliteit van de gesproken navigatie-instructies te verbeteren, kunt u een verbeterd stemmenpakket downloaden.


+Om dat te doen, volgt u de volgende instructies:
+
    +
  • + Open de Instellingen. +
    • +
  • + Ga naar de sectie Algemeen. +
    • +
  • + Tik op Toegankelijkheid. +
    • +
  • + Tik op Spraak. +
    • +
  • + Zet Spraakselectie aan. +
    • +
  • + Tik op Stemmen. +
    • +
  • + Selecteer uw taal. +
    • +
  • + Download een verbeterd stemmenpakket. +
    • +
+
+Nu zal de kwaliteit van de gesproken navigatie-instructies beter zijn. +
+ +
+Um die Sprachqualität der Navigationshilfe zu verbessern, laden Sie bitte ein verbessertes Sprachpaket herunter.


+Um dies zu tun, folgen Sie diesen Anweisungen:
+
    +
  • + Öffnen Sie die Einstellungendes Gerätes. +
    • +
  • + Navigieren Sie zu Allgemeines. +
    • +
  • + Tippen Sie auf Bedienungshilfen. +
    • +
  • + Tippen Sie auf Sprachausgabe. +
    • +
  • + Aktivieren Sie Sprachauswahl. +
    • +
  • + Tippen Sie auf Stimmen. +
    • +
  • + Wählen Sie Ihre Sprache. +
    • +
  • + Laden Sie ein verbessertes Sprachpaket herunter. +
    • +
+
+Jetzt wird die Qualität der Sprachausgabe bei der Navigation besser sein. +
+ +
+لتحسين جودة إرشادات الملاحة الصوتية، الرجاء تنزيل الحزمة الصوتية المحسنة.


+للقيام بذلك، اتبع التعليمات التالية:
+
    +
  • + فتح إعدادات الجهاز. +
    • +
  • + انتقل إلى القسم العام. +
    • +
  • + اضغط على إمكانية الوصول. +
    • +
  • + اضغط على النطق. +
    • +
  • + قم بتشغيل اختيار النطق. +
    • +
  • + اضغط على الأصوات. +
    • +
  • + حدد لغتك. +
    • +
  • + قم بتنزيل الحزمة الصوتية المحسنة. +
    • +
+
+الآن ستصير إرشادات الملاحة الصوتية أفضل. +
+ +
+Για να βελτιώσετε την ποιότητα της εκφώνησης των οδηγιών πλοήγησης, παρακαλούμε, κάντε λήψη ενός βελτιωμένου φωνητικού πακέτου.


+Για να το κάνετε αυτό, ακολουθήστε τις παρακάτω οδηγίες:
+
    +
  • + Ανοίξτε τις Ρυθμίσεις της συσκευής. +
    • +
  • + Πηγαίνετε στην επιλογή Γενικά. +
    • +
  • + Πατήστε στο Πρασβασιμότητα. +
    • +
  • + Πατήστε στο Εκφώνηση. +
    • +
  • + Ενεργοποιήστε το Εκφώνηση επιλογής. +
    • +
  • + Πατήστε στο Φωνές. +
    • +
  • + Επιλέξτε τη γλώσσα σας. +
    • +
  • + Κάντε λήψη ενός βελτιωμένου φωνητικού πακέτο. +
    • +
+
+Τώρα η ποιότητα της εκφώνησης των οδηγιών πλοήγησης θα είναι βελτιωμένη. +
+ +
+Per migliorare la qualità delle istruzioni vocali di navigazione, consigliamo di scaricare il pacchetto voce ottimizzato.


+Per farlo, segui le seguenti istruzioni:
+
    +
  • + Apri le Impostazioni del dispositivo. +
    • +
  • + Vai alla sezione Generali. +
    • +
  • + Tocca Accessibilità. +
    • +
  • + Tocca Voce. +
    • +
  • + Abilita la Pronuncia selezione. +
    • +
  • + Tocca Voci. +
    • +
  • + Seleziona la tua lingua. +
    • +
  • + Scarica il pacchetto voce ottimizzato. +
    • +
+
+Con questo pacchetto, la qualità delle istruzioni vocali di navigazione sarà migliore. +
+ + + + + +
+Növelheti a navigációs instrukciók beszédminőségét, ha letölti a továbbfejlesztett hangcsomagot.


+Ehhez kövesse az alábbi utasításokat:
+
    +
  • + Nyissa meg készülékén a Beállításokat. +
    • +
  • + Keresse meg az Általános menüpontot. +
    • +
  • + Koppintson a Kisegítő lehetőségekre. +
    • +
  • + Koppintson a Beszéd. +
    • +
  • + Kapcsolja be a Kijelölés kimondása funkciót. +
    • +
  • + Koppintson a Beszédhangokra. +
    • +
  • + Válassza ki a nyelvet. +
    • +
  • + Töltse le a továbbfejlesztett hangcsomagot. +
    • +
+
+Ettől fogva a navigációs instrukciók beszédminősége optimálisabb lesz. +
+ +
+Pentru a îmbunătăți calitatea fluxul verbal al instrucțiunilor de navigare, vă rugăm să descărcați un pachet de voce îmbunătățit.


+Pentru a face acest lucru, urmați instrucțiunile de mai jos:
+
    +
  • + Deschideți Configurări. +
    • +
  • + Mergeți la secțiunea General. +
    • +
  • + Apăsați pe Accesibilitate. +
    • +
  • + Apăsați pe Vorbire. +
    • +
  • + Porniți Selectare vorbire. +
    • +
  • + Apăsați pe Voci. +
    • +
  • + Selectați limba dorită. +
    • +
  • + Descărcați un pachet de voce îmbunătățit. +
    • +
+
+Acum, calitatea fluxului verbal al instrucțiunilor de navigare va fi mai bună. +
+ +
+音声案内の質を上させるには、ボイスパッケージをダウンロードしてください。


+ボイスパッケージのダウンロードは、次の手順に従ってください。
+
    +
  • + デバイスの 設定 を開きます。 +
    • +
  • + 一般セクションに移動します。 +
    • +
  • + アクセスビリティをタップします。 +
    • +
  • + Нスピーチをタップします。 +
    • +
  • + 選択項目の 読み上げをオンにします。 +
    • +
  • + 声をタップします。 +
    • +
  • + 言語を選択します。 +
    • +
  • + ボイスパッケージをダウンロードします。 +
    • +
+
+これで音声案内の質が上がります。 +
+ +
+For at forbedre kvaliteten af stemmenavigationsinstruktionerne, venligst download en forbedret stemmepakke.


+For at gøre dette, følg følgende instruktioner:
+
    +
  • + Åbn enhedens Indstillinger. +
    • +
  • + Gå til Generelt sektionen. +
    • +
  • + Tryk på Tilgængelighed. +
    • +
  • + Tryk på Tale. +
    • +
  • + Aktivér Oplæsning. +
    • +
  • + Tryk på Stemmer. +
    • +
  • + Vælg dit sprog. +
    • +
  • + Download en forbedret stemmepakke. +
    • +
+
+Nu vil stemmenavigeringsinstruktionerne være bedre. +
+ +
+Para mejorar la calidad de las instrucciones habladas de navegación, por favor, descarga un paquete optimizado de voz.


+Para ello, sigue estas instrucciones:
+
    +
  • + Abre los Ajustes del dispositivo. +
    • +
  • + Ve a la Sección General. +
    • +
  • + Pulsa en Accesibilidad. +
    • +
  • + Pulsa en Discurso. +
    • +
  • + Activa la Selección Oral. +
    • +
  • + Pulsa en Voces. +
    • +
  • + Выберите ваш язык. +
    • +
  • + Selecciona tu idioma. +
    • +
+
+Descarga un paquete optimizado de voz. +
+ + +
+Per tal de millorar la qualitat vocal de les instruccions de navegació, descarregueu, si us plau, un programari vocal d'alta definició.


+Per a fer-ho, seguiu les instruccions següents:
+
    +
  • + Al vostre aparell, aneu dins Ajustaments. +
    • +
  • + Aneu a la secció General. +
    • +
  • + Entreu dins Accessibilitat. +
    • +
  • + Entreu dins Paraula. +
    • +
  • + Activeu Enunciar la selecció. +
    • +
  • + Entreu dins Veu. +
    • +
  • + Seleccioneu el vostre idioma. +
    • +
  • + Descarregueu un programari vocal d'alta definició. +
    • +
+
+D'aquesta manera, es millorarà la qualitat vocal de les instruccions de navegació. +
+ +
+Parantaaksesi navigointijärjestelmän puheentunnistusta, ole hyvä ja lataa paranneltu puhepaketti.


+Ladataksesi paketin, seuraa oheista ohjetta:
+
    +
  • + Avaa laitteesi Asetukset -valikko. +
    • +
  • + Siirry kohtaan Yleiset. +
    • +
  • + Napsauta Helppokäyttötoiminnot. +
    • +
  • + Napsauta Puhe. +
    • +
  • + Ota Kielivalinta käyttöön. +
    • +
  • + Napsauta Äänet. +
    • +
  • + Valitse kielesi. +
    • +
  • + Lataa paranneltu puhepaketti. +
    • +
+
+Paketin latauksen jälkeen on navigointijärjestelmäsi puheentunnistusta entistäkin parempi. +
+ + +
+Kako bi poboljšali kvalitetu govora uputa za vožnju, molimo vas da preuzmete poboljšani glasovni paket.


+Kako biste to učinili slijedite sljedeće upute:
+
    +
  • + Otvorite Postavke uređaja. +
    • +
  • + Idite na dio Općenito. +
    • +
  • + Dotaknite Pristupačnost. +
    • +
  • + Dotaknite Govor. +
    • +
  • + Uključite Odabir Govora. +
    • +
  • + Dotaknite Glasovi. +
    • +
  • + Odaberite vaš jezik. +
    • +
  • + Preuzmite poboljšani glasovni paket. +
    • +
+
+Sada će kvaliteta govora uputa za vožnju biti bolja. +
+ +
+Untuk meningkatkan kualitas ucapan petunjuk navigasi, silakan unduh paket suara yang disempurnakan.


+Untuk melakukannya, ikuti petunjuk berikut ini:
+
    +
  • + Buka Pengaturan perangkat. +
    • +
  • + Kunjungi bagian Umum. +
    • +
  • + Ketuk Aksesibilitas. +
    • +
  • + Ketuk Ucapan. +
    • +
  • + Aktifkan Pemilihan Ucapan. +
    • +
  • + Ketuk Suara. +
    • +
  • + Pilih bahasa Anda. +
    • +
  • + Unduh paket suara yang disempurnakan. +
    • +
+
+Sekarang kualitas ucapan petunjuk navigasi akan menjadi lebih baik. +
+ +
+네비게이션 음성 명령 지침의 품질을 향상하려면, 강화된 음성 패키지를 다운로드하십시오.


+이를 실행하려면, 다음 지침을 따르십시오:
+
    +
  • + 장치 설정 을 엽니 다. +
    • +
  • + 일반 섹션으로 이동합니다. +
    • +
  • + 접근성을 누릅니다. +
    • +
  • + 음성 명령을 누릅니다. +
    • +
  • + 음성 명령 선택 을 켭니다. +
    • +
  • + 음성을 누릅니다. +
    • +
  • + 언어를 선택합니다. +
    • +
  • + 향상된 음성 패키지를 다운로드합니다. +
    • +
+
+지금 내비게이션 음성 명령 지침의 품질이 더 좋아졌습니다. +
+ +
+Para melhorar a qualidade das instruções verbais de navegação, por favor, baixe um pacote aprimorado de voz.


+Para fazer isso, siga as instruções a seguir:
+
    +
  • + Abra os Ajustes do dispositivo. +
    • +
  • + Acesse a seção Geral. +
    • +
  • + Toque em Acessibilidade. +
    • +
  • + Toque em Fala. +
    • +
  • + Ative a opção Falar Seleção. +
    • +
  • + Toque em Vozes. +
    • +
  • + Selecione o seu idioma. +
    • +
  • + Baixe um pacote aprimorado de voz. +
    • +
+
+Agora, a qualidade das instruções verbais de navegação será melhor. +
+ +
+Ak chcete zlepšiť kvalitu hovorenia navigačných pokynov, prosím, stiahnite si vylepšený hlasový balíček.


+V záujme toho postupujte podľa nasledujúcich pokynov:
+
    +
  • + Otvorte Nastavenia zariadenia. +
    • +
  • + ПPrejdite do časti Všeobecné. +
    • +
  • + Kliknite na Dostupnosť. +
    • +
  • + Kliknite na Reč. +
    • +
  • + Zapnite Výber hovoru. +
    • +
  • + Kliknite na Hlasy. +
    • +
  • + Vyberte si jazyk. +
    • +
  • + Stiahnite si vylepšený hlasový balíček. +
    • +
+
+Teraz bude kvalita hovorenia navigačných pokynov lepšia. +
+ +
+Kuinua ubora wa kuongea maelekezo ya urambazaji, tafadhali, pakua kuimarisha mfuko wa sauti ulioimarishwa.


+Kutenda hivyo, fuata maagizo yafuatayo:
+
    +
  • + Fungua kifaa Mipangilio. +
    • +
  • + Enenda kwa Jumla sehemu. +
    • +
  • + Gonga kwenye Ufikiaji. +
    • +
  • + Gonga kwenye Hotuba. +
    • +
  • + Pindua Kusema uteuzi juu ya. +
    • +
  • + Gonga kwenye Sauti. +
    • +
  • + Chagua lugha yako. +
    • +
  • + Pakua mfuko cha sauti uliomarishwa +
    • +
+
+Sasa ubora wa kuongea maelekezo ya urambazaji utakuwa ni bora zaidi. +
+ +
+เพื่อปรับปรุงคุณภาพของการแนะนำการนำทางด้วยการพูด โปรดดาวน์โหลดแพ็กเกจเสียงพูดแบบปรับประสิทธิภาพ


+เพื่อดำเนินการนั้น ทำตามคำแนะนำดังต่อไปนี้:
+
    +
  • + เปิด การตั้งค่า อุปกรณ์ +
    • +
  • + ไปยังส่วน ทั่วไป +
    • +
  • + แตะบน การเข้าถึง +
    • +
  • + แตะบน การพูด +
    • +
  • + เปิดตัวเลือกใน การพูด +
    • +
  • + แตะบน เสียงพูด +
    • +
  • + เลือกภาษาของคุณ +
    • +
  • + ดาวน์โหลดแพ็กเกจเสียงพูดแบบปรับประสิทธิภาพ +
    • +
+
+ตอนนี้คำแนะนำการนำทางด้วยการพูดจะดียิ่งขึ้น +
+ +
+若要提高語音導航指示的品質，請下載一個增強語音包。


+若要這樣做，請遵循以下說明：
+
    +
  • + 打開設備 設置. +
    • +
  • + 前往 一般 部分。 +
    • +
  • + 點擊 可及性. +
    • +
  • + 點擊 語音. +
    • +
  • + 開啟 語音選擇. +
    • +
  • + 點擊 聲音. +
    • +
  • + 選擇您的語言。 +
    • +
  • + 下載增強語音包。 +
    • +
+
+現在，語音導航指示的品質將會更好。 +
+ +
+若要提高语音导航指示的品质，请下载一个增强语音包。


+若要这样做，请遵循以下说明：
+
    +
  • + 打开设备 设置。 +
    • +
  • + 前往 一般 部分。 +
    • +
  • + 点击 可及性。 +
    • +
  • + 点击 语音。 +
    • +
  • + 开启 语音选择。 +
    • +
  • + 点击 声音. +
    • +
  • + 选择您的语言。 +
    • +
  • + 下载增强语音包。 +
    • +
+
+现在，语音导航指示的质量将会更好。 +
+ + + + diff --git a/iphone/Common/WebViewController.mm b/iphone/Common/WebViewController.mm index b1d42c3f34..61519defa0 100644 --- a/iphone/Common/WebViewController.mm +++ b/iphone/Common/WebViewController.mm @@ -35,6 +35,7 @@ UIWebView * webView = [[UIWebView alloc] initWithFrame:frame]; webView.autoresizesSubviews = YES; webView.autoresizingMask = (UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth); + webView.backgroundColor = [UIColor whiteColor]; webView.delegate = self; if (self.m_htmlText) diff --git a/iphone/Maps/MWMTTSSettingsViewController.mm b/iphone/Maps/MWMTTSSettingsViewController.mm index 248a281145..bb888bb7f0 100644 --- a/iphone/Maps/MWMTTSSettingsViewController.mm +++ b/iphone/Maps/MWMTTSSettingsViewController.mm @@ -3,6 +3,7 @@ #import "MWMTTSSettingsViewController.h" #import "SelectableCell.h" #import "Statistics.h" +#import "WebViewController.h" #import static NSString * kSelectTTSLanguageSegueName = @"TTSLanguage"; @@ -83,7 +84,7 @@ using namespace std; - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 1; + return 2; } - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section @@ -129,10 +130,14 @@ using namespace std; [tableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationFade]; } } -#warning need to add help -// else -// { -// } + else if (indexPath.section == 1) + { + NSString * path = [[NSBundle mainBundle] pathForResource:@"tts-how-to-set-up-voice" ofType:@"html"]; + NSString * html = [[NSString alloc] initWithContentsOfFile:path encoding:NSUTF8StringEncoding error:nil]; + NSURL * baseURL = [NSURL fileURLWithPath:path]; + WebViewController * vc = [[WebViewController alloc] initWithHtml:html baseUrl:baseURL andTitleOrNil:L(@"pref_tts_how_to_set_up_voice")]; + [self.navigationController pushViewController:vc animated:YES]; + } } @end diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index aae7be04d5..eea22049c6 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -54,6 +54,11 @@ 3472747B1B0F4FF100756B37 /* me.maps.production.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = 3472747A1B0F4FF100756B37 /* me.maps.production.entitlements */; }; 3472EC051B4D44BE0085CB79 /* UIFont+MapsMeFonts.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3472EC041B4D44BE0085CB79 /* UIFont+MapsMeFonts.mm */; }; 34751E9E1BFB8E73005299B7 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97C9864B186C5EAA00AF7E9E /* MediaPlayer.framework */; }; + 3476B8CC1BFDCB6700874594 /* MWMTTSSettingsViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F668F6551BCD4507002D6FFC /* MWMTTSSettingsViewController.mm */; }; + 3476B8DC1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */ = {isa = PBXBuildFile; fileRef = 3476B8D51BFDD30B00874594 /* tts-how-to-set-up-voice.html */; }; + 3476B8DD1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */ = {isa = PBXBuildFile; fileRef = 3476B8D51BFDD30B00874594 /* tts-how-to-set-up-voice.html */; }; + 3476B8E01BFDD33A00874594 /* tts-how-to-set-up-voice-img in Resources */ = {isa = PBXBuildFile; fileRef = 3476B8DF1BFDD33A00874594 /* tts-how-to-set-up-voice-img */; }; + 3476B8E11BFDD33A00874594 /* tts-how-to-set-up-voice-img in Resources */ = {isa = PBXBuildFile; fileRef = 3476B8DF1BFDD33A00874594 /* tts-how-to-set-up-voice-img */; }; 347BAC691B733D540010FF78 /* MWMPedestrianShareAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 347BAC681B733D540010FF78 /* MWMPedestrianShareAlert.xib */; }; 347BAC6E1B736BA70010FF78 /* MWMSharePedestrianRoutesToastActivityItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 347BAC6D1B736BA70010FF78 /* MWMSharePedestrianRoutesToastActivityItem.mm */; }; 347FDDA11BB59B4E00871410 /* Mapsme.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 347FDDA01BB59B4E00871410 /* Mapsme.storyboard */; }; @@ -890,6 +895,8 @@ 3472747A1B0F4FF100756B37 /* me.maps.production.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = me.maps.production.entitlements; sourceTree = ""; }; 3472EC031B4D44BE0085CB79 /* UIFont+MapsMeFonts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIFont+MapsMeFonts.h"; sourceTree = ""; }; 3472EC041B4D44BE0085CB79 /* UIFont+MapsMeFonts.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "UIFont+MapsMeFonts.mm"; sourceTree = ""; }; + 3476B8D51BFDD30B00874594 /* tts-how-to-set-up-voice.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = "tts-how-to-set-up-voice.html"; path = "../../data/tts-how-to-set-up-voice.html"; sourceTree = ""; }; + 3476B8DF1BFDD33A00874594 /* tts-how-to-set-up-voice-img */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "tts-how-to-set-up-voice-img"; path = "../../data/tts-how-to-set-up-voice-img"; sourceTree = ""; }; 347BAC681B733D540010FF78 /* MWMPedestrianShareAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPedestrianShareAlert.xib; sourceTree = ""; }; 347BAC6C1B736BA70010FF78 /* MWMSharePedestrianRoutesToastActivityItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSharePedestrianRoutesToastActivityItem.h; sourceTree = ""; }; 347BAC6D1B736BA70010FF78 /* MWMSharePedestrianRoutesToastActivityItem.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSharePedestrianRoutesToastActivityItem.mm; sourceTree = ""; }; @@ -2665,6 +2672,8 @@ FA065FC61286143F00FEA989 /* External Resources */ = { isa = PBXGroup; children = ( + 3476B8D51BFDD30B00874594 /* tts-how-to-set-up-voice.html */, + 3476B8DF1BFDD33A00874594 /* tts-how-to-set-up-voice-img */, 4A23D1561B8B4DD700D4EB6F /* drules_proto_clear.bin */, 4A23D1571B8B4DD700D4EB6F /* resources-6plus_clear */, 4A23D1581B8B4DD700D4EB6F /* resources-mdpi_clear */, @@ -3008,6 +3017,7 @@ EEA61604134C496A003A9827 /* 04_padauk.ttf in Resources */, EEA61605134C496A003A9827 /* 05_khmeros.ttf in Resources */, 347274731B0F4EE000756B37 /* me.maps.entitlements in Resources */, + 3476B8E01BFDD33A00874594 /* tts-how-to-set-up-voice-img in Resources */, EE164811135CEE4A003B8A3E /* 06_code2000.ttf in Resources */, FAAFD697139D9BE2000AE70C /* categories.txt in Resources */, FA64D9A913F975AD00350ECF /* types.txt in Resources */, @@ -3021,6 +3031,7 @@ B0DFE6311A1B78A200B6C35E /* LocalNotifications.plist in Resources */, 34B82ABB1B837FFD00180497 /* MWMSearchHistoryRequestCell.xib in Resources */, 34B6CF5D1BBBFC6B009203C6 /* LaunchScreen.storyboard in Resources */, + 3476B8DC1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */, 978D4A31199A11E600D72CA7 /* faq.html in Resources */, F66A8FB21B0A0954001B9C97 /* PlacePageView.xib in Resources */, 97FC99E019C1A2CD00C1CF98 /* resources-xxhdpi in Resources */, @@ -3155,6 +3166,7 @@ 6741A9581BF340DE002C974C /* 04_padauk.ttf in Resources */, 6741A9591BF340DE002C974C /* 05_khmeros.ttf in Resources */, 6741A95A1BF340DE002C974C /* me.maps.entitlements in Resources */, + 3476B8E11BFDD33A00874594 /* tts-how-to-set-up-voice-img in Resources */, 6741A95B1BF340DE002C974C /* 06_code2000.ttf in Resources */, 6741A95C1BF340DE002C974C /* categories.txt in Resources */, 6741A95D1BF340DE002C974C /* types.txt in Resources */, @@ -3168,6 +3180,7 @@ 6741A9651BF340DE002C974C /* LocalNotifications.plist in Resources */, 6741A9661BF340DE002C974C /* MWMSearchHistoryRequestCell.xib in Resources */, 6741A9671BF340DE002C974C /* LaunchScreen.storyboard in Resources */, + 3476B8DD1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */, 6741A9681BF340DE002C974C /* faq.html in Resources */, 6741A9691BF340DE002C974C /* PlacePageView.xib in Resources */, 6741A96A1BF340DE002C974C /* resources-xxhdpi in Resources */, @@ -3539,6 +3552,7 @@ 6741A9D11BF340DE002C974C /* RenderContext.mm in Sources */, 6741A9D21BF340DE002C974C /* MWMBookmarkDescriptionViewController.mm in Sources */, 6741A9D31BF340DE002C974C /* MWMDownloadMapRequestView.mm in Sources */, + 3476B8CC1BFDCB6700874594 /* MWMTTSSettingsViewController.mm in Sources */, 6741A9D41BF340DE002C974C /* MWMAlertViewController.mm in Sources */, 6741A9D51BF340DE002C974C /* WebViewController.mm in Sources */, 6741A9D61BF340DE002C974C /* MWMPlacePageNavigationBar.mm in Sources */, From b75d2ddccb4cc301750d74c1f488fa78632f76ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=93=D1=80=D0=B5=D1=87=D1=83?= =?UTF-8?q?=D1=85=D0=B8=D0=BD?= Date: Thu, 19 Nov 2015 14:18:00 +0300 Subject: [PATCH 3/3] [ios] Unified html settings. --- data/copyright.html | 8 +++++++- data/eula.html | 6 ++++++ data/faq.html | 5 +++++ data/welcome.html | 9 +++++++++ 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/data/copyright.html b/data/copyright.html index f1d0943b7b..414a9b4513 100644 --- a/data/copyright.html +++ b/data/copyright.html @@ -2,7 +2,8 @@ - + + Copyright