Remove Google Maps installed check from navigation

.gitignore

@@ -101,3 +101,5 @@ app/release/output-metadata.json
 
 .idea/deploymentTargetDropDown.xml
 .idea/misc.xml
+.idea/deploymentTargetSelector.xml
+.idea/other.xml

.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

@@ -8,7 +8,7 @@
 
 (Always prefer [F-Droid](https://f-droid.org) build, when possible).
 
-UNOFFICIAL and FOSS Nextcloud Maps client at its earliest stages of developement. Shows your Nextcloud Maps geofavorites list.
+UNOFFICIAL and FOSS Nextcloud Maps client at its earliest stages of developement. Shows your Nextcloud Maps geofavorites in a list and a map.
 Geofavorites can be opened in all apps supporting geo links (i.e. Google Maps, Organic Maps etc...).
 A new geofavorite can be created on current location, by sharing a "geo:" uri from another app or manually picking from the map.
 
@@ -16,5 +16,21 @@ A new geofavorite can be created on current location, by sharing a "geo:" uri fr
 
 This work is heavily based on [matiasdelellis's Nextcloud SSO example](https://github.com/matiasdelellis/app-tutorial-android) to implement [Nextcloud single sign on](https://github.com/nextcloud/Android-SingleSignOn).
 
-![Screenshot 1](screenshots/1.png)      ![Screenshot 1](screenshots/2.png)
+![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

@@ -18,14 +18,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 34
-
     defaultConfig {
         applicationId "it.danieleverducci.nextcloudmaps"
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 8
-        versionName "0.3.6"
+        compileSdkVersion 34
+        versionCode 9
+        versionName "0.4.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -46,6 +45,7 @@ android {
 
     buildFeatures {
         dataBinding true
+        buildConfig true
     }
     namespace 'it.danieleverducci.nextcloudmaps'
 }
@@ -59,10 +59,10 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
 
     // Desugaring lib: see https://developer.android.com/studio/write/java8-support
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.2")
 
     implementation 'com.android.support:design:34.0.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation "androidx.cardview:cardview:1.0.0"
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
@@ -70,11 +70,11 @@ dependencies {
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
     // Retrofif2
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.11.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.6.1'
 
     // Nextcloud SSO
-    implementation "com.github.nextcloud:Android-SingleSignOn:1.0.0"
+    implementation "com.github.nextcloud:Android-SingleSignOn:1.3.2"
 
     // OSMDroid
     implementation 'org.osmdroid:osmdroid-android:6.1.18'
@@ -83,7 +83,7 @@ dependencies {
     implementation 'org.threeten:threetenbp:1.5.1'
 
     // https://mvnrepository.com/artifact/commons-io/commons-io
-    implementation 'commons-io:commons-io:2.11.0'
+    implementation 'commons-io:commons-io:2.13.0'
 
     // Picasso (image loader)
     implementation 'com.squareup.picasso:picasso:2.8'

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

@@ -18,6 +18,8 @@
 package it.danieleverducci.nextcloudmaps.activity.detail;
 
 import android.Manifest;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -80,11 +82,6 @@ public class GeofavoriteDetailActivity extends NextcloudMapsStyledActivity imple
                 finish();
             }
 
-            @Override
-            public void onMapEditPressed() {
-                //TODO
-            }
-
             @Override
             public void onActionIconShareClicked() {
                 startActivity(Intent.createChooser(IntentGenerator.newShareIntent(GeofavoriteDetailActivity.this, mGeofavorite), getString(R.string.share_via)));
@@ -310,6 +307,12 @@ public class GeofavoriteDetailActivity extends NextcloudMapsStyledActivity imple
             CategoriesAdapter categoriesAdapter = new CategoriesAdapter(binding.root.getContext());
             this.binding.categoryAt.setAdapter(categoriesAdapter);
             this.binding.categoryAt.setText(Geofavorite.DEFAULT_CATEGORY);
+            this.binding.categoryAtClear.setOnClickListener((v) -> {
+                if (this.binding.categoryAt.getText().toString().isEmpty())
+                    this.binding.categoryAt.setText(Geofavorite.DEFAULT_CATEGORY);
+                else
+                    this.binding.categoryAt.setText("");
+            });
 
             // Set map properties
             this.binding.map.getZoomController().setVisibility(CustomZoomButtonsController.Visibility.NEVER);
@@ -340,6 +343,12 @@ public class GeofavoriteDetailActivity extends NextcloudMapsStyledActivity imple
 
         public void updateViewCoords(Geofavorite item) {
             binding.coordsTv.setText(item.getCoordinatesString());
+            binding.coordsTv.setOnClickListener((v) -> {
+                ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+                ClipData clip = ClipData.newPlainText(item.getCoordinatesString(), item.getCoordinatesString());
+                clipboard.setPrimaryClip(clip);
+                Toast.makeText(GeofavoriteDetailActivity.this, R.string.coords_copied, Toast.LENGTH_SHORT).show();
+            });
 
             // Center map
             GeoPoint position = new GeoPoint(item.getLat(), item.getLng());
@@ -407,9 +416,6 @@ public class GeofavoriteDetailActivity extends NextcloudMapsStyledActivity imple
             if (v.getId() == R.id.back_bt && this.listener != null) {
                 this.listener.onBackPressed();
             }
-            if (v.getId() == R.id.manual_pos_bt && this.listener != null) {
-                this.listener.onMapEditPressed();
-            }
 
             // Actions
             if (v.getId() == R.id.action_icon_share && this.listener != null) {
@@ -428,7 +434,6 @@ public class GeofavoriteDetailActivity extends NextcloudMapsStyledActivity imple
         void onSubmit();
         void onMapClicked();
         void onBackPressed();
-        void onMapEditPressed();
         void onActionIconShareClicked();
         void onActionIconNavClicked();
         void onActionIconDeleteClicked();

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

@@ -41,6 +41,7 @@ import it.danieleverducci.nextcloudmaps.R;
 import it.danieleverducci.nextcloudmaps.activity.NextcloudMapsStyledActivity;
 import it.danieleverducci.nextcloudmaps.activity.about.AboutActivity;
 import it.danieleverducci.nextcloudmaps.activity.detail.GeofavoriteDetailActivity;
+import it.danieleverducci.nextcloudmaps.activity.settings.SettingsActivity;
 import it.danieleverducci.nextcloudmaps.activity.login.LoginActivity;
 import it.danieleverducci.nextcloudmaps.activity.main.NavigationAdapter.NavigationItem;
 import it.danieleverducci.nextcloudmaps.activity.mappicker.MapPickerActivity;
@@ -58,6 +59,7 @@ public class MainActivity extends NextcloudMapsStyledActivity {
     private static final String NAVIGATION_KEY_ADD_GEOFAVORITE_FROM_GPS = "add_from_gps";
     private static final String NAVIGATION_KEY_ADD_GEOFAVORITE_FROM_MAP = "add_from_map";
     private static final String NAVIGATION_KEY_SHOW_ABOUT = "about";
+    private static final String NAVIGATION_KEY_SETTINGS = "settings";
     private static final String NAVIGATION_KEY_SWITCH_ACCOUNT = "switch_account";
 
     private ArrayList<OnGpsPermissionGrantedListener> onGpsPermissionGrantedListener = new ArrayList<>();
@@ -164,6 +166,9 @@ public class MainActivity extends NextcloudMapsStyledActivity {
                 case NAVIGATION_KEY_SHOW_ABOUT:
                     show_about();
                     break;
+                case NAVIGATION_KEY_SETTINGS:
+                    show_settings();
+                    break;
                 case NAVIGATION_KEY_SWITCH_ACCOUNT:
                     switch_account();
                     break;
@@ -173,6 +178,7 @@ public class MainActivity extends NextcloudMapsStyledActivity {
         navItems.add(new NavigationItem(NAVIGATION_KEY_ADD_GEOFAVORITE_FROM_GPS, getString(R.string.new_geobookmark_gps), R.drawable.ic_add_gps));
         navItems.add(new NavigationItem(NAVIGATION_KEY_ADD_GEOFAVORITE_FROM_MAP, getString(R.string.new_geobookmark_map), R.drawable.ic_add_map));
         navItems.add(new NavigationItem(NAVIGATION_KEY_SHOW_ABOUT, getString(R.string.about), R.drawable.ic_info_grey));
+        navItems.add(new NavigationItem(NAVIGATION_KEY_SETTINGS, getString(R.string.settings), R.drawable.ic_settings_grey));
         navItems.add(new NavigationItem(NAVIGATION_KEY_SWITCH_ACCOUNT, getString(R.string.switch_account), R.drawable.ic_logout_grey));
         navigationCommonAdapter.setItems(navItems);
 
@@ -192,6 +198,10 @@ public class MainActivity extends NextcloudMapsStyledActivity {
         );
     }
 
+    private void show_settings() {
+        startActivity(new Intent(this, SettingsActivity.class));
+    }
+
     private void show_about() {
         startActivity(new Intent(this, AboutActivity.class));
     }

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/GeofavoriteMapFragment.java

@@ -3,6 +3,8 @@ package it.danieleverducci.nextcloudmaps.fragments;
 import android.Manifest;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
@@ -15,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;
 
@@ -161,6 +164,11 @@ public class GeofavoriteMapFragment extends GeofavoritesFragment implements Main
 
         // Display user position on screen
         mLocationOverlay = new MyLocationNewOverlay(new GpsMyLocationProvider(requireContext()), map);
+        Bitmap personIcon = ((BitmapDrawable)AppCompatResources.getDrawable(requireContext(), R.mipmap.ic_person)).getBitmap();
+        mLocationOverlay.setPersonIcon(personIcon);
+        mLocationOverlay.setDirectionIcon(personIcon);
+        mLocationOverlay.setPersonAnchor(.5f, .5f);
+        mLocationOverlay.setDirectionAnchor(.5f, .5f);
         // On first gps fix, show "center to my position" icon
         mLocationOverlay.runOnFirstFix(() -> {
             if(getActivity() != null) {

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/floating_semitransparent_button_background.xml

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:left="8dp"
-        android:right="8dp"
-        android:top="8dp"
-        android:bottom="8dp">
+    <item>
         <shape
             android:shape="oval">
             <solid android:color="@color/defaultBrandAlpha"/>

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

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>

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

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
+</vector>

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

@@ -1,16 +0,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="?android:attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M13.95,13H9V8.05l5.61,-5.61C13.78,2.16 12.9,2 12,2c-4.2,0 -8,3.22 -8,8.2c0,3.32 2.67,7.25 8,11.8c5.33,-4.55 8,-8.48 8,-11.8c0,-1.01 -0.16,-1.94 -0.45,-2.8L13.95,13z"/>
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M11,11l2.12,0l6.16,-6.16l-2.12,-2.12l-6.16,6.16z"/>
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M20.71,2L20,1.29C19.8,1.1 19.55,1 19.29,1c-0.13,0 -0.48,0.07 -0.71,0.29l-0.72,0.72l2.12,2.12l0.72,-0.72C21.1,3.02 21.1,2.39 20.71,2z"/>
-</vector>

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/drawable/user_badge_mask.xml

@@ -9,7 +9,7 @@
             <solid android:color="@android:color/transparent" />
             <stroke
                 android:width="10dp"
-                android:color="#fff" />
+                android:color="@color/toolbar_background" />
         </shape>
     </item>
 </layer-list>

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

@@ -51,25 +51,26 @@
                     <!-- Back button -->
                     <ImageView
                         android:id="@+id/back_bt"
-                        android:layout_width="?android:attr/actionBarSize"
-                        android:layout_height="?android:attr/actionBarSize"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
                         android:layout_gravity="start"
-                        android:padding="16dp"
+                        android:layout_margin="8dp"
+                        android:padding="8dp"
                         android:src="@drawable/ic_back_grey"
                         app:tint="@color/white"
                         android:background="@drawable/floating_semitransparent_button_background"/>
 
-                    <!-- Manual position button -->
+                    <!-- Save button -->
                     <ImageView
-                        android:id="@+id/manual_pos_bt"
-                        android:layout_width="?android:attr/actionBarSize"
-                        android:layout_height="?android:attr/actionBarSize"
+                        android:id="@+id/submit_bt"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
                         android:layout_gravity="end"
-                        android:padding="16dp"
-                        android:src="@drawable/ic_manual_pos"
+                        android:layout_margin="8dp"
+                        android:padding="8dp"
+                        android:src="@drawable/ic_ok"
                         app:tint="@color/white"
-                        android:background="@drawable/floating_semitransparent_button_background"
-                        android:visibility="gone"/> <!-- TODO: Implement edit -->
+                        android:background="@drawable/round_button_background"/>
 
                 </androidx.appcompat.widget.Toolbar>
                     
@@ -197,20 +198,40 @@
                     android:drawableTint="@color/defaultBrand"
                     android:hint="@string/description"/>
 
-                <AutoCompleteTextView
-                    android:id="@+id/category_at"
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="20dp"
-                    android:ems="10"
-                    android:gravity="start|top"
-                    android:inputType="textMultiLine"
-                    android:maxLines="10"
+                    android:orientation="horizontal"
+                    android:layout_marginTop="20dp">
+
+                    <AutoCompleteTextView
+                        android:id="@+id/category_at"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:maxLines="1"
                         android:background="@android:color/transparent"
                         android:drawableLeft="@drawable/ic_category_asc"
                         android:drawablePadding="5dp"
                         android:drawableTint="@color/defaultBrand"
-                    android:hint="@string/category"/>
+                        android:hint="@string/category"
+                        android:completionThreshold="0"/>
+
+                    <ImageButton
+                        android:id="@+id/category_at_clear"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="3dp"
+                        android:background="@color/transparent"
+                        android:src="@drawable/ic_clear"/>
+
+                </LinearLayout>
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text="@string/category_hint"
+                    android:textSize="12sp"/>
 
                 <TextView
                     android:layout_width="match_parent"
@@ -249,7 +270,9 @@
                     android:id="@+id/coords_tv"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:textAlignment="textEnd" />
+                    android:textAlignment="textEnd"
+                    app:drawableEndCompat="@drawable/ic_copy"
+                    android:drawablePadding="10sp"/>
 
                 <ProgressBar
                     android:id="@+id/progress"
@@ -258,16 +281,6 @@
                     android:indeterminate="true"
                     android:visibility="gone"/>
 
-                <Button
-                    android:id="@+id/submit_bt"
-                    style="@style/Widget.AppCompat.Button.Colored"
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:layout_margin="50dp"
-                    android:text="@string/confirm"
-                    app:backgroundTint="@color/defaultBrand"
-                    android:onClick="onSubmit"/>
-
             </LinearLayout>
 
         </androidx.core.widget.NestedScrollView>

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

@@ -35,6 +35,7 @@
         android:layout_marginTop="@dimen/spacer_1hx"
         android:layout_marginEnd="@dimen/spacer_2x"
         android:layout_marginBottom="@dimen/spacer_1hx"
+        app:cardBackgroundColor="@color/toolbar_background"
         app:cardCornerRadius="30dp"
         app:cardElevation="2dp"
         app:strokeWidth="0dp">

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

@@ -61,7 +61,6 @@
         android:layout_marginBottom="25dp"
         android:layout_gravity="bottom|right"
         android:background="@drawable/unselected_floating_semitransparent_button_background"
-        android:contentDescription="@string/list_mode"
         android:padding="5dp"
         android:tint="@color/text_color"
         android:src="@drawable/ic_add_gps"

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

@@ -64,11 +64,12 @@
     <string name="accuracy">Accuratezza: {accuracy} m</string>
     <string name="accuracy_nosignal">Nessun segnale GPS!</string>
     <string name="location_permission_required">Per creare un geosegnalibro è necessario consentire l\'accesso alla posizione.</string>
-    <string name="confirm">Salva</string>
+    <string name="category_hint">Scrivi il nome per creare una nuova categoria</string>
     <string name="error_saving_geofavorite">Impossibile salvare il geosegnalibro</string>
     <string name="error_unsupported_uri">Impossibile ottenere le coordinate dai dati ricevuti</string>
     <string name="geofavorite_saved">Geosegnalibro salvato</string>
     <string name="incomplete_geofavorite">Geosegnalibro incompleto: nome e categoria sono obbligatori</string>
+    <string name="coords_copied">Coordinate copiate nella clipboard</string>
 
     <!-- Map picker activity -->
     <string name="coordinates_parse_error">Le coordinate dovrebbero essere nel formato xx.xxxxxx</string>

app/src/main/res/values-night/colors.xml

@@ -4,4 +4,7 @@
     <color name="disabled">#888</color>
     <color name="defaultBackground">#000</color>
     <color name="translucent">#C000</color>
+
+    <!-- Toolbar -->
+    <color name="toolbar_background">#211e28</color>
 </resources>

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

@@ -38,4 +38,7 @@
 
     <!-- Generic Colors -->
     <color name="white">#fff</color>
+
+    <!-- Toolbar -->
+    <color name="toolbar_background">@color/defaultBackground</color>
 </resources>

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

@@ -63,11 +63,12 @@
     <string name="accuracy">Accuracy: {accuracy} m</string>
     <string name="accuracy_nosignal">No GPS signal!</string>
     <string name="location_permission_required">Location permission is required to create a geofavorite.</string>
-    <string name="confirm">Save</string>
+    <string name="category_hint">Write the name to create a new category</string>
     <string name="error_saving_geofavorite">Unable to save geofavorite</string>
     <string name="error_unsupported_uri">Unable to obtain coordinates from shared data</string>
     <string name="geofavorite_saved">Geofavorite saved</string>
     <string name="incomplete_geofavorite">Incomplete geofavorite: Name and category are mandatory</string>
+    <string name="coords_copied">Coordinates have been copied to the clipboard</string>
 
     <!-- Map picker activity -->
     <string name="coordinates_parse_error">Coordinates should be in format xx.xxxxxx</string>
@@ -98,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.2.2'
+        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()
     }
 }
 

fastlane/metadata/android/en-US/changelogs/9.txt

@@ -0,0 +1,5 @@
+Map view
+Filter by category
+Button to copy coordinates to clipboard
+Faster autocomplete
+Graphics restyling to match new Nextcloud style

fastlane/metadata/android/en-US/full_description.txt

@@ -1,4 +1,4 @@
-UNOFFICIAL and FOSS Nextcloud Maps client at its earliest stages of developement. Shows your Nextcloud Maps geofavorites list.
+UNOFFICIAL and FOSS Nextcloud Maps client. Shows your Nextcloud Maps geofavorites in a list or a map.
 Geofavorites can be opened in all apps supporting geo links (i.e. Google Maps, Organic Maps etc...).
 A new geofavorite can be created on current location, by sharing a "geo:" uri from another app or manually picking from the map.
 

fastlane/metadata/android/it-IT/full_description.txt

@@ -1,3 +1,3 @@
 Client per Nextcloud Maps non ufficiale e FOSS al suo stato iniziale di sviluppo.
-Mostra la lista dei geosegnalibri di Nextcloud Maps e permette di aprirli in qualunque app supporti i "geo:" urls (i.e. Google Maps, Organic Maps etc...).
+Mostra i geosegnalibri di Nextcloud Maps in lista o in mappa e permette di aprirli in qualunque app supporti i "geo:" urls (i.e. Google Maps, Organic Maps etc...).
 È possibile creare nuovi geosegnalibri nella posizione GPS attuale, scegliendo la posizione dalla mappa o condividendola da altre app sotto forma di "geo:" uri.

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.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME