KAA-465: improve design, fix gauge chart scaling issues

kaaproject · Apr 30, 2015 · 4c42df1 · 4c42df1
1 parent 709aa08
commit 4c42df1
Show file tree

Hide file tree

Showing 8 changed files with 223 additions and 97 deletions.
diff --git a/examples/powerplant-android/AndroidManifest.xml b/examples/powerplant-android/AndroidManifest.xml
@@ -38,7 +38,8 @@
             android:name=".PowerPlantActivity"
             android:screenOrientation="landscape"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:label="@string/app_name" >
+            android:label="@string/app_name"
+            android:hardwareAccelerated="false">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

diff --git a/examples/powerplant-android/res/drawable-mdpi/drop_shadow_down.xml b/examples/powerplant-android/res/drawable-mdpi/drop_shadow_down.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2014-2015 CyberVision, Inc.
+ 
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+       http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">    
+    <gradient
+        android:startColor="#ACACAC"
+        android:endColor="#E0E0E0"
+        android:angle="270">
+    </gradient>
+</shape>
diff --git a/examples/powerplant-android/res/drawable-mdpi/drop_shadow_right.xml b/examples/powerplant-android/res/drawable-mdpi/drop_shadow_right.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2014-2015 CyberVision, Inc.
+ 
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+       http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">    
+    <gradient
+        android:startColor="#ACACAC"
+        android:endColor="#E0E0E0"
+        android:angle="0">
+    </gradient>
+</shape>
diff --git a/examples/powerplant-android/res/layout/fragment_dashboard.xml b/examples/powerplant-android/res/layout/fragment_dashboard.xml
@@ -26,13 +26,12 @@
 	android:background="#E0E0E0"
 	android:layout_marginTop="10dp">
 
-    <RelativeLayout
+   <RelativeLayout
         android:id="@+id/lineChartLayout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
         android:background="#FFFFFF"
-        android:layout_marginBottom="15dp"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp">
         <TextView 
@@ -56,7 +55,6 @@
             android:layout_below="@+id/lineChartYAxisText"
             android:layout_above="@+id/lineChartXAxisText">
         </lecho.lib.hellocharts.view.LineChartView>
-
         <TextView 
             android:id="@+id/lineChartXAxisText"
             android:layout_width="wrap_content"
@@ -66,7 +64,21 @@
             android:layout_centerHorizontal="true"
             android:gravity="center"
         />
+        <View
+		    android:layout_width="3dp"
+			android:layout_height="fill_parent"
+		    android:background="@drawable/drop_shadow_right"
+		    android:layout_alignParentRight="true">
+    	</View>
     </RelativeLayout>
+	<View
+	    android:layout_width="fill_parent"
+		android:layout_height="3dp"
+	    android:background="@drawable/drop_shadow_down"
+		android:layout_below="@+id/lineChartLayout"
+		android:layout_marginLeft="10dp"
+		android:layout_marginRight="10dp">
+    </View>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -75,9 +87,10 @@
         android:orientation="horizontal"
         android:weightSum="50"
         android:baselineAligned="false"
+        android:layout_marginTop="15dp"
         android:layout_marginBottom="10dp">
 
-        <LinearLayout
+      <LinearLayout
             android:id="@+id/gaugeChartMainLayout"
             android:layout_height="match_parent"
             android:layout_width="0dp"
@@ -117,6 +130,12 @@
                     custom:panel_name="Panel 3"
                     custom:update_time_s="2">
                 </org.kaaproject.kaa.demo.powerplant.view.GaugeChart>
+                <View
+				    android:layout_width="3dp"
+					android:layout_height="fill_parent"
+				    android:background="@drawable/drop_shadow_right"
+				    android:layout_alignParentRight="true">
+    			</View>
             </LinearLayout>
             <LinearLayout
                 android:id="@+id/gaugeChartBottomLayout"
@@ -149,7 +168,20 @@
                     custom:panel_name="Panel 6"
                     custom:update_time_s="2">
                 </org.kaaproject.kaa.demo.powerplant.view.GaugeChart>
+                <View
+				    android:layout_width="3dp"
+					android:layout_height="fill_parent"
+				    android:background="@drawable/drop_shadow_right"
+				    android:layout_alignParentRight="true">
+    			</View>
             </LinearLayout>
+			<View
+			    android:layout_width="fill_parent"
+				android:layout_height="3dp"
+			    android:background="@drawable/drop_shadow_down"
+				android:layout_below="@+id/gaugeChartMainLayout">
+		    </View>
+
         </LinearLayout>
 
         <RelativeLayout
@@ -161,9 +193,10 @@
                 android:id="@+id/pieChart"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="15dp">
+                android:layout_marginLeft="18dp">
             </lecho.lib.hellocharts.view.PieChartView>
             <LinearLayout
+                android:id="@+id/linearLayoutForPieChart"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_alignLeft="@+id/pieChart"
@@ -230,17 +263,29 @@
                     android:text="total"
                     android:textColor="#00BDF0"
                 />
-
             </LinearLayout>
-
+			<View
+			    android:layout_width="3dp"
+				android:layout_height="fill_parent"
+			    android:background="@drawable/drop_shadow_right"
+			    android:layout_alignParentRight="true">
+	    	</View>
+	    	<View
+				android:layout_width="fill_parent"
+				android:layout_height="3dp"
+				android:background="@drawable/drop_shadow_down"
+				android:layout_marginLeft="18dp"
+				android:layout_alignBottom="@+id/pieChart">
+			</View>
         </RelativeLayout>
 
+
         <RelativeLayout
             android:layout_height="match_parent"
             android:layout_width="0dp"
             android:layout_weight="15"
             android:background="#FFFFFF"
-            android:layout_marginLeft="15dp"
+            android:layout_marginLeft="18dp"
             android:layout_marginRight="10dp">
             <TextView
 	            android:id="@+id/logBox"
@@ -251,15 +296,29 @@
 	            android:clickable="false"
 	            android:cursorVisible="false"
 	            android:editable="false"
-	            android:gravity="left"
+	            android:gravity="bottom"
-	            android:isScrollContainer="true"
 	            android:longClickable="false"
+	            android:maxLines = "50"
 	            android:scrollbars="vertical"
-	            android:textSize="14dp"
+	            android:textSize="14sp"
 	            android:lineSpacingMultiplier="1.2"
 	            android:inputType="textMultiLine"
 	            android:paddingTop="15dp"
-	            android:paddingBottom="16dp"/>
+	            android:paddingBottom="16dp"
+	            android:paddingRight="2dp">
+            </TextView>
+			<View
+			    android:layout_width="3dp"
+				android:layout_height="fill_parent"
+			    android:background="@drawable/drop_shadow_right"
+			    android:layout_alignParentRight="true">
+	    	</View>
+	    	<View
+				android:layout_width="fill_parent"
+				android:layout_height="3dp"
+				android:background="@drawable/drop_shadow_down"
+				android:layout_alignBottom="@+id/logBox">
+			</View>
         </RelativeLayout>
     </LinearLayout>
 

diff --git a/examples/powerplant-android/res/values/strings.xml b/examples/powerplant-android/res/values/strings.xml
@@ -18,7 +18,7 @@
 
 <resources>
 
-    <string name="app_name">City Guide Demo</string>
+    <string name="app_name">Power plant</string>
     <string name="please_wait">Please wait...</string>
 
 </resources>
diff --git a/...ples/powerplant-android/src/org/kaaproject/kaa/demo/powerplant/data/RestDataEndpoint.java b/...ples/powerplant-android/src/org/kaaproject/kaa/demo/powerplant/data/RestDataEndpoint.java
@@ -25,7 +25,7 @@
 public class RestDataEndpoint extends AbstractDataEndpoint {
     private static final String TAG = RestDataEndpoint.class.getSimpleName();
 
-    private static final String BASE_URL = "http://10.2.2.89:10000/api/data";
+    private static final String BASE_URL = "http://192.168.13.100:10000/api/data";
     private static final String LATEST_URL = BASE_URL + "/latest";
 
     @Override