Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
166 commits
Select commit Hold shift + click to select a range
d89fcc8
Added a couple user stories
SharinaS Nov 15, 2019
8298c90
Added a couple user stories
SharinaS Nov 15, 2019
565639e
added three user stories
SharinaS Nov 15, 2019
f6e3300
Merge pull request #1 from JavaAwesome/projectprep
SharinaS Nov 15, 2019
f088113
Create Software-Requirements
sajafisher29 Nov 15, 2019
fe62da1
Merge pull request #2 from JavaAwesome/software-requirements-document
sajafisher29 Nov 15, 2019
6ddf3a2
added more user stories so there are 5 total
SharinaS Nov 15, 2019
3c788ac
Merge pull request #3 from JavaAwesome/projectprep
SharinaS Nov 15, 2019
5419e07
Rename Software-Requirements to Software-Requirements.md
ahrenswett Nov 15, 2019
a874666
Update Software-Requirements.md
sajafisher29 Nov 15, 2019
4bec0b5
added assets and gitignore
JamesDansie Nov 15, 2019
a76a13e
Merge branch 'Dev' of https://github.com/JavaAwesome/JavaTag into Dev
JamesDansie Nov 15, 2019
4ecb4eb
Update Software-Requirements.md
sajafisher29 Nov 15, 2019
5f06aa8
Update Software-Requirements.md
sajafisher29 Nov 15, 2019
06c8286
updated wire frames
JamesDansie Nov 15, 2019
3513490
Merge branch 'Dev' of https://github.com/JavaAwesome/JavaTag into Dev
JamesDansie Nov 15, 2019
26c2cfd
refresh
ahrenswett Nov 18, 2019
157f295
initial build out framework
TheQuangNguyen Nov 18, 2019
1c5f125
initialize project
TheQuangNguyen Nov 18, 2019
a29cce5
added GOOGLE_MAPS_API to env
ahrenswett Nov 18, 2019
c416337
removed maps api xml from igore
ahrenswett Nov 18, 2019
273f2d4
add amplify and auth to project
TheQuangNguyen Nov 18, 2019
c80712f
Merge pull request #4 from JavaAwesome/ahren
JamesDansie Nov 18, 2019
0512da7
added missing google services dependencies in build.gradle
TheQuangNguyen Nov 18, 2019
82ba8ab
added sign in and sign out functionality
TheQuangNguyen Nov 18, 2019
b99ac7a
Merge pull request #5 from JavaAwesome/monday
TheQuangNguyen Nov 18, 2019
8d1a37e
exploring cameraX
ahrenswett Nov 18, 2019
dcfd780
refresh
ahrenswett Nov 18, 2019
e352e47
add recycler view to show sessions in database
TheQuangNguyen Nov 19, 2019
70d8c05
added dependencies for s3 storage stuff
TheQuangNguyen Nov 19, 2019
04f1cea
Working on learning how and getting camera implemented
ahrenswett Nov 19, 2019
ba4b649
Merge pull request #6 from JavaAwesome/camera
ahrenswett Nov 19, 2019
ff902f8
get user current location on main page and get current session on map…
TheQuangNguyen Nov 19, 2019
ae207d5
Revert "Camera"
ahrenswett Nov 19, 2019
9e27af8
Merge pull request #7 from JavaAwesome/revert-6-camera
ahrenswett Nov 19, 2019
5052622
added todo items
TheQuangNguyen Nov 19, 2019
d459577
Merge pull request #8 from JavaAwesome/monday
TheQuangNguyen Nov 19, 2019
29a2a1b
working on the image capture
ahrenswett Nov 19, 2019
6ee4adf
user location shows up on map on create
JamesDansie Nov 19, 2019
5a6e5c5
prepare to merge from James stuff
TheQuangNguyen Nov 19, 2019
e92d915
code review with comments
JamesDansie Nov 19, 2019
918f792
Merge pull request #9 from JavaAwesome/tuesJames
JamesDansie Nov 19, 2019
62df61a
changed to front facing camera
ahrenswett Nov 19, 2019
b818d9a
changed to front facing camera
ahrenswett Nov 19, 2019
7e2368d
fix
ahrenswett Nov 19, 2019
537db96
update check for tag methods to accomodate for multiple it players
TheQuangNguyen Nov 19, 2019
7075115
pushing changes
ahrenswett Nov 19, 2019
00df181
Working on pulling user ID to the MapActivity and showing multiple pl…
sajafisher29 Nov 19, 2019
7eb3a30
Merge pull request #10 from JavaAwesome/tuesday
sajafisher29 Nov 19, 2019
a1416ac
pushing changes
ahrenswett Nov 19, 2019
496d57e
Pulling player IDs into map view, creating new players when they arri…
sajafisher29 Nov 19, 2019
f8ddcbb
Merge pull request #11 from JavaAwesome/sarahDriving
sajafisher29 Nov 19, 2019
7c9b31b
User can now be notified of being tagged by new view appearing and ph…
SharinaS Nov 19, 2019
7582314
back to working code
ahrenswett Nov 19, 2019
27c04be
figured out merge conflict
SharinaS Nov 19, 2019
dabc0e3
Merge pull request #13 from JavaAwesome/sharinaTues
SharinaS Nov 19, 2019
d7961a9
working on turning camera around
ahrenswett Nov 19, 2019
dda17c4
setting up toggles and working on changing camera view
ahrenswett Nov 20, 2019
5e2faa8
updated MapsActivity and Player classes to allow user to join existin…
SharinaS Nov 20, 2019
8bf3398
Merge pull request #14 from JavaAwesome/sharinaTuesMob
SharinaS Nov 20, 2019
e495647
Update README.md
sajafisher29 Nov 20, 2019
28a90c0
Merge pull request #15 from JavaAwesome/sajafisher29-day1-readmeupdate
sajafisher29 Nov 20, 2019
e06ac96
Created check to ask user if they want to join or not.
Zaffierce Nov 20, 2019
72bb31b
Merge pull request #16 from JavaAwesome/Jon
Zaffierce Nov 20, 2019
b80eb98
Update README.md
sajafisher29 Nov 20, 2019
0a7b775
Merge pull request #17 from JavaAwesome/sajafisher29-day2-readmeupdate
sajafisher29 Nov 20, 2019
160e6b8
front camera working
ahrenswett Nov 20, 2019
b050e65
save me please
ahrenswett Nov 20, 2019
35cf1d4
Initial rebuilt of my local Dev copy, json, and api
sajafisher29 Nov 20, 2019
1c6bec8
manifest
ahrenswett Nov 20, 2019
da48572
manifest
ahrenswett Nov 20, 2019
78e557e
Merge pull request #19 from JavaAwesome/camera2
ahrenswett Nov 20, 2019
01b80b9
added room database to store created player to have reference to the …
TheQuangNguyen Nov 20, 2019
a1503de
Custom theme is running
sajafisher29 Nov 20, 2019
80488a1
Custom launcher icon works
sajafisher29 Nov 20, 2019
f3bcf98
saving images
ahrenswett Nov 20, 2019
ce54a16
check if player is already exist in the database on main activity. If…
TheQuangNguyen Nov 20, 2019
d830515
got maps activity updating to work. Moved the iterator to onStop and …
JamesDansie Nov 20, 2019
247edb2
Merge pull request #20 from JavaAwesome/tuesday
TheQuangNguyen Nov 20, 2019
24a07cb
added comments and todos
JamesDansie Nov 20, 2019
24528af
resolving merge conflict
JamesDansie Nov 20, 2019
532ebcb
Merge pull request #21 from JavaAwesome/wedJamesMapsLoc
JamesDansie Nov 20, 2019
db579d0
added code to make a subscription to DB in MapActivity
SharinaS Nov 20, 2019
2a74398
fixed merge conflict
SharinaS Nov 20, 2019
b7adab1
turning off onResume locations
JamesDansie Nov 20, 2019
03d404e
Merge pull request #22 from JavaAwesome/wedJamesMapsLoc
JamesDansie Nov 20, 2019
5eff061
getting ready for S3upload
ahrenswett Nov 20, 2019
0787da9
getting ready for S3upload
ahrenswett Nov 20, 2019
1c0a92c
UI save before pulling in proof of concept Dev update
sajafisher29 Nov 21, 2019
0d12e04
Added subscription for Player. Player marker does move on map with po…
SharinaS Nov 21, 2019
d11e970
Merge branch 'Dev' into sharinaWed
SharinaS Nov 21, 2019
7c5fe5e
Merge pull request #23 from JavaAwesome/sharinaWed
SharinaS Nov 21, 2019
8baf39b
Merge branch 'Dev' of github.com:JavaAwesome/JavaTag into picture
ahrenswett Nov 21, 2019
9e3c6d7
Pulled Dev in
sajafisher29 Nov 21, 2019
965fb3c
pulling player information from database to update that player's mark…
SharinaS Nov 21, 2019
5f23b15
pulling player information from database to update that player's mark…
SharinaS Nov 21, 2019
d9bc974
Merge pull request #24 from JavaAwesome/sharinaWed
SharinaS Nov 21, 2019
5672137
Switched loop to fix null pointer exception in mainActivity
sajafisher29 Nov 21, 2019
89ff787
Merge branch 'Dev' of github.com:JavaAwesome/JavaTag into UIDev
sajafisher29 Nov 21, 2019
e903ce7
fixed issue with onresume being called twice due to permission being …
TheQuangNguyen Nov 21, 2019
db4e12d
Merge branch 'Dev' of github.com:JavaAwesome/JavaTag into wedQuang
TheQuangNguyen Nov 21, 2019
b2e2f4e
Pulled Dev, app is not working, will wait to pull the next Dev since …
sajafisher29 Nov 21, 2019
4b26fd2
fixed issue in code that prevented a user from creating a new session…
SharinaS Nov 21, 2019
c944953
Merge pull request #25 from JavaAwesome/sharinaWed
SharinaS Nov 21, 2019
42880d5
prepare to merge for fixes to maps activity when creating new game
TheQuangNguyen Nov 21, 2019
4c95d2a
able to View a picture and accept or deny it
ahrenswett Nov 21, 2019
1aedf4c
Merge branch 'Dev' of github.com:JavaAwesome/JavaTag into picture
ahrenswett Nov 21, 2019
b6f3566
pulled Dev
ahrenswett Nov 21, 2019
5773131
Update README.md
sajafisher29 Nov 21, 2019
5fa863d
Merge pull request #26 from JavaAwesome/sajafisher29-day3-readmeupdate
sajafisher29 Nov 21, 2019
ecbbb56
pulled Dev
ahrenswett Nov 21, 2019
34ee2d7
prepare to merge Dev
TheQuangNguyen Nov 21, 2019
137365a
Merge pull request #28 from JavaAwesome/wedQuang
TheQuangNguyen Nov 21, 2019
f3d6588
Merge branch 'Dev' into picture
ahrenswett Nov 21, 2019
7fe7ecd
Merge pull request #27 from JavaAwesome/picture
ahrenswett Nov 21, 2019
a8b7dfe
changed main page constraints
ahrenswett Nov 21, 2019
260521b
Merge branch 'picture' of github.com:JavaAwesome/JavaTag into picture
ahrenswett Nov 21, 2019
002ed27
Merge pull request #29 from JavaAwesome/picture
ahrenswett Nov 21, 2019
8936308
Pulling in the new zombie logo
sajafisher29 Nov 21, 2019
74bd294
Pulled most recent Dev into UI
sajafisher29 Nov 21, 2019
7caf88f
added distance filter for display neabry sessions on the main page
TheQuangNguyen Nov 21, 2019
08e473a
Icon is redesigned to be the zombie tag
sajafisher29 Nov 21, 2019
ba3f06b
might have fixed the moving starting point
JamesDansie Nov 21, 2019
170dbd8
Merge branch 'Dev' of https://github.com/JavaAwesome/JavaTag into thu…
JamesDansie Nov 21, 2019
ee40988
Merge pull request #30 from JavaAwesome/thursJames
JamesDansie Nov 21, 2019
8e19343
Theme refactored to greens
sajafisher29 Nov 21, 2019
50d8f79
Merge branch 'Dev' of github.com:JavaAwesome/JavaTag into UIDev
sajafisher29 Nov 21, 2019
1ed113d
change the map markers to a zombie and a player pin
ahrenswett Nov 21, 2019
8c55fe8
Merge branch 'Dev' of github.com:JavaAwesome/JavaTag into picture
ahrenswett Nov 21, 2019
e31043f
change the map markers to a zombie and a player pin
ahrenswett Nov 21, 2019
2467031
change the map markers to a zombie and a player pin
ahrenswett Nov 21, 2019
2ce32a7
Green theme and camera icon added
sajafisher29 Nov 21, 2019
8e2846a
Merge pull request #31 from JavaAwesome/UIDev
sajafisher29 Nov 21, 2019
1f3f7e9
Updated tagging logic, multiple it players can now tag users
Zaffierce Nov 21, 2019
cc6d681
Merge pull request #32 from JavaAwesome/Jon
Zaffierce Nov 21, 2019
9f274b9
players that join after the fact will now show on the creators map
JamesDansie Nov 21, 2019
78804ca
Merge branch 'Dev' of https://github.com/JavaAwesome/JavaTag into thu…
JamesDansie Nov 21, 2019
3bfaa04
Merge pull request #33 from JavaAwesome/thursJames
JamesDansie Nov 21, 2019
6fc1809
prepare for merging Dev
TheQuangNguyen Nov 21, 2019
8de471d
made a new class for profile
ahrenswett Nov 21, 2019
12b4d77
made a new class for profile
ahrenswett Nov 21, 2019
0b021f9
game does not crash on join now. Moved player null check to update ma…
JamesDansie Nov 21, 2019
70d95bb
Merge pull request #34 from JavaAwesome/quickFix
JamesDansie Nov 21, 2019
000520d
made a new class for profile
ahrenswett Nov 21, 2019
0e8587c
fixed issue with null pointers when creating or joining a game
TheQuangNguyen Nov 21, 2019
28807bf
made a new class for profile
ahrenswett Nov 21, 2019
4644dd7
Merge pull request #35 from JavaAwesome/picture
ahrenswett Nov 21, 2019
41f54b2
it status now comes from DB
JamesDansie Nov 21, 2019
31f4366
Merge pull request #36 from JavaAwesome/itfix
JamesDansie Nov 21, 2019
dfcd736
prepare to pull from Dev
TheQuangNguyen Nov 21, 2019
a7044ca
Update README.md
sajafisher29 Nov 21, 2019
6a4ddff
Merge pull request #37 from JavaAwesome/sajafisher29-adding-apk
sajafisher29 Nov 21, 2019
b46f3ed
Update README.md
sajafisher29 Nov 21, 2019
e030426
Merge pull request #38 from JavaAwesome/sajafisher29-zombie-button-apk
sajafisher29 Nov 21, 2019
18735e4
Added apk
sajafisher29 Nov 21, 2019
38b18f7
Merge pull request #39 from JavaAwesome/gameTotals
sajafisher29 Nov 21, 2019
2cd82b1
fixed merge conflicts
TheQuangNguyen Nov 21, 2019
9162f8a
updated the player instance with the player from the player list
JamesDansie Nov 21, 2019
ea9fe75
Merge pull request #40 from JavaAwesome/tagFixMaybe
JamesDansie Nov 21, 2019
5ecafe4
Added bang for apk to gitignore
sajafisher29 Nov 21, 2019
ddb5fc1
Merge pull request #41 from JavaAwesome/gameTotals
sajafisher29 Nov 21, 2019
fb21afa
merged most recent Dev
TheQuangNguyen Nov 21, 2019
4aba8c9
Update README.md
sajafisher29 Nov 21, 2019
76152b9
Merge pull request #42 from JavaAwesome/sajafisher29-apk-unignored
sajafisher29 Nov 21, 2019
69b52c3
updated GraphQL schema for player object to include photo
TheQuangNguyen Nov 21, 2019
72c3564
Merge pull request #43 from JavaAwesome/thursQuang
TheQuangNguyen Nov 21, 2019
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
229 changes: 229 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,229 @@
# Created by https://www.gitignore.io/api/java,macos,android,androidstudio

