From 9ae4458e98865a671bd25326f48bba2fd587aff9 Mon Sep 17 00:00:00 2001
From: IvanaE <ebivibe@users.noreply.github.com>
Date: Sun, 11 Nov 2018 18:35:17 -0500
Subject: [PATCH] added latest updates

---
 .../olympusservices/ServiceProvider.java      |  5 ++
 .../main/res/layout/activity_edit_profile.xml | 74 +++++++++++++++----
 .../app/src/main/res/values/styles.xml        |  5 +-
 3 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProvider.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProvider.java
index 8836b9f..c7b0165 100644
--- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProvider.java
+++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/ServiceProvider.java
@@ -25,6 +25,11 @@ public class ServiceProvider extends UserType {
      */
     private int[][] availabilities;
 
+    private String address;
+    private String phonenumber;
+    private String companyname;
+    private boolean licensed;
+
 
     /**
      * Constructor for the service object which takes the parameters to
diff --git a/OlympusServices/app/src/main/res/layout/activity_edit_profile.xml b/OlympusServices/app/src/main/res/layout/activity_edit_profile.xml
index a1165d6..0806dfd 100644
--- a/OlympusServices/app/src/main/res/layout/activity_edit_profile.xml
+++ b/OlympusServices/app/src/main/res/layout/activity_edit_profile.xml
@@ -20,27 +20,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <TextView
-                android:id="@+id/Title"
-                android:layout_width="300dp"
-                android:layout_height="80dp"
-                android:layout_marginBottom="10dp"
-                android:gravity="center"
-                android:text="Edit Profile"
-                android:textAppearance="@style/TextAppearance.AppCompat.Large"
-                android:textColor="@android:color/white"
-                android:textSize="30sp"
-                android:layout_marginTop="10dp"
-                app:fontFamily="@font/julius_sans_one" />
-
-
             //component used from https://github.com/rengwuxian/MaterialEditText
 
             <com.rengwuxian.materialedittext.MaterialEditText
                 android:id="@+id/FirstNameInput"
                 android:layout_width="match_parent"
                 android:layout_height="80dp"
-                android:layout_marginTop="30dp"
                 android:background="@drawable/customborder"
                 android:hint="First Name"
                 android:textSize="15sp"
@@ -63,8 +48,65 @@
                 app:met_primaryColor="@color/colorWhite"
                 app:met_singleLineEllipsis="true"
                 android:textCursorDrawable="@color/colorWhite"/>
-            //component used from https://github.com/rengwuxian/MaterialEditText
 
+            //component used from https://github.com/rengwuxian/MaterialEditText
+            <com.rengwuxian.materialedittext.MaterialEditText
+                android:id="@+id/CompanyNameInput"
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:background="@drawable/customborder"
+                android:hint="Company Name"
+                android:textSize="15sp"
+                app:met_baseColor="@android:color/white"
+                app:met_floatingLabel="highlight"
+                app:met_primaryColor="@color/colorWhite"
+                app:met_singleLineEllipsis="true"
+                android:textCursorDrawable="@color/colorWhite"/>
+
+
+            //component used from https://github.com/rengwuxian/MaterialEditText
+            <com.rengwuxian.materialedittext.MaterialEditText
+                android:id="@+id/PhoneNumberInput"
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:background="@drawable/customborder"
+                android:hint="Phone Number"
+                android:textSize="15sp"
+                app:met_baseColor="@android:color/white"
+                app:met_floatingLabel="highlight"
+                app:met_primaryColor="@color/colorWhite"
+                app:met_singleLineEllipsis="true"
+                android:inputType="phone"
+                android:textCursorDrawable="@color/colorWhite"/>
+
+
+            //component used from https://github.com/rengwuxian/MaterialEditText
+            <com.rengwuxian.materialedittext.MaterialEditText
+                android:id="@+id/AddressInput"
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
+                android:background="@drawable/customborder"
+                android:hint="Address"
+                android:textSize="15sp"
+                app:met_baseColor="@android:color/white"
+                app:met_floatingLabel="highlight"
+                app:met_primaryColor="@color/colorWhite"
+                app:met_singleLineEllipsis="true"
+                android:textCursorDrawable="@color/colorWhite"/>
+
+
+            <CheckBox
+                android:id="@+id/checkBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Licensed"
+                android:textSize="15sp"
+                android:textColor="@color/colorWhite"
+                android:buttonTint="@color/colorWhite"
+                android:layout_marginBottom="15dp"/>
+
+
+            //component used from https://github.com/rengwuxian/MaterialEditText
             <com.rengwuxian.materialedittext.MaterialEditText
                 android:id="@+id/PasswordInput"
                 android:layout_width="match_parent"
diff --git a/OlympusServices/app/src/main/res/values/styles.xml b/OlympusServices/app/src/main/res/values/styles.xml
index 3b46a0f..d0cae83 100644
--- a/OlympusServices/app/src/main/res/values/styles.xml
+++ b/OlympusServices/app/src/main/res/values/styles.xml
@@ -4,8 +4,8 @@
     <style name="AppTheme" parent="Base.Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+        <item name="colorPrimaryDark">@color/colorWhite</item>
+        <item name="colorAccent">@color/colorWhite</item>
     </style>
 
     <style name="AppTheme.Button" parent="Widget.AppCompat.Button.Colored">
@@ -13,4 +13,5 @@
         <item name="android:textColor">@color/colorBlack</item>
     </style>
 
+
 </resources>