Merge pull request #51 from MC-Timetracker/master

Merge statistics and ui improvements

.classpath

@@ -5,7 +5,11 @@
 	<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="libs/achartengine-1.1.0.jar"/>
+	<classpathentry kind="lib" path="libs/achartengine-1.1.0.jar">
+		<attributes>
+			<attribute name="javadoc_location" value="jar:file:/home/gullal/workspace/timetracker/libs/achartengine-1.1.0-javadocs.zip!/"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="lib" path="libs/achartengine-1.1.0-javadocs.zip"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

AndroidManifest.xml

@@ -16,7 +16,7 @@
     <application
         android:name=".ApplicationHelper"
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@drawable/ic_launchertimeturner"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
@@ -47,7 +47,7 @@
             android:label="@string/title_activity_list_recordings" >
         </activity>
         <activity
-            android:name=".Statistics"
+            android:name=".OverallStats"
             android:label="@string/title_activity_statistics" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -70,12 +70,19 @@
             android:label="@string/title_activity_edit_recording" >
         </activity>
 
+        <activity
+            android:name=".TaskWiseStats"
+            android:label="@string/title_activity_task_wise_stats" >
+        </activity>
+
+
         <receiver android:name=".BootReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" >
                 </action>
             </intent-filter>
         </receiver>
+
     </application>
 
 </manifest>

project.properties

@@ -11,6 +11,6 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=Google Inc.:Google APIs:19
+target=android-19
 android.library.reference.1=../appcompat_v7
 android.library.reference.2=../../Downloads/adt-bundle-linux-x86-20140702/sdk/extras/android/support/v7/appcompat

res/drawable-hdpi/greenstartbutton.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" >
+        <shape>
+            <solid
+                android:color="#70c656" />
+            <stroke
+                android:width="1dp"
+                android:color="#53933f" />
+            <corners
+                android:radius="3dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient
+                android:startColor="#70c656"
+                android:endColor="#53933f"
+                android:angle="270" />
+            <stroke
+                android:width="1dp"
+                android:color="#53933f" />
+            <corners
+                android:radius="4dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+</selector>

res/drawable-hdpi/orangebutton.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" >
+        <shape>
+            <solid
+                android:color="#f3ae1b" />
+            <stroke
+                android:width="1dp"
+                android:color="#bb6008" />
+            <corners
+                android:radius="3dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient
+                android:startColor="#f3ae1b"
+                android:endColor="#bb6008"
+                android:angle="270" />
+            <stroke
+                android:width="1dp"
+                android:color="#bb6008" />
+            <corners
+                android:radius="4dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+</selector>

res/drawable-hdpi/redpausebutton.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" >
+        <shape>
+            <solid
+                android:color="#ef4444" />
+            <stroke
+                android:width="1dp"
+                android:color="#992f2f" />
+            <corners
+                android:radius="3dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <gradient
+                android:startColor="#ef4444"
+                android:endColor="#992f2f"
+                android:angle="270" />
+            <stroke
+                android:width="1dp"
+                android:color="#992f2f" />
+            <corners
+                android:radius="3dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+</selector>

res/layout/activity_edit_recording.xml

@@ -111,10 +111,11 @@
 	            android:layout_width="0dp"
 	            android:layout_height="wrap_content"
 	            android:layout_marginLeft="0dp"
-	            android:layout_marginTop="250dp"
+	            android:layout_marginTop="300dp"
 	            android:layout_weight="1"
 	            android:onClick="onSave"
 	            android:text="@string/btnSave"
+	            android:background="@drawable/orangebutton"
 	            android:width="160dp" />
 
 	        <Button
@@ -123,9 +124,10 @@
 	            android:layout_height="wrap_content"
 	            android:layout_marginLeft="15dp"
 	            android:layout_marginRight="0dp"
-	            android:layout_marginTop="250dp"
+	            android:layout_marginTop="300dp"
 	            android:layout_weight="1"
 	            android:text="@string/btnCancel"
+	            android:background="@drawable/orangebutton"
 	            android:width="170dp"
 	            android:onClick="onCancel" />
 	    </TableRow>

res/layout/activity_edit_task.xml

@@ -109,7 +109,7 @@
 		            android:layout_width="0dp"
 		            android:layout_height="wrap_content"
 		            android:layout_weight="1"
-		            android:background="@drawable/roundedbutton"
+		            android:background="@drawable/orangebutton"
 		            android:text="@string/btnEdit"
 		            android:width="160dp" />
 
@@ -118,7 +118,7 @@
 		            android:layout_width="0dp"
 		            android:layout_height="wrap_content"
 		            android:layout_weight="1"
-		            android:background="@drawable/roundedbutton"
+		            android:background="@drawable/orangebutton"
 		            android:text="@string/btnUpdate"
 		            android:width="160dp" />
 
@@ -128,7 +128,7 @@
 		            android:layout_height="wrap_content"
 		            android:layout_marginLeft="20dp"
 		            android:layout_weight="1"
-		            android:background="@drawable/roundedbutton"
+		            android:background="@drawable/orangebutton"
 		            android:text="@string/btnCancel"
 		            android:width="170dp" />
 		    </TableRow>

res/layout/activity_main.xml

@@ -31,6 +31,7 @@
             android:layout_alignParentLeft="true"
             android:layout_alignParentRight="true"
             android:onClick="Start"
