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

deliverable 3 ui, methods to be filled in

Browse source
This commit is contained in:
IvanaE 2018-11-11 15:52:55 -05:00
parent 16e39ff120
commit 32f1031782
18 changed files with 1153 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
OlympusServices/app/src/main/res/layout/activity_services_list.xml → OlympusServices/app/src/main/res/layout/activity_admin_services_list.xml
View file

@ -11,7 +11,7 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/background"
tools:context=".ServicesList">
tools:context=".AdminServicesList">
<LinearLayout
android:layout_width="match_parent"

92
OlympusServices/app/src/main/res/layout/activity_edit_profile.xml Normal file
View file

@ -0,0 +1,92 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/background"
tools:context=".EditProfile">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:orientation="vertical"
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"
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/LastNameInput"
android:layout_width="match_parent"
android:layout_height="80dp"
android:background="@drawable/customborder"
android:hint="Last 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/PasswordInput"
android:layout_width="match_parent"
android:layout_height="80dp"
android:background="@drawable/customborder"
android:hint="Password"
android:textSize="15sp"
app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight"
app:met_primaryColor="@color/colorWhite"
app:met_singleLineEllipsis="true"
android:inputType="textPassword"
android:textCursorDrawable="@color/colorWhite"/>
<Button
android:id="@+id/SignUp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Save"
android:onClick="Save"
android:theme="@style/AppTheme.Button" />
</LinearLayout>
</ScrollView>
</LinearLayout>

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

@ -16,8 +16,9 @@
<TextView
android:id="@+id/Title"
android:layout_width="300dp"
android:layout_height="50dp"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:paddingTop="20dp"
android:gravity="center"
android:text="@string/login"
android:textAppearance="@style/TextAppearance.AppCompat.Large"

350
OlympusServices/app/src/main/res/layout/activity_service_provider_availabilities.xml Normal file
View file

@ -0,0 +1,350 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/background"
tools:context=".ServiceProviderAvailabilities">
<TableLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TableRow
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="10dp">
<TextView
android:id="@+id/Day"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="Day"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="15sp"
android:layout_marginTop="10dp"
android:layout_gravity="center_vertical"/>
<TextView
android:id="@+id/Start"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:paddingLeft="20dp"
android:text="Start"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="15sp"
android:layout_marginTop="10dp"
android:layout_gravity="center_vertical"/>
<TextView
android:id="@+id/End"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:paddingLeft="20dp"
android:text="End"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="15sp"
android:layout_marginTop="10dp"
android:layout_gravity="center_vertical"/>
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="45dp">
<TextView
android:id="@+id/Monday"
android:layout_width="105dp"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="Monday"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="15sp"
android:layout_marginTop="10dp"
android:layout_gravity="center_vertical"/>
<Button
android:id="@+id/MondayStart"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="Start"
android:theme="@style/AppTheme.Button"
android:onClick="onClick"
android:layout_marginRight="10dp"/>
<Button
android:id="@+id/MondayEnd"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="End"
android:layout_marginRight="10dp"
android:onClick="onClick"
android:theme="@style/AppTheme.Button" />
<Button
android:id="@+id/DeleteMon"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:text="X"
android:onClick="onRemove"
android:theme="@style/AppTheme.Button" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="10dp">
<TextView
android:id="@+id/Tuesday"
android:layout_width="105dp"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="Tuesday"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="15sp"
android:layout_marginTop="10dp"
android:layout_gravity="center_vertical"/>
<Button
android:id="@+id/TuesdayStart"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="Start"
android:theme="@style/AppTheme.Button"
android:onClick="onClick"
android:layout_marginRight="10dp"/>
<Button
android:id="@+id/TuesdayEnd"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="End"
android:layout_marginRight="10dp"
android:onClick="onClick"
android:theme="@style/AppTheme.Button" />
<Button
android:id="@+id/DeleteTuesday"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:text="X"
android:onClick="onRemove"
android:theme="@style/AppTheme.Button" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="10dp">
<TextView
android:id="@+id/Wednesday"
android:layout_width="105dp"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="Wednesday"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="15sp"
android:layout_marginTop="10dp"
android:layout_gravity="center_vertical"/>
<Button
android:id="@+id/WednesdayStart"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="Start"
android:theme="@style/AppTheme.Button"
android:onClick="onClick"
android:layout_marginRight="10dp"/>
<Button
android:id="@+id/WednesdayEnd"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="End"
android:layout_marginRight="10dp"
android:onClick="onClick"
android:theme="@style/AppTheme.Button" />
<Button
android:id="@+id/DeleteWednesday"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:text="X"
android:onClick="onRemove"
android:theme="@style/AppTheme.Button" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="10dp">
<TextView
android:id="@+id/Thursday"
android:layout_width="105dp"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="Thursday"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="15sp"
android:layout_marginTop="10dp"
android:layout_gravity="center_vertical"/>
<Button
android:id="@+id/ThursdayStart"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="Start"
android:theme="@style/AppTheme.Button"
android:onClick="onClick"
android:layout_marginRight="10dp"/>
<Button
android:id="@+id/ThursdayEnd"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="End"
android:layout_marginRight="10dp"
android:onClick="onClick"
android:theme="@style/AppTheme.Button" />
<Button
android:id="@+id/DeleteThursday"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:text="X"
android:onClick="onRemove"
android:theme="@style/AppTheme.Button" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="10dp">
<TextView
android:id="@+id/Friday"
android:layout_width="105dp"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="Friday"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="15sp"
android:layout_marginTop="10dp"
android:layout_gravity="center_vertical"/>
<Button
android:id="@+id/FridayStart"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="Start"
android:theme="@style/AppTheme.Button"
android:onClick="onClick"
android:layout_marginRight="10dp"/>
<Button
android:id="@+id/FridayEnd"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="End"
android:layout_marginRight="10dp"
android:onClick="onClick"
android:theme="@style/AppTheme.Button" />
<Button
android:id="@+id/DeleteFriday"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:text="X"
android:onClick="onRemove"
android:theme="@style/AppTheme.Button" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="10dp">
<TextView
android:id="@+id/Saturday"
android:layout_width="105dp"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="Saturday"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="15sp"
android:layout_marginTop="10dp"
android:layout_gravity="center_vertical"/>
<Button
android:id="@+id/SaturdayStart"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="Start"
android:theme="@style/AppTheme.Button"
android:onClick="onClick"
android:layout_marginRight="10dp"/>
<Button
android:id="@+id/SaturdayEnd"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="End"
android:layout_marginRight="10dp"
android:onClick="onClick"
android:theme="@style/AppTheme.Button" />
<Button
android:id="@+id/DeleteSaturday"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:text="X"
android:onClick="onRemove"
android:theme="@style/AppTheme.Button" />
</TableRow>
<TableRow
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginTop="10dp">
<TextView
android:id="@+id/Sunday"
android:layout_width="105dp"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="Sunday"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="15sp"
android:layout_marginTop="10dp"
android:layout_gravity="center_vertical"/>
<Button
android:id="@+id/SundayStart"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="Start"
android:theme="@style/AppTheme.Button"
android:onClick="onClick"
android:layout_marginRight="10dp"/>
<Button
android:id="@+id/SundayEnd"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:text="End"
android:layout_marginRight="10dp"
android:onClick="onClick"
android:theme="@style/AppTheme.Button" />
<Button
android:id="@+id/DeleteSunday"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:text="X"
android:onClick="onRemove"
android:theme="@style/AppTheme.Button" />
</TableRow>
</TableLayout>
</LinearLayout>

