Merge branch 'develop'

.classpath

@@ -5,5 +5,9 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="lib" path="C:/Users/Fen/Downloads/java-master/java-master/android/Pubnub-Android-3.6.0.jar"/>
+	<classpathentry kind="lib" path="C:/Users/Fen/Downloads/java-master/java-master/java/libs/bcprov-jdk15on-1.47.jar"/>
+	<classpathentry kind="lib" path="libs/bcprov-jdk15on-1.47.jar"/>
+	<classpathentry kind="lib" path="libs/Pubnub-Android-3.6.0.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

AndroidManifest.xml

@@ -8,13 +8,23 @@
         android:minSdkVersion="14"
         android:targetSdkVersion="19" />
 
+    <instrumentation
+        android:name="com.mercury.pulse.testing.TestRunner"
+        android:targetPackage="com.example.pulse" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
+        <uses-library android:name="android.test.runner" />
+
         <activity
-            android:name="com.mercury.pulse.activities.MainActivity"
+            android:name="com.mercury.pulse.activities.LoginActivity"
             android:label="@string/app_name"
             android:screenOrientation="portrait" >
             <intent-filter>
@@ -41,6 +51,23 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.mercury.pulse.activities.MainActivity" />
         </activity>
+        <activity
+            android:name="com.mercury.pulse.activities.QRCodeActivity"
+            android:label="Scan QR Code"
+            android:parentActivityName="com.mercury.pulse.activities.MainActivity"
+            android:screenOrientation="portrait" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.mercury.pulse.activities.MainActivity" />
+        </activity>
+        <activity
+            android:name="com.mercury.pulse.activities.GraphActivity"
+            android:screenOrientation="landscape" >
+        </activity>
+        <activity
+            android:name="com.mercury.pulse.activities.MainActivity"
+            android:screenOrientation="portrait" >
+        </activity>
     </application>
 
 </manifest>

lint.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+</lint>

res/layout/activity_about.xml

@@ -1,65 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="#efefef" >
+<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/pager"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <ScrollView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content" >
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="16dp" >
-
-            <ImageView
-                android:id="@+id/aboutfragment_aboutuscoverimage"
-                android:layout_width="fill_parent"
-                android:layout_height="140dp"
-                android:layout_gravity="center"
-                android:paddingLeft="32dp"
-                android:paddingRight="32dp"
-                android:scaleType="centerInside"
-                android:src="@drawable/mercurysoftwaredevlarge" />
-
-            <TextView
-                android:id="@+id/aboutfragment_abouttheapp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginBottom="4dp"
-                android:layout_marginLeft="4dp"
-                android:text="About The App"
-                android:textColor="#777"
-                android:textSize="20sp"
-                android:textStyle="italic" />
-
-            <TextView
-                android:layout_width="fill_parent"
-                android:layout_height="20dp" />
-
-            <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/textviewbackground"
-                android:orientation="vertical" >
-
-                <TextView
-                    android:id="@+id/aboutfragment_aboutus"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:background="#fff"
-                    android:fontFamily="sans-serif-light"
-                    android:padding="16dp"
-                    android:singleLine="false"
-                    android:text="Licensing Info"
-                    android:textColor="#222"
-                    android:textSize="16sp" />
-            </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
-
-</RelativeLayout>
+</android.support.v4.view.ViewPager>

res/layout/activity_graph.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <Spinner
+        android:id="@+id/spinner"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true" />
+
+    <TextView
+        android:id="@+id/y_axis"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_below="@+id/spinner"
+        android:layout_marginLeft="10dp"
+        android:gravity="center"
+        android:text="%" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/spinner"
+        android:layout_toRightOf="@+id/y_axis"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            android:id="@+id/graph"
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_marginLeft="25dp"
+            android:layout_weight="1"
+            android:orientation="vertical" >
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/x_axis"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="Time" />
+    </LinearLayout>
+
+    <ProgressBar
+        android:id="@+id/graphactivity_progressbar"
+        style="?android:attr/progressBarStyleLarge"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:visibility="invisible"/>
+
+    <TextView
+        android:id="@+id/graphactivity_loadingpulses"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/graphactivity_progressbar"
+        android:layout_centerHorizontal="true"
+        android:textSize="20sp"
+        android:text="Loading Pulses..." />
+
+</RelativeLayout>

