WIP Update to Android 15: edge to edge fixes

.gitignore

@@ -1,7 +1,6 @@
 *.iml
 .gradle
 /local.properties
-/.idea
 /.idea/caches
 /.idea/libraries
 /.idea/modules.xml

.idea/compiler.xml

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

README.md

@@ -18,19 +18,3 @@ 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 36
-        compileSdkVersion 34
+        targetSdkVersion 35
+        compileSdk 35
         versionCode 9
         versionName "0.4.0"
 
@@ -45,7 +45,6 @@ android {
 
     buildFeatures {
         dataBinding true
-        buildConfig true
     }
     namespace 'it.danieleverducci.nextcloudmaps'
 }

app/src/main/AndroidManifest.xml

@@ -25,7 +25,7 @@
 
     <queries>
         <package android:name="com.nextcloud.client" />
-        <!-- To see if Google Maps is installed, as it needs a specific intent Uri) -->
+        <!-- To see if google maps is installed, as it needs a specific intent Uri) -->
         <package android:name="com.google.android.apps.maps" />
     </queries>
 
@@ -111,11 +111,6 @@
             </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/NextcloudMapsStyledActivity.java

@@ -9,8 +9,6 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import org.osmdroid.views.overlay.TilesOverlay;
 
-import it.danieleverducci.nextcloudmaps.utils.EdgeToEdgeUtils;
-
 public class NextcloudMapsStyledActivity extends AppCompatActivity {
 
     @Override

app/src/main/java/it/danieleverducci/nextcloudmaps/activity/about/AboutActivity.java

@@ -31,14 +31,12 @@ import androidx.appcompat.widget.Toolbar;
 import it.danieleverducci.nextcloudmaps.BuildConfig;
 import it.danieleverducci.nextcloudmaps.R;
 import it.danieleverducci.nextcloudmaps.activity.NextcloudMapsStyledActivity;
-import it.danieleverducci.nextcloudmaps.utils.EdgeToEdgeUtils;
 
 public class AboutActivity extends NextcloudMapsStyledActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
-        EdgeToEdgeUtils.clearSystemInsets(this);
 
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);

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

@@ -54,6 +54,7 @@ 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;
@@ -76,6 +77,7 @@ 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/login/LoginActivity.java

@@ -25,7 +25,6 @@ import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ProgressBar;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
@@ -102,8 +101,7 @@ public class LoginActivity extends NextcloudMapsStyledActivity {
 
                     @Override
                     public void onError(Exception ex) {
-                        Toast.makeText(LoginActivity.this, R.string.login_error, Toast.LENGTH_SHORT).show();
-                        progress.setVisibility(View.GONE);
+                        // TODO handle errors
                     }
                 };
 
@@ -116,7 +114,7 @@ public class LoginActivity extends NextcloudMapsStyledActivity {
                 }
             });
         } catch (AccountImportCancelledException e) {
-            progress.setVisibility(View.GONE);
+            e.printStackTrace();
         }
     }
 

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

@@ -61,6 +61,9 @@ 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;
@@ -110,6 +113,14 @@ 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
@@ -117,7 +128,20 @@ 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;
@@ -128,6 +152,7 @@ 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,7 +25,10 @@ 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;
@@ -41,7 +44,6 @@ 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;
@@ -49,7 +51,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.RemoteDialog;
 import it.danieleverducci.nextcloudmaps.utils.EdgeToEdgeUtils;
 import it.danieleverducci.nextcloudmaps.utils.SettingsManager;
 