98
OlympusServices/app/src/main/res/layout/activity_service_provider_services_list.xml Normal file
View file

@ -0,0 +1,98 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/background"
tools:context=".ServiceProviderServicesList">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="10dp">
<TextView
android:id="@+id/Title1"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:layout_marginBottom="5dp"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:text="Name"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="15sp" />
<TextView
android:id="@+id/Title2"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:text="Hourly Rate"
android:gravity="end"
android:paddingRight="10dp"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="15sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.RecyclerView
android:id="@+id/Services"
android:scrollbars="vertical"
android:layout_width="match_parent"
android:layout_height="300dp"/>
</LinearLayout>
<TextView
android:id="@+id/Title3"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="Click on service to remove"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="15sp" />
// component used from https://github.com/jaredrummler/MaterialSpinner
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="20dp">
<com.jaredrummler.materialspinner.MaterialSpinner
android:id="@+id/ServicesInput"
android:layout_width="250dp"
android:layout_height="45dp"
android:layout_weight="1"
android:layout_marginTop="5dp"/>
<Button
android:id="@+id/newService"
android:layout_width="wrap_content"
android:layout_height="55dp"
android:layout_weight="1"
android:onClick="addService"
android:text="Add"
android:textSize="10sp"
android:theme="@style/AppTheme.Button"/>
</LinearLayout>
</LinearLayout>

64
OlympusServices/app/src/main/res/layout/activity_service_provider_welcome.xml
View file

@ -1,9 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/background"
tools:context=".ServiceProviderWelcome">
<TextView
android:id="@+id/Welcome"
android:layout_width="300dp"
android:layout_height="80dp"
android:layout_marginBottom="10dp"
android:gravity="center"
android:text="Welcome"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="20sp"
android:layout_marginTop="10dp"
app:fontFamily="@font/julius_sans_one" />
</android.support.constraint.ConstraintLayout>
<Button
android:id="@+id/Profile"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="10dp"
android:onClick="EditProfile"
android:text="Profile"
android:theme="@style/AppTheme.Button" />
<Button
android:id="@+id/Services"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="15dp"
android:onClick="EditServices"
android:text="Services"
android:theme="@style/AppTheme.Button" />
<Button
android:id="@+id/Availabilities"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="15dp"
android:text="Availabilities"
android:onClick="EditAvailabilities"
android:theme="@style/AppTheme.Button" />
<Button
android:id="@+id/Bookings"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="20dp"
android:text="Bookings"
android:theme="@style/AppTheme.Button" />
<Button
android:id="@+id/LogOut"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="15dp"
android:onClick="LogOut"
android:text="Logout"
android:theme="@style/AppTheme.Button" />
</LinearLayout>

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

@ -13,24 +13,13 @@
android:background="@drawable/background"
tools:context=".SignUp">
<ScrollView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/Title"
android:layout_width="300dp"
android:layout_height="20dp"
android:layout_marginBottom="10dp"
android:gravity="center"
android:text="@string/signup"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="15sp"
app:fontFamily="@font/julius_sans_one" />
<TextView
android:id="@+id/textView"

23
OlympusServices/app/src/main/res/layout/dialog_service_delete.xml Normal file
View file

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:id="@+id/Title1"
android:layout_width="300dp"
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:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/black"
android:textSize="15sp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:textAlignment="center"/>
</LinearLayout>