Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Butterfly game dev #10

Open
wants to merge 147 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
147 commits
Select commit Hold shift + click to select a range
5781818
Minor Chores
Keller-M Jul 23, 2019
7cf8959
More Chores
Keller-M Jul 24, 2019
51d153c
Spelling Fix
Keller-M Jul 24, 2019
ead1d93
Notification Update
Keller-M Jul 25, 2019
32ebdcf
Merge branch 'NoSnapTesting'
Keller-M Jul 25, 2019
4208611
Merge pull request #1 from Keller-M/NotificationWorkLocal
Keller-M Jul 25, 2019
620312c
Minor direction changes
Keller-M Jul 31, 2019
f9ba7d3
Meditiation pop-up
Keller-M Jul 31, 2019
6b9a3c0
Meditation popup
Keller-M Aug 1, 2019
d397fb2
Meditation popup
Keller-M Aug 2, 2019
a30daae
Liking notifications
Keller-M Aug 5, 2019
a40e7fd
Liking notifications
Keller-M Aug 6, 2019
dc4dd91
Liking notifications
Keller-M Aug 8, 2019
115b79f
Liking notifications
Keller-M Aug 8, 2019
856990e
Liking notifications
Keller-M Aug 9, 2019
3c56153
Liking Notifications
Keller-M Aug 20, 2019
fb07f71
Liking Notifications
Keller-M Aug 28, 2019
cbcbfe1
Merge branch 'NoSnapFriends' into NotificationWork
Keller-M Aug 29, 2019
046ef12
Liking Notifications
Keller-M Sep 3, 2019
b1d6f31
Liking Notifications
Keller-M Sep 5, 2019
465d12b
Create AppTesting
shelbyhagemann Sep 16, 2019
edf74cc
Liking Notifications - RecyclerView
Keller-M Sep 23, 2019
dc10ff0
Add files via upload
shelbyhagemann Sep 25, 2019
ac9342f
Mindfulness Breathing bug - Breath count
Keller-M Sep 26, 2019
bc4899b
Community Page Roadblock
Keller-M Sep 26, 2019
01bc036
Add files via upload
shelbyhagemann Sep 29, 2019
5ad69e9
Bug fixes
Keller-M Sep 30, 2019
e33fb83
Bug fixes and popup
Keller-M Sep 30, 2019
45d5f7c
Added drawable for the popup tutorial
Keller-M Sep 30, 2019
6553e35
Merge remote-tracking branch 'origin/UserTesting' into UserTesting
Keller-M Sep 30, 2019
f58251e
Adding toasts to prevent navigation to social page.
shelbyhagemann Sep 30, 2019
0fb7566
Committing changes.
shelbyhagemann Sep 30, 2019
038e8c3
Added Shelby's toast changes.
shelbyhagemann Sep 30, 2019
3442bc8
Added comments to explain new Toasts.
shelbyhagemann Sep 30, 2019
f07e420
Minor name change fixes
Keller-M Sep 30, 2019
d48be05
Connection Between Views
Keller-M Oct 12, 2019
f03d385
Liking Notifications - Linking to database
Keller-M Oct 16, 2019
84a12be
Liking Notifications - Removing Likes and realtime updates
Keller-M Oct 21, 2019
7963f53
Merge branch 'UserTesting' into DEMObranch
Keller-M Oct 25, 2019
54de39a
Making CustomAdapter not break
Keller-M Oct 30, 2019
2b35156
10-31-19 Asset addition
Keller-M Oct 31, 2019
9c6a1b1
Updating app
shelbyhagemann Nov 1, 2019
5a9ad47
Asset change fix
Keller-M Nov 1, 2019
4a93dd9
Mindfulness Meditation crash fix
Keller-M Nov 4, 2019
061fc78
Removal of files that are conflicting with the branch
Keller-M Nov 5, 2019
474b5a6
File problems
Keller-M Nov 5, 2019
7f27c8d
File problems
Keller-M Nov 5, 2019
16697f6
File problems
Keller-M Nov 5, 2019
f10bfe5
File problems
Keller-M Nov 5, 2019
6ce6916
Notification Object type changed to UserInteraction
Keller-M Nov 6, 2019
40a5e7c
Re-adding sound assets
Keller-M Nov 6, 2019
d6f1c26
Query work
Keller-M Nov 18, 2019
5084649
Removed growing flower from walking exercise, disabled 5 and 15 minut…
shelbyhagemann Nov 25, 2019
d1b94aa
Merge remote-tracking branch 'origin/UserTesting' into UserTesting
shelbyhagemann Nov 25, 2019
9504310
Changed mood description options in opening survey
shelbyhagemann Nov 25, 2019
5e1e7d5
Merge branch 'UserTesting' of https://github.com/Keller-M/ARORA-App i…
shelbyhagemann Nov 25, 2019
9687c0d
M2 - Quick fix for Mindfullness_meditation_R
Keller-M Nov 25, 2019
a3802fa
Merge remote-tracking branch 'origin/UserTesting' into DEMObranch
Keller-M Nov 25, 2019
0332b33
Fixing some last minute issues with M1 and icons for M1-M3
shelbyhagemann Nov 25, 2019
9a9aef6
Merge branch 'UserTesting' of https://github.com/Keller-M/ARORA-App i…
shelbyhagemann Nov 25, 2019
5846d5c
Server connectivity preparation
Keller-M Nov 26, 2019
9e106bc
Checking current NetworkCall tries
Keller-M Dec 3, 2019
a6af96c
Addition of Notification to model and accounting for that
Keller-M Dec 4, 2019
92b2748
Merge remote-tracking branch 'origin/UserTesting' into UserTesting
shelbyhagemann Dec 10, 2019
7e74e08
Changed audio for M3
shelbyhagemann Dec 10, 2019
99fbf10
Changed audio file for mindfullness walking.
shelbyhagemann Dec 10, 2019
5abbd01
Updated audio file for M3.
shelbyhagemann Dec 10, 2019
45bd33d
Merge branch 'UserTesting' of https://github.com/Keller-M/ARORA-App i…
shelbyhagemann Dec 10, 2019
685263e
Adding mindfulnesswalking.mp3
shelbyhagemann Dec 11, 2019
a03800c
Merge branch 'tmp' into UserTesting
shelbyhagemann Dec 11, 2019
1a81255
Removal of assests to get git to agree
Keller-M Dec 13, 2019
e2f28f5
Revert "Removal of assests to get git to agree"
Keller-M Dec 13, 2019
c39e790
Merge branch 'DEMObranch' into UserTesting
Keller-M Jan 13, 2020
55c9fe8
Asset changes (M1-3) and social system progress
Keller-M Feb 5, 2020
88c4104
testCommit
Keller-M Feb 7, 2020
aeb076f
Revert "testCommit"
Keller-M Feb 7, 2020
ee4b084
Adding AR Integration
Feb 10, 2020
d28ba7c
Merge pull request #3 from Keller-M/ARIntegration
Keller-M Feb 12, 2020
be8bcf5
Revert "Adding AR Integration"
Keller-M Feb 12, 2020
1433609
Merge pull request #4 from Keller-M/revert-3-ARIntegration
Keller-M Feb 12, 2020
e39853c
Merge remote-tracking branch 'origin/UserTesting' into UserTesting
shelbyhagemann May 1, 2020
8f59416
Implemented UI Fixes and documented some features.
JoeyV55 Dec 15, 2020
d6b62ef
Made pollen values pull from user account throughout the app. Made su…
JoeyV55 Dec 17, 2020
f8ca06f
- added ar model and file structure
DariusDumel Dec 22, 2020
aed4f20
added model generated files
DariusDumel Dec 22, 2020
ba3f9fb
Implemented decrement of pollen values for AR screen. Trying to make …
JoeyV55 Dec 23, 2020
1479ef2
Added working pollen incrementing after completing MindfullnessBreath…
JoeyV55 Dec 28, 2020
28a1e39
Added pollen updates and recieptpage links to M2 and M3. M3 (walking)…
JoeyV55 Dec 28, 2020
7406fcf
Fixed improper navigation via the back button by overriding onBackPre…
JoeyV55 Jan 13, 2021
df843dd
Added preliminary redesign of atrium page. Added ProfilePage navigati…
JoeyV55 Jan 14, 2021
4845064
Progress on atrium, added basic detail page when clicking each item i…
JoeyV55 Jan 20, 2021
13a7cc0
Early update of User model for inventory, atrium detail back button a…
JoeyV55 Jan 21, 2021
2e99b4c
Butterfly atrium shows the correct butterfly counts from the backend.…
JoeyV55 Jan 21, 2021
3fa1c81
PATCH Request implemented for atrium butterfly counts.
JoeyV55 Jan 21, 2021
e5f7ebd
Added early version of local atrium addition, PATCH still reflects to…
JoeyV55 Jan 27, 2021
4336d8f
Added AtriumDetail class documentation.
JoeyV55 Jan 27, 2021
5394c67
Added update to the local User atrium.
JoeyV55 Jan 27, 2021
94a01ae
Committed additional docs for Atrium, started cleanup of RecieptPage …
JoeyV55 Jan 28, 2021
a799fd8
Correct RecieptPage values shown from M1.
JoeyV55 Jan 28, 2021
d993bef
Added start to Atrium inventory system. Butterfly counts fetched from…
JoeyV55 Jan 28, 2021
b7b44ad
Started Geocoords and implemented UI fixes.
JoeyV55 Feb 4, 2021
5facce4
Distance working with butterflystops.
JoeyV55 Feb 4, 2021
e597802
Early commit with working network check in AsyncTask
JoeyV55 Feb 10, 2021
d2f5914
Network check and GPS work, both online and offline.
JoeyV55 Feb 10, 2021
496b1f1
Moved Pollen Count updates entirely to RecieptPage in order to start …
JoeyV55 Feb 11, 2021
cc5f859
Started Atrium local storage via json mapping from local atrium.
JoeyV55 Feb 11, 2021
17dfb94
Made CheckConnectivity open a socket connection with the current aror…
JoeyV55 Feb 11, 2021
3527a94
Merge branch 'UserTesting' into UserTesting
JoeyV55 Feb 11, 2021
81bf2e7
Merge pull request #2 from DovahCraft/UserTesting
JoeyV55 Feb 11, 2021
96aeb17
Remove duplicate function for recieptpage
JoeyV55 Feb 11, 2021
c8c0577
Merge branch 'UserTesting' of https://github.com/CANIS-NAU/ARORA-App …
DariusDumel Mar 15, 2021
fb129ba
Revert "Merge branch 'UserTesting' of https://github.com/CANIS-NAU/AR…
DariusDumel Mar 15, 2021
d524397
added back end support for atrium screen
DariusDumel Mar 15, 2021
6cb3c18
added colored butterfly assets
DariusDumel Mar 15, 2021
c1797a4
Merge branch 'ButterflyGameDev'
DariusDumel Mar 15, 2021
21dfd3e
updated graddle wrapper
DariusDumel Mar 15, 2021
1dfe412
Revert "Revert "Merge branch 'UserTesting' of https://github.com/CANI…
DariusDumel Mar 15, 2021
f137650
Merge branch 'UserTesting'
DariusDumel Mar 15, 2021
ff92d72
fixed compile errors from merge
DariusDumel Mar 15, 2021
f890f2d
updated to androidx
DariusDumel Mar 18, 2021
ed9801c
Merge branch 'master' into ButterflyGameDev
DariusDumel Mar 18, 2021
8bf0494
Cleanup code for demo.
JoeyV55 Mar 18, 2021
9a989cd
Create gradle.yml
DariusDumel Mar 22, 2021
a592838
Update gradle.yml
DariusDumel Mar 22, 2021
8c35724
added camera background
DariusDumel Mar 22, 2021
f2dc04a
Delete ArActivity.java
DariusDumel Mar 22, 2021
055106d
Update gradle.yml
DariusDumel Mar 22, 2021
6d16d3f
Update gradle.yml
DariusDumel Mar 22, 2021
f211b14
Update gradle.yml
DariusDumel Mar 22, 2021
6cf51de
Update gradle.yml
DariusDumel Mar 22, 2021
72fbc3c
supressed lint error with onBindViewHolder
DariusDumel Mar 23, 2021
077bedf
added suppress lint to final int position parameter
DariusDumel Mar 23, 2021
303d1c8
Update activity_survey_page.xml
DariusDumel Mar 23, 2021
c43a82d
Update gradle.yml
DariusDumel Mar 23, 2021
8e0f076
Create README.md
DariusDumel Mar 23, 2021
560f92c
Older integrations of local update code for pollen and atrium (#3)
JoeyV55 Mar 26, 2021
b7a6cb9
got cameraX displaying preview on screen correctly + code clean up
DariusDumel Apr 1, 2021
de7822a
updated CameraX to most recent stable versions
DariusDumel Apr 1, 2021
905c0e5
further cleaning of unused code
DariusDumel Apr 1, 2021
08d960f
added camera switch functionality
DariusDumel Apr 1, 2021
30f3b05
Merge branch 'master' into ButterflyGameDev
DariusDumel Apr 1, 2021
136f20d
androidX clean up
DariusDumel Apr 1, 2021
3db9ed2
changed the way butterflies spawn in screen
DariusDumel Apr 1, 2021
e45d697
changed butterfly spawn area
DariusDumel Apr 3, 2021
1b6655e
added new butterfly assets
DariusDumel Apr 5, 2021
216d0f2
add back button dialog and fixed orientation to portrait
DariusDumel Apr 13, 2021
c0fc354
made it harder for basket to grow too much
DariusDumel Apr 13, 2021
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
26 changes: 26 additions & 0 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# This workflow will build a Java project with Gradle
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle

name: Java CI with Gradle

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:

runs-on: windows-latest

steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build -x lint -x lintVitalRelease
152 changes: 127 additions & 25 deletions .idea/codeStyles/Project.xml

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

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

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

4 changes: 4 additions & 0 deletions .idea/encodings.xml

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

12 changes: 9 additions & 3 deletions .idea/gradle.xml

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

40 changes: 40 additions & 0 deletions .idea/jarRepositories.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/misc.xml

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

1 change: 1 addition & 0 deletions .idea/vcs.xml

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

16 changes: 16 additions & 0 deletions AppTesting
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
1) Meditation quest: If the chosen time is 5 minutes, the app will only run the feature for roughly 2 minutes and then
skip over to the "quest completed" page and will display the message "Something went wrong, please try again later."

2) Meditation quest: If the chosen time is 3 minutes, the app will only run the feature for roughly 1 minute and then
skip over to the "quest completed" page and will display the message "Something went wrong, please try again later."

3) Mindfulness Breathing: If 5 breaths is chosen, the app will only prompt the user to take 2 breaths. This is not an issue
when 10 or 15 breaths are selected.

4) Mindfulness Breathing: Repeatedly tapping on the button the user is supposed to hold on to as they breathe in will cause
the audio to cut out.

5) The settings (gear) button is unresponsive on all pages that it appears on.

6) The app will not allow the user to "swipe" out of the community page, only letting the user access other pages of the app
with the bottom row of buttons. This is not an issue on any other pages.
Loading