Skip to content
This repository was archived by the owner on Apr 8, 2026. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
226 commits
Select commit Hold shift + click to select a range
3592ea5
added functionality to retrieve URI from firebase and send it to Spot…
jkurtz678 Mar 13, 2018
e89b6bd
Create LICENSE
eitan12345om Mar 14, 2018
554b5d8
modified: app/src/main/java/com/houseparty/houseparty/SongActivity…
Mar 14, 2018
13ed6f0
Merge branch 'master' of https://github.com/eitan12345om/HouseParty i…
jkurtz678 Mar 15, 2018
60a4de6
Merge branch 'sprint2' of https://github.com/eitan12345om/HouseParty …
jkurtz678 Mar 15, 2018
1c62c73
implemented basic searching & playing tracks
Mar 15, 2018
0e64917
Merge branch 'sprint2' of https://github.com/eitan12345om/HouseParty …
jkurtz678 Mar 15, 2018
4ebe09e
added passcode functionality to playlists. Requires a passcode on cre…
jkurtz678 Mar 15, 2018
1311a20
fixed problem with user authentication
jkurtz678 Mar 16, 2018
5e73052
added invalid passcode dialogue
jkurtz678 Mar 16, 2018
75e3af3
minor intent changes
jkurtz678 Mar 16, 2018
c82e6d5
added a few try-catch blocks
jkurtz678 Mar 16, 2018
82dc897
added junit test for registration
jkurtz678 Apr 6, 2018
210dd93
Reformatted
eitan12345om Apr 6, 2018
dc3ecfb
Merge remote-tracking branch 'origin/junit' into junit
eitan12345om Apr 6, 2018
6870a33
Added more tests to registrationUnitTest.java
jkurtz678 Apr 6, 2018
c5263c6
resolve merge conflicts
jkurtz678 Apr 6, 2018
538db7d
Added Unit Tests for Authenticate_Login
eitan12345om Apr 6, 2018
66eda30
updated registration junit tests
jkurtz678 Apr 6, 2018
38af9d6
Add Authenticate login method
eitan12345om Apr 6, 2018
03e86ba
Merged
eitan12345om Apr 6, 2018
2186fbb
Delete local.properties
JacksonK Apr 6, 2018
817638e
Fixed that merge
eitan12345om Apr 6, 2018
439e5d1
Merge branch 'junit' of https://github.com/eitan12345om/HouseParty in…
eitan12345om Apr 6, 2018
6ae1517
SpotifySearchUnitTest.java
nathancboyd Apr 7, 2018
abe1778
Moved to package
eitan12345om Apr 9, 2018
c50c9dd
Reformatted
eitan12345om Apr 9, 2018
d4c9fd3
Deleted Example Unit Test
eitan12345om Apr 9, 2018
5d25486
Deleted unused methods
eitan12345om Apr 9, 2018
cf66721
Add Spotify Unit Test Package
eitan12345om Apr 9, 2018
8890f33
Reformatted
eitan12345om Apr 9, 2018
f5776cc
Added PlaylistUnitTests
eitan12345om Apr 9, 2018
0359d57
Add Song tests
eitan12345om Apr 9, 2018
f358e88
Fixed Parentheses error
eitan12345om Apr 9, 2018
31e9a2b
modified: app/src/main/java/com/houseparty/houseparty/SongActivity…
Apr 9, 2018
f776c4e
Merge branch 'junit' of github.com:eitan12345om/HouseParty into junit
Apr 9, 2018
cf50200
Added integration testing for createUserAndLogin
jkurtz678 Apr 9, 2018
c3ef683
Added integration testing for createUserAndLogin
jkurtz678 Apr 9, 2018
3254e54
Merge remote-tracking branch 'origin/junit' into junit
jkurtz678 Apr 9, 2018
f66da24
Moved to package
eitan12345om Apr 9, 2018
8166679
Merge remote-tracking branch 'origin/junit' into junit
eitan12345om Apr 9, 2018
995af77
Reformatted
eitan12345om Apr 9, 2018
9b24a06
Changed Up
eitan12345om Apr 9, 2018
0c7b748
fixed small error in login unit test
jkurtz678 Apr 10, 2018
144b22b
Started fixing Tests
eitan12345om Apr 10, 2018
2d30ec6
Fixes
eitan12345om Apr 11, 2018
4474662
Add abstract method
eitan12345om Apr 12, 2018
418e3e5
Add comment
eitan12345om Apr 12, 2018
5a7b74d
Added new subclasses to the abstract class song for various music APIs
jkurtz678 Apr 12, 2018
520a98d
Changed constructors
eitan12345om Apr 12, 2018
e1f6177
Better variable names for lists in SongActivity
jkurtz678 Apr 13, 2018
d258b83
Merge branch 'abstract' of https://github.com/eitan12345om/HouseParty…
jkurtz678 Apr 13, 2018
f1b4900
created SongFactory.java
nathancboyd Apr 13, 2018
182c1ae
Merge remote-tracking branch 'origin/abstract' into abstract
nathancboyd Apr 13, 2018
753fcee
created SongFactory.java
nathancboyd Apr 13, 2018
db346fd
updated SongFactory.java
nathancboyd Apr 13, 2018
50d362d
Reformatted
eitan12345om Apr 13, 2018
b339c91
modified: app/src/main/java/com/houseparty/houseparty/LoginActivit…
Apr 13, 2018
8825854
SongFactory.java is now a singleton
nathancboyd Apr 13, 2018
c7e19be
Reformatted
eitan12345om Apr 13, 2018
edb4d1e
Merge branch 'abstract' of https://github.com/eitan12345om/HouseParty…
eitan12345om Apr 13, 2018
888d07a
Added singleton for MainActivity
jkurtz678 Apr 13, 2018
1bfec98
Added Features
eitan12345om Apr 18, 2018
4174b10
Merge remote-tracking branch 'origin/abstract' into abstract
eitan12345om Apr 18, 2018
4b58234
Added Features
eitan12345om Apr 18, 2018
06eb426
Added feature files
eitan12345om Apr 19, 2018
85bf637
Added Features
eitan12345om Apr 19, 2018
4ac375f
Added set password and stream spotify feature files
jkurtz678 Apr 19, 2018
6ae2ff0
Merge remote-tracking branch 'origin/abstract' into abstract
jkurtz678 Apr 19, 2018
4a9530d
Added set password and stream spotify feature files
jkurtz678 Apr 19, 2018
5bc614e
Changed gradle file
eitan12345om Apr 20, 2018
2634e57
Changed spacing
eitan12345om Apr 20, 2018
978edc0
Changed spacing
eitan12345om Apr 20, 2018
2a14bf0
Changed Gradle
eitan12345om Apr 20, 2018
9902193
Got Cucumber to work
eitan12345om Apr 23, 2018
a82d1f3
Started working on Cucumber stuff
eitan12345om Apr 23, 2018
31fa1b0
Added Cucumber stuff to try to get it to work
eitan12345om Apr 23, 2018
713dd58
Made methods static
eitan12345om Apr 23, 2018
2a0cf95
Made methods static
eitan12345om Apr 25, 2018
05c3a3d
Added register button
TeoDoughty Apr 29, 2018
1f4b87a
Added Firebase login and registration to LoginActivity
jkurtz678 Apr 29, 2018
ec57ca8
Merge remote-tracking branch 'origin/master' into FrontEnd
jkurtz678 Apr 29, 2018
c2e15eb
Added alternative songActivity
TeoDoughty Apr 30, 2018
7d3dcdc
Merge remote-tracking branch 'origin/FrontEnd' into FrontEnd
jkurtz678 Apr 30, 2018
319c918
Fixed passcodes for playlists
jkurtz678 Apr 30, 2018
cfc1e16
Updates to SongActivity and Factory, still broken.
jkurtz678 Apr 30, 2018
789977f
Implemented new front end screen for song activity
jkurtz678 Apr 30, 2018
c53ef6c
Added Travis CI
eitan12345om May 2, 2018
33b197b
added new song class
jkurtz678 May 2, 2018
4d0b2a7
Adding some stuff. Merge
eitan12345om May 2, 2018
d3ec3d2
Updated
eitan12345om May 2, 2018
524b9be
Updated
eitan12345om May 2, 2018
3d23061
Updated
eitan12345om May 2, 2018
1d99b7e
Trying again
eitan12345om May 2, 2018
cbcc311
Updated again, bitches
eitan12345om May 2, 2018
62f033f
Updated again, beeotches
eitan12345om May 2, 2018
f7d5966
Updated again
eitan12345om May 2, 2018
d1ffd86
Updaed the Readme
eitan12345om May 2, 2018
dfe477e
added new activity xml
jkurtz678 May 2, 2018
285ab86
Merge branch 'Sprint3' of https://github.com/eitan12345om/HouseParty …
jkurtz678 May 2, 2018
0b44c99
Updated
eitan12345om May 2, 2018
9d7252e
Updated
eitan12345om May 5, 2018
4d48f83
Fixed the issue with the build.gradle
eitan12345om May 5, 2018
bbfc5fb
Fixed the issue with the invalid button
eitan12345om May 5, 2018
b0d2f10
Fixed the issue with the invalid button
eitan12345om May 5, 2018
e252eef
Finally frickin got the build.gradle right for Cucumber
eitan12345om May 7, 2018
4652de1
Commented out old unit test methods
eitan12345om May 7, 2018
8c26659
Changed SongActivityUnitTest methods
eitan12345om May 7, 2018
0881f78
Reformatted
eitan12345om May 7, 2018
9766698
Added Unit Tests to Continuous Integration
eitan12345om May 9, 2018
1f209a3
Refactored
eitan12345om May 9, 2018
8af4266
Added SonarQube to project
eitan12345om May 11, 2018
0f898f6
Fixed the Gradle file
eitan12345om May 11, 2018
71bbd21
Refactored
eitan12345om May 11, 2018
160c9b4
Remove unnecessary throwables
eitan12345om May 11, 2018
0e853c6
Added more unit tests
eitan12345om May 11, 2018
b2e1e78
Fixed SongFactory Reference
eitan12345om May 11, 2018
2fdd86b
Deleted some code smell
eitan12345om May 11, 2018
9937da2
Fixed more code smells
eitan12345om May 11, 2018
702b114
Removed more code smell
eitan12345om May 11, 2018
ee3f8a1
Removed more code smell
eitan12345om May 11, 2018
be05256
Removed more code smell
eitan12345om May 11, 2018
7e01822
Removed even more code smell
eitan12345om May 11, 2018
9143277
Small fix
eitan12345om May 11, 2018
eeaa35f
Removed more code smell
eitan12345om May 11, 2018
4786301
Small fixes
eitan12345om May 12, 2018
e4e31e2
Small fixes
eitan12345om May 12, 2018
7852d8d
Removed more Code Smells
eitan12345om May 14, 2018
fa97f0c
Updated
eitan12345om May 14, 2018
0700e0e
Added Tests
eitan12345om May 14, 2018
9e1f47b
Added Tests
eitan12345om May 14, 2018
f607bef
Added Song Tests
eitan12345om May 14, 2018
d2ca975
Added Playlist Tests
eitan12345om May 14, 2018
127eead
Added SpotifySong Tests
eitan12345om May 14, 2018
fd5a8bb
Refactored
eitan12345om May 14, 2018
c6ca854
Added TidalSongUnitTest
eitan12345om May 14, 2018
0fa4a01
Added SongFactory Tests
eitan12345om May 14, 2018
c9ba5e5
Updated to fetch entire repo
eitan12345om May 14, 2018
1d6807c
Changed the order of the arguments to actually fit the standards
eitan12345om May 14, 2018
f042b8f
Created some new tests
eitan12345om May 14, 2018
786052b
Fixed some code smell
eitan12345om May 14, 2018
f2bbfc2
Update README.md
hanskamin May 14, 2018
8d434d7
Added Hosts to Playlists
eitan12345om May 14, 2018
7519249
Merge remote-tracking branch 'origin/master'
eitan12345om May 14, 2018
1c6b4f4
Fixed SonarQube and Deleted useless tests
eitan12345om May 16, 2018
fed99a1
Merge branch 'HostAndUsers'
eitan12345om May 16, 2018
36c9c15
Fixed LoginActivity
eitan12345om May 16, 2018
b8076fd
Merge branch 'HostAndUsers'
eitan12345om May 16, 2018
4e0ad3b
Fixed Sonarqube, hopefully
eitan12345om May 16, 2018
15ac160
Fixed Sonarqube, hopefully
eitan12345om May 16, 2018
231fe43
Fixed Sonarqube, hopefully
eitan12345om May 16, 2018
c3e6357
Added some Firebase functionality
eitan12345om May 16, 2018
43dd870
Some fixes
eitan12345om May 16, 2018
3c3420a
Fixed NewSongActivity
eitan12345om May 16, 2018
8316dc7
Some changes to NewSong
eitan12345om May 17, 2018
1396179
Added changes to Playlist activity to make it easier to determine host
eitan12345om May 17, 2018
2a50f26
Converted ListView to RecyclerView which will allow for way more gest…
eitan12345om May 17, 2018
8bf7dcb
Added OnClickListener
eitan12345om May 17, 2018
de1292f
Added Host notifier
eitan12345om May 18, 2018
66e1a36
Fixed to use Playlist method for host checking
eitan12345om May 18, 2018
a75116f
Added snap scrolling
eitan12345om May 18, 2018
d78e524
Added red background on swipe
eitan12345om May 18, 2018
1eeda92
Added click background change
eitan12345om May 18, 2018
766ede5
Merged song activity. Still cannot play songs, but adding songs is fu…
jkurtz678 May 18, 2018
ff163fd
Added placeholder album art.
jkurtz678 May 18, 2018
756a883
Added swipe to delete
eitan12345om May 18, 2018
325c215
Delete playlists from Firebase
eitan12345om May 18, 2018
6e40421
Added some things
eitan12345om May 18, 2018
4e66ed4
Added swipe to delete
eitan12345om May 18, 2018
be0de72
Delete from Firebase
eitan12345om May 18, 2018
fb4affb
Added Snackbar undo
eitan12345om May 18, 2018
1363ed0
Added dividers between items
eitan12345om May 18, 2018
8fb2442
Added trash can drawing
eitan12345om May 18, 2018
fad76f0
Removed some code smells
eitan12345om May 18, 2018
27e00c1
Removed some code smells
eitan12345om May 18, 2018
421f172
Merge branch 'Sprint4'
eitan12345om May 18, 2018
27ef0f9
Merged
eitan12345om May 18, 2018
630cee6
Fixed new_song_activity.xml
jkurtz678 May 18, 2018
9edef70
fixed null song pointer: app/src/main/java/com/houseparty/housepar…
May 21, 2018
8e5eb09
Removed Comments
eitan12345om May 21, 2018
4ddf980
Merge remote-tracking branch 'origin/Sprint4' into Sprint4
eitan12345om May 21, 2018
29bf1c3
Added cover art retrieval. When song is played, the cover art is disp…
jkurtz678 May 21, 2018
f6ffb59
Added pause and play functionality.
jkurtz678 May 21, 2018
f3dec5e
Removed silly comments
eitan12345om May 21, 2018
1090856
Added a new Constructor
eitan12345om May 21, 2018
575c760
Fixed New_Song_Activity adapter alignment.
jkurtz678 May 21, 2018
e49ebbe
Merge remote-tracking branch 'origin/Sprint4' into Sprint4
jkurtz678 May 21, 2018
1b53865
Fixed New_Song_Activity adapter alignment.
jkurtz678 May 21, 2018
c1548ab
Fixed deletion error
eitan12345om May 21, 2018
36907b7
Something
eitan12345om May 21, 2018
7e5f8d9
Merge branch 'Sprint4'
eitan12345om May 21, 2018
049ac6c
HouseParty will now remember UserLogin
eitan12345om May 21, 2018
28a0026
You can now logout of HouseParty
eitan12345om May 22, 2018
c67733b
Merge branch 'Sprint4'
eitan12345om May 25, 2018
38dfc06
You can now add a thumbsup to a song
eitan12345om Jun 3, 2018
37ecad0
Added timeAdded variable
eitan12345om Jun 3, 2018
f7e2b99
Added timeAdded variable
eitan12345om Jun 3, 2018
8a7c9f4
Thumbs now get pushed!
eitan12345om Jun 4, 2018
49754bd
napster register and create player
jkurtz678 Jun 4, 2018
1bb19a6
Song playing doesn't work. Please get it to be out of SpotifySong
eitan12345om Jun 4, 2018
b6db2e5
Refer to queues as "Parties" to fit the theme.
hanskamin Jun 4, 2018
582571d
reverted spotifyPlayer object to static usage
Jun 4, 2018
2570860
Added basic napster support. Selecting napster in add song screen wil…
jkurtz678 Jun 6, 2018
f9101fd
Merge branch 'NapsterBranch'
jkurtz678 Jun 6, 2018
febe3d9
Merged napster branch to master
jkurtz678 Jun 6, 2018
76c3b5d
Some GUI tests
eitan12345om Jun 6, 2018
d987489
Fixed napster basic usage. Added acceptance test features.
jkurtz678 Jun 6, 2018
fd37b8f
First two acceptance tests implemented. These required refactoring of…
jkurtz678 Jun 8, 2018
d825bb5
Removed Code Smells
eitan12345om Jun 8, 2018
891b13f
Merge remote-tracking branch 'origin/master'
eitan12345om Jun 8, 2018
84bf02d
Removed Code Smells
eitan12345om Jun 8, 2018
2d45905
Removed Code Smells
eitan12345om Jun 8, 2018
90dbfe3
Removed Code Smells
eitan12345om Jun 9, 2018
147b88a
Removed Code Smells
eitan12345om Jun 9, 2018
1074262
Removed all the Code Smells
eitan12345om Jun 9, 2018
66a887b
Removed all the Code Smells
eitan12345om Jun 9, 2018
b2d789c
Not aborting on error
eitan12345om Jun 9, 2018
1aec647
Fixed
eitan12345om Jun 9, 2018
235e58c
implemented login integration test
Jun 9, 2018
c9fbbf7
Merge branch 'master' of github.com:eitan12345om/HouseParty
Jun 9, 2018
68a8160
Added GUI tests
eitan12345om Jun 9, 2018
2792080
Merge remote-tracking branch 'origin/master'
eitan12345om Jun 9, 2018
c5c0af4
Merge branch 'master' into AcceptanceTest
eitan12345om Jun 9, 2018
62f25f4
Merged
eitan12345om Jun 9, 2018
0ed038b
Added integration tests
eitan12345om Jun 9, 2018
1af258a
Added Acceptance Tests
zacharynoel Jun 9, 2018
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
/build
/captures
.externalNativeBuild
Cucumber.html
Cucumber.json