res/layout/activity_login.xml

@@ -0,0 +1,99 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <EditText
+        android:id="@+id/email"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/imageView1"
+        android:layout_marginLeft="35dp"
+        android:layout_marginRight="35dp"
+        android:gravity="center"
+        android:inputType="textEmailAddress"
+        android:maxLines="1"
+        android:singleLine="true"
+        android:text="[email protected]" >
+
+        <requestFocus />
+    </EditText>
+
+    <EditText
+        android:id="@+id/password"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/email"
+        android:layout_alignRight="@+id/email"
+        android:layout_below="@+id/email"
+        android:layout_marginTop="10dp"
+        android:ems="10"
+        android:gravity="center"
+        android:imeOptions="actionUnspecified"
+        android:inputType="textPassword"
+        android:maxLines="1"
+        android:singleLine="true"
+        android:text="Cadenc3!" />
+
+    <ImageView
+        android:id="@+id/imageView2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignTop="@+id/textView1"
+        android:layout_marginBottom="10dp"
+        android:layout_toLeftOf="@+id/textView1"
+        android:src="@drawable/mercurysoftwaredevsmall" />
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="10dp"
+        android:text="Mercury Software Studios"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+    <TextView
+        android:id="@+id/loginstatus"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/password"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="10dp"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <Button
+        android:id="@+id/button1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/loginstatus"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="20dp"
+        android:onClick="sign_in_button_handler"
+        android:paddingLeft="32dp"
+        android:paddingRight="32dp"
+        android:text="Sign In" />
+
+    <ProgressBar
+        android:id="@+id/loginactivity_progressbar"
+        style="?android:attr/progressBarStyleLarge"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_below="@+id/password"
+        android:layout_toLeftOf="@+id/loginstatus"
+        android:visibility="invisible" />
+
+    <ImageView
+        android:id="@+id/imageView1"
+        android:layout_width="150dp"
+        android:layout_marginTop="25dp"
+        android:layout_marginBottom="15dp"
+        android:layout_height="150dp"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:src="@drawable/ic_launcher" />
+
+</RelativeLayout>

res/layout/activity_main.xml

@@ -1,20 +1,20 @@
-<android.support.v4.widget.DrawerLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/main_navdrawer"
     android:layout_width="match_parent"
-    android:layout_height="fill_parent">
-    
+    android:layout_height="fill_parent" >
+
     <FrameLayout
         android:id="@+id/mainactivity_framelayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-
-    <ListView android:id="@+id/mainactivity_navdrawer"
+
+    <ListView
+        android:id="@+id/mainactivity_navdrawer"
         android:layout_width="250dp"
         android:layout_height="match_parent"
         android:layout_gravity="start"
+        android:background="#EEE"
         android:choiceMode="singleChoice"
-        android:dividerHeight="1dp"
-        android:background="#EEE"/>
-
+        android:dividerHeight="1dp" />
+
 </android.support.v4.widget.DrawerLayout>

res/layout/activity_qrcode.xml

@@ -0,0 +1,37 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#efefef" >
+
+    <Button
+        android:id="@+id/btn_scan_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/imageView1"
+        android:layout_centerHorizontal="true"
+        android:text="Scan QR Code" />
+
+    <ImageView
+        android:id="@+id/imageView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:src="@drawable/qrcode" />
+
+    <TextView
+        android:id="@+id/lbl_message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/imageView1"
+        android:layout_alignParentRight="true"
+        android:gravity="center"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:text="Want to monitor a machine in front of you? Just point your phone towards the server..."
+        android:textColor="#777"
+        android:textSize="20sp"
+        android:textStyle="italic" />
+
+</RelativeLayout>