### Android ###
# Built application files
*.apk
*.ap_

# Allow launched apk
!/zombietag.apk

# Files for the ART/Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/
out/

# Gradle files
.gradle/
build/

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

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation/

# Android Studio captures folder
captures/

# Intellij
*.iml
**/.idea/workspace.xml
**/.idea/tasks.xml
**/.idea/gradle.xml
**/.idea/dictionaries
**/.idea/libraries
**/.idea/markdown-navigator/

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild

# Freeline
freeline.py
freeline/
freeline_project_description.json

### Android Patch ###
gen-external-apklibs

### AndroidStudio ###
# Covers files to be ignored for android development using Android Studio.

# Built application files

# Files for the ART/Dalvik VM

# Java class files

# Generated files

# Gradle files
.gradle

# Signing files
.signing/

# Local configuration file (sdk path, etc)

# Proguard folder generated by Eclipse

# Log Files

# Android Studio
/*/build/
/*/local.properties
/*/out
/*/*/build
/*/*/production
*.ipr
*~
*.swp

# Android Patch

# External native build folder generated in Android Studio 2.2 and later

# NDK
obj/

# IntelliJ IDEA
*.iws
/out/

# User-specific configurations
**/.idea/libraries/
**/.idea/.name
**/.idea/compiler.xml
**/.idea/copyright/profiles_settings.xml
**/.idea/encodings.xml
**/.idea/misc.xml
**/.idea/modules.xml
**/.idea/scopes/scope_settings.xml
**/.idea/vcs.xml
**/.idea/jsLibraryMappings.xml
**/.idea/datasources.xml
**/.idea/dataSources.ids
**/.idea/sqlDataSources.xml
**/.idea/dynamic.xml
**/.idea/uiDesigner.xml

