Merge branch 'release/v0.2.1'

Author: edipo2s

.idea/misc.xml

@@ -18,6 +18,8 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         buildConfigField("boolean", "ENABLE_LOGS_IN_RELEASE", "false")
+        buildConfigField("String", "MIXPANEL_TOKEN", '"eb99af1dad563cbaaf02f008b28e321f"')
+        buildConfigField("String", "GCM_SENDER", '"597127048287"')
         vectorDrawables.useSupportLibrary true
     }
     signingConfigs {
@@ -85,11 +87,13 @@ dependencies {
 
     //Google
     compile "com.google.android.gms:play-services-auth:$playServicesVersion"
+    compile "com.google.android.gms:play-services-gcm:$playServicesVersion"
     compile "com.google.firebase:firebase-auth:$playServicesVersion"
     compile "com.google.firebase:firebase-ads:$playServicesVersion"
     compile "com.google.firebase:firebase-core:$playServicesVersion"
     compile "com.google.firebase:firebase-config:$playServicesVersion"
     compile "com.google.firebase:firebase-database:$playServicesVersion"
+    compile "com.google.firebase:firebase-messaging:$playServicesVersion"
     releaseCompile "com.google.firebase:firebase-crash:$playServicesVersion"
 
     //Fabric
@@ -101,6 +105,7 @@ dependencies {
     }
 
     //Others
+    compile "com.mixpanel.android:mixpanel-android:4.9.2"
     compile "com.jakewharton.threetenabp:threetenabp:$threetenabpVersion"
     compile "com.jakewharton.timber:timber:4.3.1"
     compile "org.greenrobot:eventbus:3.0.0"

app/build.gradle

@@ -65,3 +65,9 @@
 -dontwarn org.junit.**
 -dontwarn android.test.**
 -dontwarn android.support.test.**
+
+## MixPanel
+-dontwarn com.mixpanel.**
+-keep class **.R$* {
+    <fields>;
+}

app/proguard-rules.pro

@@ -17,6 +17,9 @@ object MetricsManager : MetricsConstants() {
     fun initialize(context: Context) {
     }
 
+    fun flush() {
+    }
+
     fun trackAction(action: MetricAction, vararg params: String) {
         Timber.d(if (params.isEmpty()) action.name else "${action.name} with params: ${params.toSet()}")
     }

app/src/debug/java/com/ediposouza/teslesgendstracker/manager/MetricsManager.kt

@@ -2,7 +2,17 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.ediposouza.teslesgendstracker">
 
+    <permission
+        android:name="com.ediposouza.teslesgendstracker.permission.C2D_MESSAGE"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+    <uses-permission android:name="com.ediposouza.teslesgendstracker.permission.C2D_MESSAGE" />
 
     <application
         android:name=".App"
@@ -21,20 +31,28 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".ui.CardActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppThemeTransparent" />
-
         <activity
             android:name=".ui.DeckActivity"
             android:screenOrientation="portrait" />
-
         <activity
             android:name=".ui.decks.new.NewDeckActivity"
             android:screenOrientation="portrait" />
 
+        <receiver
+            android:name="com.mixpanel.android.mpmetrics.GCMReceiver"
+            android:permission="com.google.android.c2dm.permission.SEND">
+            <intent-filter>
+                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+                <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
+
+                <category android:name="com.ediposouza.teslesgendstracker" />
+            </intent-filter>
+        </receiver>
+
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />

app/src/debug/res/mipmap-hdpi/ic_launcher.png

@@ -1,6 +1,7 @@
 package com.ediposouza.teslesgendstracker
 
 import android.content.Context
+import android.os.Bundle
 import android.support.annotation.IntegerRes
 import android.support.design.widget.BottomSheetBehavior
 import android.view.LayoutInflater
@@ -9,6 +10,7 @@ import android.view.ViewGroup
 import com.google.android.gms.ads.AdRequest
 import com.google.android.gms.ads.AdView
 import com.google.android.gms.ads.NativeExpressAdView
+import com.mixpanel.android.mpmetrics.MixpanelAPI
 
 /**
  * Created by ediposouza on 01/11/16.
@@ -47,4 +49,8 @@ private fun createAdRequest(context: Context): AdRequest {
         adRequestBuilder.addTestDevice(deviceId)
     }
     return adRequestBuilder.build()
+}
+
+fun MixpanelAPI.trackBundle(eventName: String, bundle: Bundle) {
+    trackMap(eventName, bundle.keySet().map { it to bundle[it] }.toMap())
 }