Replaced Echo library to GoogleAnalytics. Removed unused drawables.

joseroubert08 · Nov 25, 2016 · daac4b3 · daac4b3
1 parent cf961ce
commit daac4b3
Show file tree

Hide file tree

Showing 34 changed files with 440 additions and 271 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -27,4 +27,5 @@ dependencies {
     compile 'com.android.support:cardview-v7:23.1.0'
     compile 'com.android.support:recyclerview-v7:23.1.0'
     compile project(':android-gif-drawable-1.1.13')
+    compile 'com.google.android.gms:play-services-analytics:9.2.0'
 }
diff --git a/app/libs/data-client-android-9.2.1.jar b/app/libs/data-client-android-9.2.1.jar
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -18,6 +18,7 @@
           android:versionCode="10"
           android:versionName="1.5.3">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.BLUETOOTH"/>

diff --git a/app/src/main/assets/htmls/help/index.html b/app/src/main/assets/htmls/help/index.html
@@ -113,7 +113,7 @@
 want to use anymore so I want to get rid of that connection?</font></font></p>
 <p align="left">1. Go to your Bluetooth settings on your phone or
 tablet</p>
-<p align="left">2. select the BBC micro:bit 
+<p align="left">2. select the micro:bit
 </p>
 <p align="left">3. select ‘Forget this device’</p>
 <p align="left">This will remove the secret code connecting your

diff --git a/app/src/main/java/com/samsung/microbit/MBApp.java b/app/src/main/java/com/samsung/microbit/MBApp.java
@@ -2,12 +2,10 @@
 
 import android.app.Application;
 import android.graphics.Typeface;
-import android.os.Messenger;
 import android.util.Log;
 
 import com.samsung.microbit.common.ConfigInfo;
-import com.samsung.microbit.core.EchoClientManager;
-import com.samsung.microbit.utils.ServiceUtils;
+import com.samsung.microbit.core.GoogleAnalyticsManager;
 
 /**
  * Represents a custom class of the app.
@@ -22,8 +20,6 @@ public class MBApp extends Application {
     private Typeface mBoldTypeface;
     private Typeface mRobotoTypeface;
 
-    private EchoClientManager echoClientManager;
-
     private ConfigInfo configInfo;
 
     private boolean justPaired;
@@ -33,7 +29,7 @@ public void onCreate() {
         super.onCreate();
         app = this;
         initTypefaces();
-        echoClientManager = EchoClientManager.getInstance(this);
+        GoogleAnalyticsManager.createInstance(this);
 
         configInfo = new ConfigInfo(this);
         Log.d("MBApp", "App Created");
@@ -72,10 +68,6 @@ public static MBApp getApp() {
         return app;
     }
 
-    public EchoClientManager getEchoClientManager() {
-        return echoClientManager;
-    }
-
     public ConfigInfo getConfigInfo() {
         return configInfo;
     }

diff --git a/app/src/main/java/com/samsung/microbit/core/EchoClientManager.java b/app/src/main/java/com/samsung/microbit/core/EchoClientManager.java