Remove Google Maps installed check from navigation

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>

README.md

@@ -18,3 +18,19 @@ This work is heavily based on [matiasdelellis's Nextcloud SSO example](https://g
 
 ![Screenshot 1](screenshots/1.png)      ![Screenshot 2](screenshots/2.png)      ![Screenshot 3](screenshots/3.png)
 
+## Contributions
+
+### Why isn't this hosted on GitHub?
+
+I'm using a private git server just because I'm worried for the vast majority of open source code being hosted in a server property of Microsoft and being used to train theirs AI.
+I didn't find a better option, BTW the Gitea project is working on implementing federation, so soon it will be possible to contribute using any other gitea server, selfhosted or not.
+
+### How to contribute
+
+The project is open to contribution, but with some limits:
+
+- I'm sorry I can't accept AI-generated contributions. Reviewing a contribution requires time and effort from my side, while generating code with AI requires very little time and produces non reliable code that must be reviewed in detail. This is effectively shifting the work on my side, and in a forced way. If you feel you need a feature but you're not able to implement it by yourself, I prefer you to create an issue in the repository so I can implement it when I can, in a more mantainable way.
+- I prefer to make project-wide changes (i.e. updating Android target, app name and icon, release number...) by myself.
+
+To contribute, you'll have to create an account on this git instance. Unfortunately, I had to disable registration to avoid huge waves of fake accounts created by bots.
+You can request an account writing to daniele.verducci@ichibi.eu

app/build.gradle

@@ -21,8 +21,8 @@ android {
     defaultConfig {
         applicationId "it.danieleverducci.nextcloudmaps"
         minSdkVersion 23
-        targetSdkVersion 35
-        compileSdk 35
+        targetSdkVersion 34
+        compileSdkVersion 34
         versionCode 9
         versionName "0.4.0"
 
@@ -45,6 +45,7 @@ android {
 
     buildFeatures {
         dataBinding true
+        buildConfig true
     }
     namespace 'it.danieleverducci.nextcloudmaps'
 }

app/src/main/AndroidManifest.xml

@@ -25,8 +25,6 @@
 
     <queries>
         <package android:name="com.nextcloud.client" />
-        <!-- To see if google maps is installed, as it needs a specific intent Uri) -->
-        <package android:name="com.google.android.apps.maps" />
     </queries>
 
     <application
@@ -111,6 +109,11 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".activity.settings.SettingsActivity"
+            android:launchMode="singleTask"
+            android:theme="@style/AppTheme"/>
+
         <activity
             android:name=".activity.about.AboutActivity"
             android:launchMode="singleTask"

app/src/main/java/it/danieleverducci/nextcloudmaps/activity/detail/GeofavoriteDetailActivity.java

@@ -54,7 +54,6 @@ import it.danieleverducci.nextcloudmaps.R;
 import it.danieleverducci.nextcloudmaps.activity.NextcloudMapsStyledActivity;
 import it.danieleverducci.nextcloudmaps.databinding.ActivityGeofavoriteDetailBinding;
 import it.danieleverducci.nextcloudmaps.model.Geofavorite;
-import it.danieleverducci.nextcloudmaps.utils.EdgeToEdgeUtils;
 import it.danieleverducci.nextcloudmaps.utils.GeoUriParser;
 import it.danieleverducci.nextcloudmaps.utils.IntentGenerator;
 import it.danieleverducci.nextcloudmaps.utils.MapUtils;
@@ -77,7 +76,6 @@ public class GeofavoriteDetailActivity extends NextcloudMapsStyledActivity imple
 
         mViewHolder = new ViewHolder(getLayoutInflater());
         setContentView(mViewHolder.getRootView());
-        EdgeToEdgeUtils.clearTopBarWithPadding(mViewHolder.binding.appbar);
         mViewHolder.setOnSubmitListener(new OnSubmitListener() {
             @Override
             public void onBackPressed() {

app/src/main/java/it/danieleverducci/nextcloudmaps/activity/main/GeofavoriteAdapter.java

@@ -61,9 +61,6 @@ public class GeofavoriteAdapter extends RecyclerView.Adapter<GeofavoriteAdapter.
 
     private List<Geofavorite> items = new ArrayList<>();
     private int sortRule = SORT_BY_CREATED;
-    private int bottomInset = 0;
-    private int leftInset = 0;
-    private int rightInset = 0;
 
     // Contains the position of the element containing the overflow menu clicked
     private int overflowMenuSelectedPosition = -1;
@@ -113,14 +110,6 @@ public class GeofavoriteAdapter extends RecyclerView.Adapter<GeofavoriteAdapter.
         holder.tv_title.setText(Html.fromHtml(geofavorite.getName() == null ? "" : geofavorite.getName()));
         holder.tv_content.setText(geofavorite.getComment() == null ? "" : geofavorite.getComment());
         holder.tv_date.setText(geofavorite.getLocalDateCreated().format(dateFormatter));
-
-        // Last item: Clear bottom system bar
-        holder.root_view.setPadding(
-            leftInset,
-            holder.root_view.getPaddingTop(),
-            rightInset,
-            position == getItemCount() - 1 ? bottomInset : 0
-        );
     }
 
     @Override
@@ -128,20 +117,7 @@ public class GeofavoriteAdapter extends RecyclerView.Adapter<GeofavoriteAdapter.
         return items.size();
     }
 
-    public void setBottomInset(int inset) {
-        this.bottomInset = inset;
-    }
-
-    public void setLeftInset(int inset) {
-        this.leftInset = inset;
-    }
-
-    public void setRightInset(int inset) {
-        this.rightInset = inset;
-    }
-
     class GeofavoriteViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-        View root_view;
         TextView tv_category, tv_title, tv_content, tv_date;
         ImageView bt_context_menu;
         ImageView bt_nav;
@@ -152,7 +128,6 @@ public class GeofavoriteAdapter extends RecyclerView.Adapter<GeofavoriteAdapter.
         GeofavoriteViewHolder(@NonNull View itemView, ItemClickListener itemClickListener) {
             super(itemView);
 
-            root_view = itemView;
             tv_category = itemView.findViewById(R.id.tv_category);
             tv_title = itemView.findViewById(R.id.title);
             tv_content = itemView.findViewById(R.id.content);

app/src/main/java/it/danieleverducci/nextcloudmaps/activity/main/MainActivity.java

@@ -25,10 +25,7 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.core.app.ActivityCompat;
-import androidx.core.graphics.Insets;
 import androidx.core.view.GravityCompat;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -44,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;
@@ -51,7 +49,6 @@ import it.danieleverducci.nextcloudmaps.api.ApiProvider;
 import it.danieleverducci.nextcloudmaps.fragments.GeofavoriteListFragment;
 import it.danieleverducci.nextcloudmaps.fragments.GeofavoriteMapFragment;
 import it.danieleverducci.nextcloudmaps.repository.GeofavoriteRepository;
-import it.danieleverducci.nextcloudmaps.utils.EdgeToEdgeUtils;
 import it.danieleverducci.nextcloudmaps.utils.SettingsManager;
 
 public class MainActivity extends NextcloudMapsStyledActivity {
@@ -62,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<>();
@@ -127,7 +125,15 @@ public class MainActivity extends NextcloudMapsStyledActivity {
         else
             showList();
 
-        setupFAB();
+        FloatingActionButton fab = findViewById(R.id.open_fab);
+        fab.setOnClickListener(view -> openFab(!this.isFabOpen));
+
+        fab = findViewById(R.id.add_from_gps);
+        fab.setOnClickListener(view -> addGeofavoriteFromGps());
+
+        fab = findViewById(R.id.add_from_map);
+        fab.setOnClickListener(view -> addGeofavoriteFromMap());
+
         setupNavigationMenu();
 
         drawerLayout = findViewById(R.id.drawerLayout);
@@ -146,32 +152,7 @@ public class MainActivity extends NextcloudMapsStyledActivity {
         transaction.commit();
     }
 
-    private void setupFAB() {
-        // Register listeners
-        FloatingActionButton fab = findViewById(R.id.open_fab);
-        fab.setOnClickListener(view -> openFab(!this.isFabOpen));
-
-        fab = findViewById(R.id.add_from_gps);
-        fab.setOnClickListener(view -> addGeofavoriteFromGps());
-
-        fab = findViewById(R.id.add_from_map);
-        fab.setOnClickListener(view -> addGeofavoriteFromMap());
-
-        // Clear system bars (in edge to edge mode)
-        EdgeToEdgeUtils.clearBottomBarWithMargin(findViewById(R.id.fab_container));
-    }
-
     private void setupNavigationMenu() {
-        //EdgeToEdgeUtils.clearTopBarWithPadding(findViewById(R.id.header_view));
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.drawerLayout), (v, windowInsets) -> {
-            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
-            View hv = findViewById(R.id.header_view);
-            hv.setPadding(insets.left, insets.top, insets.right, hv.getPaddingBottom());
-
-            //return WindowInsetsCompat.CONSUMED;
-            return windowInsets;
-        });
-
         ArrayList<NavigationItem> navItems = new ArrayList<>();
 
         navigationCommonAdapter = new NavigationAdapter(this, item -> {
@@ -185,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;
@@ -194,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);
 
@@ -213,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));
     }

app/src/main/java/it/danieleverducci/nextcloudmaps/activity/settings/SettingsActivity.java

@@ -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;
+    }
+}

app/src/main/java/it/danieleverducci/nextcloudmaps/fragments/GeofavoriteListFragment.java

@@ -13,9 +13,6 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.Observer;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -30,7 +27,6 @@ import it.danieleverducci.nextcloudmaps.activity.main.GeofavoriteAdapter;
 import it.danieleverducci.nextcloudmaps.activity.main.MainActivity;
 import it.danieleverducci.nextcloudmaps.activity.main.SortingOrderDialogFragment;
 import it.danieleverducci.nextcloudmaps.model.Geofavorite;
-import it.danieleverducci.nextcloudmaps.utils.EdgeToEdgeUtils;
 import it.danieleverducci.nextcloudmaps.utils.GeofavoritesFilter;
 import it.danieleverducci.nextcloudmaps.utils.SettingsManager;
 
@@ -101,17 +97,6 @@ public class GeofavoriteListFragment extends GeofavoritesFragment implements Sor
         View showMapButton = v.findViewById(R.id.view_mode_map);
         showMapButton.setOnClickListener(View -> ((MainActivity)requireActivity()).showMap());
 
-        // Clear top bar in edge to edge and notify the adapter about the system bar size to avoid the system bar covering the last row
-        ViewCompat.setOnApplyWindowInsetsListener(v.findViewById(R.id.activity_list_view), (rv, windowInsets) -> {
-            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
-            rv.setPadding(rv.getPaddingLeft(), insets.top, rv.getPaddingRight(), rv.getPaddingBottom());
-            geofavoriteAdapter.setBottomInset(insets.bottom);
-            geofavoriteAdapter.setLeftInset(insets.left);
-            geofavoriteAdapter.setRightInset(insets.right);
-            //return WindowInsetsCompat.CONSUMED;
-            return windowInsets;
-        });
-
         return v;
     }
 

app/src/main/java/it/danieleverducci/nextcloudmaps/fragments/GeofavoriteMapFragment.java

@@ -8,6 +8,7 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -16,6 +17,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.app.ActivityCompat;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.lifecycle.Observer;
 
@@ -32,12 +34,13 @@ import org.osmdroid.views.overlay.mylocation.GpsMyLocationProvider;
 import org.osmdroid.views.overlay.mylocation.MyLocationNewOverlay;
 
 import java.util.List;
+import java.util.Set;
 
 import it.danieleverducci.nextcloudmaps.R;
 import it.danieleverducci.nextcloudmaps.activity.detail.GeofavoriteDetailActivity;
 import it.danieleverducci.nextcloudmaps.activity.main.MainActivity;
+import it.danieleverducci.nextcloudmaps.activity.mappicker.MapPickerActivity;
 import it.danieleverducci.nextcloudmaps.model.Geofavorite;
-import it.danieleverducci.nextcloudmaps.utils.EdgeToEdgeUtils;
 import it.danieleverducci.nextcloudmaps.utils.GeoUriParser;
 import it.danieleverducci.nextcloudmaps.utils.MapUtils;
 import it.danieleverducci.nextcloudmaps.utils.SettingsManager;
@@ -61,11 +64,7 @@ public class GeofavoriteMapFragment extends GeofavoritesFragment implements Main
         View v = inflater.inflate(R.layout.fragment_geofavorite_map, container, false);
 
         // Register listeners
