Compare commits

...

138 commits

Author SHA1 Message Date
Batuhan Berk Başoğlu
24b16fd8b1 Finished the test files 2018-11-14 13:59:26 -05:00
Batuhan Berk Başoğlu
2eb8555ae5 Added 2 Test Cases 2018-11-14 12:45:59 -05:00
Batuhan Berk Başoğlu
e45e742d71 merging with master 2018-11-14 12:34:44 -05:00
Batuhan Berk Başoğlu
3be59387a4 Updated the branch 2018-11-14 12:26:28 -05:00
IvanaE
3155b66a7e layout fixes 2018-11-13 22:29:17 -05:00
IvanaE
94b333ded9 fixed availability time formating 2018-11-13 22:20:01 -05:00
IvanaE
4a7c058c5f actually fixed license this time 2018-11-13 22:14:51 -05:00
IvanaE
a88a575e7c fixed sort of 2018-11-13 22:11:19 -05:00
IvanaE
696c4e4e4b fixed services page 2018-11-13 21:54:44 -05:00
Batuhan Berk Başoğlu
0ae6c76777 Deleted useless docx file 2018-11-13 16:10:57 -05:00
Batuhan Berk Başoğlu
d4fd4900ed Fixed UML 2018-11-13 16:07:24 -05:00
IvanaE
caafe441b9 fixes still needed 2018-11-13 15:17:41 -05:00
IvanaE
a517c63e7a finished edit profile? 2018-11-13 14:21:45 -05:00
IvanaE
bf2b4ae004 think i got them all 2018-11-13 14:00:01 -05:00
IvanaE
c3f35ad540 pls work 2018-11-13 13:57:03 -05:00
IvanaE
e374be7175 one more go 2018-11-13 13:53:55 -05:00
IvanaE
4202da62cb how about now? 2018-11-13 13:49:26 -05:00
IvanaE
1da25d2aff broken code will be fixed soon :( 2018-11-13 13:40:14 -05:00
Batuhan Berk Başoğlu
19b42bf9a5 Updated UML Diagram 2018-11-12 17:26:29 -05:00
FunwithaPorpoise
ad48945e19 Merge pull request #16 from ebivibe/DBBranch
Updated DBHelper for Deliverable 3
2018-11-11 23:27:18 -05:00
Mary Tran
39b59d5660 Fixed HomeOwner to ServiceProvider 2018-11-11 23:25:07 -05:00
Mary Tran
9a93d20dce Updated DBHelper for Deliverable 3 2018-11-11 22:55:47 -05:00
IvanaE
6b0686fbdf added latest updates 2018-11-11 18:35:17 -05:00
IvanaE
32f1031782 deliverable 3 ui, methods to be filled in 2018-11-11 15:52:55 -05:00
Anshu Sharma
16e39ff120 changes 2018-11-11 12:15:02 -05:00
Anshu Sharma
9c6c3ea257 Comment ' 2018-11-11 11:59:46 -05:00
Batuhan Berk Başoğlu
4fd07d81b1 Updated UML Diagram 2018-11-11 11:47:23 -05:00
Anshu Sharma
b730557cec Fixed constructor 2018-11-11 11:40:03 -05:00
Anshu Sharma
65fc33daa1 Availabilities 2018-11-11 11:37:05 -05:00
IvanaE
47a422705d added deliverable 2 submission 2018-11-09 23:40:13 -05:00
IvanaE
bd8ef59874 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus 2018-11-09 23:32:59 -05:00
IvanaE
89985db38f final ui changes 2018-11-09 23:32:40 -05:00
Batuhan Berk Başoğlu
38f3a14dbf changed uml 2018-11-09 21:42:58 -05:00
IvanaE
d5824827cf Update README.md 2018-11-09 17:52:30 -05:00
IvanaE
1d8b1d6dfb removed comma 2018-11-09 17:51:14 -05:00
IvanaE
8e3c6db4ef Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus 2018-11-09 17:36:11 -05:00
IvanaE
5687572fda made ui look pretty 2018-11-09 17:35:48 -05:00
Anshu Sharma
24c15fafa0 fix conflict 2018-11-09 11:53:12 -05:00
Anshu Sharma
163b1173cf comments for project. 2018-11-09 11:48:05 -05:00
IvanaE
df6c25b065 fixed password length 2018-11-08 11:43:43 -05:00
IvanaE
8ae08f829b added service exists verification 2018-11-07 14:16:54 -05:00
IvanaE
cc8e5946c5 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus 2018-11-07 13:50:58 -05:00
IvanaE
95e281fc87 added field checking, fixed some errors 2018-11-07 13:50:10 -05:00
Batuhan Berk Başoğlu
d1f7e5a81c Added comments to test files 2018-11-07 13:47:06 -05:00
Batuhan Berk Başoğlu
c5d85d3f5c Testing 2018-11-07 13:28:41 -05:00
IvanaE
f615b2f6e1 file wasn't stages 2018-11-07 11:39:37 -05:00
IvanaE
4520816740 Merge branch 'lBranch'
# Conflicts:
#	OlympusServices/.idea/caches/build_file_checksums.ser
#	OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditServiceDialogFragment.java
#	OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/NewServiceDialogFragment.java
2018-11-07 11:39:08 -05:00
IvanaE
ef6446f05b chaoe ensuing 2018-11-07 11:28:54 -05:00
Anshu Sharma
d4f1433f91 whatever 2018-11-07 11:26:51 -05:00
Batuhan Basoglu
aa56f4d772 testing 123 2018-11-03 22:54:32 -04:00
IvanaE
c11c42c305 removed USELESS file 2018-11-02 19:07:36 -04:00
IvanaE
88c6150dff Create config.yml 2018-11-02 19:03:47 -04:00
IvanaE
76f860b9eb Delete config.yml 2018-11-02 19:03:11 -04:00
IvanaE
a92cda9aed Create config.yml 2018-11-02 19:02:09 -04:00
IvanaE
e02b30c0ba no message 2018-11-02 18:57:00 -04:00
IvanaE
ab9fa36a68 fixed indenting 2018-11-02 18:50:00 -04:00
IvanaE
59317ddf37 already so done with circle ci 2018-11-02 18:49:26 -04:00
IvanaE
676c92763e trying changing path 2018-11-02 18:41:07 -04:00
IvanaE
62fd194ad9 one more time 2018-11-02 18:39:32 -04:00
IvanaE
4831f71cd4 trying circle ci again :( 2018-11-02 18:35:56 -04:00
IvanaE
dff3eda2f5 added circle ci config 2018-11-02 18:32:44 -04:00
IvanaE
e38d34b9eb fixed table alignment 2018-11-02 18:14:32 -04:00
IvanaE
afe8db8c2d Update README.md 2018-11-02 12:25:07 -04:00
Batuhan Berk Başoğlu
0d0fa1ed99 Updated readme file 2018-11-02 12:18:54 -04:00
Batuhan Berk Başoğlu
0ad149265f Merged JUnit with Master 2018-11-02 11:40:15 -04:00
Batuhan Berk Başoğlu
4862bc8a7b made some fix 2018-11-02 00:19:46 -04:00
Batuhan Berk Başoğlu
295242e572 added all test files 2018-11-02 00:18:07 -04:00
Batuhan Berk Başoğlu
4fcbb34f38 made 3 test cases for each class 2018-11-01 23:17:34 -04:00
Batuhan Berk Başoğlu
672a241e88 Fixed test files 2018-11-01 21:29:48 -04:00
Batuhan Berk Başoğlu
3a4c792cb5 Added more test cases 2018-11-01 21:17:32 -04:00
Batuhan Berk Başoğlu
2ea28277c3 Fixed the order of tests 2018-11-01 21:09:22 -04:00
Batuhan Berk Başoğlu
45ede0cbd5 Added JUnit for SignUp 2018-11-01 21:04:55 -04:00
IvanaE
33611b8983 can no longer edit service name 2018-11-01 20:30:03 -04:00
IvanaE
ea0e8bd7d1 made it look pretty 2018-11-01 19:51:35 -04:00
IvanaE
8ac71c9cac fixed ui elements 2018-11-01 14:42:04 -04:00
IvanaE
6f49545aba fixed ui elements 2018-11-01 14:40:25 -04:00
IvanaE
695ab61b15 trying some wild stuff 2018-11-01 12:49:40 -04:00
Batuhan Berk Başoğlu
aa0fa2a4ba Updated test files 2018-10-31 13:31:46 -04:00
Batuhan Berk Başoğlu
ec69678da4 Added basic JUnit files 2018-10-31 13:24:01 -04:00
FunwithaPorpoise
674ed9352f Merge pull request #15 from ebivibe/DBBranch
Changing gridview text colour to white
2018-10-31 12:58:05 -04:00
Mary Tran
39ba11d11b Changing gridview text colour to white 2018-10-31 12:55:15 -04:00
Mary Tran
23293089cb Increased DB version. Changed User to HomeOwner in existing DBs 2018-10-30 12:24:46 -04:00
IvanaE
8b2532d27e made it pretty 2018-10-30 11:16:56 -04:00
IvanaE
073885ebeb accidentally changed to many things 2018-10-30 11:16:06 -04:00
IvanaE
3491212fbc refactored user to homeowner 2018-10-30 11:08:08 -04:00
IvanaE
7790edac33 added popups and services 2018-10-28 19:31:34 -04:00
FunwithaPorpoise
60c0da3558 Merge pull request #14 from ebivibe/DBBranch
Db branch
2018-10-26 22:25:34 -04:00
Batuhan Berk Başoğlu
6c270be5ce Updated UML Diagram for Deliverable 2 2018-10-26 14:43:41 -04:00
Mary Tran
7646deb05b Replacing a relic from the past 2018-10-25 21:24:33 -04:00
Mary Tran
97148737de Added Integration Tests for services table 2018-10-25 16:43:08 -04:00
Mary Tran
d29b03972e Added new table for services. Not tested yet 2018-10-25 16:14:38 -04:00
IvanaE
319428eebb updated zip 2018-10-23 17:24:38 -04:00
IvanaE
2da777b576 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus 2018-10-23 17:16:36 -04:00
IvanaE
22cfef6b7b fixed security of users 2018-10-23 17:16:18 -04:00
IvanaE
1f822b8181 Add files via upload
added deliverable 1 submission
2018-10-23 00:03:49 -04:00
Mary Tran
4fe5b70d6e Changed ListView to GridView for admin welcome page 2018-10-22 23:09:55 -04:00
IvanaE
c91d38cf18 added admin welcome page 2018-10-22 14:48:11 -04:00
FunwithaPorpoise
04362b99c0 Merge pull request #12 from ebivibe/DBBranch
Db branch
2018-10-22 14:25:17 -04:00
Mary Tran
8c35832b28 Fixing getAllUsers again 2018-10-22 14:23:01 -04:00
Mary Tran
f12d7aa693 Added admin first, and fixed getAllUsers 2018-10-21 21:27:35 -04:00
Mary Tran
3288d51cf7 Add Admin first, always, and fixed getAllUsers 2018-10-21 21:13:11 -04:00
IvanaE
4a725dd6d6 added field validation 2018-10-21 16:34:47 -04:00
IvanaE
a1d92aa423 fixed welcome page? 2018-10-19 19:04:28 -04:00
IvanaE
d740cf72d3 Merge branch 'lBranch'
# Conflicts:
#	OlympusServices/.idea/caches/build_file_checksums.ser
#	OlympusServices/.idea/vcs.xml
#	OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java
#	OlympusServices/app/src/main/res/layout/activity_main.xml
#	OlympusServices/app/src/main/res/layout/activity_sign_up.xml
#	OlympusServices/build.gradle
2018-10-19 19:02:28 -04:00
Anshu Sharma
8be4ccbbd7 Logic 2018-10-19 16:45:18 -04:00
IvanaE
fc2f8bba29 added logo 2018-10-18 12:32:21 -04:00
IvanaE
7edfe3a185 changed cursor from pink to white - gotta stay on brand 2018-10-18 11:55:18 -04:00
IvanaE
114c698b61 made password field not visible, pop up text white instead of pink 2018-10-18 11:48:01 -04:00
IvanaE
173f6097fd Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
# Conflicts:
#	OlympusServices/app/src/main/res/layout/activity_log_in.xml
2018-10-18 11:36:47 -04:00
IvanaE
f1c28f1a4c made layout look good on actual phones 2018-10-18 11:33:05 -04:00
Batuhan Berk Başoğlu
9cd04e06da Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus 2018-10-17 17:53:59 -04:00
Batuhan Berk Başoğlu
5599bd9179 Changed UML 2018-10-17 17:53:33 -04:00
IvanaE
9bb3534191 Update README.md 2018-10-17 13:20:45 -04:00
IvanaE
6f9590413f gave credit to style repos, removed admin option from sign up drop down 2018-10-15 10:36:54 -04:00
Batuhan Berk Başoğlu
ab84abd042 Fixed UML Diagram 2018-10-14 09:27:59 -04:00
Batuhan Berk Başoğlu
0d9cf73143 Fixed UML Diagram 2018-10-14 00:05:55 -04:00
Batuhan Berk Başoğlu
7cde8be55a Fixed UML Diagram 2018-10-14 00:02:58 -04:00
IvanaE
296aaf05e3 fixed merge conflict, when you pull check the right dependency is in your build.gradle file 2018-10-10 13:44:55 -04:00
IvanaE
1014a78de8 Merge pull request #1 from ebivibe/dbBranch
Added DBHelper for database access and DBTest. Added constructors, se…
2018-10-08 19:53:05 -04:00
Mary Tran
555932b877 Changed some unit test usernames to randomized string 2018-10-08 18:16:08 -04:00
Mary Tran
a80c6d37dc Added docs and ability to get a list of all users from database 2018-10-08 18:00:21 -04:00
Mary Tran
5a382baab4 Running unit tests with Robolectric instead of starting up emulator every time 2018-10-08 16:25:15 -04:00
Mary Tran
8ecd089fe3 Added DBHelper for database access and DBTest. Added constructors, setters, and getters to UserType classes 2018-10-08 11:48:58 -04:00
Batuhan Berk Başoğlu
bba1c248a1 fixed UML Class Diagram 2018-10-05 23:52:50 -04:00
Batuhan Berk Başoğlu
b22a32b4a2 Fixed UML Class Diagram 2018-10-05 23:51:28 -04:00
IvanaE
aa102421ef another text fix 2018-10-05 12:45:50 -04:00
IvanaE
e1b947ef43 fixed text 2018-10-05 12:45:07 -04:00
IvanaE
0499d81093 added borders 2018-10-05 12:38:13 -04:00
IvanaE
0b36bb32e3 added appointment class and finished ui 2018-10-05 12:35:05 -04:00
IvanaE
f299770923 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus 2018-10-05 11:57:47 -04:00
IvanaE
6b1ff038c8 created class files for UserType, User, ServiceProvider, Admin, Service 2018-10-05 11:57:32 -04:00
Batuhan Berk Başoğlu
bcfa204f44 fixed some file inconsistencies 2018-10-05 11:40:22 -04:00
Batuhan Berk Başoğlu
ac7e8aec0a fixed some file inconsistencies 2018-10-05 11:39:30 -04:00
Batuhan Berk Başoğlu
a9746fb215 Made the UML Class Diagram 2018-10-05 11:23:36 -04:00
Batuhan Berk Başoğlu
65bc8b2109 Made the UML Class Diagram 2018-10-05 11:20:01 -04:00
IvanaE
9cd853df11 fixed text colour 2018-10-04 14:14:59 -04:00
IvanaE
50b0fc49c1 Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus 2018-10-04 13:24:26 -04:00
Batuhan Berk Başoğlu
0aed26f071 I made a empty file for UML Class 2018-09-28 22:23:37 -04:00
85 changed files with 4744 additions and 73 deletions

32
.circleci/config.yml Normal file
View file

@ -0,0 +1,32 @@
version: 2
jobs:
build:
working_directory: ~/SEG2105-Olympus/OlympusServices
docker:
- image: circleci/android:api-28-alpha
environment:
JVM_OPTS: -Xmx3200m
steps:
- checkout:
path: ~/SEG2105-Olympus
- restore_cache:
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}
- run:
name: Chmod permissions
command: sudo chmod +x ./gradlew
- run:
name: Download Dependencies
command: ./gradlew androidDependencies
- save_cache:
paths:
- ~/.gradle
key: jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}
- run:
name: Run UnitTest
command: ./gradlew test
- store_artifacts:
path: app/build/outputs/apk/debug/
destination: apks/
- store_test_results:
path: app/build/test-results

