diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java index ba03194..4ff2b71 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java @@ -75,6 +75,9 @@ private static final int GPS_MIN_TIME = 5000; private static final int GPS_MIN_DIST = 5; + private static SimpleDateFormat df_hm; + private static SimpleDateFormat df_full; + private Resources res; private FloatingActionButton fab; @@ -112,6 +115,9 @@ res = getResources(); + df_hm = new SimpleDateFormat(res.getString(R.string.date_format_hm)); + df_full = new SimpleDateFormat(res.getString(R.string.date_format_full)); + RelativeLayout relativeLayout = (RelativeLayout) findViewById(R.id.container); dbHandler = new DatabaseHandler(this); @@ -255,8 +261,8 @@ List tempPoiList = dbHandler.getPoiByType(type); for(int i=0; i optList = dbHandler.getPoiOptions(poi.getId()); @@ -385,8 +391,7 @@ public void onWeatherRetrieved(CurrentWeather weather) { Log.d(TAG, "City [" + weather.weather.location.getCity() + "] Current temp: " + weather.weather.temperature.getTemp()); - SimpleDateFormat sdf = new SimpleDateFormat("H:m"); - + /* String title = String.format("Weather for %s in %s", weather.weather.location.getCity(), weather.weather.location.getCountry()); String msg = String.format("%f%s (%f%s/%f%s)\nSunrise: %s\nSunset: %s\nRegion: %s\nPopulation: %d", weather.weather.temperature.getTemp(), @@ -395,13 +400,13 @@ weather.getUnit().tempUnit, weather.weather.temperature.getMaxTemp(), weather.getUnit().tempUnit, - sdf.format(new Date(weather.weather.location.getSunrise())), - sdf.format(new Date(weather.weather.location.getSunset())), + df_hm.format(new Date(weather.weather.location.getSunrise())), + df_hm.format(new Date(weather.weather.location.getSunset())), weather.weather.location.getRegion(), weather.weather.location.getPopulation()); InformDialog informWeatherDialog = new InformDialog(title, msg); - informWeatherDialog.show(getFragmentManager(), "Inform Dialog"); + informWeatherDialog.show(getFragmentManager(), "Inform Dialog");*/ } @Override @@ -420,17 +425,17 @@ @Override public void onStatusChanged(String provider, int status, Bundle extras) { - + Log.d(TAG, "onStatusChanged: " + provider + ", " + status); } @Override public void onProviderEnabled(String provider) { - + Log.d(TAG, "onProviderEnabled: " + provider); } @Override public void onProviderDisabled(String provider) { - + Log.d(TAG, "onProviderDisabled: " + provider); } public class InformDialog extends DialogFragment { @@ -448,7 +453,7 @@ builder.setTitle(title) .setMessage(msg) .setCancelable(false) - .setIcon(res.getDrawable(R.mipmap.ic_info_icon)) + //.setIcon(res.getDrawable(R.mipmap.ic_info_icon)) .setPositiveButton(R.string.inform_positive_button, null); return builder.create(); } @@ -459,7 +464,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setTitle(R.string.add_poi_dialog_title) - .setIcon(res.getDrawable(R.mipmap.ic_add_poi)) + //.setIcon(res.getDrawable(R.mipmap.ic_add_poi)) .setAdapter(new ImageListAdapter(MainActivity.this, entries, entryImgs), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { @@ -504,7 +509,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setTitle(R.string.fountain_size_dialog_title) - .setIcon(res.getDrawable(R.drawable.water)) + //.setIcon(res.getDrawable(R.drawable.water)) .setAdapter(new ImageListAdapter(MainActivity.this, fountainSizes, fountainImgs), new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { @@ -540,7 +545,7 @@ final CheckboxImageAdapter adapter = new CheckboxImageAdapter(MainActivity.this, pathOptions, pathDescs, pathOptionImgs); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setTitle(R.string.path_dialog_title) - .setIcon(res.getDrawable(R.drawable.path)) + //.setIcon(res.getDrawable(R.drawable.path)) .setPositiveButton(R.string.ok_button, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { @@ -571,7 +576,7 @@ 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)) + //.setIcon(res.getDrawable(R.drawable.break_point)) .setPositiveButton(R.string.ok_button, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 3a31830..ba5d317 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -13,7 +13,9 @@ Dein POI wurde erfolgreich hinzugefügt! Verstanden! Dein Standort - Latitude: %1$.03f<br/>Longitude: %2$.03f<br/>Höhe: %3$dm + Latitude: %1$.03f<br/>Longitude: %2$.03f<br/>Höhe: %3$dm<br/>Zeit: %4$s + H:m + d.MM.yyyy, HH:mm \'Uhr\' Example action Einstellungen diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e801037..30f7d43 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -14,7 +14,9 @@ Sucessfully added your POI! Got it! Your position - Latitude: %1$.03f<br/>Longitude: %2$.03f<br/>Höhe: %3$d meters + Latitude: %1$.03f<br/>Longitude: %2$.03f<br/>Altitude: %3$d meters<br/>Time: %4$s + h:m a + MM/d/yyyy, hh:mm a Example action Settings