-        View centerPositionFab = v.findViewById(R.id.center_position);
-        centerPositionFab.setOnClickListener((cpv) -> moveToUserPosition());
-
-        // Clear bottom bar in edge to edge
-        EdgeToEdgeUtils.clearBottomBarWithMargin(v.findViewById(R.id.center_position_container));
+        v.findViewById(R.id.center_position).setOnClickListener((cpv) -> moveToUserPosition());
 
         // Setup map
         map = v.findViewById(R.id.map);

app/src/main/java/it/danieleverducci/nextcloudmaps/fragments/GeofavoritesFragment.java

@@ -38,7 +38,6 @@ import it.danieleverducci.nextcloudmaps.activity.detail.GeofavoriteDetailActivit
 import it.danieleverducci.nextcloudmaps.activity.main.GeofavoritesFragmentViewModel;
 import it.danieleverducci.nextcloudmaps.activity.main.MainActivity;
 import it.danieleverducci.nextcloudmaps.model.Geofavorite;
-import it.danieleverducci.nextcloudmaps.utils.EdgeToEdgeUtils;
 import it.danieleverducci.nextcloudmaps.utils.GeofavoritesFilter;
 import it.danieleverducci.nextcloudmaps.utils.IntentGenerator;
 
@@ -87,8 +86,6 @@ public abstract class GeofavoritesFragment extends Fragment {
         userBadgeContainer.setOnClickListener(v -> showSwitchAccountDialog());
 
         // Setup toolbar/searchbar
-        View toolbarContainer = view.findViewById(R.id.toolbar_container);
-        EdgeToEdgeUtils.clearTopBarWithMargin(toolbarContainer);
         toolbar = view.findViewById(R.id.toolbar);
         homeToolbar = view.findViewById(R.id.home_toolbar);
         filterButton = view.findViewById(R.id.search_filter);

app/src/main/java/it/danieleverducci/nextcloudmaps/utils/EdgeToEdgeUtils.java

@@ -1,62 +0,0 @@
-package it.danieleverducci.nextcloudmaps.utils;
-
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
-
-public class EdgeToEdgeUtils {
-
-    /**
-     * Clears the system bars in edge to edge mode (https://developer.android.com/develop/ui/views/layout/edge-to-edge)
-     * @param viewToClear the view to clear from system bars
-     */
-    public static void clearBottomBarWithMargin(View viewToClear) {
-        ViewCompat.setOnApplyWindowInsetsListener(viewToClear, (v, windowInsets) -> {
-            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
-            ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
-            mlp.bottomMargin = insets.bottom;
-            mlp.leftMargin = insets.left;
-            mlp.rightMargin = insets.right;
-            v.setLayoutParams(mlp);
-
-            //return WindowInsetsCompat.CONSUMED;
-            return windowInsets;
-        });
-    }
-
-    /**
-     * Clears the system bars in edge to edge mode (https://developer.android.com/develop/ui/views/layout/edge-to-edge)
-     * @param viewToClear the view to clear from system bars
-     */
-    public static void clearTopBarWithMargin(View viewToClear) {
-        ViewCompat.setOnApplyWindowInsetsListener(viewToClear, (v, windowInsets) -> {
-            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
-            ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
-            mlp.topMargin = insets.top;
-            mlp.leftMargin = insets.left;
-            mlp.rightMargin = insets.right;
-            v.setLayoutParams(mlp);
-
-            //return WindowInsetsCompat.CONSUMED;
-            return windowInsets;
-        });
-    }
-
-    /**
-     * Clears the system bars in edge to edge mode (https://developer.android.com/develop/ui/views/layout/edge-to-edge)
-     * @param viewToClear the view to clear from system bars
-     */
-    public static void clearTopBarWithPadding(View viewToClear) {
-        ViewCompat.setOnApplyWindowInsetsListener(viewToClear, (v, windowInsets) -> {
-            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
-            v.setPadding(insets.left, insets.top, insets.right, v.getPaddingBottom());
-
-            //return WindowInsetsCompat.CONSUMED;
-            return windowInsets;
-        });
-    }
-
-}

app/src/main/java/it/danieleverducci/nextcloudmaps/utils/IntentGenerator.java

@@ -2,7 +2,6 @@ package it.danieleverducci.nextcloudmaps.utils;
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.util.Log;
 
 import it.danieleverducci.nextcloudmaps.R;
@@ -24,16 +23,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)
+                ? item.getGmapsUri() : item.getGeoUri()
+        );
         return i;
     }
