From ff0b8f42ac08c1d313db7660e3cc1c25ef7b4350 Mon Sep 17 00:00:00 2001
From: AkankshaBodhankar <kmit.akankshabodhankar@gmail.com>
Date: Thu, 3 Mar 2016 15:28:41 +0530
Subject: [PATCH 1/5] GUI enhancements for buttons

Appropriate style created in xml file button_shape and added to all the
buttons
---
 .../src/main/res/drawable/button_shape.xml    | 24 +++++++++++++++++++
 .../main/res/layout/activity_addactivity.xml  |  4 +++-
 .../main/res/layout/activity_addcohort.xml    |  4 +++-
 .../res/layout/activity_addindicators.xml     |  8 +++++--
 .../res/layout/activity_addmeasurement.xml    |  4 +++-
 .../res/layout/activity_cohortdetails.xml     |  8 +++++--
 .../src/main/res/layout/activity_login.xml    |  5 +++-
 .../layout/activity_measurementdetails.xml    |  8 +++++--
 .../src/main/res/layout/activity_welcome.xml  | 20 ++++++++++++----
 9 files changed, 71 insertions(+), 14 deletions(-)
 create mode 100644 PeaceTrack/app/src/main/res/drawable/button_shape.xml

diff --git a/PeaceTrack/app/src/main/res/drawable/button_shape.xml b/PeaceTrack/app/src/main/res/drawable/button_shape.xml
new file mode 100644
index 0000000..44daee1
--- /dev/null
+++ b/PeaceTrack/app/src/main/res/drawable/button_shape.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <corners
+        android:radius="6dp"
+        />
+    <solid
+        android:color="#223875"
+        />
+
+    <padding
+        android:left="0dp"
+        android:top="0dp"
+        android:right="0dp"
+        android:bottom="0dp"
+        />
+    <size
+        android:width="250dp"
+        android:height="60dp"
+        />
+    <stroke
+        android:width="1dp"
+        android:color="#878787"
+        />
+</shape>
\ No newline at end of file
diff --git a/PeaceTrack/app/src/main/res/layout/activity_addactivity.xml b/PeaceTrack/app/src/main/res/layout/activity_addactivity.xml
index 30d163d..7632fe3 100644
--- a/PeaceTrack/app/src/main/res/layout/activity_addactivity.xml
+++ b/PeaceTrack/app/src/main/res/layout/activity_addactivity.xml
@@ -227,7 +227,9 @@
             android:text="@string/save"
             android:textColor="@android:color/white"
             android:textSize="22sp"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            android:background="@drawable/button_shape"
+ />
     </LinearLayout>
 
 </ScrollView>
diff --git a/PeaceTrack/app/src/main/res/layout/activity_addcohort.xml b/PeaceTrack/app/src/main/res/layout/activity_addcohort.xml
index 36e3108..43cf8c7 100644
--- a/PeaceTrack/app/src/main/res/layout/activity_addcohort.xml
+++ b/PeaceTrack/app/src/main/res/layout/activity_addcohort.xml
@@ -67,7 +67,9 @@
 	          android:text="@string/save"
 	          android:textColor="@android:color/white"
 	          android:textSize="22sp"
-	          android:textStyle="bold" />
+	          android:textStyle="bold"
+                           android:background="@drawable/button_shape"
+                 />
     
 </LinearLayout>
 </ScrollView>
diff --git a/PeaceTrack/app/src/main/res/layout/activity_addindicators.xml b/PeaceTrack/app/src/main/res/layout/activity_addindicators.xml
index 2e5b77c..16cd456 100644
--- a/PeaceTrack/app/src/main/res/layout/activity_addindicators.xml
+++ b/PeaceTrack/app/src/main/res/layout/activity_addindicators.xml
@@ -122,7 +122,9 @@
 	          android:text="@string/addanotheroutput"
 	          android:textColor="@android:color/white"
 	          android:textSize="22sp"
-	          android:textStyle="bold" />
+	          android:textStyle="bold" 
+              android:background="@drawable/button_shape"
+               />
     
     <Button
 	          android:id="@+id/save"
@@ -137,6 +139,8 @@
 	          android:text="@string/save"
 	          android:textColor="@android:color/white"
 	          android:textSize="22sp"
