Commits · BranchSoIDontBreakEverything · charley.punshon / soulfood

20 May, 2019 12 commits
- One last change · d23dcb82
  jake.ejraee authored May 20, 2019
  
  d23dcb82
- i need sleep · 416043f4
  jake.ejraee authored May 20, 2019
  
  416043f4
- Update homeScreen.java · 1ec78012
  jake.ejraee authored May 20, 2019
  
  1ec78012
- Update SavedPlaylists.java · 3d12ed9b
  jake.ejraee authored May 20, 2019
  
  3d12ed9b
- Actually removed help button · 1d6d0e02
  jake.ejraee authored May 20, 2019
  
  1d6d0e02
- Removed help button · 73354b69
  jake.ejraee authored May 20, 2019
  
  73354b69
- Update activity_song_information_page.xml · 26a10d15
  jake.ejraee authored May 20, 2019
  
  26a10d15
- Update SongInformationPage.java · c90c5493
  jake.ejraee authored May 20, 2019
  
  c90c5493
- I sure hope this works · a005ea7b
  jake.ejraee authored May 20, 2019
  
  a005ea7b
- I feel like I'm going to be tired tomorrow · 188ede9b
  jake.ejraee authored May 20, 2019
  
  188ede9b
- Changed searchScreen.java · 48b00097
  jake.ejraee authored May 20, 2019
  
  48b00097
- Fixed a bug and broke stuff · cc1d6505
  jake.ejraee authored May 20, 2019
  
  cc1d6505
19 May, 2019 28 commits
- Fixed another minor bug · 5b667916
  jake.ejraee authored May 19, 2019
  
  5b667916
- Fixed minor bug · 2974cfed
  jake.ejraee authored May 19, 2019
  
  2974cfed
- My final commit. · fa7ba703
  charley.punshon authored May 19, 2019
  
  fa7ba703
- Merge remote-tracking branch 'origin/master' · 6726c3b4
  charley.punshon authored May 19, 2019
```
# Conflicts:
#	app/src/main/java/com/example/soulfood_assignment2/playlistView.java
```
  6726c3b4
- Navigation elements added. · 031bf900
  charley.punshon authored May 19, 2019
  
  031bf900
- Merge branch 'master' of https://git.yorkdc.net:8888/charley.punshon/soulfood · 1bd3a808
  jade.woodward authored May 19, 2019
  
  1bd3a808
- this might eventually save stuff · e52ed63a
  jade.woodward authored May 19, 2019
```
i'm sorry for the terrible code
i'm tired
```
  e52ed63a
- Merge remote-tracking branch 'origin/master' · 93c291f6
  charley.punshon authored May 19, 2019
  
  93c291f6
- Cleaned up code for the search view. · 32259739
  charley.punshon authored May 19, 2019
  
  32259739
- Delete MexicanAsyncTask.java · 5596f174
  jake.ejraee authored May 19, 2019
  
  5596f174
- Delete JapaneseAsyncTask.java · 03449409
  jake.ejraee authored May 19, 2019
  
  03449409
- Delete ItalianAsyncTask.java · aeac01a2
  jake.ejraee authored May 19, 2019
  
  aeac01a2
- Delete IndianAsyncTask.java · 0e8a6f42
  jake.ejraee authored May 19, 2019
  
  0e8a6f42
- Delete HappyAsyncTask.java · 70ba7182
  jake.ejraee authored May 19, 2019
  
  70ba7182
- Delete FrenchAsyncTask.java · a8c32a84
  jake.ejraee authored May 19, 2019
  
  a8c32a84
- Delete EnergeticAsyncTask.java · dfa21953
  jake.ejraee authored May 19, 2019
  
  dfa21953
- Delete ChineseAsyncTask.java · b797ef29
  jake.ejraee authored May 19, 2019
  
  b797ef29
- Delete ChillAsyncTask.java · 8a07dde8
  jake.ejraee authored May 19, 2019
  
  8a07dde8
- Delete AmericanAsyncTask.java unused · 0d11002d
  jake.ejraee authored May 19, 2019
  
  0d11002d
- saved playlists screen · 447cb805
  jade.woodward authored May 19, 2019
  
  447cb805
- Merge branch 'master' of... · 188982d7
  charley.punshon authored May 19, 2019
```
Merge branch 'master' of /Users/charleypunshon/AndriodStudioProjects/soulfood_working with conflicts.
```
  188982d7
- redoing because conflict · 97b9b53f
  jade.woodward authored May 19, 2019
```
# Conflicts:
#	app/src/main/java/com/example/soulfood_assignment2/SavedPlaylists.java
#	app/src/main/res/layout/activity_saved_playlists.xml
```
  97b9b53f
- Some stuff for saving playlists · b9c50170
  jade.woodward authored May 19, 2019
```
hopefully
```
  b9c50170
- Half working build playlist feature. · 06f709c7
  charley.punshon authored May 19, 2019
  
  06f709c7
- Song screen view with methods on both pause and play buttons. · e18aa589
  charley.punshon authored May 19, 2019
  
  e18aa589
- Song screen view with method added to Play button. · 49b29ff2
  charley.punshon authored May 19, 2019
  
  49b29ff2
- Song screen view with Title, tags and button. · 82b73eab
  charley.punshon authored May 19, 2019
  
  82b73eab
- Song screen view with button · cdd3785a
  charley.punshon authored May 19, 2019
  
  cdd3785a