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

Added 12 hour set time interface #907

Merged
merged 9 commits into from
Jan 31, 2022

Conversation

eliwss0
Copy link
Contributor

@eliwss0 eliwss0 commented Jan 2, 2022

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.

Removed redundant if statements in hour button logic. Spacing is now in line with repo guidelines.
Also corrected orphaned bracket
@eliwss0 eliwss0 marked this pull request as ready for review January 3, 2022 23:28
@eliwss0 eliwss0 closed this Jan 4, 2022
@eliwss0 eliwss0 deleted the develop_ampm_settime branch January 4, 2022 21:07
@Izaic
Copy link

Izaic commented Jan 4, 2022

Does this also fix the alarm app time setting?

@eliwss0 eliwss0 restored the develop_ampm_settime branch January 4, 2022 21:10
@eliwss0 eliwss0 deleted the develop_ampm_settime branch January 4, 2022 21:10
@eliwss0 eliwss0 restored the develop_ampm_settime branch January 4, 2022 21:16
@eliwss0
Copy link
Contributor Author

eliwss0 commented Jan 4, 2022

Reopening pull request because it was closed due to branch issues

@eliwss0 eliwss0 reopened this Jan 4, 2022
@eliwss0
Copy link
Contributor Author

eliwss0 commented Jan 4, 2022

This PR only changes the set time interface. I am currently looking into the alarm app too.

Copy link
Contributor

@Riksu9000 Riksu9000 left a comment

Choose a reason for hiding this comment

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

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.
current

src/displayapp/screens/settings/SettingSetTime.h Outdated Show resolved Hide resolved
src/displayapp/screens/settings/SettingSetTime.h Outdated Show resolved Hide resolved
src/displayapp/screens/settings/SettingSetTime.cpp Outdated Show resolved Hide resolved
src/displayapp/screens/settings/SettingSetTime.cpp Outdated Show resolved Hide resolved
src/displayapp/screens/settings/SettingSetTime.cpp Outdated Show resolved Hide resolved
src/displayapp/screens/settings/SettingSetTime.cpp Outdated Show resolved Hide resolved
@eliwss0
Copy link
Contributor Author

eliwss0 commented Jan 5, 2022

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.
@eliwss0 eliwss0 requested a review from Riksu9000 January 9, 2022 15:43
Consolidated 12 hour label changes to function. Removed use of strings, struct.
Copy link
Contributor

@Riksu9000 Riksu9000 left a comment

Choose a reason for hiding this comment

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

I made a couple of comments, but it might not require changes.

src/displayapp/screens/settings/SettingSetTime.cpp Outdated Show resolved Hide resolved
src/displayapp/screens/settings/SettingSetTime.cpp Outdated Show resolved Hide resolved
src/displayapp/screens/settings/SettingSetTime.cpp Outdated Show resolved Hide resolved
Changed setHourLabels function to handle 24 hour time labeling, changed to private
Corrected formatting and removed unnecessary variable time24H
@JF002 JF002 added this to the 1.9.0 milestone Jan 19, 2022
@JF002
Copy link
Collaborator

JF002 commented Jan 31, 2022

Thanks for the PR and for the review, @eliwss0 & @Riksu9000 !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants