diff --git a/.gitignore b/.gitignore index 33e746a3d6..7386d5e61e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,8 @@ OsmAndCore_*.aar *.iml .settings .idea -.project +**/.project +**/.classpath out/ # Huawei diff --git a/OsmAnd-api/src/net/osmand/aidlapi/customization/ProfileSettingsParams.java b/OsmAnd-api/src/net/osmand/aidlapi/customization/ProfileSettingsParams.java index 00c68851e7..a22d4e3c91 100644 --- a/OsmAnd-api/src/net/osmand/aidlapi/customization/ProfileSettingsParams.java +++ b/OsmAnd-api/src/net/osmand/aidlapi/customization/ProfileSettingsParams.java @@ -8,6 +8,7 @@ import net.osmand.aidlapi.AidlParams; import net.osmand.aidlapi.profile.AExportSettingsType; import java.util.ArrayList; +import java.util.List; import static net.osmand.aidlapi.profile.ExportProfileParams.SETTINGS_TYPE_KEY; @@ -15,16 +16,18 @@ public class ProfileSettingsParams extends AidlParams { public static final String VERSION_KEY = "version"; public static final String REPLACE_KEY = "replace"; + public static final String SILENT_IMPORT_KEY = "silentImport"; public static final String LATEST_CHANGES_KEY = "latestChanges"; public static final String PROFILE_SETTINGS_URI_KEY = "profileSettingsUri"; private Uri profileSettingsUri; private String latestChanges; private int version; - private ArrayList settingsTypeKeyList = new ArrayList<>(); - boolean replace; + private List settingsTypeKeyList = new ArrayList<>(); + private boolean silent; + private boolean replace; - public ProfileSettingsParams(Uri profileSettingsUri, ArrayList settingsTypeList, boolean replace, - String latestChanges, int version) { + public ProfileSettingsParams(Uri profileSettingsUri, List settingsTypeList, boolean replace, + boolean silent, String latestChanges, int version) { this.profileSettingsUri = profileSettingsUri; for (AExportSettingsType settingsType : settingsTypeList) { settingsTypeKeyList.add(settingsType.name()); @@ -32,6 +35,7 @@ public class ProfileSettingsParams extends AidlParams { this.replace = replace; this.latestChanges = latestChanges; this.version = version; + this.silent = silent; } public ProfileSettingsParams(Parcel in) { @@ -62,7 +66,7 @@ public class ProfileSettingsParams extends AidlParams { return profileSettingsUri; } - public ArrayList getSettingsTypeKeys() { + public List getSettingsTypeKeys() { return settingsTypeKeyList; } @@ -70,13 +74,18 @@ public class ProfileSettingsParams extends AidlParams { return replace; } + public boolean isSilent() { + return silent; + } + @Override public void writeToBundle(Bundle bundle) { bundle.putInt(VERSION_KEY, version); bundle.putString(LATEST_CHANGES_KEY, latestChanges); bundle.putParcelable(PROFILE_SETTINGS_URI_KEY, profileSettingsUri); - bundle.putStringArrayList(SETTINGS_TYPE_KEY, settingsTypeKeyList); + bundle.putStringArrayList(SETTINGS_TYPE_KEY, new ArrayList<>(settingsTypeKeyList)); bundle.putBoolean(REPLACE_KEY, replace); + bundle.putBoolean(SILENT_IMPORT_KEY, silent); } @Override @@ -86,5 +95,6 @@ public class ProfileSettingsParams extends AidlParams { profileSettingsUri = bundle.getParcelable(PROFILE_SETTINGS_URI_KEY); settingsTypeKeyList = bundle.getStringArrayList(SETTINGS_TYPE_KEY); replace = bundle.getBoolean(REPLACE_KEY); + silent = bundle.getBoolean(SILENT_IMPORT_KEY); } } \ No newline at end of file diff --git a/OsmAnd-java/src/main/java/net/osmand/osm/RouteActivityType.java b/OsmAnd-java/src/main/java/net/osmand/osm/RouteActivityType.java new file mode 100644 index 0000000000..28c9b11551 --- /dev/null +++ b/OsmAnd-java/src/main/java/net/osmand/osm/RouteActivityType.java @@ -0,0 +1,218 @@ +package net.osmand.osm; + +public enum RouteActivityType { + WATER("Water", "yellow"), WINTER("Winter", "yellow"), SNOWMOBILE("Snowmobile", "yellow"), RIDING("Riding", "yellow"), RACING("Racing", "yellow"), + MOUNTAINBIKE("Mountainbike", "blue"), CYCLING("Cycling", "blue"), + HIKING("Hiking", "orange"), RUNNING("Running", "orange"), WALKING("Walking", "orange"), + OFFROAD("Off-road", "yellow"), + MOTORBIKE("Motorbike", "green"), CAR("Car", "green"); + // less specific bottom order + + String name; + String color; + + private RouteActivityType(String nm, String clr) { + this.name = nm; + this.color = clr; + } + + public String getName() { + return name; + } + + public String getColor() { + return color; + } + + public static RouteActivityType getTypeFromTags(String[] tags) { + RouteActivityType activityType = null; + for (String tg : tags) { + RouteActivityType rat = RouteActivityType.convertFromOsmGPXTag(tg); + if (rat != null) { + if (activityType == null || activityType.ordinal() > rat.ordinal()) { + activityType = rat; + } + } + } + return activityType; + } + + public static RouteActivityType convertFromOsmGPXTag(String tg) { + String t = tg.toLowerCase(); + if ("mountain hiking".equalsIgnoreCase(t)) { + return HIKING; + } + if ("motorcar".equalsIgnoreCase(t)) { + return CAR; + } + if ("laufen".equalsIgnoreCase(t)) { + return RUNNING; + } + if ("pedestrian".equalsIgnoreCase(t)) { + return WALKING; + } + switch (t) { + case "mountainbiking": + case "mtb": + case "mountainbike": + case "mountain bike": + case "mountain biking": + case "mountbarker": + case "mtb-tour": + case "ciclismo-mtb-gravel": + case "vtt": + case "btt": + case "vth": + case "mtb ride": + return MOUNTAINBIKE; + case "hiking": + case "route=hiking": + case "mountain hiking": + case "hiking trail": + case "wandern": + case "hike": + case "randonnée": + case "trekking": + case "climbing": + return HIKING; + case "bike": + case "biking": + case "bicycling": + case "bicycle": + case "cycling": + case "cycle": + case "cycleway": + case "cykel": + case "handcycle": + case "cyclotourisme": + case "route=bicycle": + case "cyclotourism": + case "fietsen": + case "вело": + case "велосипед": + case "rower": + case "trasa rowerem": + case "vélo": + case "velo": + case "radtour": + case "bici": + case "fiets": + case "fahrrad": + case "ncn": + case "icn": + case "lcn": + case "network=ncn": + case "network=icn": + case "network=lcn": + return CYCLING; + case "car": + case "motorcar": + case "by car": + case "auto": + case "автомобиль": + case "automobile": + case "autós": + case "driving": + case "drive": + case "van": + case "авто": + case "на автомобиле": + case "bus": + case "truck": + case "taxi": + return CAR; + case "running": + case "run": + case "rungis": + case "trail running": + case "trailrunning": + case "бег": + case "laufen": + case "langlauf": + case "lauf": + case "course": + case "jogging": + case "fitotrack": + return RUNNING; + case "wanderung": + case "walking": + case "walk": + case "nightwalk": + case "walkway": + case "пешком": + case "пеший": + case "pěšky": + case "marche": + case "pedestrian": + case "foot": + case "footing": + case "on_foot": + case "byfoot": + case "onfoot": + case "sightseeing": + case "geocaching": + case "etnanatura": + case "etna": + case "iwn": + case "lwn": + case "rwn": + case "network=iwn": + case "network=lwn": + case "network=rwn": + return WALKING; + case "ling-moto": + case "motorbiking": + case "motorcycle": + case "motorrad": + case "motorbike": + case "motor bike": + case "FVbike": + case "Motorrad": + return MOTORBIKE; + case "offroad": + case "off-road": + case "off road": + case "4x4": + case "terrain": + case "quad": + case "enduro": + case "feldwege": + case "feldweg": + return OFFROAD; + case "boat": + case "water": + case "boating": + case "kayak": + case "river": + case "lake": + case "lakes": + case "canal": + return WATER; + case "ski": + case "skiing": + case "skating": + case "skitour": + case "winter": + case "wintersports": + case "snowboard": + case "лыжи": + case "лыжня": + case "nordic": + case "piste": + return WINTER; + case "snowmobile=designated": + case "snowmobile=permissive": + case "snowmobile=yes": + case "snowmobile": + return SNOWMOBILE; + case "ride": + case "horse": + case "horse trail": + return RIDING; + case "racing": + return RACING; + } + return null; + } + +} \ No newline at end of file diff --git a/OsmAnd-java/src/main/java/net/osmand/router/TurnType.java b/OsmAnd-java/src/main/java/net/osmand/router/TurnType.java index 7b67669cf3..6f0db3fa86 100644 --- a/OsmAnd-java/src/main/java/net/osmand/router/TurnType.java +++ b/OsmAnd-java/src/main/java/net/osmand/router/TurnType.java @@ -140,7 +140,7 @@ public class TurnType { r.setTurnAngle(angle); return r; } - + private TurnType(int vl) { this.value = vl; @@ -156,6 +156,10 @@ public class TurnType { return value == RNLB || value == TRU; } + public void setExitOut(int exitOut) { + this.exitOut = exitOut; + } + public void setTurnAngle(float turnAngle) { this.turnAngle = turnAngle; } diff --git a/OsmAnd-java/src/main/java/net/osmand/util/MapUtils.java b/OsmAnd-java/src/main/java/net/osmand/util/MapUtils.java index 15c3364007..7a37eee3aa 100644 --- a/OsmAnd-java/src/main/java/net/osmand/util/MapUtils.java +++ b/OsmAnd-java/src/main/java/net/osmand/util/MapUtils.java @@ -668,8 +668,13 @@ public class MapUtils { public static boolean areLatLonEqual(Location l1, Location l2) { return l1 == null && l2 == null - || (l1 != null && l2 != null && Math.abs(l1.getLatitude() - l2.getLatitude()) < 0.00001 - && Math.abs(l1.getLongitude() - l2.getLongitude()) < 0.00001); + || (l2 != null && areLatLonEqual(l1, l2.getLatitude(), l2.getLongitude())); + } + + public static boolean areLatLonEqual(Location l, double lat, double lon) { + return l != null + && Math.abs(l.getLatitude() - lat) < 0.00001 + && Math.abs(l.getLongitude() - lon) < 0.00001; } public static LatLon rhumbDestinationPoint(LatLon latLon, double distance, double bearing){ diff --git a/OsmAnd/res/drawable-xxhdpi/img_plugin_openplacereviews.webp b/OsmAnd/res/drawable-xxhdpi/img_plugin_openplacereviews.webp new file mode 100644 index 0000000000..97e0b2e58d Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/img_plugin_openplacereviews.webp differ diff --git a/OsmAnd/res/layout/center_button_container.xml b/OsmAnd/res/layout/center_button_container.xml new file mode 100644 index 0000000000..05fa83eae0 --- /dev/null +++ b/OsmAnd/res/layout/center_button_container.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/custom_radio_buttons.xml b/OsmAnd/res/layout/custom_radio_buttons.xml index d768e58004..6ad61aa700 100644 --- a/OsmAnd/res/layout/custom_radio_buttons.xml +++ b/OsmAnd/res/layout/custom_radio_buttons.xml @@ -1,71 +1,34 @@ - + android:layout_weight="1" /> - - - - - + android:visibility="gone" /> - - - - - - - - - + android:layout_weight="1" /> \ No newline at end of file diff --git a/OsmAnd/res/layout/data_storage_memory_used_item.xml b/OsmAnd/res/layout/data_storage_memory_used_item.xml index 0edf24f056..72f49226e8 100644 --- a/OsmAnd/res/layout/data_storage_memory_used_item.xml +++ b/OsmAnd/res/layout/data_storage_memory_used_item.xml @@ -9,7 +9,8 @@ + android:layout_height="wrap_content" + android:minHeight="@dimen/card_row_min_height"> + tools:text="Internal application memory" /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> - + - + + - + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/item_gpx_stat_block.xml b/OsmAnd/res/layout/item_gpx_stat_block.xml index 18dfa5cdde..dd0ed2a571 100644 --- a/OsmAnd/res/layout/item_gpx_stat_block.xml +++ b/OsmAnd/res/layout/item_gpx_stat_block.xml @@ -10,43 +10,59 @@ android:orientation="horizontal"> + android:gravity="center_vertical" + android:orientation="horizontal" + android:weightSum="2"> - + + + + + diff --git a/OsmAnd/res/layout/left_button_container.xml b/OsmAnd/res/layout/left_button_container.xml new file mode 100644 index 0000000000..c30305819c --- /dev/null +++ b/OsmAnd/res/layout/left_button_container.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/right_button_container.xml b/OsmAnd/res/layout/right_button_container.xml new file mode 100644 index 0000000000..98a99f991a --- /dev/null +++ b/OsmAnd/res/layout/right_button_container.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/values-ar/phrases.xml b/OsmAnd/res/values-ar/phrases.xml index 2b880e83d6..9338e3e669 100644 --- a/OsmAnd/res/values-ar/phrases.xml +++ b/OsmAnd/res/values-ar/phrases.xml @@ -3678,4 +3678,5 @@ نفق خفافيش جسر خفافيش معبر الحيوانات البرية + شريط التمرير \ No newline at end of file diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml index 8929bd6f4d..d12d0a4de4 100644 --- a/OsmAnd/res/values-ar/strings.xml +++ b/OsmAnd/res/values-ar/strings.xml @@ -3513,7 +3513,7 @@ أنواع نقاط الاهتمام لا شيء محدد زر الإجراء السريع - ملفات التعريف + الأوضاع سيتم استبدال العناصر الحالية بالعناصر التي في الملف استبدل الكل احصل على %1$d %2$s عند %3$s مقابل. @@ -3965,7 +3965,7 @@ مساحة جهازك %1$s الخالية فقط. يرجى تحرير بعض المساحة أو إلغاء تحديد بعض العناصر للتصدير. المصادر حجم الملف التقريبي - حدد البيانات التي سيتم تصديرها إلى الملف. + حدد البيانات التي سيتم تصديرها إلى ملف. مطلوب للاستيراد لا يوجد مساحة كافية أضف إلى مابيلاي @@ -3997,10 +3997,10 @@ \n • دعم ألوان مخصصة للمفضلة ونقاط لمسار الطريق \n \n - ملف تعريف أوسماند + وضع الاستعراض ملف تعريف المستخدم عكس جميع النقاط - حدد ملف التعريف، الذي سيتم استخدامه في بدء التطبيق. + حدد الوضع الذي سيتم استخدامه في بدء التطبيق. آخر استخدام تفضيل طرق التنزه تفضيل طرق التنزه @@ -4063,4 +4063,15 @@ MTB خطأ في الخادم: %1$s الاسم موجود بالفعل + هل تريد حذف محرك التوجيه عبر الإنترنت؟ + قراءة كاملة + تحرير الوصف + حذف نقاط الطريق + نسخ لعلامات الخريطة + نسخ للمفضلة + يتم الرفع + اكتمال الرفع + رفع %1$d من %2$d + تم رفع %1$d من %2$d + تحديد التعديلات للتحميل \ No newline at end of file diff --git a/OsmAnd/res/values-bn/strings.xml b/OsmAnd/res/values-bn/strings.xml index 1dd3435fca..09ae3e8f32 100644 --- a/OsmAnd/res/values-bn/strings.xml +++ b/OsmAnd/res/values-bn/strings.xml @@ -24,4 +24,8 @@ ওএসএমও কেনাকাটা একটি মানচিত্রের প্রতীকের জন্য গাইড ন্যাভিগেশন প্রোফাইল + অবস্থানগুলো + দিক নির্ণয় + মি/সে + নটিকাল মাইল \ No newline at end of file diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml index 404ec25431..738a4e98fe 100644 --- a/OsmAnd/res/values-cs/strings.xml +++ b/OsmAnd/res/values-cs/strings.xml @@ -2314,7 +2314,7 @@ Průměr %1$d z %2$d Stoupání/Klesání - Čas pohybu + Doba pohybu Max/Min Min/Max Pozastavit/pokračovat v navigaci @@ -4000,4 +4000,15 @@ Horské kolo Chyba serveru: %1$s Název již existuje + Odstranit tuto online navigační službu\? + Přečíst celé + Upravit popis + Odstranit body trasy + Kopírovat do mapových značek + Kopírovat do oblíbených + Nahrávání + Nahrávání dokončeno + Nahrávám %1$d z %2$d + Nahráno %1$d z %2$d + Vyberte úpravy pro nahrání \ No newline at end of file diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 620e4a10ea..f71ed65545 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -3972,7 +3972,7 @@ Ordner auswählen Ordner auswählen oder neuen hinzufügen Leer - Nach Intervallen auswerten (geteiltes Intervall) + Nach Intervallen auswerten Hochladen zu OpenStreetMap Track editieren Track umbenennen @@ -4008,4 +4008,9 @@ Wegpunkte löschen In Favoriten kopieren In Kartenmarkierungen kopieren + Lade hoch + Hochladen abgeschlossen + Lade %1$d von %2$d hoch + %1$d von %2$d hochgeladen + Bearbeitungen zum Hochladen auswählen \ No newline at end of file diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml index 349175b810..219a59ae10 100644 --- a/OsmAnd/res/values-eo/strings.xml +++ b/OsmAnd/res/values-eo/strings.xml @@ -2433,7 +2433,7 @@ Mezumo %1$d el %2$d Supreniroj/malsupreniroj - Movada tempo + Tempo dum movo Maks./min. Min./maks. Rozkolora diafana @@ -4006,4 +4006,9 @@ Redakti priskribon Forigi navigadpunktojn Kopii al map‑markoj + Sendado + Sendado finita + Sendado de %1$d el %2$d + Sendis %1$d el %2$d + Elektu redaktojn por sendi \ No newline at end of file diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml index 1a037e42ff..18a479e18b 100644 --- a/OsmAnd/res/values-es-rAR/strings.xml +++ b/OsmAnd/res/values-es-rAR/strings.xml @@ -2438,7 +2438,7 @@ Promedio %1$d de %2$d Ascenso/Descenso - Tiempo moviéndose + Tiempo en movimiento Máx/Min Min/Máx Rosa translúcido @@ -3982,7 +3982,7 @@ Preparar Fuera de la ruta Has llegado al destino - Giro + Girar Intervalos de tiempo y distancia El tiempo de anuncio de las diferentes indicaciones por voz depende del tipo de mensaje, la velocidad de navegación actual y la velocidad de navegación predefinida. Tiempo de anuncio @@ -4003,4 +4003,15 @@ Bicicleta de montaña Error de servidor: %1$s El nombre ya existe + ¿Borrar este motor de navegación en línea\? + Leer completo + Editar descripción + Borrar puntos de referencia + Copiar a «Marcadores del mapa» + Copiar a favoritos + Subiendo + Subida completa + Subiendo %1$d de %2$d + Se subieron %1$d de %2$d + Marcar ediciones a subir \ No newline at end of file diff --git a/OsmAnd/res/values-et/strings.xml b/OsmAnd/res/values-et/strings.xml index 3bd15abafa..1375440bb8 100644 --- a/OsmAnd/res/values-et/strings.xml +++ b/OsmAnd/res/values-et/strings.xml @@ -3948,4 +3948,9 @@ Viimati kasutatud Serveri viga: %1$s Selline nimi on juba olemas + Vali tehtud muudatused üleslaadimiseks + Üleslaaditud %1$d/%2$d + Laadin üles muudatusi %1$d/%2$d + Sai üleslaaditud + Laadin üles \ No newline at end of file diff --git a/OsmAnd/res/values-fi/strings.xml b/OsmAnd/res/values-fi/strings.xml index 95df84bf3e..c188b64182 100644 --- a/OsmAnd/res/values-fi/strings.xml +++ b/OsmAnd/res/values-fi/strings.xml @@ -2739,4 +2739,15 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t Kävely Polkupyörä Auto + Palvelimen virhe: %1$s + Nimi on jo käytössä + Lue kaikki + Muokkaa kuvausta + Kopioi karttamerkkeihin + Kopioi suosikkeihin + Lähetetään + Lähetys valmis + Lähetetty %1$d muutosta %2$d muutoksesta + Lähetettiin %1$d muutosta %2$d muutoksesta + Valitse lähetettävät muutokset \ No newline at end of file diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml index e9c1c87b65..c963ab462e 100644 --- a/OsmAnd/res/values-fr/strings.xml +++ b/OsmAnd/res/values-fr/strings.xml @@ -3996,4 +3996,9 @@ Lire la suite Modifier la description Supprimer les points de passage + Envoi de %1$d sur %2$d + Sélectionnez les modifications à envoyer + %1$d sur %2$d envoyé + Envoi en cours + Envoi terminé \ No newline at end of file diff --git a/OsmAnd/res/values-hu/phrases.xml b/OsmAnd/res/values-hu/phrases.xml index 488f760a80..b4ca7f9b08 100644 --- a/OsmAnd/res/values-hu/phrases.xml +++ b/OsmAnd/res/values-hu/phrases.xml @@ -708,7 +708,7 @@ Autó Kerékpár Radioaktívhulladék-lerakó - Vízgyűjtő + Vízgyűjtő medence Megfigyelőállomás Daru Építkezés @@ -2633,7 +2633,7 @@ Lottózó Szerencsejáték-helyszín Típus - Lottózó + Lottó Játékgépek Fogadás E-cigaretta-bolt @@ -3446,7 +3446,7 @@ Motorszerelés Biztosítás Gumiszerelés - Kötélpálya + Csúszópálya Kalandpark Via ferrata (vasalt út) Sodronyok száma @@ -3524,7 +3524,7 @@ akadémiai gyermekkönyv Atoll - Útdíjellenőrző kapu + Automatikus útdíjbeszedő kapu Gyermekgondozás (bölcsőde) Természeti emlék Tájékozódási pont diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index d883e7189b..5355241d87 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -4000,4 +4000,9 @@ Útpontok törlése Másolás a térképjelölők közé Másolás a kedvencek közé + Felöltés folyamatban + Feltöltés befejezve + %1$d / %2$d feltöltés alatt + %1$d / %2$d feltöltve + Szerkesztések kijelölése feltöltéshez \ No newline at end of file diff --git a/OsmAnd/res/values-iw/strings.xml b/OsmAnd/res/values-iw/strings.xml index 4915811995..737272e2e5 100644 --- a/OsmAnd/res/values-iw/strings.xml +++ b/OsmAnd/res/values-iw/strings.xml @@ -1528,7 +1528,7 @@ מרחק ממוצע %1$d מתוך %2$d - זמן תנועה + זמן בתנועה מרבי/מזערי מזערי/מרבי סיורים @@ -4001,4 +4001,16 @@ מחיקת נקודות דרך העתקה לסמני המפה העתקה למועדפים + שנ׳ + מעבר + הגעה + הכנה ממושכת + הכנה + פנייה + הפרשי זמן ומרחק + מתבצעת שליחה + השליחה הושלמה + נשלחות %1$d מתוך %2$d + נשלחו %1$d מתוך %2$d + נא לבחור עריכות לשליחה \ No newline at end of file diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml index 09ee2a83fd..3c683d41cf 100644 --- a/OsmAnd/res/values-lt/strings.xml +++ b/OsmAnd/res/values-lt/strings.xml @@ -18,9 +18,8 @@ po piet ryto Statymo vieta - Šis įskiepis leidžia įsiminti vietą, kurioje palikote savo automobilį ir kiek laiko liko iki parkavimo pabaigos (jei ribojamas laikas). - -Tiek vieta, tiek laikas yra matomi OsmAnd valdymo skydelyje bei skydelyje žemėlapyje rodinyje. Šis įskiepis taip pat gali įrašyti priminimą į kalendorių. + Šis įskiepis leidžia įsiminti vietą, kurioje palikote savo automobilį ir kiek laiko liko iki parkavimo pabaigos . +\nTiek vieta, tiek laikas yra matomi OsmAnd valdymo skydelyje bei skydelyje žemėlapyje rodinyje. Šis įskiepis taip pat gali įrašyti priminimą į Android kalendorių. Statymo vieta Žymėti statymo vietą Naikinti statymo žymę @@ -200,9 +199,8 @@ Tiek vieta, tiek laikas yra matomi OsmAnd valdymo skydelyje bei skydelyje žemė Foninis režimas Reikalinga, jei norite naudoti OsmAnd kai ekranas yra išjungtas. Neužtenka vietos parsiųsti %1$s MB (laisva: %2$s). - Atsiųsti {0} failą(-us)? -Tam prireiks {1} MB pastoviam saugojimui. -(Dabar laisvos vietos yra {2} MB.) + Atsiųsti {0} failą(-us)\? +\nTam prireiks {1} MB pastoviam saugojimui. (Dabar laisvos vietos yra {2} MB.) Permatoma tema Aparatinė biblioteka šiame įrenginyje nepalaikoma. Inicializuojama aparatinė biblioteka… @@ -778,8 +776,28 @@ Tam prireiks {1} MB pastoviam saugojimui. Vengti greitkelių Poziciją rodyti ant kelių kai naviguojama. Rodyti ant kelio - OsmAnd (OSM Automated Navigation Directions) -\nOsmAnd yra atviro kodo programa naudojanti įvairius OpenStreetMap (OSM) duomenis. Visi žemėlapių duomenys (vektoriniai ar lakštiniai) gali būti išsaugoti telefone ir naudojami be interneto prieigos. OsmAnd taip pat gali pasiūlyti maršruto skaičiavimo paslaugas internete ar įrenginyje, bei balso nurodymus kelionei apskaičiuotu maršrutu. Dalis pagrindinių savybių: - Veikia be interneto (išsaugokite parsiųstus žemėlapius ar jų lakštus įrenginyje) - Kompaktiški vektoriniai viso pasaulio žemėlapiai - Parsisųskite šalies ar regiono žemėlapius tiesiai iš pačios propgramos - Galima sulieti kelis žemėlapop sluoksnius, tokius kaip GPX ar judėjimo istoriją, Lankytinas Vietas, mėgiamas vietas, kontūrų linijas, viešojo transporto stoteles, papildomus žemėlapius su pasirinktinai nustatomu permatomumo lygiu - Adresų ir LV paieška nenaudojant interneto - Vidutinio ilgio maršruto apskaičiavimas be interneto paslaugų - Automobilio, dviračio ir pėsčiojo režimai su: - pasirinktiniu dineos/nakties rodinio perjungimu - pasirinktiniu pagal judėjimo greitį automatiškai nustatomu mąsteliu - pasirinktine žemėlapio orientacija pagal kompaso arba judėjimo kryptį - pasirinktinis eismo juostų nurodymas, greičio ribojimų rodymas, įrašyti ar generuojami balsai Šios nemokamos OsmAnd versijos apribojimai: - Ribojamas žemėlapių parsiuntimų skaičius - Nėra prieigos prie iš Wikipedia parsiunčiamų LV OsmAnd yra aktyviai tobulinama ir mūsų projektas bei jo tolesnis progresas priklauso nuo finansinės paramos, kuri įgalina tolesnį vystymą ir naujų funkcijų kūrimą. Norime paskatinti jus nusipirkti OsmAnd+ programą arba finansiškai prisidėti prie specifinių funkcijų kūrimo arba šiaip paremti programą osmand.net svetainėje. + OsmAnd (OSM Automated Navigation Directions) +\n +\nOsmAnd yra atviro kodo programa naudojanti įvairius OpenStreetMap (OSM) duomenis. Visi žemėlapių duomenys (vektoriniai ar lakštiniai) gali būti išsaugoti telefone ir naudojami be interneto prieigos. OsmAnd taip pat gali pasiūlyti maršruto skaičiavimo paslaugas internete ar įrenginyje, bei balso nurodymus kelionei apskaičiuotu maršrutu. +\n +\nDalis pagrindinių savybių: +\n- Veikia be interneto (išsaugokite parsiųstus žemėlapius ar jų lakštus įrenginyje) +\n- Kompaktiški vektoriniai viso pasaulio žemėlapiai +\n- Parsisųskite šalies ar regiono žemėlapius tiesiai iš pačios propgramos +\n- Galima sulieti kelis žemėlapop sluoksnius, tokius kaip GPX ar judėjimo istoriją, Lankytinas Vietas, mėgiamas vietas, kontūrų linijas, viešojo transporto stoteles, papildomus žemėlapius su pasirinktinai nustatomu permatomumo lygiu +\n - Adresų ir LV paieška nenaudojant interneto +\n- Vidutinio ilgio maršruto apskaičiavimas be interneto prieigos +\n- Automobilio, dviračio ir pėsčiojo režimai su: +\n- pasirinktiniu dineos/nakties rodinio perjungimu +\n- pasirinktiniu pagal judėjimo greitį automatiškai nustatomu mąsteliu +\n- pasirinktine žemėlapio orientacija pagal kompaso arba judėjimo kryptį +\n- pasirinktinis eismo juostų nurodymas, greičio ribojimų rodymas, įrašyti ar generuojami balsai +\n +\nNemokamos OsmAnd versijos apribojimai: +\n- Ribojamas žemėlapių parsiuntimų skaičius +\n- Nėra prieigos prie iš Wikipedia parsiunčiamų LV +\n +\n OsmAnd yra aktyviai tobulinama ir mūsų projektas bei jo tolesnis progresas priklauso nuo finansinės paramos, kuri įgalina tolesnį vystymą ir naujų funkcijų kūrimą. Norime paskatinti jus nusipirkti OsmAnd+ programą arba finansiškai prisidėti prie specifinių funkcijų kūrimo arba šiaip paremti programą https://osmand.net svetainėje. OsmAnd - atviro kodo navigacijos programa su žemėlapiais OsmAnd+ (OSM Automated Navigation Directions) \n @@ -1872,9 +1890,9 @@ Failams reikalinga {3} MB laikinam ir {1} MB pastoviam saugojimui. Prenumerata leidžia kas valandą gauti visų pasaulio žemėlapių atnaujinimus. Dalis pajamų grįžta OSM bendruomenei ir apmokamas kiekvienas indėlis į OSM kūrimą. Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka. - Ar siųsti {0} failų? - Failams reikalinga {3} MB laikinam ir {1} MB pastoviam saugojimui. - (Šiuo metu prieinama tik {2} MB vietos.) + Ar siųsti {0} failų\? +\nFailams reikalinga {3} MB laikinam ir {1} MB pastoviam saugojimui. +\n(Šiuo metu prieinama tik {2} MB vietos.) Ispanų (Amerikos) Anglų (Junginė Karalystė) Belarusų (Lotynų) @@ -2419,7 +2437,9 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka. Paskutinį kartą naudota: %1$s Taisymų %1$s, suma %2$s mBTC Laosiečių - OsmAnd (OSM Automated Navigation Directions) yra žemėlapio ir navigacijos programa su prieiga prie nemokamų, pasaulinių ir aukštos kokybės OpenStreetMap (OSM) duomenų. Naudokitės balso ir vaizdo navigatoriumi, peržiūrėkite LV (lankytinas vietas), kurkite ir valdytkite GPX kelius, naudojkite kontūro linijos vizualizaciją ir aukščio info (įskiepių pagalba), pasirinkite vairavimo, dviračių, pėsčiųjų režimus, redaguokite OSM duomenis ir daug daugiau. + OsmAnd (OSM Automated Navigation Directions) yra žemėlapio ir navigacijos programa su prieiga prie nemokamų, pasaulinių ir aukštos kokybės OpenStreetMap (OSM) duomenų. +\n +\nNaudokitės balso ir vaizdo navigatoriumi, peržiūrėkite LV (lankytinas vietas), kurkite ir valdytkite GPX kelius, naudojkite kontūro linijos vizualizaciją ir aukščio info (įskiepių pagalba), pasirinkite vairavimo, dviračių, pėsčiųjų režimus, redaguokite OSM duomenis ir daug daugiau. Nuostatos pavadinimas Bakstelėję veiksmo mygtuką pridėsite žemėlapio žymeklį ekrano centre. Bakstelėję veiksmo mygtuką pridėsite garso įrašą ekrano centre. diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index bff5af5293..7c3e0695ce 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -1526,7 +1526,7 @@ Taledataversjon som ikke støttes Sporer posisjonen din mens skjermen er slått av. Favoritter delt via OsmAnd - Lagre data som GPX-fil eller importere rutepunkter til Favoritter\? + Lagre data som GPX-fil eller importere rutepunkter til favoritter\? Format for geografiske koordinater. Koordinatformat Søk @@ -3919,4 +3919,18 @@ Vanlig sykling Tjenerfeil: %1$s Navnet finnes allerede + Analyser ved intervaller (delt intervall) + Ruteavvik + Stor lastebil + Slett denne nettbaserte rutingsmotoren\? + Les hele + Slett rutepunkt + Luke + Logg inn på OpenStreetMap + Logg inn + Tidsforbruk + Ankomst + Rediger beskrivelse + Kopier til kartmarkører + Kopier til favoritter \ No newline at end of file diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml index 012850fd00..6d4c127831 100644 --- a/OsmAnd/res/values-nl/strings.xml +++ b/OsmAnd/res/values-nl/strings.xml @@ -931,7 +931,7 @@ %1$d resterende bestanden %1$d resterende bestanden nog te downloaden Volledige versie - Annuleer route + Annuleer route \? Stop navigatie Bestemming wissen Gebruik magnetische sensor in plaats van oriëntatiesensor voor het kompas. @@ -2178,8 +2178,8 @@ Tijdsduur Tijd in beweging Rijstijl - Gebruik hoogtegegevens - Factor in hoogtegegevens (van SRTM, ASTER en EU-DEM data). + Hoogtegegevens gebruiken + Gebruik hoogtegegevens (van SRTM, ASTER en EU-DEM data) bij bepalen route. Track Rechts rijdend Automatisch @@ -3320,9 +3320,9 @@ Route herberekening Meld Gebruikersnaam en wachtwoord - Deze instellingen hebben betrekking op alle profielen + Deze plugin-instellingen hebben betrekking op alle profielen OSM Bewerking - U kan al uw niet geüploade bewerkingen of OSM fouten zien in %1$s. Geüploade punten ziet u niet meer. + U kunt alle niet-geüploade bewerkingen of OSM-opmerkingen zien in %1$s. Geüploade wijzigingen ziet u niet meer. OSM Tijdens navigatie of beweging getoond icoon. Bij rust getoond icoon. @@ -3667,8 +3667,8 @@ Volgende segment Alle volgende segmenten Alle volgende segmenten worden opnieuw berekend met het geselecteerde profiel. - De ganse track - De ganse track wordt herberekend volgens het geselecteerde profiel. + De gehele route + De gehele route wordt herberekend volgens het geselecteerde profiel. Punt van de track om te navigeren Bewaar als nieuw trackbestand Bewaar als nieuwe track @@ -3726,31 +3726,31 @@ Plan een route Gebruik de twee-fase A* route berekening methode Grafiek - Wacht op de herberekening van de route. -\nDe grafiek is beschikbaar na herberekening. + Wacht totdat route herberekend is. +\nNa herberekening is de grafiek zichtbaar. %1$s — %2$s Kies een trackbestand om te volgen of importeer het, vanaf uw apparaat. - Kloof - Op maat + Onderbreking + Aangepast Voer een OAuth-login uit om osm edit functies te gebruiken - "• Bijgewerkte app- en profielinstellingen: instellingen zijn nu gerangschikt op type. Elk profiel kan afzonderlijk worden aangepast. + • Bijgewerkte app- en profielinstellingen: instellingen zijn nu gerangschikt op type. Elk profiel kan afzonderlijk worden aangepast. \n -\n • Nieuw dialoogvenster voor het downloaden van kaarten waarin wordt voorgesteld een kaart te downloaden tijdens het browsen +\n • Nieuw dialoogvenster voor het downloaden van kaarten waarin wordt voorgesteld een kaart te downloaden tijdens het browsen \n -\n • Donkere thema-fixes +\n • Donkere thema-fixes \n -\n • Verschillende routeringsproblemen over de hele wereld opgelost +\n • Verschillende routeringsproblemen over de hele wereld opgelost \n -\n • Bijgewerkte basiskaart met meer gedetailleerd wegennet +\n • Bijgewerkte basiskaart met meer gedetailleerd wegennet \n -\n • Vaste overstroomde gebieden over de hele wereld +\n • Vaste overstroomde gebieden over de hele wereld \n -\n • Skirouting: hoogteprofiel en routecomplexiteit toegevoegd aan de routedetails +\n • Skirouting: hoogteprofiel en routecomplexiteit toegevoegd aan de routedetails \n -\n • Andere bugs opgelost +\n • Andere bugs opgelost \n -\n" - "• Profielen: nu kunt u de volgorde wijzigen, het pictogram voor de kaart instellen, alle instellingen voor basisprofielen wijzigen en ze terugzetten naar de standaardinstellingen +\n + • Profielen: nu kunt u de volgorde wijzigen, het pictogram voor de kaart instellen, alle instellingen voor basisprofielen wijzigen en ze terugzetten naar de standaardinstellingen \n \n • Exitnummer toegevoegd in de navigatie \n @@ -3758,23 +3758,23 @@ \n \n • Herwerkt instellingenscherm voor snelle toegang tot alle profielen \n -\n • Optie toegevoegd om instellingen van een ander profiel te kopiëren +\n • Optie toegevoegd om instellingen van een ander profiel te kopiëren \n -\n • Mogelijkheid toegevoegd om een volgorde te wijzigen of POI-categorieën in Zoeken te verbergen +\n • Mogelijkheid toegevoegd om een volgorde te wijzigen of POI-categorieën in Zoeken te verbergen \n -\n • Correct uitgelijnde POI-pictogrammen op de kaart +\n • Correct uitgelijnde POI-pictogrammen op de kaart \n -\n • Zonsondergang / zonsopganggegevens toegevoegd om de kaart te configureren +\n • Zonsondergang / zonsopganggegevens toegevoegd om de kaart te configureren \n -\n • Thuis/werk-pictogrammen toegevoegd op de kaart +\n • Thuis/werk-pictogrammen toegevoegd op de kaart \n -\n • Ondersteuning toegevoegd voor meerdere regels beschrijving bij Instellingen +\n • Ondersteuning toegevoegd voor meerdere regels beschrijving bij Instellingen \n \n • Correcte transliteratie toegevoegd aan de kaart van Japan \n -\n • Antarctica-kaart toegevoegd +\n • Antarctica-kaart toegevoegd \n -\n" +\n Wat is er nieuw Voor sneeuwscooter, rijden met speciale wegen en tracks. Stel aantal werkdagen in om door te gaan @@ -3837,47 +3837,47 @@ Uitloggen gelukt Bestand is reeds geïmporteerd in OsmAnd Lokale kaarten - Aangenaam + Voorziening Speciaal Transport Onderhoud Symbolen Sport - Noodtoestand + Noodgevallen Reizen Trackbestanden importeren of opnemen Track waypoint toevoegen Opslaan als trackbestand Rec U moet minimaal twee punten toevoegen - Login op OpenStreetMap - Login op OpenStreetMap.org - Login met OpenStreetMap - U moet inloggen om nieuwe of gewijzigde wijzigingen te uploaden. + Inloggen bij OpenStreetMap + Inloggen bij OpenStreetMap.org + Aanmelden via OpenStreetMap (OAuth) + U moet inloggen om wijzigingen te uploaden. \n -\nU kunt inloggen met de veilige OAuth-methode of uw login en wachtwoord gebruiken. - Gebruik uw login gegevens +\nU kunt inloggen met de veilige OAuth-methode of uw loginnaam en wachtwoord gebruiken. + Inloggen met gebruikersnaam en wachtwoord Account - Inloggen + Gebruikersnaam Abonnement beheren Er is een probleem met uw abonnement. Klik op de knop om naar de Google Play-abonnementsinstellingen te gaan om uw betalingsmethode te corrigeren. OsmAnd Live-abonnement is verlopen OsmAnd Live-abonnement is gepauzeerd - Het OsmAnd Live-abonnement is op wacht gezet - Markeervlaggen geschiedenis + Het OsmAnd Live-abonnement is opgeschort + Markeervlaggetjes-geschiedenis Stuur het GPX-bestand naar OpenStreetMap Voer tags in, gescheiden door komma\'s. - Openbaar betekent dat de trace openbaar zal worden getoond in Uw GPS-sporen en in openbare GPS-traceerlijsten. Gegevens die via de API worden geleverd, verwijzen niet naar uw traceerpagina. Tijdaanduidingen van de traceerpunten zijn niet beschikbaar via de openbare GPS-API en de punten zijn niet chronologisch gerangschikt. Andere gebruikers kunnen de onbewerkte tracering echter nog steeds downloaden van de openbare traceringslijst en eventuele tijdaanduiding erin. - Privé betekent dat de trace niet in openbare vermeldingen zal verschijnen, maar trackpoints ervan zullen nog steeds beschikbaar zijn via de openbare GPS API zonder tijdaanduiding, maar zullen niet chronologisch worden gerangschikt. - Identificeerbaar betekent dat de trace openbaar wordt getoond in uw GPS-sporen en in openbare GPS-trace-lijsten, dat wil zeggen dat andere gebruikers de onbewerkte trace kunnen downloaden en deze aan uw gebruikersnaam kunnen koppelen. Gegevens die via de trackpoints-API worden aangeboden, verwijzen naar uw oorspronkelijke tracepagina. Tijdaanduidingen van de traceerpunten zijn beschikbaar via de openbare GPS-API. - Trackbaar betekent dat de trace niet in openbare vermeldingen zal verschijnen, maar trackpoints ervan zullen nog steeds beschikbaar zijn via de openbare GPS API met tijdaanduiding. Andere gebruikers kunnen alleen verwerkte trackpoints downloaden van uw trace die niet rechtstreeks aan u kunnen worden gekoppeld. + \"Publiek\" betekent dat de track openbaar wordt getoond in \"Jouw GPS-tracks\" en in openbare GPS-track-lijsten. Trackpoints die d.m.v. de API worden gedownload zullen niet aan je oorspronkelijke trackpagina refereren. Tijden in de tracks zijn niet beschikbaar in de publieke GPS API, maar de punten zullen wel chronologisch geordend zijn. Echter, andere gebruikers kunnen de track van de openbare GPS-track-lijsten downloaden met alle tijdinformatie. + \"Persoonlijk\" betekent dat de track niet wordt getoond in openbare GPS-track-lijsten, maar de trackpunten zijn wel beschikbaar in volgorde van tijd door de publieke GPS API, maar zonder tijdinformatie. + \"Identificeerbaar\" betekent dat de trace openbaar wordt getoond in uw GPS-sporen en in openbare GPS-trace-lijsten. Dat wil zeggen dat andere gebruikers de onbewerkte trace kunnen downloaden en deze aan uw gebruikersnaam kunnen koppelen. Gegevens die via de trackpoints-API worden aangeboden, verwijzen naar uw oorspronkelijke tracepagina. Tijdaanduidingen van de traceerpunten zijn beschikbaar via de openbare GPS-API. + \"Traceerbaar\" betekent dat de track niet wordt getoond in openbare GPS-track-lijsten maar de trackpunten zijn wel beschikbaar door de publieke GPS API met tijdinformatie. Andere gebruikers kunnen alleen bewerkte trackpunten downloaden die niet aan jou herleid kunnen worden. Sluit OSM Note Opmerking maken bij OSM-nota - U kunt inloggen met de veilige OAuth-methode of uw login en wachtwoord gebruiken. + U kunt inloggen met de veilige OAuth-methode, of uw loginnaam en wachtwoord gebruiken. Een foto toevoegen Registreer u op \nOpenPlaceReviews.org - Foto\'s zijn afkomstig van het open data-project OpenPlaceReviews.org. Om uw foto\'s te uploaden, moet u zich aanmelden op deze website. + Foto\'s zijn afkomstig van het open data-project OpenPlaceReviews.org. Om uw foto\'s te uploaden, moet u zich aanmelden op hun website. Maak een nieuw account aan Ik heb al een account %1$s * %2$s @@ -3954,4 +3954,48 @@ Laat regelmatig droogvallende waterwegen toe Geef een parameter Laat leeg indien niet + Analyseren met intervallen + Uploaden naar OpenStreetMap + GPX-track bewerken + GPX-track hernoemen + Map wijzigen + sec + Bij nadering + Bij passeren + Ruime vooraankondiging + Vooraankondiging + Afwijking van de route + Aankomst op bestemming + Bocht + Tijd- en afstandsintervallen + De aankondigingstijd van verschillende aankondigen hangt af van type en huidige snelheid. + Aankondigingstijd + Start opname + Toon GPX-track op de kaart + Rolstoel + Hiken + Wandelen + Elektische Fiets + Mountainbiken + Fietsen + Normaal Fietsen + Vrachtwagen + Kleine Vrachtwagen + Vrachtwagen + Scooter + Racefiets + Mountainbike + Server fout: %1$s + Deze naam bestaat al + Deze Online-routeservice verwijderen\? + Helemaal inlezen + Beschrijving bewerken + Waypoints verwijderen + Kopiëren naar Markeervlaggetjes + Kopiëren naar Favorieten + Opladen + Opladen voltooid + Aan het opladen %1$d van %2$d + Opgeladen %1$d van %2$d + Selecteer de op te laden wijzigingen \ No newline at end of file diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index 04170526ec..dc7dcf24c9 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -2345,7 +2345,7 @@ Średnia %1$d z %2$d Podjazd/zjazd - Czas w ruchu + Czas poruszania Maks./min. Zatrzymaj/wznów nawigację Przycisk do wstrzymania lub wznowienia nawigacji. @@ -3998,4 +3998,14 @@ Taka nazwa już istnieje Silnik wyznaczania tras online Silniki wyznaczania tras online + Przeczytaj całość + Edytuj opis + Usuń punkty trasy + Skopiuj do znaczników mapy + Skopiuj do ulubionych + Wysyłanie + Przesyłanie zakończone + Przesyłanie %1$d z %2$d + Przesłano %1$d z %2$d + Wybierz zmiany do przesłania \ No newline at end of file diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml index 44ac4e79b6..023809b5ae 100644 --- a/OsmAnd/res/values-pt-rBR/strings.xml +++ b/OsmAnd/res/values-pt-rBR/strings.xml @@ -4001,4 +4001,9 @@ Copiar para favoritos Excluir este mecanismo de roteamento online\? Ler na íntegra + Carregando + Carreamento concluído + Carregando %1$d de %2$d + Carregado %1$d de %2$d + Selecione as edições para carregamento \ No newline at end of file diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 33236ca153..5747a78d85 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -1185,7 +1185,7 @@ Нет маршрута Включите GPS в настройках Показывать направление к пункту назначения - Включите плагин «Запись поездки» для использования сервисов мониторинга (запись GPX, сопровождение в реальном времени) + Включите плагин «Запись поездки» для использования служб мониторинга (запись GPX, сопровождение в реальном времени) Выберите цветовую схему дорог: Цветовая схема дорог Ш %1$.3f Д %2$.3f @@ -1731,7 +1731,7 @@ выбранные Нет Отменить выбор - Отменить выбор всех + Отменить выбор Поделиться Мои места Избранные @@ -3225,7 +3225,7 @@ \n Контурные линии и затенение рельефа Предпочитать грунтовые дороги - Предпочитать грунтовые дороги. + Предпочитать грунтовые дороги Вы уверены, что хотите обновить все карты (%1$d)\? Вы можете применить это ко всем или только к выбранному профилю. Общий @@ -3713,7 +3713,7 @@ Удалить ближайший пункт Задайте название точки Следующая точка маршрута будет удалена. Если это конечный пункт, навигация завершится. - Информация о достопримечательностях из Википедии. Ваш карманный офлайн-путеводитель — просто включите плагин Википедии и читайте об объектах вокруг вас. + Информация о достопримечательностях из Википедии, карманного автономного путеводителя со статьями о местах и направлениях. Скачать карты Википедии Эндуро мотоцикл Мотороллер @@ -3937,4 +3937,59 @@ Папки Выбор папки Выберите папку или добавьте новую + Время голосовых подсказок + Можно использовать данные о высотах для учёта подъёма/спуска поездки + Предпочитать пешеходные маршруты + Подтип + Введите параметр + Пешеход + Самокат + Анализ по интервалам (по отдельности) + Заблаговременно + Заранее + При прохождении + При приближении + Инвалидная коляска + Пеший туризм + Малый грузовик + Грузовик + Копировать в маркеры + Копировать в избранное + Удалить онлайн-маршрутизатор\? + Предпочитать пешеходные маршруты + Добавить онлайн-маршрутизатор + Редактировать онлайн-маршрутизатор + Ключ API + URL-адрес сервера + Оставить пустым, если не + URL со всеми параметрами будет выглядеть так: + Тест расчёта маршрута + Автомобиль + Онлайн-маршрутизатор + Онлайн-маршрутизаторы + Пусто + Отправить в OpenStreetMap + Редактировать трек + Переименовать трек + Изменить папку + сек. + Вне маршрута + Прибытие в пункт назначения + Поворот + Интервалы времени и расстояния + Время объявления + Время объявления различных голосовых подсказок зависит от типа подсказки, текущей скорости навигации и скорости навигации по умолчанию. + Начать запись + Показать трек на карте + Ошибка сервера: %1$s + Имя уже существует + Читать полностью + Редактировать описание + Удалить путевые точки + HGV + Отправка + Отправка завершена + Отправка %1$d из %2$d + Отправлено %1$d из %2$d + Выберите правки для отправки \ No newline at end of file diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml index c0caa235d6..020b6b3915 100644 --- a/OsmAnd/res/values-sc/strings.xml +++ b/OsmAnd/res/values-sc/strings.xml @@ -3982,4 +3982,21 @@ MTB (motosilurante) Errore de su serbidore: %1$s Su nùmene esistit giai + Analiza pro intervallos (intervallu fratzionadu) + Càrriga in OpenStreetMap + Modìfica sa rasta + Modìfica su nùmene de sa rasta + Càmbia sa cartella + seg + Iscantzellare custu motore de càrculu in lìnia\? + Leghe totu + Modìfica sa descritzione + Iscantzella sos puntos de coladòrgiu + Còpia in sos marcadores de sa mapa + Còpia in sos preferidos + Carrighende + Carrigamentu acabadu + Carrighende %1$d de %2$d + %1$d de %2$d carrigados + Ischerta modìficas de carrigare \ No newline at end of file diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml index 95f34a3db1..84b80a03a8 100644 --- a/OsmAnd/res/values-sk/strings.xml +++ b/OsmAnd/res/values-sk/strings.xml @@ -2434,7 +2434,7 @@ Priemer %1$d z %2$d Stúpanie/Klesanie - Trvanie presunu + Čas v pohybe Max/Min Pozastaviť/pokračovať navigáciu Tlačidlo pre pozastavenie alebo pokračovanie navigácie. @@ -3995,4 +3995,15 @@ Chyba servera: %1$s Názov už existuje Odbočiť + Odstrániť túto online navigačnú službu\? + Prečítať celé + Upraviť popis + Odstrániť body trasy + Skopírovať do mapových značiek + Skopírovať do obľúbených + Odosielanie + Odoslanie dokončené + Odosiela sa %1$d z %2$d + Odoslané %1$d z %2$d + Zvoľte úpravy na odoslanie \ No newline at end of file diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index 89091ce1d4..b453cd4b40 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -3275,14 +3275,14 @@ Izberi mapo Izberi mapo ali dodaj novo Prazno - Analiziraj po intervalih (razdelitveni interval) + Preuči po intervalih (razdelitveni interval) Naloži v OpenStreetMap Uredi sled Preimenuj sled Spremeni mapo sek Pristop - Pripravi se + Pripravljanje Izven poti Prihod na cilj Zavoj @@ -3296,7 +3296,7 @@ Električno kolesarjenje Gorsko kolesarjenje Cestno kolesarjenje - Redno kolesarjenje + Mestno kolesarjenje Težko tovorno vozilo Majhno tovorno vozilo Tovorno vozilo @@ -3305,4 +3305,55 @@ MTB Napaka strežnika: %1$s To ime že obstaja + Preberi v celoti + Uredi opis + Brisanje točk + Kopiraj na oznake na zemljevidu + Na napravi ni dovolj prostora. + Izbor skupin za uvoz. + Izbor predmetov za uvoz. + Dodaj na Mapillary + Dodaj na OpenPlaceReviews + Za preizkušanje pošiljanja sporočil, točk in sledi GPX preklopi iz openstreetmap.org na preizkusni dev.openstreetmap.org. + Uporabi dev.openstreetmap.org + Program podpira prikaz fotografij različnih virov: +\nOpenPlaceReviews – fotografije točk POI; +\nMapillary – ulična fotografija; +\nSplet / Wikimedia – fotografije točk POI in OpenStreetMap. + %1$s * %2$s + Dodaj nov del poti + Lahko letalo + Združi dele poti + Razdeli pred + Razdeli po + Profil OsmAnd + Uporabniški profil + Obrni vse točke + Izbor profila, ki bo prikazan ob zagonu programa. + Nazadnje uporabljeno + Podvrsta + Vozilo + Ključ API + Naslov URL strežnika + Vpis parametrov + Naslov URL z vsemi parametri bo zapisan kot: + Preizkusi izračun poti + Vožnja + Hoja + Kolo + Avto + Kopiraj naslov + Dolgo pripravljanje + Pokaži sled na zemljevidu + Raven približanja + Prosojnost + Legenda + Prikaz višinskega senčenja na zemljevidu. Več o tem je mogoče prebrati na spletni strani programa. + Senčenje + Kopiraj med priljubljene + Poteka pošiljanje + Pošiljanje je končano + Poteka pošiljanje %1$d od %2$d + Poslano %1$d od %2$d + Izbor sprememb za pošiljanje \ No newline at end of file diff --git a/OsmAnd/res/values-tr/phrases.xml b/OsmAnd/res/values-tr/phrases.xml index 2fe8bccf32..b76cd1cada 100644 --- a/OsmAnd/res/values-tr/phrases.xml +++ b/OsmAnd/res/values-tr/phrases.xml @@ -299,14 +299,14 @@ Kağıt Giyim Kutular - Cam şişeler + Cam şişeleri Plastik Hurda metal Piller Plastik şişeler Yeşil atık Atık (siyah çanta) - Plastik Ambalaj + Plastik ambalaj Gazete Kartonlar Mukavva @@ -316,11 +316,11 @@ Ahşap Kitaplar Ayakkabı - alüminyum + Alüminyum Organik İçecek kartonları Bahçe atıkları - Düşük enerji Ampüller + Düşük enerjili ampüller Floresan tüpler Metal Elektrik ögeleri @@ -329,16 +329,16 @@ Motor yağı Plastik torbalar Tehlikeli atık - Cep telefonları + Cep telefonu Cıva Bilgisayarlar - Lastikler + Araba lastiği TV, monitör Karton kutu Moloz CD Atık yağ - Şişe + Şişeler Tıpa Yazıcı kartuşları Sac metal @@ -349,7 +349,7 @@ Gübre Zor Noel ağaçları - Işık Ampülleri + Ampüller Sunta Polyester Alçıpan @@ -584,7 +584,7 @@ İbadethane Hristiyanlık Yahudilik - İslami + İslam Sih dini Budizm Hinduizm @@ -823,9 +823,9 @@ Muhasebeci Bitcoin ödeme Mağara girişi - Dağın tepesi + Zirve Eyer - Volkan + Yanardağ Krater Sırt Buzul @@ -896,13 +896,13 @@ İbranice wiki Hintçe wiki Hırvatça wiki - Haiti dilinde wiki + Haitice wiki Macarca wiki Endonezyaca wiki İtalyanca wiki Letonca wiki Malayca wiki - Newar dilinde wiki + Nevarca wiki Flemenkçe wiki Norveççe Nynorsk wiki Norveççe wiki @@ -1385,7 +1385,7 @@ Enerji kaynağı: dizel Uluslararası isim Ulusal isim - Bölgesel isim + Yerel ad Yerel isim Eski isim Alternatif isim @@ -1679,12 +1679,12 @@ Sadece glutensiz Glutensiz Glutensiz diyet: hayır - Sadece kosher + Sadece koşer Kosher - Kosher diyet: hayır + Koşer gıda: hayır Sadece helal Helal - Helal diyet: hayır + Helal gıda: hayır Sadece laktozsuz Laktozsuz Laktozsuz diyet: hayır @@ -1718,7 +1718,7 @@ Vejetaryen Vegan Glutensiz - Kosher + Koşer Helal Laktozsuz Evet @@ -1902,7 +1902,7 @@ FAA kodu Sanat eseri türü: heykel İnternet erişimi var - Nakit para çekme + Nakit çekme Salıncak kapı Kent at arabası boşluğu Rüzgar tarafından düşürülen @@ -2283,7 +2283,7 @@ Uygarlık: nuragic (MÖ 18. yy – MS 2. yy) Uygarlık: etrüsk (MÖ 12. – 6. yy) Uygarlık: tarih öncesi - Uygarlık: antik yunan + Uygarlık: eski yunan Uygarlık: roma Uygarlık: bizans (MS 285 – MS 1453) Uygarlık: çin imparatorluğu (MÖ 221 – MS 1911) @@ -2291,7 +2291,7 @@ Uygarlık: kelt Uygarlık: batı roma (MS 285 – MS 476) Uygarlık: miken - Uygarlık: dacian + Uygarlık: daçya Uygarlık: hernici Uygarlık: yunan mısırı (MÖ 332 – MÖ 30) Uygarlık: roma ve bizans mısırı @@ -2309,10 +2309,10 @@ SMS Durum Tür - Tarihi çağ: kalkolitik (MÖ 4.–3. milenyum) - Tarihi çağ: neolitik - Tarihi çağ: mezolitik - Tarihi çağ: paleolitik (günümüzden 2,6 milyon yıl önce – 10000 yıl önce) + Tarihi çağ: bakır taş (MÖ 4.–3. milenyum) + Tarihi çağ: cilalı taş + Tarihi çağ: orta taş + Tarihi çağ: yontma taş (günümüzden 2,6 milyon yıl önce – 10000 yıl önce) Tarihi dönem: imparatorluk (dönem V, MS 900 – MS 1200 Tarihi dönem: klasik (dönem IV, MS 374 – MS 900) Tarihi dönem: kentsel (dönem III, MS 133 – MS 374) @@ -2892,18 +2892,18 @@ Waffle Krep Falafel - Taco + Tako Kantin Tuzlu krep Kızarmış tavuk Kuskus Fırın Bistro - Kızarmış yiyecekler + Kızartma Dondurulmuş yoğurt Şarküteri Turta - Çay dükkanı + Çaycı Sağlık çalışanının rolü: büyücü Sağlık çalışanının rolü: teknisyen Sağlık çalışanının rolü: doktor asistanı @@ -3138,4 +3138,100 @@ Ağır yük aracı erişimi: tarım Ağır yük aracı erişimi: hayır Ağır yük aracı erişimi: özel + Göl + Irmak + Kuyu + Aşılama: Kovid-19 + Hemşire + Hayır + Evet + Hayır + Evet + Hayır + Evet + Çerezci + Arı kovanı + Sadece yürümeye izin verildiğinde + İnternet erişimi: müşteriler + Püskürme sayısı + Son püskürme + Mezar + Girocard + Nakit çekme ücreti: hayır + Nakit çekme ücreti: evet + Nakit çekme para birimi + Nakit çekme + Nakit çekme: evet + Evet + Evet + Evet + Evet + Evet + Serbest + Evet + Evet + Evet + Evet + Evet + Serbest + Evet + Taksi erişimi: hayır + Taksi erişimi: evet + Tarım aracı erişimi: hayır + Tarım aracı erişimi: evet + Kar arabası erişimi: hayır + Kar arabası erişimi: özel + Otobüs erişimi: hayır + Karavan erişimi: hayır + Yaya erişimi: müşteriler + Yaya erişimi: serbest + Yaya erişimi: hayır + Yaya erişimi: özel + Yaya erişimi: evet + At erişimi: serbest + At erişimi: özel + Bisiklet erişimi: müşteriler + Bisiklet erişimi: serbest + Bisiklet erişimi: özel + Moped erişimi: hayır + Motorsiklet erişimi: özel + Araç erişimi: askerî + Araç erişimi: müşteriler + Araç erişimi: serbset + Araç erişimi: hayır + Araç erişimi: özel + Araç erişimi: evet + Metro + Tıp laboratuvarı + Kalıntılar + Temassız kabul edilmiyor + Temassız + Lastikler + Araba parçaları + Tarım mağazası + Tür: otlak + Tırmanma güzergahları + Buz: hayır + Buz: evet + Spor: hayır + Spor: evet + Para gönderme + Konum: köprü + Kano: hayır + Kano: evet + Kayaklar: hayır + Kayaklar: evet + Kuşçuluk + Safari parkı + Lokomotif + Gıdon + Trafik aynası + Yazıt: KD + Yazıt: D + Yazıt: GD + Yazıt: G + Yazıt: GB + Yazıt: B + Yazıt: KB + Yazıt: K \ No newline at end of file diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml index 02664a0a1e..1f9d208ac4 100644 --- a/OsmAnd/res/values-tr/strings.xml +++ b/OsmAnd/res/values-tr/strings.xml @@ -2332,7 +2332,7 @@ Otomatik-sesli-bildirim periyodu Uğranacak-ara-noktalar bulunamadı İspanyolca (Amerikan) - Hareket Zamanı + Hareket halindeki zaman Plan seçin Çevrim dışı seyahat rehberi işlevselliğini almak için aşağıdakilerden birini satın alın: Uygun ögeyi seçin @@ -4007,4 +4007,9 @@ Bu çevrim içi yönlendirme motoru silinsin mi\? Tamamını oku Açıklamayı düzenle + Karşıya yükleniyor + Karşıya yükleme tamamlandı + %1$d / %2$d karşıya yükleniyor + %1$d / %2$d karşıya yüklendi + Karşıya yüklenecek düzenlemeleri seçin \ No newline at end of file diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml index f180654a56..f724876c74 100644 --- a/OsmAnd/res/values-uk/strings.xml +++ b/OsmAnd/res/values-uk/strings.xml @@ -2436,7 +2436,7 @@ Середнє %1$d зі %2$d Підйом/спуск - Час руху + Час у русі Макс/мін Мін/макс Напівпрозорий рожевий @@ -4005,4 +4005,9 @@ Видалити маршрутні точки Копіювати до позначок мапи Копіювати до закладок + Вивантаження + Вивантаження завершено + Вивантаження %1$d з %2$d + Вивантажено %1$d з %2$d + Виберіть зміни для вивантаження \ No newline at end of file diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 2c86df4178..9b601f4c19 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -2430,7 +2430,7 @@ 平均 %1$d 的 %2$d 上升/下降 - 移動時間 + 運動時間 最大/最小 最小/最大 半透明粉紅色 @@ -3993,4 +3993,15 @@ 登山車 伺服器錯誤：%1$s 名稱已存在 + 刪除此線上路線引擎？ + 讀取全部 + 編輯描述 + 刪除航點 + 複製到地圖標記 + 複製到收藏 + 正在上傳 + 已完成上傳 + 正在上傳 %1$d，共 %2$d + 已上傳 %1$d，共 %2$d + 選取要上傳的檔案 \ No newline at end of file diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 2c3358dda4..1d23e9db07 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -12,6 +12,7 @@ --> + Hillshade / Slope / Contour lines Select edits for upload Uploaded %1$d of %2$d Uploading %1$d of %2$d @@ -55,7 +56,7 @@ Rename track Edit track Upload to OpenStreetMap - Analyze by intervals (split interval) + Analyze split intervals Empty Select folder or add new one Select folder diff --git a/OsmAnd/res/xml/data_storage.xml b/OsmAnd/res/xml/data_storage.xml index a153ec4cd1..173907c8b0 100644 --- a/OsmAnd/res/xml/data_storage.xml +++ b/OsmAnd/res/xml/data_storage.xml @@ -14,10 +14,10 @@ android:title="@string/shared_string_maps"/> + android:title="@string/hillshade_slope_contour_lines"/> settingsTypeKeys, boolean replace, - String latestChanges, int version) { + public boolean importProfileV2(final Uri profileUri, List settingsTypeKeys, boolean replace, + boolean silent, String latestChanges, int version) { if (profileUri != null) { Bundle bundle = new Bundle(); - bundle.putStringArrayList(SettingsHelper.SETTINGS_TYPE_LIST_KEY, settingsTypeKeys); + bundle.putStringArrayList(SettingsHelper.SETTINGS_TYPE_LIST_KEY, new ArrayList<>(settingsTypeKeys)); bundle.putBoolean(REPLACE_KEY, replace); - bundle.putBoolean(SILENT_IMPORT_KEY, true); + bundle.putBoolean(SILENT_IMPORT_KEY, silent); bundle.putString(SettingsHelper.SETTINGS_LATEST_CHANGES_KEY, latestChanges); bundle.putInt(SettingsHelper.SETTINGS_VERSION_KEY, version); diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java index ed7ab614f3..fcd5d5159e 100644 --- a/OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java +++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlServiceV2.java @@ -1270,7 +1270,7 @@ public class OsmandAidlServiceV2 extends Service implements AidlCallbackListener try { OsmandAidlApi api = getApi("importProfile"); return api != null && api.importProfileV2(params.getProfileSettingsUri(), params.getSettingsTypeKeys(), - params.isReplace(), params.getLatestChanges(), params.getVersion()); + params.isReplace(), params.isSilent(), params.getLatestChanges(), params.getVersion()); } catch (Exception e) { handleException(e); return false; diff --git a/OsmAnd/src/net/osmand/plus/UiUtilities.java b/OsmAnd/src/net/osmand/plus/UiUtilities.java index 8d3a6d35bf..aaa9d01f8b 100644 --- a/OsmAnd/src/net/osmand/plus/UiUtilities.java +++ b/OsmAnd/src/net/osmand/plus/UiUtilities.java @@ -51,6 +51,7 @@ import net.osmand.AndroidUtils; import net.osmand.Location; import net.osmand.PlatformUtil; import net.osmand.data.LatLon; +import net.osmand.plus.helpers.AndroidUiHelper; import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.views.DirectionDrawable; import net.osmand.plus.widgets.TextViewEx; @@ -87,6 +88,7 @@ public class UiUtilities { public enum CustomRadioButtonType { START, + CENTER, END, } @@ -454,10 +456,10 @@ public class UiUtilities { int radius = AndroidUtils.dpToPx(app, 4); boolean isLayoutRtl = AndroidUtils.isLayoutRtl(app); - TextView startButtonText = buttonsView.findViewById(R.id.left_button); View startButtonContainer = buttonsView.findViewById(R.id.left_button_container); - TextView endButtonText = buttonsView.findViewById(R.id.right_button); + View centerButtonContainer = buttonsView.findViewById(R.id.center_button_container); View endButtonContainer = buttonsView.findViewById(R.id.right_button_container); + GradientDrawable background = new GradientDrawable(); background.setColor(UiUtilities.getColorWithAlpha(activeColor, 0.1f)); background.setStroke(AndroidUtils.dpToPx(app, 1), UiUtilities.getColorWithAlpha(activeColor, 0.5f)); @@ -467,20 +469,56 @@ public class UiUtilities { } else { background.setCornerRadii(new float[]{radius, radius, 0, 0, 0, 0, radius, radius}); } + TextView startButtonText = startButtonContainer.findViewById(R.id.left_button); + TextView endButtonText = endButtonContainer.findViewById(R.id.right_button); + endButtonContainer.setBackgroundColor(Color.TRANSPARENT); endButtonText.setTextColor(activeColor); startButtonContainer.setBackgroundDrawable(background); startButtonText.setTextColor(textColor); + + if (centerButtonContainer != null) { + TextView centerButtonText = centerButtonContainer.findViewById(R.id.center_button); + centerButtonText.setTextColor(activeColor); + centerButtonContainer.setBackgroundColor(Color.TRANSPARENT); + } + } else if (buttonType == CustomRadioButtonType.CENTER) { + background.setCornerRadii(new float[] {0, 0, 0, 0, 0, 0, 0, 0}); + centerButtonContainer.setBackgroundDrawable(background); + AndroidUiHelper.updateVisibility(centerButtonContainer, true); + + TextView centerButtonText = centerButtonContainer.findViewById(R.id.center_button); + centerButtonText.setTextColor(textColor); + + if (endButtonContainer != null) { + TextView endButtonText = endButtonContainer.findViewById(R.id.right_button); + endButtonText.setTextColor(activeColor); + endButtonContainer.setBackgroundColor(Color.TRANSPARENT); + } + if (startButtonContainer != null) { + TextView startButtonText = startButtonContainer.findViewById(R.id.left_button); + startButtonText.setTextColor(activeColor); + startButtonContainer.setBackgroundColor(Color.TRANSPARENT); + } } else { if (isLayoutRtl) { - background.setCornerRadii(new float[]{radius, radius, 0, 0, 0, 0, radius, radius}); + background.setCornerRadii(new float[] {radius, radius, 0, 0, 0, 0, radius, radius}); } else { background.setCornerRadii(new float[]{0, 0, radius, radius, radius, radius, 0, 0}); } + TextView startButtonText = startButtonContainer.findViewById(R.id.left_button); + TextView endButtonText = endButtonContainer.findViewById(R.id.right_button); + endButtonContainer.setBackgroundDrawable(background); endButtonText.setTextColor(textColor); startButtonContainer.setBackgroundColor(Color.TRANSPARENT); startButtonText.setTextColor(activeColor); + + if (centerButtonContainer != null) { + TextView centerButtonText = centerButtonContainer.findViewById(R.id.center_button); + centerButtonText.setTextColor(activeColor); + centerButtonContainer.setBackgroundColor(Color.TRANSPARENT); + } } } diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java index 12f66f8c49..f15a93aba1 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java @@ -139,7 +139,7 @@ import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.fragments.BaseSettingsFragment; import net.osmand.plus.settings.fragments.BaseSettingsFragment.SettingsScreenType; import net.osmand.plus.settings.fragments.ConfigureProfileFragment; -import net.osmand.plus.settings.fragments.DataStorageFragment; +import net.osmand.plus.settings.datastorage.DataStorageFragment; import net.osmand.plus.track.TrackAppearanceFragment; import net.osmand.plus.track.TrackMenuFragment; import net.osmand.plus.views.AddGpxPointBottomSheetHelper.NewGpxPoint; @@ -651,7 +651,9 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven protected void onNewIntent(final Intent intent) { super.onNewIntent(intent); setIntent(intent); - intentHelper.parseLaunchIntents(); + if (!intentHelper.parseLaunchIntents()) { + intentHelper.parseContentIntent(); + } } @Override diff --git a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java index ff7039702e..e173a49ad1 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java +++ b/OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java @@ -38,10 +38,10 @@ import java.util.Locale; import java.util.Map; public class SavingTrackHelper extends SQLiteOpenHelper { - + public final static String DATABASE_NAME = "tracks"; //$NON-NLS-1$ - public final static int DATABASE_VERSION = 6; - + public final static int DATABASE_VERSION = 7; + public final static String TRACK_NAME = "track"; //$NON-NLS-1$ public final static String TRACK_COL_DATE = "date"; //$NON-NLS-1$ public final static String TRACK_COL_LAT = "lat"; //$NON-NLS-1$ @@ -50,7 +50,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper { public final static String TRACK_COL_SPEED = "speed"; //$NON-NLS-1$ public final static String TRACK_COL_HDOP = "hdop"; //$NON-NLS-1$ public final static String TRACK_COL_HEADING = "heading"; //$NON-NLS-1$ - + public final static String POINT_NAME = "point"; //$NON-NLS-1$ public final static String POINT_COL_DATE = "date"; //$NON-NLS-1$ public final static String POINT_COL_LAT = "lat"; //$NON-NLS-1$ @@ -59,7 +59,9 @@ public class SavingTrackHelper extends SQLiteOpenHelper { public final static String POINT_COL_CATEGORY = "category"; //$NON-NLS-1$ public final static String POINT_COL_DESCRIPTION = "description"; //$NON-NLS-1$ public final static String POINT_COL_COLOR = "color"; //$NON-NLS-1$ - + public final static String POINT_COL_ICON = "icon"; //$NON-NLS-1$ + public final static String POINT_COL_BACKGROUND = "background"; //$NON-NLS-1$ + public final static float NO_HEADING = -1.0f; public final static Log log = PlatformUtil.getLog(SavingTrackHelper.class); @@ -76,8 +78,8 @@ public class SavingTrackHelper extends SQLiteOpenHelper { private SelectedGpxFile currentTrack; private int points; private int trkPoints = 0; - - public SavingTrackHelper(OsmandApplication ctx){ + + public SavingTrackHelper(OsmandApplication ctx) { super(ctx, DATABASE_NAME, null, DATABASE_VERSION); this.ctx = ctx; this.currentTrack = new SelectedGpxFile(); @@ -88,11 +90,14 @@ public class SavingTrackHelper extends SQLiteOpenHelper { prepareCurrentTrackForRecording(); updateScript = "INSERT INTO " + TRACK_NAME + " (" + TRACK_COL_LAT + ", " + TRACK_COL_LON + ", " - + TRACK_COL_ALTITUDE + ", " + TRACK_COL_SPEED + ", " + TRACK_COL_HDOP + ", " - + TRACK_COL_DATE + ", " + TRACK_COL_HEADING + ")" + + TRACK_COL_ALTITUDE + ", " + TRACK_COL_SPEED + ", " + TRACK_COL_HDOP + ", " + + TRACK_COL_DATE + ", " + TRACK_COL_HEADING + ")" + " VALUES (?, ?, ?, ?, ?, ?, ?)"; //$NON-NLS-1$ //$NON-NLS-2$ - insertPointsScript = "INSERT INTO " + POINT_NAME + " VALUES (?, ?, ?, ?, ?, ?, ?)"; //$NON-NLS-1$ //$NON-NLS-2$ + insertPointsScript = "INSERT INTO " + POINT_NAME + " (" + POINT_COL_LAT + ", " + POINT_COL_LON + ", " + + POINT_COL_DATE + ", " + POINT_COL_DESCRIPTION + ", " + POINT_COL_NAME + ", " + + POINT_COL_CATEGORY + ", " + POINT_COL_COLOR + ", " + POINT_COL_ICON + ", " + + POINT_COL_BACKGROUND + ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"; //$NON-NLS-1$ //$NON-NLS-2$ } @Override @@ -100,19 +105,19 @@ public class SavingTrackHelper extends SQLiteOpenHelper { createTableForTrack(db); createTableForPoints(db); } - - private void createTableForTrack(SQLiteDatabase db){ + + private void createTableForTrack(SQLiteDatabase db) { db.execSQL("CREATE TABLE " + TRACK_NAME + " (" + TRACK_COL_LAT + " double, " + TRACK_COL_LON + " double, " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + TRACK_COL_ALTITUDE + " double, " + TRACK_COL_SPEED + " double, " //$NON-NLS-1$ //$NON-NLS-2$ + TRACK_COL_HDOP + " double, " + TRACK_COL_DATE + " long, " + TRACK_COL_HEADING + " float )"); //$NON-NLS-1$ //$NON-NLS-2$ } - - private void createTableForPoints(SQLiteDatabase db){ + + private void createTableForPoints(SQLiteDatabase db) { try { db.execSQL("CREATE TABLE " + POINT_NAME + " (" + POINT_COL_LAT + " double, " + POINT_COL_LON + " double, " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + POINT_COL_DATE + " long, " + POINT_COL_DESCRIPTION + " text, " + POINT_COL_NAME + " text, " - + POINT_COL_CATEGORY + " text, " + POINT_COL_COLOR + " long" + ")"); //$NON-NLS-1$ //$NON-NLS-2$ + + POINT_COL_CATEGORY + " text, " + POINT_COL_COLOR + " long, " + POINT_COL_ICON + " text, " + POINT_COL_BACKGROUND + " text )"); //$NON-NLS-1$ //$NON-NLS-2$ } catch (RuntimeException e) { // ignore if already exists } @@ -120,25 +125,29 @@ public class SavingTrackHelper extends SQLiteOpenHelper { @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - if(oldVersion < 2){ + if (oldVersion < 2) { createTableForPoints(db); } - if(oldVersion < 3){ + if (oldVersion < 3) { db.execSQL("ALTER TABLE " + TRACK_NAME + " ADD " + TRACK_COL_HDOP + " double"); } - if(oldVersion < 4){ - db.execSQL("ALTER TABLE " + POINT_NAME + " ADD " + POINT_COL_NAME + " text"); - db.execSQL("ALTER TABLE " + POINT_NAME + " ADD " + POINT_COL_CATEGORY + " text"); + if (oldVersion < 4) { + db.execSQL("ALTER TABLE " + POINT_NAME + " ADD " + POINT_COL_NAME + " text"); + db.execSQL("ALTER TABLE " + POINT_NAME + " ADD " + POINT_COL_CATEGORY + " text"); } - if(oldVersion < 5){ - db.execSQL("ALTER TABLE " + POINT_NAME + " ADD " + POINT_COL_COLOR + " long"); + if (oldVersion < 5) { + db.execSQL("ALTER TABLE " + POINT_NAME + " ADD " + POINT_COL_COLOR + " long"); } - if(oldVersion < 6){ - db.execSQL("ALTER TABLE " + TRACK_NAME + " ADD " + TRACK_COL_HEADING + " float"); + if (oldVersion < 6) { + db.execSQL("ALTER TABLE " + TRACK_NAME + " ADD " + TRACK_COL_HEADING + " float"); + } + if (oldVersion < 7) { + db.execSQL("ALTER TABLE " + POINT_NAME + " ADD " + POINT_COL_ICON + " text"); + db.execSQL("ALTER TABLE " + POINT_NAME + " ADD " + POINT_COL_BACKGROUND + " text"); } } - - + + public long getLastTrackPointTime() { long res = 0; try { @@ -146,7 +155,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper { if (db != null) { try { Cursor query = db.rawQuery("SELECT " + TRACK_COL_DATE + " FROM " + TRACK_NAME + " ORDER BY " + TRACK_COL_DATE + " DESC", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - if(query.moveToFirst()) { + if (query.moveToFirst()) { res = query.getLong(0); } query.close(); @@ -154,11 +163,11 @@ public class SavingTrackHelper extends SQLiteOpenHelper { db.close(); } } - } catch(RuntimeException e) { + } catch (RuntimeException e) { } return res; } - + public synchronized boolean hasDataToSave() { try { SQLiteDatabase db = getWritableDatabase(); @@ -172,11 +181,11 @@ public class SavingTrackHelper extends SQLiteOpenHelper { } q = db.query(false, POINT_NAME, new String[]{POINT_COL_LAT, POINT_COL_LON}, null, null, null, null, null, null); has = q.moveToFirst(); - while(has) { - if(q.getDouble(0) != 0 || q.getDouble(1) != 0) { + while (has) { + if (q.getDouble(0) != 0 || q.getDouble(1) != 0) { break; } - if(!q.moveToNext()) { + if (!q.moveToNext()) { has = false; break; } @@ -189,7 +198,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper { db.close(); } } - } catch(RuntimeException e) { + } catch (RuntimeException e) { return false; } @@ -294,7 +303,8 @@ public class SavingTrackHelper extends SQLiteOpenHelper { private void collectDBPoints(SQLiteDatabase db, Map dataTracks) { Cursor query = db.rawQuery("SELECT " + POINT_COL_LAT + "," + POINT_COL_LON + "," + POINT_COL_DATE + "," //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - + POINT_COL_DESCRIPTION + "," + POINT_COL_NAME + "," + POINT_COL_CATEGORY + "," + POINT_COL_COLOR + " FROM " + POINT_NAME+" ORDER BY " + POINT_COL_DATE +" ASC", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + POINT_COL_DESCRIPTION + "," + POINT_COL_NAME + "," + POINT_COL_CATEGORY + "," + POINT_COL_COLOR + "," + + POINT_COL_ICON + "," + POINT_COL_BACKGROUND + " FROM " + POINT_NAME + " ORDER BY " + POINT_COL_DATE + " ASC", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ if (query.moveToFirst()) { do { WptPt pt = new WptPt(); @@ -309,18 +319,20 @@ public class SavingTrackHelper extends SQLiteOpenHelper { if (color != 0) { pt.setColor(color); } + pt.setIconName(query.getString(7)); + pt.setBackgroundType(query.getString(8)); // check if name is extension (needed for audio/video plugin & josm integration) - if(pt.name != null && pt.name.length() > 4 && pt.name.charAt(pt.name.length() - 4) == '.') { + if (pt.name != null && pt.name.length() > 4 && pt.name.charAt(pt.name.length() - 4) == '.') { pt.link = pt.name; } - + String date = DateFormat.format("yyyy-MM-dd", time).toString(); //$NON-NLS-1$ GPXFile gpx; if (dataTracks.containsKey(date)) { gpx = dataTracks.get(date); } else { - gpx = new GPXFile(Version.getFullVersion(ctx)); + gpx = new GPXFile(Version.getFullVersion(ctx)); dataTracks.put(date, gpx); } ctx.getSelectedGpxHelper().addPoint(pt, gpx); @@ -329,10 +341,10 @@ public class SavingTrackHelper extends SQLiteOpenHelper { } query.close(); } - + private void collectDBTracks(SQLiteDatabase db, Map dataTracks) { Cursor query = db.rawQuery("SELECT " + TRACK_COL_LAT + "," + TRACK_COL_LON + "," + TRACK_COL_ALTITUDE + "," //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - + TRACK_COL_SPEED + "," + TRACK_COL_HDOP + "," + TRACK_COL_DATE + "," + TRACK_COL_HEADING + " FROM " + TRACK_NAME +" ORDER BY " + TRACK_COL_DATE +" ASC", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + TRACK_COL_SPEED + "," + TRACK_COL_HDOP + "," + TRACK_COL_DATE + "," + TRACK_COL_HEADING + " FROM " + TRACK_NAME + " ORDER BY " + TRACK_COL_DATE + " ASC", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ long previousTime = 0; long previousInterval = 0; TrkSegment segment = null; @@ -351,14 +363,14 @@ public class SavingTrackHelper extends SQLiteOpenHelper { pt.heading = heading == NO_HEADING ? Float.NaN : heading; long currentInterval = Math.abs(time - previousTime); boolean newInterval = pt.lat == 0 && pt.lon == 0; - + if (track != null && !newInterval && (!ctx.getSettings().AUTO_SPLIT_RECORDING.get() || currentInterval < 6 * 60 * 1000 || currentInterval < 10 * previousInterval)) { // 6 minute - same segment segment.points.add(pt); } else if (track != null && (ctx.getSettings().AUTO_SPLIT_RECORDING.get() && currentInterval < 2 * 60 * 60 * 1000)) { // 2 hour - same track segment = new TrkSegment(); - if(!newInterval) { + if (!newInterval) { segment.points.add(pt); } track.segments.add(segment); @@ -367,10 +379,10 @@ public class SavingTrackHelper extends SQLiteOpenHelper { track = new Track(); segment = new TrkSegment(); track.segments.add(segment); - if(!newInterval) { + if (!newInterval) { segment.points.add(pt); } - String date = new SimpleDateFormat("yyyy-MM-dd", Locale.US).format(new Date(time));; //$NON-NLS-1$ + String date = new SimpleDateFormat("yyyy-MM-dd", Locale.US).format(new Date(time)); //$NON-NLS-1$ if (dataTracks.containsKey(date)) { GPXFile gpx = dataTracks.get(date); gpx.tracks.add(track); @@ -411,14 +423,14 @@ public class SavingTrackHelper extends SQLiteOpenHelper { dataTracks.remove(date); } } - + public void startNewSegment() { lastTimeUpdated = 0; lastPoint = null; - execWithClose(updateScript, new Object[] { 0, 0, 0, 0, 0, System.currentTimeMillis(), NO_HEADING}); + execWithClose(updateScript, new Object[]{0, 0, 0, 0, 0, System.currentTimeMillis(), NO_HEADING}); addTrackPoint(null, true, System.currentTimeMillis()); } - + public void updateLocation(net.osmand.Location location, Float heading) { // use because there is a bug on some devices with location.getTime() long locationTime = System.currentTimeMillis(); @@ -459,12 +471,12 @@ public class SavingTrackHelper extends SQLiteOpenHelper { ctx.getNotificationHelper().refreshNotification(NotificationType.GPX); } } - + public void insertData(double lat, double lon, double alt, double speed, double hdop, long time, float heading, - OsmandSettings settings) { + OsmandSettings settings) { // * 1000 in next line seems to be wrong with new IntervalChooseDialog // if (time - lastTimeUpdated > settings.SAVE_TRACK_INTERVAL.get() * 1000) { - execWithClose(updateScript, new Object[] { lat, lon, alt, speed, hdop, time, heading }); + execWithClose(updateScript, new Object[]{lat, lon, alt, speed, hdop, time, heading}); boolean newSegment = false; if (lastPoint == null || (time - lastTimeUpdated) > 180 * 1000) { lastPoint = new LatLon(lat, lon); @@ -485,7 +497,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper { addTrackPoint(pt, newSegment, time); trkPoints++; } - + private void addTrackPoint(WptPt pt, boolean newSegment, long time) { List points = currentTrack.getModifiablePointsToDisplay(); Track track = currentTrack.getModifiableGpxFile().tracks.get(0); @@ -511,12 +523,12 @@ public class SavingTrackHelper extends SQLiteOpenHelper { } public WptPt insertPointData(double lat, double lon, long time, String description, String name, String category, - int color) { + int color) { return insertPointData(lat, lon, time, description, name, category, color, null, null); } public WptPt insertPointData(double lat, double lon, long time, String description, String name, String category, - int color, String iconName, String backgroundName) { + int color, String iconName, String backgroundName) { final WptPt pt = new WptPt(lat, lon, time, Double.NaN, 0, Double.NaN); pt.name = name; pt.category = category; @@ -529,7 +541,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper { ctx.getSelectedGpxHelper().addPoint(pt, currentTrack.getModifiableGpxFile()); currentTrack.getModifiableGpxFile().modifiedTime = time; points++; - execWithClose(insertPointsScript, new Object[] { lat, lon, time, description, name, category, color }); + execWithClose(insertPointsScript, new Object[]{lat, lon, time, description, name, category, color, iconName, backgroundName}); return pt; } @@ -538,7 +550,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper { } public void updatePointData(WptPt pt, double lat, double lon, long time, String description, String name, - String category, int color, String iconName, String iconBackground) { + String category, int color, String iconName, String iconBackground) { currentTrack.getModifiableGpxFile().modifiedTime = time; List params = new ArrayList<>(); @@ -549,6 +561,8 @@ public class SavingTrackHelper extends SQLiteOpenHelper { params.add(name); params.add(category); params.add(color); + params.add(iconName); + params.add(iconBackground); params.add(pt.getLatitude()); params.add(pt.getLongitude()); @@ -563,7 +577,9 @@ public class SavingTrackHelper extends SQLiteOpenHelper { + POINT_COL_DESCRIPTION + "=?, " + POINT_COL_NAME + "=?, " + POINT_COL_CATEGORY + "=?, " - + POINT_COL_COLOR + "=? " + + POINT_COL_COLOR + "=?, " + + POINT_COL_ICON + "=?, " + + POINT_COL_BACKGROUND + "=? " + "WHERE " + POINT_COL_LAT + "=? AND " + POINT_COL_LON + "=? AND " @@ -662,10 +678,10 @@ public class SavingTrackHelper extends SQLiteOpenHelper { } } - public void loadGpxFromDatabase(){ + public void loadGpxFromDatabase() { Map files = collectRecordedData(); currentTrack.getModifiableGpxFile().tracks.clear(); - for (Map.Entry entry : files.entrySet()){ + for (Map.Entry entry : files.entrySet()) { ctx.getSelectedGpxHelper().addPoints(entry.getValue().getPoints(), currentTrack.getModifiableGpxFile()); currentTrack.getModifiableGpxFile().tracks.addAll(entry.getValue().tracks); } @@ -679,10 +695,10 @@ public class SavingTrackHelper extends SQLiteOpenHelper { } private void prepareCurrentTrackForRecording() { - if(currentTrack.getModifiableGpxFile().tracks.size() == 0) { + if (currentTrack.getModifiableGpxFile().tracks.size() == 0) { currentTrack.getModifiableGpxFile().tracks.add(new Track()); } - while(currentTrack.getPointsToDisplay().size() < currentTrack.getModifiableGpxFile().tracks.size()) { + while (currentTrack.getPointsToDisplay().size() < currentTrack.getModifiableGpxFile().tracks.size()) { TrkSegment trkSegment = new TrkSegment(); currentTrack.getModifiablePointsToDisplay().add(trkSegment); } @@ -705,7 +721,7 @@ public class SavingTrackHelper extends SQLiteOpenHelper { public int getPoints() { return points; } - + public int getTrkPoints() { return trkPoints; } @@ -717,11 +733,11 @@ public class SavingTrackHelper extends SQLiteOpenHelper { public GPXFile getCurrentGpx() { return currentTrack.getGpxFile(); } - + public SelectedGpxFile getCurrentTrack() { return currentTrack; } - + public class SaveGpxResult { public SaveGpxResult(List warnings, List filenames) { diff --git a/OsmAnd/src/net/osmand/plus/dialogs/UploadPhotoProgressBottomSheet.java b/OsmAnd/src/net/osmand/plus/dialogs/UploadPhotoProgressBottomSheet.java index f1c37a55ee..05e4bcc468 100644 --- a/OsmAnd/src/net/osmand/plus/dialogs/UploadPhotoProgressBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/dialogs/UploadPhotoProgressBottomSheet.java @@ -33,6 +33,7 @@ public class UploadPhotoProgressBottomSheet extends MenuBottomSheetDialogFragmen private int progress; private int maxProgress; + private boolean uploadingFinished; @Override public void createMenuItems(Bundle savedInstanceState) { @@ -44,17 +45,12 @@ public class UploadPhotoProgressBottomSheet extends MenuBottomSheetDialogFragmen uploadedPhotosCounter = view.findViewById(R.id.description); progressBar = view.findViewById(R.id.progress_bar); progressBar.setMax(maxProgress); - String titleProgress = getString(progress == maxProgress? R.string.upload_photo_completed: R.string.upload_photo); - String descriptionProgress; - if (progress == maxProgress) { - descriptionProgress = getString(R.string.uploaded_count, progress, maxProgress); - } else { - descriptionProgress = getString(R.string.uploading_count, progress, maxProgress); - } + + int descriptionId = uploadingFinished ? R.string.uploaded_count : R.string.uploading_count; BaseBottomSheetItem descriptionItem = new BottomSheetItemWithDescription.Builder() - .setDescription(descriptionProgress) - .setTitle(titleProgress) + .setDescription(getString(descriptionId, progress, maxProgress)) + .setTitle(getString(uploadingFinished ? R.string.upload_photo_completed : R.string.upload_photo)) .setCustomView(view) .create(); items.add(descriptionItem); @@ -74,9 +70,10 @@ public class UploadPhotoProgressBottomSheet extends MenuBottomSheetDialogFragmen } private void updateProgress(int progress) { + int descriptionId = uploadingFinished ? R.string.uploaded_count : R.string.uploading_count; progressBar.setProgress(progress); - uploadedPhotosCounter.setText((getString(R.string.uploading_count, progress, maxProgress))); - uploadedPhotosTitle.setText(progress == maxProgress ? R.string.upload_photo_completed : R.string.upload_photo); + uploadedPhotosCounter.setText(getString(descriptionId, progress, maxProgress)); + uploadedPhotosTitle.setText(uploadingFinished ? R.string.upload_photo_completed : R.string.upload_photo); } @Override @@ -87,12 +84,9 @@ public class UploadPhotoProgressBottomSheet extends MenuBottomSheetDialogFragmen @Override public void uploadPhotosFinished() { - updateProgress(maxProgress); - if (progress == maxProgress) { - uploadedPhotosCounter.setText((getString(R.string.uploaded_count, progress, maxProgress))); - setDismissButtonTextId(R.string.shared_string_close); - UiUtilities.setupDialogButton(nightMode, dismissButton, getDismissButtonType(), getDismissButtonTextId()); - } + uploadingFinished = true; + updateProgress(progress); + UiUtilities.setupDialogButton(nightMode, dismissButton, getDismissButtonType(), getDismissButtonTextId()); } @Override @@ -104,6 +98,11 @@ public class UploadPhotoProgressBottomSheet extends MenuBottomSheetDialogFragmen } } + @Override + protected int getDismissButtonTextId() { + return uploadingFinished ? R.string.shared_string_close : R.string.shared_string_cancel; + } + public static UploadPhotosListener showInstance(@NonNull FragmentManager fragmentManager, int maxProgress, OnDismissListener listener) { UploadPhotoProgressBottomSheet fragment = new UploadPhotoProgressBottomSheet(); fragment.setRetainInstance(true); diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java index aaac5e6f9e..298e3fc287 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java @@ -292,10 +292,6 @@ public class DownloadActivityType { public IndexItem parseIndexItem(OsmandApplication ctx, XmlPullParser parser) { - if (TRAVEL_FILE == this && !Version.isDeveloperVersion(ctx)) { - //todo remove "if" when .travel.obf will be used in production - return null; - } String name = parser.getAttributeValue(null, "name"); //$NON-NLS-1$ if (!isAccepted(name)) { return null; diff --git a/OsmAnd/src/net/osmand/plus/importfiles/SettingsImportTask.java b/OsmAnd/src/net/osmand/plus/importfiles/SettingsImportTask.java index 0a5e0370af..1f886a23bb 100644 --- a/OsmAnd/src/net/osmand/plus/importfiles/SettingsImportTask.java +++ b/OsmAnd/src/net/osmand/plus/importfiles/SettingsImportTask.java @@ -102,7 +102,7 @@ class SettingsImportTask extends BaseLoadAsyncTask { } } else { Map> allSettingsMap = getSettingsToOperate(pluginIndependentItems, false); - List settingsList = settingsHelper.getFilteredSettingsItems(allSettingsMap, settingsTypes, false); + List settingsList = settingsHelper.getFilteredSettingsItems(allSettingsMap, settingsTypes, pluginIndependentItems, false); settingsHelper.checkDuplicates(file, settingsList, settingsList, getDuplicatesListener(file, replace)); } } diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java index 183e41a84f..93f2bdf6b5 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java @@ -421,7 +421,7 @@ public class MenuBuilder { new Thread(new Runnable() { @Override public void run() { - if (openDBAPI.checkPrivateKeyValid(baseUrl, name, privateKey)) { + if (openDBAPI.checkPrivateKeyValid(app, baseUrl, name, privateKey)) { app.runInUIThread(new Runnable() { @Override public void run() { diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/UploadPhotosAsyncTask.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/UploadPhotosAsyncTask.java index 30932e8b42..afe492af6f 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/UploadPhotosAsyncTask.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/UploadPhotosAsyncTask.java @@ -34,6 +34,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.lang.ref.WeakReference; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -45,14 +46,13 @@ public class UploadPhotosAsyncTask extends AsyncTask { private final OsmandApplication app; private final WeakReference activityRef; - private UploadPhotosListener listener; - private final OpenDBAPI openDBAPI = new OpenDBAPI(); private final LatLon latLon; private final List data; private final String[] placeId; private final Map params; private final GetImageCardsListener imageCardListener; + private UploadPhotosListener listener; public UploadPhotosAsyncTask(MapActivity activity, List data, LatLon latLon, String[] placeId, Map params, GetImageCardsListener imageCardListener) { @@ -87,13 +87,16 @@ public class UploadPhotosAsyncTask extends AsyncTask { } protected Void doInBackground(Void... uris) { + List uploadedPhotoUris = new ArrayList<>(); for (int i = 0; i < data.size(); i++) { if (isCancelled()) { break; } Uri uri = data.get(i); - handleSelectedImage(uri); - publishProgress(i + 1); + if (handleSelectedImage(uri)) { + uploadedPhotoUris.add(uri); + publishProgress(uploadedPhotoUris.size()); + } } return null; } @@ -105,12 +108,13 @@ public class UploadPhotosAsyncTask extends AsyncTask { } } - private void handleSelectedImage(final Uri uri) { + private boolean handleSelectedImage(final Uri uri) { + boolean success = false; InputStream inputStream = null; try { inputStream = app.getContentResolver().openInputStream(uri); if (inputStream != null) { - uploadImageToPlace(inputStream); + success = uploadImageToPlace(inputStream); } } catch (Exception e) { LOG.error(e); @@ -118,11 +122,13 @@ public class UploadPhotosAsyncTask extends AsyncTask { } finally { Algorithms.closeStream(inputStream); } + return success; } - private void uploadImageToPlace(InputStream image) { + private boolean uploadImageToPlace(InputStream image) { + boolean success = false; InputStream serverData = new ByteArrayInputStream(compressImageToJpeg(image)); - final String baseUrl = OPRConstants.getBaseUrl(app); + String baseUrl = OPRConstants.getBaseUrl(app); // all these should be constant String url = baseUrl + "api/ipfs/image"; String response = NetworkUtils.sendPostDataRequest(url, "file", "compressed.jpeg", serverData); @@ -131,17 +137,15 @@ public class UploadPhotosAsyncTask extends AsyncTask { try { StringBuilder error = new StringBuilder(); String privateKey = app.getSettings().OPR_ACCESS_TOKEN.get(); - String username = app.getSettings().OPR_USERNAME.get(); + String name = app.getSettings().OPR_BLOCKCHAIN_NAME.get(); res = openDBAPI.uploadImage( placeId, baseUrl, privateKey, - username, + name, response, error); if (res != 200) { app.showToastMessage(error.toString()); - } else { - //ok, continue } } catch (FailedVerificationException e) { LOG.error(e); @@ -151,6 +155,7 @@ public class UploadPhotosAsyncTask extends AsyncTask { //image was uploaded but not added to blockchain checkTokenAndShowScreen(); } else { + success = true; String str = app.getString(R.string.successfully_uploaded_pattern, 1, 1); app.showToastMessage(str); //refresh the image @@ -163,6 +168,7 @@ public class UploadPhotosAsyncTask extends AsyncTask { } else { checkTokenAndShowScreen(); } + return success; } //This method runs on non main thread @@ -170,7 +176,7 @@ public class UploadPhotosAsyncTask extends AsyncTask { String baseUrl = OPRConstants.getBaseUrl(app); String name = app.getSettings().OPR_USERNAME.get(); String privateKey = app.getSettings().OPR_ACCESS_TOKEN.get(); - if (openDBAPI.checkPrivateKeyValid(baseUrl, name, privateKey)) { + if (openDBAPI.checkPrivateKeyValid(app, baseUrl, name, privateKey)) { app.showToastMessage(R.string.cannot_upload_image); } else { app.runInUIThread(new Runnable() { diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/SelectedGpxMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/SelectedGpxMenuController.java index 5ea0766469..6e062829a6 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/SelectedGpxMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/SelectedGpxMenuController.java @@ -43,7 +43,9 @@ public class SelectedGpxMenuController extends MenuController { @Override public void buttonPressed() { mapContextMenu.hide(false); - TrackMenuFragment.showInstance(mapActivity, selectedGpxPoint.getSelectedGpxFile()); + WptPt wptPt = selectedGpxPoint.selectedPoint; + LatLon latLon = new LatLon(wptPt.lat, wptPt.lon); + TrackMenuFragment.showInstance(mapActivity, selectedGpxPoint.getSelectedGpxFile(), latLon); } }; leftTitleButtonController.caption = mapActivity.getString(R.string.shared_string_open_track); diff --git a/OsmAnd/src/net/osmand/plus/myplaces/GPXItemPagerAdapter.java b/OsmAnd/src/net/osmand/plus/myplaces/GPXItemPagerAdapter.java index dbdd768ee3..4aad0a0951 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/GPXItemPagerAdapter.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/GPXItemPagerAdapter.java @@ -7,6 +7,7 @@ import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; +import android.view.ViewGroup.MarginLayoutParams; import android.widget.ImageView; import android.widget.TextView; @@ -35,6 +36,7 @@ import net.osmand.plus.OsmAndFormatter; import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; +import net.osmand.plus.UiUtilities.CustomRadioButtonType; import net.osmand.plus.helpers.AndroidUiHelper; import net.osmand.plus.helpers.GpxUiHelper; import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetAxisType; @@ -42,7 +44,6 @@ import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetType; import net.osmand.plus.helpers.GpxUiHelper.LineGraphType; import net.osmand.plus.helpers.GpxUiHelper.OrderedLineDataSet; import net.osmand.plus.track.TrackDisplayHelper; -import net.osmand.plus.views.controls.PagerSlidingTabStrip; import net.osmand.plus.views.controls.PagerSlidingTabStrip.CustomTabProvider; import net.osmand.plus.views.controls.WrapContentHeightViewPager.ViewAtPositionInterface; import net.osmand.util.Algorithms; @@ -51,6 +52,7 @@ import net.osmand.util.MapUtils; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -72,23 +74,23 @@ public class GPXItemPagerAdapter extends PagerAdapter implements CustomTabProvid private GpxDisplayItem gpxItem; private GPXTabItemType[] tabTypes; - private PagerSlidingTabStrip tabs; private SparseArray views = new SparseArray<>(); private SegmentActionsListener actionsListener; private boolean chartClicked; + private boolean nightMode; - public GPXItemPagerAdapter(@NonNull PagerSlidingTabStrip tabs, + public GPXItemPagerAdapter(@NonNull OsmandApplication app, @NonNull GpxDisplayItem gpxItem, @NonNull TrackDisplayHelper displayHelper, - @NonNull SegmentActionsListener actionsListener) { + boolean nightMode, @NonNull SegmentActionsListener actionsListener) { super(); - this.tabs = tabs; + this.app = app; this.gpxItem = gpxItem; + this.nightMode = nightMode; this.displayHelper = displayHelper; this.actionsListener = actionsListener; - app = (OsmandApplication) tabs.getContext().getApplicationContext(); iconsCache = app.getUIUtilities(); fetchTabTypes(); } @@ -556,40 +558,64 @@ public class GPXItemPagerAdapter extends PagerAdapter implements CustomTabProvid return view == object; } + int singleTabLayoutId[] = {R.layout.center_button_container}; + int doubleTabsLayoutIds[] = {R.layout.left_button_container, R.layout.right_button_container}; + int tripleTabsLayoutIds[] = {R.layout.left_button_container, R.layout.center_button_container, R.layout.right_button_container}; + @Override public View getCustomTabView(@NonNull ViewGroup parent, int position) { - View tab = LayoutInflater.from(parent.getContext()).inflate(R.layout.gpx_tab, parent, false); + int layoutId; + int count = getCount(); + if (count == 1) { + layoutId = singleTabLayoutId[position]; + } else if (count == 2) { + layoutId = doubleTabsLayoutIds[position]; + } else { + layoutId = tripleTabsLayoutIds[position]; + } + ViewGroup tab = (ViewGroup) UiUtilities.getInflater(parent.getContext(), nightMode).inflate(layoutId, parent, false); tab.setTag(tabTypes[position].name()); - deselect(tab); + TextView title = (TextView) tab.getChildAt(0); + if (title != null) { + title.setText(getPageTitle(position)); + } return tab; } @Override public void select(View tab) { GPXTabItemType tabType = GPXTabItemType.valueOf((String) tab.getTag()); - ImageView img = tab.findViewById(R.id.tab_image); - switch (tabs.getTabSelectionType()) { - case ALPHA: - img.setAlpha(tabs.getTabTextSelectedAlpha()); - break; - case SOLID_COLOR: - img.setImageDrawable(iconsCache.getPaintedIcon(tabType.getIconId(), tabs.getTextColor())); - break; - } + int index = Arrays.asList(tabTypes).indexOf(tabType); + View parent = (View) tab.getParent(); + UiUtilities.updateCustomRadioButtons(app, parent, nightMode, getCustomRadioButtonType(index)); } @Override public void deselect(View tab) { - GPXTabItemType tabType = GPXTabItemType.valueOf((String) tab.getTag()); - ImageView img = tab.findViewById(R.id.tab_image); - switch (tabs.getTabSelectionType()) { - case ALPHA: - img.setAlpha(tabs.getTabTextAlpha()); - break; - case SOLID_COLOR: - img.setImageDrawable(iconsCache.getPaintedIcon(tabType.getIconId(), tabs.getTabInactiveTextColor())); - break; + + } + + @Override + public void tabStylesUpdated(View tabsContainer, int currentPosition) { + ViewGroup.MarginLayoutParams params = (MarginLayoutParams) tabsContainer.getLayoutParams(); + params.height = app.getResources().getDimensionPixelSize(R.dimen.dialog_button_height); + tabsContainer.setLayoutParams(params); + UiUtilities.updateCustomRadioButtons(app, tabsContainer, nightMode, getCustomRadioButtonType(currentPosition)); + } + + private CustomRadioButtonType getCustomRadioButtonType(int index) { + int count = getCount(); + CustomRadioButtonType type = CustomRadioButtonType.CENTER; + if (count == 2) { + type = index > 0 ? CustomRadioButtonType.END : CustomRadioButtonType.START; + } else if (count == 3) { + if (index == 0) { + type = CustomRadioButtonType.START; + } else if (index == 2) { + type = CustomRadioButtonType.END; + } } + return type; } @Override diff --git a/OsmAnd/src/net/osmand/plus/myplaces/SegmentGPXAdapter.java b/OsmAnd/src/net/osmand/plus/myplaces/SegmentGPXAdapter.java index b5e7996874..60141d5ccf 100644 --- a/OsmAnd/src/net/osmand/plus/myplaces/SegmentGPXAdapter.java +++ b/OsmAnd/src/net/osmand/plus/myplaces/SegmentGPXAdapter.java @@ -6,7 +6,6 @@ import android.view.ViewGroup; import android.widget.ArrayAdapter; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import net.osmand.AndroidUtils; import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem; @@ -56,7 +55,7 @@ public class SegmentGPXAdapter extends ArrayAdapter { WrapContentHeightViewPager pager = row.findViewById(R.id.pager); PagerSlidingTabStrip tabLayout = row.findViewById(R.id.sliding_tabs); - pager.setAdapter(new GPXItemPagerAdapter(tabLayout, item, displayHelper, listener)); + pager.setAdapter(new GPXItemPagerAdapter(app, item, displayHelper, nightMode, listener)); if (create) { tabLayout.setViewPager(pager); } else { @@ -72,15 +71,8 @@ public class SegmentGPXAdapter extends ArrayAdapter { View row = UiUtilities.getInflater(context, nightMode).inflate(R.layout.gpx_list_item_tab_content, root, false); PagerSlidingTabStrip tabLayout = row.findViewById(R.id.sliding_tabs); - tabLayout.setTabBackground(R.color.color_transparent); - tabLayout.setIndicatorColorResource(nightMode ? R.color.active_color_primary_dark : R.color.active_color_primary_light); - tabLayout.setIndicatorBgColorResource(nightMode ? R.color.divider_color_dark : R.color.divider_color_light); - tabLayout.setIndicatorHeight(AndroidUtils.dpToPx(context, 1f)); - if (!nightMode) { - tabLayout.setTextColor(tabLayout.getIndicatorColor()); - tabLayout.setTabInactiveTextColor(ContextCompat.getColor(row.getContext(), R.color.text_color_secondary_light)); - } - tabLayout.setTextSize(AndroidUtils.spToPx(context, 12f)); + tabLayout.setTabBackground(AndroidUtils.resolveAttribute(context, R.attr.btn_bg_border_inactive)); + tabLayout.setIndicatorHeight(0); tabLayout.setShouldExpand(true); WrapContentHeightViewPager pager = row.findViewById(R.id.pager); pager.setSwipeable(false); diff --git a/OsmAnd/src/net/osmand/plus/onlinerouting/OnlineRoutingHelper.java b/OsmAnd/src/net/osmand/plus/onlinerouting/OnlineRoutingHelper.java index c62d952eb3..de36b87449 100644 --- a/OsmAnd/src/net/osmand/plus/onlinerouting/OnlineRoutingHelper.java +++ b/OsmAnd/src/net/osmand/plus/onlinerouting/OnlineRoutingHelper.java @@ -9,6 +9,7 @@ import net.osmand.osm.io.NetworkUtils; import net.osmand.plus.OsmandApplication; import net.osmand.plus.Version; import net.osmand.plus.onlinerouting.engine.OnlineRoutingEngine; +import net.osmand.plus.onlinerouting.engine.OnlineRoutingEngine.OnlineRoutingResponse; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.util.Algorithms; @@ -82,12 +83,12 @@ public class OnlineRoutingHelper { } @Nullable - public OnlineRoutingResponse calculateRouteOnline(@NonNull OnlineRoutingEngine engine, - @NonNull List path, - boolean leftSideNavigation) throws IOException, JSONException { + private OnlineRoutingResponse calculateRouteOnline(@NonNull OnlineRoutingEngine engine, + @NonNull List path, + boolean leftSideNavigation) throws IOException, JSONException { String url = engine.getFullUrl(path); String content = makeRequest(url); - return engine.parseServerResponse(content, leftSideNavigation); + return engine.parseServerResponse(content, app, leftSideNavigation); } @NonNull diff --git a/OsmAnd/src/net/osmand/plus/onlinerouting/OnlineRoutingResponse.java b/OsmAnd/src/net/osmand/plus/onlinerouting/OnlineRoutingResponse.java deleted file mode 100644 index 02a6a8f53c..0000000000 --- a/OsmAnd/src/net/osmand/plus/onlinerouting/OnlineRoutingResponse.java +++ /dev/null @@ -1,24 +0,0 @@ -package net.osmand.plus.onlinerouting; - -import net.osmand.Location; -import net.osmand.plus.routing.RouteDirectionInfo; - -import java.util.List; - -public class OnlineRoutingResponse { - private List route; - private List directions; - - public OnlineRoutingResponse(List route, List directions) { - this.route = route; - this.directions = directions; - } - - public List getRoute() { - return route; - } - - public List getDirections() { - return directions; - } -} diff --git a/OsmAnd/src/net/osmand/plus/onlinerouting/engine/GraphhopperEngine.java b/OsmAnd/src/net/osmand/plus/onlinerouting/engine/GraphhopperEngine.java index f2c7e19829..930ebcab8d 100644 --- a/OsmAnd/src/net/osmand/plus/onlinerouting/engine/GraphhopperEngine.java +++ b/OsmAnd/src/net/osmand/plus/onlinerouting/engine/GraphhopperEngine.java @@ -5,9 +5,9 @@ import androidx.annotation.Nullable; import net.osmand.Location; import net.osmand.data.LatLon; +import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.onlinerouting.EngineParameter; -import net.osmand.plus.onlinerouting.OnlineRoutingResponse; import net.osmand.plus.onlinerouting.VehicleType; import net.osmand.plus.routing.RouteDirectionInfo; import net.osmand.router.TurnType; @@ -83,11 +83,9 @@ public class GraphhopperEngine extends OnlineRoutingEngine { @Nullable @Override - public OnlineRoutingResponse parseServerResponse(@NonNull String content, + public OnlineRoutingResponse parseServerResponse(@NonNull JSONObject root, + @NonNull OsmandApplication app, boolean leftSideNavigation) throws JSONException { - JSONObject obj = new JSONObject(content); - JSONObject root = obj.getJSONArray("paths").getJSONObject(0); - String encoded = root.getString("points"); List points = GeoPolylineParserUtil.parse(encoded, GeoPolylineParserUtil.PRECISION_5); if (isEmpty(points)) return null; @@ -96,25 +94,20 @@ public class GraphhopperEngine extends OnlineRoutingEngine { JSONArray instructions = root.getJSONArray("instructions"); List directions = new ArrayList<>(); for (int i = 0; i < instructions.length(); i++) { - JSONObject item = instructions.getJSONObject(i); - int sign = Integer.parseInt(item.getString("sign")); - int distance = (int) Math.round(Double.parseDouble(item.getString("distance"))); - String description = item.getString("text"); - String streetName = item.getString("street_name"); - int timeInSeconds = (int) Math.round(Integer.parseInt(item.getString("time")) / 1000f); - JSONArray interval = item.getJSONArray("interval"); + JSONObject instruction = instructions.getJSONObject(i); + int distance = (int) Math.round(instruction.getDouble("distance")); + String description = instruction.getString("text"); + String streetName = instruction.getString("street_name"); + int timeInSeconds = Math.round(instruction.getInt("time") / 1000f); + JSONArray interval = instruction.getJSONArray("interval"); int startPointOffset = interval.getInt(0); int endPointOffset = interval.getInt(1); float averageSpeed = (float) distance / timeInSeconds; - TurnType turnType = identifyTurnType(sign, leftSideNavigation); - // TODO turnType.setTurnAngle() - + TurnType turnType = parseTurnType(instruction, leftSideNavigation); RouteDirectionInfo direction = new RouteDirectionInfo(averageSpeed, turnType); + direction.routePointOffset = startPointOffset; - if (turnType != null && turnType.isRoundAbout()) { - direction.routeEndPointOffset = endPointOffset; - } direction.setDescriptionRoute(description); direction.setStreetName(streetName); direction.setDistance(distance); @@ -123,27 +116,33 @@ public class GraphhopperEngine extends OnlineRoutingEngine { return new OnlineRoutingResponse(route, directions); } - @Override - public boolean parseServerMessage(@NonNull StringBuilder sb, - @NonNull String content) throws JSONException { - JSONObject obj = new JSONObject(content); - if (obj.has("message")) { - String message = obj.getString("message"); - sb.append(message); + @NonNull + private TurnType parseTurnType(@NonNull JSONObject instruction, + boolean leftSide) throws JSONException { + int sign = instruction.getInt("sign"); + TurnType turnType = identifyTurnType(sign, leftSide); + + if (turnType == null) { + turnType = TurnType.straight(); + } else if (turnType.isRoundAbout()) { + if (instruction.has("exit_number")) { + int exit = instruction.getInt("exit_number"); + turnType.setExitOut(exit); + } + if (instruction.has("turn_angle")) { + float angle = (float) instruction.getDouble("turn_angle"); + turnType.setTurnAngle(angle); + } + } else { + // TODO turnType.setTurnAngle() } - return obj.has("paths"); + + return turnType; } - /** - * @param sign - a number which specifies the turn type to show (Graphhopper API value) - * @return a TurnType object defined in OsmAnd which is equivalent to a value from the Graphhopper API - * - * For future compatibility it is important that all clients - * are able to handle also unknown instruction sign numbers - */ @Nullable public static TurnType identifyTurnType(int sign, boolean leftSide) { - int id = INVALID_ID; + Integer id = null; if (sign == -98) { // an U-turn without the knowledge @@ -192,6 +191,7 @@ public class GraphhopperEngine extends OnlineRoutingEngine { } else if (sign == 4) { // the finish instruction before the last point + id = TurnType.C; } else if (sign == 5) { // the instruction before a via point @@ -209,6 +209,18 @@ public class GraphhopperEngine extends OnlineRoutingEngine { id = TurnType.TRU; } - return id != INVALID_ID ? TurnType.valueOf(id, leftSide) : null; + return id != null ? TurnType.valueOf(id, leftSide) : null; + } + + @NonNull + @Override + protected String getErrorMessageKey() { + return "message"; + } + + @NonNull + @Override + protected String getRootArrayKey() { + return "paths"; } } diff --git a/OsmAnd/src/net/osmand/plus/onlinerouting/engine/OnlineRoutingEngine.java b/OsmAnd/src/net/osmand/plus/onlinerouting/engine/OnlineRoutingEngine.java index af94be4282..0752282c70 100644 --- a/OsmAnd/src/net/osmand/plus/onlinerouting/engine/OnlineRoutingEngine.java +++ b/OsmAnd/src/net/osmand/plus/onlinerouting/engine/OnlineRoutingEngine.java @@ -8,15 +8,18 @@ import androidx.annotation.Nullable; import net.osmand.GPXUtilities.WptPt; import net.osmand.Location; import net.osmand.data.LatLon; +import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.onlinerouting.EngineParameter; import net.osmand.plus.onlinerouting.OnlineRoutingFactory; -import net.osmand.plus.onlinerouting.OnlineRoutingResponse; import net.osmand.plus.onlinerouting.VehicleType; +import net.osmand.plus.routing.RouteDirectionInfo; import net.osmand.plus.routing.RouteProvider; import net.osmand.util.Algorithms; +import org.json.JSONArray; import org.json.JSONException; +import org.json.JSONObject; import java.util.ArrayList; import java.util.Arrays; @@ -33,7 +36,6 @@ public abstract class OnlineRoutingEngine implements Cloneable { public final static String ONLINE_ROUTING_ENGINE_PREFIX = "online_routing_engine_"; public final static VehicleType CUSTOM_VEHICLE = new VehicleType("", R.string.shared_string_custom); - public final static int INVALID_ID = -1; private final Map params = new HashMap<>(); private final List allowedVehicles = new ArrayList<>(); @@ -98,9 +100,31 @@ public abstract class OnlineRoutingEngine implements Cloneable { @NonNull public abstract String getStandardUrl(); + public OnlineRoutingResponse parseServerResponse(@NonNull String content, + @NonNull OsmandApplication app, + boolean leftSideNavigation) throws JSONException { + JSONObject root = parseRootResponseObject(content); + return root != null ? parseServerResponse(root, app, leftSideNavigation) : null; + } + @Nullable - public abstract OnlineRoutingResponse parseServerResponse(@NonNull String content, - boolean leftSideNavigation) throws JSONException; + protected abstract OnlineRoutingResponse parseServerResponse(@NonNull JSONObject root, + @NonNull OsmandApplication app, + boolean leftSideNavigation) throws JSONException; + + @Nullable + protected JSONObject parseRootResponseObject(@NonNull String content) throws JSONException { + JSONObject fullJSON = new JSONObject(content); + String responseArrayKey = getRootArrayKey(); + JSONArray array = null; + if (fullJSON.has(responseArrayKey)) { + array = fullJSON.getJSONArray(responseArrayKey); + } + return array != null && array.length() > 0 ? array.getJSONObject(0) : null; + } + + @NonNull + protected abstract String getRootArrayKey(); @NonNull protected List convertRouteToLocationsList(@NonNull List route) { @@ -160,7 +184,7 @@ public abstract class OnlineRoutingEngine implements Cloneable { return allowedParameters.contains(key); } - protected void allowParameters(@NonNull EngineParameter ... allowedParams) { + protected void allowParameters(@NonNull EngineParameter... allowedParams) { allowedParameters.addAll(Arrays.asList(allowedParams)); } @@ -192,8 +216,19 @@ public abstract class OnlineRoutingEngine implements Cloneable { return CUSTOM_VEHICLE; } - public abstract boolean parseServerMessage(@NonNull StringBuilder sb, - @NonNull String content) throws JSONException; + public boolean checkServerResponse(@NonNull StringBuilder errorMessage, + @NonNull String content) throws JSONException { + JSONObject obj = new JSONObject(content); + String messageKey = getErrorMessageKey(); + if (obj.has(messageKey)) { + String message = obj.getString(messageKey); + errorMessage.append(message); + } + return obj.has(getRootArrayKey()); + } + + @NonNull + protected abstract String getErrorMessageKey(); @NonNull @Override @@ -201,11 +236,6 @@ public abstract class OnlineRoutingEngine implements Cloneable { return OnlineRoutingFactory.createEngine(getType(), getParams()); } - @NonNull - public static String generateKey() { - return ONLINE_ROUTING_ENGINE_PREFIX + System.currentTimeMillis(); - } - @Override public boolean equals(Object o) { if (this == o) return true; @@ -215,4 +245,27 @@ public abstract class OnlineRoutingEngine implements Cloneable { if (getType() != engine.getType()) return false; return Algorithms.objectEquals(getParams(), engine.getParams()); } + + @NonNull + public static String generateKey() { + return ONLINE_ROUTING_ENGINE_PREFIX + System.currentTimeMillis(); + } + + public static class OnlineRoutingResponse { + private List route; + private List directions; + + public OnlineRoutingResponse(List route, List directions) { + this.route = route; + this.directions = directions; + } + + public List getRoute() { + return route; + } + + public List getDirections() { + return directions; + } + } } diff --git a/OsmAnd/src/net/osmand/plus/onlinerouting/engine/OrsEngine.java b/OsmAnd/src/net/osmand/plus/onlinerouting/engine/OrsEngine.java index 4502f5e957..ed9168ccf9 100644 --- a/OsmAnd/src/net/osmand/plus/onlinerouting/engine/OrsEngine.java +++ b/OsmAnd/src/net/osmand/plus/onlinerouting/engine/OrsEngine.java @@ -5,9 +5,9 @@ import androidx.annotation.Nullable; import net.osmand.Location; import net.osmand.data.LatLon; +import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.onlinerouting.EngineParameter; -import net.osmand.plus.onlinerouting.OnlineRoutingResponse; import net.osmand.plus.onlinerouting.VehicleType; import org.json.JSONArray; @@ -80,11 +80,10 @@ public class OrsEngine extends OnlineRoutingEngine { @Nullable @Override - public OnlineRoutingResponse parseServerResponse(@NonNull String content, + public OnlineRoutingResponse parseServerResponse(@NonNull JSONObject root, + @NonNull OsmandApplication app, boolean leftSideNavigation) throws JSONException { - JSONObject obj = new JSONObject(content); - JSONArray array = obj.getJSONArray("features").getJSONObject(0) - .getJSONObject("geometry").getJSONArray("coordinates"); + JSONArray array = root.getJSONObject("geometry").getJSONArray("coordinates"); List points = new ArrayList<>(); for (int i = 0; i < array.length(); i++) { JSONArray point = array.getJSONArray(i); @@ -99,14 +98,15 @@ public class OrsEngine extends OnlineRoutingEngine { return null; } + @NonNull @Override - public boolean parseServerMessage(@NonNull StringBuilder sb, - @NonNull String content) throws JSONException { - JSONObject obj = new JSONObject(content); - if (obj.has("error")) { - String message = obj.getString("error"); - sb.append(message); - } - return obj.has("features"); + protected String getErrorMessageKey() { + return "error"; + } + + @NonNull + @Override + protected String getRootArrayKey() { + return "features"; } } diff --git a/OsmAnd/src/net/osmand/plus/onlinerouting/engine/OsrmEngine.java b/OsmAnd/src/net/osmand/plus/onlinerouting/engine/OsrmEngine.java index 478c24886e..4d75b2b440 100644 --- a/OsmAnd/src/net/osmand/plus/onlinerouting/engine/OsrmEngine.java +++ b/OsmAnd/src/net/osmand/plus/onlinerouting/engine/OsrmEngine.java @@ -5,19 +5,26 @@ import androidx.annotation.Nullable; import net.osmand.Location; import net.osmand.data.LatLon; +import net.osmand.plus.OsmandApplication; import net.osmand.plus.R; import net.osmand.plus.onlinerouting.EngineParameter; -import net.osmand.plus.onlinerouting.OnlineRoutingResponse; import net.osmand.plus.onlinerouting.VehicleType; +import net.osmand.plus.routing.RouteCalculationResult; +import net.osmand.plus.routing.RouteDirectionInfo; +import net.osmand.router.TurnType; import net.osmand.util.GeoPolylineParserUtil; +import net.osmand.util.MapUtils; +import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import java.util.ArrayList; import java.util.List; import java.util.Map; import static net.osmand.util.Algorithms.isEmpty; +import static net.osmand.util.Algorithms.objectEquals; public class OsrmEngine extends OnlineRoutingEngine { @@ -69,26 +76,162 @@ public class OsrmEngine extends OnlineRoutingEngine { @Nullable @Override - public OnlineRoutingResponse parseServerResponse(@NonNull String content, + public OnlineRoutingResponse parseServerResponse(@NonNull JSONObject root, + @NonNull OsmandApplication app, boolean leftSideNavigation) throws JSONException { - JSONObject obj = new JSONObject(content); - String encoded = obj.getJSONArray("routes").getJSONObject(0).getString("geometry"); - List points = GeoPolylineParserUtil.parse(encoded, GeoPolylineParserUtil.PRECISION_5); - if (!isEmpty(points)) { - List route = convertRouteToLocationsList(points); - return new OnlineRoutingResponse(route, null); + String encodedPoints = root.getString("geometry"); + List points = GeoPolylineParserUtil.parse(encodedPoints, GeoPolylineParserUtil.PRECISION_5); + if (isEmpty(points)) return null; + + List route = convertRouteToLocationsList(points); + List directions = new ArrayList<>(); + int startSearchingId = 0; + JSONArray legs = root.getJSONArray("legs"); + for (int i = 0; i < legs.length(); i++) { + JSONObject leg = legs.getJSONObject(i); + if (!leg.has("steps")) continue; + + JSONArray steps = leg.getJSONArray("steps"); + for (int j = 0; j < steps.length(); j++) { + JSONObject instruction = steps.getJSONObject(j); + JSONObject maneuver = instruction.getJSONObject("maneuver"); + String maneuverType = maneuver.getString("type"); + + JSONArray location = maneuver.getJSONArray("location"); + double lon = location.getDouble(0); + double lat = location.getDouble(1); + Integer routePointOffset = getLocationIndexInList(route, startSearchingId, lat, lon); + if (routePointOffset == null) continue; + startSearchingId = routePointOffset; + + // in meters + int distance = (int) Math.round(instruction.getDouble("distance")); + // in seconds + int duration = (int) Math.round(instruction.getDouble("duration")); + + float averageSpeed = (float) distance / duration; + TurnType turnType = parseTurnType(maneuver, leftSideNavigation); + RouteDirectionInfo direction = new RouteDirectionInfo(averageSpeed, turnType); + direction.setDistance(distance); + + String streetName = instruction.getString("name"); + String description = ""; + if (!objectEquals(maneuverType, "arrive")) { + description = RouteCalculationResult.toString(turnType, app, false) + " " + streetName; + } + description = description.trim(); + + direction.setStreetName(streetName); + direction.setDescriptionRoute(description); + direction.routePointOffset = routePointOffset; + directions.add(direction); + } + } + + return new OnlineRoutingResponse(route, directions); + } + + @Nullable + private Integer getLocationIndexInList(@NonNull List locations, + int startIndex, double lat, double lon) { + for (int i = startIndex; i < locations.size(); i++) { + Location l = locations.get(i); + if (MapUtils.areLatLonEqual(l, lat, lon)) { + return i; + } } return null; } - @Override - public boolean parseServerMessage(@NonNull StringBuilder sb, - @NonNull String content) throws JSONException { - JSONObject obj = new JSONObject(content); - if (obj.has("message")) { - String message = obj.getString("message"); - sb.append(message); + @NonNull + private TurnType parseTurnType(@NonNull JSONObject maneuver, + boolean leftSide) throws JSONException { + TurnType turnType = null; + + String type = maneuver.getString("type"); + String modifier = null; + if (maneuver.has("modifier")) { + modifier = maneuver.getString("modifier"); } - return obj.has("routes"); + + if (objectEquals(type, "roundabout") + || objectEquals(type, "rotary") + || objectEquals(type, "roundabout turn")) { + if (maneuver.has("exit")) { + int exit = maneuver.getInt("exit"); + turnType = TurnType.getExitTurn(exit, 0.0f, leftSide); + } else if (modifier != null) { + // for simple roundabout turn without "exit" parameter + turnType = identifyTurnType(modifier, leftSide); + } + } else { + // for other maneuver types find TurnType + // like a basic turn into direction of the modifier + if (modifier != null) { + turnType = identifyTurnType(modifier, leftSide); + } + } + if (turnType == null) { + turnType = TurnType.straight(); + } + + int bearingBefore = maneuver.getInt("bearing_before"); + int bearingAfter = maneuver.getInt("bearing_after"); + float angle = (float) MapUtils.degreesDiff(bearingAfter, bearingBefore); + turnType.setTurnAngle(angle); + + return turnType; + } + + @Nullable + private TurnType identifyTurnType(@NonNull String modifier, + boolean leftSide) { + Integer id = null; + switch (modifier) { + case "uturn": + id = TurnType.TU; + break; + + case "sharp right": + id = TurnType.TSHR; + break; + + case "right": + id = TurnType.TR; + break; + + case "slight right": + id = TurnType.TSLR; + break; + + case "straight": + id = TurnType.C; + break; + + case "slight left": + id = TurnType.TSLL; + break; + + case "left": + id = TurnType.TL; + break; + + case "sharp left": + id = TurnType.TSHL; + break; + } + return id != null ? TurnType.valueOf(id, leftSide) : null; + } + + @NonNull + @Override + protected String getErrorMessageKey() { + return "message"; + } + + @NonNull + @Override + protected String getRootArrayKey() { + return "routes"; } } diff --git a/OsmAnd/src/net/osmand/plus/onlinerouting/ui/OnlineRoutingEngineFragment.java b/OsmAnd/src/net/osmand/plus/onlinerouting/ui/OnlineRoutingEngineFragment.java index 84856139b2..008bb75852 100644 --- a/OsmAnd/src/net/osmand/plus/onlinerouting/ui/OnlineRoutingEngineFragment.java +++ b/OsmAnd/src/net/osmand/plus/onlinerouting/ui/OnlineRoutingEngineFragment.java @@ -458,15 +458,15 @@ public class OnlineRoutingEngineFragment extends BaseOsmAndFragment { new Thread(new Runnable() { @Override public void run() { - StringBuilder message = new StringBuilder(); + StringBuilder errorMessage = new StringBuilder(); boolean resultOk = false; try { String response = helper.makeRequest(exampleCard.getEditedText()); - resultOk = requestedEngine.parseServerMessage(message, response); + resultOk = requestedEngine.checkServerResponse(errorMessage, response); } catch (IOException | JSONException e) { - message.append(e.toString()); + errorMessage.append(e.toString()); } - showTestResults(resultOk, message.toString(), location); + showTestResults(resultOk, errorMessage.toString(), location); } }).start(); } diff --git a/OsmAnd/src/net/osmand/plus/osmedit/opr/OpenDBAPI.java b/OsmAnd/src/net/osmand/plus/osmedit/opr/OpenDBAPI.java index a16361c8bd..1fdeba64f0 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/opr/OpenDBAPI.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/opr/OpenDBAPI.java @@ -3,10 +3,15 @@ package net.osmand.plus.osmedit.opr; import android.net.TrafficStats; import android.os.Build; +import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonSyntaxException; +import com.google.gson.reflect.TypeToken; import net.osmand.PlatformUtil; import net.osmand.osm.io.NetworkUtils; +import net.osmand.plus.OsmandApplication; +import net.osmand.util.Algorithms; import org.apache.commons.logging.Log; import org.bouncycastle.jce.provider.BouncyCastleProvider; @@ -27,6 +32,7 @@ import java.security.KeyPair; import java.security.Security; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.TreeMap; @@ -40,7 +46,7 @@ public class OpenDBAPI { public static final String PURPOSE = "osmand-android"; private static final Log log = PlatformUtil.getLog(SecUtils.class); private static final String checkLoginEndpoint = "api/auth/user-check-loginkey?"; - private static final String LOGIN_SUCCESS_MESSAGE = "{\"result\":\"OK\"}"; + private static final String LOGIN_SUCCESS_MESSAGE = "\"result\":\"OK\""; private static final int THREAD_ID = 11200; /* @@ -51,7 +57,7 @@ public class OpenDBAPI { * Need to encode key * Do not call on mainThread */ - public boolean checkPrivateKeyValid(String baseUrl, String username, String privateKey) { + public boolean checkPrivateKeyValid(OsmandApplication app, String baseUrl, String username, String privateKey) { String url = null; try { String purposeParam = "purpose=" + PURPOSE; @@ -65,9 +71,29 @@ public class OpenDBAPI { } catch (UnsupportedEncodingException e) { return false; } + StringBuilder response = new StringBuilder(); - return (NetworkUtils.sendGetRequest(url,null,response) == null) && - response.toString().contains(LOGIN_SUCCESS_MESSAGE); + String error = NetworkUtils.sendGetRequest(url, null, response); + if (error == null) { + String responseStr = response.toString(); + try { + Map map = new Gson().fromJson( + responseStr, new TypeToken>() { + }.getType() + ); + if (!Algorithms.isEmpty(map) && map.containsKey("blockchain-name")) { + String blockchainName = map.get("blockchain-name"); + app.getSettings().OPR_BLOCKCHAIN_NAME.set(blockchainName); + } else { + return false; + } + } catch (JsonSyntaxException e) { + return false; + } + return responseStr.contains(LOGIN_SUCCESS_MESSAGE); + } else { + return false; + } } public int uploadImage(String[] placeId, String baseUrl, String privateKey, String username, String image, StringBuilder sb) throws FailedVerificationException { diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java index 4ef286826d..e6efcc321f 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java +++ b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java @@ -711,7 +711,7 @@ public class RouteCalculationResult { if (directions != null && directions.size() > 1) { for (int i = 1; i < directions.size();) { RouteDirectionInfo r = directions.get(i); - if (r.getTurnType() != null && r.getTurnType().getValue() == TurnType.C) { + if (r.getTurnType().getValue() == TurnType.C) { RouteDirectionInfo prev = directions.get(i - 1); prev.setAverageSpeed((prev.distance + r.distance) / (prev.distance / prev.getAverageSpeed() + r.distance / r.getAverageSpeed())); diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java index 96bb1b19dc..b3b2a11ab6 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java +++ b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java @@ -21,7 +21,7 @@ import net.osmand.data.LocationPoint; import net.osmand.data.WptLocationPoint; import net.osmand.plus.OsmandApplication; import net.osmand.plus.onlinerouting.OnlineRoutingHelper; -import net.osmand.plus.onlinerouting.OnlineRoutingResponse; +import net.osmand.plus.onlinerouting.engine.OnlineRoutingEngine.OnlineRoutingResponse; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.settings.backend.CommonPreference; import net.osmand.plus.R; @@ -1206,7 +1206,7 @@ public class RouteProvider { helper.calculateRouteOnline(stringKey, getPathFromParams(params), params.leftSide); if (response != null) { params.intermediates = null; - return new RouteCalculationResult(response.getRoute(), response.getDirections(), params, null, true); + return new RouteCalculationResult(response.getRoute(), response.getDirections(), params, null, false); } else { return new RouteCalculationResult("Route is empty"); } diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java index dfaaea9468..0d3cddb136 100644 --- a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java @@ -1171,6 +1171,9 @@ public class OsmandSettings { public final OsmandPreference OPR_USERNAME = new StringPreference(this, "opr_username_secret", "").makeGlobal(); + public final OsmandPreference OPR_BLOCKCHAIN_NAME = + new StringPreference(this, "opr_blockchain_name", "").makeGlobal(); + // this value boolean is synchronized with settings_pref.xml preference offline POI/Bugs edition public final OsmandPreference OFFLINE_EDITION = new BooleanPreference(this, "offline_osm_editing", true).makeGlobal().makeShared(); public final OsmandPreference USE_DEV_URL = new BooleanPreference(this, "use_dev_url", false).makeGlobal().makeShared(); diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsHelper.java b/OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsHelper.java index 7008425f14..11fe377040 100644 --- a/OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsHelper.java +++ b/OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsHelper.java @@ -480,19 +480,21 @@ public class SettingsHelper { typesMap.putAll(getMyPlacesItems()); typesMap.putAll(getResourcesItems()); - return getFilteredSettingsItems(typesMap, settingsTypes, export); + return getFilteredSettingsItems(typesMap, settingsTypes, Collections.emptyList(), export); } - public List getFilteredSettingsItems(Map> allSettingsMap, - List settingsTypes, boolean export) { - List settingsItems = new ArrayList<>(); + public List getFilteredSettingsItems( + Map> allSettingsMap, List settingsTypes, + @NonNull List settingsItems, boolean export + ) { + List filteredSettingsItems = new ArrayList<>(); for (ExportSettingsType settingsType : settingsTypes) { List settingsDataObjects = allSettingsMap.get(settingsType); if (settingsDataObjects != null) { - settingsItems.addAll(prepareSettingsItems(settingsDataObjects, export)); + filteredSettingsItems.addAll(prepareSettingsItems(settingsDataObjects, settingsItems, export)); } } - return settingsItems; + return filteredSettingsItems; } public Map getSettingsByCategory(boolean addProfiles) { @@ -693,8 +695,8 @@ public class SettingsHelper { return files; } - public List prepareSettingsItems(List data, boolean export) { - List settingsItems = new ArrayList<>(); + public List prepareSettingsItems(List data, List settingsItems, boolean export) { + List result = new ArrayList<>(); List quickActions = new ArrayList<>(); List poiUIFilters = new ArrayList<>(); List tileSourceTemplates = new ArrayList<>(); @@ -719,13 +721,15 @@ public class SettingsHelper { try { File file = (File) object; if (file.getName().endsWith(IndexConstants.GPX_FILE_EXT)) { - settingsItems.add(new GpxSettingsItem(app, file)); + result.add(new GpxSettingsItem(app, file)); } else { - settingsItems.add(new FileSettingsItem(app, file)); + result.add(new FileSettingsItem(app, file)); } } catch (IllegalArgumentException e) { LOG.warn("Trying to export unsuported file type", e); } + } else if (object instanceof FileSettingsItem) { + result.add((FileSettingsItem) object); } else if (object instanceof AvoidRoadInfo) { avoidRoads.add((AvoidRoadInfo) object); } else if (object instanceof ApplicationModeBean) { @@ -746,65 +750,100 @@ public class SettingsHelper { } else if (object instanceof HistoryEntry) { historyEntries.add((HistoryEntry) object); } else if (object instanceof GlobalSettingsItem) { - settingsItems.add((GlobalSettingsItem) object); + result.add((GlobalSettingsItem) object); } else if (object instanceof OnlineRoutingEngine) { onlineRoutingEngines.add((OnlineRoutingEngine) object); } } if (!quickActions.isEmpty()) { - settingsItems.add(new QuickActionsSettingsItem(app, quickActions)); + QuickActionsSettingsItem baseItem = getBaseItem(SettingsItemType.QUICK_ACTIONS, QuickActionsSettingsItem.class, settingsItems); + result.add(new QuickActionsSettingsItem(app, baseItem, quickActions)); } if (!poiUIFilters.isEmpty()) { - settingsItems.add(new PoiUiFiltersSettingsItem(app, poiUIFilters)); + PoiUiFiltersSettingsItem baseItem = getBaseItem(SettingsItemType.POI_UI_FILTERS, PoiUiFiltersSettingsItem.class, settingsItems); + result.add(new PoiUiFiltersSettingsItem(app, baseItem, poiUIFilters)); } if (!tileSourceTemplates.isEmpty()) { - settingsItems.add(new MapSourcesSettingsItem(app, tileSourceTemplates)); + MapSourcesSettingsItem baseItem = getBaseItem(SettingsItemType.MAP_SOURCES, MapSourcesSettingsItem.class, settingsItems); + result.add(new MapSourcesSettingsItem(app, baseItem, tileSourceTemplates)); } if (!avoidRoads.isEmpty()) { - settingsItems.add(new AvoidRoadsSettingsItem(app, avoidRoads)); + AvoidRoadsSettingsItem baseItem = getBaseItem(SettingsItemType.AVOID_ROADS, AvoidRoadsSettingsItem.class, settingsItems); + result.add(new AvoidRoadsSettingsItem(app, baseItem, avoidRoads)); } if (!appModeBeans.isEmpty()) { for (ApplicationModeBean modeBean : appModeBeans) { if (export) { ApplicationMode mode = ApplicationMode.valueOfStringKey(modeBean.stringKey, null); if (mode != null) { - settingsItems.add(new ProfileSettingsItem(app, mode)); + result.add(new ProfileSettingsItem(app, mode)); } } else { - settingsItems.add(new ProfileSettingsItem(app, null, modeBean)); + result.add(new ProfileSettingsItem(app, getBaseProfileSettingsItem(modeBean, settingsItems), modeBean)); } } } if (!osmNotesPointList.isEmpty()) { - settingsItems.add(new OsmNotesSettingsItem(app, osmNotesPointList)); + OsmNotesSettingsItem baseItem = getBaseItem(SettingsItemType.OSM_NOTES, OsmNotesSettingsItem.class, settingsItems); + result.add(new OsmNotesSettingsItem(app, baseItem, osmNotesPointList)); } if (!osmEditsPointList.isEmpty()) { - settingsItems.add(new OsmEditsSettingsItem(app, osmEditsPointList)); + OsmEditsSettingsItem baseItem = getBaseItem(SettingsItemType.OSM_EDITS, OsmEditsSettingsItem.class, settingsItems); + result.add(new OsmEditsSettingsItem(app, baseItem, osmEditsPointList)); } if (!favoriteGroups.isEmpty()) { - settingsItems.add(new FavoritesSettingsItem(app, favoriteGroups)); + FavoritesSettingsItem baseItem = getBaseItem(SettingsItemType.FAVOURITES, FavoritesSettingsItem.class, settingsItems); + result.add(new FavoritesSettingsItem(app, baseItem, favoriteGroups)); } if (!markersGroups.isEmpty()) { List mapMarkers = new ArrayList<>(); for (MapMarkersGroup group : markersGroups) { mapMarkers.addAll(group.getMarkers()); } - settingsItems.add(new MarkersSettingsItem(app, mapMarkers)); + MarkersSettingsItem baseItem = getBaseItem(SettingsItemType.ACTIVE_MARKERS, MarkersSettingsItem.class, settingsItems); + result.add(new MarkersSettingsItem(app, baseItem, mapMarkers)); } if (!markersHistoryGroups.isEmpty()) { List mapMarkers = new ArrayList<>(); for (MapMarkersGroup group : markersHistoryGroups) { mapMarkers.addAll(group.getMarkers()); } - settingsItems.add(new HistoryMarkersSettingsItem(app, mapMarkers)); + HistoryMarkersSettingsItem baseItem = getBaseItem(SettingsItemType.HISTORY_MARKERS, HistoryMarkersSettingsItem.class, settingsItems); + result.add(new HistoryMarkersSettingsItem(app, baseItem, mapMarkers)); } if (!historyEntries.isEmpty()) { - settingsItems.add(new SearchHistorySettingsItem(app, historyEntries)); + SearchHistorySettingsItem baseItem = getBaseItem(SettingsItemType.SEARCH_HISTORY, SearchHistorySettingsItem.class, settingsItems); + result.add(new SearchHistorySettingsItem(app, baseItem, historyEntries)); } if (!onlineRoutingEngines.isEmpty()) { - settingsItems.add(new OnlineRoutingSettingsItem(app, onlineRoutingEngines)); + OnlineRoutingSettingsItem baseItem = getBaseItem(SettingsItemType.ONLINE_ROUTING_ENGINES, OnlineRoutingSettingsItem.class, settingsItems); + result.add(new OnlineRoutingSettingsItem(app, baseItem, onlineRoutingEngines)); } - return settingsItems; + return result; + } + + @Nullable + private ProfileSettingsItem getBaseProfileSettingsItem(ApplicationModeBean modeBean, List settingsItems) { + for (SettingsItem settingsItem : settingsItems) { + if (settingsItem.getType() == SettingsItemType.PROFILE) { + ProfileSettingsItem profileItem = (ProfileSettingsItem) settingsItem; + ApplicationModeBean bean = profileItem.getModeBean(); + if (Algorithms.objectEquals(bean.stringKey, modeBean.stringKey) && Algorithms.objectEquals(bean.userProfileName, modeBean.userProfileName)) { + return profileItem; + } + } + } + return null; + } + + @Nullable + private T getBaseItem(SettingsItemType settingsItemType, Class clazz, List settingsItems) { + for (SettingsItem settingsItem : settingsItems) { + if (settingsItem.getType() == settingsItemType && clazz.isInstance(settingsItem)) { + return clazz.cast(settingsItem); + } + } + return null; } public static Map getSettingsToOperateByCategory(List items, boolean importComplete) { diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java index e61faafe16..f43320c27c 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/ChangeDataStorageBottomSheet.java @@ -19,13 +19,13 @@ import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem; import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithDescription; import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem; import net.osmand.plus.settings.fragments.BaseSettingsFragment; -import net.osmand.plus.settings.fragments.DataStorageMenuItem; +import net.osmand.plus.settings.datastorage.item.StorageItem; import org.apache.commons.logging.Log; import java.io.File; -import static net.osmand.plus.settings.fragments.DataStorageHelper.MANUALLY_SPECIFIED; +import static net.osmand.plus.settings.datastorage.DataStorageHelper.MANUALLY_SPECIFIED; public class ChangeDataStorageBottomSheet extends BasePreferenceBottomSheet { @@ -39,8 +39,8 @@ public class ChangeDataStorageBottomSheet extends BasePreferenceBottomSheet { public final static String MOVE_DATA = "move_data"; public final static String CHOSEN_DIRECTORY = "chosen_storage"; - private DataStorageMenuItem currentDirectory; - private DataStorageMenuItem newDirectory; + private StorageItem currentDirectory; + private StorageItem newDirectory; @Override public void createMenuItems(Bundle savedInstanceState) { @@ -126,11 +126,11 @@ public class ChangeDataStorageBottomSheet extends BasePreferenceBottomSheet { items.add(baseItem); } - public void setCurrentDirectory(DataStorageMenuItem currentDirectory) { + public void setCurrentDirectory(StorageItem currentDirectory) { this.currentDirectory = currentDirectory; } - public void setNewDirectory(DataStorageMenuItem newDirectory) { + public void setNewDirectory(StorageItem newDirectory) { this.newDirectory = newDirectory; } @@ -158,8 +158,8 @@ public class ChangeDataStorageBottomSheet extends BasePreferenceBottomSheet { return true; } - public static boolean showInstance(FragmentManager fm, String prefId, DataStorageMenuItem currentDirectory, - DataStorageMenuItem newDirectory, Fragment target, boolean usedOnMap) { + public static boolean showInstance(FragmentManager fm, String prefId, StorageItem currentDirectory, + StorageItem newDirectory, Fragment target, boolean usedOnMap) { try { if (fm.findFragmentByTag(TAG) == null) { Bundle args = new Bundle(); diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java b/OsmAnd/src/net/osmand/plus/settings/datastorage/DataStorageFragment.java similarity index 69% rename from OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java rename to OsmAnd/src/net/osmand/plus/settings/datastorage/DataStorageFragment.java index de95eaeade..7fd96b8185 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/datastorage/DataStorageFragment.java @@ -1,8 +1,7 @@ -package net.osmand.plus.settings.fragments; +package net.osmand.plus.settings.datastorage; import android.Manifest; import android.annotation.SuppressLint; -import android.app.ProgressDialog; import android.content.Context; import android.content.DialogInterface; import android.graphics.drawable.Drawable; @@ -26,7 +25,6 @@ import net.osmand.AndroidUtils; import net.osmand.FileUtils; import net.osmand.plus.OsmandApplication; import net.osmand.plus.settings.backend.OsmandSettings; -import net.osmand.plus.ProgressImplementation; import net.osmand.plus.R; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; @@ -34,20 +32,21 @@ import net.osmand.plus.activities.OsmandActionBarActivity; import net.osmand.plus.download.DownloadActivity; import net.osmand.plus.settings.bottomsheets.ChangeDataStorageBottomSheet; import net.osmand.plus.settings.bottomsheets.SelectFolderBottomSheet; -import net.osmand.util.Algorithms; +import net.osmand.plus.settings.datastorage.item.MemoryItem; +import net.osmand.plus.settings.datastorage.item.StorageItem; +import net.osmand.plus.settings.datastorage.task.MoveFilesTask; +import net.osmand.plus.settings.datastorage.task.RefreshUsedMemoryTask; +import net.osmand.plus.settings.datastorage.task.ReloadDataTask; +import net.osmand.plus.settings.fragments.BaseSettingsFragment; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.lang.ref.WeakReference; import java.text.DecimalFormat; import java.util.ArrayList; -import static net.osmand.plus.settings.fragments.DataStorageHelper.INTERNAL_STORAGE; -import static net.osmand.plus.settings.fragments.DataStorageHelper.MANUALLY_SPECIFIED; -import static net.osmand.plus.settings.fragments.DataStorageHelper.OTHER_MEMORY; -import static net.osmand.plus.settings.fragments.DataStorageHelper.TILES_MEMORY; +import static net.osmand.plus.settings.datastorage.DataStorageHelper.INTERNAL_STORAGE; +import static net.osmand.plus.settings.datastorage.DataStorageHelper.MANUALLY_SPECIFIED; +import static net.osmand.plus.settings.datastorage.DataStorageHelper.OTHER_MEMORY; +import static net.osmand.plus.settings.datastorage.DataStorageHelper.TILES_MEMORY; import static net.osmand.plus.settings.bottomsheets.ChangeDataStorageBottomSheet.CHOSEN_DIRECTORY; import static net.osmand.plus.settings.bottomsheets.ChangeDataStorageBottomSheet.MOVE_DATA; import static net.osmand.plus.settings.bottomsheets.SelectFolderBottomSheet.NEW_PATH; @@ -60,17 +59,17 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto private final static String CHANGE_DIRECTORY_BUTTON = "change_directory"; private final static String OSMAND_USAGE = "osmand_usage"; - private ArrayList menuItems; - private ArrayList memoryItems; + private ArrayList storageItems; + private ArrayList memoryItems; private ArrayList dataStorageRadioButtonsGroup; private Preference changeButton; - private DataStorageMenuItem currentDataStorage; + private StorageItem currentDataStorage; private String tmpManuallySpecifiedPath; private DataStorageHelper dataStorageHelper; private boolean calculateTilesBtnPressed; - private DataStorageHelper.RefreshMemoryUsedInfo calculateMemoryTask; - private DataStorageHelper.RefreshMemoryUsedInfo calculateTilesMemoryTask; + private RefreshUsedMemoryTask calculateMemoryTask; + private RefreshUsedMemoryTask calculateTilesMemoryTask; private OsmandApplication app; private OsmandActionBarActivity activity; @@ -95,11 +94,11 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto return; } - menuItems = dataStorageHelper.getStorageItems(); + storageItems = dataStorageHelper.getStorageItems(); memoryItems = dataStorageHelper.getMemoryInfoItems(); dataStorageRadioButtonsGroup = new ArrayList<>(); - for (DataStorageMenuItem item : menuItems) { + for (StorageItem item : storageItems) { CheckBoxPreference preference = new CheckBoxPreference(activity); preference.setKey(item.getKey()); preference.setTitle(item.getTitle()); @@ -136,7 +135,7 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto Bundle resultData = (Bundle) newValue; if (resultData.containsKey(ChangeDataStorageBottomSheet.TAG)) { boolean moveMaps = resultData.getBoolean(MOVE_DATA); - DataStorageMenuItem newDataStorage = resultData.getParcelable(CHOSEN_DIRECTORY); + StorageItem newDataStorage = resultData.getParcelable(CHOSEN_DIRECTORY); if (newDataStorage != null) { if (tmpManuallySpecifiedPath != null) { String directory = tmpManuallySpecifiedPath; @@ -154,9 +153,9 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto if (pathChanged) { tmpManuallySpecifiedPath = resultData.getString(NEW_PATH); if (tmpManuallySpecifiedPath != null) { - DataStorageMenuItem manuallySpecified = null; + StorageItem manuallySpecified = null; try { - manuallySpecified = (DataStorageMenuItem) dataStorageHelper.getManuallySpecified().clone(); + manuallySpecified = (StorageItem) dataStorageHelper.getManuallySpecified().clone(); manuallySpecified.setDirectory(tmpManuallySpecifiedPath); } catch (CloneNotSupportedException e) { return false; @@ -170,7 +169,7 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto //show necessary dialog String key = preference.getKey(); if (key != null) { - DataStorageMenuItem newDataStorage = dataStorageHelper.getStorage(key); + StorageItem newDataStorage = dataStorageHelper.getStorage(key); if (newDataStorage != null) { if (!currentDataStorage.getKey().equals(newDataStorage.getKey())) { if (newDataStorage.getType() == OsmandSettings.EXTERNAL_STORAGE_TYPE_DEFAULT @@ -212,7 +211,7 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto final View itemView = holder.itemView; if (preference instanceof CheckBoxPreference) { - DataStorageMenuItem item = dataStorageHelper.getStorage(key); + StorageItem item = dataStorageHelper.getStorage(key); if (item != null) { TextView tvTitle = itemView.findViewById(android.R.id.title); TextView tvSummary = itemView.findViewById(R.id.summary); @@ -267,7 +266,7 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto TextView tvSummary = itemView.findViewById(R.id.summary); tvSummary.setText(DataStorageHelper.getFormattedMemoryInfo(totalUsageBytes, memoryUnitsFormats)); } else { - for (DataStorageMemoryItem mi : memoryItems) { + for (MemoryItem mi : memoryItems) { if (key.equals(mi.getKey())) { TextView tvMemory = itemView.findViewById(R.id.memory); String summary = ""; @@ -326,7 +325,7 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto } private void showFolderSelectionDialog() { - DataStorageMenuItem manuallySpecified = dataStorageHelper.getManuallySpecified(); + StorageItem manuallySpecified = dataStorageHelper.getManuallySpecified(); if (manuallySpecified != null) { SelectFolderBottomSheet.showInstance(getFragmentManager(), manuallySpecified.getKey(), manuallySpecified.getDirectory(), DataStorageFragment.this, @@ -335,11 +334,11 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto } } - private void moveData(final DataStorageMenuItem currentStorage, final DataStorageMenuItem newStorage) { + private void moveData(final StorageItem currentStorage, final StorageItem newStorage) { File fromDirectory = new File(currentStorage.getDirectory()); File toDirectory = new File(newStorage.getDirectory()); @SuppressLint("StaticFieldLeak") - MoveFilesToDifferentDirectory task = new MoveFilesToDifferentDirectory(activity, fromDirectory, toDirectory) { + MoveFilesTask task = new MoveFilesTask(activity, fromDirectory, toDirectory) { @NonNull @@ -405,7 +404,7 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } - private void confirm(OsmandApplication app, OsmandActionBarActivity activity, DataStorageMenuItem newStorageDirectory, boolean silentRestart) { + private void confirm(OsmandApplication app, OsmandActionBarActivity activity, StorageItem newStorageDirectory, boolean silentRestart) { String newDirectory = newStorageDirectory.getDirectory(); int type = newStorageDirectory.getType(); File newDirectoryFile = new File(newDirectory); @@ -454,7 +453,7 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto } protected void reloadData() { - new ReloadData(activity, app).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null); + new ReloadDataTask(activity, app).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null); } @Override @@ -463,204 +462,10 @@ public class DataStorageFragment extends BaseSettingsFragment implements DataSto } @Override - public void onFinishUpdating(String taskKey) { + public void onFinishUpdating(String tag) { updateAllSettings(); - if (taskKey != null && taskKey.equals(TILES_MEMORY)) { + if (tag != null && tag.equals(TILES_MEMORY)) { app.getSettings().OSMAND_USAGE_SPACE.set(dataStorageHelper.getTotalUsedBytes()); } } - - public static class MoveFilesToDifferentDirectory extends AsyncTask { - - protected WeakReference activity; - private WeakReference context; - private File from; - private File to; - protected ProgressImplementation progress; - private Runnable runOnSuccess; - private int movedCount; - private long movedSize; - private int copiedCount; - private long copiedSize; - private int failedCount; - private long failedSize; - private String exceptionMessage; - - public MoveFilesToDifferentDirectory(OsmandActionBarActivity activity, File from, File to) { - this.activity = new WeakReference<>(activity); - this.context = new WeakReference<>((Context) activity); - this.from = from; - this.to = to; - } - - public void setRunOnSuccess(Runnable runOnSuccess) { - this.runOnSuccess = runOnSuccess; - } - - public int getMovedCount() { - return movedCount; - } - - public int getCopiedCount() { - return copiedCount; - } - - public int getFailedCount() { - return failedCount; - } - - public long getMovedSize() { - return movedSize; - } - - public long getCopiedSize() { - return copiedSize; - } - - public long getFailedSize() { - return failedSize; - } - - @Override - protected void onPreExecute() { - Context ctx = context.get(); - if (context == null) { - return; - } - movedCount = 0; - copiedCount = 0; - failedCount = 0; - progress = ProgressImplementation.createProgressDialog( - ctx, ctx.getString(R.string.copying_osmand_files), - ctx.getString(R.string.copying_osmand_files_descr, to.getPath()), - ProgressDialog.STYLE_HORIZONTAL); - } - - @Override - protected void onPostExecute(Boolean result) { - Context ctx = context.get(); - if (ctx == null) { - return; - } - if (result != null) { - if (result.booleanValue() && runOnSuccess != null) { - runOnSuccess.run(); - } else if (!result.booleanValue()) { - Toast.makeText(ctx, ctx.getString(R.string.shared_string_io_error) + ": " + exceptionMessage, Toast.LENGTH_LONG).show(); - } - } - try { - if (progress.getDialog().isShowing()) { - progress.getDialog().dismiss(); - } - } catch (Exception e) { - //ignored - } - } - - private void movingFiles(File f, File t, int depth) throws IOException { - Context ctx = context.get(); - if (ctx == null) { - return; - } - if (depth <= 2) { - progress.startTask(ctx.getString(R.string.copying_osmand_one_file_descr, t.getName()), -1); - } - if (f.isDirectory()) { - t.mkdirs(); - File[] lf = f.listFiles(); - if (lf != null) { - for (int i = 0; i < lf.length; i++) { - if (lf[i] != null) { - movingFiles(lf[i], new File(t, lf[i].getName()), depth + 1); - } - } - } - f.delete(); - } else if (f.isFile()) { - if (t.exists()) { - Algorithms.removeAllFiles(t); - } - boolean rnm = false; - long fileSize = f.length(); - try { - rnm = f.renameTo(t); - movedCount++; - movedSize += fileSize; - } catch (RuntimeException e) { - } - if (!rnm) { - FileInputStream fin = new FileInputStream(f); - FileOutputStream fout = new FileOutputStream(t); - try { - progress.startTask(ctx.getString(R.string.copying_osmand_one_file_descr, t.getName()), (int) (f.length() / 1024)); - Algorithms.streamCopy(fin, fout, progress, 1024); - copiedCount++; - copiedSize += fileSize; - } catch (IOException e) { - failedCount++; - failedSize += fileSize; - } finally { - fin.close(); - fout.close(); - } - f.delete(); - } - } - if (depth <= 2) { - progress.finishTask(); - } - } - - @Override - protected Boolean doInBackground(Void... params) { - to.mkdirs(); - try { - movingFiles(from, to, 0); - } catch (IOException e) { - exceptionMessage = e.getMessage(); - return false; - } - return true; - } - - } - - public static class ReloadData extends AsyncTask { - private WeakReference ctx; - protected ProgressImplementation progress; - private OsmandApplication app; - - public ReloadData(Context ctx, OsmandApplication app) { - this.ctx = new WeakReference<>(ctx); - this.app = app; - } - - @Override - protected void onPreExecute() { - Context c = ctx.get(); - if (c == null) { - return; - } - progress = ProgressImplementation.createProgressDialog(c, c.getString(R.string.loading_data), - c.getString(R.string.loading_data), ProgressDialog.STYLE_HORIZONTAL); - } - - @Override - protected void onPostExecute(Boolean result) { - try { - if (progress.getDialog().isShowing()) { - progress.getDialog().dismiss(); - } - } catch (Exception e) { - //ignored - } - } - - @Override - protected Boolean doInBackground(Void... params) { - app.getResourceManager().reloadIndexes(progress, new ArrayList()); - return true; - } - } } \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/settings/datastorage/DataStorageHelper.java b/OsmAnd/src/net/osmand/plus/settings/datastorage/DataStorageHelper.java new file mode 100644 index 0000000000..ecc0f04842 --- /dev/null +++ b/OsmAnd/src/net/osmand/plus/settings/datastorage/DataStorageHelper.java @@ -0,0 +1,321 @@ +package net.osmand.plus.settings.datastorage; + +import android.os.Build; + +import androidx.annotation.NonNull; + +import net.osmand.IndexConstants; +import net.osmand.ValueHolder; +import net.osmand.plus.OsmandApplication; +import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.R; +import net.osmand.plus.settings.datastorage.item.DirectoryItem; +import net.osmand.plus.settings.datastorage.item.DirectoryItem.CheckingType; +import net.osmand.plus.settings.datastorage.item.MemoryItem; +import net.osmand.plus.settings.datastorage.item.StorageItem; +import net.osmand.plus.settings.datastorage.task.RefreshUsedMemoryTask; + +import java.io.File; +import java.text.DecimalFormat; +import java.util.ArrayList; + +import static net.osmand.IndexConstants.AV_INDEX_DIR; +import static net.osmand.IndexConstants.BACKUP_INDEX_DIR; +import static net.osmand.IndexConstants.GPX_INDEX_DIR; +import static net.osmand.IndexConstants.MAPS_PATH; +import static net.osmand.IndexConstants.ROADS_INDEX_DIR; +import static net.osmand.IndexConstants.SRTM_INDEX_DIR; +import static net.osmand.IndexConstants.TILES_INDEX_DIR; +import static net.osmand.IndexConstants.WIKIVOYAGE_INDEX_DIR; +import static net.osmand.IndexConstants.WIKI_INDEX_DIR; +import static net.osmand.plus.settings.datastorage.item.DirectoryItem.CheckingType.EXTENSIONS; +import static net.osmand.plus.settings.datastorage.item.DirectoryItem.CheckingType.PREFIX; + +public class DataStorageHelper { + public final static String INTERNAL_STORAGE = "internal_storage"; + public final static String EXTERNAL_STORAGE = "external_storage"; + public final static String SHARED_STORAGE = "shared_storage"; + public final static String MULTIUSER_STORAGE = "multiuser_storage"; + public final static String MANUALLY_SPECIFIED = "manually_specified"; + + public final static String MAPS_MEMORY = "maps_memory_used"; + public final static String TERRAIN_MEMORY = "terrain_memory_used"; + public final static String TRACKS_MEMORY = "tracks_memory_used"; + public final static String NOTES_MEMORY = "notes_memory_used"; + public final static String TILES_MEMORY = "tiles_memory_used"; + public final static String OTHER_MEMORY = "other_memory_used"; + + private OsmandApplication app; + private ArrayList storageItems = new ArrayList<>(); + private StorageItem currentDataStorage; + private StorageItem manuallySpecified; + + private ArrayList memoryItems = new ArrayList<>(); + private MemoryItem mapsMemory; + private MemoryItem terrainMemory; + private MemoryItem tracksMemory; + private MemoryItem notesMemory; + private MemoryItem tilesMemory; + private MemoryItem otherMemory; + + private int currentStorageType; + private String currentStoragePath; + + public DataStorageHelper(@NonNull OsmandApplication app) { + this.app = app; + prepareData(); + } + + private void prepareData() { + initStorageItems(); + initUsedMemoryItems(); + } + + private void initStorageItems() { + OsmandSettings settings = app.getSettings(); + if (settings.getExternalStorageDirectoryTypeV19() >= 0) { + currentStorageType = settings.getExternalStorageDirectoryTypeV19(); + } else { + ValueHolder vh = new ValueHolder(); + if (vh.value != null && vh.value >= 0) { + currentStorageType = vh.value; + } else { + currentStorageType = 0; + } + } + currentStoragePath = settings.getExternalStorageDirectory().getAbsolutePath(); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + + //internal storage + String path = settings.getInternalAppPath().getAbsolutePath(); + File dir = new File(path); + int iconId = R.drawable.ic_action_phone; + + StorageItem internalStorageItem = StorageItem.builder() + .setKey(INTERNAL_STORAGE) + .setTitle(app.getString(R.string.storage_directory_internal_app)) + .setDirectory(path) + .setDescription(app.getString(R.string.internal_app_storage_description)) + .setType(OsmandSettings.EXTERNAL_STORAGE_TYPE_INTERNAL_FILE) + .setIconResId(iconId) + .createItem(); + addItem(internalStorageItem); + + //shared storage + dir = settings.getDefaultInternalStorage(); + path = dir.getAbsolutePath(); + iconId = R.drawable.ic_action_phone; + + StorageItem sharedStorageItem = StorageItem.builder() + .setKey(SHARED_STORAGE) + .setTitle(app.getString(R.string.storage_directory_shared)) + .setDirectory(path) + .setType(OsmandSettings.EXTERNAL_STORAGE_TYPE_DEFAULT) + .setIconResId(iconId) + .createItem(); + addItem(sharedStorageItem); + + //external storage + File[] externals = app.getExternalFilesDirs(null); + if (externals != null) { + int i = 0; + for (File external : externals) { + if (external != null) { + ++i; + dir = external; + path = dir.getAbsolutePath(); + iconId = getIconForStorageType(dir); + StorageItem externalStorageItem = StorageItem.builder() + .setKey(EXTERNAL_STORAGE + i) + .setTitle(app.getString(R.string.storage_directory_external) + " " + i) + .setDirectory(path) + .setType(OsmandSettings.EXTERNAL_STORAGE_TYPE_EXTERNAL_FILE) + .setIconResId(iconId) + .createItem(); + addItem(externalStorageItem); + } + } + } + + //multi user storage + File[] obbDirs = app.getObbDirs(); + if (obbDirs != null) { + int i = 0; + for (File obb : obbDirs) { + if (obb != null) { + ++i; + dir = obb; + path = dir.getAbsolutePath(); + iconId = getIconForStorageType(dir); + StorageItem multiuserStorageItem = StorageItem.builder() + .setKey(MULTIUSER_STORAGE + i) + .setTitle(app.getString(R.string.storage_directory_multiuser) + " " + i) + .setDirectory(path) + .setType(OsmandSettings.EXTERNAL_STORAGE_TYPE_OBB) + .setIconResId(iconId) + .createItem(); + addItem(multiuserStorageItem); + } + } + } + } + + //manually specified storage + manuallySpecified = StorageItem.builder() + .setKey(MANUALLY_SPECIFIED) + .setTitle(app.getString(R.string.storage_directory_manual)) + .setDirectory(currentStoragePath) + .setType(OsmandSettings.EXTERNAL_STORAGE_TYPE_SPECIFIED) + .setIconResId(R.drawable.ic_action_folder) + .createItem(); + storageItems.add(manuallySpecified); + + if (currentDataStorage == null) { + currentDataStorage = manuallySpecified; + } + } + + private void initUsedMemoryItems() { + mapsMemory = MemoryItem.builder() + .setKey(MAPS_MEMORY) + .setExtensions(IndexConstants.BINARY_MAP_INDEX_EXT) + .setDirectories( + createDirectory(MAPS_PATH, false, EXTENSIONS, true), + createDirectory(ROADS_INDEX_DIR, true, EXTENSIONS, true), + createDirectory(WIKI_INDEX_DIR, true, EXTENSIONS, true), + createDirectory(WIKIVOYAGE_INDEX_DIR, true, EXTENSIONS, true), + createDirectory(BACKUP_INDEX_DIR, true, EXTENSIONS, true)) + .createItem(); + memoryItems.add(mapsMemory); + + terrainMemory = MemoryItem.builder() + .setKey(TERRAIN_MEMORY) + .setExtensions(IndexConstants.BINARY_SRTM_MAP_INDEX_EXT) + .setDirectories( + createDirectory(SRTM_INDEX_DIR, true, EXTENSIONS, true), + createDirectory(TILES_INDEX_DIR, false, PREFIX, false)) + .setPrefixes("Hillshade", "Slope") + .createItem(); + memoryItems.add(terrainMemory); + + tracksMemory = MemoryItem.builder() + .setKey(TRACKS_MEMORY) +// .setExtensions(IndexConstants.GPX_FILE_EXT, ".gpx.bz2") + .setDirectories( + createDirectory(GPX_INDEX_DIR, true, EXTENSIONS, true)) + .createItem(); + memoryItems.add(tracksMemory); + + notesMemory = MemoryItem.builder() + .setKey(NOTES_MEMORY) +// .setExtensions("") + .setDirectories( + createDirectory(AV_INDEX_DIR, true, EXTENSIONS, true)) + .createItem(); + memoryItems.add(notesMemory); + + tilesMemory = MemoryItem.builder() + .setKey(TILES_MEMORY) +// .setExtensions("") + .setDirectories( + createDirectory(TILES_INDEX_DIR, true, EXTENSIONS, true)) + .createItem(); + memoryItems.add(tilesMemory); + + otherMemory = MemoryItem.builder() + .setKey(OTHER_MEMORY) + .createItem(); + memoryItems.add(otherMemory); + } + + public ArrayList getStorageItems() { + return storageItems; + } + + private int getIconForStorageType(File dir) { + return R.drawable.ic_action_folder; + } + + public StorageItem getCurrentStorage() { + return currentDataStorage; + } + + private void addItem(StorageItem item) { + if (currentStorageType == item.getType() && currentStoragePath.equals(item.getDirectory())) { + currentDataStorage = item; + } + storageItems.add(item); + } + + public StorageItem getManuallySpecified() { + return manuallySpecified; + } + + public StorageItem getStorage(String key) { + if (storageItems != null && key != null) { + for (StorageItem storageItem : storageItems) { + if (key.equals(storageItem.getKey())) { + return storageItem; + } + } + } + return null; + } + + public ArrayList getMemoryInfoItems() { + return memoryItems; + } + + public RefreshUsedMemoryTask calculateMemoryUsedInfo(UpdateMemoryInfoUIAdapter uiAdapter) { + File rootDir = new File(currentStoragePath); + RefreshUsedMemoryTask task = new RefreshUsedMemoryTask(uiAdapter, otherMemory, rootDir, null, null, OTHER_MEMORY); + task.execute(mapsMemory, terrainMemory, tracksMemory, notesMemory); + return task; + } + + public RefreshUsedMemoryTask calculateTilesMemoryUsed(UpdateMemoryInfoUIAdapter listener) { + File rootDir = new File(tilesMemory.getDirectories()[0].getAbsolutePath()); + RefreshUsedMemoryTask task = new RefreshUsedMemoryTask(listener, otherMemory, rootDir, null, terrainMemory.getPrefixes(), TILES_MEMORY); + task.execute(tilesMemory); + return task; + } + + public long getTotalUsedBytes() { + long total = 0; + if (memoryItems != null && memoryItems.size() > 0) { + for (MemoryItem mi : memoryItems) { + total += mi.getUsedMemoryBytes(); + } + return total; + } + return -1; + } + + public DirectoryItem createDirectory(@NonNull String relativePath, + boolean processInternalDirectories, + CheckingType checkingType, + boolean addUnmatchedToOtherMemory) { + String path = app.getAppPath(relativePath).getAbsolutePath(); + return new DirectoryItem(path, processInternalDirectories, checkingType, addUnmatchedToOtherMemory); + } + + public static String getFormattedMemoryInfo(long bytes, String[] formatStrings) { + int type = 0; + double memory = (double) bytes / 1024; + while (memory > 1024 && type < formatStrings.length) { + ++type; + memory = memory / 1024; + } + String formattedUsed = new DecimalFormat("#.##").format(memory); + return String.format(formatStrings[type], formattedUsed); + } + + public interface UpdateMemoryInfoUIAdapter { + + void onMemoryInfoUpdate(); + + void onFinishUpdating(String tag); + + } +} \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/settings/datastorage/item/DirectoryItem.java b/OsmAnd/src/net/osmand/plus/settings/datastorage/item/DirectoryItem.java new file mode 100644 index 0000000000..f316a47920 --- /dev/null +++ b/OsmAnd/src/net/osmand/plus/settings/datastorage/item/DirectoryItem.java @@ -0,0 +1,40 @@ +package net.osmand.plus.settings.datastorage.item; + +public class DirectoryItem { + + private final String absolutePath; + private final boolean processInternalDirectories; + private final CheckingType checkingType; + private final boolean addUnmatchedToOtherMemory; + + public enum CheckingType { + EXTENSIONS, + PREFIX + } + + public DirectoryItem(String absolutePath, + boolean processInternalDirectories, + CheckingType checkingType, + boolean addUnmatchedToOtherMemory) { + this.absolutePath = absolutePath; + this.processInternalDirectories = processInternalDirectories; + this.checkingType = checkingType; + this.addUnmatchedToOtherMemory = addUnmatchedToOtherMemory; + } + + public String getAbsolutePath() { + return absolutePath; + } + + public boolean shouldProcessInternalDirectories() { + return processInternalDirectories; + } + + public CheckingType getCheckingType() { + return checkingType; + } + + public boolean shouldAddUnmatchedToOtherMemory() { + return addUnmatchedToOtherMemory; + } +} diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMemoryItem.java b/OsmAnd/src/net/osmand/plus/settings/datastorage/item/MemoryItem.java similarity index 52% rename from OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMemoryItem.java rename to OsmAnd/src/net/osmand/plus/settings/datastorage/item/MemoryItem.java index f7f955f89a..8fb65f99c3 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMemoryItem.java +++ b/OsmAnd/src/net/osmand/plus/settings/datastorage/item/MemoryItem.java @@ -1,16 +1,18 @@ -package net.osmand.plus.settings.fragments; +package net.osmand.plus.settings.datastorage.item; + +public class MemoryItem { -public class DataStorageMemoryItem { - public final static int EXTENSIONS = 0; - public final static int PREFIX = 1; - private String key; - private String[] extensions; - private String[] prefixes; - private Directory[] directories; + private final String[] extensions; + private final String[] prefixes; + private final DirectoryItem[] directories; private long usedMemoryBytes; - private DataStorageMemoryItem(String key, String[] extensions, String[] prefixes, long usedMemoryBytes, Directory[] directories) { + private MemoryItem(String key, + String[] extensions, + String[] prefixes, + long usedMemoryBytes, + DirectoryItem[] directories) { this.key = key; this.extensions = extensions; this.prefixes = prefixes; @@ -42,7 +44,7 @@ public class DataStorageMemoryItem { return prefixes; } - public Directory[] getDirectories() { + public DirectoryItem[] getDirectories() { return directories; } @@ -54,7 +56,7 @@ public class DataStorageMemoryItem { private String key; private String[] extensions; private String[] prefixes; - private Directory[] directories; + private DirectoryItem[] directories; private long usedMemoryBytes; public DataStorageMemoryItemBuilder setKey(String key) { @@ -72,7 +74,7 @@ public class DataStorageMemoryItem { return this; } - public DataStorageMemoryItemBuilder setDirectories(Directory ... directories) { + public DataStorageMemoryItemBuilder setDirectories(DirectoryItem... directories) { this.directories = directories; return this; } @@ -82,38 +84,8 @@ public class DataStorageMemoryItem { return this; } - public DataStorageMemoryItem createItem() { - return new DataStorageMemoryItem(key, extensions, prefixes, usedMemoryBytes, directories); - } - } - - public static class Directory { - private String absolutePath; - private boolean goDeeper; - private int checkingType; - private boolean skipOther; - - public Directory(String absolutePath, boolean goDeeper, int checkingType, boolean skipOther) { - this.absolutePath = absolutePath; - this.goDeeper = goDeeper; - this.checkingType = checkingType; - this.skipOther = skipOther; - } - - public String getAbsolutePath() { - return absolutePath; - } - - public boolean isGoDeeper() { - return goDeeper; - } - - public int getCheckingType() { - return checkingType; - } - - public boolean isSkipOther() { - return skipOther; + public MemoryItem createItem() { + return new MemoryItem(key, extensions, prefixes, usedMemoryBytes, directories); } } } diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMenuItem.java b/OsmAnd/src/net/osmand/plus/settings/datastorage/item/StorageItem.java similarity index 78% rename from OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMenuItem.java rename to OsmAnd/src/net/osmand/plus/settings/datastorage/item/StorageItem.java index f965b95fb1..717bcbd5e7 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageMenuItem.java +++ b/OsmAnd/src/net/osmand/plus/settings/datastorage/item/StorageItem.java @@ -1,11 +1,11 @@ -package net.osmand.plus.settings.fragments; +package net.osmand.plus.settings.datastorage.item; import android.os.Parcel; import android.os.Parcelable; import androidx.annotation.IdRes; -public class DataStorageMenuItem implements Parcelable, Cloneable { +public class StorageItem implements Parcelable, Cloneable { private String key; private int type; @@ -15,8 +15,12 @@ public class DataStorageMenuItem implements Parcelable, Cloneable { @IdRes private int iconResId; - private DataStorageMenuItem(String key, int type, String title, String description, - String directory, int iconResId) { + private StorageItem(String key, + int type, + String title, + String description, + String directory, + int iconResId) { this.key = key; this.type = type; this.title = title; @@ -25,7 +29,7 @@ public class DataStorageMenuItem implements Parcelable, Cloneable { this.iconResId = iconResId; } - private DataStorageMenuItem(Parcel in) { + private StorageItem(Parcel in) { key = in.readString(); type = in.readInt(); title = in.readString(); @@ -99,16 +103,16 @@ public class DataStorageMenuItem implements Parcelable, Cloneable { dest.writeString(directory); } - public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override - public DataStorageMenuItem createFromParcel(Parcel source) { - return new DataStorageMenuItem(source); + public StorageItem createFromParcel(Parcel source) { + return new StorageItem(source); } @Override - public DataStorageMenuItem[] newArray(int size) { - return new DataStorageMenuItem[size]; + public StorageItem[] newArray(int size) { + return new StorageItem[size]; } }; @@ -151,14 +155,14 @@ public class DataStorageMenuItem implements Parcelable, Cloneable { return this; } - public DataStorageMenuItem createItem() { - return new DataStorageMenuItem(key, type, title, description, directory, iconResId); + public StorageItem createItem() { + return new StorageItem(key, type, title, description, directory, iconResId); } } @Override public Object clone() throws CloneNotSupportedException { - return DataStorageMenuItem.builder() + return StorageItem.builder() .setKey(this.key) .setTitle(this.title) .setDescription(this.description) diff --git a/OsmAnd/src/net/osmand/plus/settings/datastorage/task/MoveFilesTask.java b/OsmAnd/src/net/osmand/plus/settings/datastorage/task/MoveFilesTask.java new file mode 100644 index 0000000000..b6fc45d93c --- /dev/null +++ b/OsmAnd/src/net/osmand/plus/settings/datastorage/task/MoveFilesTask.java @@ -0,0 +1,173 @@ +package net.osmand.plus.settings.datastorage.task; + +import android.app.ProgressDialog; +import android.content.Context; +import android.os.AsyncTask; +import android.widget.Toast; + +import net.osmand.plus.ProgressImplementation; +import net.osmand.plus.R; +import net.osmand.plus.activities.OsmandActionBarActivity; +import net.osmand.util.Algorithms; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.lang.ref.WeakReference; + +public class MoveFilesTask extends AsyncTask { + + protected WeakReference activity; + private WeakReference context; + private File from; + private File to; + protected ProgressImplementation progress; + private Runnable runOnSuccess; + private int movedCount; + private long movedSize; + private int copiedCount; + private long copiedSize; + private int failedCount; + private long failedSize; + private String exceptionMessage; + + public MoveFilesTask(OsmandActionBarActivity activity, File from, File to) { + this.activity = new WeakReference<>(activity); + this.context = new WeakReference<>((Context) activity); + this.from = from; + this.to = to; + } + + public void setRunOnSuccess(Runnable runOnSuccess) { + this.runOnSuccess = runOnSuccess; + } + + public int getMovedCount() { + return movedCount; + } + + public int getCopiedCount() { + return copiedCount; + } + + public int getFailedCount() { + return failedCount; + } + + public long getMovedSize() { + return movedSize; + } + + public long getCopiedSize() { + return copiedSize; + } + + public long getFailedSize() { + return failedSize; + } + + @Override + protected void onPreExecute() { + Context ctx = context.get(); + if (context == null) { + return; + } + movedCount = 0; + copiedCount = 0; + failedCount = 0; + progress = ProgressImplementation.createProgressDialog( + ctx, ctx.getString(R.string.copying_osmand_files), + ctx.getString(R.string.copying_osmand_files_descr, to.getPath()), + ProgressDialog.STYLE_HORIZONTAL); + } + + @Override + protected void onPostExecute(Boolean result) { + Context ctx = context.get(); + if (ctx == null) { + return; + } + if (result != null) { + if (result.booleanValue() && runOnSuccess != null) { + runOnSuccess.run(); + } else if (!result.booleanValue()) { + Toast.makeText(ctx, ctx.getString(R.string.shared_string_io_error) + ": " + exceptionMessage, Toast.LENGTH_LONG).show(); + } + } + try { + if (progress.getDialog().isShowing()) { + progress.getDialog().dismiss(); + } + } catch (Exception e) { + //ignored + } + } + + private void movingFiles(File f, File t, int depth) throws IOException { + Context ctx = context.get(); + if (ctx == null) { + return; + } + if (depth <= 2) { + progress.startTask(ctx.getString(R.string.copying_osmand_one_file_descr, t.getName()), -1); + } + if (f.isDirectory()) { + t.mkdirs(); + File[] lf = f.listFiles(); + if (lf != null) { + for (int i = 0; i < lf.length; i++) { + if (lf[i] != null) { + movingFiles(lf[i], new File(t, lf[i].getName()), depth + 1); + } + } + } + f.delete(); + } else if (f.isFile()) { + if (t.exists()) { + Algorithms.removeAllFiles(t); + } + boolean rnm = false; + long fileSize = f.length(); + try { + rnm = f.renameTo(t); + movedCount++; + movedSize += fileSize; + } catch (RuntimeException e) { + } + if (!rnm) { + FileInputStream fin = new FileInputStream(f); + FileOutputStream fout = new FileOutputStream(t); + try { + progress.startTask(ctx.getString(R.string.copying_osmand_one_file_descr, t.getName()), (int) (f.length() / 1024)); + Algorithms.streamCopy(fin, fout, progress, 1024); + copiedCount++; + copiedSize += fileSize; + } catch (IOException e) { + failedCount++; + failedSize += fileSize; + } finally { + fin.close(); + fout.close(); + } + f.delete(); + } + } + if (depth <= 2) { + progress.finishTask(); + } + } + + @Override + protected Boolean doInBackground(Void... params) { + to.mkdirs(); + try { + movingFiles(from, to, 0); + } catch (IOException e) { + exceptionMessage = e.getMessage(); + return false; + } + return true; + } + +} diff --git a/OsmAnd/src/net/osmand/plus/settings/datastorage/task/RefreshUsedMemoryTask.java b/OsmAnd/src/net/osmand/plus/settings/datastorage/task/RefreshUsedMemoryTask.java new file mode 100644 index 0000000000..123aac1b2b --- /dev/null +++ b/OsmAnd/src/net/osmand/plus/settings/datastorage/task/RefreshUsedMemoryTask.java @@ -0,0 +1,232 @@ +package net.osmand.plus.settings.datastorage.task; + +import android.os.AsyncTask; + +import androidx.annotation.NonNull; + +import net.osmand.plus.settings.datastorage.DataStorageHelper.UpdateMemoryInfoUIAdapter; +import net.osmand.plus.settings.datastorage.item.DirectoryItem; +import net.osmand.plus.settings.datastorage.item.DirectoryItem.CheckingType; +import net.osmand.plus.settings.datastorage.item.MemoryItem; + +import java.io.File; + +import static net.osmand.plus.settings.datastorage.DataStorageFragment.UI_REFRESH_TIME_MS; +import static net.osmand.util.Algorithms.objectEquals; + +public class RefreshUsedMemoryTask extends AsyncTask { + private final UpdateMemoryInfoUIAdapter uiAdapter; + private final File root; + private final MemoryItem otherMemoryItem; + private final String[] directoriesToSkip; + private final String[] filePrefixesToSkip; + private final String tag; + private long lastRefreshTime; + + public RefreshUsedMemoryTask(UpdateMemoryInfoUIAdapter uiAdapter, + MemoryItem otherMemoryItem, + File root, + String[] directoriesToSkip, + String[] filePrefixesToSkip, + String tag) { + this.uiAdapter = uiAdapter; + this.otherMemoryItem = otherMemoryItem; + this.root = root; + this.directoriesToSkip = directoriesToSkip; + this.filePrefixesToSkip = filePrefixesToSkip; + this.tag = tag; + } + + @Override + protected Void doInBackground(MemoryItem... items) { + lastRefreshTime = System.currentTimeMillis(); + if (root.canRead()) { + calculateMultiTypes(root, items); + } + return null; + } + + private void calculateMultiTypes(File rootDir, + MemoryItem... items) { + File[] subFiles = rootDir.listFiles(); + if (subFiles != null) { + for (File file : subFiles) { + if (isCancelled()) break; + + if (file.isDirectory()) { + if (!shouldSkipDirectory(file)) { + processDirectory(file, items); + } + + } else if (file.isFile()) { + if (!shouldSkipFile(file)) { + processFile(rootDir, file, items); + } + } + refreshUI(); + } + } + } + + private boolean shouldSkipDirectory(@NonNull File dir) { + if (directoriesToSkip != null) { + for (String dirToSkipPath : directoriesToSkip) { + String dirPath = dir.getAbsolutePath(); + if (objectEquals(dirPath, dirToSkipPath)) { + return true; + } + } + } + return false; + } + + private boolean shouldSkipFile(@NonNull File file) { + if (filePrefixesToSkip != null) { + String fileName = file.getName().toLowerCase(); + for (String prefixToAvoid : filePrefixesToSkip) { + String prefix = prefixToAvoid.toLowerCase(); + if (fileName.startsWith(prefix)) { + return true; + } + } + } + return false; + } + + private void processDirectory(@NonNull File directory, + @NonNull MemoryItem... items) { + String directoryPath = directory.getAbsolutePath(); + for (MemoryItem memoryItem : items) { + DirectoryItem[] targetDirectories = memoryItem.getDirectories(); + if (targetDirectories != null) { + for (DirectoryItem dir : targetDirectories) { + String allowedDirPath = dir.getAbsolutePath(); + boolean isPerfectlyMatch = objectEquals(directoryPath, allowedDirPath); + boolean isParentDirectory = !isPerfectlyMatch && (directoryPath.startsWith(allowedDirPath)); + boolean isMatchDirectory = isPerfectlyMatch || isParentDirectory; + if (isPerfectlyMatch) { + calculateMultiTypes(directory, items); + return; + } else if (isParentDirectory && dir.shouldProcessInternalDirectories()) { + calculateMultiTypes(directory, items); + return; + } else if (isMatchDirectory && !dir.shouldAddUnmatchedToOtherMemory()) { + return; + } + } + } + } + // Current directory did not match to any type + otherMemoryItem.addBytes(calculateFolderSize(directory)); + } + + private void processFile(@NonNull File rootDir, + @NonNull File file, + @NonNull MemoryItem... items) { + for (MemoryItem item : items) { + DirectoryItem[] targetDirectories = item.getDirectories(); + if (targetDirectories == null) continue; + String rootDirPath = rootDir.getAbsolutePath(); + + for (DirectoryItem targetDirectory : targetDirectories) { + String allowedDirPath = targetDirectory.getAbsolutePath(); + boolean processInternal = targetDirectory.shouldProcessInternalDirectories(); + if (objectEquals(rootDirPath, allowedDirPath) + || (rootDirPath.startsWith(allowedDirPath) && processInternal)) { + CheckingType checkingType = targetDirectory.getCheckingType(); + switch (checkingType) { + case EXTENSIONS: { + if (isSuitableExtension(file, item)) { + item.addBytes(file.length()); + return; + } + break; + } + case PREFIX: { + if (isSuitablePrefix(file, item)) { + item.addBytes(file.length()); + return; + } + break; + } + } + if (!targetDirectory.shouldAddUnmatchedToOtherMemory()) { + return; + } + } + } + } + // Current file did not match any type + otherMemoryItem.addBytes(file.length()); + } + + private boolean isSuitableExtension(@NonNull File file, + @NonNull MemoryItem item) { + String[] extensions = item.getExtensions(); + if (extensions != null) { + for (String extension : extensions) { + if (file.getAbsolutePath().endsWith(extension)) { + return true; + } + } + } + return extensions == null; + } + + private boolean isSuitablePrefix(@NonNull File file, + @NonNull MemoryItem item) { + String[] prefixes = item.getPrefixes(); + if (prefixes != null) { + for (String prefix : prefixes) { + if (file.getName().toLowerCase().startsWith(prefix.toLowerCase())) { + return true; + } + } + } + return prefixes == null; + } + + private long calculateFolderSize(@NonNull File dir) { + long bytes = 0; + if (dir.isDirectory()) { + File[] files = dir.listFiles(); + if (files == null) return 0; + + for (File file : files) { + if (isCancelled()) { + break; + } + if (file.isDirectory()) { + bytes += calculateFolderSize(file); + } else if (file.isFile()) { + bytes += file.length(); + } + } + } + return bytes; + } + + @Override + protected void onProgressUpdate(Void... values) { + super.onProgressUpdate(values); + if (uiAdapter != null) { + uiAdapter.onMemoryInfoUpdate(); + } + } + + @Override + protected void onPostExecute(Void aVoid) { + super.onPostExecute(aVoid); + if (uiAdapter != null) { + uiAdapter.onFinishUpdating(tag); + } + } + + private void refreshUI() { + long currentTime = System.currentTimeMillis(); + if ((currentTime - lastRefreshTime) > UI_REFRESH_TIME_MS) { + lastRefreshTime = currentTime; + publishProgress(); + } + } +} diff --git a/OsmAnd/src/net/osmand/plus/settings/datastorage/task/ReloadDataTask.java b/OsmAnd/src/net/osmand/plus/settings/datastorage/task/ReloadDataTask.java new file mode 100644 index 0000000000..4e097b9df2 --- /dev/null +++ b/OsmAnd/src/net/osmand/plus/settings/datastorage/task/ReloadDataTask.java @@ -0,0 +1,50 @@ +package net.osmand.plus.settings.datastorage.task; + +import android.app.ProgressDialog; +import android.content.Context; +import android.os.AsyncTask; + +import net.osmand.plus.OsmandApplication; +import net.osmand.plus.ProgressImplementation; +import net.osmand.plus.R; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; + +public class ReloadDataTask extends AsyncTask { + private WeakReference ctx; + protected ProgressImplementation progress; + private OsmandApplication app; + + public ReloadDataTask(Context ctx, OsmandApplication app) { + this.ctx = new WeakReference<>(ctx); + this.app = app; + } + + @Override + protected void onPreExecute() { + Context c = ctx.get(); + if (c == null) { + return; + } + progress = ProgressImplementation.createProgressDialog(c, c.getString(R.string.loading_data), + c.getString(R.string.loading_data), ProgressDialog.STYLE_HORIZONTAL); + } + + @Override + protected void onPostExecute(Boolean result) { + try { + if (progress.getDialog().isShowing()) { + progress.getDialog().dismiss(); + } + } catch (Exception e) { + //ignored + } + } + + @Override + protected Boolean doInBackground(Void... params) { + app.getResourceManager().reloadIndexes(progress, new ArrayList()); + return true; + } +} diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java index e2d3244f26..947a331290 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java @@ -73,6 +73,7 @@ import net.osmand.plus.settings.bottomsheets.ChangeGeneralProfilesPrefBottomShee import net.osmand.plus.settings.bottomsheets.EditTextPreferenceBottomSheet; import net.osmand.plus.settings.bottomsheets.MultiSelectPreferencesBottomSheet; import net.osmand.plus.settings.bottomsheets.SingleSelectPreferenceBottomSheet; +import net.osmand.plus.settings.datastorage.DataStorageFragment; import net.osmand.plus.settings.preferences.ListPreferenceEx; import net.osmand.plus.settings.preferences.MultiSelectBooleanPreference; import net.osmand.plus.settings.preferences.SwitchPreferenceEx; diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageHelper.java b/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageHelper.java deleted file mode 100644 index b270175d86..0000000000 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/DataStorageHelper.java +++ /dev/null @@ -1,485 +0,0 @@ -package net.osmand.plus.settings.fragments; - -import android.os.AsyncTask; -import android.os.Build; - -import net.osmand.IndexConstants; -import net.osmand.ValueHolder; -import net.osmand.plus.OsmandApplication; -import net.osmand.plus.settings.backend.OsmandSettings; -import net.osmand.plus.R; - -import java.io.File; -import java.text.DecimalFormat; -import java.util.ArrayList; - -import static net.osmand.plus.settings.fragments.DataStorageFragment.UI_REFRESH_TIME_MS; -import static net.osmand.plus.settings.fragments.DataStorageMemoryItem.Directory; -import static net.osmand.plus.settings.fragments.DataStorageMemoryItem.EXTENSIONS; -import static net.osmand.plus.settings.fragments.DataStorageMemoryItem.PREFIX; - -public class DataStorageHelper { - public final static String INTERNAL_STORAGE = "internal_storage"; - public final static String EXTERNAL_STORAGE = "external_storage"; - public final static String SHARED_STORAGE = "shared_storage"; - public final static String MULTIUSER_STORAGE = "multiuser_storage"; - public final static String MANUALLY_SPECIFIED = "manually_specified"; - - public final static String MAPS_MEMORY = "maps_memory_used"; - public final static String SRTM_AND_HILLSHADE_MEMORY = "contour_lines_and_hillshade_memory"; - public final static String TRACKS_MEMORY = "tracks_memory_used"; - public final static String NOTES_MEMORY = "notes_memory_used"; - public final static String TILES_MEMORY = "tiles_memory_used"; - public final static String OTHER_MEMORY = "other_memory_used"; - - private ArrayList menuItems = new ArrayList<>(); - private DataStorageMenuItem currentDataStorage; - private DataStorageMenuItem manuallySpecified; - - private ArrayList memoryItems = new ArrayList<>(); - private DataStorageMemoryItem mapsMemory; - private DataStorageMemoryItem srtmAndHillshadeMemory; - private DataStorageMemoryItem tracksMemory; - private DataStorageMemoryItem notesMemory; - private DataStorageMemoryItem tilesMemory; - private DataStorageMemoryItem otherMemory; - - private int currentStorageType; - private String currentStoragePath; - - public DataStorageHelper(OsmandApplication app) { - prepareData(app); - } - - private void prepareData(OsmandApplication app) { - - if (app == null) { - return; - } - - OsmandSettings settings = app.getSettings(); - - if (settings.getExternalStorageDirectoryTypeV19() >= 0) { - currentStorageType = settings.getExternalStorageDirectoryTypeV19(); - } else { - ValueHolder vh = new ValueHolder(); - if (vh.value != null && vh.value >= 0) { - currentStorageType = vh.value; - } else { - currentStorageType = 0; - } - } - currentStoragePath = settings.getExternalStorageDirectory().getAbsolutePath(); - - String path; - File dir; - int iconId; - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - - //internal storage - path = settings.getInternalAppPath().getAbsolutePath(); - dir = new File(path); - iconId = R.drawable.ic_action_phone; - - DataStorageMenuItem internalStorageItem = DataStorageMenuItem.builder() - .setKey(INTERNAL_STORAGE) - .setTitle(app.getString(R.string.storage_directory_internal_app)) - .setDirectory(path) - .setDescription(app.getString(R.string.internal_app_storage_description)) - .setType(OsmandSettings.EXTERNAL_STORAGE_TYPE_INTERNAL_FILE) - .setIconResId(iconId) - .createItem(); - addItem(internalStorageItem); - - //shared_storage - dir = settings.getDefaultInternalStorage(); - path = dir.getAbsolutePath(); - iconId = R.drawable.ic_action_phone; - - DataStorageMenuItem sharedStorageItem = DataStorageMenuItem.builder() - .setKey(SHARED_STORAGE) - .setTitle(app.getString(R.string.storage_directory_shared)) - .setDirectory(path) - .setType(OsmandSettings.EXTERNAL_STORAGE_TYPE_DEFAULT) - .setIconResId(iconId) - .createItem(); - addItem(sharedStorageItem); - - //external storage - File[] externals = app.getExternalFilesDirs(null); - if (externals != null) { - int i = 0; - for (File external : externals) { - if (external != null) { - ++i; - dir = external; - path = dir.getAbsolutePath(); - iconId = getIconForStorageType(dir); - DataStorageMenuItem externalStorageItem = DataStorageMenuItem.builder() - .setKey(EXTERNAL_STORAGE + i) - .setTitle(app.getString(R.string.storage_directory_external) + " " + i) - .setDirectory(path) - .setType(OsmandSettings.EXTERNAL_STORAGE_TYPE_EXTERNAL_FILE) - .setIconResId(iconId) - .createItem(); - addItem(externalStorageItem); - } - } - } - - //multi user storage - File[] obbDirs = app.getObbDirs(); - if (obbDirs != null) { - int i = 0; - for (File obb : obbDirs) { - if (obb != null) { - ++i; - dir = obb; - path = dir.getAbsolutePath(); - iconId = getIconForStorageType(dir); - DataStorageMenuItem multiuserStorageItem = DataStorageMenuItem.builder() - .setKey(MULTIUSER_STORAGE + i) - .setTitle(app.getString(R.string.storage_directory_multiuser) + " " + i) - .setDirectory(path) - .setType(OsmandSettings.EXTERNAL_STORAGE_TYPE_OBB) - .setIconResId(iconId) - .createItem(); - addItem(multiuserStorageItem); - } - } - } - } - - //manually specified storage - manuallySpecified = DataStorageMenuItem.builder() - .setKey(MANUALLY_SPECIFIED) - .setTitle(app.getString(R.string.storage_directory_manual)) - .setDirectory(currentStoragePath) - .setType(OsmandSettings.EXTERNAL_STORAGE_TYPE_SPECIFIED) - .setIconResId(R.drawable.ic_action_folder) - .createItem(); - menuItems.add(manuallySpecified); - - if (currentDataStorage == null) { - currentDataStorage = manuallySpecified; - } - - initMemoryUsed(app); - } - - private void initMemoryUsed(OsmandApplication app) { - mapsMemory = DataStorageMemoryItem.builder() - .setKey(MAPS_MEMORY) - .setExtensions(IndexConstants.BINARY_MAP_INDEX_EXT) - .setDirectories( - new Directory(app.getAppPath(IndexConstants.MAPS_PATH).getAbsolutePath(), false, EXTENSIONS, false), - new Directory(app.getAppPath(IndexConstants.ROADS_INDEX_DIR).getAbsolutePath(), true, EXTENSIONS, false), - new Directory(app.getAppPath(IndexConstants.WIKI_INDEX_DIR).getAbsolutePath(), true, EXTENSIONS, false), - new Directory(app.getAppPath(IndexConstants.WIKIVOYAGE_INDEX_DIR).getAbsolutePath(), true, EXTENSIONS, false), - new Directory(app.getAppPath(IndexConstants.BACKUP_INDEX_DIR).getAbsolutePath(), true, EXTENSIONS, false)) - .createItem(); - memoryItems.add(mapsMemory); - - srtmAndHillshadeMemory = DataStorageMemoryItem.builder() - .setKey(SRTM_AND_HILLSHADE_MEMORY) - .setExtensions(IndexConstants.BINARY_SRTM_MAP_INDEX_EXT) - .setDirectories( - new Directory(app.getAppPath(IndexConstants.SRTM_INDEX_DIR).getAbsolutePath(), true, EXTENSIONS, false), - new Directory(app.getAppPath(IndexConstants.TILES_INDEX_DIR).getAbsolutePath(), false, PREFIX, true)) - .setPrefixes("Hillshade") - .createItem(); - memoryItems.add(srtmAndHillshadeMemory); - - tracksMemory = DataStorageMemoryItem.builder() - .setKey(TRACKS_MEMORY) -// .setExtensions(IndexConstants.GPX_FILE_EXT, ".gpx.bz2") - .setDirectories( - new Directory(app.getAppPath(IndexConstants.GPX_INDEX_DIR).getAbsolutePath(), true, EXTENSIONS, false)) - .createItem(); - memoryItems.add(tracksMemory); - - notesMemory = DataStorageMemoryItem.builder() - .setKey(NOTES_MEMORY) -// .setExtensions("") - .setDirectories( - new Directory(app.getAppPath(IndexConstants.AV_INDEX_DIR).getAbsolutePath(), true, EXTENSIONS, false)) - .createItem(); - memoryItems.add(notesMemory); - - tilesMemory = DataStorageMemoryItem.builder() - .setKey(TILES_MEMORY) -// .setExtensions("") - .setDirectories( - new Directory(app.getAppPath(IndexConstants.TILES_INDEX_DIR).getAbsolutePath(), true, EXTENSIONS, false)) - .createItem(); - memoryItems.add(tilesMemory); - - otherMemory = DataStorageMemoryItem.builder() - .setKey(OTHER_MEMORY) - .createItem(); - memoryItems.add(otherMemory); - } - - public ArrayList getStorageItems() { - return menuItems; - } - - private int getIconForStorageType(File dir) { - return R.drawable.ic_action_folder; - } - - public DataStorageMenuItem getCurrentStorage() { - return currentDataStorage; - } - - private void addItem(DataStorageMenuItem item) { - if (currentStorageType == item.getType() && currentStoragePath.equals(item.getDirectory())) { - currentDataStorage = item; - } - menuItems.add(item); - } - - public DataStorageMenuItem getManuallySpecified() { - return manuallySpecified; - } - - public DataStorageMenuItem getStorage(String key) { - if (menuItems != null && key != null) { - for (DataStorageMenuItem menuItem : menuItems) { - if (key.equals(menuItem.getKey())) { - return menuItem; - } - } - } - return null; - } - - public int getCurrentType() { - return currentStorageType; - } - - public String getCurrentPath() { - return currentStoragePath; - } - - public ArrayList getMemoryInfoItems() { - return memoryItems; - } - - public RefreshMemoryUsedInfo calculateMemoryUsedInfo(UpdateMemoryInfoUIAdapter listener) { - File rootDir = new File(currentStoragePath); - RefreshMemoryUsedInfo task = new RefreshMemoryUsedInfo(listener, otherMemory, rootDir, null, null, OTHER_MEMORY); - task.execute(mapsMemory, srtmAndHillshadeMemory, tracksMemory, notesMemory); - return task; - } - - public RefreshMemoryUsedInfo calculateTilesMemoryUsed(UpdateMemoryInfoUIAdapter listener) { - File rootDir = new File(tilesMemory.getDirectories()[0].getAbsolutePath()); - RefreshMemoryUsedInfo task = new RefreshMemoryUsedInfo(listener, otherMemory, rootDir, null, srtmAndHillshadeMemory.getPrefixes(), TILES_MEMORY); - task.execute(tilesMemory); - return task; - } - - public static class RefreshMemoryUsedInfo extends AsyncTask { - private UpdateMemoryInfoUIAdapter listener; - private File rootDir; - private DataStorageMemoryItem otherMemory; - private String[] directoriesToAvoid; - private String[] prefixesToAvoid; - private String taskKey; - private long lastRefreshTime; - - public RefreshMemoryUsedInfo(UpdateMemoryInfoUIAdapter listener, DataStorageMemoryItem otherMemory, File rootDir, String[] directoriesToAvoid, String[] prefixesToAvoid, String taskKey) { - this.listener = listener; - this.otherMemory = otherMemory; - this.rootDir = rootDir; - this.directoriesToAvoid = directoriesToAvoid; - this.prefixesToAvoid = prefixesToAvoid; - this.taskKey = taskKey; - } - - @Override - protected Void doInBackground(DataStorageMemoryItem... items) { - lastRefreshTime = System.currentTimeMillis(); - if (rootDir.canRead()) { - calculateMultiTypes(rootDir, items); - } - return null; - } - - private void calculateMultiTypes(File rootDir, DataStorageMemoryItem... items) { - File[] subFiles = rootDir.listFiles(); - - for (File file : subFiles) { - if (isCancelled()) { - break; - } - nextFile : { - if (file.isDirectory()) { - //check current directory should be avoid - if (directoriesToAvoid != null) { - for (String directoryToAvoid : directoriesToAvoid) { - if (file.getAbsolutePath().equals(directoryToAvoid)) { - break nextFile; - } - } - } - //check current directory matched items type - for (DataStorageMemoryItem item : items) { - Directory[] directories = item.getDirectories(); - if (directories == null) { - continue; - } - for (Directory dir : directories) { - if (file.getAbsolutePath().equals(dir.getAbsolutePath()) - || (file.getAbsolutePath().startsWith(dir.getAbsolutePath()))) { - if (dir.isGoDeeper()) { - calculateMultiTypes(file, items); - break nextFile; - } else if (dir.isSkipOther()) { - break nextFile; - } - } - } - } - //current directory did not match to any type - otherMemory.addBytes(getDirectorySize(file)); - } else if (file.isFile()) { - //check current file should be avoid - if (prefixesToAvoid != null) { - for (String prefixToAvoid : prefixesToAvoid) { - if (file.getName().toLowerCase().startsWith(prefixToAvoid.toLowerCase())) { - break nextFile; - } - } - } - //check current file matched items type - for (DataStorageMemoryItem item : items) { - Directory[] directories = item.getDirectories(); - if (directories == null) { - continue; - } - for (Directory dir : directories) { - if (rootDir.getAbsolutePath().equals(dir.getAbsolutePath()) - || (rootDir.getAbsolutePath().startsWith(dir.getAbsolutePath()) && dir.isGoDeeper())) { - int checkingType = dir.getCheckingType(); - switch (checkingType) { - case EXTENSIONS : { - String[] extensions = item.getExtensions(); - if (extensions != null) { - for (String extension : extensions) { - if (file.getAbsolutePath().endsWith(extension)) { - item.addBytes(file.length()); - break nextFile; - } - } - } else { - item.addBytes(file.length()); - break nextFile; - } - break ; - } - case PREFIX : { - String[] prefixes = item.getPrefixes(); - if (prefixes != null) { - for (String prefix : prefixes) { - if (file.getName().toLowerCase().startsWith(prefix.toLowerCase())) { - item.addBytes(file.length()); - break nextFile; - } - } - } else { - item.addBytes(file.length()); - break nextFile; - } - break ; - } - } - if (dir.isSkipOther()) { - break nextFile; - } - } - } - } - //current file did not match any type - otherMemory.addBytes(file.length()); - } - } - refreshUI(); - } - } - - private long getDirectorySize(File dir) { - long bytes = 0; - if (dir.isDirectory()) { - File[] files = dir.listFiles(); - for (File file : files) { - if (isCancelled()) { - break; - } - if (file.isDirectory()) { - bytes += getDirectorySize(file); - } else if (file.isFile()) { - bytes += file.length(); - } - } - } - return bytes; - } - - @Override - protected void onProgressUpdate(Void... values) { - super.onProgressUpdate(values); - if (listener != null) { - listener.onMemoryInfoUpdate(); - } - } - - @Override - protected void onPostExecute(Void aVoid) { - super.onPostExecute(aVoid); - if (listener != null) { - listener.onFinishUpdating(taskKey); - } - } - - private void refreshUI() { - long currentTime = System.currentTimeMillis(); - if ((currentTime - lastRefreshTime) > UI_REFRESH_TIME_MS) { - lastRefreshTime = currentTime; - publishProgress(); - } - } - } - - public long getTotalUsedBytes() { - long total = 0; - if (memoryItems != null && memoryItems.size() > 0) { - for (DataStorageMemoryItem mi : memoryItems) { - total += mi.getUsedMemoryBytes(); - } - return total; - } - return -1; - } - - public static String getFormattedMemoryInfo(long bytes, String[] formatStrings) { - int type = 0; - double memory = (double) bytes / 1024; - while (memory > 1024 && type < formatStrings.length) { - ++type; - memory = memory / 1024; - } - String formattedUsed = new DecimalFormat("#.##").format(memory); - return String.format(formatStrings[type], formattedUsed); - } - - public interface UpdateMemoryInfoUIAdapter { - - void onMemoryInfoUpdate(); - - void onFinishUpdating(String taskKey); - - } -} \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ExportSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportSettingsFragment.java index 586b6f0db3..6fef4d4e03 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ExportSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ExportSettingsFragment.java @@ -36,6 +36,7 @@ import org.apache.commons.logging.Log; import java.io.File; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Locale; @@ -150,7 +151,7 @@ public class ExportSettingsFragment extends BaseSettingsListFragment { showExportProgressDialog(); File tempDir = FileUtils.getTempDir(app); String fileName = getFileName(); - List items = app.getSettingsHelper().prepareSettingsItems(adapter.getData(), true); + List items = app.getSettingsHelper().prepareSettingsItems(adapter.getData(), Collections.emptyList(), true); progress.setMax(getMaxProgress(items)); app.getSettingsHelper().exportSettings(tempDir, fileName, getSettingsExportListener(), items, true); } diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java index fa7383228c..071d7be709 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/GlobalSettingsFragment.java @@ -22,6 +22,8 @@ import net.osmand.plus.profiles.SelectProfileBottomSheet.DialogMode; import net.osmand.plus.profiles.SelectProfileBottomSheet.OnSelectProfileCallback; import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmandSettings; +import net.osmand.plus.settings.datastorage.DataStorageHelper; +import net.osmand.plus.settings.datastorage.item.StorageItem; import net.osmand.plus.settings.preferences.ListPreferenceEx; import net.osmand.plus.settings.preferences.SwitchPreferenceEx; @@ -181,7 +183,7 @@ public class GlobalSettingsFragment extends BaseSettingsFragment externalStorageDir.setIcon(getActiveIcon(R.drawable.ic_action_folder)); DataStorageHelper holder = new DataStorageHelper(app); - DataStorageMenuItem currentStorage = holder.getCurrentStorage(); + StorageItem currentStorage = holder.getCurrentStorage(); long totalUsed = app.getSettings().OSMAND_USAGE_SPACE.get(); if (totalUsed > 0) { String[] usedMemoryFormats = new String[] { diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java index 83a271b059..b614bc57dd 100644 --- a/OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java @@ -18,57 +18,24 @@ import androidx.fragment.app.FragmentManager; import com.google.android.material.appbar.CollapsingToolbarLayout; -import net.osmand.IndexConstants; import net.osmand.PlatformUtil; -import net.osmand.map.ITileSource; -import net.osmand.map.TileSourceManager.TileSourceTemplate; import net.osmand.plus.AppInitializer; -import net.osmand.plus.FavouritesDbHelper.FavoriteGroup; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.R; -import net.osmand.plus.SQLiteTileSource; import net.osmand.plus.UiUtilities; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.audionotes.AudioVideoNotesPlugin; import net.osmand.plus.download.ReloadIndexesTask; import net.osmand.plus.download.ReloadIndexesTask.ReloadIndexesListener; -import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo; -import net.osmand.plus.helpers.SearchHistoryHelper.HistoryEntry; -import net.osmand.plus.mapmarkers.MapMarker; -import net.osmand.plus.mapmarkers.MapMarkersGroup; -import net.osmand.plus.onlinerouting.engine.OnlineRoutingEngine; -import net.osmand.plus.osmedit.OpenstreetmapPoint; -import net.osmand.plus.osmedit.OsmNotesPoint; -import net.osmand.plus.poi.PoiUIFilter; -import net.osmand.plus.quickaction.QuickAction; -import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBean; -import net.osmand.plus.settings.backend.ExportSettingsType; -import net.osmand.plus.settings.backend.backup.AvoidRoadsSettingsItem; -import net.osmand.plus.settings.backend.backup.FavoritesSettingsItem; import net.osmand.plus.settings.backend.backup.FileSettingsItem; -import net.osmand.plus.settings.backend.backup.GlobalSettingsItem; -import net.osmand.plus.settings.backend.backup.GpxSettingsItem; -import net.osmand.plus.settings.backend.backup.HistoryMarkersSettingsItem; -import net.osmand.plus.settings.backend.backup.MapSourcesSettingsItem; -import net.osmand.plus.settings.backend.backup.MarkersSettingsItem; -import net.osmand.plus.settings.backend.backup.OnlineRoutingSettingsItem; -import net.osmand.plus.settings.backend.backup.OsmEditsSettingsItem; -import net.osmand.plus.settings.backend.backup.OsmNotesSettingsItem; -import net.osmand.plus.settings.backend.backup.PoiUiFiltersSettingsItem; -import net.osmand.plus.settings.backend.backup.ProfileSettingsItem; -import net.osmand.plus.settings.backend.backup.QuickActionsSettingsItem; -import net.osmand.plus.settings.backend.backup.SearchHistorySettingsItem; import net.osmand.plus.settings.backend.backup.SettingsHelper; import net.osmand.plus.settings.backend.backup.SettingsHelper.ImportAsyncTask; import net.osmand.plus.settings.backend.backup.SettingsItem; -import net.osmand.plus.settings.backend.backup.SettingsItemType; -import net.osmand.util.Algorithms; import org.apache.commons.logging.Log; import java.io.File; import java.lang.ref.WeakReference; -import java.util.ArrayList; import java.util.List; public class ImportSettingsFragment extends BaseSettingsListFragment { @@ -177,7 +144,7 @@ public class ImportSettingsFragment extends BaseSettingsListFragment { } private void importItems() { - List selectedItems = getSettingsItemsFromData(adapter.getData()); + List selectedItems = settingsHelper.prepareSettingsItems(adapter.getData(), settingsItems, false); if (file != null && settingsItems != null) { duplicateStartTime = System.currentTimeMillis(); settingsHelper.checkDuplicates(file, settingsItems, selectedItems, getDuplicatesListener()); @@ -272,181 +239,6 @@ public class ImportSettingsFragment extends BaseSettingsListFragment { this.settingsItems = settingsItems; } - @Nullable - private ProfileSettingsItem getBaseProfileSettingsItem(ApplicationModeBean modeBean) { - for (SettingsItem settingsItem : settingsItems) { - if (settingsItem.getType() == SettingsItemType.PROFILE) { - ProfileSettingsItem profileItem = (ProfileSettingsItem) settingsItem; - ApplicationModeBean bean = profileItem.getModeBean(); - if (Algorithms.objectEquals(bean.stringKey, modeBean.stringKey) && Algorithms.objectEquals(bean.userProfileName, modeBean.userProfileName)) { - return profileItem; - } - } - } - return null; - } - - @Nullable - private QuickActionsSettingsItem getBaseQuickActionsSettingsItem() { - for (SettingsItem settingsItem : settingsItems) { - if (settingsItem.getType() == SettingsItemType.QUICK_ACTIONS) { - return (QuickActionsSettingsItem) settingsItem; - } - } - return null; - } - - @Nullable - private PoiUiFiltersSettingsItem getBasePoiUiFiltersSettingsItem() { - for (SettingsItem settingsItem : settingsItems) { - if (settingsItem.getType() == SettingsItemType.POI_UI_FILTERS) { - return (PoiUiFiltersSettingsItem) settingsItem; - } - } - return null; - } - - @Nullable - private MapSourcesSettingsItem getBaseMapSourcesSettingsItem() { - for (SettingsItem settingsItem : settingsItems) { - if (settingsItem.getType() == SettingsItemType.MAP_SOURCES) { - return (MapSourcesSettingsItem) settingsItem; - } - } - return null; - } - - @Nullable - private AvoidRoadsSettingsItem getBaseAvoidRoadsSettingsItem() { - for (SettingsItem settingsItem : settingsItems) { - if (settingsItem.getType() == SettingsItemType.AVOID_ROADS) { - return (AvoidRoadsSettingsItem) settingsItem; - } - } - return null; - } - - @Nullable - private T getBaseItem(SettingsItemType settingsItemType, Class clazz) { - for (SettingsItem settingsItem : settingsItems) { - if (settingsItem.getType() == settingsItemType && clazz.isInstance(settingsItem)) { - return clazz.cast(settingsItem); - } - } - return null; - } - - private List getSettingsItemsFromData(List data) { - List settingsItems = new ArrayList<>(); - List appModeBeans = new ArrayList<>(); - List quickActions = new ArrayList<>(); - List poiUIFilters = new ArrayList<>(); - List tileSourceTemplates = new ArrayList<>(); - List avoidRoads = new ArrayList<>(); - List osmNotesPointList = new ArrayList<>(); - List osmEditsPointList = new ArrayList<>(); - List favoriteGroups = new ArrayList<>(); - List markersGroups = new ArrayList<>(); - List markersHistoryGroups = new ArrayList<>(); - List historyEntries = new ArrayList<>(); - List onlineRoutingEngines = new ArrayList<>(); - for (Object object : data) { - if (object instanceof ApplicationModeBean) { - appModeBeans.add((ApplicationModeBean) object); - } else if (object instanceof QuickAction) { - quickActions.add((QuickAction) object); - } else if (object instanceof PoiUIFilter) { - poiUIFilters.add((PoiUIFilter) object); - } else if (object instanceof TileSourceTemplate || object instanceof SQLiteTileSource) { - tileSourceTemplates.add((ITileSource) object); - } else if (object instanceof File) { - File file = (File) object; - if (file.getName().endsWith(IndexConstants.GPX_FILE_EXT)) { - settingsItems.add(new GpxSettingsItem(app, file)); - } else { - settingsItems.add(new FileSettingsItem(app, file)); - } - } else if (object instanceof FileSettingsItem) { - settingsItems.add((FileSettingsItem) object); - } else if (object instanceof AvoidRoadInfo) { - avoidRoads.add((AvoidRoadInfo) object); - } else if (object instanceof OsmNotesPoint) { - osmNotesPointList.add((OsmNotesPoint) object); - } else if (object instanceof OpenstreetmapPoint) { - osmEditsPointList.add((OpenstreetmapPoint) object); - } else if (object instanceof FavoriteGroup) { - favoriteGroups.add((FavoriteGroup) object); - } else if (object instanceof GlobalSettingsItem) { - settingsItems.add((GlobalSettingsItem) object); - } else if (object instanceof MapMarkersGroup) { - MapMarkersGroup markersGroup = (MapMarkersGroup) object; - if (ExportSettingsType.ACTIVE_MARKERS.name().equals(markersGroup.getId())) { - markersGroups.add((MapMarkersGroup) object); - } else if (ExportSettingsType.HISTORY_MARKERS.name().equals(markersGroup.getId())) { - markersHistoryGroups.add((MapMarkersGroup) object); - } - } else if (object instanceof HistoryEntry) { - historyEntries.add((HistoryEntry) object); - } else if (object instanceof OnlineRoutingEngine) { - onlineRoutingEngines.add((OnlineRoutingEngine) object); - } - } - if (!appModeBeans.isEmpty()) { - for (ApplicationModeBean modeBean : appModeBeans) { - settingsItems.add(new ProfileSettingsItem(app, getBaseProfileSettingsItem(modeBean), modeBean)); - } - } - if (!quickActions.isEmpty()) { - settingsItems.add(new QuickActionsSettingsItem(app, getBaseQuickActionsSettingsItem(), quickActions)); - } - if (!poiUIFilters.isEmpty()) { - settingsItems.add(new PoiUiFiltersSettingsItem(app, getBasePoiUiFiltersSettingsItem(), poiUIFilters)); - } - if (!tileSourceTemplates.isEmpty()) { - settingsItems.add(new MapSourcesSettingsItem(app, getBaseMapSourcesSettingsItem(), tileSourceTemplates)); - } - if (!avoidRoads.isEmpty()) { - settingsItems.add(new AvoidRoadsSettingsItem(app, getBaseAvoidRoadsSettingsItem(), avoidRoads)); - } - if (!osmNotesPointList.isEmpty()) { - OsmNotesSettingsItem baseItem = getBaseItem(SettingsItemType.OSM_NOTES, OsmNotesSettingsItem.class); - settingsItems.add(new OsmNotesSettingsItem(app, baseItem, osmNotesPointList)); - } - if (!osmEditsPointList.isEmpty()) { - OsmEditsSettingsItem baseItem = getBaseItem(SettingsItemType.OSM_EDITS, OsmEditsSettingsItem.class); - settingsItems.add(new OsmEditsSettingsItem(app, baseItem, osmEditsPointList)); - } - if (!favoriteGroups.isEmpty()) { - FavoritesSettingsItem baseItem = getBaseItem(SettingsItemType.FAVOURITES, FavoritesSettingsItem.class); - settingsItems.add(new FavoritesSettingsItem(app, baseItem, favoriteGroups)); - } - if (!markersGroups.isEmpty()) { - List mapMarkers = new ArrayList<>(); - for (MapMarkersGroup group : markersGroups) { - mapMarkers.addAll(group.getMarkers()); - } - MarkersSettingsItem baseItem = getBaseItem(SettingsItemType.ACTIVE_MARKERS, MarkersSettingsItem.class); - settingsItems.add(new MarkersSettingsItem(app, baseItem, mapMarkers)); - } - if (!markersHistoryGroups.isEmpty()) { - List mapMarkers = new ArrayList<>(); - for (MapMarkersGroup group : markersHistoryGroups) { - mapMarkers.addAll(group.getMarkers()); - } - HistoryMarkersSettingsItem baseItem = getBaseItem(SettingsItemType.HISTORY_MARKERS, HistoryMarkersSettingsItem.class); - settingsItems.add(new HistoryMarkersSettingsItem(app, baseItem, mapMarkers)); - } - if (!historyEntries.isEmpty()) { - SearchHistorySettingsItem baseItem = getBaseItem(SettingsItemType.SEARCH_HISTORY, SearchHistorySettingsItem.class); - settingsItems.add(new SearchHistorySettingsItem(app, baseItem, historyEntries)); - } - if (!onlineRoutingEngines.isEmpty()) { - OnlineRoutingSettingsItem baseItem = getBaseItem(SettingsItemType.ONLINE_ROUTING_ENGINES, OnlineRoutingSettingsItem.class); - settingsItems.add(new OnlineRoutingSettingsItem(app, baseItem, onlineRoutingEngines)); - } - return settingsItems; - } - public void setFile(File file) { this.file = file; } diff --git a/OsmAnd/src/net/osmand/plus/track/SegmentsCard.java b/OsmAnd/src/net/osmand/plus/track/SegmentsCard.java index ec000a8f08..ad266fc2ab 100644 --- a/OsmAnd/src/net/osmand/plus/track/SegmentsCard.java +++ b/OsmAnd/src/net/osmand/plus/track/SegmentsCard.java @@ -47,7 +47,7 @@ public class SegmentsCard extends BaseCard { WrapContentHeightViewPager pager = segmentView.findViewById(R.id.pager); PagerSlidingTabStrip tabLayout = segmentView.findViewById(R.id.sliding_tabs); - pager.setAdapter(new GPXItemPagerAdapter(tabLayout, displayItem, displayHelper, listener)); + pager.setAdapter(new GPXItemPagerAdapter(app, displayItem, displayHelper, nightMode, listener)); tabLayout.setViewPager(pager); container.addView(segmentView); diff --git a/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java b/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java index 9147de6de9..4b58c0b9dc 100644 --- a/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java +++ b/OsmAnd/src/net/osmand/plus/track/TrackMenuFragment.java @@ -149,6 +149,7 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card private Location lastLocation; private UpdateLocationViewCache updateLocationViewCache; private boolean locationUpdateStarted; + private LatLon latLon; private int menuTitleHeight; private int toolbarHeightPx; @@ -259,6 +260,10 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card this.selectedGpxFile = selectedGpxFile; } + public void setLatLon(LatLon latLon) { + this.latLon = latLon; + } + @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view = super.onCreateView(inflater, container, savedInstanceState); @@ -556,10 +561,9 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card MapActivity mapActivity = getMapActivity(); View view = overviewCard.getView(); if (mapActivity != null && view != null) { - MapContextMenu menu = mapActivity.getContextMenu(); TextView distanceText = (TextView) view.findViewById(R.id.distance); ImageView direction = (ImageView) view.findViewById(R.id.direction); - app.getUIUtilities().updateLocationView(updateLocationViewCache, direction, distanceText, menu.getLatLon()); + app.getUIUtilities().updateLocationView(updateLocationViewCache, direction, distanceText, latLon); } } @@ -1113,7 +1117,7 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card selectedGpxFile = app.getSelectedGpxHelper().getSelectedFileByPath(path); } if (selectedGpxFile != null) { - showInstance(mapActivity, selectedGpxFile); + showInstance(mapActivity, selectedGpxFile, null); } else if (!Algorithms.isEmpty(path)) { String title = app.getString(R.string.loading_smth, ""); final ProgressDialog progress = ProgressDialog.show(mapActivity, title, app.getString(R.string.loading_data)); @@ -1126,7 +1130,7 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card if (mapActivity != null) { OsmandApplication app = mapActivity.getMyApplication(); SelectedGpxFile selectedGpxFile = app.getSelectedGpxHelper().selectGpxFile(result, true, false); - showInstance(mapActivity, selectedGpxFile); + showInstance(mapActivity, selectedGpxFile, null); } if (progress != null && AndroidUtils.isActivityNotDestroyed(mapActivity)) { progress.dismiss(); @@ -1138,7 +1142,7 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card } } - public static boolean showInstance(@NonNull MapActivity mapActivity, SelectedGpxFile selectedGpxFile) { + public static boolean showInstance(@NonNull MapActivity mapActivity, SelectedGpxFile selectedGpxFile, @Nullable LatLon latLon) { try { Bundle args = new Bundle(); args.putInt(ContextMenuFragment.MENU_STATE_KEY, MenuState.HEADER_ONLY); @@ -1148,6 +1152,14 @@ public class TrackMenuFragment extends ContextMenuScrollFragment implements Card fragment.setRetainInstance(true); fragment.setSelectedGpxFile(selectedGpxFile); + if (latLon != null) { + fragment.setLatLon(latLon); + } else { + QuadRect rect = selectedGpxFile.getGpxFile().getRect(); + LatLon latLonRect = new LatLon(rect.centerY(), rect.centerX()); + fragment.setLatLon(latLonRect); + } + mapActivity.getSupportFragmentManager() .beginTransaction() .replace(R.id.fragmentContainer, fragment, TAG) diff --git a/OsmAnd/src/net/osmand/plus/views/controls/PagerSlidingTabStrip.java b/OsmAnd/src/net/osmand/plus/views/controls/PagerSlidingTabStrip.java index a92d2c5e0a..f6d5bdd4fd 100644 --- a/OsmAnd/src/net/osmand/plus/views/controls/PagerSlidingTabStrip.java +++ b/OsmAnd/src/net/osmand/plus/views/controls/PagerSlidingTabStrip.java @@ -68,6 +68,7 @@ public class PagerSlidingTabStrip extends HorizontalScrollView { public View getCustomTabView(@NonNull ViewGroup parent, int position); public void select(View tab); public void deselect(View tab); + public void tabStylesUpdated(View tabsContainer, int currentPosition); } public interface OnTabReselectedListener { @@ -307,6 +308,10 @@ public class PagerSlidingTabStrip extends HorizontalScrollView { } } + public int getCurrentPosition() { + return currentPosition; + } + private void addTab(final int position, CharSequence title, View tabView) { TextView textView = (TextView) tabView.findViewById(R.id.tab_title); if (textView != null) { @@ -332,41 +337,31 @@ public class PagerSlidingTabStrip extends HorizontalScrollView { private void updateTabStyles() { tabsContainer.setBackgroundResource(tabBackgroundResId); - for (int i = 0; i < tabCount; i++) { - View v = tabsContainer.getChildAt(i); - v.setBackgroundResource(tabBackgroundResId); - v.setPadding(tabPadding, v.getPaddingTop(), tabPadding, v.getPaddingBottom()); - TextView tab_title = (TextView) v.findViewById(R.id.tab_title); + if (pager.getAdapter() instanceof CustomTabProvider) { + ((CustomTabProvider) pager.getAdapter()).tabStylesUpdated(tabsContainer, currentPosition); + } else { + for (int i = 0; i < tabCount; i++) { + View v = tabsContainer.getChildAt(i); + v.setBackgroundResource(tabBackgroundResId); + v.setPadding(tabPadding, v.getPaddingTop(), tabPadding, v.getPaddingBottom()); - if (tab_title != null) { - tab_title.setTextSize(TypedValue.COMPLEX_UNIT_PX, tabTextSize); - tab_title.setTypeface(tabTypeface, pager.getCurrentItem() == i ? tabTypefaceSelectedStyle : tabTypefaceStyle); - switch (tabSelectionType) { - case ALPHA: - float alpha = pager.getCurrentItem() == i ? tabTextSelectedAlpha : tabTextAlpha; - tab_title.setAlpha(alpha); - tab_title.setTextColor(tabTextColor); - break; - case SOLID_COLOR: - tab_title.setAlpha(OPAQUE); - tab_title.setTextColor(pager.getCurrentItem() == i ? tabTextColor : tabInactiveTextColor); - break; - } - if (pager.getAdapter() instanceof CustomTabProvider) { - if (pager.getCurrentItem() == i) { - ((CustomTabProvider) pager.getAdapter()).select(v); - } else { - ((CustomTabProvider) pager.getAdapter()).deselect(v); + TextView tabTitle = v.findViewById(R.id.tab_title); + if (tabTitle != null) { + tabTitle.setTextSize(TypedValue.COMPLEX_UNIT_PX, tabTextSize); + tabTitle.setTypeface(tabTypeface, pager.getCurrentItem() == i ? tabTypefaceSelectedStyle : tabTypefaceStyle); + switch (tabSelectionType) { + case ALPHA: + float alpha = pager.getCurrentItem() == i ? tabTextSelectedAlpha : tabTextAlpha; + tabTitle.setAlpha(alpha); + tabTitle.setTextColor(tabTextColor); + break; + case SOLID_COLOR: + tabTitle.setAlpha(OPAQUE); + tabTitle.setTextColor(pager.getCurrentItem() == i ? tabTextColor : tabInactiveTextColor); + break; } - } - - // setAllCaps() is only available from API 14, so the upper case is made manually if we are on a - // pre-ICS-build - if (textAllCaps) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) { - tab_title.setAllCaps(true); - } else { - tab_title.setText(tab_title.getText().toString().toUpperCase(locale)); + if (textAllCaps) { + tabTitle.setAllCaps(true); } } } @@ -558,39 +553,41 @@ public class PagerSlidingTabStrip extends HorizontalScrollView { private void notSelected(View tab) { if (tab != null) { - TextView title = (TextView) tab.findViewById(R.id.tab_title); - if (title != null) { - title.setTypeface(tabTypeface, tabTypefaceStyle); - switch (tabSelectionType) { - case ALPHA: - title.setAlpha(tabTextAlpha); - break; - case SOLID_COLOR: - title.setTextColor(tabInactiveTextColor); - break; - } - } if (pager.getAdapter() instanceof CustomTabProvider) { ((CustomTabProvider) pager.getAdapter()).deselect(tab); + } else { + TextView title = tab.findViewById(R.id.tab_title); + if (title != null) { + title.setTypeface(tabTypeface, tabTypefaceStyle); + switch (tabSelectionType) { + case ALPHA: + title.setAlpha(tabTextAlpha); + break; + case SOLID_COLOR: + title.setTextColor(tabInactiveTextColor); + break; + } + } } } } private void selected(View tab) { if (tab != null) { - TextView title = (TextView) tab.findViewById(R.id.tab_title); - if (title != null) { - title.setTypeface(tabTypeface, tabTypefaceSelectedStyle); - switch (tabSelectionType) { - case ALPHA: - title.setAlpha(tabTextSelectedAlpha); - break; - case SOLID_COLOR: - title.setTextColor(tabTextColor); - break; - } - if (pager.getAdapter() instanceof CustomTabProvider) { - ((CustomTabProvider) pager.getAdapter()).select(tab); + if (pager.getAdapter() instanceof CustomTabProvider) { + ((CustomTabProvider) pager.getAdapter()).select(tab); + } else { + TextView title = tab.findViewById(R.id.tab_title); + if (title != null) { + title.setTypeface(tabTypeface, tabTypefaceSelectedStyle); + switch (tabSelectionType) { + case ALPHA: + title.setAlpha(tabTextSelectedAlpha); + break; + case SOLID_COLOR: + title.setTextColor(tabTextColor); + break; + } } } } diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/SelectWikiLanguagesBottomSheet.java b/OsmAnd/src/net/osmand/plus/wikipedia/SelectWikiLanguagesBottomSheet.java index 873feba53c..2fdf57b9be 100644 --- a/OsmAnd/src/net/osmand/plus/wikipedia/SelectWikiLanguagesBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/wikipedia/SelectWikiLanguagesBottomSheet.java @@ -1,8 +1,12 @@ package net.osmand.plus.wikipedia; +import android.app.Activity; import android.content.res.Resources; +import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.text.SpannableString; +import android.text.style.StyleSpan; import android.view.View; import android.widget.CompoundButton; @@ -12,6 +16,8 @@ import androidx.core.content.ContextCompat; import androidx.core.os.ConfigurationCompat; import androidx.core.os.LocaleListCompat; +import com.google.android.material.snackbar.Snackbar; + import net.osmand.AndroidUtils; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; @@ -124,6 +130,12 @@ public class SelectWikiLanguagesBottomSheet extends MenuBottomSheetDialogFragmen } } + @Nullable + public MapActivity getMapActivity() { + Activity activity = getActivity(); + return (MapActivity) activity; + } + private void initLanguagesData() { languages = new ArrayList<>(); @@ -188,12 +200,44 @@ public class SelectWikiLanguagesBottomSheet extends MenuBottomSheetDialogFragmen localesForSaving.add(language.getLocale()); } } - wikiPlugin.setLanguagesToShow(localesForSaving); - wikiPlugin.setShowAllLanguages(isGlobalWikiPoiEnabled); - wikiPlugin.updateWikipediaState(); + applyPreferenceWithSnackBar(localesForSaving, isGlobalWikiPoiEnabled); dismiss(); } + protected final void applyPreference(boolean applyToAllProfiles, List localesForSaving, boolean global) { + if (applyToAllProfiles) { + for (ApplicationMode mode : ApplicationMode.allPossibleValues()) { + wikiPlugin.setLanguagesToShow(mode, localesForSaving); + wikiPlugin.setShowAllLanguages(mode, global); + } + } else { + wikiPlugin.setLanguagesToShow(localesForSaving); + wikiPlugin.setShowAllLanguages(global); + } + + wikiPlugin.updateWikipediaState(); + } + + protected void applyPreferenceWithSnackBar(final List localesForSaving, final boolean global) { + applyPreference(false, localesForSaving, global); + MapActivity mapActivity = getMapActivity(); + if (mapActivity != null) { + String modeName = appMode.toHumanString(); + String text = app.getString(R.string.changes_applied_to_profile, modeName); + SpannableString message = UiUtilities.createSpannableString(text, new StyleSpan(Typeface.BOLD), modeName); + Snackbar snackbar = Snackbar.make(mapActivity.getLayout(), message, Snackbar.LENGTH_LONG) + .setAction(R.string.apply_to_all_profiles, new View.OnClickListener() { + @Override + public void onClick(View view) { + applyPreference(true, localesForSaving, global); + } + }); + UiUtilities.setupSnackbarVerticalLayout(snackbar); + UiUtilities.setupSnackbar(snackbar, nightMode); + snackbar.show(); + } + } + private View getCustomButtonView() { OsmandApplication app = getMyApplication(); if (app == null) { @@ -265,7 +309,7 @@ public class SelectWikiLanguagesBottomSheet extends MenuBottomSheetDialogFragmen } public static void showInstance(@NonNull MapActivity mapActivity, - boolean usedOnMap) { + boolean usedOnMap) { SelectWikiLanguagesBottomSheet fragment = new SelectWikiLanguagesBottomSheet(); fragment.setUsedOnMap(usedOnMap); fragment.show(mapActivity.getSupportFragmentManager(), SelectWikiLanguagesBottomSheet.TAG); diff --git a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPlugin.java b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPlugin.java index 16684fbe25..88b7618185 100644 --- a/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPlugin.java +++ b/OsmAnd/src/net/osmand/plus/wikipedia/WikipediaPlugin.java @@ -30,6 +30,7 @@ import net.osmand.plus.search.QuickSearchDialogFragment; import net.osmand.plus.search.QuickSearchListAdapter; import net.osmand.plus.search.listitems.QuickSearchBannerListItem; import net.osmand.plus.search.listitems.QuickSearchFreeBannerListItem; +import net.osmand.plus.settings.backend.ApplicationMode; import net.osmand.plus.settings.backend.OsmandSettings; import net.osmand.plus.views.layers.DownloadedRegionsLayer; import net.osmand.plus.views.OsmandMapTileView; @@ -97,8 +98,8 @@ public class WikipediaPlugin extends OsmandPlugin { @Override protected void registerLayerContextMenuActions(OsmandMapTileView mapView, - ContextMenuAdapter adapter, - final MapActivity mapActivity) { + ContextMenuAdapter adapter, + final MapActivity mapActivity) { ContextMenuAdapter.ItemClickListener listener = new ContextMenuAdapter.OnRowItemClick() { @Override @@ -113,7 +114,7 @@ public class WikipediaPlugin extends OsmandPlugin { @Override public boolean onContextMenuClick(final ArrayAdapter adapter, int itemId, - final int pos, boolean isChecked, int[] viewCoordinates) { + final int pos, boolean isChecked, int[] viewCoordinates) { if (itemId == R.string.shared_string_wikipedia) { toggleWikipediaPoi(isChecked, new CallbackWithObject() { @Override @@ -189,26 +190,50 @@ public class WikipediaPlugin extends OsmandPlugin { return !isShowAllLanguages() && getLanguagesToShow() != null; } + public boolean hasCustomSettings(ApplicationMode profile) { + return !isShowAllLanguages(profile) && getLanguagesToShow(profile) != null; + } + public boolean hasLanguagesFilter() { return settings.WIKIPEDIA_POI_ENABLED_LANGUAGES.get() != null; } + public boolean hasLanguagesFilter(ApplicationMode profile) { + return settings.WIKIPEDIA_POI_ENABLED_LANGUAGES.getModeValue(profile) != null; + } + public boolean isShowAllLanguages() { return settings.GLOBAL_WIKIPEDIA_POI_ENABLED.get(); } + public boolean isShowAllLanguages(ApplicationMode mode) { + return settings.GLOBAL_WIKIPEDIA_POI_ENABLED.getModeValue(mode); + } + public void setShowAllLanguages(boolean showAllLanguages) { settings.GLOBAL_WIKIPEDIA_POI_ENABLED.set(showAllLanguages); } + public void setShowAllLanguages(ApplicationMode mode, boolean showAllLanguages) { + settings.GLOBAL_WIKIPEDIA_POI_ENABLED.setModeValue(mode, showAllLanguages); + } + public List getLanguagesToShow() { return settings.WIKIPEDIA_POI_ENABLED_LANGUAGES.getStringsList(); } + public List getLanguagesToShow(ApplicationMode mode) { + return settings.WIKIPEDIA_POI_ENABLED_LANGUAGES.getStringsListForProfile(mode); + } + public void setLanguagesToShow(List languagesToShow) { settings.WIKIPEDIA_POI_ENABLED_LANGUAGES.setStringsList(languagesToShow); } + public void setLanguagesToShow(ApplicationMode mode, List languagesToShow) { + settings.WIKIPEDIA_POI_ENABLED_LANGUAGES.setStringsListForProfile(mode, languagesToShow); + } + public void toggleWikipediaPoi(boolean enable, CallbackWithObject callback) { if (enable) { showWikiOnMap(); diff --git a/plugins/Osmand-Nautical/.classpath b/plugins/Osmand-Nautical/.classpath deleted file mode 100644 index 7bc01d9a9c..0000000000 --- a/plugins/Osmand-Nautical/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/plugins/Osmand-Nautical/.project b/plugins/Osmand-Nautical/.project deleted file mode 100644 index 69d5b60769..0000000000 --- a/plugins/Osmand-Nautical/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - Osmand-Nautical - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/plugins/Osmand-ParkingPlugin/.classpath b/plugins/Osmand-ParkingPlugin/.classpath deleted file mode 100644 index 7bc01d9a9c..0000000000 --- a/plugins/Osmand-ParkingPlugin/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/plugins/Osmand-ParkingPlugin/.project b/plugins/Osmand-ParkingPlugin/.project deleted file mode 100644 index 1c708327e5..0000000000 --- a/plugins/Osmand-ParkingPlugin/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - Osmand-ParkingPlugin - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/plugins/Osmand-SRTMPlugin/.classpath b/plugins/Osmand-SRTMPlugin/.classpath deleted file mode 100644 index 7bc01d9a9c..0000000000 --- a/plugins/Osmand-SRTMPlugin/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/plugins/Osmand-SRTMPlugin/.project b/plugins/Osmand-SRTMPlugin/.project deleted file mode 100644 index 6c3b83059d..0000000000 --- a/plugins/Osmand-SRTMPlugin/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - Osmand-SRTMPlugin - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/plugins/Osmand-Skimaps/.classpath b/plugins/Osmand-Skimaps/.classpath deleted file mode 100644 index 7bc01d9a9c..0000000000 --- a/plugins/Osmand-Skimaps/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/plugins/Osmand-Skimaps/.project b/plugins/Osmand-Skimaps/.project deleted file mode 100644 index 852dfb35a5..0000000000 --- a/plugins/Osmand-Skimaps/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - Osmand-SkiMaps - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - -