-
Notifications
You must be signed in to change notification settings - Fork 6
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
DariusDumel
wants to merge
147
commits into
mertayD:master
Choose a base branch
from
CANIS-NAU:ButterflyGameDev
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some spelling errors fixed spelling fixed
Added multiple missing drawables and a couple json files to get the app running. Also commented out a MediaPlayer variable called "snap_sound" (in MinfulnessMeditationGame.java) for the meditation game because I couldn' find anything for it at the moment and it doesn't seem required to get the app to build and function.
The notifications are able to be updated by tapping the notification tab now. They appear in a more or less ordered fashion, this could be due to not ordering by the activity's timestamp of completion.
Notification work
Changed the directions of the exhale on the breathing game to "Let go of the button and exhale \n as the butterfly flaps its wings".
added a meditation pop up tutorial, will be implemented.
Added a tutorial popup skeleton for the meditation activity. It still needs to be fleshed out but the functionality works.
Fixed meditation box design and changed some text colors
current work on the social aspect of liking a user's notification that they have completed an activity.
More set up for getting the front end and back end to each other.
More updates to the backend and progress in the toggleLike() method. This method should be able to tell which state the notification is in and switch it to the opposite one.
progress on the "middleware" software.
Progress on the front end but still trying to get RecyclerLayout to play nice. Need to create a new listener for it.
User can now click the like button and a toast will appear saying something along the lines of "Notification liked". This is a placeholder for commented out code that toggles the heart to filled (or unfilled) and also adds or removes the record of that like in the database.
The hearts will now "like" but all hearts fill whenever user goes to the notification page.
Users can now like individual notifications. Some problems with it: sometimes the liked notification will not be the one the user clicked, frequently cannot un-like a notification. I think the two issues are from the same block of code but I have yet to find the problem area.
Added the following toast to the settings button: "Settings is under development"
Fixed the breath count for the 5 breath choice in the mindfulness breathing exercise. Just a matter of the possible_points variable being instantiated to 5 instead of 2.
Set up the roadblock to the community page so when users try to go to it, they get a Toast instead of being redirected. The Toast says "Community page is under development".
Blocked navigation to pollen page
Recreating the popup functionality for mindfulness meditation.
The breathing tutorial popup needs to finally have the tutorial image. Will add in next commit.
* Able to read and write to and from json file stored locally. * Implemented JSON storage of local values and check for updates. * Backend updates sucessfully from json file storage. * Documenting code and asset test. * Removed test backgrounds * Documentation additions, added NetworkCallsInternal.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
added camera background option in butterfly game activity
added support for androidx libraries