Added 12 hour set time interface#907
Merged
JF002 merged 9 commits intoInfiniTimeOrg:developfrom Jan 31, 2022
Merged
Conversation
Removed redundant if statements in hour button logic. Spacing is now in line with repo guidelines.
Also corrected orphaned bracket
|
Does this also fix the alarm app time setting? |
Contributor
Author
|
Reopening pull request because it was closed due to branch issues |
Contributor
Author
|
This PR only changes the set time interface. I am currently looking into the alarm app too. |
Riksu9000
suggested changes
Jan 5, 2022
Contributor
Riksu9000
left a comment
Riksu9000
left a comment
There was a problem hiding this comment.
Please clang-format SettingSetTime.cpp
This is what it looks like now. I'm wondering what would be the best place for the ampm label, though the position might slightly change soon.
Contributor
Author
|
Thanks for the review! I will get started on addressing the issues. |
Consolidated 24 hour to 12 hour time conversion logic into function, addressed formatting issues, cleaned up code.
Itai-Nelken
reviewed
Jan 9, 2022
Riksu9000
reviewed
Jan 9, 2022
Consolidated 12 hour label changes to function. Removed use of strings, struct.
Riksu9000
approved these changes
Jan 11, 2022
Contributor
Riksu9000
left a comment
Riksu9000
left a comment
There was a problem hiding this comment.
I made a couple of comments, but it might not require changes.
Changed setHourLabels function to handle 24 hour time labeling, changed to private
Riksu9000
suggested changes
Jan 11, 2022
Corrected formatting and removed unnecessary variable time24H
Riksu9000
approved these changes
Jan 11, 2022
Collaborator
|
Thanks for the PR and for the review, @eliwss0 & @Riksu9000 ! |
This was referenced Feb 21, 2022
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
5 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.
Added appropriate set time interface for 12 hour setting. Time is still kept and set as 24 hours, but interface changes to reflect 12 hour time if user chooses 12 hour format.