BIN
Deliverable1.zip Normal file

Binary file not shown.

BIN
Deliverable2.zip Normal file

Binary file not shown.

View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="WizardSettings">
<option name="children">
<map>
<entry key="vectorWizard">
<value>
<PersistentState />
</value>
</entry>
</map>
</option>
</component>
</project>

View file

@ -25,7 +25,7 @@
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

View file

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

View file

@ -16,18 +16,32 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
testOptions {
unitTests {
includeAndroidResources = true
}
}
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:design:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
testImplementation 'junit:junit:4.12'
testImplementation 'androidx.test:core:1.0.0'
testImplementation 'org.mockito:mockito-core:1.10.19'
testImplementation 'org.robolectric:robolectric:4.0-alpha-3-SNAPSHOT'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
implementation 'com.jaredrummler:material-spinner:1.2.5'
implementation 'com.android.support:design:28.0.0-alpha3'
implementation 'com.rengwuxian.materialedittext:library:2.1.4'
implementation 'com.android.support:recyclerview-v7:28.0.0'
}
repositories {
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
}

View file

@ -0,0 +1,22 @@
package com.uottawa.olympus.olympusservices;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class)
public class LogInTest {
@Rule
public ActivityTestRule<LogIn> mActivityTestRule = new ActivityTestRule<LogIn>(LogIn.class);
@Test
public void checkSignIn() throws Exception{
}
}

View file

@ -0,0 +1,90 @@
package com.uottawa.olympus.olympusservices;
import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import android.widget.TextView;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import static android.support.test.espresso.Espresso.onData;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard;
import static android.support.test.espresso.action.ViewActions.typeText;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withSpinnerText;
import static java.util.regex.Pattern.matches;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.core.AllOf.allOf;
import static org.junit.Assert.*;
@RunWith(AndroidJUnit4.class)
public class SignUpTest {
@Rule
public ActivityTestRule<SignUp> mActivityTestRule = new ActivityTestRule<SignUp>(SignUp.class);
private SignUp mActivity=null;
private TextView text;
@Before
public void setUp() throws Exception {
mActivity = mActivityTestRule.getActivity();
}
@Test
public void checkSignUp1() throws Exception{
onView(withId(R.id.UsernameInput)).perform(typeText("John123"), closeSoftKeyboard());
onView(withId(R.id.PasswordInput)).perform(typeText("1234567890"), closeSoftKeyboard());
onView(withId(R.id.FirstNameInput)).perform(typeText("John"), closeSoftKeyboard());
onView(withId(R.id.LastNameInput)).perform(typeText("Doe"), closeSoftKeyboard());
onView(withId(R.id.SignUp)).perform(click());
}
@Test
public void checkSignUp2() throws Exception{
onView(withId(R.id.RoleInput)).perform(click());
onData(allOf(is(instanceOf(String.class)), is("Service Provider"))).perform(click());
onView(withId(R.id.UsernameInput)).perform(typeText("Service123"), closeSoftKeyboard());
onView(withId(R.id.PasswordInput)).perform(typeText("1234567890"), closeSoftKeyboard());
onView(withId(R.id.FirstNameInput)).perform(typeText("Jane"), closeSoftKeyboard());
onView(withId(R.id.LastNameInput)).perform(typeText("Doe"), closeSoftKeyboard());
onView(withId(R.id.SignUp)).perform(click());
}
@Test
public void checkSignUp3() throws Exception{
onView(withId(R.id.UsernameInput)).perform(typeText(""), closeSoftKeyboard());
onView(withId(R.id.PasswordInput)).perform(typeText(""), closeSoftKeyboard());
onView(withId(R.id.FirstNameInput)).perform(typeText(""), closeSoftKeyboard());
onView(withId(R.id.LastNameInput)).perform(typeText(""), closeSoftKeyboard());
onView(withId(R.id.SignUp)).perform(click());
}
@Test
public void checkSignUp4() throws Exception{
onView(withId(R.id.UsernameInput)).perform(typeText("$$$$$$"), closeSoftKeyboard());
onView(withId(R.id.PasswordInput)).perform(typeText("$$$$$$"), closeSoftKeyboard());
onView(withId(R.id.FirstNameInput)).perform(typeText("$$$$$$"), closeSoftKeyboard());
onView(withId(R.id.LastNameInput)).perform(typeText("$$$$$$"), closeSoftKeyboard());
onView(withId(R.id.SignUp)).perform(click());
}
public void checkSignUp5() throws Exception{
onView(withId(R.id.UsernameInput)).perform(typeText("user"), closeSoftKeyboard());
onView(withId(R.id.PasswordInput)).perform(typeText("pass"), closeSoftKeyboard());
onView(withId(R.id.FirstNameInput)).perform(typeText("Honda"), closeSoftKeyboard());
onView(withId(R.id.LastNameInput)).perform(typeText("Gokuchi"), closeSoftKeyboard());
onView(withId(R.id.SignUp)).perform(click());
}
@After
public void tearDown() throws Exception {
mActivity=null;
}
}

View file

@ -9,15 +9,14 @@
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:icon="@mipmap/ic_launcher_round"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".Main"
android:label="@string/app_name">
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -29,13 +28,47 @@
android:name="preloaded_fonts"
android:resource="@array/preloaded_fonts" />
<activity android:name=".SignUp" android:parentActivityName=".Main">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".Main" />
</activity>
<activity android:name=".LogIn" />
<activity android:name=".Welcome"/>
<activity
android:name=".SignUp"
android:label="Sign Up"
android:screenOrientation="portrait" />
<activity
android:name=".LogIn"
android:label="Log In"
android:screenOrientation="portrait" />
<activity
android:name=".Welcome"
android:label="Welcome"
android:screenOrientation="portrait" />
<activity
android:name=".AdminWelcome"
android:label="Welcome"
android:screenOrientation="portrait" />
<activity
android:name=".UsersList"
android:label="List of Users"
android:screenOrientation="portrait" />
<activity
android:name=".AdminServicesList"
android:label="List of Services"
android:screenOrientation="portrait" />
<activity
android:name=".ServiceProviderWelcome"
android:label="Welcome"
android:screenOrientation="portrait" />
<activity
android:name=".EditProfile"
android:label="Edit Profile"
android:screenOrientation="portrait" />
<activity
android:name=".ServiceProviderServicesList"
android:label="List of Services"
android:screenOrientation="portrait" />
<activity
android:name=".ServiceProviderAvailabilities"
android:label="Availabilities"
android:screenOrientation="portrait"></activity>
<activity android:name=".SignUpPart2"></activity>
</application>
</manifest>

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

View file

@ -0,0 +1,28 @@
package com.uottawa.olympus.olympusservices;
/**
* The class Admin is a child of the class userType. The class gives
* admin permission over the app such that the user can add and delete services
* and can add and delete other users from the database of the app.
*
*/
public class Admin extends UserType {
/**
* The constructor for the admin object with predefined fields.
* There should only be one admin object for the entire app.
*/
Admin(){
super("admin", "admin", "Admin", "Admin");
}
/**
* The getRole() method returns a string "Admin"
* the app gets role of user type objects for access
* app permission purposes.
*
* @return String object "Admin"
*/
public String getRole(){ return "Admin"; }
}

View file

@ -0,0 +1,213 @@
package com.uottawa.olympus.olympusservices;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import android.widget.Toast;
import java.util.Iterator;
import java.util.List;
/**
* Creates the view and dialog listener for List of services
* which the admin can view and manipulate.
*
*/
public class AdminServicesList extends AppCompatActivity implements NewServiceDialogFragment.NoticeDialogListener, EditServiceDialogFragment.NoticeDialogListener{
//field for RecyclerView
private RecyclerView mRecyclerView;
//field for adapter of Recycler view
private RecyclerView.Adapter mAdapter;
//field for layout manager of Recyler view.
private RecyclerView.LayoutManager mLayoutManager;
/**
* On creation loads up the xml, and generates the services list,
* and fillsout the recylerView fields.
*
* @param savedInstanceState Bundle to transfer information.
*/
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_admin_services_list);
DBHelper dbHelper = new DBHelper(this);
List<String[]> serviceslist = dbHelper.getAllServices();
Service[] services = new Service[(serviceslist.size())];
Iterator iter = serviceslist.iterator();
for (int i=0; i<serviceslist.size();i++){
String[] current = (String[])iter.next();
services[i] = new Service(current[0], Double.parseDouble(current[1]));
}
mRecyclerView = (RecyclerView) findViewById(R.id.Services);
mLayoutManager = new LinearLayoutManager(this);
mRecyclerView.setLayoutManager(mLayoutManager);
mAdapter = new MyAdapter(services, this);
mRecyclerView.setAdapter(mAdapter);
}
/**
* Adds new services to the generated list.
*
* @param view View object contains the generated list and buttons
*/
public void addService(View view) {
DialogFragment newFragment = new NewServiceDialogFragment();
newFragment.show(getSupportFragmentManager(), "addService");
}
/**
* Edits services to the generated list.
*
* @param view View object contains the generated list and buttons
*/
public void editService(View view, String name) {
DialogFragment newFragment = new EditServiceDialogFragment();
newFragment.show(getSupportFragmentManager(), "editService");
Bundle args = new Bundle();
args.putString("name", name);
newFragment.setArguments(args);
}
//add new service
/**
* Uses dialog to obtain the fields for addSerivce.
*
* @param dialog DialogFragment used to obtain the fields for the added service
*/
@Override
public void onDialogNew(DialogFragment dialog) {
DBHelper dbHelper = new DBHelper(this);
String name = (String)dialog.getArguments().get("name");
Double rate = (Double)dialog.getArguments().get("rate");
dbHelper.addService(new Service(name,rate));
dialog.dismiss();
this.recreate();
}
//user clicked cancel
/**
* Uses dialog to cancel adding a service.
*
* @param dialog DialogFragment that contains the cancel button.
*/
@Override
public void onDialogNevermind(DialogFragment dialog) {
}
//edits service with info from dialog
/**
* Uses Dialog to edit service.
*
* @param dialog DialogFragment that contains the fields and buttons to edit rate.
*/
@Override
public void onDialogEdit(DialogFragment dialog) {
DBHelper dbHelper = new DBHelper(this);
String name = (String)dialog.getArguments().get("name");
Double rate = (Double)dialog.getArguments().get("rate");
dbHelper.updateService(new Service(name,rate));
dialog.dismiss();
this.recreate();
}
//deletes service with info from dialog
/**
* Uses Dialog to delete a service from the serviceList.
*
* @param dialog DialogFragment that contains the delete service button.
*/
@Override
public void onDialogDelete(DialogFragment dialog) {
DBHelper dbHelper = new DBHelper(this);
String name = (String)dialog.getArguments().get("name");
dbHelper.deleteService(name);
Toast.makeText(this, "Service \""+(String)dialog.getArguments().get("name")+"\" has been deleted", Toast.LENGTH_LONG).show();
dialog.dismiss();
this.recreate();
}
public class MyAdapter extends RecyclerView.Adapter<MyAdapter.ServicesHolder> {
private Service[] services;
private Context context;
// Provide a reference to the views for each data item
// Complex data items may need more than one view per item, and
// you provide access to all the views for a data item in a view holder
// Provide a suitable constructor (depends on the kind of dataset)
public MyAdapter(Service[] services, Context context) {
this.services = services;
}
// Create new views (invoked by the layout manager)
@NonNull
@Override
public ServicesHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View v = LayoutInflater.from(parent.getContext())
.inflate(R.layout.list_item, parent, false);
ServicesHolder vh = new ServicesHolder(v);
return vh;
}
// Replace the contents of a view (invoked by the layout manager)
@Override
public void onBindViewHolder(ServicesHolder holder, int position) {
Service service = services[position];
holder.name.setText(service.getName());
holder.rate.setText(String.format("$%,.2f", service.getRate()));
}
// Return the size of your dataset (invoked by the layout manager)
@Override
public int getItemCount() {
return services.length;
}
class ServicesHolder extends RecyclerView.ViewHolder implements View.OnClickListener{
TextView name;
TextView rate;
public ServicesHolder(View row){
super(row);
name = row.findViewById(R.id.Name);
rate = row.findViewById(R.id.Rate);
row.setOnClickListener(this);
}
@Override
public void onClick(View view) {
TextView nameview = (TextView)view.findViewById(R.id.Name);
String name = nameview.getText().toString();
editService(view, name);
}
}
}
}

View file

@ -0,0 +1,76 @@
package com.uottawa.olympus.olympusservices;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
/**
* The Admin Welcome class is the welcome
* screen for admin users when they have logged into the
* app. The admin welcome screen has features such as the
* user list and service list which it can only access.
*
*/
public class AdminWelcome extends AppCompatActivity {
/**
* Creates the xml pages for the class object
* on creation of the object.
*
* @param savedInstanceState Bundle for transfer of data.
*/
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_admin_welcome);
}
/**
* Override so that nothing occurs when pressing the
* back button on this activity of the app.
*
*/
@Override
public void onBackPressed(){
}
/**
* Logs out the user and returns them back to
* main activity. End all current user activity
* for security purposes.
*
* @param view View object of current activity.
*/
public void LogOut(View view){
Intent intent = new Intent(getApplicationContext(), Main.class);
startActivity(intent);
finish();
}
/**
* On click of list of user button that goes to
* UserList screen for the admin to edit the user list
* of the app.
*
* @param view View object of current activity
*/
public void goToUsers(View view){
Intent intent = new Intent(getApplicationContext(), UsersList.class);
startActivity(intent);
}
/**
* On click of list of services button goes to
* ServiceList screen for the admin to edit the
* service list of the app.
*
* @param view
*/
public void goToServices(View view){
Intent intent = new Intent(getApplicationContext(), AdminServicesList.class);
startActivity(intent);
}
}

View file

@ -0,0 +1,12 @@
package com.uottawa.olympus.olympusservices;
/**
* This class is the class for Appointments
* which has not been implemented yet. This
* feature shall be expanded upon next deliverable.
*
*/
public class Appointment {
Service service;
ServiceProvider provider;
}

View file

