Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
9a6a831
what
kangxi11 Mar 6, 2020
500e846
Update .gitignore
kangxi11 Mar 6, 2020
19da948
Merge branch 'testing' of https://github.com/mustafakhairullah/QRyde …
kangxi11 Mar 6, 2020
0c3b628
sda
kangxi11 Mar 6, 2020
1f21222
junk gone
kangxi11 Mar 6, 2020
f388312
Merge branch 'testing'
kangxi11 Mar 6, 2020
055a022
Merge pull request #16 from CMPUT301W20T02/testing2
atonyma7 Mar 6, 2020
f1b834d
new version
n00b4ever Mar 11, 2020
b87c42b
fixed cancel and confirm buttons
n00b4ever Mar 11, 2020
2ec5da7
added driver side map and showing rides
n00b4ever Mar 11, 2020
b022bc5
made stuff private, added 1 function
n00b4ever Mar 12, 2020
bfcb756
more cleanup
n00b4ever Mar 12, 2020
c31a3a4
more cleanup >.<
n00b4ever Mar 12, 2020
69dee6b
another cleanup
n00b4ever Mar 12, 2020
79a809f
changed 1 letter
n00b4ever Mar 12, 2020
d068b26
Merge branch 'Mergetest2' of https://github.com/CMPUT301W20T02/QRyde …
atonyma7 Mar 12, 2020
564b029
test
mustafakhairullah Mar 12, 2020
a163526
xd
atonyma7 Mar 12, 2020
39fe09c
Revert "test"
mustafakhairullah Mar 12, 2020
d57b0b2
Merge branch 'Mergetest2' of https://github.com/CMPUT301W20T02/QRyde …
atonyma7 Mar 12, 2020
f1539a2
Update DriverMainMap.java
n00b4ever Mar 12, 2020
8f163ca
Merge branch 'Mergetest2' of https://github.com/CMPUT301W20T02/QRyde …
atonyma7 Mar 12, 2020
a320e70
Update MapActivity.java
n00b4ever Mar 12, 2020
bbf93c5
Merge branch 'Mergetest2' of https://github.com/CMPUT301W20T02/QRyde …
atonyma7 Mar 12, 2020
ac60374
added robotium:
kangxi11 Mar 12, 2020
a1ebec4
Merge branch 'Mergetest2' of https://github.com/CMPUT301W20T02/QRyde …
atonyma7 Mar 12, 2020
728858e
robotium
kangxi11 Mar 13, 2020
c5a61a4
Revert "robotium"
kangxi11 Mar 13, 2020
226b706
Revert "added robotium:"
kangxi11 Mar 13, 2020
b33e451
Merge branch 'Mergetest2' of https://github.com/CMPUT301W20T02/QRyde …
atonyma7 Mar 13, 2020
98d89bb
robotium 3.6
atonyma7 Mar 13, 2020
9473e18
robotium 3.6
atonyma7 Mar 13, 2020
748491b
what
kangxi11 Mar 13, 2020
240119c
Merge branch 'Mergetest2' of https://github.com/CMPUT301W20T02/QRyde …
kangxi11 Mar 13, 2020
ac76e4f
robotium 3.6
atonyma7 Mar 13, 2020
9ac5cec
tests
n00b4ever Mar 13, 2020
9c50ca7
Merge branch 'Mergetest2' of https://github.com/CMPUT301W20T02/QRyde …
atonyma7 Mar 13, 2020
5db97f5
Adding Basic MapActivityTests
mustafakhairullah Mar 13, 2020
4b7cc51
Merge branch 'Mergetest2' of https://github.com/CMPUT301W20T02/QRyde …
mustafakhairullah Mar 13, 2020
5326975
fixed testing
atonyma7 Mar 13, 2020
d2b93e3
Merge branch 'Mergetest2' of https://github.com/CMPUT301W20T02/QRyde …
atonyma7 Mar 13, 2020
84f51b7
firebase to robotium
kangxi11 Mar 13, 2020
58564d2
Merge branch 'Mergetest2' of https://github.com/CMPUT301W20T02/QRyde …
kangxi11 Mar 13, 2020
0e998a9
Delete local.properties
kangxi11 Mar 13, 2020
5d523e8
Update .gitignore
kangxi11 Mar 13, 2020
4bb7412
added tests for riders and drivers
atonyma7 Mar 13, 2020
11de000
Merge branch 'Mergetest2' of https://github.com/CMPUT301W20T02/QRyde …
atonyma7 Mar 13, 2020
a4ff61e
driver main map test
n00b4ever Mar 13, 2020
312bdaa
main tests
kangxi11 Mar 13, 2020
459181c
Merge branch 'Mergetest2' of https://github.com/CMPUT301W20T02/QRyde …
n00b4ever Mar 13, 2020
2e3c6b9
Merge branch 'Mergetest2' of https://github.com/CMPUT301W20T02/QRyde …
kangxi11 Mar 13, 2020
cea3e6f
Merge branch 'Mergetest2' of https://github.com/CMPUT301W20T02/QRyde …
kangxi11 Mar 13, 2020
6d94654
fixed tests
kangxi11 Mar 13, 2020
265a95b
.gitignor
kangxi11 Mar 13, 2020
9815295
new test
kangxi11 Mar 13, 2020
ecc97db
Merge pull request #18 from CMPUT301W20T02/Mergetest2
kangxi11 Mar 13, 2020
92d2793
driver test
n00b4ever Mar 13, 2020
4bc5726
Update DriverMainMapTest.java
n00b4ever Mar 13, 2020
976fbc3
updated javadoc for first 4 functions
Judalopez28 Mar 13, 2020
99102cd
bug fixes
kangxi11 Mar 13, 2020
a79891c
Added the Javadocs
MayowaL Mar 13, 2020
753bab2
waiting user response test and mapactivity fix
n00b4ever Mar 13, 2020
0e13280
drivertests and deleted classes
n00b4ever Mar 13, 2020
89e326a
rideinprogresstest
n00b4ever Mar 13, 2020
61f9f40
finished user tests
kangxi11 Mar 13, 2020
8a6792e
Merge branch 'Mergetest2' of https://github.com/CMPUT301W20T02/QRyde …
kangxi11 Mar 13, 2020
9e28ae9
bug
kangxi11 Mar 13, 2020
00ce15d
fixed testing
kangxi11 Mar 13, 2020
2f125c7
Merge pull request #19 from CMPUT301W20T02/Mergetest2
kangxi11 Mar 13, 2020
37fd743
added test for cancel in driver
atonyma7 Mar 13, 2020
c241859
Merge pull request #20 from CMPUT301W20T02/mergeTest2
atonyma7 Mar 13, 2020
6f99b0b
changed storyboard pds
atonyma7 Mar 13, 2020
62bdce2
changed storyboard pds
atonyma7 Mar 13, 2020
f032f46
Add files via upload
kangxi11 Mar 13, 2020
3fb0a8e
Update .gitignore
kangxi11 Mar 13, 2020
553f8bd
updated javadoc
Mar 13, 2020
3d486f3
Merge pull request #22 from CMPUT301W20T02/JavaDocBranchJuan
Judalopez28 Mar 13, 2020
3e27bc7
addedUML part3, renamed umlpart2
n00b4ever Mar 13, 2020
50526f0
javadocs added
MayowaL Mar 13, 2020
1599a8b
javadocs added
MayowaL Mar 13, 2020
bf59b41
Update .gitignore
MayowaL Mar 13, 2020
120504e
Update .gitignore
MayowaL Mar 13, 2020
4decca1
added gradle.properties
shanerrr Mar 13, 2020
c272b8e
Update .gitignore
shanerrr Mar 13, 2020
2ebf1fd
Merge remote-tracking branch 'origin/Mergetest2'
atonyma7 Mar 13, 2020
0eea457
Merge branch 'master' of https://github.com/CMPUT301W20T02/QRyde
atonyma7 Mar 13, 2020
16e0f17
javadocs added
MayowaL Mar 13, 2020
e0523ed
Merge branch 'Mayowa2' into Mergetest2
Mar 13, 2020
799bfba
creating hamburger menu branch
Mar 20, 2020
bc849aa
xd
atonyma7 Mar 22, 2020
221ac74
Merge branch 'HamburgerMenu' of https://github.com/CMPUT301W20T02/QRy…
atonyma7 Mar 22, 2020
4232dc6
added basic functionality for hamburger menu
atonyma7 Mar 22, 2020
c0bbd90
Revert "added basic functionality for hamburger menu"
atonyma7 Mar 23, 2020
36eaf39
started implementation of hamb menu
Mar 23, 2020
0c0bd03
Merge pull request #25 from CMPUT301W20T02/HamburgerMenu
Judalopez28 Mar 23, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ build/

# Local configuration file (sdk path, etc)
local.properties
#*.properties

# Proguard folder generated by Eclipse
proguard/
Expand All @@ -38,6 +39,7 @@ proguard/
captures/

# IntelliJ
.iml
.idea
# Keystore files
# Uncomment the following lines if you do not want to check your keystore files in.
Expand Down Expand Up @@ -72,3 +74,6 @@ lint/generated/
lint/outputs/
lint/tmp/
# lint/reports/

*.mp4

Binary file modified Storyboard/QRyde_Storyboard.pdf
Binary file not shown.
Binary file added UML/QRydeUMLProjectPart3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion app/.idea/.name

This file was deleted.

Binary file removed app/.idea/caches/build_file_checksums.ser
Binary file not shown.
Binary file removed app/.idea/caches/gradle_models.ser
Binary file not shown.
116 changes: 0 additions & 116 deletions app/.idea/codeStyles/Project.xml

This file was deleted.

16 changes: 0 additions & 16 deletions app/.idea/gradle.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

15 changes: 0 additions & 15 deletions app/.idea/libraries/Gradle__androidx_core_core_1_1_0_aar.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading