From 66a5b5226f3d23b79100a9844d466d6f981d627e Mon Sep 17 00:00:00 2001
From: Bobby Donald <bobbydonald25@gmail.com>
Date: Thu, 4 Dec 2014 14:49:08 -0500
Subject: [PATCH 1/2] ripple effects for buttons

---
 Apps/Motion/res/layout-v11/main.xml           |   9 +-
 Apps/Motion/res/layout-v21/main.xml           | 157 ++++++++++++++++++
 Apps/Motion/res/layout/main.xml               |   2 +-
 .../src/edu/uml/cs/isense/motion/Motion.java  |  30 +++-
 .../res/drawable-v21/button_bar_green.xml     |  21 +++
 .../res/drawable-v21/button_bar_rsense.xml    |  21 +++
 .../res/drawable-v21/button_rsense.xml        |  80 +++++++++
 .../res/drawable-v21/button_rsense_green.xml  |  80 +++++++++
 .../button_rsense_ripple_green.xml            |  80 +++++++++
 9 files changed, 468 insertions(+), 12 deletions(-)
 create mode 100644 Apps/Motion/res/layout-v21/main.xml
 create mode 100644 Libs/iSENSE Imports/res/drawable-v21/button_bar_green.xml
 create mode 100644 Libs/iSENSE Imports/res/drawable-v21/button_bar_rsense.xml
 create mode 100644 Libs/iSENSE Imports/res/drawable-v21/button_rsense.xml
 create mode 100644 Libs/iSENSE Imports/res/drawable-v21/button_rsense_green.xml
 create mode 100644 Libs/iSENSE Imports/res/drawable-v21/button_rsense_ripple_green.xml

diff --git a/Apps/Motion/res/layout-v11/main.xml b/Apps/Motion/res/layout-v11/main.xml
index b33b5e81..9e474f5d 100644
--- a/Apps/Motion/res/layout-v11/main.xml
+++ b/Apps/Motion/res/layout-v11/main.xml
@@ -13,6 +13,7 @@
         android:id="@+id/leftChevron"
         android:layout_width="40dp"
         android:layout_height="60dp"
+        style="?android:borderlessButtonStyle"
         android:layout_toLeftOf="@+id/leftChevron"
         android:layout_alignParentLeft="true"
         android:text="@string/font_awesome_icon_left_chevron"
@@ -30,6 +31,7 @@
         android:id="@+id/rightChevron"
         android:layout_width="40dp"
         android:layout_height="60dp"
+        style="?android:borderlessButtonStyle"
         android:layout_alignParentRight="true"
         android:background="@drawable/chevron"
         android:textColor="@android:color/white"
@@ -53,8 +55,9 @@
 	            android:id="@+id/b_rate"
 	            android:layout_width="match_parent"
 	            android:layout_height="40dp"
-	            android:background="@drawable/button_rsense"
-	            android:text="Rate"
+                style="?android:selectableItemBackground"
+                android:background="@drawable/button_rsense"
+                android:text="Rate"
 	            android:layout_weight="1"
 	            android:textColor="#0066FF"
 	            android:textSize="14sp"
@@ -129,7 +132,7 @@
 
         <Button
             android:id="@+id/b_upload"
-            style="?android:attr/buttonBarButtonStyle"
+            style="?android:selectableItemBackground"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
diff --git a/Apps/Motion/res/layout-v21/main.xml b/Apps/Motion/res/layout-v21/main.xml
new file mode 100644
index 00000000..13a84f85
--- /dev/null
+++ b/Apps/Motion/res/layout-v21/main.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+<RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <Button
+        android:id="@+id/leftChevron"
+        android:layout_width="40dp"
+        android:layout_height="60dp"
+        style="?android:borderlessButtonStyle"
+        android:layout_toLeftOf="@+id/leftChevron"
+        android:layout_alignParentLeft="true"
+        android:text="@string/font_awesome_icon_left_chevron"
+        android:textColor="@android:color/white"
+        android:background="@drawable/chevron"/>
+
+   <android.support.v4.view.ViewPager
+       android:id="@+id/viewpager_fields"
+       android:layout_width="match_parent"
+       android:layout_toRightOf="@+id/leftChevron"
+       android:layout_toLeftOf="@+id/rightChevron"
+       android:layout_height= "60dp"/>
+
+    <Button
+        android:id="@+id/rightChevron"
+        android:layout_width="40dp"
+        android:layout_height="60dp"
+        style="?android:borderlessButtonStyle"
+        android:layout_alignParentRight="true"
+        android:background="@drawable/chevron"
+        android:textColor="@android:color/white"
+        android:text="@string/font_awesome_icon_right_chevron" />
+
+</RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_rateanddurationbuttons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="20dp">
+          <TextView
+            android:id="@+id/tv_rate"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="5dp"
+            android:text="Rate:" /> 
+        
+	        <Button
+	            android:id="@+id/b_rate"
+	            android:layout_width="match_parent"
+	            android:layout_height="40dp"
+                style="?android:selectableItemBackground"
+                android:background="@drawable/button_rsense"
+                android:text="Rate"
+	            android:layout_weight="1"
+	            android:textColor="#0066FF"
+	            android:textSize="14sp"
+	            android:textStyle="bold" />
+	        
+	        <TextView
+            android:id="@+id/tv_length"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="5dp"
+            android:text="Length:" />
+	        
+	        <Button
+	            android:id="@+id/b_length"
+	            android:layout_width="match_parent"
+	            android:layout_height="40dp"
+	            android:layout_weight="1"
+	            android:background="@drawable/button_rsense"
+	            android:text="Length"
+	            android:textColor="#0066FF"
+	            android:textSize="14sp"
+	            android:textStyle="bold" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/startStop"
+        android:layout_width="fill_parent"
+        android:background="@drawable/button_rsense_ripple_green"
+        android:layout_height="0dp"
+        android:layout_marginBottom="10dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="10dp"
+        android:layout_weight="0.79"
+        android:text="@string/holdToStart"
+        android:textColor="#0066FF"
+        android:textSize="30sp" />
+
+    <RelativeLayout
+        android:id="@+id/rl_nameandlogin"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="20dp">
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_marginRight="10dp"
+            android:gravity="left|center_vertical"
+            android:text="@string/nameWithColon" />
+
+        <Button
+            android:id="@+id/b_name"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_toRightOf="@id/tv_name"
+            android:background="@drawable/button_rsense"
+            android:text="@string/john_smith"
+	        android:textColor="#0066FF"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+    </RelativeLayout>
+    
+     <LinearLayout
+        android:id="@+id/ll_project"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/b_upload"
+            style="?android:selectableItemBackground"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@drawable/button_bar_green"
+            android:text="@string/upload"
+            android:textColor="#FFF"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/b_project"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@drawable/button_bar_rsense"
+            android:text="@string/genericproj"
+	        android:textColor="#0066FF"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Apps/Motion/res/layout/main.xml b/Apps/Motion/res/layout/main.xml
index 7206b4a9..9d282f1e 100644
--- a/Apps/Motion/res/layout/main.xml
+++ b/Apps/Motion/res/layout/main.xml
@@ -87,7 +87,7 @@
         android:layout_marginRight="20dp"
         android:layout_marginTop="10dp"
         android:layout_weight="0.79"
-        android:background="@drawable/button_rsense"
+        android:background="@drawable/button_rsense_ripple_green"
         android:text="@string/holdToStart"
         android:textColor="#0066FF"
         android:textSize="30sp" />
