Small fixes

This commit is contained in:
2026-04-16 01:08:09 +02:00
parent 4ef2d837fa
commit 139e148fb2
14 changed files with 15 additions and 23 deletions

View File

@@ -1,4 +1,4 @@
package eu.konggdev.strikemaps.helper; package eu.konggdev.strikemaps.data.helper;
import android.content.res.AssetManager; import android.content.res.AssetManager;
import android.os.Environment; import android.os.Environment;

View File

@@ -1,4 +1,4 @@
package eu.konggdev.strikemaps.helper; package eu.konggdev.strikemaps.data.helper;
import android.content.SharedPreferences; import android.content.SharedPreferences;

View File

@@ -1,4 +1,4 @@
package eu.konggdev.strikemaps.provider; package eu.konggdev.strikemaps.data.provider;
public class HttpDataProvider implements Provider { public class HttpDataProvider implements Provider {
//TODO //TODO

View File

@@ -1,4 +1,4 @@
package eu.konggdev.strikemaps.provider; package eu.konggdev.strikemaps.data.provider;
import android.Manifest; import android.Manifest;
import android.content.Context; import android.content.Context;

View File

@@ -1,4 +1,4 @@
package eu.konggdev.strikemaps.provider; package eu.konggdev.strikemaps.data.provider;
public interface Provider { public interface Provider {

View File

@@ -3,7 +3,7 @@ package eu.konggdev.strikemaps.map;
import java.util.*; import java.util.*;
import eu.konggdev.strikemaps.Component; import eu.konggdev.strikemaps.Component;
import eu.konggdev.strikemaps.ui.factory.AlertDialogFactory; 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.renderer.implementation.VtmRenderer;
import eu.konggdev.strikemaps.map.style.MapStyle; import eu.konggdev.strikemaps.map.style.MapStyle;
import org.maplibre.android.geometry.LatLng; import org.maplibre.android.geometry.LatLng;

View File

@@ -4,7 +4,7 @@ import org.maplibre.android.style.layers.Layer;
import org.maplibre.android.style.sources.GeoJsonSource; 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 (?) //Most likely implement an "AdditionalMapLayer" or something of that sorts (?)
public class MapLayer { public class MapLayer {
public GeoJsonSource source; public GeoJsonSource source;

View File

@@ -1,4 +1,4 @@
package eu.konggdev.strikemaps.map.overlay.overlay; package eu.konggdev.strikemaps.map.overlay.implementation;
import android.graphics.Color; import android.graphics.Color;
import android.location.Location; 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.layer.MapLayer;
import eu.konggdev.strikemaps.map.overlay.MapOverlay; 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.CircleLayer;
import org.maplibre.android.style.layers.Property; import org.maplibre.android.style.layers.Property;
import org.maplibre.android.style.sources.GeoJsonSource; import org.maplibre.android.style.sources.GeoJsonSource;

View File

@@ -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.layer.MapLayer;
import eu.konggdev.strikemaps.map.overlay.MapOverlay; import eu.konggdev.strikemaps.map.overlay.MapOverlay;

View File

@@ -6,8 +6,7 @@ import androidx.annotation.NonNull;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.ObjectNode;
import eu.konggdev.strikemaps.helper.FileHelper; import eu.konggdev.strikemaps.data.helper.UserPrefsHelper;
import eu.konggdev.strikemaps.helper.UserPrefsHelper;
import eu.konggdev.strikemaps.map.overlay.MapOverlay; import eu.konggdev.strikemaps.map.overlay.MapOverlay;
import eu.konggdev.strikemaps.map.layer.MapLayer; import eu.konggdev.strikemaps.map.layer.MapLayer;
import eu.konggdev.strikemaps.map.renderer.MapRenderer; import eu.konggdev.strikemaps.map.renderer.MapRenderer;

View File

@@ -2,15 +2,13 @@ package eu.konggdev.strikemaps.map.style;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.ObjectNode;
import eu.konggdev.strikemaps.app.AppController; 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 eu.konggdev.strikemaps.map.source.MapSource;
import org.json.JSONObject;
import java.util.*; import java.util.*;

View File

@@ -1,21 +1,16 @@
package eu.konggdev.strikemaps.ui.element.item; package eu.konggdev.strikemaps.ui.element.item;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.view.View; import android.view.View;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import eu.konggdev.strikemaps.R; 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.MapComponent;
import eu.konggdev.strikemaps.map.style.MapStyle; import eu.konggdev.strikemaps.map.style.MapStyle;
import eu.konggdev.strikemaps.ui.UIComponent; import eu.konggdev.strikemaps.ui.UIComponent;
import java.io.InputStream;
public class GenericItem implements UIItem { public class GenericItem implements UIItem {
@NonNull public String name; @NonNull public String name;
public Bitmap image; public Bitmap image;

View File

@@ -15,8 +15,8 @@ import android.widget.Toast;
import eu.konggdev.strikemaps.R; import eu.konggdev.strikemaps.R;
import eu.konggdev.strikemaps.app.AppController; import eu.konggdev.strikemaps.app.AppController;
import eu.konggdev.strikemaps.helper.UserPrefsHelper; import eu.konggdev.strikemaps.data.helper.UserPrefsHelper;
import eu.konggdev.strikemaps.map.overlay.overlay.LocationOverlay; import eu.konggdev.strikemaps.map.overlay.implementation.LocationOverlay;
import eu.konggdev.strikemaps.ui.fragment.popup.FragmentMapChangePopup; import eu.konggdev.strikemaps.ui.fragment.popup.FragmentMapChangePopup;
public class FragmentLayoutControls extends Fragment implements Layout { public class FragmentLayoutControls extends Fragment implements Layout {

View File

@@ -9,7 +9,7 @@ import android.widget.LinearLayout;
import eu.konggdev.strikemaps.R; import eu.konggdev.strikemaps.R;
import eu.konggdev.strikemaps.app.AppController; 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.MapComponent;
import eu.konggdev.strikemaps.map.style.MapStyle; import eu.konggdev.strikemaps.map.style.MapStyle;