-	          android:textStyle="bold" />
+	          android:textStyle="bold" 
+              android:background="@drawable/button_shape"
+         />
     </LinearLayout>
     </ScrollView>
\ No newline at end of file
diff --git a/PeaceTrack/app/src/main/res/layout/activity_addmeasurement.xml b/PeaceTrack/app/src/main/res/layout/activity_addmeasurement.xml
index aac0a26..7095018 100644
--- a/PeaceTrack/app/src/main/res/layout/activity_addmeasurement.xml
+++ b/PeaceTrack/app/src/main/res/layout/activity_addmeasurement.xml
@@ -104,7 +104,9 @@
 	          android:text="@string/save"
 	          android:textColor="@android:color/white"
 	          android:textSize="22sp"
-	          android:textStyle="bold" />
+	          android:textStyle="bold"
+              android:background="@drawable/button_shape"
+                />
     
 </LinearLayout>
 </ScrollView>
diff --git a/PeaceTrack/app/src/main/res/layout/activity_cohortdetails.xml b/PeaceTrack/app/src/main/res/layout/activity_cohortdetails.xml
index 19c2a47..8787855 100644
--- a/PeaceTrack/app/src/main/res/layout/activity_cohortdetails.xml
+++ b/PeaceTrack/app/src/main/res/layout/activity_cohortdetails.xml
@@ -93,7 +93,9 @@
         android:padding="10dp"
         android:text="@string/addnewactivity"
         android:textStyle="bold"
-        android:id="@+id/addnewactivitybutton"/>
+        android:id="@+id/addnewactivitybutton"
+        android:background="@drawable/button_shape"
+/>
     <Button
         android:textSize="22sp"
         android:textColor="@android:color/white"
@@ -102,6 +104,8 @@
         android:padding="10dp"
         android:text="@string/addnewmeasurement"
         android:textStyle="bold"
-        android:id="@+id/addnewmeasurementbutton"/>
+        android:id="@+id/addnewmeasurementbutton"
+        android:background="@drawable/button_shape"
+/>
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/PeaceTrack/app/src/main/res/layout/activity_login.xml b/PeaceTrack/app/src/main/res/layout/activity_login.xml
index 34d47f0..6ab32bb 100644
--- a/PeaceTrack/app/src/main/res/layout/activity_login.xml
+++ b/PeaceTrack/app/src/main/res/layout/activity_login.xml
@@ -132,7 +132,10 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:layout_gravity="center"
-            android:text="@string/addacountbutton" />
+            android:text="@string/addacountbutton" 
+            android:textColor="@android:color/white"
+            android:background="@drawable/button_shape"
+/>
 
     </RelativeLayout>
 
diff --git a/PeaceTrack/app/src/main/res/layout/activity_measurementdetails.xml b/PeaceTrack/app/src/main/res/layout/activity_measurementdetails.xml
index 6d231b1..f0b3752 100644
--- a/PeaceTrack/app/src/main/res/layout/activity_measurementdetails.xml
+++ b/PeaceTrack/app/src/main/res/layout/activity_measurementdetails.xml
@@ -93,7 +93,9 @@
         android:padding="10dp"
         android:text="@string/addnewactivity"
         android:textStyle="bold"
-        android:id="@+id/addnewactivitybutton"/>
+        android:id="@+id/addnewactivitybutton"
+        android:background="@drawable/button_shape"
+   />
     <Button
         android:textSize="22sp"
         android:textColor="@android:color/white"
@@ -102,6 +104,8 @@
         android:padding="10dp"
         android:text="@string/addnewmeasurement"
         android:textStyle="bold"
-        android:id="@+id/addnewmeasurementbutton"/>
+        android:id="@+id/addnewmeasurementbutton"
+        android:background="@drawable/button_shape"
+/>
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/PeaceTrack/app/src/main/res/layout/activity_welcome.xml b/PeaceTrack/app/src/main/res/layout/activity_welcome.xml
index 79fcaed..76d1bdb 100644
--- a/PeaceTrack/app/src/main/res/layout/activity_welcome.xml
+++ b/PeaceTrack/app/src/main/res/layout/activity_welcome.xml
@@ -27,7 +27,10 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="30dp"
         android:padding="20dp"
