batuhan-basoglu/SEG2105-Olympus-Android-Application
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added appointment class and finished ui

Browse source
This commit is contained in:
IvanaE 2018-10-05 12:35:05 -04:00
parent 0677226a71
commit cd4c3e1e3f
5 changed files with 137 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OlympusServices/.idea/vcs.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

6
OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/Appointment.java Normal file
View file

@ -0,0 +1,6 @@
package com.uottawa.olympus.olympusservices;
public class Appointment {
Service service;
ServiceProvider provider;
}

54
OlympusServices/app/src/main/res/layout/activity_log_in.xml
View file

@ -13,4 +13,58 @@
android:background="@drawable/background" android:background="@drawable/background"
tools:context=".LogIn"> tools:context=".LogIn">
<TextView
android:id="@+id/Title"
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_marginBottom="20dp"
android:gravity="center"
android:text="@string/signup"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="36sp"
app:fontFamily="@font/julius_sans_one" />
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/UsernameInput"
android:layout_width="match_parent"
android:layout_height="70dp"
android:background="@color/colorWhite"
android:hint="Username"
android:textSize="20sp"
android:layout_marginTop="40dp"
app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent"
app:met_singleLineEllipsis="true" />
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/PasswordInput"
android:layout_width="match_parent"
android:layout_height="70dp"
android:background="@drawable/customborder"
android:hint="Password"
android:textSize="20sp"
android:layout_marginTop="20dp"
app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent"
app:met_singleLineEllipsis="true" />
<Button
android:theme="@style/AppTheme.Button"
android:id="@+id/SignUp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/login"
android:layout_marginTop="40dp"
/>
</LinearLayout> </LinearLayout>

35
OlympusServices/app/src/main/res/layout/activity_sign_up.xml
View file

@ -17,7 +17,7 @@
android:id="@+id/Title" android:id="@+id/Title"
android:layout_width="300dp" android:layout_width="300dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginBottom="40dp" android:layout_marginBottom="20dp"
android:gravity="center" android:gravity="center"
android:text="@string/signup" android:text="@string/signup"
android:textAppearance="@style/TextAppearance.AppCompat.Large" android:textAppearance="@style/TextAppearance.AppCompat.Large"
@ -36,13 +36,13 @@
<com.jaredrummler.materialspinner.MaterialSpinner <com.jaredrummler.materialspinner.MaterialSpinner
android:id="@+id/RoleInput" android:id="@+id/RoleInput"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="50dp"
android:layout_marginBottom="15dp" /> android:layout_marginBottom="10dp" />
<com.rengwuxian.materialedittext.MaterialEditText <com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/UsernameInput" android:id="@+id/UsernameInput"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="70dp"
android:background="@color/colorWhite" android:background="@color/colorWhite"
android:hint="Username" android:hint="Username"
android:textSize="20sp" android:textSize="20sp"
@ -54,38 +54,47 @@
<com.rengwuxian.materialedittext.MaterialEditText <com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/PasswordInput" android:id="@+id/PasswordInput"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="70dp"
android:background="@drawable/customborder"
android:hint="Password" android:hint="Password"
android:textSize="20sp" android:textSize="20sp"
app:met_baseColor="@android:color/white" app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight" app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent" app:met_primaryColor="?colorAccent"
app:met_singleLineEllipsis="true" app:met_singleLineEllipsis="true" />
android:background="@drawable/customborder"/>
<com.rengwuxian.materialedittext.MaterialEditText <com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/FirstNameInput" android:id="@+id/FirstNameInput"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="70dp"
android:background="@drawable/customborder"
android:hint="First Name" android:hint="First Name"
android:textSize="20sp" android:textSize="20sp"
app:met_baseColor="@android:color/white" app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight" app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent" app:met_primaryColor="?colorAccent"
app:met_singleLineEllipsis="true" app:met_singleLineEllipsis="true" />
android:background="@drawable/customborder"/>
<com.rengwuxian.materialedittext.MaterialEditText <com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/LastNameInput" android:id="@+id/LastNameInput"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="70dp"
android:background="@drawable/customborder"
android:hint="Last Name" android:hint="Last Name"
android:textSize="20sp" android:textSize="20sp"
app:met_baseColor="@android:color/white" app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight" app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent" app:met_primaryColor="?colorAccent"
app:met_singleLineEllipsis="true" app:met_singleLineEllipsis="true" />
android:background="@drawable/customborder"/>
<Button
android:theme="@style/AppTheme.Button"
android:id="@+id/SignUp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/signup"
android:layout_marginTop="20dp"/>

49
OlympusServices/app/src/main/res/layout/activity_welcome.xml
View file

@ -13,4 +13,53 @@
android:background="@drawable/background" android:background="@drawable/background"
tools:context=".Welcome"> tools:context=".Welcome">
<TextView
android:id="@+id/Welcome"
android:layout_width="300dp"
android:layout_height="80dp"
android:layout_marginBottom="20dp"
android:gravity="center"
android:text="Welcome"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="36sp"
android:layout_marginTop="50dp"
app:fontFamily="@font/julius_sans_one" />
<TextView
android:id="@+id/name"
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_marginBottom="20dp"
android:gravity="center"
android:text="FirstNameHere"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="36sp"
app:fontFamily="@font/julius_sans_one" />
<TextView
android:id="@+id/Roleis"
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_marginBottom="20dp"
android:gravity="center"
android:text="You are logged in as"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="36sp"
app:fontFamily="@font/julius_sans_one" />
<TextView
android:id="@+id/Role"
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_marginBottom="20dp"
android:gravity="center"
android:text="RoleHere"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="36sp"
app:fontFamily="@font/julius_sans_one" />
</LinearLayout> </LinearLayout>