Add option to force Google Maps or use geo: URI for navigation

2026-07-07 12:03:59 +02:00
parent d929397492
commit 096cb18415
8 changed files with 188 additions and 1 deletions
@@ -41,6 +41,7 @@ import it.danieleverducci.nextcloudmaps.R;
 import it.danieleverducci.nextcloudmaps.activity.NextcloudMapsStyledActivity;
 import it.danieleverducci.nextcloudmaps.activity.about.AboutActivity;
 import it.danieleverducci.nextcloudmaps.activity.detail.GeofavoriteDetailActivity;
+import it.danieleverducci.nextcloudmaps.activity.settings.SettingsActivity;
 import it.danieleverducci.nextcloudmaps.activity.login.LoginActivity;
 import it.danieleverducci.nextcloudmaps.activity.main.NavigationAdapter.NavigationItem;
 import it.danieleverducci.nextcloudmaps.activity.mappicker.MapPickerActivity;
@@ -58,6 +59,7 @@ public class MainActivity extends NextcloudMapsStyledActivity {
    private static final String NAVIGATION_KEY_ADD_GEOFAVORITE_FROM_GPS = "add_from_gps";
    private static final String NAVIGATION_KEY_ADD_GEOFAVORITE_FROM_MAP = "add_from_map";
    private static final String NAVIGATION_KEY_SHOW_ABOUT = "about";
+    private static final String NAVIGATION_KEY_SETTINGS = "settings";
    private static final String NAVIGATION_KEY_SWITCH_ACCOUNT = "switch_account";

    private ArrayList<OnGpsPermissionGrantedListener> onGpsPermissionGrantedListener = new ArrayList<>();
@@ -164,6 +166,9 @@ public class MainActivity extends NextcloudMapsStyledActivity {
                case NAVIGATION_KEY_SHOW_ABOUT:
                    show_about();
                    break;
+                case NAVIGATION_KEY_SETTINGS:
+                    show_settings();
+                    break;
                case NAVIGATION_KEY_SWITCH_ACCOUNT:
                    switch_account();
                    break;
@@ -173,6 +178,7 @@ public class MainActivity extends NextcloudMapsStyledActivity {
        navItems.add(new NavigationItem(NAVIGATION_KEY_ADD_GEOFAVORITE_FROM_GPS, getString(R.string.new_geobookmark_gps), R.drawable.ic_add_gps));
        navItems.add(new NavigationItem(NAVIGATION_KEY_ADD_GEOFAVORITE_FROM_MAP, getString(R.string.new_geobookmark_map), R.drawable.ic_add_map));
        navItems.add(new NavigationItem(NAVIGATION_KEY_SHOW_ABOUT, getString(R.string.about), R.drawable.ic_info_grey));
+        navItems.add(new NavigationItem(NAVIGATION_KEY_SETTINGS, getString(R.string.settings), R.drawable.ic_settings_grey));
        navItems.add(new NavigationItem(NAVIGATION_KEY_SWITCH_ACCOUNT, getString(R.string.switch_account), R.drawable.ic_logout_grey));
        navigationCommonAdapter.setItems(navItems);

@@ -192,6 +198,10 @@ public class MainActivity extends NextcloudMapsStyledActivity {
        );
    }

+    private void show_settings() {
+        startActivity(new Intent(this, SettingsActivity.class));
+    }
+
    private void show_about() {
        startActivity(new Intent(this, AboutActivity.class));
    }
@@ -0,0 +1,56 @@
+/*
+ * Nextcloud Maps Geofavorites for Android
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package it.danieleverducci.nextcloudmaps.activity.settings;
+
+import android.os.Bundle;
+import android.widget.Switch;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
+
+import it.danieleverducci.nextcloudmaps.R;
+import it.danieleverducci.nextcloudmaps.activity.NextcloudMapsStyledActivity;
+import it.danieleverducci.nextcloudmaps.utils.SettingsManager;
+
+public class SettingsActivity extends NextcloudMapsStyledActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayShowTitleEnabled(false);
+        }
+
+        Switch useGoogleMapsSwitch = findViewById(R.id.use_google_maps_switch);
+        useGoogleMapsSwitch.setChecked(SettingsManager.isUseGoogleMaps(this));
+        useGoogleMapsSwitch.setOnCheckedChangeListener((buttonView, isChecked) ->
+            SettingsManager.setUseGoogleMaps(SettingsActivity.this, isChecked)
+        );
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        finish();
+        return true;
+    }
+}
@@ -24,7 +24,10 @@ public class IntentGenerator {
    public static Intent newGeoUriIntent(Context context, Geofavorite item) {
        Intent i = new Intent();
        i.setAction(Intent.ACTION_VIEW);
-        i.setData(isGoogleMapsInstalled(context) ? item.getGmapsUri() : item.getGeoUri());
+        i.setData(
+            SettingsManager.isUseGoogleMaps(context) && isGoogleMapsInstalled(context)
+                ? item.getGmapsUri() : item.getGeoUri()
+        );
        return i;
    }
    
@@ -12,6 +12,7 @@ public class SettingsManager {
    static private final String SETTING_LAST_MAP_POSITION_LAT = "SETTING_LAST_MAP_POSITION_LAT";
    static private final String SETTING_LAST_MAP_POSITION_LNG = "SETTING_LAST_MAP_POSITION_LNG";
    static private final String SETTING_LAST_MAP_POSITION_ZOOM = "SETTING_LAST_MAP_POSITION_ZOOM";
+    static private final String SETTING_USE_GOOGLE_MAPS = "SETTING_USE_GOOGLE_MAPS";

    public static int getGeofavoriteListSortBy(Context context) {
        return PreferenceManager.getDefaultSharedPreferences(context)
@@ -47,6 +48,16 @@ public class SettingsManager {
        };
    }

+    public static boolean isUseGoogleMaps(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context)
+                .getBoolean(SETTING_USE_GOOGLE_MAPS, true);
+    }
+
+    public static void setUseGoogleMaps(Context context, boolean value) {
+        PreferenceManager.getDefaultSharedPreferences(context)
+            .edit().putBoolean(SETTING_USE_GOOGLE_MAPS, value).apply();
+    }
+
    public static void setLastMapPosition(Context context, double lat, double lng, double zoom) {
        PreferenceManager.getDefaultSharedPreferences(context).edit()
                .putFloat(SETTING_LAST_MAP_POSITION_LAT, (float)lat)