Encapsulate cloud interfaces into SDK

.gitignore

@@ -6,3 +6,10 @@
 .DS_Store
 /build
 /captures
+<<<<<<< HEAD
+<<<<<<< HEAD
+app/src/main/java/ca/xlight/demoapp/SDK/CloudAccount.java
+=======
+>>>>>>> parent of 99d739f... clean
+=======
+>>>>>>> parent of 99d739f... clean

app/.gitignore

@@ -1,2 +1,2 @@
 /build
-/src/main/java/com/umarbhutta/xlightcompanion/particle/CloudAccount.java
+/src/main/java/ca/xlight/demoapp/SDK/CloudAccount.java

app/build.gradle

@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion '25.0.2'
     defaultConfig {
-        applicationId "com.umarbhutta.xlightcompanion"
+        applicationId "ca.xlight.demoapp"
         minSdkVersion 19
-        targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 25
+        versionCode 2
+        versionName "2.0"
     }
     buildTypes {
         release {
@@ -27,13 +27,26 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
-    compile 'com.android.support:support-v4:23.4.0'
-    compile 'com.android.support:recyclerview-v7:23.4.0'
+    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support:support-fragment:25.2.0'
+    compile 'com.android.support:design:25.2.0'
+    compile 'com.android.support:support-v4:25.2.0'
+    compile 'com.android.support:recyclerview-v7:25.2.0'
     compile 'com.github.clans:fab:1.6.4'
+    compile 'com.yanzhenjie:recyclerview-swipe:1.1.3'
     compile 'com.squareup.okhttp3:okhttp:3.4.1'
-    compile 'io.particle:cloudsdk:0.3.4'
+
+    // BY DEFAULT, BUILD APP AGAINST THE LOCAL SDK SOURCE
+    // (i.e.: make modifications to the SDK source in the local repo show up in this app
+    // just by rebuilding)
+    compile project(':cloudsdk')
+    //
+    // **OR**
+    //
+    // comment out the above, and
+    // UNCOMMENT THE FOLLOWING TO USE A PUBLISHED VERSION OF THE SDK:
+    //compile 'io.particle:cloudsdk:0.3.4'
+
     compile 'io.particle:devicesetup:0.3.6'
     compile 'me.priyesh:chroma:1.0.2'
 }

app/src/androidTest/java/com/umarbhutta/xlightcompanion/ApplicationTest.java → app/src/androidTest/java/ca/xlight/demoapp/ApplicationTest.java

@@ -1,4 +1,4 @@
-package com.umarbhutta.xlightcompanion;
+package ca.xlight.demoapp;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;

app/src/main/AndroidManifest.xml

@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.umarbhutta.xlightcompanion">
+    package="ca.xlight.demoapp">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+
+    <uses-feature
+        android:name="android.hardware.bluetooth_le"
+        android:required="false" />
 
     <application
         android:allowBackup="true"
@@ -24,10 +30,24 @@
         </activity>
         <activity
             android:name=".schedule.AddScheduleActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".scenario.AddScenarioActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
+
+        <receiver
+            android:name=".Tools.DataReceiver"
+            android:enabled="true"
+            android:exported="true" />
+        <receiver
+            android:name=".Tools.StatusReceiver"
+            android:enabled="true"
+            android:exported="true" />
+
+        <activity
+            android:name=".glance.AddNewDevice"
+            android:label="@string/title_activity_add_new_device"
+            android:theme="@style/AppTheme.NoActionBar"></activity>
     </application>
 
 </manifest>

app/src/main/java/ca/xlight/demoapp/SDK/BLE/BLEAdapterDelegate.java

@@ -0,0 +1,45 @@
+package ca.xlight.demoapp.SDK.BLE;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+
+import java.util.Set;
+
+/**
+ * Created by sunboss on 2017-03-21.
+ */
+
+public class BLEAdapterDelegate implements BLEAdapterWrapper {
+
+    private final BluetoothAdapter adapter;
+
+    public BLEAdapterDelegate(BluetoothAdapter adapter) {
+        assert adapter != null;
+        this.adapter = adapter;
+    }
+
+    @Override
+    public Set<BluetoothDevice> getBondedDevices() {
+        return adapter.getBondedDevices();
+    }
+
+    @Override
+    public void cancelDiscovery() {
+        adapter.cancelDiscovery();
+    }
+
+    @Override
+    public boolean isDiscovering() {
+        return adapter.isDiscovering();
+    }
+
+    @Override
+    public void startDiscovery() {
+        adapter.startDiscovery();
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return adapter.isEnabled();
+    }
+}

app/src/main/java/ca/xlight/demoapp/SDK/BLE/BLEAdapterFactory.java

@@ -0,0 +1,18 @@
+package ca.xlight.demoapp.SDK.BLE;
+
+import android.bluetooth.BluetoothAdapter;
+
+/**
+ * Created by sunboss on 2017-03-21.
+ */
+
+public class BLEAdapterFactory {
+    private BLEAdapterFactory() {
+        // utility class
+    }
+
+    public static BLEAdapterWrapper getBluetoothAdapterWrapper() {
+        BluetoothAdapter defaultAdapter = BluetoothAdapter.getDefaultAdapter();
+        return defaultAdapter != null ? new BLEAdapterDelegate(defaultAdapter) : new NullBLEWrapper();
+    }
+}

app/src/main/java/ca/xlight/demoapp/SDK/BLE/BLEAdapterWrapper.java

@@ -0,0 +1,22 @@
+package ca.xlight.demoapp.SDK.BLE;
+
+import android.bluetooth.BluetoothDevice;
+
+import java.util.Set;
+
+/**
+ * Created by sunboss on 2017-03-21.
+ */
+
+public interface BLEAdapterWrapper {
+
+    Set<BluetoothDevice> getBondedDevices();
+
+    void cancelDiscovery();
+
+    boolean isDiscovering();
+
+    void startDiscovery();
+
+    boolean isEnabled();
+}