Merge pull request #131 in MOB/climate-android from ~RJOSHI/climate-a…

…ndroid:BASIC-713 to master Squashed commit of the following: commit d58d2a7753eb6fb3b58aec69f827d45e3f7d3071 Author: Ram Joshi <ram@ramjoshi.com> Date: Tue Feb 24 09:25:42 2015 -0800 Removed extra newlines commit 76ad38e38a5613e52a6630ae8146dc52e4542568 Author: Ram Joshi <ram@ramjoshi.com> Date: Tue Feb 24 09:23:22 2015 -0800 Field card 2015 analytics Added tracking for + Show precip range + Hide precip range
MichaelBlume · Feb 24, 2015 · 5b29eef · 5b29eef
1 parent fd1a42f
commit 5b29eef
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 6 deletions.
diff --git a/ClimateGrowersProject/AndroidMapsExtensions/AndroidMapsExtensions.iml b/ClimateGrowersProject/AndroidMapsExtensions/AndroidMapsExtensions.iml
@@ -9,6 +9,7 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />

diff --git a/ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml b/ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
@@ -9,6 +9,7 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
@@ -79,7 +80,7 @@
     <orderEntry type="library" exported="" name="lolay-logjam-2" level="project" />
     <orderEntry type="library" exported="" name="essentials-logger" level="project" />
     <orderEntry type="library" exported="" name="play-services-6.5.87" level="project" />
-    <orderEntry type="library" exported="" name="notifications-android-1.3.10" level="project" />
+    <orderEntry type="library" exported="" name="notifications-android-1.3.11" level="project" />
     <orderEntry type="library" exported="" name="http-request-5.4" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="okio-1.0.0" level="project" />

diff --git a/...eGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/Tracking.java b/...eGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/Tracking.java
@@ -29,5 +29,7 @@ public class Tracking {
 	public static String PARAM_ORDERING = "ordering";
 	public static String PARAM_PAGER_INDEX = "pager_index";
 
-
+    // Field cards 2015
+    public static String EVENT_SHOW_PRECIP_RANGE = "show_precip_range";
+    public static String EVENT_HIDE_PRECIP_RANGE = "hide_precip_range";
 }
diff --git a/...eGrowersApp/src/main/java/com/climate/growers/android/listAdapters/FieldStatsAdapter.java b/...eGrowersApp/src/main/java/com/climate/growers/android/listAdapters/FieldStatsAdapter.java
@@ -7,11 +7,16 @@
 import android.widget.ArrayAdapter;
 
 import com.climate.growers.android.R;
+import com.climate.growers.android.Tracking;
 import com.climate.growers.android.managers.pojos.FieldLazyDetails;
 import com.climate.growers.android.renderers.FieldStatRenderer;
+import com.climate.growers.android.ui.ClimateApplication;
+import com.lolay.android.tracker.LolayAnalyticsTracker;
+import com.lolay.android.tracker.LolayTracker;
 import com.therealjoshua.essentials.bitmaploader.binders.FadeImageViewBinder;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 public class FieldStatsAdapter extends ArrayAdapter<FieldLazyDetails> {
@@ -20,12 +25,14 @@ public class FieldStatsAdapter extends ArrayAdapter<FieldLazyDetails> {
 	private FadeImageViewBinder binder;
 	private List<Long> alertedFieldIds;
 	private boolean isPrecipRangeVisible;
+    private LolayTracker tracker;
 
 	public FieldStatsAdapter(Context context, List<FieldLazyDetails> items) {
 		super(context, 0, items);
 		inflater = LayoutInflater.from(context);
 		binder = new FadeImageViewBinder(context);
 		alertedFieldIds = new ArrayList<Long>();
+        tracker = ((ClimateApplication)context.getApplicationContext()).getTracker();
 	}
 
 	public void addAlertedFieldIds(List<Long> ids) {
@@ -76,9 +83,18 @@ public View getView(int position, View convertView, ViewGroup parent) {
 //	}
 
 	public void setPrecipRangeVisible(boolean isPrecipRangeVisible) {
+        HashMap<Object, Object> params = new HashMap<Object, Object>();
+        params.put(Tracking.PARAM_FIELD_ID, alertedFieldIds.toArray().toString());
+
 		if (this.isPrecipRangeVisible != isPrecipRangeVisible) {
 			this.isPrecipRangeVisible = isPrecipRangeVisible;
 			this.notifyDataSetChanged();
 		}
+
+        if (this.isPrecipRangeVisible) {
+            tracker.logEventWithParams(getContext(), Tracking.EVENT_SHOW_PRECIP_RANGE, params);
+        } else {
+            tracker.logEventWithParams(getContext(), Tracking.EVENT_HIDE_PRECIP_RANGE, params);
+        }
 	}
 }
diff --git a/ClimateGrowersProject/ClimateGrowersProject.iml b/ClimateGrowersProject/ClimateGrowersProject.iml
@@ -7,9 +7,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/classes/main" />
-    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />

diff --git a/ClimateGrowersProject/FieldHealthLib-release/FieldHealthLib-release.iml b/ClimateGrowersProject/FieldHealthLib-release/FieldHealthLib-release.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="ClimateGrowersProject" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>

diff --git a/ClimateGrowersProject/MapTileAnimationLib/MapTileAnimationLib.iml b/ClimateGrowersProject/MapTileAnimationLib/MapTileAnimationLib.iml
@@ -9,6 +9,7 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />

diff --git a/ClimateGrowersProject/TwoWayViewCore/TwoWayViewCore.iml b/ClimateGrowersProject/TwoWayViewCore/TwoWayViewCore.iml
@@ -9,6 +9,7 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />

diff --git a/ClimateGrowersProject/TwoWayViewLayouts/TwoWayViewLayouts.iml b/ClimateGrowersProject/TwoWayViewLayouts/TwoWayViewLayouts.iml
@@ -9,6 +9,7 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />