commit 806f16a4159c18f8d0a3fd37c3d0e39b9088635b Author: Fabio Mazza Date: Sat May 3 16:42:38 2025 +0200 Revert "Disable other styles, update MapLibre SDK" This reverts commit 5f441e0faeaf5ee73a9bea9445bbdc66c70a17c7. diff --git a/app/src/main/java/it/reyboz/bustorino/data/PreferencesHolder.java b/app/src/main/java/it/reyboz/bustorino/data/PreferencesHolder.java index c223575..36938d9 100644 --- a/app/src/main/java/it/reyboz/bustorino/data/PreferencesHolder.java +++ b/app/src/main/java/it/reyboz/bustorino/data/PreferencesHolder.java @@ -97,15 +97,12 @@ public abstract class PreferencesHolder { public static String getMapLibreStyleFile(Context con){ final SharedPreferences pref = getAppPreferences(con); - /*final String mapStyle_val = pref.getString(SettingsFragment.LIBREMAP_STYLE_PREF_KEY, ""); + final String mapStyle_val = pref.getString(SettingsFragment.LIBREMAP_STYLE_PREF_KEY, ""); return switch (mapStyle_val) { //MUST MATCH IN keys.xml -> map_style_pref_values case "versatiles_c" -> MapLibreUtils.STYLE_VERSATILES_COLORFUL_JSON; case "bright" -> MapLibreUtils.STYLE_BRIGHT_DEFAULT_JSON; //default is "bright" - default -> MapLibreUtils.STYLE_VERSATILES_COLORFUL_JSON; + default -> MapLibreUtils.getDefaultStyleJson(); }; - - */ - return MapLibreUtils.getDefaultStyleJson(); } } diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index 196cbb7..433691a 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -32,8 +32,8 @@ - versatiles_c bright + versatiles_c \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d28bcdf..2e5cac1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -286,8 +286,8 @@ OSM Bright Versatiles - @string/map_style_versatiles @string/map_style_osm_bright + @string/map_style_versatiles Remove trips data (free up space) diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 1863754..5338d24 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -16,6 +16,13 @@ +