+            android:background="@drawable/greenstartbutton"
             android:text="@string/btnStart" />
 
         <iiitd.mc.timetracker.view.TaskAutoCompleteTextView
@@ -50,8 +51,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
         android:textSize="20sp"
+        android:textAllCaps="true"
+        android:textStyle="bold"
         android:layout_below="@+id/root_layout"
-        android:background="@color/AppOrange"
         android:text="@string/recentTv"/>
 
     <ListView 

res/layout/activity_new_task.xml

@@ -30,7 +30,7 @@
 			<iiitd.mc.timetracker.view.TaskAutoCompleteTextView
 				android:id="@+id/taskSelectionBox"
 				android:layout_height="wrap_content"
-				android:layout_width="wrap_content"
+				android:layout_width="match_parent"
 				android:ems="10"
 				android:gravity="top|left"
 				android:inputType="textAutoComplete|textAutoCorrect"/>
@@ -42,7 +42,7 @@
 	 	    android:layout_width="match_parent"
 	 	    android:layout_height="wrap_content"
 	 	    android:layout_below="@+id/row1"
-	 	    android:layout_marginTop="40dp" >
+	 	    android:layout_marginTop="30dp" >
 
 	 	    <TextView
 	 	        android:id="@+id/tasknametextview"
@@ -63,7 +63,7 @@
 	 	    android:layout_width="match_parent"
 	 	    android:layout_height="wrap_content"
 	 	    android:layout_below="@+id/row2"
-	 	    android:layout_marginTop="60dp" >
+	 	    android:layout_marginTop="50dp" >
 
 	 	    <TextView
 	 	        android:id="@+id/description"
@@ -86,7 +86,7 @@
 	 	        android:ems="10"
 	 	        android:inputType="textMultiLine"
 	 	        android:maxLines="10"
-	 	        android:scrollbars="vertical" />
+	 	        android:scrollbars="vertical"/>
 	 	</TableRow>
 
 	 	<TableRow
@@ -99,9 +99,9 @@
 	 	        android:layout_width="0dp"
 	 	        android:layout_height="wrap_content"
 	 	        android:layout_marginLeft="0dp"
-	 	        android:layout_marginTop="100dp"
+	 	        android:layout_marginTop="70dp"
 	 	        android:layout_weight="1"
-	 	        android:background="@drawable/roundedbutton"
+	 	        android:background="@drawable/orangebutton"
 	 	        android:text="@string/btnDone"
 	 	        android:width="160dp" />
 
@@ -111,9 +111,9 @@
 	 	        android:layout_height="wrap_content"
 	 	        android:layout_marginLeft="15dp"
 	 	        android:layout_marginRight="0dp"
-	 	        android:layout_marginTop="100dp"
+	 	        android:layout_marginTop="70dp"
 	 	        android:layout_weight="1"
-	 	        android:background="@drawable/roundedbutton"
+	 	        android:background="@drawable/orangebutton"
 	 	        android:text="@string/btnClear"
 	 	        android:width="170dp" />
 	 	</TableRow>

res/layout/activity_overall_statistics.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:orientation="vertical"
+	android:fillViewport="true">
+
+
+
+	<LinearLayout
+
+		android:layout_height="wrap_content"	
+		android:layout_width="fill_parent"
+		android:orientation="vertical"
+		android:weightSum="1"
+		android:layout_gravity="top"
+		android:background="@android:color/transparent">
+
+		    <TextView 
+		        android:id="@+id/timeRangeTv"
+		        android:layout_width="wrap_content"
+		        android:layout_height="wrap_content"
+		        android:layout_gravity="center"
+		        android:textSize="20sp"/>
+
+		    <View
+			    android:layout_width="fill_parent"
+			    android:layout_height="1dp"
+			    android:layout_gravity="center"
+			    android:background="@android:color/darker_gray"/>
+
+		    <LinearLayout
+
+				android:orientation="vertical"
+				android:layout_width="fill_parent"
+				android:layout_height="350dp"
+				android:paddingLeft="10sp"
+				android:paddingRight="10sp"			
+				android:id="@+id/chart"			
+				android:layout_gravity="center_horizontal"			
+				android:background="@android:color/transparent">
+
+		        <TextView
+		        android:layout_width="match_parent"
+		        android:layout_height="match_parent"
+		        android:gravity="center"
+		        android:id="@+id/no_data1"/>
+
+		    </LinearLayout>
+
+	</LinearLayout>
+</ScrollView>

res/layout/activity_running.xml

@@ -47,7 +47,9 @@
                 android:layout_height="wrap_content"
                 android:onClick="Pause"
                 android:padding="10dp"
+                android:layout_marginRight="20dp"
                 android:text="@string/btnPause"
+                android:background="@drawable/orangebutton"
                 android:visibility="visible" />
 
             <Button
@@ -56,7 +58,9 @@
                 android:layout_height="wrap_content"
                 android:onClick="Resume"
                 android:padding="10dp"
+                android:layout_marginRight="20dp"
                 android:text="@string/btnResume"
+                android:background="@drawable/greenstartbutton"
                 android:visibility="gone" />
 
             <Button
@@ -65,7 +69,8 @@
                 android:layout_height="wrap_content"
                 android:padding="10dp"
                 android:onClick="Stop"
-                android:text="@string/btnStop" />
+                android:text="@string/btnStop"
+                android:background="@drawable/redpausebutton" />
         </LinearLayout>
 
     </LinearLayout>