Skip to content

New strategy for asset overrides. Fixes popup warnings#4

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

Merged
ps2 merged 1 commit into from
Oct 13, 2019
Merged

New strategy for asset overrides. Fixes popup warnings #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 0 additions & 77 deletions AdditionalAssets.xcassets/CustomLoopIcon.appiconset/Contents.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,83 +107,6 @@
"idiom" : "ios-marketing",
"filename" : "Icon.png",
"scale" : "1x"
},
{
"size" : "24x24",
"idiom" : "watch",
"scale" : "2x",
"role" : "notificationCenter",
"subtype" : "38mm"
},
{
"size" : "27.5x27.5",
"idiom" : "watch",
"scale" : "2x",
"role" : "notificationCenter",
"subtype" : "42mm"
},
{
"size" : "29x29",
"idiom" : "watch",
"filename" : "icon_29pt@2x-2.png",
"role" : "companionSettings",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "watch",
"filename" : "icon_29pt@3x-1.png",
"role" : "companionSettings",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "watch",
"filename" : "icon_40pt@2x-2.png",
"scale" : "2x",
"role" : "appLauncher",
"subtype" : "38mm"
},
{
"size" : "44x44",
"idiom" : "watch",
"scale" : "2x",
"role" : "appLauncher",
"subtype" : "40mm"
},
{
"size" : "50x50",
"idiom" : "watch",
"scale" : "2x",
"role" : "appLauncher",
"subtype" : "44mm"
},
{
"size" : "86x86",
"idiom" : "watch",
"scale" : "2x",
"role" : "quickLook",
"subtype" : "38mm"
},
{
"size" : "98x98",
"idiom" : "watch",
"scale" : "2x",
"role" : "quickLook",
"subtype" : "42mm"
},
{
"size" : "108x108",
"idiom" : "watch",
"scale" : "2x",
"role" : "quickLook",
"subtype" : "44mm"
},
{
"size" : "1024x1024",
"idiom" : "watch-marketing",
"filename" : "Icon-1.png",
"scale" : "1x"
}
],
"info" : {
Expand Down
Binary file modifiedAdditionalAssets.xcassets/CustomLoopIcon.appiconset/Icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removedAdditionalAssets.xcassets/CustomLoopIcon.appiconset/icon_29pt@2x-2.png
View file
Open in desktop
Binary file not shown.
Binary file removedAdditionalAssets.xcassets/CustomLoopIcon.appiconset/icon_29pt@3x-1.png
View file
Open in desktop
Binary file not shown.
Binary file removedAdditionalAssets.xcassets/CustomLoopIcon.appiconset/icon_40pt@2x-2.png
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions AdditionalWatchAssets.xcassets/Contents.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
92 changes: 92 additions & 0 deletions AdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/Contents.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
{
"images" : [
{
"size" : "24x24",
"idiom" : "watch",
"filename" : "icon_24pt@2x.png",
"scale" : "2x",
"role" : "notificationCenter",
"subtype" : "38mm"
},
{
"size" : "27.5x27.5",
"idiom" : "watch",
"filename" : "icon_27.5pt@2x.png",
"scale" : "2x",
"role" : "notificationCenter",
"subtype" : "42mm"
},
{
"size" : "29x29",
"idiom" : "watch",
"filename" : "icon_29pt@2x.png",
"role" : "companionSettings",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "watch",
"filename" : "icon_29pt@3x.png",
"role" : "companionSettings",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "watch",
"filename" : "icon_40pt@2x.png",
"scale" : "2x",
"role" : "appLauncher",
"subtype" : "38mm"
},
{
"size" : "44x44",
"idiom" : "watch",
"filename" : "icon_44pt@2x.png",
"scale" : "2x",
"role" : "appLauncher",
"subtype" : "40mm"
},
{
"size" : "50x50",
"idiom" : "watch",
"filename" : "icon_50pt@2x.png",
"scale" : "2x",
"role" : "appLauncher",
"subtype" : "44mm"
},
{
"size" : "86x86",
"idiom" : "watch",
"filename" : "icon_86pt@2x.png",
"scale" : "2x",
"role" : "quickLook",
"subtype" : "38mm"
},
{
"size" : "98x98",
"idiom" : "watch",
"filename" : "icon_98pt@2x.png",
"scale" : "2x",
"role" : "quickLook",
"subtype" : "42mm"
},
{
"size" : "108x108",
"idiom" : "watch",
"filename" : "icon_108pt@2x.png",
"scale" : "2x",
"role" : "quickLook",
"subtype" : "44mm"
},
{
"size" : "1024x1024",
"idiom" : "watch-marketing",
"filename" : "Icon.png",
"scale" : "1x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file renamed...sets/CustomLoopIcon.appiconset/Icon-1.png → ...assets/CustomLoopIcon.appiconset/Icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedAdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_108pt@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedAdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_24pt@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedAdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_27.5pt@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedAdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_29pt@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedAdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_29pt@3x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedAdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_40pt@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedAdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_44pt@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedAdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_50pt@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedAdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_86pt@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file addedAdditionalWatchAssets.xcassets/CustomLoopIcon.appiconset/icon_98pt@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Loop
Open in desktop
Submodule Loop updated 6 files
+4 −0 .gitignore
+8 −6 Loop.xcodeproj/project.pbxproj
+6 −0 Loop/DerivedAssets.xcassets/Contents.json
+2 −3 Scripts/build-derived-assets.sh
+4 −6 Scripts/build-derived-watch-assets.sh
+6 −0 WatchApp/DerivedAssets.xcassets/Contents.json
6 changes: 6 additions & 0 deletions Loop.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion LoopConfigOverride.xcconfig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,4 +12,4 @@ MAIN_APP_DISPLAY_NAME = Loop
// Assets
INCLUDED_SOURCE_FILE_NAMES = AdditionalAssets.xcassets

//APPICON_NAME = CustomLoopIcon
APPICON_NAME = CustomLoopIcon