Graphs #71
Merged
Graphs #71
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
Collaborator
AbhB2303
commented
Mar 18, 2022
AbhB2303
commented
- updated code with new main-dev code
- added region comments sections to organize code
- added type of drink fragment to specify before measurement and include in pie chart
- UI 2.1: Created a button to move to the graphs activity (temporary button to be changed with new homepage) - UI 2.3: Displayed all user inputs retrieved on data plot -made use of MPAndroidChart library to be able to plot values -Work to still be done: add different types of graphs
- completion of 3 graphs based on user inputs over time - still needs proper documentation - code needs to be cleaned up and prepped to merge -removed unneeded files in models
# Conflicts: # .gradle/7.2/executionHistory/executionHistory.bin # .gradle/7.2/executionHistory/executionHistory.lock # .gradle/7.2/fileHashes/fileHashes.bin # .gradle/7.2/fileHashes/fileHashes.lock # .gradle/7.2/fileHashes/resourceHashesCache.bin # .gradle/buildOutputCleanup/buildOutputCleanup.lock # .gradle/buildOutputCleanup/outputFiles.bin # .gradle/checksums/checksums.lock # .idea/misc.xml # .idea/modules/app/Drinking_Buddy.app.iml # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/com/example/drinkingbuddy/Controllers/Config.java # app/src/main/java/com/example/drinkingbuddy/Controllers/DBHelper.java # app/src/main/java/com/example/drinkingbuddy/Views/MainActivity.java # app/src/main/res/layout/activity_main.xml
- updated code with new main-dev code - added region comments sections to organize code - added type of drink fragment to specify before measurement and include in pie chart
- fixed all warnings - changed drink specifying to floating action button - included text view on home page to clarify drink that is specified -
- removed description label at corner of graph - fixed some warnings on homepage
Removed unessential code from graphs
# Conflicts: # app/src/main/java/com/example/drinkingbuddy/Controllers/DBHelper.java # app/src/main/java/com/example/drinkingbuddy/Views/HomePage.java # app/src/main/res/values/strings.xml
- added needed library - minor glitch still in code when going to trends - merged menu items together
# Conflicts: # app/src/main/java/com/example/drinkingbuddy/Controllers/DBHelper.java
This was
linked to
issues
Mar 20, 2022
Closed
- fixed graph discrepancy - fixed timestamp issue
- fix of skipping every other measurement - still need to fix overwrite of first graph value
breathalyzer result was handled differently for graphs then it was in homepage
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.