diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 646a89a..52d692d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,10 +1,10 @@
+ package="org.r3pek.pharmacies" android:versionCode="10" android:versionName="2.0.1" android:installLocation="auto">
-
-
-
+
+
+
@@ -13,10 +13,12 @@
+
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/bin/Farmacias.apk b/bin/Farmacias.apk
deleted file mode 100644
index 9d68c56..0000000
Binary files a/bin/Farmacias.apk and /dev/null differ
diff --git a/bin/classes.dex b/bin/classes.dex
deleted file mode 100644
index e18641d..0000000
Binary files a/bin/classes.dex and /dev/null differ
diff --git a/bin/resources.ap_ b/bin/resources.ap_
deleted file mode 100644
index 1946a08..0000000
Binary files a/bin/resources.ap_ and /dev/null differ
diff --git a/default.properties b/default.properties
index 5b3be86..a18e9af 100644
--- a/default.properties
+++ b/default.properties
@@ -7,7 +7,7 @@
# "build.properties", and override values to adapt the script to your
# project structure.
+# Project target.
+target=Google Inc.:Google APIs:8
# Indicates whether an apk should be generated for each density.
split.density=false
-# Project target.
-target=Google Inc.:Google APIs:4
diff --git a/libs/admob-sdk-android.jar b/libs/admob-sdk-android.jar
index e186671..c0fc34b 100644
Binary files a/libs/admob-sdk-android.jar and b/libs/admob-sdk-android.jar differ
diff --git a/res/values-en/strings.xml b/res/values/strings.xml
similarity index 84%
rename from res/values-en/strings.xml
rename to res/values/strings.xml
index 6864507..0ecb985 100644
--- a/res/values-en/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,6 @@
- Fármacias was developed by Carlos Silva and uses Sapo's services to fetch the information about the pharmacies. If the application was usefull, and if you want to, make a donation at www.r3pek.org. It also uses some icons from Yusuke Kamiyamane (p.yusukekamiyamane.com). Thanks.
+ Fármacias was developed by Carlos Silva and uses Sapo\'s services to fetch the information about the pharmacies. If the application was usefull, and if you want to, make a donation at www.r3pek.org. It also uses some icons from Yusuke Kamiyamane (p.yusukekamiyamane.com). Thanks.
Farmácias
General
Only display on Service
@@ -27,7 +27,7 @@
Settings
List
About
- You don't have any localization system active. Want to activate now?
+ You don\'t have any localization system active. Want to activate now?
Get GPS position
Set my location
Tap on the screen to select your location
diff --git a/src/org/r3pek/pharmacies/PharmacyInfo.java b/src/org/r3pek/pharmacies/PharmacyInfo.java
index 658d28e..cef96af 100644
--- a/src/org/r3pek/pharmacies/PharmacyInfo.java
+++ b/src/org/r3pek/pharmacies/PharmacyInfo.java
@@ -1,5 +1,7 @@
package org.r3pek.pharmacies;
+import com.admob.android.ads.AdView;
+
import org.r3pek.pharmacies.utils.GeoUtils;
import org.r3pek.pharmacies.utils.GlobalVars;
import org.r3pek.pharmacies.widgets.Arrow;
@@ -73,6 +75,8 @@ public class PharmacyInfo extends Activity {
public void onPause() {
arrowChangerSensor.delImage((Arrow)findViewById(R.id.ivInfoDirection));
sm.unregisterListener(arrowChangerSensor);
+ AdView ad = (AdView) findViewById(R.id.ad);
+ ad.cleanup();
super.onPause();
}
diff --git a/src/org/r3pek/pharmacies/utils/Positioner.java b/src/org/r3pek/pharmacies/utils/Positioner.java
index 9f8e19c..d9897d9 100644
--- a/src/org/r3pek/pharmacies/utils/Positioner.java
+++ b/src/org/r3pek/pharmacies/utils/Positioner.java
@@ -1,15 +1,14 @@
package org.r3pek.pharmacies.utils;
-import java.util.LinkedList;
+import com.google.android.maps.GeoPoint;
import android.content.Context;
import android.location.Location;
import android.location.LocationListener;
import android.location.LocationManager;
import android.os.Bundle;
-import android.util.Log;
-import com.google.android.maps.GeoPoint;
+import java.util.LinkedList;
public class Positioner implements LocationListener {
private Location currentLocation;
@@ -57,7 +56,6 @@ public class Positioner implements LocationListener {
public void requestUpdates() {
if (isUpdating) return;
- Log.d("Positioner", "Enabling location Updates");
if (getBestLocationProvider().equals(LocationManager.GPS_PROVIDER) && !hadGPSFix)
locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, this);
@@ -68,7 +66,6 @@ public class Positioner implements LocationListener {
public void cancelUpdates() {
if (!isUpdating) return;
- Log.d("Positioner", "Disabling location Updates");
locationManager.removeUpdates(this);
@@ -81,12 +78,10 @@ public class Positioner implements LocationListener {
}
public void registerNotification(OnPositionChangeListener object) {
- Log.d("Positioner", "Adding notification " + object.getClass().getCanonicalName());
toNotify.add(object);
}
public void unregisterNotification(OnPositionChangeListener object) {
- Log.d("Positioner", "Removing notification " + object.getClass().getCanonicalName());
toNotify.remove(object);
}
@@ -104,8 +99,6 @@ public class Positioner implements LocationListener {
@Override
public synchronized void onLocationChanged(Location location) {
- Log.d("Positioner", "New location arrived");
-
/* If we already have a GPS fix, discard Network locations */
if (hadGPSFix && location.getProvider().equals(LocationManager.NETWORK_PROVIDER))
return;
@@ -136,7 +129,6 @@ public class Positioner implements LocationListener {
@Override
public void onProviderEnabled(String provider) {
- Log.d("Positioner", "Provider enabled: " + provider);
initLocation();
}
@@ -145,7 +137,6 @@ public class Positioner implements LocationListener {
}
private synchronized void notifyAllClients() {
- Log.d("Positioner", "Notifying clients");
for (OnPositionChangeListener l : toNotify)
l.onLocationChange(currentGeoPoint, currentAccuracy);
}