diff --git a/OlympusServices/.idea/misc.xml b/OlympusServices/.idea/misc.xml index 99202cc..c0f68ed 100644 --- a/OlympusServices/.idea/misc.xml +++ b/OlympusServices/.idea/misc.xml @@ -25,7 +25,7 @@ - + diff --git a/OlympusServices/.idea/vcs.xml b/OlympusServices/.idea/vcs.xml index 35eb1dd..62bd7a0 100644 --- a/OlympusServices/.idea/vcs.xml +++ b/OlympusServices/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file 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 887e5f8..9432068 100644 --- a/OlympusServices/app/src/main/res/layout/activity_log_in.xml +++ b/OlympusServices/app/src/main/res/layout/activity_log_in.xml @@ -31,8 +31,8 @@ android:layout_width="match_parent" android:layout_height="80dp" android:background="@color/colorWhite" - android:hint="Username" android:textSize="15sp" + android:hint="@string/username" android:layout_marginTop="40dp" app:met_baseColor="@android:color/white" app:met_floatingLabel="highlight" @@ -45,8 +45,8 @@ android:layout_width="match_parent" android:layout_height="80dp" android:background="@drawable/customborder" - android:hint="Password" android:textSize="15sp" + android:hint="@string/password" android:layout_marginTop="20dp" app:met_baseColor="@android:color/white" app:met_floatingLabel="highlight" diff --git a/OlympusServices/app/src/main/res/values/strings.xml b/OlympusServices/app/src/main/res/values/strings.xml index b6a75bf..0714d08 100644 --- a/OlympusServices/app/src/main/res/values/strings.xml +++ b/OlympusServices/app/src/main/res/values/strings.xml @@ -19,6 +19,8 @@ Log In Enter Username Enter Password + Password + Username Admin User diff --git a/README.md b/README.md index 3835589..1a09c36 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # SEG2105-Olympus SEG2105 final project, Ivana Erlich, Anshu Sharma, Batuhan Basoglu, Mary Tran +https://github.com/ebivibe/SEG2105-Olympus diff --git a/UML Class Diagram.docx b/UML Class Diagram.docx index 1b6097c..4c3da81 100644 Binary files a/UML Class Diagram.docx and b/UML Class Diagram.docx differ