Checkup screen #19
Merged
Checkup screen #19
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
This reverts commit b50cf96
|
This hasn't been merged yet. |
Closed
|
@saachipahwa If you haven't dealt with merge conflicts before they're a bit annoying but you get used to them after a while. |
|
@saachipahwa Also, it doesn't build on Android but it looks like easy fixes. Let me know if you need me to fix it for android. |
|
Oh and remember to re-request review once you're happy with it and want me to take a look. |
I'm not able to test for android so can you fix it? |
|
Yep I can fix the android issues on this branch. |
thevirtuoso1973
requested changes
Dec 13, 2020
|
You can press resolve conversation on stuff that you have changed. |
thevirtuoso1973
requested changes
Dec 15, 2020
thevirtuoso1973
approved these changes
Dec 15, 2020
thevirtuoso1973
added a commit
that referenced
this pull request
Jan 10, 2021
* dart version update * installing package for push notifications * scheduled notificastion * changes to notifcation * version update in pubspec.lock * commented out the bit in appdelegate.swift that was causing a problem * testing checkup without fitkit errors * fixing comment symbols * just tweaks * finished checkup screen * migrate model to use sqlflite * randomly create wellbeing items for debugging * i need to commit to leave the branch sorry * remove test, we'll do it properly later * fix AndroidManifest.xml & build.gradle * add pubspec.lock * fixed comments on pull request * adding checkup to pages * have to commit to checkout * remove unrelated stuff from checkup branch * rough initial working implementation of notifications * schedule weekly notifications for checkup and publish in main.dart * initial implementation of wellbeing_circle.dart * support nullable score in wellbeing_circle.dart and use a material card * Publish Data Screen & POST Last Week's Wellbeing (#24) * migrate model to use sqlflite * randomly create wellbeing items for debugging * remove test, we'll do it properly later * working pop up screen for publishing data * implement differential privacy * fix http for debug android builds and some type errors * switch to flutter stable and fix * don't actually POST yet * Revert "don't actually POST yet" This reverts commit 751421c. * change BASE_URL to a test url * First time setup (#25) * working pop up screen for publishing data * implement differential privacy * add first_time_screen and add the form * save setup data to shared_preferences * update lock * add publish screen to _selectNotification * fix build issue by commenting out application tag * switch to newer notification version and use timezones. Also, add a (working) notification tester in settings. * implement partially working recurring notification * fix notification behavior when app is closed (by using streams). Now works on emulator. * remove TODO. notification works on device * check if db is empty before opening publish screen * fix bug with empty DB check * update .gitignore (#26) * clean up project and remove .idea * Checkup screen (#19) * all page files addded * Revert "all page files addded" This reverts commit b50cf96 * dart version update * installing package for push notifications * scheduled notificastion * changes to notifcation * version update in pubspec.lock * commented out the bit in appdelegate.swift that was causing a problem * testing checkup without fitkit errors * fixing comment symbols * just tweaks * finished checkup screen * i need to commit to leave the branch sorry * fix AndroidManifest.xml & build.gradle * add pubspec.lock * fixed comments on pull request * adding checkup to pages * pedometer logic using hive (not tested) * it was counting per day (for testing) but changed it to per week (line 116 from ==1 to ==7) * Delete launch.json * http connection permision for ios * commenting out my test main * removing change notifier from main.dart * fixed some of the warnings, but will fix the commented out function in notification.dart tomorrow * remove old notification file, remove checkup from pages, trying to fix pod build errors * fixing pod that got corrupted 'pod deintegrate, pod install, pod update' * changing the text displayed * resolving changes * removing second main * fixing comments * requested changes Co-authored-by: Chris <[email protected]> Co-authored-by: Chris <[email protected]> Co-authored-by: Chris <[email protected]> * remove hive and put the others under 'util' * use checkup screen with notifications * split up widgets into functions * add padding around _thisWeekHolder * implement first try of better version of pedometer * handle the case where user has rebooted in the middle of a week (not perfectly, but it won't show negative numbers at least) * run `flutter format .` * add steps to home & rename folder to shared * fix the home page step count, add explicit type in wellbeing_circle.dart * remove jiffy from pubspec * remove hive and put the others under 'util' (#34) * implement our own first time setup * fix checkup screen adding to DB * init every time app is opened * add widget test for wellbeing_circle.dart (#47) * update with new back-end (#48) * Check wellbeing (#39) * check if wellbeing has dropped after the user adds their new score in checkup * implement the share_button.dart widget and add it to wellbeing_graph.dart * implement pedometer checking as a background task with Workmanager * some bug fixes, nudge notification works but not showing pop up screen * fix UI of nudge screen * init notification stuff in background callback * Improved intro screen (#38) * improved intro screen * support code text field instead of multiple choice * removing main * fixing build error? * unused import * push replacement * multiple choice removed * removing input formatters\ * unused import * requested changes * changing to textformfield and using validators * changing postcode validator to work always * unused import * removing bits for testin * settings page changes * save function * fix validation on intro screen * switch back to stateful and dispose of text controllers * run flutter format . * reverting to old settings page * Update lib/pages/intro_screen.dart * Update lib/pages/intro_screen.dart * removed material app Co-authored-by: thevirtuoso1973 <[email protected]> Co-authored-by: Chris <[email protected]> * fix the sent body, and properly generate new items (#51) Co-authored-by: saachipahwa <[email protected]>
Merged
This was referenced Feb 16, 2021
Closed
Merged
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.
sliding wb score scale and attempt at notification