From 0ddb424854d550b831b327c99ae72fe60aeaa09c Mon Sep 17 00:00:00 2001 From: konggdev Date: Thu, 16 Apr 2026 01:08:09 +0200 Subject: [PATCH] Small fixes --- .../java/eu/konggdev/strikemaps/data/helper/FileHelper.java | 2 +- .../eu/konggdev/strikemaps/data/helper/UserPrefsHelper.java | 2 +- .../konggdev/strikemaps/data/provider/HttpDataProvider.java | 2 +- .../strikemaps/data/provider/LocationDataProvider.java | 2 +- .../java/eu/konggdev/strikemaps/data/provider/Provider.java | 2 +- .../main/java/eu/konggdev/strikemaps/map/MapComponent.java | 2 +- .../main/java/eu/konggdev/strikemaps/map/layer/MapLayer.java | 2 +- .../overlay/{overlay => implementation}/LocationOverlay.java | 4 ++-- .../{overlay => implementation}/PointSelectionOverlay.java | 2 +- .../map/renderer/implementation/MapLibreNativeRenderer.java | 3 +-- .../main/java/eu/konggdev/strikemaps/map/style/MapStyle.java | 4 +--- .../eu/konggdev/strikemaps/ui/element/item/GenericItem.java | 5 ----- .../ui/fragment/layout/FragmentLayoutControls.java | 4 ++-- .../strikemaps/ui/fragment/popup/FragmentMapChangePopup.java | 2 +- 14 files changed, 15 insertions(+), 23 deletions(-) rename app/src/main/java/eu/konggdev/strikemaps/map/overlay/{overlay => implementation}/LocationOverlay.java (94%) rename app/src/main/java/eu/konggdev/strikemaps/map/overlay/{overlay => implementation}/PointSelectionOverlay.java (80%) diff --git a/app/src/main/java/eu/konggdev/strikemaps/data/helper/FileHelper.java b/app/src/main/java/eu/konggdev/strikemaps/data/helper/FileHelper.java index 3228ab8..32ffaaa 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/data/helper/FileHelper.java +++ b/app/src/main/java/eu/konggdev/strikemaps/data/helper/FileHelper.java @@ -1,4 +1,4 @@ -package eu.konggdev.strikemaps.helper; +package eu.konggdev.strikemaps.data.helper; import android.content.res.AssetManager; import android.os.Environment; diff --git a/app/src/main/java/eu/konggdev/strikemaps/data/helper/UserPrefsHelper.java b/app/src/main/java/eu/konggdev/strikemaps/data/helper/UserPrefsHelper.java index d6c4951..085de01 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/data/helper/UserPrefsHelper.java +++ b/app/src/main/java/eu/konggdev/strikemaps/data/helper/UserPrefsHelper.java @@ -1,4 +1,4 @@ -package eu.konggdev.strikemaps.helper; +package eu.konggdev.strikemaps.data.helper; import android.content.SharedPreferences; diff --git a/app/src/main/java/eu/konggdev/strikemaps/data/provider/HttpDataProvider.java b/app/src/main/java/eu/konggdev/strikemaps/data/provider/HttpDataProvider.java index bca95ad..a36b710 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/data/provider/HttpDataProvider.java +++ b/app/src/main/java/eu/konggdev/strikemaps/data/provider/HttpDataProvider.java @@ -1,4 +1,4 @@ -package eu.konggdev.strikemaps.provider; +package eu.konggdev.strikemaps.data.provider; public class HttpDataProvider implements Provider { //TODO diff --git a/app/src/main/java/eu/konggdev/strikemaps/data/provider/LocationDataProvider.java b/app/src/main/java/eu/konggdev/strikemaps/data/provider/LocationDataProvider.java index 5424b64..1fb52b6 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/data/provider/LocationDataProvider.java +++ b/app/src/main/java/eu/konggdev/strikemaps/data/provider/LocationDataProvider.java @@ -1,4 +1,4 @@ -package eu.konggdev.strikemaps.provider; +package eu.konggdev.strikemaps.data.provider; import android.Manifest; import android.content.Context; diff --git a/app/src/main/java/eu/konggdev/strikemaps/data/provider/Provider.java b/app/src/main/java/eu/konggdev/strikemaps/data/provider/Provider.java index 270971f..ce9e717 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/data/provider/Provider.java +++ b/app/src/main/java/eu/konggdev/strikemaps/data/provider/Provider.java @@ -1,4 +1,4 @@ -package eu.konggdev.strikemaps.provider; +package eu.konggdev.strikemaps.data.provider; public interface Provider { diff --git a/app/src/main/java/eu/konggdev/strikemaps/map/MapComponent.java b/app/src/main/java/eu/konggdev/strikemaps/map/MapComponent.java index 37c7a7b..5356b01 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/map/MapComponent.java +++ b/app/src/main/java/eu/konggdev/strikemaps/map/MapComponent.java @@ -3,7 +3,7 @@ package eu.konggdev.strikemaps.map; import java.util.*; import eu.konggdev.strikemaps.Component; import eu.konggdev.strikemaps.ui.factory.AlertDialogFactory; -import eu.konggdev.strikemaps.helper.UserPrefsHelper; +import eu.konggdev.strikemaps.data.helper.UserPrefsHelper; import eu.konggdev.strikemaps.map.renderer.implementation.VtmRenderer; import eu.konggdev.strikemaps.map.style.MapStyle; import org.maplibre.android.geometry.LatLng; diff --git a/app/src/main/java/eu/konggdev/strikemaps/map/layer/MapLayer.java b/app/src/main/java/eu/konggdev/strikemaps/map/layer/MapLayer.java index 900259e..0b5ad2d 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/map/layer/MapLayer.java +++ b/app/src/main/java/eu/konggdev/strikemaps/map/layer/MapLayer.java @@ -4,7 +4,7 @@ import org.maplibre.android.style.layers.Layer; import org.maplibre.android.style.sources.GeoJsonSource; -//FIXME: Get rid of reliance on MapLibr +//FIXME: Get rid of reliance on MapLibre! //Most likely implement an "AdditionalMapLayer" or something of that sorts (?) public class MapLayer { public GeoJsonSource source; diff --git a/app/src/main/java/eu/konggdev/strikemaps/map/overlay/overlay/LocationOverlay.java b/app/src/main/java/eu/konggdev/strikemaps/map/overlay/implementation/LocationOverlay.java similarity index 94% rename from app/src/main/java/eu/konggdev/strikemaps/map/overlay/overlay/LocationOverlay.java rename to app/src/main/java/eu/konggdev/strikemaps/map/overlay/implementation/LocationOverlay.java index a4277be..64922cf 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/map/overlay/overlay/LocationOverlay.java +++ b/app/src/main/java/eu/konggdev/strikemaps/map/overlay/implementation/LocationOverlay.java @@ -1,4 +1,4 @@ -package eu.konggdev.strikemaps.map.overlay.overlay; +package eu.konggdev.strikemaps.map.overlay.implementation; import android.graphics.Color; import android.location.Location; @@ -9,7 +9,7 @@ import eu.konggdev.strikemaps.map.MapComponent; import eu.konggdev.strikemaps.map.layer.MapLayer; import eu.konggdev.strikemaps.map.overlay.MapOverlay; -import eu.konggdev.strikemaps.provider.LocationDataProvider; +import eu.konggdev.strikemaps.data.provider.LocationDataProvider; import org.maplibre.android.style.layers.CircleLayer; import org.maplibre.android.style.layers.Property; import org.maplibre.android.style.sources.GeoJsonSource; diff --git a/app/src/main/java/eu/konggdev/strikemaps/map/overlay/overlay/PointSelectionOverlay.java b/app/src/main/java/eu/konggdev/strikemaps/map/overlay/implementation/PointSelectionOverlay.java similarity index 80% rename from app/src/main/java/eu/konggdev/strikemaps/map/overlay/overlay/PointSelectionOverlay.java rename to app/src/main/java/eu/konggdev/strikemaps/map/overlay/implementation/PointSelectionOverlay.java index c9d7fef..152f480 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/map/overlay/overlay/PointSelectionOverlay.java +++ b/app/src/main/java/eu/konggdev/strikemaps/map/overlay/implementation/PointSelectionOverlay.java @@ -1,4 +1,4 @@ -package eu.konggdev.strikemaps.map.overlay.overlay; +package eu.konggdev.strikemaps.map.overlay.implementation; import eu.konggdev.strikemaps.map.layer.MapLayer; import eu.konggdev.strikemaps.map.overlay.MapOverlay; diff --git a/app/src/main/java/eu/konggdev/strikemaps/map/renderer/implementation/MapLibreNativeRenderer.java b/app/src/main/java/eu/konggdev/strikemaps/map/renderer/implementation/MapLibreNativeRenderer.java index 2b09d40..83be451 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/map/renderer/implementation/MapLibreNativeRenderer.java +++ b/app/src/main/java/eu/konggdev/strikemaps/map/renderer/implementation/MapLibreNativeRenderer.java @@ -6,8 +6,7 @@ import androidx.annotation.NonNull; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import eu.konggdev.strikemaps.helper.FileHelper; -import eu.konggdev.strikemaps.helper.UserPrefsHelper; +import eu.konggdev.strikemaps.data.helper.UserPrefsHelper; import eu.konggdev.strikemaps.map.overlay.MapOverlay; import eu.konggdev.strikemaps.map.layer.MapLayer; import eu.konggdev.strikemaps.map.renderer.MapRenderer; diff --git a/app/src/main/java/eu/konggdev/strikemaps/map/style/MapStyle.java b/app/src/main/java/eu/konggdev/strikemaps/map/style/MapStyle.java index 76e8cd5..f3e227b 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/map/style/MapStyle.java +++ b/app/src/main/java/eu/konggdev/strikemaps/map/style/MapStyle.java @@ -2,15 +2,13 @@ package eu.konggdev.strikemaps.map.style; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import eu.konggdev.strikemaps.app.AppController; -import eu.konggdev.strikemaps.helper.FileHelper; +import eu.konggdev.strikemaps.data.helper.FileHelper; import eu.konggdev.strikemaps.map.source.MapSource; -import org.json.JSONObject; import java.util.*; diff --git a/app/src/main/java/eu/konggdev/strikemaps/ui/element/item/GenericItem.java b/app/src/main/java/eu/konggdev/strikemaps/ui/element/item/GenericItem.java index ecbeb43..5c77772 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/ui/element/item/GenericItem.java +++ b/app/src/main/java/eu/konggdev/strikemaps/ui/element/item/GenericItem.java @@ -1,21 +1,16 @@ package eu.konggdev.strikemaps.ui.element.item; import android.graphics.Bitmap; -import android.graphics.BitmapFactory; import android.view.View; import android.widget.ImageButton; import android.widget.TextView; import androidx.annotation.NonNull; import eu.konggdev.strikemaps.R; -import eu.konggdev.strikemaps.app.AppController; -import eu.konggdev.strikemaps.helper.FileHelper; import eu.konggdev.strikemaps.map.MapComponent; import eu.konggdev.strikemaps.map.style.MapStyle; import eu.konggdev.strikemaps.ui.UIComponent; -import java.io.InputStream; - public class GenericItem implements UIItem { @NonNull public String name; public Bitmap image; diff --git a/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/layout/FragmentLayoutControls.java b/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/layout/FragmentLayoutControls.java index 1adb1e3..776dbda 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/layout/FragmentLayoutControls.java +++ b/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/layout/FragmentLayoutControls.java @@ -15,8 +15,8 @@ import android.widget.Toast; import eu.konggdev.strikemaps.R; import eu.konggdev.strikemaps.app.AppController; -import eu.konggdev.strikemaps.helper.UserPrefsHelper; -import eu.konggdev.strikemaps.map.overlay.overlay.LocationOverlay; +import eu.konggdev.strikemaps.data.helper.UserPrefsHelper; +import eu.konggdev.strikemaps.map.overlay.implementation.LocationOverlay; import eu.konggdev.strikemaps.ui.fragment.popup.FragmentMapChangePopup; public class FragmentLayoutControls extends Fragment implements Layout { diff --git a/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/popup/FragmentMapChangePopup.java b/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/popup/FragmentMapChangePopup.java index 0c070b3..c532883 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/popup/FragmentMapChangePopup.java +++ b/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/popup/FragmentMapChangePopup.java @@ -9,7 +9,7 @@ import android.widget.LinearLayout; import eu.konggdev.strikemaps.R; import eu.konggdev.strikemaps.app.AppController; -import eu.konggdev.strikemaps.helper.FileHelper; +import eu.konggdev.strikemaps.data.helper.FileHelper; import eu.konggdev.strikemaps.map.MapComponent; import eu.konggdev.strikemaps.map.style.MapStyle;