Binary file added .idea/caches/build_file_checksums.ser
Binary file not shown.
29 changes: 29 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 0 additions & 22 deletions .idea/compiler.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/copyright/profiles_settings.xml

This file was deleted.

7 changes: 5 additions & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 61 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
language: android
sudo: false
install:
- git fetch --unshallow
addons:
apt:
update: true
sonarcloud:
organization: "eitan12345om-github"
token:
secure: "e97750523d801bb3d958658a3544ddc84487bfb6"

android:
components:
# Uncomment the lines below if you want to
# use the latest revision of Android SDK Tools
- tools
- platform-tools


# The BuildTools version used by your project
- build-tools-28.0.0


# The SDK version used to compile your project
- android-26
- extra-google-google_play_services
- extra-google-m2repository
- addon-google_apis-google-$ANDROID_API_LEVEL

licences :
- 'android-sdk-preview-license-.+'
- 'android-sdk-license-.+'
- 'google-gdk-license-.+'

before_script :
- mkdir -p "$ANDROID_HOME/licenses"
- cp ./licenses/* "$ANDROID_HOME/licenses"

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/

cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
- $HOME/.android/build-cache
- $HOME/.m2/repository
- $HOME/.sonar/cache
- $HOME/.gradle
- .gradle

script:
- ./gradlew build check
- ./gradlew test
- ./gradlew sonarqube

before_install:
- chmod +x gradlew

2 changes: 1 addition & 1 deletion HouseParty.iml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2018 Eitan Simler

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
# HouseParty
# HouseParty

![!Travis CI build badge](https://travis-ci.org/eitan12345om/Houseparty.svg)

Never fight for the aux again.

## Collaborative Live Queues
- Start a Party or join a friend's.
- Connect with Spotify Premium to queue up your favorite songs.
- Up-vote the songs you want to hear first.
- Hosts can pause/skip songs and control who's in their Party.
Loading