diff options
Diffstat (limited to 'main')
26 files changed, 59 insertions, 72 deletions
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml index 95bbe8e..27b5081 100644 --- a/main/AndroidManifest.xml +++ b/main/AndroidManifest.xml @@ -25,7 +25,20 @@ android:backupAgent="cgeo.geocaching.backup.CentralBackupAgent" android:allowBackup="true" > <uses-library android:name="com.google.android.maps" android:required="false" /> - <meta-data + + <!-- Samsung Multi-Window support --> + <uses-library android:name="com.sec.android.app.multiwindow" android:required="false" /> + <meta-data + android:name="com.sec.android.support.multiwindow" + android:value="true" /> + <meta-data + android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" + android:resource="@dimen/app_defaultsize_w" /> + <meta-data + android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" + android:resource="@dimen/app_defaultsize_h" /> + + <meta-data android:name="android.app.default_searchable" android:value=".SearchActivity" /> <meta-data @@ -40,6 +53,7 @@ <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> + <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" /> </intent-filter> </activity> <activity diff --git a/main/res/layout/cache_information_item.xml b/main/res/layout/cache_information_item.xml index a1d7d76..5d53340 100644 --- a/main/res/layout/cache_information_item.xml +++ b/main/res/layout/cache_information_item.xml @@ -57,7 +57,7 @@ android:gravity="center_vertical" android:textColor="?text_color_grey" android:textIsSelectable="false" - android:textSize="11sp" + android:textSize="12sp" android:visibility="gone" /> </RelativeLayout>
\ No newline at end of file diff --git a/main/res/layout/touch.xml b/main/res/layout/touch.xml index 03d4881..7791409 100644 --- a/main/res/layout/touch.xml +++ b/main/res/layout/touch.xml @@ -72,7 +72,7 @@ android:layout_height="wrap_content" android:layout_gravity="left" android:gravity="center" - android:padding="1px" /> + android:padding="2sp" /> <TextView android:layout_width="wrap_content" diff --git a/main/res/layout/visit.xml b/main/res/layout/visit.xml index f48c370..e0294da 100644 --- a/main/res/layout/visit.xml +++ b/main/res/layout/visit.xml @@ -73,7 +73,7 @@ android:layout_height="wrap_content" android:layout_gravity="left" android:gravity="center" - android:padding="1px" /> + android:padding="2sp" /> <TextView android:layout_width="wrap_content" diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml index f29f7e6..715f949 100644 --- a/main/res/values-cs/strings.xml +++ b/main/res/values-cs/strings.xml @@ -10,7 +10,6 @@ <string name="settings">Nastavení</string> <string name="helpers">Užitečné aplikace</string> <string name="about">O aplikaci</string> - <string name="helper">Chceš zjistit více o <b>c:geo</b>?\nMrkni na snadno čitelný návod.</string> <string name="latitude">Zeměpisná šířka</string> <string name="longitude">Zeměpisná délka</string> @@ -154,7 +153,6 @@ <string name="err_detail_cache_find">c:geo nemůže najít geokeš</string> <string name="err_detail_cache_find_some">c:geo nemůže najít tuto geokeš.</string> <string name="err_detail_cache_find_any">c:geo nemůže najít žádnou geokeš.</string> - <string name="err_detail_cache_find_next">c:geo nemůže najít další geokeše.</string> <string name="err_detail_cache_forgot">c:geo zapomnělo, jakou keš chceš zobrazit.</string> <string name="err_detail_google_maps_limit_reached">c:geo nemůže stáhnout statické mapy. Možná byl dosažen limit Google map.</string> <string name="err_detail_no_spoiler">c:geo nenašlo žádný obrázek pro tuto keš.</string> @@ -267,7 +265,6 @@ <string name="caches_downloading">Stahování keší…\nETA:</string> <string name="caches_eta_ltm">Méně než minutu</string> <plurals name="caches_eta_mins"> - <item quantity="zero">minut</item> <item quantity="one">minuta</item> <item quantity="few">minuty</item> <item quantity="other">minuty</item> @@ -492,7 +489,6 @@ <!-- cache --> <plurals name="cache_counts"> - <item quantity="zero">Žádná keš</item> <item quantity="one">Jedna keš</item> <item quantity="other">%1$d keší</item> </plurals> diff --git a/main/res/values-da/strings.xml b/main/res/values-da/strings.xml index f621f9c..3ff6756 100644 --- a/main/res/values-da/strings.xml +++ b/main/res/values-da/strings.xml @@ -165,9 +165,8 @@ <!-- cache --> <plurals name="cache_counts"> - <item quantity="zero">Ingen cache</item> <item quantity="one">En cache</item> - <item quantity="other">%1$d Cacher</item> + <item quantity="other">%1$d cacher</item> </plurals> <string name="cache_offline">Offline</string> <string name="cache_offline_refresh">Genindlæs</string> diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml index 69838db..d5ed34a 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -10,7 +10,6 @@ <string name="settings">Einstellungen</string> <string name="helpers">Nützliche Apps</string> <string name="about">Über c:geo</string> - <string name="helper">Um mehr über <b>c:geo</b> zu erfahren\neinfach die Bedienungsanleitung öffnen.</string> <string name="latitude">Breitengrad</string> <string name="longitude">Längengrad</string> @@ -163,7 +162,6 @@ <string name="err_detail_cache_find">c:geo konnte keinen Cache finden.</string> <string name="err_detail_cache_find_some">c:geo konnte diesen Cache nicht finden.</string> <string name="err_detail_cache_find_any">c:geo konnte keine Caches finden.</string> - <string name="err_detail_cache_find_next">c:geo konnte die nächsten Caches nicht finden.</string> <string name="err_detail_cache_forgot">c:geo hat vergessen, welcher Cache aufgerufen werden sollte.</string> <string name="err_detail_google_maps_limit_reached">c:geo kann die statischen Karten nicht herunterladen. Google Maps Limit könnte erreicht sein.</string> <string name="err_detail_no_spoiler">c:geo hat kein Hinweisbild für diesen Cache gefunden.</string> @@ -276,7 +274,6 @@ <string name="caches_downloading">Lade Caches…\nGeschätzte Zeit: </string> <string name="caches_eta_ltm">Weniger als eine Minute</string> <plurals name="caches_eta_mins"> - <item quantity="zero">Minuten</item> <item quantity="one">Minute</item> <item quantity="other">Minuten</item> </plurals> @@ -516,7 +513,6 @@ <!-- cache --> <plurals name="cache_counts"> - <item quantity="zero">Kein Cache</item> <item quantity="one">Ein Cache</item> <item quantity="other">%1$d Caches</item> </plurals> diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml index 4373be0..f5a84ea 100644 --- a/main/res/values-es/strings.xml +++ b/main/res/values-es/strings.xml @@ -10,7 +10,6 @@ <string name="settings">Ajustes</string> <string name="helpers">¿Qué instalar?</string> <string name="about">Sobre c:geo</string> - <string name="helper">Si quieres aprender cosas sobre <b>c:geo</b>?\nEcha un ojo a nuestro manual.</string> <string name="latitude">Latitud</string> <string name="longitude">Longitud</string> @@ -151,7 +150,6 @@ <string name="err_detail_cache_find">Lo siento, c:geo no puede encontrar escondites</string> <string name="err_detail_cache_find_some">Lo siento, c:geo no puede encontrar ese escondite.</string> <string name="err_detail_cache_find_any">Lo siento, c:geo no puede encontrar algunos escondites.</string> - <string name="err_detail_cache_find_next">Lo siento, c:geo no puede encontrar los siguientes escondites.</string> <string name="err_detail_cache_forgot">Lo siento, c:geo ha olvidado el escondite que quieres.</string> <string name="err_detail_no_spoiler">c:geo no ha encontrado imágenes/pista para este escondite.</string> <string name="err_detail_no_map_static">c:geo no ha encontrado mapas estáticos para este escondite.</string> @@ -410,7 +408,6 @@ <!-- cache --> <plurals name="cache_counts"> - <item quantity="zero">Sin escondites</item> <item quantity="one">Un escondite</item> <item quantity="other">%1$d Escondites</item> </plurals> diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml index 9f25083..69fa863 100644 --- a/main/res/values-fr/strings.xml +++ b/main/res/values-fr/strings.xml @@ -10,7 +10,6 @@ <string name="settings">Paramètres</string> <string name="helpers">Aide à l\'installation</string> <string name="about">À propos de c:geo</string> - <string name="helper">Voulez-vous en savoir plus au sujet de <b>c:geo</b> ?\nLisez notre manuel (en anglais).</string> <string name="latitude">Latitude</string> <string name="longitude">Longitude</string> @@ -163,7 +162,6 @@ <string name="err_detail_cache_find">c:geo ne peut pas trouver de caches</string> <string name="err_detail_cache_find_some">c:geo ne peut pas trouver cette cache.</string> <string name="err_detail_cache_find_any">c:geo ne peut pas trouver de caches.</string> - <string name="err_detail_cache_find_next">c:geo ne peut pas trouver les caches suivantes.</string> <string name="err_detail_cache_forgot">c:geo a oublié la cache demandée.</string> <string name="err_detail_google_maps_limit_reached">c:geo n\'a pas pu charger les cartes statiques. La limite de Google Maps est peut être temporairement atteinte.</string> <string name="err_detail_no_spoiler">c:geo n\'a pas trouvé d\'image indice pour cette cache.</string> @@ -499,7 +497,6 @@ <!-- cache --> <plurals name="cache_counts"> - <item quantity="zero">aucune cache</item> <item quantity="one">une cache</item> <item quantity="other">%1$d caches</item> </plurals> diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml index 930b18f..17eb247 100644 --- a/main/res/values-hu/strings.xml +++ b/main/res/values-hu/strings.xml @@ -10,7 +10,6 @@ <string name="settings">Beállítások</string> <string name="helpers">Hasznos segédprogramok</string> <string name="about">A c:geo-ról</string> - <string name="helper">Szeretnél többet megtudni a <b>c:geo</b>-ról?\nNézd meg a kézikönyvünket.</string> <string name="latitude">Szélesség</string> <string name="longitude">Hosszúság</string> @@ -141,7 +140,6 @@ <string name="err_detail_cache_find">Sajnáljuk, a c:geo nem találja a geoládát.</string> <string name="err_detail_cache_find_some">Sajnáljuk, a c:geo nem találja azt a geoládát.</string> <string name="err_detail_cache_find_any">Sajnáljuk, a c:geo nem talál geoládákat.</string> - <string name="err_detail_cache_find_next">Sajnáljuk, a c:geo nem találja a következő geoládákat.</string> <string name="err_detail_cache_forgot">Sajnáljuk, a c:geo elfelejtette melyik geoládát szeretnéd.</string> <string name="err_detail_google_maps_limit_reached">A c:geonak nem sikerült letölteni a statikus térképeket. Lehet hogy elérted a Google Maps limitjét.</string> <string name="err_detail_no_spoiler">A c:geo nem talált spoiler képeket ehhez a ládához.</string> @@ -248,10 +246,6 @@ <string name="caches_more_caches_currently">jelenleg</string> <string name="caches_downloading">Ládák letöltése…\nkb.: </string> <string name="caches_eta_ltm">Kevesebb mint egy perc</string> - <plurals name="caches_eta_mins"> - <item quantity="one">minute</item> - <item quantity="other">perc</item> - </plurals> <string name="caches_store_offline">Offlineba mentés</string> <string name="caches_store_selected">Kijelöltek mentése</string> <string name="caches_history">Előzmények</string> @@ -463,8 +457,6 @@ <!-- cache --> <plurals name="cache_counts"> - <item quantity="zero">Nincs megtalálás</item> - <item quantity="one">Megtalálás</item> <item quantity="other">%1$d Megtalálások</item> </plurals> <string name="cache_offline">Offline</string> @@ -502,7 +494,6 @@ <string name="cache_waypoints">Útpontok</string> <plurals name="waypoints"> - <item quantity="one">1 Útpontok</item> <item quantity="other">%d Útpontok</item> </plurals> <string name="cache_waypoints_add">Útpont hozzáadása</string> @@ -957,7 +948,6 @@ <string name="clipboard_copy_ok">Kimásolva a vágólapra</string> <plurals name="days_ago"> - <item quantity="one">tegnap</item> <item quantity="other">%d nappal ezelőtt</item> </plurals> </resources> diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml index 98fdf5f..aeb2e2d 100644 --- a/main/res/values-it/strings.xml +++ b/main/res/values-it/strings.xml @@ -10,7 +10,6 @@ <string name="settings">Settaggi</string> <string name="helpers">Apps utili</string> <string name="about">Info c:geo</string> - <string name="helper">Vuoi imparare di più su <b>c:geo</b>?\nLeggi il semplice manuale.</string> <string name="latitude">Latitudine</string> <string name="longitude">Longitudine</string> @@ -162,7 +161,6 @@ <string name="err_detail_cache_find">c:geo non trova il geocache</string> <string name="err_detail_cache_find_some">c:geo non trova quel geocache.</string> <string name="err_detail_cache_find_any">c:geo non trova nessun geocache.</string> - <string name="err_detail_cache_find_next">c:geo non trova il prossimo geocache.</string> <string name="err_detail_cache_forgot">c:geo ha dimenticato quale geocache hai richiesto.</string> <string name="err_detail_google_maps_limit_reached">c:geo non riesce a scaricare le mappe statiche. Forse raggiunto il limite di google map. Riprova domani.</string> <string name="err_detail_no_spoiler">c:geo non trova alcuna immagine spoiler per questo cache.</string> @@ -494,9 +492,8 @@ <!-- cache --> <plurals name="cache_counts"> - <item quantity="zero">Nessun cache</item> <item quantity="one">Un cache</item> - <item quantity="other">%1$d Cache</item> + <item quantity="other">%1$d cache</item> </plurals> <string name="cache_offline">Offline</string> <string name="cache_offline_refresh">Aggiorna</string> diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml index b88577b..9e19b84 100644 --- a/main/res/values-ja/strings.xml +++ b/main/res/values-ja/strings.xml @@ -10,7 +10,6 @@ <string name="settings">設定</string> <string name="helpers">役に立つアプリ</string> <string name="about">c:geoについて</string> - <string name="helper"><b>c:geo</b>についてもっと知りたい?\nマニュアル(英語)を読んでね。</string> <string name="latitude">緯度</string> <string name="longitude">経度</string> @@ -146,7 +145,6 @@ <string name="err_detail_cache_find">キャッシュ情報が見つかりません。</string> <string name="err_detail_cache_find_some">キャッシュ情報が見つかりません。</string> <string name="err_detail_cache_find_any">キャッシュ情報が一つも見つかりません。</string> - <string name="err_detail_cache_find_next">次のキャッシュ情報が見つかりません。</string> <string name="err_detail_cache_forgot">c:geo forgot which geocache you want.</string> <string name="err_detail_google_maps_limit_reached">オフライン用の地図のダウンロードに失敗しました。大量のデータをダウンロードしたと判断されGoogleマップ側に制限されたかもしれません。</string> <string name="err_detail_no_spoiler">このキャッシュのスポイラー画像を見つけることができませんでした。</string> @@ -255,7 +253,6 @@ <string name="caches_downloading">キャッシュ情報をダウンロード中…\n残り時間: </string> <string name="caches_eta_ltm">1分以内</string> <plurals name="caches_eta_mins"> - <item quantity="one">分</item> <item quantity="other">分</item> </plurals> <string name="caches_store_offline">オフライン用に保存</string> @@ -472,8 +469,6 @@ <!-- cache --> <plurals name="cache_counts"> - <item quantity="zero">キャッシュがありません</item> - <item quantity="one">1つのキャッシュ</item> <item quantity="other">%1$d 個のキャッシュ</item> </plurals> <string name="cache_offline">オフライン</string> @@ -511,7 +506,6 @@ <string name="cache_waypoints">ウェイポイント</string> <plurals name="waypoints"> - <item quantity="one">1 ウェイポイント</item> <item quantity="other">%d ウェイポイント</item> </plurals> <string name="cache_waypoints_add">ウェイポイントを追加</string> @@ -989,7 +983,6 @@ <string name="clipboard_copy_ok">クリップボードにコピーしました</string> <plurals name="days_ago"> - <item quantity="one">昨日</item> <item quantity="other">%d日前</item> </plurals> </resources> diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml index 12823e5..1319137 100644 --- a/main/res/values-nb/strings.xml +++ b/main/res/values-nb/strings.xml @@ -96,7 +96,6 @@ <string name="err_detail_cache_find">Beklager, c:geo klarte ikke å finne geocachen</string> <string name="err_detail_cache_find_some">Beklager, c:geo klarte ikke å finne den forespurte cachen.</string> <string name="err_detail_cache_find_any">Beklager, c:geo klarte ikke finne geocacher..</string> - <string name="err_detail_cache_find_next">Beklager, c:geo klarte ikke å finne den neste geocachen.</string> <string name="err_detail_cache_forgot">Beklager, c:geo glemte hvilken cache du ønsket.</string> <string name="err_detail_no_spoiler">c:geo fant ingen bilder for denne cachen.</string> <string name="err_detail_no_map_static">c:geo fant ingen statiske kart for denne cachen.</string> @@ -236,9 +235,8 @@ <!-- cache --> <plurals name="cache_counts"> - <item quantity="zero">Ingen cacher</item> <item quantity="one">Én cache</item> - <item quantity="other">%1$d Cacher</item> + <item quantity="other">%1$d cacher</item> </plurals> <string name="cache_offline">Offline</string> <string name="cache_offline_refresh">Oppdater</string> diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml index c827848..8c92509 100644 --- a/main/res/values-nl/strings.xml +++ b/main/res/values-nl/strings.xml @@ -10,7 +10,6 @@ <string name="settings">Instellingen</string> <string name="helpers">Wat te installeren</string> <string name="about">Over c:geo</string> - <string name="helper">Wil je meer weten over <b>c:geo</b>?\nKijk dan in de (makkelijk te lezen) handleiding.</string> <string name="latitude">Breedtegraad</string> <string name="longitude">Lengtegraad</string> @@ -146,7 +145,6 @@ <string name="err_detail_cache_find">Sorry, c:geo kan de geocache niet vinden.</string> <string name="err_detail_cache_find_some">Sorry, c:geo kan die geocache niet vinden.</string> <string name="err_detail_cache_find_any">Sorry, c:geo kan geen enkele geocache vinden.</string> - <string name="err_detail_cache_find_next">Sorry, c:geo kan de volgende cache niet vinden.</string> <string name="err_detail_cache_forgot">Sorry, c:geo is kwijt welke geocache je wilde openen.</string> <string name="err_detail_google_maps_limit_reached">c:geo kon de statische kaarten niet downloaden. Wellicht dat de Google Maps limiet is bereikt.</string> <string name="err_detail_no_spoiler">c:geo Heeft geen spoiler images gevonden voor deze cache.</string> @@ -475,7 +473,6 @@ <!-- cache --> <plurals name="cache_counts"> - <item quantity="zero">Geen cache</item> <item quantity="one">Een cache</item> <item quantity="other">%1$d Caches</item> </plurals> diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml index e736bbb..f4f3b46 100644 --- a/main/res/values-pl/strings.xml +++ b/main/res/values-pl/strings.xml @@ -10,7 +10,6 @@ <string name="settings">Ustawienia</string> <string name="helpers">Przydatne programy</string> <string name="about">O c:geo</string> - <string name="helper">Chcesz dowiedzieć się więcej o <b>c:geo</b>?\nZajrzyj do instrukcji obsługi.</string> <string name="latitude">Szerokość geograficzna</string> <string name="longitude">Długość geograficzna</string> @@ -155,7 +154,6 @@ <string name="err_detail_cache_find">c:geo nie mógł znaleźć skrzynki.</string> <string name="err_detail_cache_find_some">c:geo nie mógł znaleźć tej skrzynki.</string> <string name="err_detail_cache_find_any">c:geo nie mógł znaleźć żadnej skrzynki.</string> - <string name="err_detail_cache_find_next">c:geo nie mógł znaleźć następnych skrzynek.</string> <string name="err_detail_cache_forgot">c:geo zapomniał którą skrzynkę chcesz obejrzeć.</string> <string name="err_detail_google_maps_limit_reached">c:geo nie był w stanie pobrać map statycznych. Może limit map Google został wyczerpany.</string> <string name="err_detail_no_spoiler">c:geo nie znalazł zdjęcia spoilera dla tej skrzynki.</string> diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml index bbc094c..f00a835 100644 --- a/main/res/values-pt/strings.xml +++ b/main/res/values-pt/strings.xml @@ -10,7 +10,6 @@ <string name="settings">Definições</string> <string name="helpers">Apps Úteis</string> <string name="about">Sobre c:geo</string> - <string name="helper">Quer aprender acerca do <b>c:geo</b>?\nVeja o nosso prático manual.</string> <string name="latitude">Latitude</string> <string name="longitude">Longitude</string> @@ -142,7 +141,6 @@ <string name="err_detail_cache_find">O c:geo não encontra a geocache</string> <string name="err_detail_cache_find_some">O c:geo não encontra essa geocache.</string> <string name="err_detail_cache_find_any">O c:geo não encontra qualquer geocache.</string> - <string name="err_detail_cache_find_next">O c:geo não encontra as próximas geocaches.</string> <string name="err_detail_cache_forgot">O c:geo esqueceu a geocache pretendida.</string> <string name="err_detail_google_maps_limit_reached">O c:geo falhou no download dos mapas. Talvez o tenha atingido o limite do Google Maps.</string> <string name="err_detail_no_spoiler">O c:geo não encontrou images spoiler para esta cache.</string> @@ -464,7 +462,6 @@ <!-- cache --> <plurals name="cache_counts"> - <item quantity="zero">Nenhuma cache</item> <item quantity="one">Uma cache</item> <item quantity="other">%1$d Caches</item> </plurals> diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml index 87286cb..1e71350 100644 --- a/main/res/values-sk/strings.xml +++ b/main/res/values-sk/strings.xml @@ -10,7 +10,6 @@ <string name="settings">Nastavenie</string> <string name="helpers">Pomocné aplikácie</string> <string name="about">O aplikácii</string> - <string name="helper">Chcete sa dozvedieť viac o <b>c:geo</b>?\nPozrite si manuál.</string> <string name="latitude">Zemepisná šírka</string> <string name="longitude">Zemepisná dĺžka</string> @@ -141,7 +140,6 @@ <string name="err_detail_cache_find">Prepáčte, c:geo nemôže nájsť skrýšu</string> <string name="err_detail_cache_find_some">Prepáčte, c:geo nemôže nájsť požadovanú skrýšu.</string> <string name="err_detail_cache_find_any">Prepáčte, c:geo nemôže nájsť žiadnu skrýšu.</string> - <string name="err_detail_cache_find_next">Prepáčte, c:geo nemôže nájsť ďalšiu skrýšu.</string> <string name="err_detail_cache_forgot">Prepáčte, c:geo zabudlo, akú skrýšu chcete zobraziť.</string> <string name="err_detail_google_maps_limit_reached">c:geo sa nepodarilo prevziať statické mapy. Je možné, že bol dosiahnutý limit Google mapy.</string> <string name="err_detail_no_spoiler">c:geo nenašla pre túto skrýšu žiaden spoilerový obrázok.</string> @@ -464,7 +462,6 @@ <!-- cache --> <plurals name="cache_counts"> - <item quantity="zero">žiadna skrýša</item> <item quantity="one">jedna skrýša</item> <item quantity="other">%1$d skrýš</item> </plurals> diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml index 8501cf7..6644ce6 100644 --- a/main/res/values-sv/strings.xml +++ b/main/res/values-sv/strings.xml @@ -10,7 +10,6 @@ <string name="settings">Inställningar</string> <string name="helpers">Bra program att installera</string> <string name="about">Om c:geo</string> - <string name="helper">Vill du lära dig mer om <b>c:geo</b>?\nLäs manualen (på engelska).</string> <string name="latitude">Latitud</string> <string name="longitude">Longitud</string> @@ -163,7 +162,6 @@ <string name="err_detail_cache_find">Tyvärr kan c:geo inte hitta geocache</string> <string name="err_detail_cache_find_some">Tyvärr kan c:geo inte hitta geocachen.</string> <string name="err_detail_cache_find_any">Tyvärr kan c:geo inte hitta någon geocache.</string> - <string name="err_detail_cache_find_next">Tyvärr kan c:geo inte hitta nästa geocache.</string> <string name="err_detail_cache_forgot">Tyvärr glömde c:geo vilken geocache du ville se.</string> <string name="err_detail_google_maps_limit_reached">c:geo kunde inte hämta kartor. Eventuellt kan Google Maps gräns ha uppnåtts.</string> <string name="err_detail_no_spoiler">c:geo hittade inga spoiler bilder för den här cachen.</string> @@ -499,7 +497,6 @@ <!-- cache --> <plurals name="cache_counts"> - <item quantity="zero">Ingen cache</item> <item quantity="one">En cache</item> <item quantity="other">%1$d cacher</item> </plurals> diff --git a/main/res/values/dimens.xml b/main/res/values/dimens.xml index 051f73f..1c1c47c 100644 --- a/main/res/values/dimens.xml +++ b/main/res/values/dimens.xml @@ -3,4 +3,8 @@ <dimen name="actionbar_height">45dip</dimen> <dimen name="actionbar_separator_height">37dip</dimen> <dimen name="actionbar_separator_width">2dip</dimen> + + <!-- Dimensions for Samsung Multi-Window support --> + <dimen name="app_defaultsize_w">632.0dip</dimen> + <dimen name="app_defaultsize_h">598.0dip</dimen> </resources> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 43f87ea..69f9ca3 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -10,7 +10,6 @@ <string name="settings">Settings</string> <string name="helpers">Useful apps</string> <string name="about">About c:geo</string> - <string name="helper">Do you want to learn about <b>c:geo</b>?\nCheck our easy to read manual.</string> <string name="latitude">Latitude</string> <string name="longitude">Longitude</string> @@ -163,7 +162,6 @@ <string name="err_detail_cache_find">c:geo can\'t find geocache</string> <string name="err_detail_cache_find_some">c:geo can\'t find that geocache.</string> <string name="err_detail_cache_find_any">c:geo can\'t find any geocache.</string> - <string name="err_detail_cache_find_next">c:geo can\'t find next geocaches.</string> <string name="err_detail_cache_forgot">c:geo forgot which geocache you want.</string> <string name="err_detail_google_maps_limit_reached">c:geo failed to download static maps. Maybe google maps limit is reached.</string> <string name="err_detail_no_spoiler">c:geo found no spoiler images for this cache.</string> @@ -518,7 +516,7 @@ <plurals name="cache_counts"> <item quantity="zero">No cache</item> <item quantity="one">One cache</item> - <item quantity="other">%1$d Caches</item> + <item quantity="other">%1$d caches</item> </plurals> <string name="cache_offline">Offline</string> <string name="cache_offline_refresh">Refresh</string> diff --git a/main/src/cgeo/geocaching/DirectionProvider.java b/main/src/cgeo/geocaching/DirectionProvider.java index c1f83ac..37b184a 100644 --- a/main/src/cgeo/geocaching/DirectionProvider.java +++ b/main/src/cgeo/geocaching/DirectionProvider.java @@ -14,7 +14,7 @@ public class DirectionProvider extends MemorySubject<Float> implements SensorEve private final SensorManager sensorManager; - // Previous values signaled to observers to avoid resending the same value when the + // Previous values signaled to observers to avoid re-sending the same value when the // device doesn't change orientation. The orientation is usually given with a 1 degree // precision by Android, so it is not uncommon to obtain exactly the same value several // times. @@ -27,7 +27,8 @@ public class DirectionProvider extends MemorySubject<Float> implements SensorEve @Override protected void onFirstObserver() { - sensorManager.registerListener(this, sensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION), SensorManager.SENSOR_DELAY_NORMAL); + final Sensor defaultSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ORIENTATION); + sensorManager.registerListener(this, defaultSensor, SensorManager.SENSOR_DELAY_NORMAL); } @Override @@ -43,7 +44,7 @@ public class DirectionProvider extends MemorySubject<Float> implements SensorEve * this event leads to the log being flooded with multiple entries _per second_, * which I experienced when running cgeo in a building (with GPS and network being * unreliable). - * + * * See for example https://code.google.com/p/android/issues/detail?id=14792 */ diff --git a/main/src/cgeo/geocaching/compatibility/AndroidLevel8Emulation.java b/main/src/cgeo/geocaching/compatibility/AndroidLevel8Emulation.java index a60b48d..6d5781f 100644 --- a/main/src/cgeo/geocaching/compatibility/AndroidLevel8Emulation.java +++ b/main/src/cgeo/geocaching/compatibility/AndroidLevel8Emulation.java @@ -19,7 +19,11 @@ public class AndroidLevel8Emulation implements AndroidLevel8Interface { @Override public int getRotationOffset(Activity activity) { final Display display = activity.getWindowManager().getDefaultDisplay(); + + // the non deprecated method is available in API 8+ only, so we cannot deal better with this + @SuppressWarnings("deprecation") final int rotation = display.getOrientation(); + if (rotation == Configuration.ORIENTATION_LANDSCAPE) { return 90; } diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java index ea51375..97c4b7e 100644 --- a/main/src/cgeo/geocaching/maps/CGeoMap.java +++ b/main/src/cgeo/geocaching/maps/CGeoMap.java @@ -119,6 +119,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto private static final String BUNDLE_MAP_SOURCE = "mapSource"; private static final String BUNDLE_MAP_STATE = "mapState"; private static final String BUNDLE_LIVE_ENABLED = "liveEnabled"; + private static final String BUNDLE_TRAIL_HISTORY = "trailHistory"; private Resources res = null; private MapItemFactory mapItemFactory = null; @@ -343,6 +344,9 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto outState.putInt(BUNDLE_MAP_SOURCE, currentSourceId); outState.putIntArray(BUNDLE_MAP_STATE, currentMapState()); outState.putBoolean(BUNDLE_LIVE_ENABLED, isLiveEnabled); + if (overlayPosition != null) { + outState.putParcelableArrayList(BUNDLE_TRAIL_HISTORY, overlayPosition.getHistory()); + } } @Override @@ -380,11 +384,14 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto mapTitle = res.getString(R.string.map_map); } + ArrayList<Location> trailHistory = null; + // Get fresh map information from the bundle if any if (savedInstanceState != null) { currentSourceId = savedInstanceState.getInt(BUNDLE_MAP_SOURCE, Settings.getMapSource().getNumericalId()); mapStateIntent = savedInstanceState.getIntArray(BUNDLE_MAP_STATE); isLiveEnabled = savedInstanceState.getBoolean(BUNDLE_LIVE_ENABLED, false); + trailHistory = savedInstanceState.getParcelableArrayList(BUNDLE_TRAIL_HISTORY); } else { currentSourceId = Settings.getMapSource().getNumericalId(); } @@ -421,6 +428,9 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto if (overlayPosition == null) { overlayPosition = mapView.createAddPositionOverlay(activity); + if (trailHistory != null) { + overlayPosition.setHistory(trailHistory); + } } if (overlayScale == null) { diff --git a/main/src/cgeo/geocaching/maps/PositionOverlay.java b/main/src/cgeo/geocaching/maps/PositionOverlay.java index fec67ef..08acd2f 100644 --- a/main/src/cgeo/geocaching/maps/PositionOverlay.java +++ b/main/src/cgeo/geocaching/maps/PositionOverlay.java @@ -22,7 +22,6 @@ import android.graphics.Point; import android.location.Location; import java.util.ArrayList; -import java.util.List; public class PositionOverlay implements GeneralOverlay { private Location coordinates = null; @@ -39,7 +38,7 @@ public class PositionOverlay implements GeneralOverlay { private PaintFlagsDrawFilter setfil = null; private PaintFlagsDrawFilter remfil = null; private Location historyRecent = null; - private List<Location> history = new ArrayList<Location>(); + private ArrayList<Location> history = new ArrayList<Location>(); private Point historyPointN = new Point(); private Point historyPointP = new Point(); private Activity activity; @@ -229,4 +228,12 @@ public class PositionOverlay implements GeneralOverlay { public OverlayImpl getOverlayImpl() { return this.ovlImpl; } + + public ArrayList<Location> getHistory() { + return history; + } + + public void setHistory(ArrayList<Location> inHistory) { + history = inHistory; + } } diff --git a/main/src/cgeo/geocaching/utils/ClipboardUtils.java b/main/src/cgeo/geocaching/utils/ClipboardUtils.java index e6779ad..9343576 100644 --- a/main/src/cgeo/geocaching/utils/ClipboardUtils.java +++ b/main/src/cgeo/geocaching/utils/ClipboardUtils.java @@ -3,7 +3,6 @@ package cgeo.geocaching.utils; import cgeo.geocaching.cgeoapplication; import android.content.Context; -import android.text.ClipboardManager; /** * Clipboard Utilities. Functions to copy data to the Android clipboard. @@ -20,7 +19,8 @@ public final class ClipboardUtils { * The text to place in the clipboard. */ public static void copyToClipboard(final CharSequence text) { - final ClipboardManager clipboard = (ClipboardManager) cgeoapplication.getInstance().getSystemService(Context.CLIPBOARD_SERVICE); + // fully qualified name used here to avoid buggy deprecation warning (of javac) on the import statement + final android.text.ClipboardManager clipboard = (android.text.ClipboardManager) cgeoapplication.getInstance().getSystemService(Context.CLIPBOARD_SERVICE); clipboard.setText(text); } diff --git a/main/templates/private.properties b/main/templates/private.properties index 13c424b..731ff50 100644 --- a/main/templates/private.properties +++ b/main/templates/private.properties @@ -1,7 +1,7 @@ # The API-key is necessary in order that Google Maps is working. # You can get one at # http://code.google.com/intl/de/android/add-ons/google-apis/maps-api-signup.html -# For developing paste your key to both lines and you will not have any problems +# For developing paste your key to both lines and you will not have any problems. maps.api.key= maps.api.key.market= @@ -17,9 +17,9 @@ maps.api.key.market= #key.store.password= #key.alias.password= -# These keys allow c:geo to be registered at openaching.de and -# to search and log caches in your name -# You can request your own at http://www.opencaching.de/okapi/signup.html +# These keys allow c:geo to be registered at opencaching.de and +# to search and log caches in your name. +# You can request your own key at http://www.opencaching.de/okapi/signup.html ocde.okapi.consumer.key= ocde.okapi.consumer.secret= |