diff --git a/app/src/main/ic_bench-web.png b/app/src/main/ic_bench-web.png new file mode 100644 index 0000000..fc141aa --- /dev/null +++ b/app/src/main/ic_bench-web.png Binary files differ diff --git a/app/src/main/ic_rock-web.png b/app/src/main/ic_rock-web.png new file mode 100644 index 0000000..759bfff --- /dev/null +++ b/app/src/main/ic_rock-web.png Binary files differ diff --git a/app/src/main/ic_roofed-web.png b/app/src/main/ic_roofed-web.png new file mode 100644 index 0000000..378292c --- /dev/null +++ b/app/src/main/ic_roofed-web.png Binary files differ diff --git a/app/src/main/ic_table-web.png b/app/src/main/ic_table-web.png new file mode 100644 index 0000000..c76ee04 --- /dev/null +++ b/app/src/main/ic_table-web.png Binary files differ diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java index ce99285..ec24925 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java @@ -88,13 +88,15 @@ private String[] pathOptions; private String[] pathDescs; private Integer[] pathOptionImgs; + private String[] breakPointOptions; + private Integer[] breakPointOptionsImgs; private String[] entries; private Integer[] entryImgs; private Integer[] fountainImgs; private DrawerLayout drawerLayout; private ListView listView; - private List[] poiMarkers; + private List[] poiMarkers; private String provider; private Location mLocation; @@ -145,6 +147,13 @@ R.mipmap.path_giddiness, R.mipmap.path_climbing }; + breakPointOptions = res.getStringArray(R.array.break_point_dialog_options); + breakPointOptionsImgs = new Integer[]{ + R.mipmap.ic_rock, + R.mipmap.ic_bench, + R.mipmap.ic_table, + R.mipmap.ic_roofed + }; entries = res.getStringArray(R.array.toggleEntries); entryImgs = new Integer[]{ @@ -281,7 +290,7 @@ //tv.setTypeface(tf); Toaster("You disabled " + entries[position]); for(int i=0; i(); @@ -433,7 +442,8 @@ .setAdapter(new ImageListAdapter(MainActivity.this, entries, entryImgs), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - switch (which) { + int type = getType(which); + switch (type) { case Types.FOUNTAIN: AddFountainDialog addFountainDialog = new AddFountainDialog(); addFountainDialog.show(getFragmentManager(), "Add fountain POI Dialog"); @@ -441,6 +451,26 @@ case Types.PATH: AddPathDialog addPathDialog = new AddPathDialog(); addPathDialog.show(getFragmentManager(), "Add Path POI Dialog"); + break; + case Types.BREAK_POINT: + AddBreakpointDialog addBreakpointDialog = new AddBreakpointDialog(); + addBreakpointDialog.show(getFragmentManager(), "Add Break point POI Dialog"); + break; + case Types.TRASH_BIN: + addPoi(Types.TRASH_BIN); + break; + case Types.PIC: + addPoi(Types.PIC); + break; + case Types.CELL_RECEPTION: + addPoi(Types.CELL_RECEPTION); + break; + case Types.WIFI: + addPoi(Types.WIFI); + break; + case Types.LIFT: + addPoi(Types.LIFT); + break; } } }); @@ -504,7 +534,37 @@ public void onClick(DialogInterface dialog, int which) { } }) - //TODO replace by own checkable adapter with imageviews + .setAdapter(adapter, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + } + }); + return builder.create(); + } + } + + public class AddBreakpointDialog extends DialogFragment { + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + final List mSelectedItems = new ArrayList<>(); + final CheckboxImageAdapter adapter = new CheckboxImageAdapter(MainActivity.this, breakPointOptions, null, breakPointOptionsImgs); + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + builder.setTitle(R.string.break_point_dialog_title) + .setIcon(res.getDrawable(R.drawable.break_point)) + .setPositiveButton(R.string.ok_button, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + int[] options = adapter.getCheckedItems(); + int _type = Types.BREAK_POINT; + long rowId = addPoi(_type); + dbHandler.addPoiOptions(rowId, options); + } + }) + .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) { diff --git a/app/src/main/res/mipmap-hdpi/ic_bench.png b/app/src/main/res/mipmap-hdpi/ic_bench.png new file mode 100644 index 0000000..77d7922 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_bench.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_rock.png b/app/src/main/res/mipmap-hdpi/ic_rock.png new file mode 100644 index 0000000..8545eea --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_rock.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_roofed.png b/app/src/main/res/mipmap-hdpi/ic_roofed.png new file mode 100644 index 0000000..41a0d74 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_roofed.png Binary files differ diff --git a/app/src/main/res/mipmap-hdpi/ic_table.png b/app/src/main/res/mipmap-hdpi/ic_table.png new file mode 100644 index 0000000..98e7752 --- /dev/null +++ b/app/src/main/res/mipmap-hdpi/ic_table.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_bench.png b/app/src/main/res/mipmap-mdpi/ic_bench.png new file mode 100644 index 0000000..c84fd3b --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_bench.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_rock.png b/app/src/main/res/mipmap-mdpi/ic_rock.png new file mode 100644 index 0000000..653c629 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_rock.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_roofed.png b/app/src/main/res/mipmap-mdpi/ic_roofed.png new file mode 100644 index 0000000..99fd030 --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_roofed.png Binary files differ diff --git a/app/src/main/res/mipmap-mdpi/ic_table.png b/app/src/main/res/mipmap-mdpi/ic_table.png new file mode 100644 index 0000000..a41997a --- /dev/null +++ b/app/src/main/res/mipmap-mdpi/ic_table.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_bench.png b/app/src/main/res/mipmap-xhdpi/ic_bench.png new file mode 100644 index 0000000..0ed9414 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_bench.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_rock.png b/app/src/main/res/mipmap-xhdpi/ic_rock.png new file mode 100644 index 0000000..09fa0e9 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_rock.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_roofed.png b/app/src/main/res/mipmap-xhdpi/ic_roofed.png new file mode 100644 index 0000000..2417647 --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_roofed.png Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_table.png b/app/src/main/res/mipmap-xhdpi/ic_table.png new file mode 100644 index 0000000..11c492a --- /dev/null +++ b/app/src/main/res/mipmap-xhdpi/ic_table.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_bench.png b/app/src/main/res/mipmap-xxhdpi/ic_bench.png new file mode 100644 index 0000000..dcbd739 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_bench.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_rock.png b/app/src/main/res/mipmap-xxhdpi/ic_rock.png new file mode 100644 index 0000000..6152484 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_rock.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_roofed.png b/app/src/main/res/mipmap-xxhdpi/ic_roofed.png new file mode 100644 index 0000000..8e21c27 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_roofed.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_table.png b/app/src/main/res/mipmap-xxhdpi/ic_table.png new file mode 100644 index 0000000..e116b11 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ic_table.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_bench.png b/app/src/main/res/mipmap-xxxhdpi/ic_bench.png new file mode 100644 index 0000000..15ebe4b --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_bench.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_rock.png b/app/src/main/res/mipmap-xxxhdpi/ic_rock.png new file mode 100644 index 0000000..1aced6c --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_rock.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_roofed.png b/app/src/main/res/mipmap-xxxhdpi/ic_roofed.png new file mode 100644 index 0000000..3a2d377 --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_roofed.png Binary files differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_table.png b/app/src/main/res/mipmap-xxxhdpi/ic_table.png new file mode 100644 index 0000000..160c47e --- /dev/null +++ b/app/src/main/res/mipmap-xxxhdpi/ic_table.png Binary files differ diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index a6b7c7e..210fe57 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -6,6 +6,7 @@ Welche Art von POI möchtest du hinzufügen? Größe der Quelle Weg-Eigenschaften + Art des Pausenorts Navigationsdrawer öffnen Navigationsdrawer schließen Information @@ -45,4 +46,10 @@ Gibt an ob man für diesen Weg Schwindelfrei sein muss Gibt an ob man auf diesem Weg klettern muss + + Steine + Bank + Bank & Tisch + überdacht + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 32deda2..8ce8857 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,6 +6,7 @@ What kind of POI do you want to add? Size of the fountain Path characteristics + Kind of the break point Open navigation drawer Close navigation drawer Information @@ -45,4 +46,10 @@ If giddiness If climbing + + Stones + Bench + Bench & table + Roofed +