@ -0,0 +1,744 @@
package com.uottawa.olympus.olympusservices;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.database.Cursor;
import android.content.ContentValues;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
/**
* The class DBHelper allows the Android application to access and perform
* CRUD (Create, Read, Update, Delete) operations on the tables of the SQLite database.
* There is currently one table of all users' login information and names.
* Table of service providers and services to come soon.
*
* To use, create an object of this class with the current activity as context.
*
*/
public class DBHelper extends SQLiteOpenHelper {
//version of db used for update method
private static final int DB_VERSION = 3;
//name of db in app data
private static final String DB_NAME = "UsersDB.db";
//SQLiteDatabase for reading
private static SQLiteDatabase readDB;
//SQLiteDatabase for writing
private static SQLiteDatabase writeDB;
//name of table containing user login information and names
private static final String TABLE_LOGIN = "userInfo";
//columns of TABLE_LOGIN
private static final String COLUMN_USERNAME = "username";
private static final String COLUMN_PASSWORD = "password";
private static final String COLUMN_FIRSTNAME = "firstName";
private static final String COLUMN_LASTNAME = "lastName";
private static final String COLUMN_USERTYPE = "userType";
private static final String COLUMN_ADDRESS = "address";
private static final String COLUMN_PHONE = "phone";
private static final String COLUMN_COMPANY = "company";
private static final String COLUMN_LICENSED = "licensed";
//name of table containing services and rates
private static final String TABLE_SERVICES = "services";
//columns of TABLE_SERVICES
private static final String COLUMN_SERVICE = "service";
private static final String COLUMN_RATE = "rate";
//name of table containing service provider information
private static final String TABLE_SERVICEPROVIDERS = "serviceProviders";
//columns of TABLE_SERVICEPROVIDERS
private static final String COLUMN_SERVICEPROVIDERNAME = "username";
private static final String COLUMN_SERVICEPROVIDERSERVICE = "service";
//name of table containing service provider availability
//availability is stored as number of minutes from 00:00
private static final String TABLE_AVAILABILITY = "availability";
//columns of TABLE_AVAILABILITY
private static final String COLUMN_AVAILABILITYNAME = "username";
private static final String COLUMN_MONSTART = "mondaystart";
private static final String COLUMN_MONEND = "mondayend";
private static final String COLUMN_TUESTART = "tuesdaystart";
private static final String COLUMN_TUEEND = "tuesdayend";
private static final String COLUMN_WEDSTART = "wednesdaystart";
private static final String COLUMN_WEDEND = "wednesdayend";
private static final String COLUMN_THUSTART = "thursdaystart";
private static final String COLUMN_THUEND = "thursdayend";
private static final String COLUMN_FRISTART = "fridaystart";
private static final String COLUMN_FRIEND = "fridayend";
private static final String COLUMN_SATSTART = "saturdaystart";
private static final String COLUMN_SATEND = "saturdayend";
private static final String COLUMN_SUNSTART = "sundaystart";
private static final String COLUMN_SUNEND = "sundayend";
/**
* Creates an instance of DBHelper to allow activities to access and
* perform CRUD operations on the database via DBHelper's methods
*
* @param context current activity calling DBHelper
*/
public DBHelper(Context context){
super(context, DB_NAME, null, DB_VERSION);
//since these methods take a while we will call them once and store the returned dbs
readDB = this.getReadableDatabase();
writeDB = this.getWritableDatabase();
//pre-add the admin user
addUser(new Admin());
}
@Override
public void onCreate(SQLiteDatabase db){
//making the table containing user login information
String CREATE_LOGIN_TABLE = "CREATE TABLE "+ TABLE_LOGIN + "("
+ COLUMN_USERNAME + " TEXT UNIQUE NOT NULL PRIMARY KEY ON CONFLICT ROLLBACK,"
+ COLUMN_PASSWORD + " TEXT,"
+ COLUMN_FIRSTNAME + " TEXT DEFAULT 'FirstName',"
+ COLUMN_LASTNAME + " TEXT DEFAULT 'LastName',"
+ COLUMN_USERTYPE + " TEXT NOT NULL, "
+ COLUMN_ADDRESS + " TEXT, "
+ COLUMN_PHONE + " TEXT, "
+ COLUMN_COMPANY + " TEXT, "
+ COLUMN_LICENSED + " TEXT "
+ ")";
db.execSQL(CREATE_LOGIN_TABLE);
//making the table containing services and their rates
String CREATE_SERVICES_TABLE = "CREATE TABLE "+ TABLE_SERVICES + "("
+ COLUMN_SERVICE + " TEXT UNIQUE NOT NULL PRIMARY KEY ON CONFLICT ROLLBACK,"
+ COLUMN_RATE + " REAL DEFAULT 0.0" + ")";
db.execSQL(CREATE_SERVICES_TABLE);
//making the table containing service providers and offered services
String CREATE_SERVICEPROVIDERS_TABLE = "CREATE TABLE "+ TABLE_SERVICEPROVIDERS + "("
+ COLUMN_SERVICEPROVIDERNAME + " TEXT, "
+ COLUMN_SERVICEPROVIDERSERVICE + " TEXT, "
//service provider name is foreign key
+ " FOREIGN KEY(" + COLUMN_SERVICEPROVIDERNAME
+ ") REFERENCES " + TABLE_LOGIN + "(" + COLUMN_USERNAME +"), "
//service is also foreign key
+ " FOREIGN KEY(" + COLUMN_SERVICEPROVIDERSERVICE
+ ") REFERENCES " + TABLE_SERVICES + "(" + COLUMN_SERVICE +") "
+ ")";
db.execSQL(CREATE_SERVICEPROVIDERS_TABLE);
//making the table containing services and their rates
String CREATE_AVAILABILITY_TABLE = "CREATE TABLE "+ TABLE_AVAILABILITY + "("
+ COLUMN_AVAILABILITYNAME + " TEXT UNIQUE NOT NULL PRIMARY KEY ON CONFLICT ROLLBACK, "
+ COLUMN_MONSTART + " REAL, "
+ COLUMN_MONEND + " REAL, "
+ COLUMN_TUESTART + " REAL, "
+ COLUMN_TUEEND + " REAL, "
+ COLUMN_WEDSTART + " REAL, "
+ COLUMN_WEDEND + " REAL, "
+ COLUMN_THUSTART + " REAL, "
+ COLUMN_THUEND + " REAL, "
+ COLUMN_FRISTART + " REAL, "
+ COLUMN_FRIEND + " REAL, "
+ COLUMN_SATSTART + " REAL, "
+ COLUMN_SATEND + " REAL, "
+ COLUMN_SUNSTART + " REAL, "
+ COLUMN_SUNEND + " REAL)";
db.execSQL(CREATE_AVAILABILITY_TABLE);
}
@Override
public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion){
switch(oldVersion){
case 1: //going from db version 1 to 2
//change usertype of Users to Homeowner
ContentValues values = new ContentValues();
values.put(COLUMN_USERTYPE, "HomeOwner");
db.update(TABLE_LOGIN, values, COLUMN_USERTYPE + " = ?", new String[]{"User"});
//if services table is not created, create it
db.execSQL("CREATE TABLE IF NOT EXISTS "+ TABLE_SERVICES + "("
+ COLUMN_SERVICE + " TEXT UNIQUE NOT NULL PRIMARY KEY ON CONFLICT ROLLBACK,"
+ COLUMN_RATE + " REAL DEFAULT 0.0" + ")");
case 2: //going from db versions 1-2 to 3
db.execSQL("CREATE TABLE IF NOT EXISTS "+ TABLE_SERVICEPROVIDERS + "("
+ COLUMN_SERVICEPROVIDERNAME + " TEXT NOT NULL, "
+ COLUMN_SERVICEPROVIDERSERVICE + " TEXT NOT NULL, "
//service provider name is foreign key
+ " FOREIGN KEY(" + COLUMN_SERVICEPROVIDERNAME
+ ") REFERENCES " + TABLE_LOGIN + "(" + COLUMN_USERNAME +"), "
//service is also foreign key
+ " FOREIGN KEY(" + COLUMN_SERVICEPROVIDERSERVICE
+ ") REFERENCES " + TABLE_SERVICES + "(" + COLUMN_SERVICE +") "
+ ")");
db.execSQL("CREATE TABLE IF NOT EXISTS "+ TABLE_AVAILABILITY + "("
+ COLUMN_AVAILABILITYNAME + " TEXT UNIQUE NOT NULL PRIMARY KEY ON CONFLICT ROLLBACK, "
+ COLUMN_MONSTART + " REAL, "
+ COLUMN_MONEND + " REAL, "
+ COLUMN_TUESTART + " REAL, "
+ COLUMN_TUEEND + " REAL, "
+ COLUMN_WEDSTART + " REAL, "
+ COLUMN_WEDEND + " REAL, "
+ COLUMN_THUSTART + " REAL, "
+ COLUMN_THUEND + " REAL, "
+ COLUMN_FRISTART + " REAL, "
+ COLUMN_FRIEND + " REAL, "
+ COLUMN_SATSTART + " REAL, "
+ COLUMN_SATEND + " REAL, "
+ COLUMN_SUNSTART + " REAL, "
+ COLUMN_SUNEND + " REAL)");
db.execSQL("ALTER TABLE " + TABLE_LOGIN + " ADD COLUMN " + COLUMN_ADDRESS + " TEXT");
db.execSQL("ALTER TABLE " + TABLE_LOGIN + " ADD COLUMN " + COLUMN_PHONE + " TEXT");
db.execSQL("ALTER TABLE " + TABLE_LOGIN + " ADD COLUMN " + COLUMN_COMPANY + " TEXT");
db.execSQL("ALTER TABLE " + TABLE_LOGIN + " ADD COLUMN " + COLUMN_LICENSED + " TEXT");
}
}
@Override
public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
onUpgrade(db, oldVersion, newVersion);
}
//methods for table of users
/**
* Adds a user to the database. Returns false if there is a user already
* existing in the database with the same username. Returns true if
* successful in adding user to database.
*
* @param userType user to be added
* @return whether adding user was successful
*/
public boolean addUser(UserType userType){
if (userType == null) return false;
//Check for duplicate username by querying login table
Cursor cursor = writeDB.query(TABLE_LOGIN,
new String[] {COLUMN_USERNAME},
COLUMN_USERNAME + " = ?",
new String[]{userType.getUsername()},
null, null, null,
"1");
//If cursor has 1+ elements in it, username already exists in table
if (cursor != null && cursor.getCount() > 0){
cursor.close();
return false;
}
cursor.close();
ContentValues values = new ContentValues();
values.put(COLUMN_USERNAME, userType.getUsername());
values.put(COLUMN_PASSWORD, userType.getPassword());
values.put(COLUMN_FIRSTNAME, userType.getFirstname());
values.put(COLUMN_LASTNAME, userType.getLastname());
values.put(COLUMN_USERTYPE, userType.getClass().getSimpleName());
if (userType instanceof ServiceProvider){
ServiceProvider serviceProvider = (ServiceProvider)userType;
String address = serviceProvider.getAddress();
if (address != null){
values.put(COLUMN_ADDRESS, address);
}
String phone = serviceProvider.getPhonenumber();
if (phone != null){
values.put(COLUMN_PHONE, phone);
}
String company = serviceProvider.getCompanyname();
if (company != null){
values.put(COLUMN_COMPANY, company);
}
boolean licensed = serviceProvider.isLicensed();
values.put(COLUMN_LICENSED, Boolean.toString(licensed));
}
writeDB.insert(TABLE_LOGIN, null, values);
return true;
}
/**
* Looks in database for user with requested username, and returns an
* object of UserType corresponding to said user's role.
* Returns null if no such user found.
*
* @param username username to look up
* @return object representing user found
*/
public UserType findUserByUsername(String username){
if (username == null) return null;
UserType usertype = null;
Cursor cursor = readDB.rawQuery("SELECT * FROM " + TABLE_LOGIN
+ " WHERE " + COLUMN_USERNAME + " = ?",
new String[]{username});
if (cursor.moveToFirst()){
String password = cursor.getString(1);
String firstname = cursor.getString(2);
String lastname = cursor.getString(3);
String address = cursor.getString(5);
String phonenumber = cursor.getString(6);
String companyname = cursor.getString(7);
boolean licensed = Boolean.parseBoolean(cursor.getString(8));
if (cursor.getString(4)
.equals("Admin")){
usertype = new Admin();
} else if (cursor.getString(4)
.equals("ServiceProvider")){
ServiceProvider serviceProvider = new ServiceProvider(username, password, firstname, lastname, address, phonenumber, companyname, licensed);
getAllServicesProvidedByUser(serviceProvider);
getAvailabilities(serviceProvider);
usertype = serviceProvider;
} else {
usertype = new HomeOwner(username, password, firstname, lastname);
}
}
cursor.close();
return usertype;
}
/**
* Updates user login information and name for user with requested username.
* Returns true if a user of said username was found and entry updated.
* Returns false if no user was found of said username.
*
*
* @param username username of entry to update
* @param password new password
* @param firstname new first name
* @param lastname new last name
*
* @return whether updating user information was successful
*/
public boolean updateUserInfo(String username, String password, String firstname, String lastname){
return updateUserInfo(username, password, firstname, lastname,
null, null, null, null);
}
public boolean updateUserInfo(String username, String password, String firstname, String lastname,
String address, String phonenumber, String companyname, Boolean licensed){
ContentValues values = new ContentValues();
if (password != null && !password.equals("")) values.put(COLUMN_PASSWORD, password);
if (firstname != null && !firstname.equals("")) values.put(COLUMN_FIRSTNAME, firstname);
if (lastname != null && !lastname.equals(""))values.put(COLUMN_LASTNAME, lastname);
if (address != null && !address.equals(""))values.put(COLUMN_ADDRESS, address);
if (phonenumber != null && !phonenumber.equals(""))values.put(COLUMN_PHONE, phonenumber);
if (companyname != null && !companyname.equals(""))values.put(COLUMN_COMPANY, companyname);
if (licensed != null)values.put(COLUMN_LICENSED, Boolean.toString(licensed));
return writeDB.update(TABLE_LOGIN, values, COLUMN_USERNAME+" = ?",
new String[]{username}) > 0;
}
/**
* Looks in database for user with requested username, and deletes the corresponding
* entry. Returns true if a user was deleted, false otherwise.
*
* @param username username of entry to delete
* @return whether a user was deleted
*/
public boolean deleteUser(String username) {
return writeDB.delete(TABLE_LOGIN, COLUMN_USERNAME+" = ?",
new String[]{username}) > 0;
}
/**
* Returns a list of String arrays containing the username, first name,
* last name, and user type of every user in TABLE_LOGIN.
*
* @return list of arrays of [username, first name, last name, user type]
*/
public List<String[]> getAllUsers(){
return getAll("SELECT " + COLUMN_USERNAME + ", "
+ COLUMN_FIRSTNAME + ", "
+ COLUMN_LASTNAME + ", "
+ COLUMN_USERTYPE
+ " FROM "+TABLE_LOGIN);
}
//methods for table of services
/**
* Adds a service to the database. Returns false if service already
* exists in the database.
* Returns true if successful in adding service to database.
*
* @param service service to be added
* @return whether adding service was successful
*/
public boolean addService(Service service){
if (service == null) return false;
//Check for duplicate username by querying services table
Cursor cursor = writeDB.query(TABLE_SERVICES,
new String[] {COLUMN_SERVICE},
COLUMN_SERVICE + " = ?",
new String[]{service.getName().toLowerCase().trim()},
null, null, null,
"1");
//If cursor has 1+ elements in it, username already exists in table
if (cursor != null && cursor.getCount() > 0){
cursor.close();
return false;
}
cursor.close();
ContentValues values = new ContentValues();
values.put(COLUMN_SERVICE, service.getName().toLowerCase().trim());
values.put(COLUMN_RATE, service.getRate());
writeDB.insert(TABLE_SERVICES, null, values);
return true;
}
/**
* Looks in database for service with specified, and returns an
* object of Service if found.
* Returns null if no such service found.
*
* @param serviceName service to look up
* @return object representing service found
*/
public Service findService(String serviceName){
if (serviceName == null) return null;
Service service;
serviceName = serviceName.toLowerCase().trim();
Cursor cursor = readDB.rawQuery("SELECT * FROM " + TABLE_SERVICES
+ " WHERE " + COLUMN_SERVICE + " = ?",
new String[]{serviceName});
if (cursor.moveToFirst()){
String servName = cursor.getString(0);
double rate = cursor.getDouble(1);
service = new Service(servName, rate);
} else {
service = null;
}
cursor.close();
return service;
}
/**
* Updates service rate using a Service object.
* Returns true if a service was found and entry updated.
* Returns false if no service was found.
*
*
* @param service service object containing updated values
*
* @return whether updating service information was successful
*/
public boolean updateService(Service service){
if (service == null) return false;
ContentValues values = new ContentValues();
values.put(COLUMN_RATE, service.getRate());
return writeDB.update(TABLE_SERVICES, values, COLUMN_SERVICE+" = ?",
new String[]{service.getName().toLowerCase().trim()}) > 0;
}
/**
* Updates service rate using input of service name and rate.
* Returns true if a service was found and entry updated.
* Returns false if no service was found.
*
*
* @param name name of service
* @param rate rate of service
*
* @return whether updating service information was successful
*/
public boolean updateService(String name, double rate){
if (name == null) return false;
name = name.toLowerCase().trim();
ContentValues values = new ContentValues();
if (rate > 0)
values.put(COLUMN_RATE, rate);
return writeDB.update(TABLE_SERVICES, values, COLUMN_SERVICE+" = ?",
new String[]{name}) > 0;
}
/**
* Looks in database for a service, and deletes the corresponding
* entry. Returns true if a service was deleted, false otherwise.
*
* @param service service of entry to delete
* @return whether the service was deleted
*/
public boolean deleteService(String service) {
if (service == null) return false;
boolean deleted;
String nullify = null;
service = service.toLowerCase().trim();
ContentValues contentValues = new ContentValues();
contentValues.put(COLUMN_SERVICEPROVIDERSERVICE, nullify);
writeDB.update(TABLE_SERVICEPROVIDERS, contentValues, COLUMN_SERVICEPROVIDERSERVICE+" = ?",
new String[]{service});
deleted = writeDB.delete(TABLE_SERVICES, COLUMN_SERVICE+" = ?",
new String[]{service}) > 0;
if (deleted) {
writeDB.delete(TABLE_SERVICEPROVIDERS, COLUMN_SERVICEPROVIDERSERVICE+" = ?",
new String[]{service});
} else {
ContentValues restoreContentValues = new ContentValues();
restoreContentValues.put(COLUMN_SERVICEPROVIDERSERVICE, service);
writeDB.update(TABLE_SERVICEPROVIDERS, restoreContentValues, COLUMN_SERVICEPROVIDERSERVICE+" = ?",
null);
}
return deleted;
}
/**
* Returns a list of String arrays containing the service categories,
* names and hourly rates.
*
* @return list of arrays of [service, rate]
*/
public List<String[]> getAllServices(){
return getAll("SELECT * FROM " + TABLE_SERVICES + " ORDER BY " + COLUMN_SERVICE);
}
public boolean addServiceProvidedByUser(ServiceProvider serviceProvider, Service service){
if (serviceProvider == null || service == null) return false;
return addServiceProvidedByUser(serviceProvider.getUsername(), service.getName());
}
public boolean addServiceProvidedByUser(ServiceProvider serviceProvider, String serviceName){
if (serviceProvider == null || serviceName == null) return false;
return addServiceProvidedByUser(serviceProvider.getUsername(), serviceName);
}
public boolean addServiceProvidedByUser(String serviceProviderUsername, String serviceName){
if (serviceProviderUsername == null || serviceName == null) return false;
//TODO: Check if serviceProviderUsername and serviceName are in db before adding
serviceName = serviceName.toLowerCase().trim();
//Check for duplicate username/service combination by querying login table
Cursor cursor = writeDB.query(TABLE_SERVICEPROVIDERS,
new String[] {COLUMN_SERVICEPROVIDERNAME},
COLUMN_SERVICEPROVIDERNAME + " = ? AND "
+ COLUMN_SERVICEPROVIDERSERVICE + " = ?",
new String[]{serviceProviderUsername, serviceName},
null, null, null,
"1");
//If cursor has 1+ elements in it, username already exists in table
if (cursor != null && cursor.getCount() > 0){
cursor.close();
return false;
}
cursor.close();
ContentValues values = new ContentValues();
values.put(COLUMN_SERVICEPROVIDERNAME, serviceProviderUsername);
values.put(COLUMN_SERVICEPROVIDERSERVICE, serviceName);
writeDB.insert(TABLE_SERVICEPROVIDERS, null, values);
return true;
}
public boolean deleteServiceProvidedByUser(ServiceProvider serviceProvider, Service service){
if (serviceProvider == null || service == null) return false;
return deleteServiceProvidedByUser(serviceProvider.getUsername(), service.getName());
}
public boolean deleteServiceProvidedByUser(ServiceProvider serviceProvider, String serviceName){
if (serviceProvider == null || serviceName == null) return false;
return deleteServiceProvidedByUser(serviceProvider.getUsername(), serviceName);
}
public boolean deleteServiceProvidedByUser(String serviceProviderUsername, String serviceName){
if (serviceProviderUsername == null || serviceName == null) return false;
serviceName = serviceName.toLowerCase().trim();
return writeDB.delete(TABLE_SERVICEPROVIDERS,
COLUMN_SERVICEPROVIDERNAME + " = ? AND "
+ COLUMN_SERVICEPROVIDERSERVICE + " = ?",
new String[]{serviceProviderUsername, serviceName}) > 0;
}
public List<String[]> getAllServicesProvidedByUser(ServiceProvider serviceProvider){
if (serviceProvider == null) return new ArrayList<>();
return getAllServicesProvidedByUser(serviceProvider.getUsername());
}
public List<String[]> getAllServicesProvidedByUser(String serviceProviderName){
if (serviceProviderName == null) return new ArrayList<>();
return getAll("SELECT " + TABLE_SERVICES + "." + COLUMN_SERVICE + ", "
+ TABLE_SERVICES + "." + COLUMN_RATE
+ " FROM " + TABLE_SERVICES
+ " JOIN " + TABLE_SERVICEPROVIDERS
+ " ON " + TABLE_SERVICEPROVIDERS + "." + COLUMN_SERVICEPROVIDERSERVICE + " = "
+ TABLE_SERVICES + "." + COLUMN_SERVICE
+ " AND " + TABLE_SERVICEPROVIDERS + "." + COLUMN_SERVICEPROVIDERNAME
+ "= '" + serviceProviderName + "'");
}
public List<String[]> getAllProvidersByService(Service service){
if (service == null) return new ArrayList<>();
return getAllProvidersByService(service.getName());
}
public List<String[]> getAllProvidersByService(String serviceName){
if (serviceName == null) return new ArrayList<>();
serviceName = serviceName.toLowerCase().trim();
return getAll("SELECT " + COLUMN_SERVICEPROVIDERNAME
+ " FROM " + TABLE_SERVICEPROVIDERS
+ " WHERE " + COLUMN_SERVICEPROVIDERSERVICE + " = '"
+ serviceName + "'");
}
public boolean updateAvailability(ServiceProvider serviceProvider){
//availability is stored as number of minutes from 00:00
if (serviceProvider == null) return false;
int[][] availabilities = serviceProvider.getAvailabilities();
if (availabilities == null) return false;
Cursor cursor = readDB.rawQuery("SELECT * FROM " + TABLE_AVAILABILITY
+ " WHERE " + COLUMN_AVAILABILITYNAME + " = ?",
new String[]{serviceProvider.getUsername()});
ContentValues contentValues = new ContentValues();
addAvailabilityToContentValues(contentValues, COLUMN_MONSTART, COLUMN_MONEND, availabilities[0]);
addAvailabilityToContentValues(contentValues, COLUMN_TUESTART, COLUMN_TUEEND, availabilities[1]);
addAvailabilityToContentValues(contentValues, COLUMN_WEDSTART, COLUMN_WEDEND, availabilities[2]);
addAvailabilityToContentValues(contentValues, COLUMN_THUSTART, COLUMN_THUEND, availabilities[3]);
addAvailabilityToContentValues(contentValues, COLUMN_FRISTART, COLUMN_FRIEND, availabilities[4]);
addAvailabilityToContentValues(contentValues, COLUMN_SATSTART, COLUMN_SATEND, availabilities[5]);
addAvailabilityToContentValues(contentValues, COLUMN_SUNSTART, COLUMN_SUNEND, availabilities[6]);
if (!cursor.moveToFirst()){
contentValues.put(COLUMN_AVAILABILITYNAME, serviceProvider.getUsername());
writeDB.insert(TABLE_AVAILABILITY, null, contentValues);
} else {
writeDB.update(TABLE_AVAILABILITY, contentValues,
COLUMN_AVAILABILITYNAME + " = ?", new String[]{serviceProvider.getUsername()});
}
return true;
}
private void addAvailabilityToContentValues(ContentValues contentValues,
String startColumn, String endColumn,
int[] startAndEndTimes){
if (startAndEndTimes == null){
contentValues.put(startColumn, 0);
contentValues.put(endColumn, 0);
} else {
int startTime = startAndEndTimes[0]*60+startAndEndTimes[1];
int endTime = startAndEndTimes[2]*60+startAndEndTimes[3];
if (endTime - startTime <=0 || startTime > 1439 || startTime <= 0
|| endTime > 1439 || endTime <= 0) {
contentValues.put(startColumn, 0);
contentValues.put(endColumn, 0);
} else {
contentValues.put(startColumn, startTime);
contentValues.put(endColumn, endTime);
}
}
}
//note that this method overwrites serviceProvider's availability if it exists
public int[][] getAvailabilities(ServiceProvider serviceProvider){
if (serviceProvider==null) return new int[7][4];
Cursor cursor = readDB.rawQuery("SELECT * FROM " + TABLE_AVAILABILITY
+ " WHERE " + COLUMN_AVAILABILITYNAME + " = ?",
new String[]{serviceProvider.getUsername()});
if (cursor.moveToFirst()){
for (int i = 0; i < 7; i++) {
int start = cursor.getInt(i*2+1);
int end = cursor.getInt(i*2+2);
serviceProvider.setAvailabilities(i, start/60, start%60,
end/60, end%60);
}
}
return serviceProvider.getAvailabilities();
}
public int[][] getAvailabilities(String serviceProviderName){
int[][] availabilities = new int[7][4];
if (serviceProviderName==null) return availabilities;
Cursor cursor = readDB.rawQuery("SELECT * FROM " + TABLE_AVAILABILITY
+ " WHERE " + COLUMN_AVAILABILITYNAME + " = ?",
new String[]{serviceProviderName});
if (cursor.moveToFirst()){
for (int i = 0; i < 7; i++) {
int start = cursor.getInt(i*2+1);
int end = cursor.getInt(i*2+2);
availabilities[i] = new int[]{start/60, start%60, end/60, end%60};
}
}
return availabilities;
}
/**
* Prints all entries of table. One row is printed per line. Columns are
* separated by spaces.
*
* @param tableName name of table to print
*/
void printTable(String tableName){
Cursor cursor = readDB.rawQuery("SELECT * FROM "+tableName, null);
cursor.moveToFirst();
for (int i = 0; i<cursor.getCount(); i++){
String[] columns = cursor.getColumnNames();
for (String name: columns) {
System.out.print(cursor.getString(cursor.getColumnIndex(name))+" ");
}
System.out.println();
cursor.moveToNext();
}
cursor.close();
}
/**
* Gets all items in a table
* @param rawQuery SELECT * query
* @return list of array representing all items in raw query
*/
private List<String[]> getAll(String rawQuery){
List<String[]> list = new LinkedList<>();
String[] infoArray;
Cursor cursor = readDB.rawQuery(rawQuery,null);
if (cursor.moveToFirst()) {
for (int i = 0; i < cursor.getCount(); i++) {
infoArray = new String[cursor.getColumnNames().length];
for (int j = 0; j < cursor.getColumnNames().length; j++) {
infoArray[j] = cursor.getString(j);
}
list.add(infoArray);
cursor.moveToNext();
}
}
cursor.close();
return list;
}
}

View file

@ -0,0 +1,64 @@
package com.uottawa.olympus.olympusservices;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import android.view.LayoutInflater;
import android.widget.EditText;
import android.widget.Toast;
public class DeleteServiceDialogFragment extends DialogFragment{
public interface NoticeDialogListener {
public void onDialogDelete(DialogFragment dialog);
public void onDialogNevermind(DialogFragment dialog);
}
DeleteServiceDialogFragment.NoticeDialogListener mListener;
@Override
public void onAttach(Context context) {
super.onAttach(context);
// Verify that the host activity implements the callback interface
try {
// Instantiate the NoticeDialogListener so we can send events to the host
mListener = (DeleteServiceDialogFragment.NoticeDialogListener) context;
} catch (ClassCastException e) {
// The activity doesn't implement the interface, throw exception
throw new ClassCastException(this.toString()
+ " must implement NoticeDialogListener");
}
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
// Get the layout inflater
LayoutInflater inflater = getActivity().getLayoutInflater();
// Inflate and set the layout for the dialog
// 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.remove, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
Bundle args = new Bundle();
args.putString("name", (String)getArguments().get("name"));
DeleteServiceDialogFragment.this.setArguments(args);
mListener.onDialogDelete(DeleteServiceDialogFragment.this);
}
})
.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
Bundle args = new Bundle();
args.putString("name", (String)getArguments().get("name"));
mListener.onDialogNevermind(DeleteServiceDialogFragment.this);
}
})
.setTitle((String)getArguments().get("name"));
return builder.create();
}
}

View file

@ -0,0 +1,92 @@
package com.uottawa.olympus.olympusservices;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.CheckBox;
import android.widget.TextView;
import android.widget.Toast;
public class EditProfile extends AppCompatActivity {
String username;
DBHelper dbHelper;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_edit_profile);
Bundle bundle = getIntent().getExtras();
username = bundle.getString("username");
dbHelper = new DBHelper(this);
ServiceProvider user;
user = (ServiceProvider)dbHelper.findUserByUsername(username);
TextView firstname = findViewById(R.id.FirstNameInput);
TextView lastname = findViewById(R.id.LastNameInput);
TextView password = findViewById(R.id.PasswordInput);
TextView companyname = findViewById(R.id.CompanyNameInput);
TextView address = findViewById(R.id.AddressInput);
TextView phonenumber = findViewById(R.id.PhoneNumberInput);
CheckBox licensed = findViewById(R.id.LicensedInput);
firstname.setText(user.getFirstname());
lastname.setText(user.getLastname());
password.setText(user.getPassword());
companyname.setText(user.getCompanyname());
address.setText(user.getAddress());
phonenumber.setText(user.getPhonenumber());
licensed.setChecked(user.isLicensed());
}
/**
* Override so that previous screen refreshes when pressing the
* back button on this activity of the app.
*
*/
@Override
public void onBackPressed(){
Intent intent = new Intent(getApplicationContext(),ServiceProviderWelcome.class);
intent.putExtra("username", username);
startActivity(intent);
finish();
}
public void Save(View view){
TextView firstname = findViewById(R.id.FirstNameInput);
TextView lastname = findViewById(R.id.LastNameInput);
TextView password = findViewById(R.id.PasswordInput);
TextView companyname = findViewById(R.id.CompanyNameInput);
TextView address = findViewById(R.id.AddressInput);
TextView phonenumber = findViewById(R.id.PhoneNumberInput);
CheckBox licensed = findViewById(R.id.LicensedInput);
if(password.getText().toString().length()>=5 && firstname.getText().toString().length()>0
&& lastname.getText().toString().length()>0 && companyname.getText().toString().length()>0
&& address.getText().toString().length()>0 && phonenumber.getText().toString().length()>0
&& password.getText().toString().matches("[a-zA-Z0-9]*")
&& firstname.getText().toString().matches("[a-zA-Z]*")
&& lastname.getText().toString().matches("[a-zA-Z]*")
&& companyname.getText().toString().matches("^[a-zA-Z0-9_ ]*$")
&& address.getText().toString().matches("^[a-zA-Z0-9_ ]*$")
&& phonenumber.getText().toString().matches("^(\\+\\d{1,2}\\s)?\\(?\\d{3}\\)?[\\s.-]?\\d{3}[\\s.-]?\\d{4}$")
) {
if(dbHelper.updateUserInfo(username, password.getText().toString(), firstname.getText().toString(), lastname.getText().toString(),
address.getText().toString(), phonenumber.getText().toString(), companyname.getText().toString(), licensed.isChecked())){
Toast.makeText(this, "Profile has been updated", Toast.LENGTH_LONG).show();
}
else{
Toast.makeText(this, "Could not update profile ", Toast.LENGTH_LONG).show();
}
}
else{
Toast.makeText(this, "Fields cannot be empty and must be formatted correctly", Toast.LENGTH_LONG).show();
}
}
}

View file

