Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7848f9ad2d |
Generated
+1
-1
@@ -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="25" />
|
<bytecodeTargetLevel target="21" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
+3
-3
@@ -21,10 +21,10 @@ android {
|
|||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "it.danieleverducci.nextcloudmaps"
|
applicationId "it.danieleverducci.nextcloudmaps"
|
||||||
minSdkVersion 23
|
minSdkVersion 23
|
||||||
targetSdkVersion 36
|
targetSdkVersion 34
|
||||||
compileSdkVersion 34
|
compileSdkVersion 34
|
||||||
versionCode 9
|
versionCode 10
|
||||||
versionName "0.4.0"
|
versionName "0.4.1"
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|||||||
-2
@@ -9,8 +9,6 @@ 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,14 +31,12 @@ 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);
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ 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 {
|
||||||
@@ -119,7 +118,6 @@ 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)
|
||||||
|
|||||||
-2
@@ -32,7 +32,6 @@ 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;
|
||||||
|
|
||||||
@@ -71,7 +70,6 @@ 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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
-2
@@ -25,7 +25,6 @@ import androidx.appcompat.widget.Toolbar;
|
|||||||
|
|
||||||
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;
|
|
||||||
import it.danieleverducci.nextcloudmaps.utils.SettingsManager;
|
import it.danieleverducci.nextcloudmaps.utils.SettingsManager;
|
||||||
|
|
||||||
public class SettingsActivity extends NextcloudMapsStyledActivity {
|
public class SettingsActivity extends NextcloudMapsStyledActivity {
|
||||||
@@ -33,7 +32,6 @@ public class SettingsActivity extends NextcloudMapsStyledActivity {
|
|||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_settings);
|
setContentView(R.layout.activity_settings);
|
||||||
EdgeToEdgeUtils.clearSystemInsets(this);
|
|
||||||
|
|
||||||
Toolbar toolbar = findViewById(R.id.toolbar);
|
Toolbar toolbar = findViewById(R.id.toolbar);
|
||||||
setSupportActionBar(toolbar);
|
setSupportActionBar(toolbar);
|
||||||
|
|||||||
@@ -1,50 +0,0 @@
|
|||||||
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;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+1
-1
@@ -25,7 +25,7 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:9.3.2'
|
classpath 'com.android.tools.build:gradle:9.3.0'
|
||||||
|
|
||||||
// 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
|
||||||
|
|||||||
Reference in New Issue
Block a user