Merge branch 'release/1.0.10'

azavea · Jul 31, 2018 · 43474ec · 43474ec
2 parents 2cfa616 + 7f6f80b
commit 43474ec
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 33 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "org.gophillygo.app"
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 12
-        versionName "1.0.9"
+        versionCode 13
+        versionName "1.0.10"
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         javaCompileOptions {

diff --git a/app/src/main/java/org/gophillygo/app/tasks/AddGeofenceWorker.java b/app/src/main/java/org/gophillygo/app/tasks/AddGeofenceWorker.java
@@ -32,15 +32,14 @@ public class AddGeofenceWorker extends Worker {
     // https://developer.android.com/training/location/geofencing
     // Minimum radius should be at least 100 - 150, more for outdoors areas with no WiFi.
     // Greater values reduce battery consumption.
-    private static final int GEOFENCE_RADIUS_METERS = 300;
+    private static final int GEOFENCE_RADIUS_METERS = 800;
 
     // Send alert roughly after device has been in geofence for this long.
     // When we are using the DWELL filter, this is about when we will receive notifications.
-    // In development (DEBUG build), use no delay.
-    private static final int GEOFENCE_LOITERING_DELAY = BuildConfig.DEBUG ? 60000 : 180000; // 1 or 3 minutes
+    private static final int GEOFENCE_LOITERING_DELAY = 0;
 
     // Set responsiveness high to save battery
-    private static final int GEOFENCE_RESPONSIVENESS = BuildConfig.DEBUG ? 180000 : 300000; // 3 or 5 minutes
+    private static final int GEOFENCE_RESPONSIVENESS = BuildConfig.DEBUG ? 60000 : 180000; // 1 or 3 minutes
 
     private static final String LOG_LABEL = "AddGeofenceWorker";
     private static final int TRANSITION_BROADCAST_REQUEST_CODE = 42;

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -138,11 +138,10 @@
     <string name="search_provider_description">Places and Events around Greater Philadelphia</string>
     <string name="general_preferences_privacy_policy_url" translatable="false">https://gophillygo.org/privacy_policy</string>
     <string name="general_preferences_terms_of_service_url" translatable="false">https://gophillygo.org/terms_of_service</string>
-
-
+
     <!-- About page -->
     <string name="title_activity_app_info">About GoPhillyGo</string>
-    <string name="app_info_description">The Clean Air Council\'s GoPhillyGo mobile app highlights the greater Philadelphia area\'s best educational and recreational destinations and events. Browse through all the region’s options using a number of activity filters, such biking, hiking, and water recreation, and save places you’d like to go in order to be notified whenever you’re nearby. You can also find upcoming events and add them to your calendar directly from the app. Need help getting there? The app links out to our multimodal trip planner \u2014 combining biking, walking, and public transportation within one trip \u2014 to travel anywhere within the region without the use of a car. If you want to find an outdoor festival taking place this weekend or a place to learn or see something new whenever it’s convenient, we can help!</string>
+    <string name="app_info_description">The Clean Air Council\'s GoPhillyGo mobile app highlights the greater Philadelphia area\'s best educational and recreational destinations and events. Browse through all the region’s options using a number of activity filters such as biking, hiking, and water recreation, and save places you’d like to go in order to be notified whenever you’re nearby. You can also find upcoming events and add them to your calendar directly from the app. Need help getting there? The app links out to our multimodal trip planner \u2014 combining biking, walking, and public transportation within one trip \u2014 to travel anywhere within the region without the use of a car. If you want to find an outdoor festival taking place this weekend or a place to learn or see something new whenever it’s convenient, we can help!</string>
     <string name="app_info_root_site_link"><a href="https://gophillygo.org">GoPhillyGo website</a></string>
     <string name="app_info_blog_link"><a href="https://gophillygo.org/learn">GoPhillyGo blog</a></string>
     <string name="app_info_cac_link"><a href="https://cleanair.org/">Clean Air Council website</a></string>

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -1,28 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory
-        android:title="@string/general_preference_category"
-        android:key="@string/general_preferences_key">
-        <SwitchPreference
-            android:key="@string/general_preferences_allow_notifications_key"
-            android:defaultValue="true"
-            android:summary="@string/general_preference_notifications_summary"
-            android:title="@string/general_preference_notifications" />
-        <SwitchPreference
-            android:key="@string/general_preferences_fabric_logging_key"
-            android:title="@string/general_preference_fabric_logging"
-            android:summary="@string/general_preference_fabric_logging_summary"
-            android:defaultValue="false" />
-        <SwitchPreference
-            android:key="@string/general_preferences_send_flags_key"
-            android:defaultValue="false"
-            android:summary="@string/general_preferences_send_flags_summary"
-            android:title="@string/general_preferences_send_flags"  />
-        <Preference
-            android:key="@string/general_preferences_reset_uuid_key"
-            android:summary="@string/general_preferences_reset_uuid_summary"
-            android:title="@string/general_preferences_reset_uuid" />
-    </PreferenceCategory>
     <PreferenceCategory
         android:title="@string/preferences_fine_print"
         android:key="@string/preferences_fine_print_key">
@@ -53,5 +30,27 @@
                 android:targetClass="com.google.android.gms.oss.licenses.OssLicensesMenuActivity" />
         </Preference>
     </PreferenceCategory>
-
+    <PreferenceCategory
+        android:title="@string/general_preference_category"
+        android:key="@string/general_preferences_key">
+        <SwitchPreference
+            android:key="@string/general_preferences_allow_notifications_key"
+            android:defaultValue="true"
+            android:summary="@string/general_preference_notifications_summary"
+            android:title="@string/general_preference_notifications" />
+        <SwitchPreference
+            android:key="@string/general_preferences_fabric_logging_key"
+            android:title="@string/general_preference_fabric_logging"
+            android:summary="@string/general_preference_fabric_logging_summary"
+            android:defaultValue="false" />
+        <SwitchPreference
+            android:key="@string/general_preferences_send_flags_key"
+            android:defaultValue="false"
+            android:summary="@string/general_preferences_send_flags_summary"
+            android:title="@string/general_preferences_send_flags"  />
+        <Preference
+            android:key="@string/general_preferences_reset_uuid_key"
+            android:summary="@string/general_preferences_reset_uuid_summary"
+            android:title="@string/general_preferences_reset_uuid" />
+    </PreferenceCategory>
 </PreferenceScreen>