diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDIalog.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDIalog.java deleted file mode 100644 index f93dc91..0000000 --- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDIalog.java +++ /dev/null @@ -1,134 +0,0 @@ -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 org.osmdroid.bonuspack.overlays.Polyline; -import org.osmdroid.bonuspack.routing.OSRMRoadManager; -import org.osmdroid.bonuspack.routing.Road; -import org.osmdroid.bonuspack.routing.RoadManager; -import org.osmdroid.util.GeoPoint; -import org.osmdroid.views.overlay.OverlayItem; - -import java.util.ArrayList; - -import de.apps4ics.mountainnavigation.CheckboxImageAdapter; -import de.apps4ics.mountainnavigation.Features; -import de.apps4ics.mountainnavigation.MainActivity; -import de.apps4ics.mountainnavigation.R; - -/** - * Created by Vinz on 03.11.2015. - */ -public class AddPathDialog extends DialogFragment { - MainActivity ma; - - public AddPathDialog(MainActivity ma){ - this.ma = ma; - } - - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - final CheckboxImageAdapter adapter = new CheckboxImageAdapter(getActivity(), ma.getPathOptions(), ma.getPathDescs(), ma.getPathOptionImgs()); - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - builder.setTitle(R.string.path_dialog_title) - .setPositiveButton(R.string.ok_button, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - int[] options = adapter.getCheckedItems(); - int exposed = 0; - int diffWet = 0; - int giddiness = 0; - int climbing = 0; - for (int i = 0; i < options.length; ++i) { - switch (options[i]) { - case 0: - options[i] = Features.PATH_EXPOSED; - exposed = 1; - break; - case 1: - options[i] = Features.PATH_DIFF_WET; - diffWet = 1; - break; - case 2: - options[i] = Features.PATH_GIDDINESS; - giddiness = 1; - break; - case 3: - options[i] = Features.PATH_CLIMBING; - climbing = 1; - break; - } - } - ArrayList pathMarkers = ma.getPathMarkers(); - - if(pathMarkers.size() < 2){ - Log.e(MainActivity.TAG, "One of the path markers in addPathDialog is null!"); - } - - RoadManager roadManager = new OSRMRoadManager(); - ArrayList waypoints = new ArrayList<>(); - DbGeoPoint current = null; - DbGeoPoint last = null; - boolean currentNew = false; - boolean lastNew = false; - for(int i=0; i()); - } - }) - .setNegativeButton(R.string.cancel_button, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - } - }) - .setAdapter(adapter, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - } - }); - return builder.create(); - } -} \ No newline at end of file diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java new file mode 100644 index 0000000..f93dc91 --- /dev/null +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPathDialog.java @@ -0,0 +1,134 @@ +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 org.osmdroid.bonuspack.overlays.Polyline; +import org.osmdroid.bonuspack.routing.OSRMRoadManager; +import org.osmdroid.bonuspack.routing.Road; +import org.osmdroid.bonuspack.routing.RoadManager; +import org.osmdroid.util.GeoPoint; +import org.osmdroid.views.overlay.OverlayItem; + +import java.util.ArrayList; + +import de.apps4ics.mountainnavigation.CheckboxImageAdapter; +import de.apps4ics.mountainnavigation.Features; +import de.apps4ics.mountainnavigation.MainActivity; +import de.apps4ics.mountainnavigation.R; + +/** + * Created by Vinz on 03.11.2015. + */ +public class AddPathDialog extends DialogFragment { + MainActivity ma; + + public AddPathDialog(MainActivity ma){ + this.ma = ma; + } + + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + final CheckboxImageAdapter adapter = new CheckboxImageAdapter(getActivity(), ma.getPathOptions(), ma.getPathDescs(), ma.getPathOptionImgs()); + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + builder.setTitle(R.string.path_dialog_title) + .setPositiveButton(R.string.ok_button, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + int[] options = adapter.getCheckedItems(); + int exposed = 0; + int diffWet = 0; + int giddiness = 0; + int climbing = 0; + for (int i = 0; i < options.length; ++i) { + switch (options[i]) { + case 0: + options[i] = Features.PATH_EXPOSED; + exposed = 1; + break; + case 1: + options[i] = Features.PATH_DIFF_WET; + diffWet = 1; + break; + case 2: + options[i] = Features.PATH_GIDDINESS; + giddiness = 1; + break; + case 3: + options[i] = Features.PATH_CLIMBING; + climbing = 1; + break; + } + } + ArrayList pathMarkers = ma.getPathMarkers(); + + if(pathMarkers.size() < 2){ + Log.e(MainActivity.TAG, "One of the path markers in addPathDialog is null!"); + } + + RoadManager roadManager = new OSRMRoadManager(); + ArrayList waypoints = new ArrayList<>(); + DbGeoPoint current = null; + DbGeoPoint last = null; + boolean currentNew = false; + boolean lastNew = false; + for(int i=0; i()); + } + }) + .setNegativeButton(R.string.cancel_button, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + } + }) + .setAdapter(adapter, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + } + }); + return builder.create(); + } +} \ No newline at end of file