Merge pull request #46 from RUGSoftEng/release-0.3

Release 0.3

Author: Luc van den Brand

Hestia/app/build.gradle

@@ -25,10 +25,11 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:recyclerview-v7:25.2.0'
-    compile 'com.android.support:design:25.2.0'
+    compile 'com.android.support:recyclerview-v7:25.3.1'
+    compile 'com.android.support:design:25.3.1'
     compile 'com.google.code.gson:gson:2.7'
-    compile 'com.android.volley:volley:1.0.0'
+    compile 'com.yalantis:contextmenu:1.0.7'
+    testCompile 'org.mockito:mockito-core:1.10.19'
 }

Hestia/app/proguard-rules.pro

@@ -1,7 +1,7 @@
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
 # in /Users/Feiko/Library/Android/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
+# You can edit the include pluginPath and order by changing the proguardFiles
 # directive in build.gradle.
 #
 # For more details, see

Hestia/app/src/androidTest/java/com/rugged/application/hestia/ClientInteractionControllerTest.java

@@ -0,0 +1,31 @@
+package com.rugged.application.hestia;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import hestia.backend.ClientInteractionController;
+import hestia.backend.Device;
+
+import static org.junit.Assert.*;
+
+@RunWith(AndroidJUnit4.class)
+public class ClientInteractionControllerTest {
+    private String TAG = "ClientInteractionTest";
+
+    @Test
+    public void getDevices() throws Exception {
+        ClientInteractionController cic = ClientInteractionController.getInstance();
+        StringBuilder sb = new StringBuilder();
+        for(Device d : cic.getDevices()){
+            sb.append(d.toString());
+        }
+        Context appContext = InstrumentationRegistry.getTargetContext();
+        assertEquals("com.rugged.application.hestia", appContext.getPackageName());
+        Log.i(TAG, sb.toString());
+    }
+}

Hestia/app/src/apk/Hestia-release-0.3.apk

@@ -2,23 +2,24 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.rugged.application.hestia">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.INTERNET"></uses-permission>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
 
     <application
+        android:name="hestia.UI.HestiaApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.AppCompat.Light.NoActionBar">
-        <activity android:name=".LoginActivity"
+        <activity android:name="hestia.UI.LoginActivity"
             android:screenOrientation="locked">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".PeripheralListActivity"
+        <activity android:name="hestia.UI.DeviceListActivity"
             android:screenOrientation="locked">
 
         </activity>