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.

Sign up for GitHub

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

Jump to bottom

Update OSW-APP resolve #23, #206, #207, #215, #220 #223

Merged
merged 76 commits into from
May 29, 2022
Merged

Update OSW-APP resolve #23, #206, #207, #215, #220 #223

merged 76 commits into from
May 29, 2022

Conversation

RuffaloLavoisier
Copy link
Member

@RuffaloLavoisier RuffaloLavoisier commented Apr 27, 2022 •
edited
Loading

It's time to get started. All UI steps have been tested. The final challenge is to implement it to OSW device.

This change upgrades many OSW-APP.
In particular, we introduced a graph that can visualize health data, which supported only the existing number of steps, into three items: calories, distance, and number of steps.

We have also introduced dual-time and updated it to check the time of different countries.

  • Watchface(Re-design) - 2ea
  • Add Dual Digital-Watchface
  • Add Dual Analog-Watchface
  • Fitness app(Independent) - 3ea
  • Add fitness tracking

PR

@RuffaloLavoisier RuffaloLavoisier added ⭐ enhancement New feature or request src/osw-app This PR / issue impacts the current release of the OS src/osw-service ⏳ pending for discussion This object is queued for internal discussion... labels Apr 27, 2022
@RuffaloLavoisier RuffaloLavoisier marked this pull request as draft April 27, 2022 13:04
@RuffaloLavoisier RuffaloLavoisier self-assigned this Apr 27, 2022
@RuffaloLavoisier RuffaloLavoisier force-pushed the DualAnalogOverlays branch 2 times, most recently from d61da9d to 9f5024c Compare April 27, 2022 13:48
@RuffaloLavoisier
Copy link
Member Author

Don't worry , it is WIP

@RuffaloLavoisier RuffaloLavoisier removed the ⏳ pending for discussion This object is queued for internal discussion... label Apr 28, 2022
simonmicro
simonmicro requested changes May 4, 2022
View reviewed changes
Copy link
Member

@simonmicro simonmicro left a comment

Choose a reason for hiding this comment

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

I've noted much copy-duplication, which must be fixed. Otherwise good implementation and I'm happy to merge that soon ™️

include/apps/tools/fitness_stats.h Outdated Show resolved Hide resolved
include/apps/tools/kcal_stats.h Outdated Show resolved Hide resolved
include/apps/tools/fitness_stats.h Outdated Show resolved Hide resolved
include/apps/tools/step_stats.h Outdated Show resolved Hide resolved
include/apps/watchfaces/watchface_dual_time.h Outdated Show resolved Hide resolved
src/apps/watchfaces/watchface_dual_time.cpp Outdated Show resolved Hide resolved
src/apps/watchfaces/watchface_dual_time.cpp Outdated Show resolved Hide resolved
src/apps/watchfaces/watchface_dual_time.cpp Outdated Show resolved Hide resolved
src/apps/watchfaces/watchface_fitness_tracking.cpp Outdated Show resolved Hide resolved
src/osw_config_keys.cpp Show resolved Hide resolved
@RuffaloLavoisier RuffaloLavoisier added the ⏳ pending for discussion This object is queued for internal discussion... label May 4, 2022
@RuffaloLavoisier
OSW-CONFIG : add new config key list
35ebc3f 
-settingDisplayDualHourTick, dualTimeZone, configHeight, distPerDay, kcalPerDay
@RuffaloLavoisier
Copy link
Member Author

Based on what CI has been fixed, I'll make a PR one by one.

@RuffaloLavoisier RuffaloLavoisier force-pushed the DualAnalogOverlays branch 3 times, most recently from 30a7186 to b5c3bba Compare May 8, 2022 10:29
@RuffaloLavoisier RuffaloLavoisier marked this pull request as ready for review May 9, 2022 10:21
@simonmicro simonmicro marked this pull request as draft May 10, 2022 12:54
@RuffaloLavoisier
OSW-CONFIG : remove model
e0d127d
@RuffaloLavoisier
Fitness-Tracking : remove dead code for date week-day
61ea29a 
The GFX library has an alignment bug, causing single letters to float, therefore the workaround above is used to still utilize the correct string printing
@RuffaloLavoisier
Copy link
Member Author

Arc_osw
DualTime_osw
curved_osw
fitness_osw
stickchart_osw

simonmicro
simonmicro requested changes May 29, 2022
View reviewed changes
Copy link
Member

@simonmicro simonmicro left a comment

Choose a reason for hiding this comment

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

I'm very sorry but I've just catched this - could you fix this last one, please?

src/osw_config_keys.cpp Outdated Show resolved Hide resolved
@simonmicro simonmicro merged commit 9ff4d91 into Open-Smartwatch:develop May 29, 2022
@RuffaloLavoisier
Copy link
Member Author

Thank you for merge !

@RuffaloLavoisier
Copy link
Member Author

Resolve see #23, #206, #207, #215, #220

@RuffaloLavoisier RuffaloLavoisier deleted the DualAnalogOverlays branch May 29, 2022 23:36
@RuffaloLavoisier RuffaloLavoisier mentioned this pull request May 31, 2022
Merged
@RuffaloLavoisier RuffaloLavoisier removed the ⏳ pending for discussion This object is queued for internal discussion... label May 31, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simonmicro simonmicro simonmicro approved these changes

Assignees

@RuffaloLavoisier RuffaloLavoisier

Labels
src/osw-app This PR / issue impacts the current release of the OS src/osw-service ⭐ enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@RuffaloLavoisier @simonmicro