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

Improved intro screen #38

Merged
merged 26 commits into from
Jan 9, 2021
Merged

Improved intro screen #38

merged 26 commits into from
Jan 9, 2021

Conversation

saachipahwa
Copy link
Collaborator

No description provided.

@saachipahwa saachipahwa changed the base branch from master to develop December 24, 2020 16:11
@thevirtuoso1973
Copy link
Collaborator

Can you add screenshot(s)/gif(s) when ready?

@thevirtuoso1973 thevirtuoso1973 linked an issue Dec 27, 2020 that may be closed by this pull request
@thevirtuoso1973 thevirtuoso1973 added this to In progress in Implementation via automation Dec 28, 2020
@saachipahwa
Copy link
Collaborator Author

Screenshot 2020-12-28 at 14 55 54

Screenshot 2020-12-28 at 14 55 59

Screenshot 2020-12-28 at 14 56 05

@saachipahwa
Copy link
Collaborator Author

Just pushed changing support code to a text field
Screenshot 2020-12-28 at 15 06 03

@thevirtuoso1973
Copy link
Collaborator

Looks cool, resolve conflicts and I'll review when requested.

@thevirtuoso1973 thevirtuoso1973 marked this pull request as ready for review December 29, 2020 17:56
Copy link
Collaborator

@thevirtuoso1973 thevirtuoso1973 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't finished reviewing but I noticed I can't type support code in the text box, have you tested this?

lib/pages/intro_screen.dart Outdated Show resolved Hide resolved
lib/pages/intro_screen.dart Outdated Show resolved Hide resolved
@saachipahwa
Copy link
Collaborator Author

I haven't finished reviewing but I noticed I can't type support code in the text box, have you tested this?

yes it works for me? there's a filter that only allows numbers to be typed since support code is numbers?

@thevirtuoso1973
Copy link
Collaborator

I haven't finished reviewing but I noticed I can't type support code in the text box, have you tested this?

yes it works for me? there's a filter that only allows numbers to be typed since support code is numbers?

Oh I see, although I don't recall saying or seeing that it is a string of numbers, just any string.
Either way if its a string of numbers, we should use the special digit keyboard, there's prob a way of having a keypad pop up instead of normal keyboard, but the easy alternative is just allow any string cos we don't know what the support code will be for now.

@saachipahwa
Copy link
Collaborator Author

I haven't finished reviewing but I noticed I can't type support code in the text box, have you tested this?

yes it works for me? there's a filter that only allows numbers to be typed since support code is numbers?

Oh I see, although I don't recall saying or seeing that it is a string of numbers, just any string.
Either way if its a string of numbers, we should use the special digit keyboard, there's prob a way of having a keypad pop up instead of normal keyboard, but the easy alternative is just allow any string cos we don't know what the support code will be for now.

It seemed like a string of numbers in the old app, but I'll comment it out until we know?

@saachipahwa saachipahwa changed the title Improved intro screen (still have to change support codes ) Improved intro screen Dec 30, 2020
@thevirtuoso1973
Copy link
Collaborator

I haven't finished reviewing but I noticed I can't type support code in the text box, have you tested this?

yes it works for me? there's a filter that only allows numbers to be typed since support code is numbers?

Oh I see, although I don't recall saying or seeing that it is a string of numbers, just any string.
Either way if its a string of numbers, we should use the special digit keyboard, there's prob a way of having a keypad pop up instead of normal keyboard, but the easy alternative is just allow any string cos we don't know what the support code will be for now.

It seemed like a string of numbers in the old app, but I'll comment it out until we know?

Yep just comment out the filter part and add a 'TODO'.

Copy link
Collaborator

@thevirtuoso1973 thevirtuoso1973 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also have to run it and test it again.
Also you may have been doing this already but if not run flutter format . in the project directory so we have consistent formatting.

lib/pages/intro_screen.dart Outdated Show resolved Hide resolved
lib/pages/intro_screen.dart Outdated Show resolved Hide resolved
pubspec.yaml Outdated Show resolved Hide resolved
lib/pages/intro_screen.dart Outdated Show resolved Hide resolved
Copy link
Collaborator

@thevirtuoso1973 thevirtuoso1973 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am able to press done without entering anything. This is not the expected behaviour.

lib/pages/intro_screen.dart Show resolved Hide resolved
@saachipahwa
Copy link
Collaborator Author

savePostcode and saveSupportCode in onSaved() save the postcode?

Copy link
Collaborator

@thevirtuoso1973 thevirtuoso1973 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you not test it? Surely you would've noticed this if you had tested it.

lib/pages/intro_screen.dart Show resolved Hide resolved
@saachipahwa
Copy link
Collaborator Author

Not sure how to validate since the message only appears once they're not on that screen anymore? Like it gets saved once they swipe to the next screen, so they don't see the message? And there doesn't seem to be a way to disable the done button if they haven't input the information correctly

@thevirtuoso1973
Copy link
Collaborator

@saachipahwa I'll figure it out and do this PR then.

@thevirtuoso1973
Copy link
Collaborator

So I don't think what you described is exactly the same issue, but regardless there is actually another issue flutter/flutter#17385 with multipage validation that is unresolved. So I'll just use the old-fashioned setState I suppose.

@thevirtuoso1973
Copy link
Collaborator

@saachipahwa I've done the validation, the intro screen works now but you've mixed the settings page in this PR so either revert/remove it here or merge settings into here properly and we'll just work on one.

@saachipahwa
Copy link
Collaborator Author

settings page stuff have been removfed

lib/pages/intro_screen.dart Outdated Show resolved Hide resolved
lib/pages/intro_screen.dart Outdated Show resolved Hide resolved
lib/pages/intro_screen.dart Outdated Show resolved Hide resolved
@thevirtuoso1973 thevirtuoso1973 merged commit eff7647 into develop Jan 9, 2021
Implementation automation moved this from In progress to Done Jan 9, 2021
@thevirtuoso1973 thevirtuoso1973 deleted the improved-intro-screen branch January 9, 2021 10:39
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 <chris.tomy@hotmail.com>
Co-authored-by: Chris <chris.tomy.19@ucl.ac.uk>
Co-authored-by: Chris <46009390+thevirtuoso1973@users.noreply.github.com>

* 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 <chris.tomy@hotmail.com>
Co-authored-by: Chris <46009390+thevirtuoso1973@users.noreply.github.com>

* fix the sent body, and properly generate new items (#51)

Co-authored-by: saachipahwa <55795994+saachipahwa@users.noreply.github.com>
@saachipahwa saachipahwa mentioned this pull request Jan 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

Improved First Time Screen
2 participants