diff --git a/Apps/Motion/src/edu/uml/cs/isense/motion/Motion.java b/Apps/Motion/src/edu/uml/cs/isense/motion/Motion.java
index 406c4da0..6bbc7003 100644
--- a/Apps/Motion/src/edu/uml/cs/isense/motion/Motion.java
+++ b/Apps/Motion/src/edu/uml/cs/isense/motion/Motion.java
@@ -214,14 +214,16 @@ public void run() {
         leftChevronB.setTypeface(typeface);
         rightChevronB.setTypeface(typeface);
 
-
         if (RecordingService.running) {
 			startStop.setBackgroundResource(R.drawable.button_rsense_green);
 			startStop.setText("Recording");
-		} else {
+		} else if(getApiLevel() < 21) {
 			startStop.setBackgroundResource(R.drawable.button_rsense);
 			startStop.setText("Hold to Start");
-		}
+		} else if(getApiLevel() >= 21) {
+            startStop.setBackgroundResource(R.drawable.button_rsense_ripple_green);
+            startStop.setText("Hold to Start");
+        }
 
 		SharedPreferences namePrefs = getSharedPreferences(
 				EnterName.PREFERENCES_KEY_USER_INFO, MODE_PRIVATE);
@@ -269,7 +271,11 @@ public void onReceive(Context context, Intent intent) {
 						invalidateOptionsMenu();
 
                 } else if(intent.hasExtra("BUTTONSTOP")) {
-					startStop.setBackgroundResource(R.drawable.button_rsense);
+                    if(getApiLevel() < 21) {
+                        startStop.setBackgroundResource(R.drawable.button_rsense);
+                    } else {
+                        startStop.setBackgroundResource(R.drawable.button_rsense_ripple_green);
+                    }
                     startStop.setText("Hold to Start");
 
         			useMenu = true;
@@ -295,8 +301,12 @@ public boolean onLongClick(View arg0) {
 				mMediaPlayer.start();
 
                 if (RecordingService.running) {
-					startStop.setBackgroundResource(R.drawable.button_rsense);
-					startStop.setText("Hold to Start");
+                    if(getApiLevel() < 21) {
+                        startStop.setBackgroundResource(R.drawable.button_rsense);
+                    } else {
+                        startStop.setBackgroundResource(R.drawable.button_rsense_ripple_green);
+                    }
+                    startStop.setText("Hold to Start");
 					useMenu = true;
 					if (android.os.Build.VERSION.SDK_INT >= 11)
 						invalidateOptionsMenu();
@@ -433,8 +443,12 @@ public void onResume() {
 		//this sets the layout the correct layout for when it is not recording
 		//this is relevant if recording finishes while the app is in the background
 		if(!RecordingService.running) {
-			startStop.setBackgroundResource(R.drawable.button_rsense);
-	        startStop.setText("Hold to Start");
+            if(getApiLevel() < 21) {
+                startStop.setBackgroundResource(R.drawable.button_rsense);
+            } else {
+                startStop.setBackgroundResource(R.drawable.button_rsense_ripple_green);
+            }
+            startStop.setText("Hold to Start");
 
 			useMenu = true;
 			if (android.os.Build.VERSION.SDK_INT >= 11)
diff --git a/Libs/iSENSE Imports/res/drawable-v21/button_bar_green.xml b/Libs/iSENSE Imports/res/drawable-v21/button_bar_green.xml
new file mode 100644
index 00000000..bc9ef322
--- /dev/null
+++ b/Libs/iSENSE Imports/res/drawable-v21/button_bar_green.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:colorControlHighlight">
+
+    <item android:state_enabled="false"><shape>
+            <gradient android:angle="90" android:endColor="#C0C0C0" android:startColor="#B0B0B0" />
+
+            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
+        </shape></item>
+    <item android:state_pressed="true"><shape>
+            <gradient android:angle="270" android:endColor="#265906" android:startColor="#2B6605" />
+
+            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
+        </shape></item>
+    <item><shape>
+            <gradient android:angle="90" android:endColor="#46A807" android:startColor="#408911" />
+
+            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
+        </shape></item>
+
+</ripple>
\ No newline at end of file
diff --git a/Libs/iSENSE Imports/res/drawable-v21/button_bar_rsense.xml b/Libs/iSENSE Imports/res/drawable-v21/button_bar_rsense.xml
new file mode 100644
index 00000000..54c4ac98
--- /dev/null
+++ b/Libs/iSENSE Imports/res/drawable-v21/button_bar_rsense.xml	
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:colorControlHighlight">
+
+    <item android:state_enabled="false"><shape>
+            <gradient android:angle="90" android:endColor="#C0C0C0" android:startColor="#B0B0B0" />
+
+            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
+        </shape></item>
+    <item android:state_pressed="true"><shape>
+            <gradient android:angle="270" android:endColor="#D8D8D8" android:startColor="#D0D0D0" />
+
+            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
+        </shape></item>
+    <item><shape>
+            <gradient android:angle="90" android:endColor="#D8D8D8" android:startColor="#E0E0E0" />
+
+            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
+        </shape></item>
+
+</ripple>
\ No newline at end of file
diff --git a/Libs/iSENSE Imports/res/drawable-v21/button_rsense.xml b/Libs/iSENSE Imports/res/drawable-v21/button_rsense.xml
new file mode 100644
index 00000000..e65967dd
--- /dev/null
+++ b/Libs/iSENSE Imports/res/drawable-v21/button_rsense.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:colorControlHighlight">
+    
+    <item android:state_enabled="false" >        
+        <shape>
+            <gradient
+                android:endColor="#C0C0C0"
+                android:startColor="#C0C0C0"
+                android:angle="90" />
+            <stroke
+                android:width="2dp"
+                android:color="#CCCCCC" />
+            <corners
+                android:radius="8dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+    
+    <item android:state_pressed="true" >
+        <shape>
+            <gradient
+                android:startColor="#B0B0B0"
+                android:endColor="#A0A0A0"
+                android:angle="270" />
+            <stroke
+                android:width="2dp"
+                android:color="#0066FF" />
+            <corners
+                android:radius="8dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+
+    <item android:state_focused="true" >
+        <shape>
+            <gradient
+                android:startColor="#B0B0B0"
+                android:endColor="#A0A0A0"
+                android:angle="270" />
+            <stroke
+                android:width="2dp"
+                android:color="#CCCCCC" />
+            <corners
+                android:radius="8dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+
+    <item>        
+        <shape>
+            <gradient
+                android:endColor="#D8D8D8"
+                android:startColor="#E0E0E0"
+                android:angle="90" />
+            <stroke
+                android:width="2dp"
+                android:color="#CCCCCC" />
+            <corners
+                android:radius="8dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/Libs/iSENSE Imports/res/drawable-v21/button_rsense_green.xml b/Libs/iSENSE Imports/res/drawable-v21/button_rsense_green.xml
new file mode 100644
index 00000000..2abdc154
--- /dev/null
+++ b/Libs/iSENSE Imports/res/drawable-v21/button_rsense_green.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:colorControlHighlight">
+    
+    <item android:state_enabled="false" >
+        <shape>
+            <gradient
+                android:endColor="#83EB71"
+                android:startColor="#beffa8"
+                android:angle="90" />
+            <stroke
+                android:width="2dp"
+                android:color="#CCCCCC" />
+            <corners
+                android:radius="15dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+    
+    <item android:state_pressed="true" >
+        <shape>
+            <gradient
+                android:endColor="#CBF0C7"
+                android:startColor="#A9C9A5"
+                android:angle="270" />
+            <stroke
+                android:width="2dp"
+                android:color="#CCCCCC" />
+            <corners
+                android:radius="15dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+
+    <item android:state_focused="true" >
+        <shape>
+            <gradient
+                android:startColor="#B0B0B0"
+                android:endColor="#A0A0A0"
+                android:angle="270" />
+            <stroke
+                android:width="2dp"
+                android:color="#CCCCCC" />
+            <corners
+                android:radius="15dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+
+    <item>
+        <shape>
+            <gradient
+                android:endColor="#CBF0C7"
+                android:startColor="#A9C9A5"
+                android:angle="90" />
+            <stroke
+                android:width="2dp"
+                android:color="#CCCCCC" />
+            <corners
+                android:radius="15dp" />
+            <padding
+                android:left="10dp"
+                android:top="10dp"
+                android:right="10dp"
+                android:bottom="10dp" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/Libs/iSENSE Imports/res/drawable-v21/button_rsense_ripple_green.xml b/Libs/iSENSE Imports/res/drawable-v21/button_rsense_ripple_green.xml
new file mode 100644
index 00000000..5f3b9608
--- /dev/null
+++ b/Libs/iSENSE Imports/res/drawable-v21/button_rsense_ripple_green.xml	
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="#83EB71">
+
+<item android:state_enabled="false" >
+    <shape>
+        <gradient
+            android:endColor="#C0C0C0"
+            android:startColor="#C0C0C0"
+            android:angle="90" />
+        <stroke
+            android:width="2dp"
+            android:color="#CCCCCC" />
+        <corners
+            android:radius="8dp" />
+        <padding
+            android:left="10dp"
+            android:top="10dp"
+            android:right="10dp"
+            android:bottom="10dp" />
+    </shape>
+</item>
+
+<item android:state_pressed="true" >
+    <shape>
+        <gradient
+            android:startColor="#B0B0B0"
+            android:endColor="#A0A0A0"
+            android:angle="270" />
+        <stroke
+            android:width="2dp"
+            android:color="#0066FF" />
+        <corners
+            android:radius="8dp" />
+        <padding
+            android:left="10dp"
+            android:top="10dp"
+            android:right="10dp"
+            android:bottom="10dp" />
+    </shape>
+</item>
+
+<item android:state_focused="true" >
+    <shape>
+        <gradient
+            android:startColor="#B0B0B0"
+            android:endColor="#A0A0A0"
+            android:angle="270" />
+        <stroke
+            android:width="2dp"
+            android:color="#CCCCCC" />
+        <corners
+            android:radius="8dp" />
+        <padding
+            android:left="10dp"
+            android:top="10dp"
+            android:right="10dp"
+            android:bottom="10dp" />
+    </shape>
+</item>
+
+<item>
+    <shape>
+        <gradient
+            android:endColor="#D8D8D8"
+            android:startColor="#E0E0E0"
+            android:angle="90" />
+        <stroke
+            android:width="2dp"
+            android:color="#CCCCCC" />
+        <corners
+            android:radius="8dp" />
+        <padding
+            android:left="10dp"
+            android:top="10dp"
+            android:right="10dp"
+            android:bottom="10dp" />
+    </shape>
+</item>
+</ripple>
\ No newline at end of file

From 56b66314c7d1180da595ef314375b8684eb26ff6 Mon Sep 17 00:00:00 2001
From: Bobby Donald <bobbydonald25@gmail.com>
Date: Thu, 4 Dec 2014 15:20:46 -0500
Subject: [PATCH 2/2] fixed logic for chevron

---
 Apps/Motion/src/edu/uml/cs/isense/motion/Motion.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Apps/Motion/src/edu/uml/cs/isense/motion/Motion.java b/Apps/Motion/src/edu/uml/cs/isense/motion/Motion.java
index 6bbc7003..25263abd 100644
--- a/Apps/Motion/src/edu/uml/cs/isense/motion/Motion.java
+++ b/Apps/Motion/src/edu/uml/cs/isense/motion/Motion.java
@@ -390,8 +390,8 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
                 int current = fields.getCurrentItem();
-                if (current-1 > 0)
-                    fields.setCurrentItem(current - 1);
+                if (current > 0)
+                    fields.setCurrentItem(current-1);
             }
         });