-    
-    public static boolean isGoogleMapsInstalled(Context context) {
-        try {
-            context.getPackageManager().getApplicationInfo("com.google.android.apps.maps", 0);
-            return true;
-        } catch (PackageManager.NameNotFoundException e) {
-            return false;
-        }
-    }
 }

app/src/main/java/it/danieleverducci/nextcloudmaps/utils/SettingsManager.java

@@ -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)

app/src/main/res/drawable/ic_settings_grey.xml

@@ -0,0 +1,16 @@
+<!--
+  Material Design Settings icon by Google
+  Licensed under the Apache License, Version 2.0
+  https://www.apache.org/licenses/LICENSE-2.0
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#757575">
+    <path
+        android:fillColor="#757575"
+        android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58a0.49,0.49 0,0 0,0.12 -0.61l-1.92,-3.32a0.49,0.49 0,0 0,-0.59 -0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81a0.48,0.48 0,0 0,-0.47 -0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33a0.49,0.49 0,0 0,-0.59 0.22L2.74,8.87a0.48,0.48 0,0 0,0.12 0.61l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58a0.49,0.49 0,0 0,-0.12 0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6A3.6,3.6 0,1 1,12 8.4a3.6,3.6 0,0 1,0 7.2z"/>
+</vector>

app/src/main/res/layout/activity_geofavorite_detail.xml

