diff --git a/.idea/compiler.xml b/.idea/compiler.xml index b86273d..bcf4711 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/README.md b/README.md index 89f7670..6359996 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,6 @@ # Nextcloud Maps Geofavorites Android app [Get it on F-Droid](https://f-droid.org/it/packages/it.danieleverducci.nextcloudmaps) -[](https://play.google.com/store/apps/details?id=it.danieleverducci.nextcloudmaps) -[](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. diff --git a/app/build.gradle b/app/build.gradle index 6d23be6..e12a706 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,10 +21,10 @@ android { defaultConfig { applicationId "it.danieleverducci.nextcloudmaps" minSdkVersion 23 - targetSdkVersion 34 - compileSdkVersion 34 + targetSdkVersion 36 + compileSdkVersion 37 versionCode 10 - versionName "0.4.1" + 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 { diff --git a/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/NextcloudMapsStyledActivity.java b/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/NextcloudMapsStyledActivity.java index f5b6a0a..fcc4307 100644 --- a/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/NextcloudMapsStyledActivity.java +++ b/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/NextcloudMapsStyledActivity.java @@ -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 diff --git a/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/about/AboutActivity.java b/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/about/AboutActivity.java index e157b74..09a23ba 100644 --- a/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/about/AboutActivity.java +++ b/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/about/AboutActivity.java @@ -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); diff --git a/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/main/MainActivity.java b/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/main/MainActivity.java index ff89b8e..5b63e2f 100644 --- a/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/main/MainActivity.java +++ b/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/main/MainActivity.java @@ -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) diff --git a/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/mappicker/MapPickerActivity.java b/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/mappicker/MapPickerActivity.java index 821ac31..71fcc12 100644 --- a/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/mappicker/MapPickerActivity.java +++ b/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/mappicker/MapPickerActivity.java @@ -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); } /** diff --git a/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/settings/SettingsActivity.java b/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/settings/SettingsActivity.java index 93068de..0db81e2 100644 --- a/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/settings/SettingsActivity.java +++ b/app/src/main/java/it/danieleverducci/nextcloudmaps/activity/settings/SettingsActivity.java @@ -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); diff --git a/app/src/main/java/it/danieleverducci/nextcloudmaps/utils/EdgeToEdgeUtils.java b/app/src/main/java/it/danieleverducci/nextcloudmaps/utils/EdgeToEdgeUtils.java new file mode 100644 index 0000000..a1f99d0 --- /dev/null +++ b/app/src/main/java/it/danieleverducci/nextcloudmaps/utils/EdgeToEdgeUtils.java @@ -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; + }); + } +} + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d77a0af..ef310a0 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -82,9 +82,9 @@ Versione Stai usando la versione <strong>%1$s</strong> Codice sorgente - Questo progetto è disponibile su GitHub: <a href="%1$s">%1$s</a> + Il codice sorgente è disponibile su: <a href="%1$s">%1$s</a> Segnalazioni - Puoi segnalare bugs, proporre migliorie o richiedere nuove funzionalità sul GitHub issue tracker: <a href="%1$s">%1$s</a> + Puoi segnalare bugs, proporre migliorie o richiedere nuove funzionalità sull\'issue tracker: <a href="%1$s">%1$s</a> Mappe 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. Licenza @@ -95,11 +95,10 @@ Si Annulla - - https://github.com/penguin86/nextcloud-maps-client - https://github.com/penguin86/nextcloud-maps-client/issues - https://raw.githubusercontent.com/penguin86/nextcloud-maps-client/master/LICENSE - https://donate.openstreetmap.org + + Impostazioni + Apri sempre con Google Maps + Quando disabilitato, verrà usato un Geo URI generico così da poter aprire la posizione con la vostra app preferita Crea dalla posizione corrente diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9009224..a4fe1d9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -81,9 +81,9 @@ Version You are currently using <strong>%1$s</strong> Source code - This project is hosted on GitHub: <a href="%1$s">%1$s</a> + The source code is available at: <a href="%1$s">%1$s</a> Issues - You can report bugs, enhancement proposals and feature requests at the GitHub issue tracker: <a href="%1$s">%1$s</a> + You can report bugs, enhancement proposals and feature requests on the issue tracker: <a href="%1$s">%1$s</a> 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. App license @@ -95,9 +95,9 @@ Cancel - https://github.com/penguin86/nextcloud-maps-client - https://github.com/penguin86/nextcloud-maps-client/issues - https://raw.githubusercontent.com/penguin86/nextcloud-maps-client/master/LICENSE + https://git.ichibi.eu/penguin86/nextcloud-maps-client/ + https://git.ichibi.eu/penguin86/nextcloud-maps-client/issues + https://git.ichibi.eu/penguin86/nextcloud-maps-client/raw/branch/master/LICENSE https://donate.openstreetmap.org diff --git a/build.gradle b/build.gradle index b8b855b..f3aa296 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:9.3.0' + 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 diff --git a/fastlane/metadata/android/en-US/changelogs/10.txt b/fastlane/metadata/android/en-US/changelogs/10.txt new file mode 100644 index 0000000..b0964b6 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/10.txt @@ -0,0 +1,2 @@ +Android 16 compatibility +Migrated away from GitHub diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6f3e321..8dc02ba 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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.5.0-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