@ -0,0 +1,90 @@
package com.uottawa.olympus.olympusservices;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import android.view.LayoutInflater;
import android.widget.EditText;
import android.widget.Toast;
public class EditServiceDialogFragment extends DialogFragment{
/**
* Creates a NoticeDialogListener interface for other classes to
* implement to have this class be functional in the other classes.
*
*/
public interface NoticeDialogListener {
public void onDialogEdit(DialogFragment dialog);
public void onDialogDelete(DialogFragment dialog);
}
EditServiceDialogFragment.NoticeDialogListener mListener;
// Override the Fragment.onAttach() method to instantiate the NoticeDialogListener
@Override
public void onAttach(Context context) {
super.onAttach(context);
// Verify that the host activity implements the callback interface
try {
// Instantiate the NoticeDialogListener so we can send events to the host
mListener = (EditServiceDialogFragment.NoticeDialogListener) context;
} catch (ClassCastException e) {
// The activity doesn't implement the interface, throw exception
throw new ClassCastException(this.toString()
+ " must implement NoticeDialogListener");
}
}
/**
* Edit the Dialog to change rate of a service that the
* admin wants to change.
*
* @param savedInstanceState Bundle to transfer information.
* @return Dialog that is sent to admin for information.
*/
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
// Get the layout inflater
LayoutInflater inflater = getActivity().getLayoutInflater();
// Inflate and set the layout for the dialog
// Pass null as the parent view because its going in the dialog layout
builder.setView(inflater.inflate(R.layout.dialog_service_edit, null))
// Add action buttons
.setPositiveButton(R.string.update, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
Bundle args = new Bundle();
args.putString("name", (String)getArguments().get("name"));
EditText rateInput = (EditText) ((AlertDialog) dialog).findViewById(R.id.RateInput);
if(rateInput.getText().toString().length()>0 && !rateInput.getText().toString().equals(".")){
Double rate = Double.parseDouble(rateInput.getText().toString());
args.putDouble("rate", rate);
EditServiceDialogFragment.this.setArguments(args);
mListener.onDialogEdit(EditServiceDialogFragment.this);
}
else{
Toast.makeText(getContext(), "Rate cannot be empty", Toast.LENGTH_LONG).show();
}
}
})
.setNegativeButton(R.string.delete, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
Bundle args = new Bundle();
args.putString("name", (String)getArguments().get("name"));
EditServiceDialogFragment.this.setArguments(args);
mListener.onDialogDelete(EditServiceDialogFragment.this);
}
})
.setTitle((String)getArguments().get("name"));
return builder.create();
}
}

View file

@ -0,0 +1,35 @@
package com.uottawa.olympus.olympusservices;
/**
* The class HomeOwner is a child of the class userType. The class permission
* to the user of a standard homeowner hence users with homeowner permissions
* are able to book service providers. Has not been implemented yet.
*
*/
public class HomeOwner extends UserType {
/**
* Constructor of the HomeOwner object that takes the username, password,
* lastname, and firstname as parameters to use for the creation of a
* HomeOwner object.
*
* @param username String for username.
* @param password String for password.
* @param firstname String for firstname.
* @param lastname String for lastname.
*/
HomeOwner(String username, String password, String firstname, String lastname){
super(username, password, firstname, lastname);
}
/**
* Returns the type of role the user is for this class.
* will return the string "HomeOwner".
*
* @return "HomeOwner" String object.
*/
public String getRole(){ return "HomeOwner"; }
}

View file

@ -2,12 +2,98 @@ package com.uottawa.olympus.olympusservices;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.content.Intent;
import android.widget.EditText;
import android.view.View;
import android.widget.Toast;
/**
* The login activity for the app that checks
* credentials of users to allow them to log in and use
* the functionality of the app.
*
*/
public class LogIn extends AppCompatActivity {
/**
* On creation of this activity the login xml file
* is loaded up.
*
* @param savedInstanceState Bundle object for transfer of information.
*/
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_log_in);
}
/**
* On click of the login button the app checks if all specification
* for login credentials are met and then either sends an error toast
* or logs the user in.
*
* @param view View object that contains all the buttons and editTexts.
*/
public void onClickLogIn(View view){
String username = ((EditText) findViewById(R.id.UsernameInput)).getText().toString();
String password = ((EditText) findViewById(R.id.PasswordInput)).getText().toString();
DBHelper dbHelper = new DBHelper(this);
if(username.matches("[a-zA-Z0-9]*")&&password.matches("[a-zA-Z0-9]*")
&& password.length()>0 && username.length()>0) {
if (dbHelper.findUserByUsername(username) != null) {
UserType user = dbHelper.findUserByUsername(username);
if (user.getUsername().equals(username) &&
user.getPassword().equals(password)) {
if(user.getRole()=="Admin"){
Intent intent = new Intent(getApplicationContext(),AdminWelcome.class);
startActivity(intent);
finish();
}
else if(user.getRole()=="ServiceProvider"){
Intent intent = new Intent(getApplicationContext(),ServiceProviderWelcome.class);
intent.putExtra("username", username);
startActivity(intent);
finish();
}
else {
Intent intent = new Intent(getApplicationContext(),Welcome.class);
intent.putExtra("username", username);
startActivity(intent);
finish();
}
} else {
Toast.makeText(this, "Wrong Password", Toast.LENGTH_LONG).show();
}
} else {
Toast.makeText(this, "Account does not exist", Toast.LENGTH_LONG).show();
}
}
else if(username.length()==0 || password.length()==0){
Toast.makeText(this, "Fields cannot be empty", Toast.LENGTH_LONG).show();
}
else{
Toast.makeText(this, "Fields may only contain alphanumeric values", Toast.LENGTH_LONG).show();
}
}
/**
* app closes the the activity when back is pressed and
* no user information written down is saved in the EditText for
* security purposes.
*/
@Override
public void onBackPressed(){
Intent intent = new Intent(getApplicationContext(), Main.class);
startActivity(intent);
finish();
}
}

View file

@ -5,13 +5,53 @@ import android.os.Bundle;
import android.content.Intent;
import android.view.View;
/**
* The starting page of the app which contains two buttons
* of either registering for the app or logging into an existing
* account.
*
*/
public class Main extends AppCompatActivity {
/**
* On creation of the object the app loads up the xml page
* for the class and creates dbHelper object and Admin object
* and then add the admin into the database.
* @param savedInstanceState
*/
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
UserType admin = new Admin();
DBHelper dbHelper = new DBHelper(this);
dbHelper.addUser(admin);
}
/**
* On click of the sign up button loads up the sign up activity
*
* @param view View object containing the buttons.
*/
public void onClickSignUp(View view){
Intent intent = new Intent(getApplicationContext(),SignUp.class);
startActivity(intent);
finish();
}
/**
* On click of the Login button loads up the login activity.
*
* @param view View object containing the buttons.
*/
public void onClickLogIn(View view){
Intent intent = new Intent(getApplicationContext(),LogIn.class);
startActivity(intent);
finish();
}
}

View file

@ -0,0 +1,106 @@
package com.uottawa.olympus.olympusservices;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import android.view.LayoutInflater;
import android.content.res.Resources;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.ViewGroup;
import android.widget.EditText;
import android.view.View;
import android.widget.Toast;
import com.rengwuxian.materialedittext.MaterialEditText;
/**
* Creates a dialog whenever admin adds a new service into the
* service list which the admin fills in to provide the fields of
* the service.
*/
public class NewServiceDialogFragment extends DialogFragment {
/**
* Creates a NoticeDialogListener interface for other classes to
* implement to have this class be functional in the other classes.
*
*/
public interface NoticeDialogListener {
public void onDialogNew(DialogFragment dialog);
public void onDialogNevermind(DialogFragment dialog);
}
NoticeDialogListener mListener;
// Override the Fragment.onAttach() method to instantiate the NoticeDialogListener
@Override
public void onAttach(Context context) {
super.onAttach(context);
// Verify that the host activity implements the callback interface
try {
// Instantiate the NoticeDialogListener so we can send events to the host
mListener = (NoticeDialogListener) context;
} catch (ClassCastException e) {
// The activity doesn't implement the interface, throw exception
throw new ClassCastException(this.toString()
+ " must implement NoticeDialogListener");
}
}
/**
* Creates the Dialog to add the name and rate of a new service that
* the admin has added to the list of services.
*
* @param savedInstanceState Bundle to transfer information.
* @return Dialog that is sent to admin for information.
*/
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
// Get the layout inflater
LayoutInflater inflater = getActivity().getLayoutInflater();
View view = inflater.inflate(R.layout.dialog_service_new, null);
// Inflate and set the layout for the dialog
// Pass null as the parent view because its going in the dialog layout
builder.setView(view)
// Add action buttons
.setPositiveButton(R.string.add, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
EditText nameInput = (EditText) ((AlertDialog) dialog).findViewById(R.id.NameInput);
EditText rateInput = (EditText) ((AlertDialog) dialog).findViewById(R.id.RateInput);
String name = nameInput.getText().toString();
DBHelper dbHelper = new DBHelper(getContext());
if (rateInput.getText().toString().length()>0 && !rateInput.getText().toString().equals(".") && name.length()>0 && name.matches("^[a-zA-Z0-9_ ]*$") && dbHelper.findService(name)==null){
Double rate = Double.parseDouble(rateInput.getText().toString());
Bundle args = new Bundle();
args.putString("name", name);
args.putDouble("rate", rate);
NewServiceDialogFragment.this.setArguments(args);
mListener.onDialogNew(NewServiceDialogFragment.this);
}
else if(!(rateInput.getText().toString().length()>0) || !(name.length()>0)|| !name.matches("[a-zA-Z]*") || !rateInput.getText().toString().equals(".")){
Toast.makeText(getContext(), "Service must have an alphanumeric name and a rate", Toast.LENGTH_LONG).show();
}
else{
Toast.makeText(getContext(), "Service already exists", Toast.LENGTH_LONG).show();
}
}
})
.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
NewServiceDialogFragment.this.getDialog().cancel();
}
});
return builder.create();
}
}

View file

@ -0,0 +1,91 @@
package com.uottawa.olympus.olympusservices;
import java.util.ArrayList;
import java.util.List;
/**
* creates a service object that can be managed by admin and service providers
* and be viewed by the homeowner for the sale of service which is the main
* functionality of the app.
*
*/
public class Service {
//name of the service field.
private String name;
//rate of the service field.
private double rate;
//list of services the providers that offers this service.
private List<ServiceProvider> serviceProviders;
/**
* Constructor for a new service which uses the parameters
* to fill in the fields of the service and creates an arrayList
* for all the providers that provide that service.
*
* @param name String of the name of service.
* @param rate double of the price of service.
*/
Service(String name, double rate) {
this.name = name;
this.rate = rate;
serviceProviders = new ArrayList<ServiceProvider>();
}
/**
* Gets the Name field of the service.
*
* @return String of the name.
*/
public String getName() {
return name;
}
/**
* Gets the Rate field of the service.
*
* @return double of the rate.
*/
public double getRate() {
return rate;
}
/**
* Changes the name field of the object to parameter given.
*
* @param name String object of new name
*/
public void setName(String name) {
this.name = name;
}
/**
* Changes the rate field of the object to parameter given.
*
* @param rate double of new rate.
*/
public void setRate(double rate) {
this.rate = rate;
}
/**
* Adds a new service provider that offers this service into the list
* of service providers that offer this service.
*
* @param user Service Provider object which is added to the service's list.
* @return boolean of if the Service provider has been added.
*/
public boolean addServiceProvider(ServiceProvider user){
for (ServiceProvider listUser : serviceProviders){
if (user.getUsername().equals(listUser.getUsername())){
return false;
}
}
serviceProviders.add(user);
return true;
}
public List<ServiceProvider> getServiceProviders(){
return serviceProviders;
}
}

View file

@ -0,0 +1,142 @@
package com.uottawa.olympus.olympusservices;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* The service provider is the child userType class. The service provider
* class provides services which the homeowner can buy in the app.
*
*/
public class ServiceProvider extends UserType {
//Field for list of services that service provider offers.
private List<Service> services;
//Field for array of availabilities
/*
DO NOT CHANGE THIS ARRAY. The 2D array size is hard coded such that the first array has a size
of 7 and the array inside has an array size of 4. The array is setup such that the index represent a day of the
week. Monday is 0, Tuesday is 1, Wednesday is 2, Thursday is 3, Friday is 4, Saturday is 5,
Sunday is 6. so, [Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday]. Inside each of
the arrays there is a another array containing int values such that index 0,1,2,3 is startHour,
startMin, endHour, endMin respectively.
*/
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
* fill out the service providers field.
*
* @param username String of the username.
* @param password String of the password.
* @param firstname String of the firstname.
* @param lastname String of the lastname.
*/
ServiceProvider(String username, String password, String firstname, String lastname, String address,
String phonenumber, String companyname, boolean licensed){
super(username, password, firstname, lastname);
services = new ArrayList<>();
availabilities = new int[7][4];
this.address = address;
this.phonenumber = phonenumber;
this.companyname = companyname;
this.licensed = licensed;
}
/**
* gets the role of the UserType.
*
* @return String "Service Provider"
*/
public String getRole(){ return "ServiceProvider"; }
/**
* adds service to the to service list if the service is in the
* database list of services.
*
* @param service Service object which is added to the services field.
* @return boolean whether service is added.
*/
public boolean addService(Service service){
for (Service listService : services){
if (service.getName().equals(listService.getName())){
return false;
}
}
services.add(service);
return true;
}
/**
* Gets the services list field of service provider.
*
* @return arrayList of Services
*/
public void setAvailabilities(int day, int startHour, int startMin, int endHour, int endMin){
availabilities[day][0] = startHour;
availabilities[day][1] = startMin;
availabilities[day][2] = endHour;
availabilities[day][3] = endMin;
}
public int[][] getAvailabilities(){
return availabilities;
}
public void setAvailabilities(int[][] availabilities) {
this.availabilities = availabilities;
}
public void setServices(List<Service> services) {
this.services = services;
}
public List<Service> getServices(){
return services;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getPhonenumber() {
return phonenumber;
}
public void setPhonenumber(String phonenumber) {
this.phonenumber = phonenumber;
}
public String getCompanyname() {
return companyname;
}
public void setCompanyname(String companyname) {
this.companyname = companyname;
}
public boolean isLicensed() {
return licensed;
}
public void setLicensed(boolean licensed) {
this.licensed = licensed;
}
}

View file

@ -0,0 +1,70 @@
package com.uottawa.olympus.olympusservices;
import android.app.TimePickerDialog;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.TimePicker;
import java.util.Calendar;
public class ServiceProviderAvailabilities extends AppCompatActivity {
private String username;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_service_provider_availabilities);
Bundle bundle = getIntent().getExtras();
username = bundle.getString("username");
}
public void onClick(View v) {
// Get Current Time
final Calendar c = Calendar.getInstance();
int hour = c.get(Calendar.HOUR_OF_DAY);
int minute = c.get(Calendar.MINUTE);
final Button button = (Button)v;
// Launch Time Picker Dialog
TimePickerDialog timePickerDialog = new TimePickerDialog(this,
new TimePickerDialog.OnTimeSetListener() {
@Override
public void onTimeSet(TimePicker view, int hourOfDay,
int minute) {
if (minute==0){
button.setText(hourOfDay + ":00");
}
else {
button.setText(hourOfDay + ":" + minute);
}
//set availibility for service provider and check start time is less than finish
}
}, hour, minute, false);
timePickerDialog.show();
}
public void onRemove(View view){
//set time to Start/End, set availibility for start and end to null
}
/**
* Override so that previous screen refreshes when pressing the
* back button on this activity of the app.
*
*/
@Override
public void onBackPressed(){
Intent intent = new Intent(getApplicationContext(),ServiceProviderWelcome.class);
intent.putExtra("username", username);
startActivity(intent);
finish();
}
}

View file

