Compare commits

...
18 Commits
Author SHA1 Message Date
penguin86 7ec450f57e Merge branch 'develop' 2026-11-19 22:51:49 +01:00
penguin86 a16252413e Bumped version and compileSdk 2026-11-19 22:46:52 +01:00
penguin86 a2d3a2bffe Updated gradle and libs 2026-11-19 22:37:18 +01:00
penguin86 f5cde70d71 Removed GitHub references 2026-11-19 22:29:19 +01:00
penguin86 7e720353d0 Update README.md 2026-10-28 22:20:42 +01:00
penguin86 796f658fc5 Android 16 support, fix edge to edge 2026-09-02 22:58:48 +02:00
penguin86 4a760a9297 Gradle update 2026-09-01 22:42:05 +02:00
Daniele Verducci 7848f9ad2d Bumped version 2026-07-16 11:40:06 +02:00
Daniele Verducci 230421065b Handle login errors 2026-07-16 11:25:11 +02:00
Daniele Verducci e22e748b28 Updated gradle 2026-07-16 11:17:44 +02:00
Daniele Verducci 339ee7629b Sensible default for geouri/gmaps setting 2026-07-16 11:16:05 +02:00
penguin86 46da74fa89 Merge pull request 'Add option to force Google Maps or use geo: URI for navigation' (#1) from sim6/nextcloud-maps-client:no-google-maps into develop
Reviewed-on: #1
2026-07-16 10:45:24 +02:00
sim6 f0d8e30d39 Remove Google Maps installed check from navigation 2026-07-07 14:44:51 +02:00
sim6 096cb18415 Add option to force Google Maps or use geo: URI for navigation 2026-07-07 14:44:51 +02:00
penguin86 d929397492 Updated README 2026-07-06 22:48:45 +02:00
penguin86 2217f80f72 Updated gradle 2026-07-06 22:43:30 +02:00
penguin86 d062158c7c Fixed build 2026-07-06 22:18:07 +02:00
Daniele Verducci 26dcfb8f34 Temporarily targeting SDK 34 until edge to edge fixes are ready 2024-10-03 07:51:53 +02:00
22 changed files with 334 additions and 54 deletions
+1
View File
@@ -1,6 +1,7 @@
*.iml *.iml
.gradle .gradle
/local.properties /local.properties
/.idea
/.idea/caches /.idea/caches
/.idea/libraries /.idea/libraries
/.idea/modules.xml /.idea/modules.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<bytecodeTargetLevel target="17" /> <bytecodeTargetLevel target="25" />
</component> </component>
</project> </project>
+19 -4
View File
@@ -3,10 +3,6 @@
# Nextcloud Maps Geofavorites Android app # Nextcloud Maps Geofavorites Android app
[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/it/packages/it.danieleverducci.nextcloudmaps) [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/it/packages/it.danieleverducci.nextcloudmaps)
[<img src="https://cdn.rawgit.com/steverichey/google-play-badge-svg/master/img/en_get.svg" height="80">](https://play.google.com/store/apps/details?id=it.danieleverducci.nextcloudmaps)
[<img src="https://raw.githubusercontent.com/andOTP/andOTP/master/assets/badges/get-it-on-github.png" height="80">](https://github.com/penguin86/nextcloud-maps-client/releases/latest)
(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 in a list and a map. 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...). Geofavorites can be opened in all apps supporting geo links (i.e. Google Maps, Organic Maps etc...).
@@ -18,3 +14,22 @@ 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) ![Screenshot 1](screenshots/1.png) ![Screenshot 2](screenshots/2.png) ![Screenshot 3](screenshots/3.png)
## Contributions
A big thanks to the contributors that kindly dedicated their time to make this project great:
- Simó Albert i Beltran
### 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
+17 -15
View File
@@ -21,9 +21,10 @@ android {
defaultConfig { defaultConfig {
applicationId "it.danieleverducci.nextcloudmaps" applicationId "it.danieleverducci.nextcloudmaps"
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 35 targetSdkVersion 36
versionCode 9 compileSdkVersion 37
versionName "0.4.0" versionCode 10
versionName "0.4.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
@@ -44,6 +45,7 @@ android {
buildFeatures { buildFeatures {
dataBinding true dataBinding true
buildConfig true
} }
namespace 'it.danieleverducci.nextcloudmaps' namespace 'it.danieleverducci.nextcloudmaps'
} }
@@ -57,34 +59,34 @@ dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"]) implementation fileTree(dir: "libs", include: ["*.jar"])
// Desugaring lib: see https://developer.android.com/studio/write/java8-support // Desugaring lib: see https://developer.android.com/studio/write/java8-support
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.2") coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
implementation 'com.android.support:design:34.0.0' implementation 'com.android.support:design:34.0.0'
implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.appcompat:appcompat:1.8.0'
implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'androidx.recyclerview:recyclerview:1.4.0'
implementation "androidx.cardview:cardview:1.0.0" implementation "androidx.cardview:cardview:1.0.0"
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.constraintlayout:constraintlayout:2.2.2'
implementation "androidx.preference:preference:1.2.1" implementation "androidx.preference:preference:1.2.1"
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0'
// Retrofif2 // Retrofif2
implementation 'com.squareup.retrofit2:retrofit:2.11.0' implementation 'com.squareup.retrofit2:retrofit:3.0.0'
implementation 'com.squareup.retrofit2:converter-gson:2.6.1' implementation 'com.squareup.retrofit2:converter-gson:3.0.0'
// Nextcloud SSO // Nextcloud SSO
implementation "com.github.nextcloud:Android-SingleSignOn:1.3.2" implementation "com.github.nextcloud:Android-SingleSignOn:1.3.5"
// OSMDroid // OSMDroid
implementation 'org.osmdroid:osmdroid-android:6.1.18' implementation 'org.osmdroid:osmdroid-android:6.1.20'
//Threeten-Backport (ports Java 8 Date API on Java 6+) //Threeten-Backport (ports Java 8 Date API on Java 6+)
implementation 'org.threeten:threetenbp:1.5.1' implementation 'org.threeten:threetenbp:1.7.5'
// https://mvnrepository.com/artifact/commons-io/commons-io // https://mvnrepository.com/artifact/commons-io/commons-io
implementation 'commons-io:commons-io:2.13.0' implementation 'commons-io:commons-io:2.22.0'
// Picasso (image loader) // Picasso (image loader)
implementation 'com.squareup.picasso:picasso:2.8' implementation 'com.squareup.picasso:picasso:2.71828'
configurations.all { configurations.all {
resolutionStrategy { resolutionStrategy {
+6 -1
View File
@@ -25,7 +25,7 @@
<queries> <queries>
<package android:name="com.nextcloud.client" /> <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" /> <package android:name="com.google.android.apps.maps" />
</queries> </queries>
@@ -111,6 +111,11 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity
android:name=".activity.settings.SettingsActivity"
android:launchMode="singleTask"
android:theme="@style/AppTheme"/>
<activity <activity
android:name=".activity.about.AboutActivity" android:name=".activity.about.AboutActivity"
android:launchMode="singleTask" android:launchMode="singleTask"
@@ -9,6 +9,8 @@ import androidx.appcompat.app.AppCompatActivity;
import org.osmdroid.views.overlay.TilesOverlay; import org.osmdroid.views.overlay.TilesOverlay;
import it.danieleverducci.nextcloudmaps.utils.EdgeToEdgeUtils;
public class NextcloudMapsStyledActivity extends AppCompatActivity { public class NextcloudMapsStyledActivity extends AppCompatActivity {
@Override @Override
@@ -31,12 +31,14 @@ import androidx.appcompat.widget.Toolbar;
import it.danieleverducci.nextcloudmaps.BuildConfig; import it.danieleverducci.nextcloudmaps.BuildConfig;
import it.danieleverducci.nextcloudmaps.R; import it.danieleverducci.nextcloudmaps.R;
import it.danieleverducci.nextcloudmaps.activity.NextcloudMapsStyledActivity; import it.danieleverducci.nextcloudmaps.activity.NextcloudMapsStyledActivity;
import it.danieleverducci.nextcloudmaps.utils.EdgeToEdgeUtils;
public class AboutActivity extends NextcloudMapsStyledActivity { public class AboutActivity extends NextcloudMapsStyledActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_about); setContentView(R.layout.activity_about);
EdgeToEdgeUtils.clearSystemInsets(this);
Toolbar toolbar = findViewById(R.id.toolbar); Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
@@ -25,6 +25,7 @@ import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
@@ -101,7 +102,8 @@ public class LoginActivity extends NextcloudMapsStyledActivity {
@Override @Override
public void onError(Exception ex) { public void onError(Exception ex) {
// TODO handle errors Toast.makeText(LoginActivity.this, R.string.login_error, Toast.LENGTH_SHORT).show();
progress.setVisibility(View.GONE);
} }
}; };
@@ -114,7 +116,7 @@ public class LoginActivity extends NextcloudMapsStyledActivity {
} }
}); });
} catch (AccountImportCancelledException e) { } catch (AccountImportCancelledException e) {
e.printStackTrace(); progress.setVisibility(View.GONE);
} }
} }
@@ -41,6 +41,7 @@ import it.danieleverducci.nextcloudmaps.R;
import it.danieleverducci.nextcloudmaps.activity.NextcloudMapsStyledActivity; import it.danieleverducci.nextcloudmaps.activity.NextcloudMapsStyledActivity;
import it.danieleverducci.nextcloudmaps.activity.about.AboutActivity; import it.danieleverducci.nextcloudmaps.activity.about.AboutActivity;
import it.danieleverducci.nextcloudmaps.activity.detail.GeofavoriteDetailActivity; 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.login.LoginActivity;
import it.danieleverducci.nextcloudmaps.activity.main.NavigationAdapter.NavigationItem; import it.danieleverducci.nextcloudmaps.activity.main.NavigationAdapter.NavigationItem;
import it.danieleverducci.nextcloudmaps.activity.mappicker.MapPickerActivity; import it.danieleverducci.nextcloudmaps.activity.mappicker.MapPickerActivity;
@@ -48,6 +49,7 @@ import it.danieleverducci.nextcloudmaps.api.ApiProvider;
import it.danieleverducci.nextcloudmaps.fragments.GeofavoriteListFragment; import it.danieleverducci.nextcloudmaps.fragments.GeofavoriteListFragment;
import it.danieleverducci.nextcloudmaps.fragments.GeofavoriteMapFragment; import it.danieleverducci.nextcloudmaps.fragments.GeofavoriteMapFragment;
import it.danieleverducci.nextcloudmaps.repository.GeofavoriteRepository; import it.danieleverducci.nextcloudmaps.repository.GeofavoriteRepository;
import it.danieleverducci.nextcloudmaps.utils.EdgeToEdgeUtils;
import it.danieleverducci.nextcloudmaps.utils.SettingsManager; import it.danieleverducci.nextcloudmaps.utils.SettingsManager;
public class MainActivity extends NextcloudMapsStyledActivity { public class MainActivity extends NextcloudMapsStyledActivity {
@@ -58,6 +60,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_GPS = "add_from_gps";
private static final String NAVIGATION_KEY_ADD_GEOFAVORITE_FROM_MAP = "add_from_map"; 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_SHOW_ABOUT = "about";
private static final String NAVIGATION_KEY_SETTINGS = "settings";
private static final String NAVIGATION_KEY_SWITCH_ACCOUNT = "switch_account"; private static final String NAVIGATION_KEY_SWITCH_ACCOUNT = "switch_account";
private ArrayList<OnGpsPermissionGrantedListener> onGpsPermissionGrantedListener = new ArrayList<>(); private ArrayList<OnGpsPermissionGrantedListener> onGpsPermissionGrantedListener = new ArrayList<>();
@@ -116,6 +119,7 @@ public class MainActivity extends NextcloudMapsStyledActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
EdgeToEdgeUtils.clearSystemInsets(this);
boolean showMap = SettingsManager.isGeofavoriteListShownAsMap(this); boolean showMap = SettingsManager.isGeofavoriteListShownAsMap(this);
if (showMap) if (showMap)
@@ -164,6 +168,9 @@ public class MainActivity extends NextcloudMapsStyledActivity {
case NAVIGATION_KEY_SHOW_ABOUT: case NAVIGATION_KEY_SHOW_ABOUT:
show_about(); show_about();
break; break;
case NAVIGATION_KEY_SETTINGS:
show_settings();
break;
case NAVIGATION_KEY_SWITCH_ACCOUNT: case NAVIGATION_KEY_SWITCH_ACCOUNT:
switch_account(); switch_account();
break; break;
@@ -173,6 +180,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_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_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_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)); navItems.add(new NavigationItem(NAVIGATION_KEY_SWITCH_ACCOUNT, getString(R.string.switch_account), R.drawable.ic_logout_grey));
navigationCommonAdapter.setItems(navItems); navigationCommonAdapter.setItems(navItems);
@@ -192,6 +200,10 @@ public class MainActivity extends NextcloudMapsStyledActivity {
); );
} }
private void show_settings() {
startActivity(new Intent(this, SettingsActivity.class));
}
private void show_about() { private void show_about() {
startActivity(new Intent(this, AboutActivity.class)); startActivity(new Intent(this, AboutActivity.class));
} }
@@ -32,6 +32,7 @@ import it.danieleverducci.nextcloudmaps.R;
import it.danieleverducci.nextcloudmaps.activity.NextcloudMapsStyledActivity; import it.danieleverducci.nextcloudmaps.activity.NextcloudMapsStyledActivity;
import it.danieleverducci.nextcloudmaps.activity.detail.GeofavoriteDetailActivity; import it.danieleverducci.nextcloudmaps.activity.detail.GeofavoriteDetailActivity;
import it.danieleverducci.nextcloudmaps.databinding.ActivityMapPickerBinding; import it.danieleverducci.nextcloudmaps.databinding.ActivityMapPickerBinding;
import it.danieleverducci.nextcloudmaps.utils.EdgeToEdgeUtils;
import it.danieleverducci.nextcloudmaps.utils.GeoUriParser; import it.danieleverducci.nextcloudmaps.utils.GeoUriParser;
import it.danieleverducci.nextcloudmaps.utils.MapUtils; import it.danieleverducci.nextcloudmaps.utils.MapUtils;
@@ -70,6 +71,7 @@ public class MapPickerActivity extends NextcloudMapsStyledActivity {
mViewHolder.centerMapOn(l.getLatitude(), l.getLongitude()); mViewHolder.centerMapOn(l.getLatitude(), l.getLongitude());
setContentView(mViewHolder.getRootView()); setContentView(mViewHolder.getRootView());
EdgeToEdgeUtils.clearSystemInsets(this);
} }
/** /**
@@ -0,0 +1,58 @@
/*
* 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;
}
}
@@ -0,0 +1,50 @@
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.view.ViewCompat;
import it.danieleverducci.nextcloudmaps.R;
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
*/
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);
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;
});
}
}
@@ -2,7 +2,6 @@ package it.danieleverducci.nextcloudmaps.utils;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.util.Log; import android.util.Log;
import it.danieleverducci.nextcloudmaps.R; import it.danieleverducci.nextcloudmaps.R;
@@ -24,16 +23,10 @@ public class IntentGenerator {
public static Intent newGeoUriIntent(Context context, Geofavorite item) { public static Intent newGeoUriIntent(Context context, Geofavorite item) {
Intent i = new Intent(); Intent i = new Intent();
i.setAction(Intent.ACTION_VIEW); i.setAction(Intent.ACTION_VIEW);
i.setData(isGoogleMapsInstalled(context) ? item.getGmapsUri() : item.getGeoUri()); i.setData(
SettingsManager.isUseGoogleMaps(context)
? item.getGmapsUri() : item.getGeoUri()
);
return i; 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;
}
}
} }
@@ -2,6 +2,7 @@ package it.danieleverducci.nextcloudmaps.utils;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import androidx.preference.PreferenceManager; import androidx.preference.PreferenceManager;
import it.danieleverducci.nextcloudmaps.activity.main.GeofavoriteAdapter; import it.danieleverducci.nextcloudmaps.activity.main.GeofavoriteAdapter;
@@ -12,6 +13,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_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_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_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) { public static int getGeofavoriteListSortBy(Context context) {
return PreferenceManager.getDefaultSharedPreferences(context) return PreferenceManager.getDefaultSharedPreferences(context)
@@ -47,6 +49,16 @@ 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) { public static void setLastMapPosition(Context context, double lat, double lng, double zoom) {
PreferenceManager.getDefaultSharedPreferences(context).edit() PreferenceManager.getDefaultSharedPreferences(context).edit()
.putFloat(SETTING_LAST_MAP_POSITION_LAT, (float)lat) .putFloat(SETTING_LAST_MAP_POSITION_LAT, (float)lat)
@@ -54,4 +66,13 @@ public class SettingsManager {
.putFloat(SETTING_LAST_MAP_POSITION_ZOOM, (float)zoom) .putFloat(SETTING_LAST_MAP_POSITION_ZOOM, (float)zoom)
.apply(); .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;
}
}
} }
@@ -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>
@@ -0,0 +1,81 @@
<?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>
+7 -7
View File
@@ -23,6 +23,7 @@
<!-- Login Activity --> <!-- Login Activity -->
<string name="choose_account">Scegli account</string> <string name="choose_account">Scegli account</string>
<string name="login_error">Si è verificato un errore durante la login</string>
<!-- Geofavorites list --> <!-- Geofavorites list -->
<string name="new_geobookmark">Nuovo geosegnalibro</string> <string name="new_geobookmark">Nuovo geosegnalibro</string>
@@ -81,9 +82,9 @@
<string name="about_version_title">Versione</string> <string name="about_version_title">Versione</string>
<string name="about_version">Stai usando la versione &lt;strong>%1$s&lt;/strong></string> <string name="about_version">Stai usando la versione &lt;strong>%1$s&lt;/strong></string>
<string name="about_source_title">Codice sorgente</string> <string name="about_source_title">Codice sorgente</string>
<string name="about_source">Questo progetto è disponibile su GitHub: &lt;a href="%1$s">%1$s&lt;/a></string> <string name="about_source">Il codice sorgente è disponibile su: &lt;a href="%1$s">%1$s&lt;/a></string>
<string name="about_issues_title">Segnalazioni</string> <string name="about_issues_title">Segnalazioni</string>
<string name="about_issues">Puoi segnalare bugs, proporre migliorie o richiedere nuove funzionalità sul GitHub issue tracker: &lt;a href="%1$s">%1$s&lt;/a></string> <string name="about_issues">Puoi segnalare bugs, proporre migliorie o richiedere nuove funzionalità sull\'issue tracker: &lt;a href="%1$s">%1$s&lt;/a></string>
<string name="about_maps_title">Mappe</string> <string name="about_maps_title">Mappe</string>
<string name="about_maps">Questa app usa i server e le tiles di OpenStreetMap. Non accetto donazioni per questa app, ma raccomando piuttosto di donare a &lt;a href="%1$s">OpenStreetMap&lt;/a>, poiché questa applicazione non potrebbe esistere senza di loro.</string> <string name="about_maps">Questa app usa i server e le tiles di OpenStreetMap. Non accetto donazioni per questa app, ma raccomando piuttosto di donare a &lt;a href="%1$s">OpenStreetMap&lt;/a>, poiché questa applicazione non potrebbe esistere senza di loro.</string>
<string name="about_app_license_title">Licenza</string> <string name="about_app_license_title">Licenza</string>
@@ -94,11 +95,10 @@
<string name="common_yes">Si</string> <string name="common_yes">Si</string>
<string name="common_cancel">Annulla</string> <string name="common_cancel">Annulla</string>
<!-- URLs --> <!-- Settings -->
<string name="url_source" translatable="false">https://github.com/penguin86/nextcloud-maps-client</string> <string name="settings">Impostazioni</string>
<string name="url_issues" translatable="false">https://github.com/penguin86/nextcloud-maps-client/issues</string> <string name="settings_use_google_maps">Apri sempre con Google Maps</string>
<string name="url_license" translatable="false">https://raw.githubusercontent.com/penguin86/nextcloud-maps-client/master/LICENSE</string> <string name="settings_use_google_maps_summary">Quando disabilitato, verrà usato un Geo URI generico così da poter aprire la posizione con la vostra app preferita</string>
<string name="url_maps" translatable="false">https://donate.openstreetmap.org</string>
<!-- Menu --> <!-- Menu -->
<string name="new_geobookmark_gps">Crea dalla posizione corrente</string> <string name="new_geobookmark_gps">Crea dalla posizione corrente</string>
+11 -5
View File
@@ -22,6 +22,7 @@
<!-- Login Activity --> <!-- Login Activity -->
<string name="choose_account">Choose account</string> <string name="choose_account">Choose account</string>
<string name="login_error">An error has occurred during the login</string>
<!-- Geofavorites list --> <!-- Geofavorites list -->
<string name="new_geobookmark">New geofavorite</string> <string name="new_geobookmark">New geofavorite</string>
@@ -80,9 +81,9 @@
<string name="about_version_title">Version</string> <string name="about_version_title">Version</string>
<string name="about_version">You are currently using &lt;strong>%1$s&lt;/strong></string> <string name="about_version">You are currently using &lt;strong>%1$s&lt;/strong></string>
<string name="about_source_title">Source code</string> <string name="about_source_title">Source code</string>
<string name="about_source">This project is hosted on GitHub: &lt;a href="%1$s">%1$s&lt;/a></string> <string name="about_source">The source code is available at: &lt;a href="%1$s">%1$s&lt;/a></string>
<string name="about_issues_title">Issues</string> <string name="about_issues_title">Issues</string>
<string name="about_issues">You can report bugs, enhancement proposals and feature requests at the GitHub issue tracker: &lt;a href="%1$s">%1$s&lt;/a></string> <string name="about_issues">You can report bugs, enhancement proposals and feature requests on the issue tracker: &lt;a href="%1$s">%1$s&lt;/a></string>
<string name="about_maps_title">Maps</string> <string name="about_maps_title">Maps</string>
<string name="about_maps">This app uses Open Street Maps tiles and servers to display the map. I do not accept any donation for this app, but strongly encourage to make any donation to &lt;a href="%1$s">OpenStreetMap&lt;/a>, as this application could not exist without them.</string> <string name="about_maps">This app uses Open Street Maps tiles and servers to display the map. I do not accept any donation for this app, but strongly encourage to make any donation to &lt;a href="%1$s">OpenStreetMap&lt;/a>, as this application could not exist without them.</string>
<string name="about_app_license_title">App license</string> <string name="about_app_license_title">App license</string>
@@ -94,11 +95,16 @@
<string name="common_cancel">Cancel</string> <string name="common_cancel">Cancel</string>
<!-- URLs --> <!-- URLs -->
<string name="url_source" translatable="false">https://github.com/penguin86/nextcloud-maps-client</string> <string name="url_source" translatable="false">https://git.ichibi.eu/penguin86/nextcloud-maps-client/</string>
<string name="url_issues" translatable="false">https://github.com/penguin86/nextcloud-maps-client/issues</string> <string name="url_issues" translatable="false">https://git.ichibi.eu/penguin86/nextcloud-maps-client/issues</string>
<string name="url_license" translatable="false">https://raw.githubusercontent.com/penguin86/nextcloud-maps-client/master/LICENSE</string> <string name="url_license" translatable="false">https://git.ichibi.eu/penguin86/nextcloud-maps-client/raw/branch/master/LICENSE</string>
<string name="url_maps" translatable="false">https://donate.openstreetmap.org</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 --> <!-- Menu -->
<string name="new_geobookmark_gps">New from current position</string> <string name="new_geobookmark_gps">New from current position</string>
<string name="new_geobookmark_map">New from map</string> <string name="new_geobookmark_map">New from map</string>
+3 -3
View File
@@ -22,10 +22,10 @@
buildscript { buildscript {
repositories { repositories {
google() google()
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.5.1' classpath 'com.android.tools.build:gradle:9.4.1'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@@ -35,7 +35,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
google() google()
jcenter() mavenCentral()
} }
} }
@@ -0,0 +1,2 @@
Android 16 compatibility
Migrated away from GitHub
+11 -2
View File
@@ -37,6 +37,15 @@ org.gradle.jvmargs=-Xmx2048m
android.useAndroidX=true android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX # Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false android.nonTransitiveRClass=false
android.nonFinalResIds=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
+4 -3
View File
@@ -1,6 +1,7 @@
#Sun Feb 20 08:50:37 CET 2022 #Thu Nov 19 22:11:06 CET 2026
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists distributionSha256Sum=bbaeb2fef8710818cf0e261201dab964c572f92b942812df0c3620d62a529a01
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists