diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/DeleteServiceDialogFragment.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/DeleteServiceDialogFragment.java
index 5427179..031cfae 100644
--- a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/DeleteServiceDialogFragment.java
+++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/DeleteServiceDialogFragment.java
@@ -40,7 +40,7 @@ public class DeleteServiceDialogFragment extends DialogFragment{
// Pass null as the parent view because its going in the dialog layout
builder.setView(inflater.inflate(R.layout.dialog_service_delete, null))
// Add action buttons
- .setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() {
+ .setPositiveButton(R.string.remove, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
Bundle args = new Bundle();
diff --git a/OlympusServices/app/src/main/res/layout/activity_log_in.xml b/OlympusServices/app/src/main/res/layout/activity_log_in.xml
index 746e4f2..c45a55d 100644
--- a/OlympusServices/app/src/main/res/layout/activity_log_in.xml
+++ b/OlympusServices/app/src/main/res/layout/activity_log_in.xml
@@ -12,6 +12,13 @@
android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/background"
tools:context=".LogIn">
+
+
-
+
+
diff --git a/OlympusServices/app/src/main/res/layout/dialog_service_delete.xml b/OlympusServices/app/src/main/res/layout/dialog_service_delete.xml
index 606b92f..2e3551b 100644
--- a/OlympusServices/app/src/main/res/layout/dialog_service_delete.xml
+++ b/OlympusServices/app/src/main/res/layout/dialog_service_delete.xml
@@ -11,12 +11,12 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_weight="1"
- android:text="Are you sure you want to delete this service?"
+ android:text="Are you sure you want to remove this service from your account?"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/black"
android:textSize="15sp"
android:layout_marginLeft="20dp"
- android:layout_marginRight="20dp"
+ android:layout_marginRight="40dp"
/>
diff --git a/OlympusServices/app/src/main/res/values/strings.xml b/OlympusServices/app/src/main/res/values/strings.xml
index fd35a05..aec11dc 100644
--- a/OlympusServices/app/src/main/res/values/strings.xml
+++ b/OlympusServices/app/src/main/res/values/strings.xml
@@ -27,6 +27,7 @@
Cancel
Update
Delete
+ Remove
Add
- Admin