diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java index 4ccc2d6..2a8473a 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java @@ -12,7 +12,6 @@ import android.location.Location; import android.location.LocationListener; import android.location.LocationManager; -import android.os.Environment; import android.provider.Settings; import android.support.design.widget.FloatingActionButton; import android.support.v4.view.GravityCompat; @@ -50,7 +49,6 @@ import org.osmdroid.util.GeoPoint; import org.osmdroid.views.MapView; -import java.io.File; import java.util.List; public class MainActivity extends AppCompatActivity implements LocationListener { @@ -76,6 +74,7 @@ private MapView mapView; private IMapController mapController; + private int ZOOM_LEVEL; private ActionBarDrawerToggle drawerToggle; private String[] fountainSizes; @@ -98,12 +97,13 @@ dbHandler = new DatabaseHandler(this); + ZOOM_LEVEL = 18; mapView = new MapView(getApplicationContext(), 256); mapView.setTileSource(TileSourceFactory.MAPNIK); mapView.setBuiltInZoomControls(true); mapView.setMultiTouchControls(true); mapController = mapView.getController(); - mapController.setZoom(9); + mapController.setZoom(ZOOM_LEVEL); mapController.setCenter(new GeoPoint(37.9777, 23.7277)); frameLayout.addView(mapView); @@ -150,7 +150,7 @@ @Override public void onClick(View v) { if(mLocation == null){ - InformDialog informDialog = new InformDialog("Information", "Couldn't find your location! Please try again after your position has been found"); + InformDialog informDialog = new InformDialog(getString(R.string.inform_title), getString(R.string.inform_gps_pos_not_found)); informDialog.show(getFragmentManager(), "Inform Dialog"); } AddPoiDialog addPoiDialog = new AddPoiDialog(); @@ -236,7 +236,7 @@ Marker positionMarker = new Marker(mapView); positionMarker.setPosition(gp); positionMarker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM); - positionMarker.setTitle("Your Position"); + positionMarker.setTitle(getString(R.string.osm_marker_title)); positionMarker.setSnippet("Latitude: " + lat + "\n" + "Longitude: " + lon); mapView.getOverlays().add(positionMarker); mapView.invalidate(); @@ -262,7 +262,6 @@ t.printStackTrace(); } }); - Toaster("New Location: " + mLocation, true); } @Override @@ -295,7 +294,7 @@ builder.setTitle(title) .setMessage(msg) .setCancelable(false) - .setPositiveButton("Got it!", null); + .setPositiveButton(R.string.inform_positive_button, null); return builder.create(); } } @@ -337,6 +336,8 @@ Poi poi = new Poi(_lat, _lon, _alt, _type, _time); long rowId = dbHandler.addPoi(poi); + if(rowId >= 0) Toaster(getString(R.string.add_poi_success), true); + int size = 0; switch (which) { case 0: diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml new file mode 100644 index 0000000..f390338 --- /dev/null +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -0,0 +1,32 @@ + + + Mountain Navigation + Welche Art von POI möchtest du hinzufügen? + Größe der Quelle + Navigationsdrawer öffnen + Navigationsdrawer schließen + Information + Dein Standort konnte nicht ermittelt werden! Bitte versuche es nochmal, sobald dein Standort gefunden wurde. + Dein POI wurde erfolgreich hinzugefügt! + Verstanden! + Dein Standort + + Example action + Einstellungen + + + Quelle + Weg + Pausenort + Mülleimer + Bilder + Handyempfang + W-LAN + Lifte + + + Klein + Mittel + Groß + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8f21afc..c428d72 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,6 +5,11 @@ Size of the fountain Open navigation drawer Close navigation drawer + Information + Couldn\'t find your location! Please try again after your position has been found. + Sucessfully added your POI! + Got it! + Your position Example action Settings