@@ -61,7 +62,6 @@ 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<>();
@@ -120,11 +120,6 @@ public class MainActivity extends NextcloudMapsStyledActivity {
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        EdgeToEdgeUtils.clearSystemInsets(this);
-
-        // Check dialog
-        RemoteDialog rd = new RemoteDialog(this);
-        rd.run();
 
         boolean showMap = SettingsManager.isGeofavoriteListShownAsMap(this);
         if (showMap)
@@ -132,15 +127,7 @@ public class MainActivity extends NextcloudMapsStyledActivity {
         else
             showList();
 
-        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());
-
+        setupFAB();
         setupNavigationMenu();
 
         drawerLayout = findViewById(R.id.drawerLayout);
@@ -159,7 +146,32 @@ 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 -> {
@@ -173,9 +185,6 @@ 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;
@@ -185,7 +194,6 @@ 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);
 
@@ -205,10 +213,6 @@ 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/mappicker/MapPickerActivity.java

@@ -32,7 +32,6 @@ import it.danieleverducci.nextcloudmaps.R;
 import it.danieleverducci.nextcloudmaps.activity.NextcloudMapsStyledActivity;
 import it.danieleverducci.nextcloudmaps.activity.detail.GeofavoriteDetailActivity;
 import it.danieleverducci.nextcloudmaps.databinding.ActivityMapPickerBinding;
-import it.danieleverducci.nextcloudmaps.utils.EdgeToEdgeUtils;
 import it.danieleverducci.nextcloudmaps.utils.GeoUriParser;
 import it.danieleverducci.nextcloudmaps.utils.MapUtils;
 
@@ -71,7 +70,6 @@ public class MapPickerActivity extends NextcloudMapsStyledActivity {
             mViewHolder.centerMapOn(l.getLatitude(), l.getLongitude());
 
         setContentView(mViewHolder.getRootView());
-        EdgeToEdgeUtils.clearSystemInsets(this);
     }
 
     /**

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

@@ -1,58 +0,0 @@
-/*
- * 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.EdgeToEdgeUtils;
-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);
-        EdgeToEdgeUtils.clearSystemInsets(this);
-
-        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,6 +13,9 @@ 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;
@@ -27,6 +30,7 @@ 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;
 
@@ -97,6 +101,17 @@ 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,7 +8,6 @@ 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;
@@ -17,7 +16,6 @@ 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;
 
@@ -34,13 +32,12 @@ 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;
@@ -64,7 +61,11 @@ public class GeofavoriteMapFragment extends GeofavoritesFragment implements Main
         View v = inflater.inflate(R.layout.fragment_geofavorite_map, container, false);
 
         // Register listeners
-        v.findViewById(R.id.center_position).setOnClickListener((cpv) -> moveToUserPosition());
+        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));
 
         // Setup map
         map = v.findViewById(R.id.map);

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

@@ -38,6 +38,7 @@ 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;
 
@@ -86,6 +87,8 @@ 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,50 +1,62 @@
 package it.danieleverducci.nextcloudmaps.utils;
 
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Color;
-import android.os.Build;
-import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.core.content.ContextCompat;
+import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
-
-import it.danieleverducci.nextcloudmaps.R;
+import androidx.core.view.WindowInsetsCompat;
 
 public class EdgeToEdgeUtils {
 
     /**
-     * Called in an activity's onCreate method, adds paddings to clear the system bars, in any orientation,
-     * to make all the content visible. Useful to adapt an old android project to the mandatory introduction
-     * of edge to edge in Android 15.
-     * @param a the activity to pad
+     * 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 clearSystemInsets(Activity a) {
-        // This color will be used as background in the system bars in case of edge to edge.
-        // Defaults to R.color.colorAccent, if defined, black otherwise.
-        int accentColor = ContextCompat.getColor(a, R.color.defaultBackground);
+    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);
 
-        ViewGroup rootLayout = a.findViewById(android.R.id.content);
-        rootLayout.setBackgroundColor(accentColor);
-
-        // Register to receive insets callbacks
-        ViewCompat.setOnApplyWindowInsetsListener(rootLayout, (v, insets) -> {
-            // Top padding is the device insets plus the actionbar height
-            boolean hasActionBar = a.getActionBar() != null && a.getActionBar().isShowing();
-            int actionbarHeightInPixels = 0;
-            if (hasActionBar && Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                Context context = rootLayout.getContext();
-                TypedValue tv = new TypedValue();
-                if (context.getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true))
-                    actionbarHeightInPixels = TypedValue.complexToDimensionPixelSize(tv.data, context.getResources().getDisplayMetrics());
-            }
-            int topPadding = insets.getStableInsetTop() + actionbarHeightInPixels;
-            v.setPadding(insets.getStableInsetLeft(), topPadding, insets.getStableInsetRight(), insets.getStableInsetBottom());
-            return insets;
+            //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,6 +2,7 @@ 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;
@@ -23,10 +24,16 @@ public class IntentGenerator {
     public static Intent newGeoUriIntent(Context context, Geofavorite item) {
         Intent i = new Intent();
         i.setAction(Intent.ACTION_VIEW);
-        i.setData(
-            SettingsManager.isUseGoogleMaps(context)
-                ? item.getGmapsUri() : item.getGeoUri()
-        );
+        i.setData(isGoogleMapsInstalled(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/RemoteDialog.java

@@ -1,99 +0,0 @@
-package it.danieleverducci.nextcloudmaps.utils;
-
-import static androidx.core.content.ContextCompat.startActivity;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.Log;
-
-import androidx.appcompat.app.AlertDialog;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-
-import it.danieleverducci.nextcloudmaps.R;
-
-public class RemoteDialog {
-
-    private Activity context;
-
-    public RemoteDialog(Activity context) {
-        this.context = context;
-    }
-
-    public void run() {
-        Thread t = new Thread(() -> {
-            HttpURLConnection urlConnection = null;
-            try {
-                URL url = new URL("https://git.ichibi.eu/penguin86/nextcloud-maps-client/raw/branch/remote-dialog/remote-dialog/data.json");
-                urlConnection = (HttpURLConnection) url.openConnection();
-                InputStream in = new BufferedInputStream(urlConnection.getInputStream());
-                StringBuilder textBuilder = new StringBuilder();
-                try (Reader reader = new BufferedReader(new InputStreamReader
-                        (in, StandardCharsets.UTF_8))) {
-                    int c = 0;
-                    while ((c = reader.read()) != -1) {
-                        textBuilder.append((char) c);
-                    }
-                }
-                showDialog(new JSONObject(textBuilder.toString()));
-            } catch (Exception e) {
-                e.printStackTrace();
-            } finally {
-                if (urlConnection != null)
-                    urlConnection.disconnect();
-            }
-        });
-        t.start();
-    }
-
-    private void showDialog(JSONObject jo) {
-        try {
-            String title = jo.getString("title");
-            String content = jo.getString("content");
-            JSONObject button1 = jo.getJSONObject("button1");
-            JSONObject button2 = jo.getJSONObject("button2");
-            String button1text = button1.getString("text");
-            String button1action = button1.getString("action");
-            String button2text = button2.getString("text");
-            String button2action = button2.getString("action");
-
-            AlertDialog.Builder builder = new AlertDialog.Builder(context);
-            builder.setMessage(content)
-                    .setTitle(title)
-                    .setPositiveButton(button1text, (dialog, id) -> {
-                        openBrowser(button1action);
-                    })
-                    .setNegativeButton(button2text, (dialog, id) -> {
-                        openBrowser(button2action);
-                    })
-                    .setNeutralButton(android.R.string.cancel, (dialog, id) -> dialog.dismiss());
-            context.runOnUiThread(() -> {
-                AlertDialog ad = builder.create();
-                ad.show();
-            });
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void openBrowser(String url) {
-        Intent i = new Intent(Intent.ACTION_VIEW);
-        i.setData(Uri.parse(url));
-        context.startActivity(i);
-    }
-}

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

@@ -2,7 +2,6 @@ package it.danieleverducci.nextcloudmaps.utils;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
 
 import androidx.preference.PreferenceManager;
 import it.danieleverducci.nextcloudmaps.activity.main.GeofavoriteAdapter;
@@ -13,7 +12,6 @@ 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)
@@ -49,16 +47,6 @@ public class SettingsManager {
         };
     }
 
-    public static boolean isUseGoogleMaps(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context)
-                .getBoolean(SETTING_USE_GOOGLE_MAPS, isGoogleMapsInstalled(context));
-    }
-
-    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)
@@ -66,13 +54,4 @@ public class SettingsManager {
                 .putFloat(SETTING_LAST_MAP_POSITION_ZOOM, (float)zoom)
                 .apply();
     }
-
-    private 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/res/drawable/ic_settings_grey.xml

@@ -1,16 +0,0 @@
-<!--
-  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,14 +10,12 @@
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appbar"
             android:layout_width="match_parent"
-            android:layout_height="250dp"
-            android:fitsSystemWindows="true">
+            android:layout_height="250dp">
 
             <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,12 +30,18 @@
         tools:layout="@layout/fragment_geofavorite_list" />
 
 
+    <FrameLayout
+        android:id="@+id/fab_container"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="bottom|end">
+
         <!-- 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|end"
+            android:layout_gravity="bottom"
             android:layout_margin="24dp"
             android:src="@drawable/ic_add_map"
             app:backgroundTint="@color/defaultBrand"
@@ -69,4 +75,6 @@
             app:tint="@color/white"
             android:contentDescription="@string/open_fab"/>
 
+    </FrameLayout>
+
 </FrameLayout>

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

@@ -35,8 +35,7 @@
     <com.google.android.material.navigation.NavigationView
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true">
+        android:layout_gravity="start">
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/scrollView"
@@ -49,17 +48,21 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <RelativeLayout
+                <FrameLayout
                     android:id="@+id/header_view"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/drawer_header_height"
+                    android:layout_height="wrap_content"
                     android:background="@color/defaultBrand">
 
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        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_centerVertical="true"
                             android:layout_margin="@dimen/spacer_2x"
                             android:gravity="center"
                             android:src="@drawable/ic_app" />
@@ -68,18 +71,20 @@
                             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: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>
+                            android:textSize="24sp"/>
+
+                    </LinearLayout>
+
+                </FrameLayout>
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/navigationCommon"

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

@@ -1,81 +0,0 @@
-<?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>
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingStart="10dp"
-                android:paddingEnd="10dp"
-                android:paddingBottom="10dp"
-                android:text="@string/settings_use_google_maps_summary"
-                android:textSize="12sp"
-                android:textColor="@android:color/darker_gray"/>
-
-        </LinearLayout>
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-</ScrollView>

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

@@ -3,6 +3,7 @@
     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,7 +17,6 @@
         <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,17 +53,24 @@
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 
+    <FrameLayout
+        android:id="@+id/center_position_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        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_marginRight="100dp"
             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"/>
+            android:visibility="visible"/>
+
+    </FrameLayout>
 
 </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="90dp"
+    android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:clickable="true"
     android:focusable="true">
@@ -32,6 +32,8 @@
         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-it/strings.xml

@@ -23,7 +23,6 @@
 
     <!-- Login Activity -->
     <string name="choose_account">Scegli account</string>
-    <string name="login_error">Si è verificato un errore durante la login</string>
 
     <!-- Geofavorites list -->
     <string name="new_geobookmark">Nuovo geosegnalibro</string>

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

@@ -22,7 +22,6 @@
 
     <!-- Login Activity -->
     <string name="choose_account">Choose account</string>
-    <string name="login_error">An error has occurred during the login</string>
 
     <!-- Geofavorites list -->
     <string name="new_geobookmark">New geofavorite</string>
@@ -100,11 +99,6 @@
     <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 so you can choose your preferred maps app</string>
-
     <!-- Menu -->
     <string name="new_geobookmark_gps">New from current position</string>
     <string name="new_geobookmark_map">New from map</string>

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

@@ -57,12 +57,11 @@
     <!-- Alertdialogs -->
     <style name="AlertDialogTheme" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
         <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
-        <item name="buttonBarNeutralButtonStyle">@style/NegativeButtonStyle</item>
         <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
     </style>
 
     <style name="NegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
-        <item name="android:textColor">@color/text_color</item>
+        <item name="android:textColor">@color/inactive</item>
     </style>
 
     <style name="PositiveButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">

build.gradle

@@ -22,10 +22,10 @@
 buildscript {
     repositories {
         google()
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:9.3.2'
+        classpath 'com.android.tools.build:gradle:8.5.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()
-        mavenCentral()
+        jcenter()
     }
 }
 

gradle.properties

@@ -37,15 +37,6 @@ 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,9 +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
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
-networkTimeout=10000
-retries=0
-retryBackOffMs=500
-validateDistributionUrl=true
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,128 +1,78 @@
-#!/bin/sh
-
-#
-# Copyright © 2015 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
+#!/usr/bin/env sh
 
 ##############################################################################
-#
-#   gradlew start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh gradlew
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -131,118 +81,92 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
         fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
     done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
 fi
 
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,82 +1,84 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
-
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
-@rem  gradlew startup script for Windows
+@rem  Gradle startup script for Windows
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables, and ensure extensions are enabled
-setlocal EnableExtensions
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
-"%COMSPEC%" /c exit 1
+goto fail
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
-"%COMSPEC%" /c exit 1
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
 
 :execute
 @rem Setup the command line
 
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
-@rem Execute gradlew
-@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
-@rem which allows us to clear the local environment before executing the java command
-endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
-:exitWithErrorLevel
-@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
-"%COMSPEC%" /c exit %ERRORLEVEL%
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega