Allows users to see their first and second period on the homescreen before school starts.#126
Open
todesj wants to merge 271 commits intoStudent-Lyf:masterfrom
Open
Allows users to see their first and second period on the homescreen before school starts.#126todesj wants to merge 271 commits intoStudent-Lyf:masterfrom
todesj wants to merge 271 commits intoStudent-Lyf:masterfrom
Conversation
…-Lyf#123) * Moved Firebase initialization logic to main using flutterfire_cli * Removed manual Firebase initialization for Web * Moved Dart-only Firebase initialization to FirebaseCore.initializeFirebase * Updated Firebase dependencies to support flutterfire_cli * Removed old (manual) calls to FirebaseCore.init(), replaced with new flutterfire_cli initialization * Added try/catch for Firestore emulator Workaround for firebase/flutterfire#6216 * Cleanup
Co-authored-by: Levi Lesches <levilesches@gmail.com>
todesj
changed the title
Comment on lines
-67
to
+74
| : "${next ? 'Up next' : 'Right now'}: ${period!.getName(subject)}" | ||
| : "${next ? (Models.instance.schedule.periods) != null ? ( | ||
| (Time.fromDateTime(DateTime.now()) < | ||
| Models.instance.schedule.periods![0].time.start) ? | ||
| 'Second Period': 'Up Next'): "Up Next" : (Models.instance.schedule.periods) | ||
| != null ? ((Time.fromDateTime(DateTime.now()) < | ||
| Models.instance.schedule.periods![0].time.start) ? | ||
| 'First Period': 'Right Now'):'Right Now'}: ${period!.getName(subject)}" |
Member
There was a problem hiding this comment.
Why not just treat the first period as the current period and the 2nd period as the next period? In other words, treat "school hasn't started yet" as the first period since that's the info users need to see most. Remember that "school hasn't started yet" typically means a few minutes before the bell rings so it's not too weird to see "Right now" or "Up next"
Collaborator
Author
There was a problem hiding this comment.
But I feel like everyone knows that school has started yet no? I think it might just make more sense to have "First Period" and "Second Period". Plus it looks pretty nice.
Bumps [ini](https://github.com/npm/ini) from 1.3.5 to 1.3.8. - [Release notes](https://github.com/npm/ini/releases) - [Changelog](https://github.com/npm/ini/blob/main/CHANGELOG.md) - [Commits](npm/ini@v1.3.5...v1.3.8) --- updated-dependencies: - dependency-name: ini dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.1 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Commits](node-fetch/node-fetch@v2.6.1...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Levi Lesches <levilesches@gmail.com>
…ons (Student-Lyf#127) Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.12.0 to 6.12.6. - [Release notes](https://github.com/ajv-validator/ajv/releases) - [Commits](ajv-validator/ajv@v6.12.0...v6.12.6) --- updated-dependencies: - dependency-name: ajv dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [protobufjs](https://github.com/protobufjs/protobuf.js) from 6.8.9 to 6.11.3. - [Release notes](https://github.com/protobufjs/protobuf.js/releases) - [Changelog](https://github.com/protobufjs/protobuf.js/blob/v6.11.3/CHANGELOG.md) - [Commits](https://github.com/protobufjs/protobuf.js/commits/v6.11.3) --- updated-dependencies: - dependency-name: protobufjs dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Collaborator
|
LGTM, I'm with you Josh on this one- it looks better to have it show first and second period instead. It has a sort of silly feel with it saying |
BraydenKO
approved these changes
Nov 1, 2022
Member
|
Yeah, either are good. FYI that you all (should) have write access to merge this when you feel it's ready |
…fore school starts.
todesj
force-pushed
the
school-is-over
branch
from
d823cee to
9623793
Compare
BraydenKO
force-pushed
the
master
branch
2 times, most recently
from
16558f1 to
268f74a
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
No description provided.