diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/AboutActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/AboutActivity.java index e21f456..2042d56 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/AboutActivity.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/AboutActivity.java @@ -1,10 +1,3 @@ -package de.apps4ics.mountainnavigation; - -import android.app.Activity; -import android.os.Bundle; -import android.widget.ArrayAdapter; -import android.widget.ListView; - /** * This file is part of MountainNavigation. * @@ -25,6 +18,14 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation; + +import android.app.Activity; +import android.os.Bundle; +import android.widget.ArrayAdapter; +import android.widget.ListView; + public class AboutActivity extends Activity { @Override diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java index 8091409..99d6004 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java @@ -1,3 +1,24 @@ +/** + * This file is part of MountainNavigation. + * + * MountainNavigation is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * MountainNavigation is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with MountainNavigation. If not, see . + * + * @copyright Copyright (c) 2016 Vinzenz Rosenkanz + * + * @author Vinzenz Rosenkranz + */ + package de.apps4ics.mountainnavigation; import android.app.Activity; @@ -30,26 +51,6 @@ import de.apps4ics.mountainnavigation.handlers.WeatherHandler; -/** - * This file is part of MountainNavigation. - * - * MountainNavigation is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * MountainNavigation is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with MountainNavigation. If not, see . - * - * @copyright Copyright (c) 2016 Vinzenz Rosenkanz - * - * @author Vinzenz Rosenkranz - */ public class DownloadActivity extends Activity implements OnSingleWeatherRetrieved, OnWeatherRetrieved { LinearLayout dayLayout; SeekBar dayPicker; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/Features.java b/app/src/main/java/de/apps4ics/mountainnavigation/Features.java index b77425f..e02287e 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/Features.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/Features.java @@ -1,5 +1,3 @@ -package de.apps4ics.mountainnavigation; - /** * This file is part of MountainNavigation. * @@ -20,6 +18,9 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation; + public class Features { public static final int FOUNTAIN_SMALL = 0; //Size of fountain public static final int FOUNTAIN_MEDIUM = 1; //Size of fountain diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/InformDialog.java b/app/src/main/java/de/apps4ics/mountainnavigation/InformDialog.java index 0233828..f220909 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/InformDialog.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/InformDialog.java @@ -1,10 +1,3 @@ -package de.apps4ics.mountainnavigation; - -import android.app.AlertDialog; -import android.app.Dialog; -import android.app.DialogFragment; -import android.os.Bundle; - /** * This file is part of MountainNavigation. * @@ -25,6 +18,14 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation; + +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.DialogFragment; +import android.os.Bundle; + public class InformDialog extends DialogFragment { private String title; private String msg; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/InformListDialog.java b/app/src/main/java/de/apps4ics/mountainnavigation/InformListDialog.java index 3ef3469..96426a0 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/InformListDialog.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/InformListDialog.java @@ -1,12 +1,3 @@ -package de.apps4ics.mountainnavigation; - -import android.app.AlertDialog; -import android.app.Dialog; -import android.app.DialogFragment; -import android.content.DialogInterface; -import android.os.Bundle; -import android.widget.ListAdapter; - /** * This file is part of MountainNavigation. * @@ -27,6 +18,16 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation; + +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.DialogFragment; +import android.content.DialogInterface; +import android.os.Bundle; +import android.widget.ListAdapter; + public class InformListDialog extends DialogFragment { private String title; private ListAdapter adapter; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java index c96abdf..c0561e1 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java @@ -1,3 +1,24 @@ +/** + * This file is part of MountainNavigation. + * + * MountainNavigation is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * MountainNavigation is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with MountainNavigation. If not, see . + * + * @copyright Copyright (c) 2016 Vinzenz Rosenkanz + * + * @author Vinzenz Rosenkranz + */ + package de.apps4ics.mountainnavigation; import android.content.Context; @@ -25,11 +46,9 @@ import android.view.MenuItem; import android.view.View; import android.support.v4.widget.DrawerLayout; -import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.ListView; import android.widget.RelativeLayout; import android.widget.TableLayout; import android.widget.TableRow; @@ -56,27 +75,6 @@ import de.apps4ics.mountainnavigation.pois.Poi; import de.apps4ics.mountainnavigation.pois.Types; -/** - * This file is part of MountainNavigation. - * - * MountainNavigation is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * MountainNavigation is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with MountainNavigation. If not, see . - * - * @copyright Copyright (c) 2016 Vinzenz Rosenkanz - * - * @author Vinzenz Rosenkranz - */ - public class MainActivity extends AppCompatActivity implements LocationListener, OnSingleWeatherRetrieved { public static final String TAG = "MountainNavigation"; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MyPhoneStateListener.java b/app/src/main/java/de/apps4ics/mountainnavigation/MyPhoneStateListener.java index 5055f88..53e8073 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/MyPhoneStateListener.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/MyPhoneStateListener.java @@ -1,8 +1,3 @@ -package de.apps4ics.mountainnavigation; - -import android.telephony.PhoneStateListener; -import android.telephony.SignalStrength; - /** * This file is part of MountainNavigation. * @@ -23,6 +18,12 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation; + +import android.telephony.PhoneStateListener; +import android.telephony.SignalStrength; + public class MyPhoneStateListener extends PhoneStateListener { @Override public void onSignalStrengthsChanged(SignalStrength signalStrength) { diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MyWeather.java b/app/src/main/java/de/apps4ics/mountainnavigation/MyWeather.java index 72c0340..48b1248 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/MyWeather.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/MyWeather.java @@ -1,16 +1,3 @@ -package de.apps4ics.mountainnavigation; - -import android.graphics.drawable.Drawable; -import android.location.Location; - -import com.survivingwithandroid.weather.lib.WeatherCode; -import com.survivingwithandroid.weather.lib.model.DayForecast; -import com.survivingwithandroid.weather.lib.model.Weather; - -import java.util.Arrays; - -import de.apps4ics.mountainnavigation.handlers.WeatherHandler; - /** * This file is part of MountainNavigation. * @@ -31,6 +18,20 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation; + +import android.graphics.drawable.Drawable; +import android.location.Location; + +import com.survivingwithandroid.weather.lib.WeatherCode; +import com.survivingwithandroid.weather.lib.model.DayForecast; +import com.survivingwithandroid.weather.lib.model.Weather; + +import java.util.Arrays; + +import de.apps4ics.mountainnavigation.handlers.WeatherHandler; + public class MyWeather { private long timestamp; private float minTemp; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/OnSingleWeatherRetrieved.java b/app/src/main/java/de/apps4ics/mountainnavigation/OnSingleWeatherRetrieved.java index a3c42bc..e2fe95b 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/OnSingleWeatherRetrieved.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/OnSingleWeatherRetrieved.java @@ -1,5 +1,3 @@ -package de.apps4ics.mountainnavigation; - /** * This file is part of MountainNavigation. * @@ -20,6 +18,9 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation; + public interface OnSingleWeatherRetrieved { public MyWeather postRetrieve(MyWeather weather); } diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/OnWeatherRetrieved.java b/app/src/main/java/de/apps4ics/mountainnavigation/OnWeatherRetrieved.java index c929506..6c9e971 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/OnWeatherRetrieved.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/OnWeatherRetrieved.java @@ -1,7 +1,3 @@ -package de.apps4ics.mountainnavigation; - -import java.util.List; - /** * This file is part of MountainNavigation. * @@ -22,6 +18,11 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation; + +import java.util.List; + public interface OnWeatherRetrieved { public List postRetrieve(List weathers); } diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/SeekBarPreference.java b/app/src/main/java/de/apps4ics/mountainnavigation/SeekBarPreference.java index 0eb1a53..3b9d166 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/SeekBarPreference.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/SeekBarPreference.java @@ -1,15 +1,3 @@ -package de.apps4ics.mountainnavigation; - -import android.content.Context; -import android.content.res.TypedArray; -import android.util.AttributeSet; -import android.view.Gravity; -import android.view.View; -import android.preference.DialogPreference; -import android.widget.SeekBar; -import android.widget.TextView; -import android.widget.LinearLayout; - /** * This file is part of MountainNavigation. * @@ -30,6 +18,19 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation; + +import android.content.Context; +import android.content.res.TypedArray; +import android.util.AttributeSet; +import android.view.Gravity; +import android.view.View; +import android.preference.DialogPreference; +import android.widget.SeekBar; +import android.widget.TextView; +import android.widget.LinearLayout; + public class SeekBarPreference extends DialogPreference implements SeekBar.OnSeekBarChangeListener { private Context context; private int maxValue; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/SettingsActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/SettingsActivity.java index 678b970..60e329f 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/SettingsActivity.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/SettingsActivity.java @@ -1,17 +1,3 @@ -package de.apps4ics.mountainnavigation; - -import android.app.Activity; -import android.app.FragmentManager; -import android.app.FragmentTransaction; -import android.content.SharedPreferences; -import android.content.res.Resources; -import android.os.Bundle; -import android.preference.Preference; -import android.preference.PreferenceCategory; -import android.preference.PreferenceFragment; - -import de.apps4ics.mountainnavigation.handlers.WeatherHandler; - /** * This file is part of MountainNavigation. * @@ -32,6 +18,21 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation; + +import android.app.Activity; +import android.app.FragmentManager; +import android.app.FragmentTransaction; +import android.content.SharedPreferences; +import android.content.res.Resources; +import android.os.Bundle; +import android.preference.Preference; +import android.preference.PreferenceCategory; +import android.preference.PreferenceFragment; + +import de.apps4ics.mountainnavigation.handlers.WeatherHandler; + public class SettingsActivity extends Activity { @Override public void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/WeatherDatabase.java b/app/src/main/java/de/apps4ics/mountainnavigation/WeatherDatabase.java index 678f9fe..56f8eb0 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/WeatherDatabase.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/WeatherDatabase.java @@ -1,12 +1,3 @@ -package de.apps4ics.mountainnavigation; - -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteOpenHelper; -import android.location.Location; - /** * This file is part of MountainNavigation. * @@ -27,6 +18,16 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation; + +import android.content.ContentValues; +import android.content.Context; +import android.database.Cursor; +import android.database.sqlite.SQLiteDatabase; +import android.database.sqlite.SQLiteOpenHelper; +import android.location.Location; + public class WeatherDatabase extends SQLiteOpenHelper { private static final int DATABASE_VERSION = 1; private static final String DATABASE_NAME = "weathers.db"; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/adapters/CheckboxImageAdapter.java b/app/src/main/java/de/apps4ics/mountainnavigation/adapters/CheckboxImageAdapter.java index 3789262..4720359 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/adapters/CheckboxImageAdapter.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/adapters/CheckboxImageAdapter.java @@ -1,19 +1,3 @@ -package de.apps4ics.mountainnavigation.adapters; - -import android.app.Activity; -import android.graphics.drawable.Drawable; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; -import android.widget.CheckBox; -import android.widget.ImageView; -import android.widget.TableRow; -import android.widget.TextView; - -import de.apps4ics.mountainnavigation.MainActivity; -import de.apps4ics.mountainnavigation.R; - /** * This file is part of MountainNavigation. * @@ -34,6 +18,23 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.adapters; + +import android.app.Activity; +import android.graphics.drawable.Drawable; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.CheckBox; +import android.widget.ImageView; +import android.widget.TableRow; +import android.widget.TextView; + +import de.apps4ics.mountainnavigation.MainActivity; +import de.apps4ics.mountainnavigation.R; + public class CheckboxImageAdapter extends BaseAdapter { Activity context; boolean[] itemChecked; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/adapters/ImageListAdapter.java b/app/src/main/java/de/apps4ics/mountainnavigation/adapters/ImageListAdapter.java index 1f9b916..29d9959 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/adapters/ImageListAdapter.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/adapters/ImageListAdapter.java @@ -1,15 +1,3 @@ -package de.apps4ics.mountainnavigation.adapters; - -import android.app.Activity; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.ImageView; -import android.widget.TextView; - -import de.apps4ics.mountainnavigation.R; - /** * This file is part of MountainNavigation. * @@ -30,6 +18,19 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.adapters; + +import android.app.Activity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import de.apps4ics.mountainnavigation.R; + public class ImageListAdapter extends ArrayAdapter { private final Activity context; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/adapters/WarningListAdapter.java b/app/src/main/java/de/apps4ics/mountainnavigation/adapters/WarningListAdapter.java index 114eccf..68ae5ce 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/adapters/WarningListAdapter.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/adapters/WarningListAdapter.java @@ -1,15 +1,3 @@ -package de.apps4ics.mountainnavigation.adapters; - -import android.app.Activity; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.TextView; - -import de.apps4ics.mountainnavigation.MainActivity; -import de.apps4ics.mountainnavigation.R; - /** * This file is part of MountainNavigation. * @@ -30,6 +18,19 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.adapters; + +import android.app.Activity; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.TextView; + +import de.apps4ics.mountainnavigation.MainActivity; +import de.apps4ics.mountainnavigation.R; + public class WarningListAdapter extends ArrayAdapter { private final Activity context; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java index 5c1a5c3..b6a7f54 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java @@ -1,3 +1,24 @@ +/** + * This file is part of MountainNavigation. + * + * MountainNavigation is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * MountainNavigation is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with MountainNavigation. If not, see . + * + * @copyright Copyright (c) 2016 Vinzenz Rosenkanz + * + * @author Vinzenz Rosenkranz + */ + package de.apps4ics.mountainnavigation.handlers; import android.content.ContentValues; @@ -25,26 +46,6 @@ import de.apps4ics.mountainnavigation.pois.TrashBin; import de.apps4ics.mountainnavigation.pois.Wifi; -/** - * This file is part of MountainNavigation. - * - * MountainNavigation is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * MountainNavigation is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with MountainNavigation. If not, see . - * - * @copyright Copyright (c) 2016 Vinzenz Rosenkanz - * - * @author Vinzenz Rosenkranz - */ public class DatabaseHandler extends SQLiteOpenHelper { private static final int DATABASE_VERSION = 2; private static final float MAX_POI_DISTANCE = 12.5f; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/OsmHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/OsmHandler.java index 8e6e578..a50f257 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/OsmHandler.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/OsmHandler.java @@ -1,19 +1,3 @@ -package de.apps4ics.mountainnavigation.handlers; - -import android.os.AsyncTask; -import android.util.Log; - -import org.osmdroid.bonuspack.location.NominatimPOIProvider; -import org.osmdroid.bonuspack.location.POI; -import org.osmdroid.util.GeoPoint; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ExecutionException; - -import de.apps4ics.mountainnavigation.MainActivity; -import de.apps4ics.mountainnavigation.pois.Poi; - /** * This file is part of MountainNavigation. * @@ -34,6 +18,23 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.handlers; + +import android.os.AsyncTask; +import android.util.Log; + +import org.osmdroid.bonuspack.location.NominatimPOIProvider; +import org.osmdroid.bonuspack.location.POI; +import org.osmdroid.util.GeoPoint; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ExecutionException; + +import de.apps4ics.mountainnavigation.MainActivity; +import de.apps4ics.mountainnavigation.pois.Poi; + public class OsmHandler { public static final String OSM_TYPE_PATH = "path"; public static final String OSM_TYPE_SPRING = "spring"; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java index 88f6143..3531cd7 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/PoiHandler.java @@ -1,3 +1,24 @@ +/** + * This file is part of MountainNavigation. + * + * MountainNavigation is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * MountainNavigation is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with MountainNavigation. If not, see . + * + * @copyright Copyright (c) 2016 Vinzenz Rosenkanz + * + * @author Vinzenz Rosenkranz + */ + package de.apps4ics.mountainnavigation.handlers; import android.app.Activity; @@ -79,26 +100,6 @@ import de.apps4ics.mountainnavigation.pois.Types; import de.apps4ics.mountainnavigation.pois.Wifi; -/** - * This file is part of MountainNavigation. - * - * MountainNavigation is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * MountainNavigation is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with MountainNavigation. If not, see . - * - * @copyright Copyright (c) 2016 Vinzenz Rosenkanz - * - * @author Vinzenz Rosenkranz - */ public class PoiHandler { private static List[] poiMarkers; private Map> pois; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java index 1562a65..fa8640e 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java @@ -1,3 +1,24 @@ +/** + * This file is part of MountainNavigation. + * + * MountainNavigation is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * MountainNavigation is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with MountainNavigation. If not, see . + * + * @copyright Copyright (c) 2016 Vinzenz Rosenkanz + * + * @author Vinzenz Rosenkranz + */ + package de.apps4ics.mountainnavigation.handlers; import android.app.Activity; @@ -35,26 +56,6 @@ import de.apps4ics.mountainnavigation.WeatherDatabase; import de.apps4ics.mountainnavigation.adapters.WarningListAdapter; -/** - * This file is part of MountainNavigation. - * - * MountainNavigation is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * MountainNavigation is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with MountainNavigation. If not, see . - * - * @copyright Copyright (c) 2016 Vinzenz Rosenkanz - * - * @author Vinzenz Rosenkranz - */ public class WeatherHandler { private static final String API_KEY = "fd4034defae557fd5f2fdaaf73c3402c"; //OpenWeatherMap API Key private Context context; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/overlays/ImageDialogItemizedIconOverlay.java b/app/src/main/java/de/apps4ics/mountainnavigation/overlays/ImageDialogItemizedIconOverlay.java index 47ca378..8c89120 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/overlays/ImageDialogItemizedIconOverlay.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/overlays/ImageDialogItemizedIconOverlay.java @@ -1,20 +1,3 @@ -package de.apps4ics.mountainnavigation.overlays; - -import android.app.AlertDialog; -import android.content.Context; -import android.content.res.Resources; -import android.graphics.drawable.Drawable; - -import org.osmdroid.views.MapView; -import org.osmdroid.views.overlay.ItemizedIconOverlay; -import org.osmdroid.views.overlay.OverlayItem; - -import java.util.ArrayList; -import java.util.List; - -import de.apps4ics.mountainnavigation.MainActivity; -import de.apps4ics.mountainnavigation.R; - /** * This file is part of MountainNavigation. * @@ -35,6 +18,24 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.overlays; + +import android.app.AlertDialog; +import android.content.Context; +import android.content.res.Resources; +import android.graphics.drawable.Drawable; + +import org.osmdroid.views.MapView; +import org.osmdroid.views.overlay.ItemizedIconOverlay; +import org.osmdroid.views.overlay.OverlayItem; + +import java.util.ArrayList; +import java.util.List; + +import de.apps4ics.mountainnavigation.MainActivity; +import de.apps4ics.mountainnavigation.R; + public class ImageDialogItemizedIconOverlay extends ItemizedIconOverlay { private Context context; private AlertDialog alertDialog; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/overlays/MapDialogItemizedIconOverlay.java b/app/src/main/java/de/apps4ics/mountainnavigation/overlays/MapDialogItemizedIconOverlay.java index b37d1cf..742eff2 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/overlays/MapDialogItemizedIconOverlay.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/overlays/MapDialogItemizedIconOverlay.java @@ -1,3 +1,24 @@ +/** + * This file is part of MountainNavigation. + * + * MountainNavigation is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * MountainNavigation is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with MountainNavigation. If not, see . + * + * @copyright Copyright (c) 2016 Vinzenz Rosenkanz + * + * @author Vinzenz Rosenkranz + */ + package de.apps4ics.mountainnavigation.overlays; import android.app.AlertDialog; @@ -21,26 +42,6 @@ import de.apps4ics.mountainnavigation.MainActivity; import de.apps4ics.mountainnavigation.R; -/** - * This file is part of MountainNavigation. - * - * MountainNavigation is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * MountainNavigation is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with MountainNavigation. If not, see . - * - * @copyright Copyright (c) 2016 Vinzenz Rosenkanz - * - * @author Vinzenz Rosenkranz - */ public class MapDialogItemizedIconOverlay extends ItemizedIconOverlay { private Context context; private AlertDialog alertDialog; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddBreakpointDialog.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddBreakpointDialog.java index bc5ba61..af38ca1 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddBreakpointDialog.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddBreakpointDialog.java @@ -1,17 +1,3 @@ -package de.apps4ics.mountainnavigation.pois; - -import android.app.AlertDialog; -import android.app.Dialog; -import android.app.DialogFragment; -import android.content.DialogInterface; -import android.os.Bundle; - -import de.apps4ics.mountainnavigation.adapters.CheckboxImageAdapter; -import de.apps4ics.mountainnavigation.Features; -import de.apps4ics.mountainnavigation.MainActivity; -import de.apps4ics.mountainnavigation.R; -import de.apps4ics.mountainnavigation.handlers.PoiHandler; - /** * This file is part of MountainNavigation. * @@ -32,6 +18,21 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.pois; + +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.DialogFragment; +import android.content.DialogInterface; +import android.os.Bundle; + +import de.apps4ics.mountainnavigation.adapters.CheckboxImageAdapter; +import de.apps4ics.mountainnavigation.Features; +import de.apps4ics.mountainnavigation.MainActivity; +import de.apps4ics.mountainnavigation.R; +import de.apps4ics.mountainnavigation.handlers.PoiHandler; + public class AddBreakpointDialog extends DialogFragment { PoiHandler poiHandler; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddFountainDialog.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddFountainDialog.java index 1b42c92..f8c957d 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddFountainDialog.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddFountainDialog.java @@ -1,18 +1,3 @@ -package de.apps4ics.mountainnavigation.pois; - -import android.app.AlertDialog; -import android.app.Dialog; -import android.app.DialogFragment; -import android.content.DialogInterface; -import android.os.Bundle; -import android.util.Log; - -import de.apps4ics.mountainnavigation.Features; -import de.apps4ics.mountainnavigation.adapters.ImageListAdapter; -import de.apps4ics.mountainnavigation.MainActivity; -import de.apps4ics.mountainnavigation.R; -import de.apps4ics.mountainnavigation.handlers.PoiHandler; - /** * This file is part of MountainNavigation. * @@ -33,6 +18,22 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.pois; + +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.DialogFragment; +import android.content.DialogInterface; +import android.os.Bundle; +import android.util.Log; + +import de.apps4ics.mountainnavigation.Features; +import de.apps4ics.mountainnavigation.adapters.ImageListAdapter; +import de.apps4ics.mountainnavigation.MainActivity; +import de.apps4ics.mountainnavigation.R; +import de.apps4ics.mountainnavigation.handlers.PoiHandler; + public class AddFountainDialog extends DialogFragment { PoiHandler poiHandler; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddHutDialog.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddHutDialog.java index 920789f..d33adb0 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddHutDialog.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddHutDialog.java @@ -1,21 +1,3 @@ -package de.apps4ics.mountainnavigation.pois; - -import android.app.AlertDialog; -import android.app.Dialog; -import android.app.DialogFragment; -import android.content.DialogInterface; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.CheckBox; -import android.widget.EditText; -import android.widget.Spinner; - -import de.apps4ics.mountainnavigation.Features; -import de.apps4ics.mountainnavigation.MainActivity; -import de.apps4ics.mountainnavigation.R; -import de.apps4ics.mountainnavigation.handlers.PoiHandler; - /** * This file is part of MountainNavigation. * @@ -36,6 +18,25 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.pois; + +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.DialogFragment; +import android.content.DialogInterface; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.CheckBox; +import android.widget.EditText; +import android.widget.Spinner; + +import de.apps4ics.mountainnavigation.Features; +import de.apps4ics.mountainnavigation.MainActivity; +import de.apps4ics.mountainnavigation.R; +import de.apps4ics.mountainnavigation.handlers.PoiHandler; + public class AddHutDialog extends DialogFragment { PoiHandler poiHandler; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java index 80eea06..bd50e86 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java @@ -1,3 +1,24 @@ +/** + * This file is part of MountainNavigation. + * + * MountainNavigation is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * MountainNavigation is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with MountainNavigation. If not, see . + * + * @copyright Copyright (c) 2016 Vinzenz Rosenkanz + * + * @author Vinzenz Rosenkranz + */ + package de.apps4ics.mountainnavigation.pois; import android.app.AlertDialog; @@ -22,26 +43,6 @@ import de.apps4ics.mountainnavigation.R; import de.apps4ics.mountainnavigation.handlers.PoiHandler; -/** - * This file is part of MountainNavigation. - * - * MountainNavigation is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * MountainNavigation is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with MountainNavigation. If not, see . - * - * @copyright Copyright (c) 2016 Vinzenz Rosenkanz - * - * @author Vinzenz Rosenkranz - */ public class AddPathDialog extends DialogFragment { PoiHandler poiHandler; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPeakDialog.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPeakDialog.java index 6e263fd..9966e2d 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPeakDialog.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPeakDialog.java @@ -1,16 +1,3 @@ -package de.apps4ics.mountainnavigation.pois; - -import android.app.AlertDialog; -import android.app.Dialog; -import android.app.DialogFragment; -import android.content.DialogInterface; -import android.os.Bundle; -import android.widget.EditText; - -import de.apps4ics.mountainnavigation.MainActivity; -import de.apps4ics.mountainnavigation.R; -import de.apps4ics.mountainnavigation.handlers.PoiHandler; - /** * This file is part of MountainNavigation. * @@ -31,6 +18,20 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.pois; + +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.DialogFragment; +import android.content.DialogInterface; +import android.os.Bundle; +import android.widget.EditText; + +import de.apps4ics.mountainnavigation.MainActivity; +import de.apps4ics.mountainnavigation.R; +import de.apps4ics.mountainnavigation.handlers.PoiHandler; + public class AddPeakDialog extends DialogFragment { PoiHandler poiHandler; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/BreakPoint.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/BreakPoint.java index e0f4138..7ac1d82 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/BreakPoint.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/BreakPoint.java @@ -1,5 +1,3 @@ -package de.apps4ics.mountainnavigation.pois; - /** * This file is part of MountainNavigation. * @@ -20,6 +18,9 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.pois; + public class BreakPoint extends Poi { int stone; int bench; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/CellReception.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/CellReception.java index 6c8f983..73ff540 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/CellReception.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/CellReception.java @@ -1,5 +1,3 @@ -package de.apps4ics.mountainnavigation.pois; - /** * This file is part of MountainNavigation. * @@ -20,6 +18,9 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.pois; + public class CellReception extends Poi { int strength; String opName; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/DbGeoPoint.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/DbGeoPoint.java index 268e195..7a48a90 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/DbGeoPoint.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/DbGeoPoint.java @@ -1,7 +1,3 @@ -package de.apps4ics.mountainnavigation.pois; - -import org.osmdroid.util.GeoPoint; - /** * This file is part of MountainNavigation. * @@ -22,6 +18,11 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.pois; + +import org.osmdroid.util.GeoPoint; + public class DbGeoPoint extends Poi { private double lat; private double lon; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Fountain.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Fountain.java index a3a5a85..dfc1930 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Fountain.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Fountain.java @@ -1,5 +1,3 @@ -package de.apps4ics.mountainnavigation.pois; - /** * This file is part of MountainNavigation. * @@ -20,6 +18,9 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.pois; + public class Fountain extends Poi { int size; public Fountain(long _id){ diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Hut.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Hut.java index 53b4958..ba8d221 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Hut.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Hut.java @@ -1,5 +1,3 @@ -package de.apps4ics.mountainnavigation.pois; - /** * This file is part of MountainNavigation. * @@ -20,6 +18,9 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.pois; + public class Hut extends Poi { int huttype; int winterroom; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Image.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Image.java index e049076..109428b 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Image.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Image.java @@ -1,5 +1,3 @@ -package de.apps4ics.mountainnavigation.pois; - /** * This file is part of MountainNavigation. * @@ -20,6 +18,9 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.pois; + public class Image extends Poi { byte[] image; int associated_poi_type; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Lift.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Lift.java index cfa6d59..65b59df 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Lift.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Lift.java @@ -1,5 +1,3 @@ -package de.apps4ics.mountainnavigation.pois; - /** * This file is part of MountainNavigation. * @@ -20,6 +18,9 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.pois; + public class Lift extends Poi { DbGeoPoint end; long endGpId; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Options.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Options.java index 759cd09..a9edbad 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Options.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Options.java @@ -1,5 +1,3 @@ -package de.apps4ics.mountainnavigation.pois; - /** * This file is part of MountainNavigation. * @@ -20,5 +18,8 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.pois; + public class Options { } diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Path.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Path.java index 874b4cc..abd7609 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Path.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Path.java @@ -1,5 +1,3 @@ -package de.apps4ics.mountainnavigation.pois; - /** * This file is part of MountainNavigation. * @@ -20,6 +18,9 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.pois; + public class Path extends Poi { long gp_e_id; long length; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Peak.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Peak.java index c26067d..323615d 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Peak.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Peak.java @@ -1,5 +1,3 @@ -package de.apps4ics.mountainnavigation.pois; - /** * This file is part of MountainNavigation. * @@ -20,6 +18,9 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.pois; + public class Peak extends Poi { String name; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Poi.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Poi.java index 77c0b99..8b39401 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Poi.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Poi.java @@ -1,9 +1,3 @@ -package de.apps4ics.mountainnavigation.pois; - -import org.osmdroid.bonuspack.location.POI; - -import de.apps4ics.mountainnavigation.MainActivity; - /** * This file is part of MountainNavigation. * @@ -24,6 +18,13 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.pois; + +import org.osmdroid.bonuspack.location.POI; + +import de.apps4ics.mountainnavigation.MainActivity; + public class Poi { protected long _id; protected int _type; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/TrashBin.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/TrashBin.java index 22e67ed..fdbcee2 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/TrashBin.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/TrashBin.java @@ -1,5 +1,3 @@ -package de.apps4ics.mountainnavigation.pois; - /** * This file is part of MountainNavigation. * @@ -20,6 +18,9 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.pois; + public class TrashBin extends Poi { public TrashBin(long _id) { super(_id, Types.TRASH_BIN); diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Types.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Types.java index 61c2048..550676c 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Types.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Types.java @@ -1,5 +1,3 @@ -package de.apps4ics.mountainnavigation.pois; - /** * This file is part of MountainNavigation. * @@ -20,6 +18,9 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.pois; + public class Types { public static final int FOUNTAIN = 0; public static final int PATH = 1; diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Wifi.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Wifi.java index 9cfad38..1fc73f1 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Wifi.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Wifi.java @@ -1,5 +1,3 @@ -package de.apps4ics.mountainnavigation.pois; - /** * This file is part of MountainNavigation. * @@ -20,6 +18,9 @@ * * @author Vinzenz Rosenkranz */ + +package de.apps4ics.mountainnavigation.pois; + public class Wifi extends Poi { String ssid; int levels;