@ -0,0 +1,238 @@
package com.uottawa.olympus.olympusservices;
import android.content.Context;
import android.content.Intent;
import android.support.annotation.NonNull;
import android.support.design.widget.Snackbar;
import android.support.v4.app.DialogFragment;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.ListAdapter;
import android.widget.TextView;
import android.widget.Toast;
import com.jaredrummler.materialspinner.MaterialSpinner;
import java.util.Iterator;
import java.util.List;
/**
* Creates the view and dialog listener for List of services
* which the admin can view and manipulate.
*
*/
public class ServiceProviderServicesList extends AppCompatActivity implements DeleteServiceDialogFragment.NoticeDialogListener{
//field for RecyclerView
private RecyclerView mRecyclerView;
//field for adapter of Recycler view
private RecyclerView.Adapter mAdapter;
//field for layout manager of Recyler view.
private RecyclerView.LayoutManager mLayoutManager;
private String username;
/**
* On creation loads up the xml, and generates the services list,
* and fillsout the recylerView fields.
*
* @param savedInstanceState Bundle to transfer information.
*/
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_service_provider_services_list);
Bundle bundle = getIntent().getExtras();
username = bundle.getString("username");
DBHelper dbHelper = new DBHelper(this);
//grid
List<String[]> serviceslist2 = dbHelper.getAllServicesProvidedByUser(username);
Service[] services2 = new Service[(serviceslist2.size())];
Iterator iter2 = serviceslist2.iterator();
for (int i=0; i<serviceslist2.size();i++){
String[] current = (String[])iter2.next();
services2[i] = new Service(current[0], Double.parseDouble(current[1]));
}
mRecyclerView = (RecyclerView) findViewById(R.id.Services);
mLayoutManager = new LinearLayoutManager(this);
mRecyclerView.setLayoutManager(mLayoutManager);
mAdapter = new MyAdapter(services2, this);
mRecyclerView.setAdapter(mAdapter);
//spinner
MaterialSpinner spinner = findViewById(R.id.ServicesInput);
List<String[]> serviceslist = dbHelper.getAllServices();
String[] services = new String[(serviceslist.size())];
Iterator iter = serviceslist.iterator();
for (int i=0; i<serviceslist.size();i++){
String[] current = (String[])iter.next();
services[i] = current[0];
}
ArrayAdapter<String> servicesadapter = new ArrayAdapter<String>
(this, android.R.layout.simple_spinner_item, services);
servicesadapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
spinner.setAdapter(servicesadapter);
spinner.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
@Override public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
Snackbar.make(view, "Clicked " + item, Snackbar.LENGTH_LONG).show();
}
});
}
/**
* Override so that previous screen refreshes when pressing the
* back button on this activity of the app.
*
*/
@Override
public void onBackPressed(){
Intent intent = new Intent(getApplicationContext(),ServiceProviderWelcome.class);
intent.putExtra("username", username);
startActivity(intent);
finish();
}
/**
* Deletes services from the list.
*
* @param view View object contains the generated list and buttons
*/
public void deleteService(View view, String name) {
DialogFragment newFragment = new DeleteServiceDialogFragment();
newFragment.show(getSupportFragmentManager(), "addService");
Bundle args = new Bundle();
args.putString("name", name);
newFragment.setArguments(args);
}
/**
* Adds service to the list.
*
* @param view View object contains the generated list and buttons
*/
public void addService(View view) {
MaterialSpinner spinner = findViewById(R.id.ServicesInput);
String servicename = spinner.getText().toString();
DBHelper dbHelper = new DBHelper(this);
if(dbHelper.addServiceProvidedByUser(username, servicename)){
this.recreate();
}
else{
Toast.makeText(this, "Could not add service", Toast.LENGTH_SHORT).show();
}
}
/**
* Uses Dialog to delete a service from the serviceList.
*
* @param dialog DialogFragment that contains the delete service button.
*/
@Override
public void onDialogDelete(DialogFragment dialog) {
DBHelper dbHelper = new DBHelper(this);
String name = (String)dialog.getArguments().get("name");
dbHelper.deleteServiceProvidedByUser(username, name);
dialog.dismiss();
this.recreate();
}
/**
* Does nothing
*
* @param dialog DialogFragment that contains the cancel button.
*/
@Override
public void onDialogNevermind(DialogFragment dialog) {
}
public class MyAdapter extends RecyclerView.Adapter<MyAdapter.ServicesHolder> {
private Service[] services;
private Context context;
// Provide a reference to the views for each data item
// Complex data items may need more than one view per item, and
// you provide access to all the views for a data item in a view holder
// Provide a suitable constructor (depends on the kind of dataset)
public MyAdapter(Service[] services, Context context) {
this.services = services;
}
// Create new views (invoked by the layout manager)
@NonNull
@Override
public ServicesHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View v = LayoutInflater.from(parent.getContext())
.inflate(R.layout.list_item, parent, false);
ServicesHolder vh = new ServicesHolder(v);
return vh;
}
// Replace the contents of a view (invoked by the layout manager)
@Override
public void onBindViewHolder(ServicesHolder holder, int position) {
Service service = services[position];
holder.name.setText(service.getName());
holder.rate.setText(String.format("$%,.2f", service.getRate()));
}
// Return the size of your dataset (invoked by the layout manager)
@Override
public int getItemCount() {
return services.length;
}
class ServicesHolder extends RecyclerView.ViewHolder implements View.OnClickListener{
TextView name;
TextView rate;
public ServicesHolder(View row){
super(row);
name = row.findViewById(R.id.Name);
rate = row.findViewById(R.id.Rate);
row.setOnClickListener(this);
}
@Override
public void onClick(View view) {
TextView nameview = (TextView)view.findViewById(R.id.Name);
String name = nameview.getText().toString();
deleteService(view, name);
}
}
}
}

View file

@ -0,0 +1,84 @@
package com.uottawa.olympus.olympusservices;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.TextView;
import android.content.Intent;
/**
* Welcome class creates the welcome screen for the HomeOwners and ServiceProviders
* as a temporary screen until full functionality of those two a classes are
* implemented.
*
*/
public class ServiceProviderWelcome extends AppCompatActivity {
String username;
/**
* On creation of this object the app will display the xml file for
* the welcome page which gets the role and username of the UserType
* object and welcomes the user with a message.
*
* @param savedInstanceState Bundle to transfer data
*/
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_service_provider_welcome);
Bundle bundle = getIntent().getExtras();
username = bundle.getString("username");
DBHelper dbHelper = new DBHelper(this);
UserType user;
user = dbHelper.findUserByUsername(username);
TextView welcome = findViewById(R.id.Welcome);
welcome.setText("Welcome "+user.getFirstname()+ " you are logged in as a Service Provider");
}
/**
* Override so that nothing occurs when pressing the
* back button on this activity of the app.
*
*/
@Override
public void onBackPressed(){
}
/**
* Logs out the user and returns them back to
* main activity. End all current user activity
* for security purposes.
*
* @param view View object of current activity.
*/
public void LogOut(View view){
Intent intent = new Intent(getApplicationContext(), Main.class);
startActivity(intent);
finish();
}
public void EditProfile(View view){
Intent intent = new Intent(getApplicationContext(),EditProfile.class);
intent.putExtra("username", username);
startActivity(intent);
finish();
}
public void EditServices(View view){
Intent intent = new Intent(getApplicationContext(),ServiceProviderServicesList.class);
intent.putExtra("username", username);
startActivity(intent);
finish();
}
public void EditAvailabilities(View view){
Intent intent = new Intent(getApplicationContext(),ServiceProviderAvailabilities.class);
intent.putExtra("username", username);
startActivity(intent);
finish();
}
}

View file

@ -4,22 +4,122 @@ import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import com.jaredrummler.materialspinner.MaterialSpinner;
import android.support.design.widget.Snackbar;
import android.content.Intent;
import android.widget.EditText;
import android.view.View;
import android.widget.Toast;
/**
* This class is used to create new userType where the user
* fills in his information and his data is sent to to the database
* to create a new userType object.
*
*/
public class SignUp extends AppCompatActivity {
/**
* On creation of this class the xml page is loaded up onto the app and
* the EditTexts are set up to accept the information of the user.
*
* @param savedInstanceState Bundle for transferring information
*/
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_sign_up);
MaterialSpinner spinner = findViewById(R.id.RoleInput);
spinner.setItems("Ice Cream Sandwich", "Jelly Bean", "KitKat", "Lollipop", "Marshmallow");
spinner.setItems("Home Owner", "Service Provider");
spinner.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
@Override public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
Snackbar.make(view, "Clicked " + item, Snackbar.LENGTH_LONG).show();
}
});
}
public static void main(String[] args){
}
/**
* On click creates a new user if the the user information
* fits the criteria specified by the documentation and is
* not a duplicate of another user.
*
* @param view View object that contains all the editText and buttons used.
*/
public void onClickSignUp(View view){
UserType newUser;
String username = ((EditText) findViewById(R.id.UsernameInput)).getText().toString();
String password = ((EditText) findViewById(R.id.PasswordInput)).getText().toString();
String firstname = ((EditText) findViewById(R.id.FirstNameInput)).getText().toString();
String lastname = ((EditText) findViewById(R.id.LastNameInput)).getText().toString();
MaterialSpinner spinner = findViewById(R.id.RoleInput);
if(username.length()>=5 && password.length()>=5 && firstname.length()>0 && lastname.length()>0 && username.matches("[a-zA-Z0-9]*") && password.matches("[a-zA-Z0-9]*")
&& firstname.matches("[a-zA-Z]*") && lastname.matches("[a-zA-Z]*")){
DBHelper dbHelper = new DBHelper(this);
Intent intent = new Intent(getApplicationContext(),LogIn.class);
switch(spinner.getText().toString()){
case "Home Owner":
newUser = new HomeOwner(username,password,firstname,lastname);
if(dbHelper.addUser(newUser)){
startActivity(intent);
finish();
}else{
Toast.makeText(this,"Username is taken",Toast.LENGTH_LONG).show();
}
break;
case "Service Provider":
if(dbHelper.findUserByUsername(username)==null) {
Intent intent2 = new Intent(getApplicationContext(), SignUpPart2.class);
intent2.putExtra("firstname", firstname);
intent2.putExtra("lastname", lastname);
intent2.putExtra("username", username);
intent2.putExtra("password", password);
startActivity(intent2);
finish();
}else{
Toast.makeText(this,"Username is taken",Toast.LENGTH_LONG).show();
}
break;
default:
newUser = new HomeOwner(username,password,firstname,lastname); //if nothing is enter then defaults to user role.
if(dbHelper.addUser(newUser)){
startActivity(intent);
finish();
}else{
Toast.makeText(this,"Username is taken",Toast.LENGTH_LONG).show();
}
break;
}
}
else if(firstname.length()==0 || lastname.length()==0 || username.length()==0 || password.length()==0){
Toast.makeText(this, "Fields cannot be empty", Toast.LENGTH_LONG).show();
}
else if (username.length()<5 || password.length()<5 ){
Toast.makeText(this, "Password and username must be longer than 4 characters", Toast.LENGTH_LONG).show();
}
else{
Toast.makeText(this, "Fields may only contain alphanumeric values", Toast.LENGTH_LONG).show();
}
}
/**
* app closes the the activity when back is pressed and
* no user information written down is saved in the EditText for
* security purposes.
*/
@Override
public void onBackPressed(){
Intent intent = new Intent(getApplicationContext(), Main.class);
startActivity(intent);
finish();
}
}

View file

@ -0,0 +1,54 @@
package com.uottawa.olympus.olympusservices;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.Toast;
public class SignUpPart2 extends AppCompatActivity {
private String username;
private String password;
private String firstname;
private String lastname;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_sign_up_part2);
Bundle bundle = getIntent().getExtras();
username = bundle.getString("username");
password = bundle.getString("password");
firstname = bundle.getString("firstname");
lastname = bundle.getString("lastname");
}
public void SignUp(View view){
DBHelper dbHelper = new DBHelper(this);
Intent intent = new Intent(getApplicationContext(),LogIn.class);
String companyname = ((EditText) findViewById(R.id.CompanyNameInput)).getText().toString();
String phonenumber = ((EditText) findViewById(R.id.PhoneNumberInput)).getText().toString();
String address = ((EditText) findViewById(R.id.AddressInput)).getText().toString();
boolean licensed = ((CheckBox) findViewById(R.id.LicensedInput)).isChecked();
if(companyname.length()>0 && address.length()>0 && phonenumber.length()>0
&& companyname.matches("^[a-zA-Z0-9_ ]*$") && address.matches("^[a-zA-Z0-9_ ]*$")
&& phonenumber.matches("^(\\+\\d{1,2}\\s)?\\(?\\d{3}\\)?[\\s.-]?\\d{3}[\\s.-]?\\d{4}$")) {
ServiceProvider serviceProvider = new ServiceProvider(username, password, firstname, lastname,
address, phonenumber, companyname, licensed);
if(dbHelper.addUser(serviceProvider)){
startActivity(intent);
finish();
}else{
Toast.makeText(this,"Could not create account",Toast.LENGTH_LONG).show();
}
}
else{
Toast.makeText(this, "Fields cannot be empty and must be formatted correctly", Toast.LENGTH_LONG).show();
}
}
}

View file

@ -0,0 +1,139 @@
package com.uottawa.olympus.olympusservices;
import java.io.Serializable;
/**
* UserType is the abstract object that is the parent class
* of all users in this program with all common methods and
* fields set in this one class.
*/
public abstract class UserType {
//field for the username attached to the userType.
String username;
//field for the password attached to the userType.
String password;
//field for the firstname attached to the userType.
String firstname;
//field for the lastname attached to the userType.
String lastname;
/**
* Constructor filling out all the field values with given parameters
* entered by a new user for the app.
*
* @param username String object containing the username.
* @param password String object containing the password.
* @param firstname String object containing the firstname.
* @param lastname String object containing the lastname.
*/
UserType(String username, String password, String firstname, String lastname){
this.username = username;
this.password = password;
this.firstname = firstname;
this.lastname = lastname;
}
/**
* Abstract method to get the role of each userType child in the app.
*
* @return String object specifying the role of userType.
*/
public abstract String getRole();
/**
* Gets the username field of userType.
*
* @return String of the username.
*/
public String getUsername() {
return username;
}
/**
* Gets the password field of userType.
*
* @return String of the password.
*/
public String getPassword() {
return password;
}
/**
* Gets the firstname field of userType.
*
* @return String of firstname
*/
public String getFirstname() {
return firstname;
}
/**
* Gets the lastname field of userType.
*
* @return String of lastname
*/
public String getLastname() {
return lastname;
}
/**
* Sets the username field with given parameters.
*
* @param username String for new username.
*/
public void setUsername(String username) {
//remember to call updateUser(String username, String password, String firstname, String lastname)
//in activity whenever a setter is called. DBHelper requires a Context (Activity) to be initialized
//so cannot be initialized in this class
this.username = username;
}
/**
* Sets the password field with given parameters.
*
* @param password String of new password.
*/
public void setPassword(String password) {
//remember to call updateUser(String username, String password, String firstname, String lastname)
//in activity whenever a setter is called. DBHelper requires a Context (Activity) to be initialized
//so cannot be initialized in this class
this.password = password;
}
/**
* Sets the firstname field with given parameters.
*
* @param firstname String of new firstname.
*/
public void setFirstname(String firstname) {
//remember to call updateUser(String username, String password, String firstname, String lastname)
//in activity whenever a setter is called. DBHelper requires a Context (Activity) to be initialized
//so cannot be initialized in this class
this.firstname = firstname;
}
public void setLastname(String lastname) {
//remember to call updateUser(String username, String password, String firstname, String lastname)
//in activity whenever a setter is called. DBHelper requires a Context (Activity) to be initialized
//so cannot be initialized in this class
this.lastname = lastname;
}
/**
* Compares this userType and another userType to see if there fields are equal.
*
* @param other Usertype object that is compared to this userType.
*/
public boolean equals(UserType other){
if(this.username.equals(other.username)&&this.password.equals(other.password)&&
this.firstname.equals(other.firstname)&&this.lastname.equals(other.lastname)){
return true;
}
return false;
}
}

View file

@ -0,0 +1,45 @@
package com.uottawa.olympus.olympusservices;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.widget.ArrayAdapter;
import android.widget.GridView;
import java.util.Iterator;
import java.util.List;
/**
* screen for user list that the admin can access
* and manage all users in the program. Userlist is generated through
* the database using DBHelper class.
*
*/
public class UsersList extends AppCompatActivity {
/**
* on Creation of this class the app loads up the xml page for
* activity_user_list and generates a gridview using the database
* for all the users in the app.
*
* @param savedInstanceState bundle to transfer data
*/
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_users_list);
DBHelper dbHelper = new DBHelper(this);
List<String[]> users = dbHelper.getAllUsers();
String[] usernames = new String[(users.size())*2];
Iterator iter = users.iterator();
for (int i=0; i<users.size();i++){
String[] current = (String[])iter.next();
usernames[(i)*2] = current[0];
usernames[(i)*2+1] = current[3];
}
ArrayAdapter adapter = new ArrayAdapter<String>(this, R.layout.simple_list_item_1_customized, usernames);
GridView gridView = findViewById(R.id.Users);
gridView.setAdapter(adapter);
}
}

View file