@@ -10,12 +10,14 @@
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
             android:layout_width="match_parent"
-            android:layout_height="250dp">
+            android:layout_height="250dp"
+            android:fitsSystemWindows="true">
 
             <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:fitsSystemWindows="true"
                 app:contentScrim="@color/defaultBrand"
                 app:layout_scrollFlags="scroll|snap|exitUntilCollapsed"
                 app:title="@string/new_geobookmark"

app/src/main/res/layout/activity_list_view.xml

@@ -30,51 +30,43 @@
         tools:layout="@layout/fragment_geofavorite_list" />
 
 
-    <FrameLayout
-        android:id="@+id/fab_container"
+    <!-- Add from map FAB -->
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/add_from_map"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="bottom|end">
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="24dp"
+        android:src="@drawable/ic_add_map"
+        app:backgroundTint="@color/defaultBrand"
+        app:fabSize="mini"
+        app:tint="@color/white"
+        tools:ignore="DuplicateClickableBoundsCheck"
+        android:contentDescription="@string/add_from_map" />
 
-        <!-- Add from map FAB -->
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/add_from_map"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_margin="24dp"
-            android:src="@drawable/ic_add_map"
-            app:backgroundTint="@color/defaultBrand"
-            app:fabSize="mini"
-            app:tint="@color/white"
-            tools:ignore="DuplicateClickableBoundsCheck"
-            android:contentDescription="@string/add_from_map" />
+    <!-- Add from current position FAB -->
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/add_from_gps"
+        android:layout_margin="24dp"
+        android:layout_gravity="bottom|end"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:fabSize="mini"
+        android:src="@drawable/ic_add_gps"
+        app:backgroundTint="@color/defaultBrand"
+        app:tint="@color/white"
+        android:contentDescription="@string/add_from_gps"/>
 
