commit 88c215d9a1c789c1a6d2258bd489406944a8a1ea Author: Fabio Mazza Date: Sat May 3 16:56:30 2025 +0200 Add legacy static tiles diff --git a/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java b/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java index 0125937..d088f97 100644 --- a/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java +++ b/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java @@ -24,7 +24,6 @@ import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.content.res.Configuration; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.util.Log; import android.view.Menu; @@ -257,7 +256,7 @@ public class ActivityPrincipal extends GeneralActivity implements FragmentListen onCreateComplete = true; //last but not least, set the good default values - manageDefaultValuesForSettings(); + setDefaultSettingsValuesWhenMissing(); //check if first run activity (IntroActivity) has been started once or not boolean hasIntroRun = theShPr.getBoolean(PreferencesHolder.PREF_INTRO_ACTIVITY_RUN,false); @@ -756,7 +755,7 @@ public class ActivityPrincipal extends GeneralActivity implements FragmentListen /** * Adjust setting to match the default ones */ - private void manageDefaultValuesForSettings(){ + private void setDefaultSettingsValuesWhenMissing(){ SharedPreferences mainSharedPref = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences.Editor editor = mainSharedPref.edit(); //Main fragment to show 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 36938d9..c08a194 100644 --- a/app/src/main/java/it/reyboz/bustorino/data/PreferencesHolder.java +++ b/app/src/main/java/it/reyboz/bustorino/data/PreferencesHolder.java @@ -101,7 +101,7 @@ public abstract class PreferencesHolder { 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" + case "osm_legacy" -> MapLibreUtils.STYLE_OSM_RASTER; default -> MapLibreUtils.getDefaultStyleJson(); }; } diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/SettingsFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/SettingsFragment.java index 91750b2..fff1183 100644 --- a/app/src/main/java/it/reyboz/bustorino/fragments/SettingsFragment.java +++ b/app/src/main/java/it/reyboz/bustorino/fragments/SettingsFragment.java @@ -55,7 +55,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared public final static String PREF_KEY_STARTUP_SCREEN="startup_screen_to_show"; public final static String KEY_ARRIVALS_FETCHERS_USE = "arrivals_fetchers_use_setting"; public final static String LIVE_POSITIONS_PREF_MQTT_VALUE="mqtt"; - public final static String LIBREMAP_STYLE_PREF_KEY = "libremap_style"; + public final static String LIBREMAP_STYLE_PREF_KEY = "libremap_style_1"; private boolean setSummaryStartupPref = false; diff --git a/app/src/main/java/it/reyboz/bustorino/map/MapLibreUtils.kt b/app/src/main/java/it/reyboz/bustorino/map/MapLibreUtils.kt index 0430d26..f0ecc69 100644 --- a/app/src/main/java/it/reyboz/bustorino/map/MapLibreUtils.kt +++ b/app/src/main/java/it/reyboz/bustorino/map/MapLibreUtils.kt @@ -17,6 +17,7 @@ class MapLibreUtils { companion object{ const val STYLE_BRIGHT_DEFAULT_JSON = "map_style_good_noshops.json" const val STYLE_VERSATILES_COLORFUL_JSON = "versatiles_colorful_light.json" + const val STYLE_OSM_RASTER="openstreetmap_raster.json" private const val DEBUG_TAG ="BusTO-MapLibreUtils" @JvmStatic diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index 433691a..fca17aa 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -1,10 +1,9 @@ - layout_pref - pref_update_db_now - libremap_style - + layout_pref + pref_update_db_now + arrivals favorites @@ -31,9 +30,10 @@ gtfsrt + - bright versatiles_c + osm_legacy \ 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 2e5cac1..2a62caf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -283,11 +283,11 @@ GTFS RT (more stable, less frequently updated) Style of the map - OSM Bright - Versatiles + Versatiles (vector) + OSM legacy (raster, lighter) - @string/map_style_osm_bright @string/map_style_versatiles + @string/map_style_legacy_raster 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 5338d24..84c4504 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -17,7 +17,7 @@ android:title="@string/map" >