Compare commits
11
Commits
46da74fa89
...
v0.4.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7ec450f57e | ||
|
|
a16252413e | ||
|
|
a2d3a2bffe | ||
|
|
f5cde70d71 | ||
|
|
7e720353d0 | ||
|
|
796f658fc5 | ||
|
|
4a760a9297 | ||
|
|
7848f9ad2d | ||
|
|
230421065b | ||
|
|
e22e748b28 | ||
|
|
339ee7629b |
@@ -1,6 +1,7 @@
|
||||
*.iml
|
||||
.gradle
|
||||
/local.properties
|
||||
/.idea
|
||||
/.idea/caches
|
||||
/.idea/libraries
|
||||
/.idea/modules.xml
|
||||
|
||||
Generated
+1
-1
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<bytecodeTargetLevel target="21" />
|
||||
<bytecodeTargetLevel target="25" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -3,10 +3,6 @@
|
||||
# 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://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.
|
||||
Geofavorites can be opened in all apps supporting geo links (i.e. Google Maps, Organic Maps etc...).
|
||||
@@ -20,6 +16,9 @@ This work is heavily based on [matiasdelellis's Nextcloud SSO example](https://g
|
||||
|
||||
## 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.
|
||||
|
||||
+16
-16
@@ -21,10 +21,10 @@ android {
|
||||
defaultConfig {
|
||||
applicationId "it.danieleverducci.nextcloudmaps"
|
||||
minSdkVersion 23
|
||||
targetSdkVersion 34
|
||||
compileSdkVersion 34
|
||||
versionCode 9
|
||||
versionName "0.4.0"
|
||||
targetSdkVersion 36
|
||||
compileSdkVersion 37
|
||||
versionCode 10
|
||||
versionName "0.4.2"
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
@@ -59,34 +59,34 @@ 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.1.2")
|
||||
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
|
||||
|
||||
implementation 'com.android.support:design:34.0.0'
|
||||
implementation 'androidx.appcompat:appcompat:1.7.0'
|
||||
implementation 'androidx.recyclerview:recyclerview:1.3.2'
|
||||
implementation 'androidx.appcompat:appcompat:1.8.0'
|
||||
implementation 'androidx.recyclerview:recyclerview:1.4.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.swiperefreshlayout:swiperefreshlayout:1.1.0'
|
||||
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0'
|
||||
|
||||
// Retrofif2
|
||||
implementation 'com.squareup.retrofit2:retrofit:2.11.0'
|
||||
implementation 'com.squareup.retrofit2:converter-gson:2.6.1'
|
||||
implementation 'com.squareup.retrofit2:retrofit:3.0.0'
|
||||
implementation 'com.squareup.retrofit2:converter-gson:3.0.0'
|
||||
|
||||
// Nextcloud SSO
|
||||
implementation "com.github.nextcloud:Android-SingleSignOn:1.3.2"
|
||||
implementation "com.github.nextcloud:Android-SingleSignOn:1.3.5"
|
||||
|
||||
// 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+)
|
||||
implementation 'org.threeten:threetenbp:1.5.1'
|
||||
implementation 'org.threeten:threetenbp:1.7.5'
|
||||
|
||||
// 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)
|
||||
implementation 'com.squareup.picasso:picasso:2.8'
|
||||
implementation 'com.squareup.picasso:picasso:2.71828'
|
||||
|
||||
configurations.all {
|
||||
resolutionStrategy {
|
||||
|
||||
@@ -25,6 +25,8 @@
|
||||
|
||||
<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
|
||||
|
||||
+2
@@ -9,6 +9,8 @@ import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import org.osmdroid.views.overlay.TilesOverlay;
|
||||
|
||||
import it.danieleverducci.nextcloudmaps.utils.EdgeToEdgeUtils;
|
||||
|
||||
public class NextcloudMapsStyledActivity extends AppCompatActivity {
|
||||
|
||||
@Override
|
||||
|
||||
@@ -31,12 +31,14 @@ 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);
|
||||
|
||||
+4
-2
@@ -25,6 +25,7 @@ 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;
|
||||
@@ -101,7 +102,8 @@ public class LoginActivity extends NextcloudMapsStyledActivity {
|
||||
|
||||
@Override
|
||||
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) {
|
||||
e.printStackTrace();
|
||||
progress.setVisibility(View.GONE);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -49,6 +49,7 @@ import it.danieleverducci.nextcloudmaps.api.ApiProvider;
|
||||
import it.danieleverducci.nextcloudmaps.fragments.GeofavoriteListFragment;
|
||||
import it.danieleverducci.nextcloudmaps.fragments.GeofavoriteMapFragment;
|
||||
import it.danieleverducci.nextcloudmaps.repository.GeofavoriteRepository;
|
||||
import it.danieleverducci.nextcloudmaps.utils.EdgeToEdgeUtils;
|
||||
import it.danieleverducci.nextcloudmaps.utils.SettingsManager;
|
||||
|
||||
public class MainActivity extends NextcloudMapsStyledActivity {
|
||||
@@ -118,6 +119,7 @@ public class MainActivity extends NextcloudMapsStyledActivity {
|
||||
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_main);
|
||||
EdgeToEdgeUtils.clearSystemInsets(this);
|
||||
|
||||
boolean showMap = SettingsManager.isGeofavoriteListShownAsMap(this);
|
||||
if (showMap)
|
||||
|
||||
+2
@@ -32,6 +32,7 @@ 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;
|
||||
|
||||
@@ -70,6 +71,7 @@ public class MapPickerActivity extends NextcloudMapsStyledActivity {
|
||||
mViewHolder.centerMapOn(l.getLatitude(), l.getLongitude());
|
||||
|
||||
setContentView(mViewHolder.getRootView());
|
||||
EdgeToEdgeUtils.clearSystemInsets(this);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+2
@@ -25,6 +25,7 @@ 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 {
|
||||
@@ -32,6 +33,7 @@ public class SettingsActivity extends NextcloudMapsStyledActivity {
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_settings);
|
||||
EdgeToEdgeUtils.clearSystemInsets(this);
|
||||
|
||||
Toolbar toolbar = findViewById(R.id.toolbar);
|
||||
setSupportActionBar(toolbar);
|
||||
|
||||
@@ -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,6 +2,7 @@ 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;
|
||||
@@ -50,7 +51,7 @@ public class SettingsManager {
|
||||
|
||||
public static boolean isUseGoogleMaps(Context context) {
|
||||
return PreferenceManager.getDefaultSharedPreferences(context)
|
||||
.getBoolean(SETTING_USE_GOOGLE_MAPS, true);
|
||||
.getBoolean(SETTING_USE_GOOGLE_MAPS, isGoogleMapsInstalled(context));
|
||||
}
|
||||
|
||||
public static void setUseGoogleMaps(Context context, boolean value) {
|
||||
@@ -65,4 +66,13 @@ 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
|
||||
<!-- 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>
|
||||
@@ -81,9 +82,9 @@
|
||||
<string name="about_version_title">Versione</string>
|
||||
<string name="about_version">Stai usando la versione <strong>%1$s</strong></string>
|
||||
<string name="about_source_title">Codice sorgente</string>
|
||||
<string name="about_source">Questo progetto è disponibile su GitHub: <a href="%1$s">%1$s</a></string>
|
||||
<string name="about_source">Il codice sorgente è disponibile su: <a href="%1$s">%1$s</a></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: <a href="%1$s">%1$s</a></string>
|
||||
<string name="about_issues">Puoi segnalare bugs, proporre migliorie o richiedere nuove funzionalità sull\'issue tracker: <a href="%1$s">%1$s</a></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 <a href="%1$s">OpenStreetMap</a>, poiché questa applicazione non potrebbe esistere senza di loro.</string>
|
||||
<string name="about_app_license_title">Licenza</string>
|
||||
@@ -94,11 +95,10 @@
|
||||
<string name="common_yes">Si</string>
|
||||
<string name="common_cancel">Annulla</string>
|
||||
|
||||
<!-- URLs -->
|
||||
<string name="url_source" translatable="false">https://github.com/penguin86/nextcloud-maps-client</string>
|
||||
<string name="url_issues" translatable="false">https://github.com/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_maps" translatable="false">https://donate.openstreetmap.org</string>
|
||||
<!-- Settings -->
|
||||
<string name="settings">Impostazioni</string>
|
||||
<string name="settings_use_google_maps">Apri sempre con Google Maps</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>
|
||||
|
||||
<!-- Menu -->
|
||||
<string name="new_geobookmark_gps">Crea dalla posizione corrente</string>
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
|
||||
<!-- 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>
|
||||
@@ -80,9 +81,9 @@
|
||||
<string name="about_version_title">Version</string>
|
||||
<string name="about_version">You are currently using <strong>%1$s</strong></string>
|
||||
<string name="about_source_title">Source code</string>
|
||||
<string name="about_source">This project is hosted on GitHub: <a href="%1$s">%1$s</a></string>
|
||||
<string name="about_source">The source code is available at: <a href="%1$s">%1$s</a></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: <a href="%1$s">%1$s</a></string>
|
||||
<string name="about_issues">You can report bugs, enhancement proposals and feature requests on the issue tracker: <a href="%1$s">%1$s</a></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 <a href="%1$s">OpenStreetMap</a>, as this application could not exist without them.</string>
|
||||
<string name="about_app_license_title">App license</string>
|
||||
@@ -94,9 +95,9 @@
|
||||
<string name="common_cancel">Cancel</string>
|
||||
|
||||
<!-- URLs -->
|
||||
<string name="url_source" translatable="false">https://github.com/penguin86/nextcloud-maps-client</string>
|
||||
<string name="url_issues" translatable="false">https://github.com/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_source" translatable="false">https://git.ichibi.eu/penguin86/nextcloud-maps-client/</string>
|
||||
<string name="url_issues" translatable="false">https://git.ichibi.eu/penguin86/nextcloud-maps-client/issues</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>
|
||||
|
||||
<!-- Settings -->
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ buildscript {
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:9.2.1'
|
||||
classpath 'com.android.tools.build:gradle:9.4.1'
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
Android 16 compatibility
|
||||
Migrated away from GitHub
|
||||
+4
-3
@@ -1,6 +1,7 @@
|
||||
#Sun Feb 20 08:50:37 CET 2022
|
||||
#Thu Nov 19 22:11:06 CET 2026
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
|
||||
distributionPath=wrapper/dists
|
||||
zipStorePath=wrapper/dists
|
||||
distributionSha256Sum=bbaeb2fef8710818cf0e261201dab964c572f92b942812df0c3620d62a529a01
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
Reference in New Issue
Block a user