-        <!-- Add from current position FAB -->
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/add_from_gps"
-            android:layout_margin="24dp"
-            android:layout_gravity="bottom|end"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:fabSize="mini"
-            android:src="@drawable/ic_add_gps"
-            app:backgroundTint="@color/defaultBrand"
-            app:tint="@color/white"
-            android:contentDescription="@string/add_from_gps"/>
-
-        <!-- Main FAB -->
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/open_fab"
-            android:layout_margin="16dp"
-            android:layout_gravity="bottom|end"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_add"
-            app:backgroundTint="@color/defaultBrand"
-            app:tint="@color/white"
-            android:contentDescription="@string/open_fab"/>
-
-    </FrameLayout>
+    <!-- Main FAB -->
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/open_fab"
+        android:layout_margin="16dp"
+        android:layout_gravity="bottom|end"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_add"
+        app:backgroundTint="@color/defaultBrand"
+        app:tint="@color/white"
+        android:contentDescription="@string/open_fab"/>
 
 </FrameLayout>

app/src/main/res/layout/activity_main.xml

@@ -35,7 +35,8 @@
     <com.google.android.material.navigation.NavigationView
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_gravity="start">
+        android:layout_gravity="start"
+        android:fitsSystemWindows="true">
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/scrollView"
@@ -48,43 +49,37 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <FrameLayout
+                <RelativeLayout
                     android:id="@+id/header_view"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="@dimen/drawer_header_height"
                     android:background="@color/defaultBrand">
 
-                    <LinearLayout
-                        android:layout_width="match_parent"
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/logo"
+                        android:layout_width="@dimen/drawer_header_logo_size"
+                        android:layout_height="@dimen/drawer_header_logo_size"
+                        android:layout_centerVertical="true"
+                        android:layout_margin="@dimen/spacer_2x"
+                        android:gravity="center"
+                        android:src="@drawable/ic_app" />
+
+                    <TextView
+                        android:id="@+id/app_name"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical">
-
-                        <androidx.appcompat.widget.AppCompatImageView
-                            android:id="@+id/logo"
-                            android:layout_width="@dimen/drawer_header_logo_size"
-                            android:layout_height="@dimen/drawer_header_logo_size"
-                            android:layout_margin="@dimen/spacer_2x"
-                            android:gravity="center"
-                            android:src="@drawable/ic_app" />
-
-                        <TextView
-                            android:id="@+id/app_name"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="20dp"
-                            android:layout_marginBottom="20dp"
-                            android:layout_marginRight="20dp"
-                            android:ellipsize="end"
-                            android:lines="2"
-                            android:fontFamily="sans-serif-light"
-                            android:gravity="center_vertical"
-                            android:text="@string/app_name"
-                            android:textColor="@android:color/white"
-                            android:textSize="24sp"/>
-
-                    </LinearLayout>
-
-                </FrameLayout>
+                        android:layout_marginRight="20dp"
+                        android:layout_centerVertical="true"
+                        android:layout_toEndOf="@id/logo"
+                        android:ellipsize="end"
+                        android:lines="2"
+                        android:fontFamily="sans-serif-light"
+                        android:gravity="center_vertical"
+                        android:text="@string/app_name"
+                        android:textColor="@android:color/white"
+                        android:textSize="24sp"
+                        android:layout_toRightOf="@id/logo" />
+                </RelativeLayout>
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/navigationCommon"

app/src/main/res/layout/activity_settings.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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/>.
+  -->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/primary"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?android:attr/actionBarSize"
+            app:contentInsetStartWithNavigation="0dp"
+            app:navigationIcon="@drawable/ic_back_grey"
+            app:titleMarginStart="0dp"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="@dimen/spacer_2x">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:padding="10dp">
+
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_gravity="center_vertical"
+                    android:text="@string/settings_use_google_maps"
+                    style="?android:attr/editTextPreferenceStyle"/>
+
+                <Switch
+                    android:id="@+id/use_google_maps_switch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"/>
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+</ScrollView>

app/src/main/res/layout/app_toolbar.xml

@@ -3,7 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/toolbar_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="10dp">

app/src/main/res/layout/fragment_geofavorite_list.xml

@@ -17,6 +17,7 @@
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:fitsSystemWindows="true"
             app:contentScrim="?android:attr/colorPrimary"
             app:layout_scrollFlags="scroll|enterAlways"
             app:toolbarId="@+id/toolbar" >

app/src/main/res/layout/fragment_geofavorite_map.xml

@@ -53,24 +53,17 @@
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 
-    <FrameLayout
-        android:id="@+id/center_position_container"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/center_position"
+        android:layout_width="@dimen/floating_bar_height"
+        android:layout_height="@dimen/floating_bar_height"
         android:layout_marginRight="100dp"
-        android:layout_gravity="bottom|right">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/center_position"
-            android:layout_width="@dimen/floating_bar_height"
-            android:layout_height="@dimen/floating_bar_height"
-            android:layout_marginBottom="25dp"
-            android:background="@drawable/unselected_floating_semitransparent_button_background"
-            android:padding="5dp"
-            android:tint="@color/text_color"
-            android:src="@drawable/ic_add_gps"
-            android:visibility="visible"/>
-
-    </FrameLayout>
+        android:layout_marginBottom="25dp"
+        android:layout_gravity="bottom|right"
+        android:background="@drawable/unselected_floating_semitransparent_button_background"
+        android:padding="5dp"
+        android:tint="@color/text_color"
+        android:src="@drawable/ic_add_gps"
+        android:visibility="gone"/>
 
 </FrameLayout>

app/src/main/res/layout/item_geofav.xml

@@ -22,7 +22,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="90dp"
     android:gravity="center_vertical"
     android:clickable="true"
     android:focusable="true">
@@ -32,8 +32,6 @@
         android:layout_width="64dp"
         android:layout_height="64dp"
         android:layout_marginStart="4dp"
-        android:layout_marginTop="14dp"
-        android:layout_marginBottom="14dp"
         android:layout_weight="0"
         android:background="@drawable/ic_list_pin"
         android:gravity="top|center"

app/src/main/res/values/strings.xml

@@ -99,6 +99,11 @@
     <string name="url_license" translatable="false">https://raw.githubusercontent.com/penguin86/nextcloud-maps-client/master/LICENSE</string>
     <string name="url_maps" translatable="false">https://donate.openstreetmap.org</string>
 
+    <!-- Settings -->
+    <string name="settings">Settings</string>
+    <string name="settings_use_google_maps">Always open with Google Maps</string>
+    <string name="settings_use_google_maps_summary">When disabled, a generic geo: URI will be used instead</string>
+
     <!-- Menu -->
     <string name="new_geobookmark_gps">New from current position</string>
     <string name="new_geobookmark_map">New from map</string>

build.gradle

@@ -22,10 +22,10 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.1'
+        classpath 'com.android.tools.build:gradle:9.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -35,7 +35,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

gradle.properties

@@ -37,6 +37,15 @@ org.gradle.jvmargs=-Xmx2048m
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
+android.defaults.buildfeatures.resvalues=true
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+android.enableAppCompileTimeRClass=false
+android.usesSdkInManifest.disallowed=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
+android.builtInKotlin=false
+android.newDsl=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sun Feb 20 08:50:37 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME