-
Notifications
You must be signed in to change notification settings - Fork 1
Implement the colorful power chart #19
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
Open
xopok
wants to merge
14
commits into
master
Choose a base branch
from
watch-ui
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
6a0e974
Add PowerFieldWatchLayout
xopok bbfd13f
Use PowerFieldWatchLayout for round and semi-round screen shape.
xopok ac67551
Add PowerFieldWideWatchLayout
xopok 2229dd6
Implement power chart
xopok 7168bd2
Add the "Use alternative font over power chart" property
xopok 9b7252a
Add the Edge layout for power chart support. Tweak font sizes.
xopok 48e2404
Make the chart drawing compatible with different layouts and datafiel…
xopok 5d8271d
Use system fg/bg colors for alt font.
xopok eb62726
Don't use alt font on watches
xopok 98173b3
Update label font sizes for Edge devices to match the actual size
xopok 7fcc632
Add fenix6 family to the manifest file. (#21)
xopok 8c863fc
Merge pull request #22 from axl13/master
xopok e771c56
Fix orphan "-" when in alt font mode.
xopok 011df90
Update PowerAdjusterView.mc
axl13 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,48 @@ | ||
| <resources> | ||
| <bitmaps> | ||
| <bitmap id="id_pc" filename="images/pc.png" /> | ||
| </bitmaps> | ||
| <font id="outline_fnt" filename="fonts/font.fnt"/> | ||
| <font id="outline2_fnt" filename="fonts/font_2.fnt"/> | ||
| <layout id="PowerFieldLayout"> | ||
| <label id="label" x="left" y="bottom" | ||
| font="Graphics.FONT_SYSTEM_XTINY" | ||
| justification="Graphics.TEXT_JUSTIFY_LEFT"/> | ||
| <label id="value" x="center" y="center" | ||
| font="Graphics.FONT_SYSTEM_NUMBER_THAI_HOT" | ||
| justification="Graphics.TEXT_JUSTIFY_CENTER"/> | ||
| <label id="mark" x="center" y="top" | ||
| font="Graphics.FONT_SYSTEM_XTINY" | ||
| justification="Graphics.TEXT_JUSTIFY_CENTER"/> | ||
| </layout> | ||
| <bitmaps> | ||
| <bitmap id="id_pc" filename="images/pc.png" /> | ||
| </bitmaps> | ||
| <font id="outline_fnt" filename="fonts/font.fnt"/> | ||
| <font id="outline2_fnt" filename="fonts/font_2.fnt"/> | ||
| <layout id="PowerFieldEdgeLayout"> | ||
| <label id="label" x="center" y="top" | ||
| font="Graphics.FONT_SMALL" | ||
| justification="Graphics.TEXT_JUSTIFY_CENTER"/> | ||
| <label id="value" x="center" y="bottom" | ||
| font="Graphics.FONT_SYSTEM_NUMBER_MEDIUM" | ||
| justification="Graphics.TEXT_JUSTIFY_CENTER"/> | ||
| </layout> | ||
| <layout id="PowerFieldEdgeChartLayout"> | ||
| <label id="label" x="center" y="top" | ||
| font="Graphics.FONT_SMALL" | ||
| justification="Graphics.TEXT_JUSTIFY_CENTER"/> | ||
| <label id="value" x="center" y="center" | ||
| font="Graphics.FONT_SYSTEM_NUMBER_THAI_HOT" | ||
| justification="Graphics.TEXT_JUSTIFY_CENTER"/> | ||
| <label id="chart" x="0" y="bottom" | ||
| font="Graphics.FONT_NUMBER_MEDIUM" | ||
| justification="Graphics.TEXT_JUSTIFY_CENTER"/> | ||
| </layout> | ||
| <layout id="PowerFieldWatchLayout"> | ||
| <label id="label" x="center" y="top" | ||
| font="Graphics.FONT_TINY" | ||
| justification="Graphics.TEXT_JUSTIFY_CENTER"/> | ||
| <label id="value" x="center" y="center" | ||
| font="Graphics.FONT_NUMBER_MEDIUM" | ||
| justification="Graphics.TEXT_JUSTIFY_CENTER"/> | ||
| </layout> | ||
| <layout id="PowerFieldWideWatchLayout"> | ||
| <label id="label" x="center" y="top" | ||
| font="Graphics.FONT_TINY" | ||
| justification="Graphics.TEXT_JUSTIFY_CENTER"/> | ||
| <label id="value" x="230" y="top" | ||
| font="Graphics.FONT_NUMBER_MEDIUM" | ||
| justification="Graphics.TEXT_JUSTIFY_RIGHT"/> | ||
| <label id="cadence" x="10" y="top" | ||
| font="Graphics.FONT_NUMBER_MEDIUM" | ||
| justification="Graphics.TEXT_JUSTIFY_LEFT"/> | ||
| <label id="chart" x="0" y="bottom" | ||
| font="Graphics.FONT_NUMBER_MEDIUM" | ||
| justification="Graphics.TEXT_JUSTIFY_CENTER"/> | ||
| </layout> | ||
| </resources> | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why was this removed?