@ -2,12 +2,63 @@ package com.uottawa.olympus.olympusservices;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.TextView;
import android.content.Intent;
/**
* Welcome class creates the welcome screen for the HomeOwners and ServiceProviders
* as a temporary screen until full functionality of those two a classes are
* implemented.
*
*/
public class Welcome extends AppCompatActivity {
/**
* On creation of this object the app will display the xml file for
* the welcome page which gets the role and username of the UserType
* object and welcomes the user with a message.
*
* @param savedInstanceState Bundle to transfer data
*/
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_welcome);
Bundle bundle = getIntent().getExtras();
String username = bundle.getString("username");
DBHelper dbHelper = new DBHelper(this);
UserType user;
user = dbHelper.findUserByUsername(username);
TextView role = findViewById(R.id.Role);
TextView name = findViewById(R.id.name);
role.setText(user.getRole());
name.setText(user.getFirstname());
}
/**
* Override so that nothing occurs when pressing the
* back button on this activity of the app.
*
*/
@Override
public void onBackPressed(){
}
/**
* Logs out the user and returns them back to
* main activity. End all current user activity
* for security purposes.
*
* @param view View object of current activity.
*/
public void LogOut(View view){
Intent intent = new Intent(getApplicationContext(), Main.class);
startActivity(intent);
finish();
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View file

@ -0,0 +1,81 @@
<?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=".AdminServicesList">
<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="20dp"
android:gravity="center"
android:text="Click on service to edit or delete"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="15sp" />
<Button
android:id="@+id/newService"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="Add New Service"
android:onClick="addService"
android:theme="@style/AppTheme.Button" />
</LinearLayout>

View file

@ -0,0 +1,54 @@
<?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=".Welcome">
<TextView
android:id="@+id/Welcome"
android:layout_width="300dp"
android:layout_height="80dp"
android:layout_marginBottom="20dp"
android:gravity="center"
android:text="Welcome Admin"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="20sp"
android:layout_marginTop="10dp"
app:fontFamily="@font/julius_sans_one" />
<Button
android:id="@+id/Users"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="20dp"
android:onClick="goToUsers"
android:text="List of Users"
android:theme="@style/AppTheme.Button" />
<Button
android:id="@+id/Services"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="20dp"
android:onClick="goToServices"
android:text="List of Services"
android:theme="@style/AppTheme.Button" />
<Button
android:id="@+id/LogOut"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="50dp"
android:onClick="LogOut"
android:text="Logout"
android:theme="@style/AppTheme.Button" />
</LinearLayout>

View file

@ -0,0 +1,134 @@
<?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">
//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: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/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/LicensedInput"
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"
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>

View file

@ -12,5 +12,72 @@
android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/background"
tools:context=".LogIn">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/Title"
android:layout_width="300dp"
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"
android:textColor="@android:color/white"
android:textSize="36sp"
app:fontFamily="@font/julius_sans_one" />
//component used from https://github.com/rengwuxian/MaterialEditText
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/UsernameInput"
android:layout_width="match_parent"
android:layout_height="80dp"
android:background="@color/colorWhite"
android:textSize="15sp"
android:hint="@string/username"
android:layout_marginTop="40dp"
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:textSize="15sp"
android:hint="@string/password"
android:layout_marginTop="20dp"
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/LogIn"
android:layout_width="match_parent"
android:layout_height="60dp"
android:layout_marginTop="40dp"
android:onClick="onClickLogIn"
android:text="@string/login"
android:theme="@style/AppTheme.Button" />
</LinearLayout>
</ScrollView>
</LinearLayout>

View file

@ -17,27 +17,34 @@
android:id="@+id/Title"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_marginBottom="100dp"
android:layout_marginBottom="70dp"
android:gravity="center"
android:text="@string/CompanyName"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="36sp"
app:fontFamily="@font/julius_sans_one" />
app:fontFamily="@font/julius_sans_one"
android:layout_marginTop="30dp"/>
<Button
android:theme="@style/AppTheme.Button"
android:id="@+id/SignUp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="50dp"
android:text="@string/signup" />
android:layout_height="70dp"
android:layout_marginBottom="35dp"
android:onClick="onClickSignUp"
android:text="@string/signup"
android:theme="@style/AppTheme.Button"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"/>
<Button
android:theme="@style/AppTheme.Button"
android:id="@+id/LogIn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/login" />
android:layout_height="70dp"
android:onClick="onClickLogIn"
android:text="@string/login"
android:theme="@style/AppTheme.Button"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"/>
</LinearLayout>

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>

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="48dp"
android:layout_weight="1"
android:layout_marginTop="5dp"/>
<Button
android:id="@+id/newService"
android:layout_width="wrap_content"
android:layout_height="60dp"
android:layout_weight="1"
android:onClick="addService"
android:text="Add"
android:textSize="10sp"
android:theme="@style/AppTheme.Button"/>
</LinearLayout>
</LinearLayout>

View file

@ -0,0 +1,69 @@
<?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=".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" />
<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>

View file

@ -12,82 +12,95 @@
android:paddingTop="@dimen/activity_vertical_margin"
android:background="@drawable/background"
tools:context=".SignUp">
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<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="50dp"
android:layout_marginBottom="40dp"
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" />
<TextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="20sp"
android:text="Role" />
android:text="Role"
android:textColor="#6d81a5"
android:textSize="15sp" />
// component used from https://github.com/jaredrummler/MaterialSpinner
<com.jaredrummler.materialspinner.MaterialSpinner
android:id="@+id/RoleInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="15dp" />
android:layout_height="45dp"
android:layout_marginBottom="10dp" />
//component used from https://github.com/rengwuxian/MaterialEditText
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/UsernameInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Username"
android:textSize="20sp"
app:met_baseColor="@android:color/white"
android:layout_height="80dp"
android:background="@color/colorWhite"
android:hint="Username"
android:textSize="15sp"
app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent"
app:met_singleLineEllipsis="true"/>
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="wrap_content"
android:layout_height="80dp"
android:background="@drawable/customborder"
android:hint="Password"
android:textSize="20sp"
android:textSize="15sp"
app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent"
app:met_primaryColor="@color/colorWhite"
app:met_singleLineEllipsis="true"
android:background="@drawable/customborder"/>
android:inputType="textPassword"
android:textCursorDrawable="@color/colorWhite"/>
//component used from https://github.com/rengwuxian/MaterialEditText
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/FirstNameInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="80dp"
android:background="@drawable/customborder"
android:hint="First Name"
android:textSize="20sp"
android:textSize="15sp"
app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent"
app:met_primaryColor="@color/colorWhite"
app:met_singleLineEllipsis="true"
android:background="@drawable/customborder"/>
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="wrap_content"
android:layout_height="80dp"
android:background="@drawable/customborder"
android:hint="Last Name"
android:textSize="20sp"
android:textSize="15sp"
app:met_baseColor="@android:color/white"
app:met_floatingLabel="highlight"
app:met_primaryColor="?colorAccent"
app:met_primaryColor="@color/colorWhite"
app:met_singleLineEllipsis="true"
android:background="@drawable/customborder"/>
android:textCursorDrawable="@color/colorWhite"/>
<Button
android:id="@+id/SignUp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="onClickSignUp"
android:text="@string/signup"
android:theme="@style/AppTheme.Button" />
</LinearLayout>
</ScrollView>
</LinearLayout>

View file

@ -0,0 +1,93 @@
<?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=".SignUpPart2">
<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">
//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"
android:layout_marginTop="20dp"/>
//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/LicensedInput"
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"/>
<Button
android:id="@+id/SignUp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Sign Up"
android:onClick="SignUp"
android:theme="@style/AppTheme.Button" />
</LinearLayout>
</ScrollView>
</LinearLayout>

View file

@ -0,0 +1,66 @@
<?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=".Welcome">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginBottom="10dp">
<TextView
android:id="@+id/Title1"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:layout_marginTop="10dp"
android:layout_weight="1"
android:text="Username"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="15sp"
android:gravity="center"/>
<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="User Type"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="15sp"
android:gravity="center"/>
</LinearLayout>
<GridView
android:id="@+id/Users"
android:layout_width="fill_parent"
android:layout_weight="1"
android:layout_height="450dp"
android:numColumns="2"
android:textColor="@android:color/white"
android:textSize="15sp"
/>
</LinearLayout>
</LinearLayout>

View file

@ -13,4 +13,63 @@
android:background="@drawable/background"
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="30sp"
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="20sp"
android:background="@drawable/customborder"
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 a"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:textSize="18sp"
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="Role Here"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textColor="@android:color/white"
android:background="@drawable/customborder"
android:textSize="20sp"
app:fontFamily="@font/julius_sans_one" />
<Button
android:id="@+id/LogOut"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:onClick="LogOut"
android:text="Logout"
android:theme="@style/AppTheme.Button" />
</LinearLayout>

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 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="40dp"
/>
</LinearLayout>

View file

@ -0,0 +1,28 @@
<?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">
//component used from https://github.com/rengwuxian/MaterialEditText
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/RateInput"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_marginTop="20dp"
android:hint="@string/servicerate"
android:inputType="numberDecimal"
android:textCursorDrawable="@color/colorWhite"
android:textSize="15sp"
android:text=""
app:met_baseColor="@android:color/black"
app:met_floatingLabel="highlight"
app:met_primaryColor="@color/colorBlack"
app:met_singleLineEllipsis="true"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"/>
</LinearLayout>

View file

@ -0,0 +1,44 @@
<?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">
//component used from https://github.com/rengwuxian/MaterialEditText
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/NameInput"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_marginTop="20dp"
android:hint="@string/servicename"
android:textCursorDrawable="@color/colorWhite"
android:textSize="15sp"
android:text=""
app:met_baseColor="@android:color/black"
app:met_floatingLabel="highlight"
app:met_primaryColor="@color/colorBlack"
app:met_singleLineEllipsis="true"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"/>
//component used from https://github.com/rengwuxian/MaterialEditText
<com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/RateInput"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_marginTop="20dp"
android:hint="@string/servicerate"
android:text=""
android:inputType="numberDecimal"
android:textCursorDrawable="@color/colorWhite"
android:textSize="15sp"
app:met_baseColor="@android:color/black"
app:met_floatingLabel="highlight"
app:met_primaryColor="@color/colorBlack"
app:met_singleLineEllipsis="true"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"/>
</LinearLayout>

View file

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:background="@color/colorWhite"
android:layout_marginBottom="5dp">
<TextView
android:paddingLeft="10dp"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:id="@+id/Name"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:text=""
android:textColor="@color/colorBlack"
android:textSize="15sp"
/>
<TextView
android:id="@+id/Rate"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text=""
android:textColor="@color/colorBlack"
android:textSize="15sp"
android:gravity="end"/>
</LinearLayout>

View file

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
android:paddingRight="?android:attr/listPreferredItemPaddingRight"
android:paddingStart="30dp"
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:textColor="@android:color/black"
android:background="@color/colorWhite"
android:layout_marginBottom="10dp"
>
</TextView>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View file

@ -2,7 +2,7 @@
<resources>
<color name="colorPrimary">#3F51B5</color>
<color name="colorPrimaryDark">#303F9F</color>
<color name="colorAccent">#FF4081</color>
<color name="colorAccent">#303F9F</color>
<color name="colorWhite">#FFFFFF</color>
<color name="colorBlack">#000000</color>
</resources>

View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#FFFFFF</color>
</resources>

View file

@ -19,6 +19,16 @@
<string name="login">Log In</string>
<string name="newusername">Enter Username</string>
<string name="newpassword">Enter Password</string>
<string name="password">Password</string>
<string name="username">Username</string>
<string name="servicename">Service Name</string>
<string name="servicerate">Service Rate</string>
<string name="save">Save</string>
<string name="cancel">Cancel</string>
<string name="update">Update</string>
<string name="delete">Delete</string>
<string name="remove">Remove</string>
<string name="add">Add</string>
<string-array name="roles">
<item>Admin</item>
<item>User</item>

View file

@ -4,7 +4,7 @@
<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="colorPrimaryDark">@color/colorWhite</item>
<item name="colorAccent">@color/colorAccent</item>
</style>
@ -13,4 +13,5 @@
<item name="android:textColor">@color/colorBlack</item>
</style>
</resources>

View file

@ -0,0 +1,27 @@
package com.uottawa.olympus.olympusservices;
import org.junit.Test;
import static org.junit.Assert.*;
public class AdminTest {
/**
* Initiates an Admin account and tests if the strings match to the required inputs.
*/
@Test
public void testAdmin() {
Admin admin = new Admin();
String username = admin.getUsername();
String password = admin.getPassword();
String firstname = admin.getFirstname();
String lastname = admin.getLastname();
String role = admin.getRole();
assertEquals("Admin", role);
assertEquals("admin", username);
assertEquals("admin", password);
assertEquals("Admin", firstname);
assertEquals("Admin", lastname);
}
}

View file

@ -0,0 +1,311 @@
package com.uottawa.olympus.olympusservices;
//import android.content.Context;
//import android.database.DatabaseUtils;
//import android.database.sqlite.SQLiteDatabase;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import java.util.List;
import static org.junit.Assert.*;
@RunWith(RobolectricTestRunner.class)
@Config(packageName = "com.uottawa.olympus.olympusservices")
public class DBIntegrationTest {
private DBHelper dbHelper = new DBHelper(RuntimeEnvironment.application);
//testing user login table
@Test
public void testAdminExists(){
UserType dbUser = dbHelper.findUserByUsername("admin");
assertEquals("Admin", dbUser.getClass().getSimpleName());
assertEquals("admin", dbUser.getUsername());
assertEquals("admin", dbUser.getPassword());
assertEquals("Admin", dbUser.getFirstname());
assertEquals("Admin", dbUser.getLastname());
}
@Test
public void testAddAndDeleteUser(){
UserType originalUser, dbUser;
boolean deleted, addedOne, addedTwo;
originalUser = new HomeOwner("mgarzon", "soccer", "Miguel", "Garzon");
addedOne = dbHelper.addUser(originalUser);
dbUser = dbHelper.findUserByUsername("mgarzon");
assertEquals("HomeOwner", dbUser.getClass().getSimpleName());
assertEquals("mgarzon", dbUser.getUsername());
assertEquals("soccer", dbUser.getPassword());
assertEquals("Miguel", dbUser.getFirstname());
assertEquals("Garzon", dbUser.getLastname());
originalUser = new ServiceProvider("jbO4aBF4dC", "seg2105", "Juan", "Guzman",
"testaddress", "8888888888", "companydotcom", true);
addedTwo = dbHelper.addUser(originalUser);
dbUser = dbHelper.findUserByUsername("jbO4aBF4dC");
assertEquals("ServiceProvider", dbUser.getClass().getSimpleName());
assertEquals("jbO4aBF4dC", dbUser.getUsername());
assertEquals("seg2105", dbUser.getPassword());
assertEquals("Juan", dbUser.getFirstname());
assertEquals("Guzman", dbUser.getLastname());
if (addedOne) {
deleted = dbHelper.deleteUser("mgarzon");
assertTrue(deleted);
}
if (addedTwo) {
deleted = dbHelper.deleteUser("jbO4aBF4dC");
assertTrue(deleted);
}
}
@Test
public void testAddDuplicateUsers(){
boolean added;
added = dbHelper.addUser(new HomeOwner("jbO4aBF4dC", "soccer", "Miguel", "Garzon"));
assertTrue(added);
added = dbHelper.addUser(new HomeOwner("jbO4aBF4dC", "seg2105", "Miguel", "Garzon"));
assertTrue(!added);
added = dbHelper.addUser(new ServiceProvider("jbO4aBF4dC", "seg2105", "Juan", "Guzman",
"testaddress", "8888888888", "companydotcom", true));
assertTrue(!added);
dbHelper.deleteUser("jbO4aBF4dC");
}
@Test
public void testUpdateUserLogin(){
boolean updated;
UserType dbUser;
dbHelper.addUser(new HomeOwner("jbO4aBF4dC", "soccer", "Miguel", "Garzon"));
updated = dbHelper.updateUserInfo("jbO4aBF4dC", "soccer", "Juan", "Guzman");
assertTrue(updated);
dbUser = dbHelper.findUserByUsername("jbO4aBF4dC");
assertEquals("jbO4aBF4dC", dbUser.getUsername());
assertEquals("soccer", dbUser.getPassword());
assertEquals("Juan", dbUser.getFirstname());
assertEquals("Guzman", dbUser.getLastname());
//changed on character of username. Everything is case sensitive!
updated = dbHelper.updateUserInfo("JbO4aBF4dC", "seg2105", "Juan", "Guzman");
assertTrue(!updated);
dbHelper.deleteUser("jbO4aBF4dC");
}
@Test
public void testGetAllUsers(){
dbHelper.addUser(new HomeOwner("jbO4aBF4dC", "soccer", "Miguel", "Garzon"));
List<String[]> allUsers = dbHelper.getAllUsers();
for (String[] user : allUsers){
/* for (String s : user){
System.out.print(s + " ");
}
System.out.println();*/
UserType usertype = dbHelper.findUserByUsername(user[0]);
assertEquals(usertype.getFirstname(), user[1]);
assertEquals(usertype.getLastname(), user[2]);
assertEquals(usertype.getClass().getSimpleName(), user[3]);
}
dbHelper.deleteUser("jbO4aBF4dC");
}
//Testing services table
@Test
public void testAddAndDeleteServices(){
Service originalService, dbService;
boolean deleted, addedOne, addedTwo;
originalService = new Service("Exterminating flatworms", 20.00);
addedOne = dbHelper.addService(originalService);
dbService = dbHelper.findService("Exterminating flatworms");
assertEquals("exterminating flatworms", dbService.getName());
assertEquals(20.00, dbService.getRate(), 0.001);
originalService = new Service("Cleaning fishtanks", 15.00);
addedTwo = dbHelper.addService(originalService);
dbService = dbHelper.findService("Cleaning fishtanks");
assertEquals("cleaning fishtanks", dbService.getName());
assertEquals(15.00, dbService.getRate(), 0.001);
if (addedOne) {
deleted = dbHelper.deleteService("Exterminating flatworms");
assertTrue(deleted);
}
if (addedTwo) {
deleted = dbHelper.deleteService("Cleaning fishtanks");
assertTrue(deleted);
}
}
@Test
public void testAddDuplicateService(){
boolean added;
added = dbHelper.addService(new Service("Exterminating flatworms", 20.00));
assertTrue(added);
added = dbHelper.addService(new Service("Exterminating flatworms", 25.00));
assertTrue(!added);
dbHelper.deleteService("Exterminating flatworms");
}
@Test
public void testUpdateService(){
boolean updated;
Service service;
dbHelper.addService(new Service("Exterminating flatworms", 20.00));
updated = dbHelper.updateService("Exterminating flatworms", 25.00);
assertTrue(updated);
service = dbHelper.findService("Exterminating flatworms");
assertEquals("exterminating flatworms", service.getName());
assertEquals(25.00, service.getRate(), 0.001);
dbHelper.deleteService("Exterminating flatworms");
}
@Test
public void testGetAllServices(){
dbHelper.addService(new Service("Exterminating flatworms", 20.00));
List<String[]> allServices = dbHelper.getAllServices();
for (String[] service : allServices){
/* for (String s : user){
System.out.print(s + " ");
}
System.out.println();*/
Service dbService = dbHelper.findService(service[0]);
assertEquals(dbService.getRate(), Double.parseDouble(service[1]), 0.001);
}
dbHelper.deleteService("Exterminating flatworms");
}
@Test
public void testAddAndDeleteServiceProvidedByUser(){
dbHelper.addUser(new ServiceProvider("jbO4aBF4dC", null, null, null,
"testaddress", "8888888888", "companydotcom", true));
dbHelper.addService(new Service("Hitman", 12358));
boolean added = dbHelper.addServiceProvidedByUser("jbO4aBF4dC", "hitman");
assertTrue(added);
boolean deleted = dbHelper.deleteServiceProvidedByUser("jbO4aBF4dC", "Hitman");
assertTrue(deleted);
dbHelper.deleteUser("jbO4aBF4dC");
dbHelper.deleteService("hitman");
}
@Test
public void testGetAllServicesProvidedByUserAndDeleteService(){
dbHelper.addUser(new ServiceProvider("jbO4aBF4dC", null, null, null,
"testaddress", "8888888888", "companydotcom", true));
dbHelper.addService(new Service("Hitman", 12358));
dbHelper.addService(new Service("Exterminating flatworms", 392.457));
dbHelper.addServiceProvidedByUser("jbO4aBF4dC", "hitman");
dbHelper.addServiceProvidedByUser("jbO4aBF4dC", "exterminating flatworms");
List<String[]> servicesProvidedByUser = dbHelper.getAllServicesProvidedByUser("jbO4aBF4dC");
assertEquals(2, servicesProvidedByUser.size());
assertEquals("hitman", servicesProvidedByUser.get(0)[0]);
assertEquals(12358, Double.parseDouble(servicesProvidedByUser.get(0)[1]), 0.00001);
assertEquals("exterminating flatworms", servicesProvidedByUser.get(1)[0]);
assertEquals(392.457, Double.parseDouble(servicesProvidedByUser.get(1)[1]), 0.00001);
dbHelper.deleteService("hitman");
servicesProvidedByUser = dbHelper.getAllServicesProvidedByUser("jbO4aBF4dC");
assertEquals(1, servicesProvidedByUser.size());
dbHelper.deleteService("exterminating flatworms");
servicesProvidedByUser = dbHelper.getAllServicesProvidedByUser("jbO4aBF4dC");
assertEquals(0, servicesProvidedByUser.size());
dbHelper.deleteUser("jbO4aBF4dC");
}
@Test
public void testGetAllProvidersByService(){
dbHelper.addService(new Service("Exterminating flatworms", 392.457));
dbHelper.addUser(new ServiceProvider("jbO4aBF4dC", null, null, null,
"testaddress", "8888888888", "companydotcom", true));
dbHelper.addUser(new ServiceProvider("7MuF1c59XP", null, null, null,
"testaddress", "8888888888", "companydotcom", true));
dbHelper.addServiceProvidedByUser("jbO4aBF4dC", "exterminating flatworms");
dbHelper.addServiceProvidedByUser("7MuF1c59XP", "exterminating flatworms");
List<String[]> providersByService = dbHelper.getAllProvidersByService("exterminating flatworms");
assertEquals(2, providersByService.size());
assertEquals("jbO4aBF4dC", providersByService.get(0)[0]);
assertEquals("7MuF1c59XP", providersByService.get(1)[0]);
dbHelper.deleteService("Exterminating flatworms");
dbHelper.deleteUser("jbO4aBF4dC");
dbHelper.deleteUser("7MuF1c59XP");
}
@Test
public void testUpdateAndGetAvailability(){
ServiceProvider serviceProvider = new ServiceProvider("jbO4aBF4dC", null, null, null,
"testaddress", "8888888888", "companydotcom", true);
serviceProvider.setAvailabilities(0, 4, 18, 19, 30);
serviceProvider.setAvailabilities(3, 8, 12, 15, 14);
//TODO:Perhaps implement a deep clone function for UserType?
ServiceProvider serviceProvider2 = new ServiceProvider("jbO4aBF4dC", null, null, null,
"testaddress", "8888888888", "companydotcom", true);
serviceProvider2.setAvailabilities(0, 4, 18, 19, 30);
serviceProvider2.setAvailabilities(3, 8, 12, 15, 14);
dbHelper.addUser(serviceProvider2);
boolean updated = dbHelper.updateAvailability(serviceProvider2);
assertTrue(updated);
serviceProvider2.setAvailabilities(3, 8, 12, 15, 10);
int[][] dbAvailabilities = dbHelper.getAvailabilities(serviceProvider2);
int[][] availabilities = serviceProvider.getAvailabilities();
assertEquals(14, serviceProvider2.getAvailabilities()[3][3]);
for (int i = 0; i < 7; i++){
for (int j = 0; j < 4; j++){
assertEquals(availabilities[i][j], dbAvailabilities[i][j]);
}
}
}
}

View file

@ -0,0 +1,31 @@
package com.uottawa.olympus.olympusservices;
import org.junit.Test;
import static org.junit.Assert.*;
public class HomeOwnerTest {
/**
* Initiates an Homeowner account and tests if the random strings match to the required inputs.
*/
@Test
public void testHomeOwner(){
UserType user = new HomeOwner( "John123", "1234567890", "John", "Doe" );
String role = user.getRole();
assertEquals("HomeOwner", role);
assertEquals("John123", user.getUsername());
assertEquals("1234567890", user.getPassword());
assertEquals("John", user.getFirstname());
assertEquals("Doe", user.getLastname());
user.setUsername( "username" );
user.setPassword( "password" );
user.setFirstname( "firstname" );
user.setLastname( "lastname" );
assertNotEquals("John123", user.getUsername());
assertNotEquals("1234567890", user.getPassword());
assertNotEquals("John", user.getFirstname());
assertNotEquals("Doe", user.getLastname());
}
}

View file

@ -0,0 +1,51 @@
package com.uottawa.olympus.olympusservices;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
public class ServiceProviderTest {
ServiceProvider serviceprovider = new ServiceProvider("John123", "1234567890", "John", "Doe",
"testaddress", "8888888888", "companydotcom", true);
/**
* Initiates an ServiceProvider account and tests if the random strings match to the required inputs.
*/
@Test
public void testServiceProvider() {
assertEquals( "John123", serviceprovider.getUsername() );
assertEquals( "1234567890", serviceprovider.getPassword() );
assertEquals( "John", serviceprovider.getFirstname() );
assertEquals( "Doe", serviceprovider.getLastname() );
assertEquals( "ServiceProvider", serviceprovider.getRole() );
serviceprovider.setUsername( "username" );
serviceprovider.setPassword( "password" );
serviceprovider.setFirstname( "firstname" );
serviceprovider.setLastname( "lastname" );
assertNotEquals("John123", serviceprovider.getUsername());
assertNotEquals("1234567890", serviceprovider.getPassword());
assertNotEquals("John", serviceprovider.getFirstname());
assertNotEquals("Doe", serviceprovider.getLastname());
}
/**
* adds services and tests if they match the requirements in order to function properly. Example: If a service has a same name it doesn't count as one.
*
*/
@Test
public void addServiceTest() {
serviceprovider.addService( new Service( "KitchenCleaner", 50 ) );
serviceprovider.addService( new Service( "FrenchMaid", 250 ) );
serviceprovider.addService( new Service( "FrenchMaid", 210 ) );
serviceprovider.addService( new Service( "SecretService", 150 ) );
serviceprovider.addService( new Service( "SecretService", 110 ) );
int numOfServices = serviceprovider.getServices().size();
assertEquals( 3, numOfServices );
}
}

View file

@ -0,0 +1,38 @@
package com.uottawa.olympus.olympusservices;
import org.junit.Test;
import static org.junit.Assert.*;
public class ServiceProviderTest2 {
ServiceProvider serviceprovider = new ServiceProvider("John123", "1234567890", "John", "Doe",
"testaddress", "8888888888", "companydotcom", true);
@Test
public void testAvailabilities() {
int [][] availability = new int[7][4];
assertEquals( availability, serviceprovider.getAvailabilities());
serviceprovider.setAvailabilities(5, 8, 30, 12, 0);
availability[5][0] = 8;
availability[5][1] = 30;
availability[5][2] = 12;
availability[5][3] = 0;
assertEquals( availability, serviceprovider.getAvailabilities());
}
@Test
public void testOtherInstances() {
assertEquals( "testaddress", serviceprovider.getAddress() );
assertEquals( "8888888888", serviceprovider.getPhonenumber() );
assertEquals( "companydotcom", serviceprovider.getCompanyname() );
assertEquals( true, serviceprovider.isLicensed() );
serviceprovider.setAddress( "Canada, Ontario" );
serviceprovider.setPhonenumber( "+1-416-555-0182" );
serviceprovider.setCompanyname( "Google" );
serviceprovider.setLicensed( false );
assertNotEquals( "testaddress", serviceprovider.getAddress() );
assertNotEquals( "8888888888", serviceprovider.getPhonenumber() );
assertNotEquals( "companydotcom", serviceprovider.getCompanyname() );
assertNotEquals( true, serviceprovider.isLicensed() );
}
}

View file

@ -0,0 +1,45 @@
package com.uottawa.olympus.olympusservices;
import org.junit.Test;
import static org.junit.Assert.*;
public class ServiceTest {
Service service = new Service( "FrenchMaid", 250 );
/**
* Initiates an Service account and tests if the random strings match to the required inputs.
*/
@Test
public void testService(){
assertEquals( "FrenchMaid", service.getName() );
assertEquals( 250, service.getRate(), 0);
service.setName( "ItalianMafia" );
service.setRate( 200 );
assertNotEquals( "FrenchMaid", service.getName() );
assertNotEquals( 250, service.getRate());
}
/**
* adds service providers and tests if they match the requirements in order to function properly. Example: If a service has a same name it doesn't count as one.
*
*/
@Test
public void addServiceProviderTest(){
service.addServiceProvider( new ServiceProvider( "John123", "1234567890", "John", "Doe",
"testaddress", "8888888888", "companydotcom", true) );
service.addServiceProvider( new ServiceProvider( "Jane123", "1234567890", "Jane", "Doe",
"testaddress", "8888888888", "companydotcom", true) );
service.addServiceProvider( new ServiceProvider( "John123", "1234567890", "John", "Doe",
"testaddress", "8888888888", "companydotcom", true) );
service.addServiceProvider( new ServiceProvider( "Jane123", "1234567890", "Jane", "Doe",
"testaddress", "8888888888", "companydotcom", true) );
service.addServiceProvider( new ServiceProvider( "Jane123", "1234567890", "John", "Doe",
"testaddress", "8888888888", "companydotcom", true) );
int numOfSP = service.getServiceProviders().size();
assertEquals( 2,numOfSP );
}
}

View file

@ -0,0 +1,35 @@
package com.uottawa.olympus.olympusservices;
import android.view.View;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import static org.junit.Assert.*;
public class UserTypeTest {
/**
* Tests if the every user that is created is equal to each other or not.
*/
@Test
public void userTypeComparaison() {
UserType user = new HomeOwner("John123", "1234567890", "John", "Doe");
UserType admin = new Admin();
UserType serviceprovider = new ServiceProvider( "Jane123", "1234567890", "Jane", "Doe",
"testaddress", "8888888888", "companydotcom", true);
boolean userservice = user.equals(serviceprovider);
boolean useradmin = user.equals(admin);
boolean serviceadmin = serviceprovider.equals(admin);
assertNotEquals( true, useradmin );
assertNotEquals( true, serviceadmin );
assertNotEquals( true, userservice );
user.setFirstname(serviceprovider.getFirstname());
user.setUsername(serviceprovider.getUsername());
userservice = user.equals(serviceprovider);
assertEquals( true, userservice );
}
}

View file

@ -7,8 +7,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.android.tools.build:gradle:3.2.1'
// NOTE: Do not place your application dependencies here; they belong

View file

@ -1,6 +1,10 @@
#Fri Sep 28 14:59:51 EDT 2018
<<<<<<< HEAD
#Fri Oct 05 11:36:36 EDT 2018
=======
#Fri Oct 05 10:21:14 EDT 2018
>>>>>>> refs/remotes/origin/master
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

62
ProjectUML.ump Normal file
View file

@ -0,0 +1,62 @@
class UserType
{
firstname;
lastname;
username;
password;
}
class HomeOwner
{
isA UserType;
}
class ServiceProvider
{
int[] availabilities;
address;
int phonenumber;
companyname;
boolean licensed;
isA UserType;
}
class Admin
{
isA UserType;
}
class Service
{
name;
double rate;
* -- * ServiceProvider;
}
//$?[End_of_model]$?
class UserType
{
position 475 69 141 109;
}
class HomeOwner
{
position 109 233 109 41;
}
class ServiceProvider
{
position 849 239 173 126;
}
class Admin
{
position 490 236 109 41;
}
class Service
{
position 853 422 112 75;
position.association Service__ServiceProvider 65,0 61,126;
}

View file

@ -1,2 +1,8 @@
# SEG2105-Olympus
SEG2105 final project, Ivana Erlich, Anshu Sharma, Batuhan Basoglu, Mary Tran
https://github.com/ebivibe/SEG2105-Olympus
Admin account is precreated with
username = admin,
password = admin

BIN
UML Class Diagram.docx Normal file

Binary file not shown.