From 0a11b6f88fa55195763dfa098c0a76e42ccbba9b Mon Sep 17 00:00:00 2001
From: Mattia <mattia.ducci@studenti.unimi.it>
Date: Sun, 29 Apr 2018 22:58:22 +0200
Subject: [PATCH] implementato screen tracking

---
 .gitignore                                    |   1 +
 .../.idea/caches/build_file_checksums.ser     | Bin 589 -> 589 bytes
 IcarusAndroid/app/build.gradle                |   2 +
 .../it/icarusandroid/MainActivity.java        |  31 +++++
 .../app/src/main/res/layout/activity_main.xml |  28 +++-
 IcarusAndroid/icarus/build.gradle             |   1 +
 .../icarus/src/main/AndroidManifest.xml       |   5 +-
 .../it/icarus/EventTrackResource.java         |   5 +
 .../it/icarus/Icarus.java                     | 126 +++++++++++++++++-
 .../it/icarus/IcarusResource.java             |   4 +
 .../it/icarus/ScreenTrackResource.java        |  13 ++
 .../it/icarus/UserSettingsResource.java       |   5 +
 .../src/main/res/values/app_constants.xml     |   5 +
 .../icarus/src/main/res/values/strings.xml    |   2 +-
 14 files changed, 218 insertions(+), 10 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 IcarusAndroid/icarus/src/main/res/values/app_constants.xml

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..504a29a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+AppuntiProgetto/
diff --git a/IcarusAndroid/.idea/caches/build_file_checksums.ser b/IcarusAndroid/.idea/caches/build_file_checksums.ser
index 636d3d3e8ded17ef6c605126952d8453a43e099c..ba777d47a33b1c13fa587329c5deccb710ae2ad1 100644
GIT binary patch
delta 53
zcmV-50LuT(1kD7Hm;@3!VZ@P~{1BU$5B5Dssq5(WH{H@@EtZq00hAFTR=}}!nD~20
L9+(}r@k>s4v9KA@

delta 53
zcmV-50LuT(1kD7Hm;?vW28fZI{17}d{CPXcXq8EQ!4kJb44#vy0hAHShnK6}hkmKT
L@-8`%HdFR^h7%bx

diff --git a/IcarusAndroid/app/build.gradle b/IcarusAndroid/app/build.gradle
index fc758cf..33a6075 100644
--- a/IcarusAndroid/app/build.gradle
+++ b/IcarusAndroid/app/build.gradle
@@ -25,4 +25,6 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+
+    implementation project(':icarus')
 }
diff --git a/IcarusAndroid/app/src/main/java/framework/everywaretechnologies/it/icarusandroid/MainActivity.java b/IcarusAndroid/app/src/main/java/framework/everywaretechnologies/it/icarusandroid/MainActivity.java
index 01f64d6..57e2062 100644
--- a/IcarusAndroid/app/src/main/java/framework/everywaretechnologies/it/icarusandroid/MainActivity.java
+++ b/IcarusAndroid/app/src/main/java/framework/everywaretechnologies/it/icarusandroid/MainActivity.java
@@ -2,14 +2,45 @@ package framework.everywaretechnologies.it.icarusandroid;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.Switch;
+
+import framework.everywaretechnologies.it.icarus.Icarus;
+
 
 //classe di test Icarus framework
 
 public class MainActivity extends AppCompatActivity {
 
+    private final static String CLASS_NAME="MainActivity";
+
+    private Switch enteredExitedScreenTrackSwitch;
+    private Icarus instance;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+        instance=Icarus.getInstance(MainActivity.this);
+        instance.setApplicationContext(getApplicationContext());
+
+        enteredExitedScreenTrackSwitch=findViewById(R.id.entered_exited_screen_track_switch);
+    }
+
+    //------------------------- UI EVENT -----------------------
+    public void onBtnScreenEventTrack(View view){
+
+        Log.d(CLASS_NAME,"on btn screen event track");
+
+        String eventType=null;
+        if(enteredExitedScreenTrackSwitch.isChecked())
+            eventType=enteredExitedScreenTrackSwitch.getTextOn().toString();
+        else
+            eventType=enteredExitedScreenTrackSwitch.getTextOff().toString();
+
+        instance.trackScreen(MainActivity.this,eventType);
     }
 }
diff --git a/IcarusAndroid/app/src/main/res/layout/activity_main.xml b/IcarusAndroid/app/src/main/res/layout/activity_main.xml
index 84f1951..3cc99b1 100644
--- a/IcarusAndroid/app/src/main/res/layout/activity_main.xml
+++ b/IcarusAndroid/app/src/main/res/layout/activity_main.xml
@@ -1,18 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.widget.LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".MainActivity">
 
     <TextView
-        android:layout_width="wrap_content"
+        android:id="@+id/lbl_track_screen"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
+        android:text="Track screen"
+        android:textColor="@android:color/holo_red_light"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+    <Switch
+        android:id="@+id/entered_exited_screen_track_switch"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:showText="true"
+        android:splitTrack="false"
+        android:text="Tipo di evento"
+        android:textOff="EXITED"
+        android:textOn="ENTERED" />
+
+    <Button
+        android:id="@+id/btn_send_screen_track_event"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:onClick="onBtnScreenEventTrack"
+        android:text="Invia screen track event" />
+
+</android.widget.LinearLayout>
\ No newline at end of file
diff --git a/IcarusAndroid/icarus/build.gradle b/IcarusAndroid/icarus/build.gradle
index 5d9762e..4bba022 100644
--- a/IcarusAndroid/icarus/build.gradle
+++ b/IcarusAndroid/icarus/build.gradle
@@ -33,4 +33,5 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 
     implementation 'com.android.volley:volley:1.1.0'
+    implementation 'com.google.code.gson:gson:2.8.3'
 }
diff --git a/IcarusAndroid/icarus/src/main/AndroidManifest.xml b/IcarusAndroid/icarus/src/main/AndroidManifest.xml
index c6d9e16..b663d97 100644
--- a/IcarusAndroid/icarus/src/main/AndroidManifest.xml
+++ b/IcarusAndroid/icarus/src/main/AndroidManifest.xml
@@ -1,2 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="framework.everywaretechnologies.it.icarus" />
+    package="framework.everywaretechnologies.it.icarus" >
+
+    <uses-permission android:name="android.permission.INTERNET"/> <!-- richiesto da Volley -->
+</manifest>
\ No newline at end of file
diff --git a/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/EventTrackResource.java b/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/EventTrackResource.java
index 73504c9..dccedcf 100644
--- a/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/EventTrackResource.java
+++ b/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/EventTrackResource.java
@@ -1,4 +1,9 @@
 package framework.everywaretechnologies.it.icarus;
 
 public class EventTrackResource extends IcarusResource {
+
+    public EventTrackResource(){
+
+        super();
+    }
 }
diff --git a/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/Icarus.java b/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/Icarus.java
index 8650282..62b011d 100644
--- a/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/Icarus.java
+++ b/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/Icarus.java
@@ -1,17 +1,49 @@
 package framework.everywaretechnologies.it.icarus;
 
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.util.Log;
+
+import com.android.volley.Request;
+import com.android.volley.RequestQueue;
+import com.android.volley.Response;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.JsonObjectRequest;
+import com.android.volley.toolbox.Volley;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.util.LinkedList;
 import java.util.Queue;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-class Icarus {
+
+public class Icarus {
+
+    enum Categories{
+
+        APPLICATION,ACTION,NOTIFICATION;
+    }
+
+    private final static String ICARUS_URL="https://webdev.ewlab.di.unimi.it/icarus/str";
 
     private static final Icarus ourInstance = new Icarus();
-    private Queue<IcarusResource> pendingResources;
+    private Queue<JSONObject> pendingResources; //FIFO
     private Lock pendingResourceLock;
+    private Context appContext;// serve per istanziare un un'unica coda di richieste Volley (e non averne una per Activity)
+    private static Context curContext; //context dell'Activity corrente
+    private RequestQueue mVolleyRequestQueue;
+
+    public static Icarus getInstance(Context c) {
 
-    public static Icarus getInstance() {
+        curContext=c;
         return ourInstance;
     }
 
@@ -21,8 +53,94 @@ class Icarus {
         pendingResourceLock=new ReentrantLock();
     }
 
-    public void pushResource(IcarusResource icarusResource){
+    public void setApplicationContext(Context applicationContext){
+
+        appContext=applicationContext;
+
+        //adesso che ho l'applicationContext dell'app chiamante creo la coda di richieste per Volley
+        mVolleyRequestQueue= Volley.newRequestQueue(appContext);
+    }
+
+    //----------------- LOG PREFERENCE CHANGES -----------------------
+
+    public void logUserSettings(SharedPreferences mySharedPrefs){
+
+        Log.d(curContext.getString(R.string.icarus_class),"log pref changes");
+    }
+
+    //---------------------- LOG SCREEN TRACKING ------------------------------
+
+
+    public void trackScreen(Context c,String screenEventType){
+
+        Log.d(curContext.getString(R.string.icarus_class),"log screen track");
+
+        String screenName=c.getClass().getSimpleName();
+
+        if(screenEventType.equalsIgnoreCase(ScreenTrackResource.EVENT_ENTERED) || screenEventType.equalsIgnoreCase(ScreenTrackResource.EVENT_EXITED) ){
+
+            IcarusResource resource=new ScreenTrackResource(screenName,screenEventType);
+
+            Gson gson=new Gson();
+            String screenTrackJson=gson.toJson(resource);
+            try {
+
+                JSONObject icarusPayload=new JSONObject(screenTrackJson);
+                postIcarusHttpRequest(icarusPayload);
+
+                Log.d(curContext.getString(R.string.icarus_class),"log screen track -> Volley");
+
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+    //---------------------- LOG EVENT TRACKING --------------------------
+
+    public void logEvent(String eventName,String category,String label){
+
+        Log.d(curContext.getString(R.string.icarus_class),"log event");
+
+    }
+
+
+
+
+    //--------------------------- UTILITY ----------------------------------
+    private void postIcarusHttpRequest(final JSONObject icarusPayload){
+
+        final JsonObjectRequest jsonObjectRequest=new JsonObjectRequest(Request.Method.POST, ICARUS_URL, icarusPayload, new Response.Listener<JSONObject>() {
+            @Override
+            public void onResponse(JSONObject response) {
+
+                Log.d(curContext.getString(R.string.icarus_class),"onVolley response POSITIVE");
+
+                //controllo se ho qualche elemento che precedentemente non sono riuscito ad inviare e nel caso lo provo ad inviare
+                pendingResourceLock.lock();
+
+                if(pendingResources.peek() != null){ //se ho qualche elemento pendente da inviare
+
+                    Log.d(curContext.getString(R.string.icarus_class),"messaggi pendenti");
+                    JSONObject pendingResource=pendingResources.poll();
+                    postIcarusHttpRequest(pendingResource);
+                }
+                pendingResourceLock.unlock();
+
+            }
+        }, new Response.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError error) {
+
+                Log.d(curContext.getString(R.string.icarus_class),"onVolley response NEGATIVE");
 
+                pendingResourceLock.lock();
+                pendingResources.add(icarusPayload);
+                pendingResourceLock.unlock();
+            }
+        });
 
+        mVolleyRequestQueue.add(jsonObjectRequest);//faccio effettivamente la richiesta
     }
 }
diff --git a/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/IcarusResource.java b/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/IcarusResource.java
index 2144195..2384493 100644
--- a/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/IcarusResource.java
+++ b/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/IcarusResource.java
@@ -1,4 +1,8 @@
 package framework.everywaretechnologies.it.icarus;
 
 public abstract class IcarusResource {
+
+    public IcarusResource(){}
 }
+
+
diff --git a/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/ScreenTrackResource.java b/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/ScreenTrackResource.java
index 8425275..50c0049 100644
--- a/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/ScreenTrackResource.java
+++ b/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/ScreenTrackResource.java
@@ -1,4 +1,17 @@
 package framework.everywaretechnologies.it.icarus;
 
 public class ScreenTrackResource extends IcarusResource {
+
+    public final static String EVENT_ENTERED="Entered";
+    public final static String EVENT_EXITED="Exited";
+
+    private String ScreenName; //è un attributo anche se inizia con la lettera maiuscola perchè il server vuole così il nome del campo JSON
+    private String Event;
+
+    public ScreenTrackResource(String _screenName,String _event){
+
+        super();
+        ScreenName=_screenName;
+        Event=_event;
+    }
 }
diff --git a/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/UserSettingsResource.java b/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/UserSettingsResource.java
index bf46990..4b2ba0f 100644
--- a/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/UserSettingsResource.java
+++ b/IcarusAndroid/icarus/src/main/java/framework/everywaretechnologies/it/icarus/UserSettingsResource.java
@@ -1,4 +1,9 @@
 package framework.everywaretechnologies.it.icarus;
 
 public class UserSettingsResource extends IcarusResource {
+
+    public UserSettingsResource(){
+
+        super();
+    }
 }
diff --git a/IcarusAndroid/icarus/src/main/res/values/app_constants.xml b/IcarusAndroid/icarus/src/main/res/values/app_constants.xml
new file mode 100644
index 0000000..a53d545
--- /dev/null
+++ b/IcarusAndroid/icarus/src/main/res/values/app_constants.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="icarus_class">Icarus</string>
+</resources>
\ No newline at end of file
diff --git a/IcarusAndroid/icarus/src/main/res/values/strings.xml b/IcarusAndroid/icarus/src/main/res/values/strings.xml
index 2a19be1..f9753a1 100644
--- a/IcarusAndroid/icarus/src/main/res/values/strings.xml
+++ b/IcarusAndroid/icarus/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Icarus</string>
+    <string name="lib_name">Icarus</string>
 </resources>
-- 
2.18.1