# OS-specific files
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db

# Legacy Eclipse project files
.classpath
.project

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.war
*.ear

# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
hs_err_pid*

## Plugin-specific files:

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Mongo Explorer plugin
.idea/mongoSettings.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

### Java ###
# Compiled class file

# Log file

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)

# Package Files #
*.jar
*.zip
*.tar.gz
*.rar

### AndroidStudio Patch ###

!/gradle/wrapper/gradle-wrapper.jar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml

### macOS ###
*.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.TemporaryItems
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

# IDE
**/.vscode/
**/.settings/

# End of https://www.gitignore.io/api/java,macos,android,androidstudio
**markdown-navigator.xml

# google maps api key
google_maps_api.xml
google-services.json

#amplify
amplify/\#current-cloud-backend
amplify/.config/local-*
amplify/mock-data
amplify/backend/amplify-meta.json
amplify/backend/awscloudformation
build/
dist/
node_modules/
aws-exports.js
awsconfiguration.json
15 changes: 15 additions & 0 deletions .graphqlconfig.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
projects:
javatag:
schemaPath: app/src/main/graphql/schema.json
includes:
- app/src/main/graphql/**/*.graphql
excludes:
- ./amplify/**
extensions:
amplify:
codeGenTarget: ''
generatedFileName: ''
docsFilePath: app/src/main/graphql/com/amazonaws/amplify/generated/graphql
extensions:
amplify:
version: 3
149 changes: 149 additions & 0 deletions .idea/assetWizardSettings.xml

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

Binary file added .idea/caches/build_file_checksums.ser
Binary file not shown.
Binary file added .idea/caches/gradle_models.ser
Binary file not shown.
Loading