Skip to content

Commit

Permalink
Release version 0.10
Browse files Browse the repository at this point in the history
  • Loading branch information
Teester committed Feb 13, 2018
2 parents ef25f59 + 0647ca0 commit a2d8cf7
Show file tree
Hide file tree
Showing 6 changed files with 110 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ android {
applicationId 'com.teester.whatsnearby'
minSdkVersion 21
targetSdkVersion 27
versionCode 9
versionName "0.9"
versionCode 10
versionName "0.10"
setProperty("archivesBaseName", "whatsnearby-$versionName")
}
buildTypes {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
import android.location.Location;
import android.os.Build;
import android.os.IBinder;
import android.support.annotation.Nullable;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v4.graphics.drawable.DrawableCompat;

import com.mapzen.android.lost.api.LocationListener;
import com.mapzen.android.lost.api.LocationRequest;
Expand Down Expand Up @@ -52,10 +50,6 @@ public void onLocationChanged(Location location) {
*/
private static Bitmap getBitmapFromVectorDrawable(Context context, int drawableId) {
Drawable drawable = ContextCompat.getDrawable(context, drawableId);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
drawable = (DrawableCompat.wrap(drawable)).mutate();
}

Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(),
drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(bitmap);
Expand Down Expand Up @@ -89,8 +83,10 @@ public int onStartCommand(Intent intent, int flags, int startId) {
@Override
public void onDestroy() {
super.onDestroy();
LocationServices.FusedLocationApi.removeLocationUpdates(client, listener);
client.disconnect();
if (client.isConnected()) {
LocationServices.FusedLocationApi.removeLocationUpdates(client, listener);
client.disconnect();
}
}

@Override
Expand Down Expand Up @@ -127,8 +123,6 @@ public void onConnectionSuspended() {

@Override
public void performOverpassQuery(final Location location) {
// UseCaseHandler useCaseHandler = UseCaseHandler.getInstance();

SourceContract.Overpass overpassQuery = new QueryOverpass(getApplicationContext());
new Thread(new Runnable() {
@Override
Expand All @@ -137,19 +131,6 @@ public void run() {
overpassQuery.queryOverpass(location.getLatitude(), location.getLongitude(), location.getAccuracy());
}
}).start();

// QueryOverpass.response response = overpassQuery.response;
// useCaseHandler.execute(overpassQuery, response, new UseCase.UseCaseCallback<String>() {
// @Override
// public void onSuccess(String response) {
// Log.w(TAG, response);
// }
//
// @Override
// public void onError() {
// Log.w(TAG, "Error");
// }
// });
}

public void checkLocationPermission() {
Expand Down
49 changes: 49 additions & 0 deletions app/src/main/res/values-de-rDE/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="wheelchair">Ist %s rollstuhlgerecht?</string>
<string name="wheelchair_toilets">Hat %s behindertengerechte Toiletten?</string>
<string name="outdoor_seating">Hat %s Sitzgelegenheiten im Freien?</string>
<string name="wifi">Hat %s Wifi für Kunden?</string>
<string name="wifi_fee">Zählt %s für den WLAN-Zugang?</string>
<string name="vegetarian">Ist %s auf Vegetarier ausgerichtet?</string>
<string name="vegan">Bietet %s Veganer?</string>
<string name="men">Bietet %s Männer an?</string>
<string name="women">Bietet %s Frauen an?</string>
<string name="drive_through">Hat %s eine Durchfahrt?</string>
<string name="takeaway">Bietet %s zum Mitnehmen?</string>
<string name="deliver">Liefert %s?</string>
<string name="reservation">Benötigt %s eine Reservierung?</string>
<string name="cash">Nimmt %s Bargeld?</string>
<string name="cheques">Übernimmt %s Kontrollen?</string>
<string name="credit_card">Nimmt %s Kreditkarten an?</string>
<string name="debit_card">Nimmt %s Debitkarten an?</string>
<string name="contactless">Bietet %s kontaktlos?</string>
<string name="dispensing">Gibt %s Rezepte aus?</string>
<string name="yes">Ja</string>
<string name="no">Nein</string>
<string name="unsure">Nicht sicher</string>
<string name="nothere">Ich bin nicht in %s</string>
<string name="distance_away">%.0fm entfernt</string>
<string name="at_location">Bei %s?</string>
<string name="answer_questions">Beantworte Fragen, um OpenStreetMap zu helfen.</string>
<string name="ok">OK</string>
<string name="not_here">Ich bin nicht hier</string>
<string name="halal">Bietet %s Halal Fleisch?</string>
<string name="kosher">Bietet %s koschere Produkte?</string>
<string name="organic">Verkauft Centra Bio-Produkte?</string>
<string name="upload_thanks">Danke für die Antwort. Ihre Antworten haben geholfen, OpenStreetmap für alle zu verbessern</string>
<string name="authorise_openstreetmap">Autorisieren Sie OpenStreetmap</string>
<string name="not_logged_in">Sie sind nicht bei OpenStreetmap angemeldet. Ihre Antworten können erst hochgeladen werden, nachdem Sie sich eingeloggt haben. Bitte klicken Sie auf die Schaltfläche unten, um sich anzumelden oder ein Konto bei OpenStreetMap anzulegen</string>
<string name="osm_login_description">Bevor Sie Fragen beantworten können, müssen Sie sich bei Ihrem OpenStreetMap-Konto anmelden.</string>
<string name="osm_login_button">Logge dich bei OpenStreetMap ein</string>
<string name="select_current_location">Nicht bei %s? Wählen Sie den Ort, an dem Sie sich gerade befinden</string>
<string name="none_of_these_places">Keiner dieser Orte</string>
<string name="check_pois_instruction">Klicken Sie auf die Schaltfläche unten, um nach interessanten Orten in der Nähe Ihres aktuellen Standorts zu suchen.</string>
<string name="check_now_button">Jetzt prüfen!</string>
<string name="logged_in_as">Sie sind derzeit bei OpenStreetMap angemeldet. Was ist in der Nähe? benachrichtigt Sie, wenn Sie sich an einem Ort befinden, an dem Informationen in OpenStreetMap fehlen.</string>
<string name="log_out">Ausloggen</string>
<string name="changeset_comment">Details zu %s hinzugefügt</string>
<string name="close">Schließen</string>
<string name="others_have_answered_this_question">Andere haben diese Frage mit ‘%s’ beantwortet</string>
<string name="intro_answer_questions">Fragen beantworten</string>
</resources>
49 changes: 49 additions & 0 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="wheelchair">%s est-il accessible aux fauteuils roulants?</string>
<string name="wheelchair_toilets">Est-ce que %s a des toilettes accessibles aux fauteuils roulants?</string>
<string name="outdoor_seating">Est-ce que %s a des sièges d\'extérieur?</string>
<string name="wifi">Est-ce que %s a le Wifi pour les clients?</string>
<string name="wifi_fee">Est-ce que %s facture un accès wifi?</string>
<string name="vegetarian">Est-ce que %s répond aux besoins des végétariens?</string>
<string name="vegan">Est-ce que %s répond aux besoins des végétaliens?</string>
<string name="men">Est-ce que %s répond aux hommes?</string>
<string name="women">Est-ce que %s s\'adresse aux femmes?</string>
<string name="drive_through">Est-ce que %s a un drive-through?</string>
<string name="takeaway">%s propose-t-il des plats à emporter?</string>
<string name="deliver">Est-ce que %s livre?</string>
<string name="reservation">Est-ce que %s nécessite une réservation?</string>
<string name="cash">Est-ce que %s prend de l\'argent?</string>
<string name="cheques">Est-ce que %s prend des chèques?</string>
<string name="credit_card">Est-ce que %s prend des cartes de crédit?</string>
<string name="debit_card">Est-ce que %s prend des cartes de débit?</string>
<string name="contactless">Est-ce que %s offre sans contact?</string>
<string name="dispensing">%s dispense-t-il des prescriptions?</string>
<string name="yes">Oui</string>
<string name="no">Non</string>
<string name="unsure">Pas certain</string>
<string name="nothere">Je ne suis pas à %s</string>
<string name="distance_away">À %.0fm</string>
<string name="at_location">Chez %s?</string>
<string name="answer_questions">Répondez aux questions pour aider OpenStreetMap.</string>
<string name="ok">D\'accord</string>
<string name="not_here">Je ne suis pas là</string>
<string name="halal">Est-ce que %s offre des viandes halal?</string>
<string name="kosher">Est-ce que %s propose des produits casher?</string>
<string name="organic">Est-ce que %s vend des produits biologiques?</string>
<string name="upload_thanks">Merci de répondre. Vos réponses ont contribué à améliorer OpenStreetmap pour tout le monde</string>
<string name="authorise_openstreetmap">Autoriser OpenStreetmap</string>
<string name="not_logged_in">Vous n\'êtes pas connecté à OpenStreetmap. Vos réponses ne peuvent être téléchargées tant que vous n\'êtes pas connecté. Veuillez cliquer sur le bouton ci-dessous pour vous connecter ou créer un compte avec OpenStreetMap</string>
<string name="osm_login_description">Avant de pouvoir répondre à vos questions, vous devez vous connecter à votre compte OpenStreetMap.</string>
<string name="osm_login_button">Se connecter à OpenStreetMap</string>
<string name="select_current_location">Pas à %s?\\nSélectionnez l\'endroit où vous vous trouvez actuellement</string>
<string name="none_of_these_places">Aucun de ces endroits</string>
<string name="check_pois_instruction">Cliquez sur le bouton ci-dessous pour vérifier les points d\'intérêt autour de votre position actuelle.</string>
<string name="check_now_button">Vérifie maintenant!</string>
<string name="logged_in_as">Vous êtes actuellement connecté à OpenStreetMap.\nWhat\'s Nearby? vous avertira lorsque vous vous trouvez dans un endroit où des informations sont manquantes dans OpenStreetMap.</string>
<string name="log_out">Connectez - Out</string>
<string name="close">Fermer</string>
<string name="changeset_comment">Ajout de détails à %s</string>
<string name="others_have_answered_this_question">D\'autres ont répondu ‘%s’ à cette question</string>
<string name="intro_answer_questions">Répondez aux questions</string>
</resources>
10 changes: 5 additions & 5 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<resources>
<string name="app_name">What\'s Nearby?</string>
<string name="title_activity_questions">QuestionsActivity</string>
<string name="app_name" translatable="false">What\'s Nearby?</string>
<string name="title_activity_questions" translatable="false">QuestionsActivity</string>

<!-- Questions -->
<string name="wheelchair">Is %s wheelchair accessible?</string>
Expand All @@ -24,7 +24,7 @@
<string name="dispensing">Does %s dispense prescriptions?</string>


<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="hello_blank_fragment" translatable="false">Hello blank fragment</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="unsure">Not sure</string>
Expand All @@ -38,7 +38,7 @@
<string name="kosher">Does %s offer kosher produce?</string>
<string name="organic">Does %s sell organic produce?</string>
<string name="upload_thanks">Thanks for answering. Your answers have helped to improve OpenStreetmap for everyone</string>
<string name="icon_content_description">icon</string>
<string name="icon_content_description" translatable="false">icon</string>
<string name="authorise_openstreetmap">Authorise OpenStreetmap</string>
<string name="not_logged_in">You are not logged into OpenStreetmap. Your answers cannot be uploaded until you have logged in. Please press the button below to log in or create an account with OpenStreetMap</string>
<string name="osm_login_description">Before you can answer any questions, you must log in to your OpenStreetMap account.</string>
Expand All @@ -50,7 +50,7 @@
<string name="logged_in_as">You are currently logged in to OpenStreetMap.\nWhat\'s Nearby? will notify you when you\'re in a location where there is missing information in OpenStreetMap.</string>
<string name="log_out">Log Out</string>
<string name="changeset_comment">Added details to %s</string>
<string name="changeset_source">survey</string>
<string name="changeset_source" translatable="false">survey</string>
<string name="close">Close</string>
<string name="others_have_answered_this_question">Others have answered ‘%s’ to this question</string>
<string name="intro_answer_questions">Answer Questions</string>
Expand Down

0 comments on commit a2d8cf7

Please sign in to comment.