-        android:text="@string/cohort" />
+        android:text="@string/cohort"
+        android:textColor="@android:color/white"
+        android:background="@drawable/button_shape"
+ />
 
     <Button
         android:id="@+id/impactButton"
@@ -35,7 +38,10 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
         android:padding="20dp"
-        android:text="@string/impact" />
+        android:text="@string/impact"
+        android:textColor="@android:color/white"
+        android:background="@drawable/button_shape"
+ />
 
     <Button
         android:id="@+id/addActivityButton"
@@ -43,7 +49,10 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
         android:padding="20dp"
-        android:text="@string/quickactivity" />
+        android:text="@string/quickactivity" 
+        android:textColor="@android:color/white"
+        android:background="@drawable/button_shape"
+/>
     
     <Button
         android:id="@+id/addMeasurementButton"
@@ -51,6 +60,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
         android:padding="20dp"
-        android:text="@string/quickmeasurement" />
+        android:text="@string/quickmeasurement"
+        android:textColor="@android:color/white"
+        android:background="@drawable/button_shape"
+ />
 
 </LinearLayout>
\ No newline at end of file

From 3485b75d442b4d26cd910a67578442b97c789f52 Mon Sep 17 00:00:00 2001
From: AkankshaBodhankar <kmit.akankshabodhankar@gmail.com>
Date: Mon, 7 Mar 2016 15:14:07 +0530
Subject: [PATCH 2/5] Updates rounded_edittext.xml to enhance GUI

---
 PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml b/PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml
index e376afa..baf7db6 100644
--- a/PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml
+++ b/PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml
@@ -3,6 +3,9 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
 android:shape="rectangle" android:padding="10dp">
  <solid android:color="#FFFFFF"/>
+ <stroke
+     android:width="2dp"
+     android:color="#223875" />
     <corners
      android:bottomRightRadius="5dp"
      android:bottomLeftRadius="5dp"

From 03e0046a08d3c6653d5087d55a179fdab40e6051 Mon Sep 17 00:00:00 2001
From: AkankshaBodhankar <kmit.akankshabodhankar@gmail.com>
Date: Mon, 7 Mar 2016 15:16:15 +0530
Subject: [PATCH 3/5] Update rounded_edittext.xml

---
 PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml b/PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml
index baf7db6..e376afa 100644
--- a/PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml
+++ b/PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml
@@ -3,9 +3,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
 android:shape="rectangle" android:padding="10dp">
  <solid android:color="#FFFFFF"/>
- <stroke
-     android:width="2dp"
-     android:color="#223875" />
     <corners
      android:bottomRightRadius="5dp"
      android:bottomLeftRadius="5dp"

From e3cb42d56a6a8ca2bcac8badc8bf6ea1897ce7d5 Mon Sep 17 00:00:00 2001
From: AkankshaBodhankar <kmit.akankshabodhankar@gmail.com>
Date: Mon, 7 Mar 2016 15:18:09 +0530
Subject: [PATCH 4/5] GUI enhancement for edit text

---
 PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml b/PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml
index e376afa..baf7db6 100644
--- a/PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml
+++ b/PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml
@@ -3,6 +3,9 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
 android:shape="rectangle" android:padding="10dp">
  <solid android:color="#FFFFFF"/>
+ <stroke
+     android:width="2dp"
+     android:color="#223875" />
     <corners
      android:bottomRightRadius="5dp"
      android:bottomLeftRadius="5dp"

From 11a44d144c00cd70d9e8115ecfbdecb31435bf38 Mon Sep 17 00:00:00 2001
From: AkankshaBodhankar <kmit.akankshabodhankar@gmail.com>
Date: Mon, 7 Mar 2016 15:23:35 +0530
Subject: [PATCH 5/5] Update rounded_edittext.xml

---
 PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml b/PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml
index baf7db6..940b198 100644
--- a/PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml
+++ b/PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml
@@ -3,9 +3,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
 android:shape="rectangle" android:padding="10dp">
  <solid android:color="#FFFFFF"/>
- <stroke
-     android:width="2dp"
-     android:color="#223875" />
+
     <corners
      android:bottomRightRadius="5dp"
      android:bottomLeftRadius="5dp"