-
Notifications
You must be signed in to change notification settings - Fork 727
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
Support complicationset folders #1051
Open
Patrick-Kladek
wants to merge
5
commits into
SwiftGen:develop
Choose a base branch
from
bikemap:enhancement/complicationset
base: develop
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
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
5 commits
Select commit
Hold shift + click to select a range
566e16b
add complicationset to others cateloge
Patrick-Kladek 55603de
extend parser to include complicationset folder extension
Patrick-Kladek 1542266
add changelog
Patrick-Kladek 77c480f
Merge branch 'develop' of https://github.com/SwiftGen/SwiftGen into e…
Patrick-Kladek 69ac7ba
remove merge conflict marker in changelog
Patrick-Kladek File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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 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 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 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
88 changes: 65 additions & 23 deletions
88
...ils/Fixtures/Resources/XCAssets/Other.xcassets/AppIcon (watchOS).appiconset/Contents.json
This file contains 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,88 +1,130 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "size" : "24x24", | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "role" : "notificationCenter", | ||
| "scale" : "2x", | ||
| "size" : "24x24", | ||
| "subtype" : "38mm" | ||
| }, | ||
| { | ||
| "size" : "27.5x27.5", | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "role" : "notificationCenter", | ||
| "scale" : "2x", | ||
| "size" : "27.5x27.5", | ||
| "subtype" : "42mm" | ||
| }, | ||
| { | ||
| "size" : "29x29", | ||
| "idiom" : "watch", | ||
| "role" : "companionSettings", | ||
| "scale" : "2x" | ||
| "scale" : "2x", | ||
| "size" : "29x29" | ||
| }, | ||
| { | ||
| "size" : "29x29", | ||
| "idiom" : "watch", | ||
| "role" : "companionSettings", | ||
| "scale" : "3x" | ||
| "scale" : "3x", | ||
| "size" : "29x29" | ||
| }, | ||
| { | ||
| "size" : "40x40", | ||
| "idiom" : "watch", | ||
| "role" : "notificationCenter", | ||
| "scale" : "2x", | ||
| "size" : "33x33", | ||
| "subtype" : "45mm" | ||
| }, | ||
| { | ||
| "idiom" : "watch", | ||
| "role" : "appLauncher", | ||
| "scale" : "2x", | ||
| "size" : "40x40", | ||
| "subtype" : "38mm" | ||
| }, | ||
| { | ||
| "size" : "44x44", | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "role" : "appLauncher", | ||
| "scale" : "2x", | ||
| "size" : "44x44", | ||
| "subtype" : "40mm" | ||
| }, | ||
| { | ||
| "size" : "50x50", | ||
| "idiom" : "watch", | ||
| "role" : "appLauncher", | ||
| "scale" : "2x", | ||
| "size" : "46x46", | ||
| "subtype" : "41mm" | ||
| }, | ||
| { | ||
| "idiom" : "watch", | ||
| "role" : "appLauncher", | ||
| "scale" : "2x", | ||
| "size" : "50x50", | ||
| "subtype" : "44mm" | ||
| }, | ||
| { | ||
| "size" : "86x86", | ||
| "idiom" : "watch", | ||
| "role" : "appLauncher", | ||
| "scale" : "2x", | ||
| "size" : "51x51", | ||
| "subtype" : "45mm" | ||
| }, | ||
| { | ||
| "idiom" : "watch", | ||
| "role" : "appLauncher", | ||
| "scale" : "2x", | ||
| "size" : "54x54", | ||
| "subtype" : "49mm" | ||
| }, | ||
| { | ||
| "idiom" : "watch", | ||
| "role" : "quickLook", | ||
| "scale" : "2x", | ||
| "size" : "86x86", | ||
| "subtype" : "38mm" | ||
| }, | ||
| { | ||
| "size" : "98x98", | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "role" : "quickLook", | ||
| "scale" : "2x", | ||
| "size" : "98x98", | ||
| "subtype" : "42mm" | ||
| }, | ||
| { | ||
| "idiom" : "watch", | ||
| "role" : "quickLook", | ||
| "scale" : "2x", | ||
| "size" : "108x108", | ||
| "subtype" : "44mm" | ||
| }, | ||
| { | ||
| "idiom" : "watch", | ||
| "role" : "quickLook", | ||
| "scale" : "2x", | ||
| "size" : "117x117", | ||
| "subtype" : "45mm" | ||
| }, | ||
| { | ||
| "idiom" : "watch", | ||
| "role" : "quickLook", | ||
| "subtype" : "44mm" | ||
| "scale" : "2x", | ||
| "size" : "129x129", | ||
| "subtype" : "49mm" | ||
| }, | ||
| { | ||
| "idiom" : "watch-marketing", | ||
| "size" : "1024x1024", | ||
| "scale" : "1x" | ||
| "scale" : "1x", | ||
| "size" : "1024x1024" | ||
| }, | ||
| { | ||
| "size" : "44x44", | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "role" : "longLook", | ||
| "scale" : "2x", | ||
| "size" : "44x44", | ||
| "subtype" : "42mm" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "version" : 1, | ||
| "author" : "xcode" | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
...rces/XCAssets/Other.xcassets/Complication.complicationset/Circular.imageset/Contents.json
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "idiom" : "watch", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "screen-width" : "<=145" | ||
| }, | ||
| { | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "screen-width" : ">183" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
53 changes: 53 additions & 0 deletions
53
...ils/Fixtures/Resources/XCAssets/Other.xcassets/Complication.complicationset/Contents.json
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| { | ||
| "assets" : [ | ||
| { | ||
| "filename" : "Circular.imageset", | ||
| "idiom" : "watch", | ||
| "role" : "circular" | ||
| }, | ||
| { | ||
| "filename" : "Extra Large.imageset", | ||
| "idiom" : "watch", | ||
| "role" : "extra-large" | ||
| }, | ||
| { | ||
| "filename" : "Graphic Bezel.imageset", | ||
| "idiom" : "watch", | ||
| "role" : "graphic-bezel" | ||
| }, | ||
| { | ||
| "filename" : "Graphic Circular.imageset", | ||
| "idiom" : "watch", | ||
| "role" : "graphic-circular" | ||
| }, | ||
| { | ||
| "filename" : "Graphic Corner.imageset", | ||
| "idiom" : "watch", | ||
| "role" : "graphic-corner" | ||
| }, | ||
| { | ||
| "filename" : "Graphic Extra Large.imageset", | ||
| "idiom" : "watch", | ||
| "role" : "graphic-extra-large" | ||
| }, | ||
| { | ||
| "filename" : "Graphic Large Rectangular.imageset", | ||
| "idiom" : "watch", | ||
| "role" : "graphic-large-rectangular" | ||
| }, | ||
| { | ||
| "filename" : "Modular.imageset", | ||
| "idiom" : "watch", | ||
| "role" : "modular" | ||
| }, | ||
| { | ||
| "filename" : "Utilitarian.imageset", | ||
| "idiom" : "watch", | ||
| "role" : "utilitarian" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
...s/XCAssets/Other.xcassets/Complication.complicationset/Extra Large.imageset/Contents.json
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "idiom" : "watch", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "screen-width" : "<=145" | ||
| }, | ||
| { | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "screen-width" : ">183" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
17 changes: 17 additions & 0 deletions
17
...XCAssets/Other.xcassets/Complication.complicationset/Graphic Bezel.imageset/Contents.json
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "idiom" : "watch", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "screen-width" : ">183" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
17 changes: 17 additions & 0 deletions
17
...ssets/Other.xcassets/Complication.complicationset/Graphic Circular.imageset/Contents.json
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "idiom" : "watch", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "screen-width" : ">183" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
17 changes: 17 additions & 0 deletions
17
...CAssets/Other.xcassets/Complication.complicationset/Graphic Corner.imageset/Contents.json
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "idiom" : "watch", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "screen-width" : ">183" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
22 changes: 22 additions & 0 deletions
22
...ts/Other.xcassets/Complication.complicationset/Graphic Extra Large.imageset/Contents.json
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "idiom" : "watch", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "screen-width" : "<=145" | ||
| }, | ||
| { | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "screen-width" : ">183" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
17 changes: 17 additions & 0 deletions
17
...er.xcassets/Complication.complicationset/Graphic Large Rectangular.imageset/Contents.json
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "idiom" : "watch", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "screen-width" : ">183" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
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.
This doesn't change anything?