diff --git a/GNUmakefile b/GNUmakefile index efa1177dd..9973731e0 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1419,7 +1419,7 @@ dist-ios: iosrelease-app mkdir -p out/Payload/tildefriends.app cp -avR out/tildefriends-iosrelease.app/* out/Payload/tildefriends.app/ cp src/ios/tildefriends.png out/Payload/tildefriends.app/ - xcrun -sdk iphoneos actool --compile out/Payload/tildefriends.app/ --platform iphoneos --minimum-deployment-target $(IPHONEOS_VERSION_MIN) --app-icon AppIcon src/ios/icons/Assets.xcassets --output-partial-info-plist out/actool.plist + xcrun -sdk iphoneos actool --compile out/Payload/tildefriends.app/ --platform iphoneos --minimum-deployment-target $(IPHONEOS_VERSION_MIN) --app-icon AppIcon src/ios/icons/Assets.xcassets src/ios/icons/*.png --output-partial-info-plist out/actool.plist cp src/ios/distribution.mobileprovision out/Payload/tildefriends.app/embedded.mobileprovision xcrun -sdk iphoneos codesign -f -s 'Apple Distribution' --entitlements src/ios/Entitlements.plist --generate-entitlement-der out/Payload/tildefriends.app cd out; zip -r tildefriends.ipa Payload; cd .. diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/100.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/100.png new file mode 100644 index 000000000..67b57c283 Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/100.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/1024.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/1024.png new file mode 100644 index 000000000..b1359c853 Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/114.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/114.png new file mode 100644 index 000000000..ec3d137f5 Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/114.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/120.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/120.png new file mode 100644 index 000000000..6596bf01b Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/120.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/144.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/144.png new file mode 100644 index 000000000..c31ce20b7 Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/144.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/152.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/152.png new file mode 100644 index 000000000..d25c78128 Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/152.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/167.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/167.png new file mode 100644 index 000000000..964311995 Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/167.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/180.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/180.png new file mode 100644 index 000000000..d6459fd67 Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/180.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/20.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/20.png new file mode 100644 index 000000000..25e8d65e6 Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/20.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/29.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/29.png new file mode 100644 index 000000000..771295721 Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/29.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/40.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/40.png new file mode 100644 index 000000000..dcf2e4405 Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/40.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/50.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/50.png new file mode 100644 index 000000000..bc6efdf98 Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/50.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/57.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/57.png new file mode 100644 index 000000000..c0fb6ee71 Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/57.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/58.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/58.png new file mode 100644 index 000000000..e6153d5a8 Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/58.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/60.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/60.png new file mode 100644 index 000000000..ce6168adf Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/60.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/72.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/72.png new file mode 100644 index 000000000..58335ce82 Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/72.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/76.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/76.png new file mode 100644 index 000000000..02be1a45e Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/76.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/80.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/80.png new file mode 100644 index 000000000..2b234b5d2 Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/80.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/87.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/87.png new file mode 100644 index 000000000..0486332f3 Binary files /dev/null and b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/87.png differ diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/Contents.json b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/Contents.json index aff4124e0..65b74d7ef 100644 --- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1 +1 @@ -{"images":[{"idiom":"ios-marketing","scale":"1x","size":"1024x1024","filename":"icon-ios-marketing-1-1024-1024.png"}],"info":{"author":"xcode","version":1}} \ No newline at end of file +{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"}]} \ No newline at end of file diff --git a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/icon-ios-marketing-1-1024-1024.png b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/icon-ios-marketing-1-1024-1024.png deleted file mode 100644 index 0484a9c2b..000000000 Binary files a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/icon-ios-marketing-1-1024-1024.png and /dev/null differ diff --git a/src/ios/icons/Assets.xcassets/Contents.json b/src/ios/icons/Assets.xcassets/Contents.json deleted file mode 100644 index 77aed3d43..000000000 --- a/src/ios/icons/Assets.xcassets/Contents.json +++ /dev/null @@ -1 +0,0 @@ -{"info": {"version": 1, "author": "xcode"}} \ No newline at end of file diff --git a/src/ios/icons/android/mipmap-hdpi.png b/src/ios/icons/android/mipmap-hdpi.png deleted file mode 100644 index 934f133b8..000000000 Binary files a/src/ios/icons/android/mipmap-hdpi.png and /dev/null differ diff --git a/src/ios/icons/android/mipmap-ldpi.png b/src/ios/icons/android/mipmap-ldpi.png deleted file mode 100644 index ddb48f0e5..000000000 Binary files a/src/ios/icons/android/mipmap-ldpi.png and /dev/null differ diff --git a/src/ios/icons/android/mipmap-mdpi.png b/src/ios/icons/android/mipmap-mdpi.png deleted file mode 100644 index d83847bdc..000000000 Binary files a/src/ios/icons/android/mipmap-mdpi.png and /dev/null differ diff --git a/src/ios/icons/android/mipmap-xhdpi.png b/src/ios/icons/android/mipmap-xhdpi.png deleted file mode 100644 index 375a2d094..000000000 Binary files a/src/ios/icons/android/mipmap-xhdpi.png and /dev/null differ diff --git a/src/ios/icons/android/mipmap-xxhdpi.png b/src/ios/icons/android/mipmap-xxhdpi.png deleted file mode 100644 index cf75b46a1..000000000 Binary files a/src/ios/icons/android/mipmap-xxhdpi.png and /dev/null differ diff --git a/src/ios/icons/android/mipmap-xxxhdpi.png b/src/ios/icons/android/mipmap-xxxhdpi.png deleted file mode 100644 index 5917d13dc..000000000 Binary files a/src/ios/icons/android/mipmap-xxxhdpi.png and /dev/null differ diff --git a/src/ios/icons/appstore.png b/src/ios/icons/appstore.png new file mode 100644 index 000000000..b1359c853 Binary files /dev/null and b/src/ios/icons/appstore.png differ diff --git a/src/ios/icons/ios/100.png b/src/ios/icons/ios/100.png deleted file mode 100644 index 0928ae795..000000000 Binary files a/src/ios/icons/ios/100.png and /dev/null differ diff --git a/src/ios/icons/ios/114.png b/src/ios/icons/ios/114.png deleted file mode 100644 index 4ea7cfa9a..000000000 Binary files a/src/ios/icons/ios/114.png and /dev/null differ diff --git a/src/ios/icons/ios/128.png b/src/ios/icons/ios/128.png deleted file mode 100644 index d3de53dc4..000000000 Binary files a/src/ios/icons/ios/128.png and /dev/null differ diff --git a/src/ios/icons/ios/16.png b/src/ios/icons/ios/16.png deleted file mode 100644 index 3a5398bfd..000000000 Binary files a/src/ios/icons/ios/16.png and /dev/null differ diff --git a/src/ios/icons/ios/172.png b/src/ios/icons/ios/172.png deleted file mode 100644 index ca032d348..000000000 Binary files a/src/ios/icons/ios/172.png and /dev/null differ diff --git a/src/ios/icons/ios/180.png b/src/ios/icons/ios/180.png deleted file mode 100644 index ef126a780..000000000 Binary files a/src/ios/icons/ios/180.png and /dev/null differ diff --git a/src/ios/icons/ios/196.png b/src/ios/icons/ios/196.png deleted file mode 100644 index 3ec164129..000000000 Binary files a/src/ios/icons/ios/196.png and /dev/null differ diff --git a/src/ios/icons/ios/216.png b/src/ios/icons/ios/216.png deleted file mode 100644 index 9389d93ca..000000000 Binary files a/src/ios/icons/ios/216.png and /dev/null differ diff --git a/src/ios/icons/ios/256.png b/src/ios/icons/ios/256.png deleted file mode 100644 index ead37cea3..000000000 Binary files a/src/ios/icons/ios/256.png and /dev/null differ diff --git a/src/ios/icons/ios/32.png b/src/ios/icons/ios/32.png deleted file mode 100644 index 9f73ddf5b..000000000 Binary files a/src/ios/icons/ios/32.png and /dev/null differ diff --git a/src/ios/icons/ios/48.png b/src/ios/icons/ios/48.png deleted file mode 100644 index d83847bdc..000000000 Binary files a/src/ios/icons/ios/48.png and /dev/null differ diff --git a/src/ios/icons/ios/50.png b/src/ios/icons/ios/50.png deleted file mode 100644 index 16e8f03e8..000000000 Binary files a/src/ios/icons/ios/50.png and /dev/null differ diff --git a/src/ios/icons/ios/512.png b/src/ios/icons/ios/512.png deleted file mode 100644 index 4b1d7e5e2..000000000 Binary files a/src/ios/icons/ios/512.png and /dev/null differ diff --git a/src/ios/icons/ios/55.png b/src/ios/icons/ios/55.png deleted file mode 100644 index 168bc2ff4..000000000 Binary files a/src/ios/icons/ios/55.png and /dev/null differ diff --git a/src/ios/icons/ios/64.png b/src/ios/icons/ios/64.png deleted file mode 100644 index 2f12d2098..000000000 Binary files a/src/ios/icons/ios/64.png and /dev/null differ diff --git a/src/ios/icons/ios/88.png b/src/ios/icons/ios/88.png deleted file mode 100644 index 5a7a2156b..000000000 Binary files a/src/ios/icons/ios/88.png and /dev/null differ diff --git a/src/ios/icons/ios/icon-120.png b/src/ios/icons/ios/icon-120.png deleted file mode 100644 index 722574429..000000000 Binary files a/src/ios/icons/ios/icon-120.png and /dev/null differ diff --git a/src/ios/icons/ios/icon-144.png b/src/ios/icons/ios/icon-144.png deleted file mode 100644 index cf75b46a1..000000000 Binary files a/src/ios/icons/ios/icon-144.png and /dev/null differ diff --git a/src/ios/icons/ios/icon-152.png b/src/ios/icons/ios/icon-152.png deleted file mode 100644 index 70ff34a69..000000000 Binary files a/src/ios/icons/ios/icon-152.png and /dev/null differ diff --git a/src/ios/icons/ios/icon-167.png b/src/ios/icons/ios/icon-167.png deleted file mode 100644 index a1d86334e..000000000 Binary files a/src/ios/icons/ios/icon-167.png and /dev/null differ diff --git a/src/ios/icons/ios/icon-72.png b/src/ios/icons/ios/icon-72.png deleted file mode 100644 index 934f133b8..000000000 Binary files a/src/ios/icons/ios/icon-72.png and /dev/null differ diff --git a/src/ios/icons/ios/icon-76.png b/src/ios/icons/ios/icon-76.png deleted file mode 100644 index a4a2c9fc7..000000000 Binary files a/src/ios/icons/ios/icon-76.png and /dev/null differ diff --git a/src/ios/icons/ios/icon-notification.png b/src/ios/icons/ios/icon-notification.png deleted file mode 100644 index ccc719fc4..000000000 Binary files a/src/ios/icons/ios/icon-notification.png and /dev/null differ diff --git a/src/ios/icons/ios/icon-notification@2x.png b/src/ios/icons/ios/icon-notification@2x.png deleted file mode 100644 index 665b26d98..000000000 Binary files a/src/ios/icons/ios/icon-notification@2x.png and /dev/null differ diff --git a/src/ios/icons/ios/icon-notification@3x.png b/src/ios/icons/ios/icon-notification@3x.png deleted file mode 100644 index 5c7a93cba..000000000 Binary files a/src/ios/icons/ios/icon-notification@3x.png and /dev/null differ diff --git a/src/ios/icons/ios/icon-small-120.png b/src/ios/icons/ios/icon-small-120.png deleted file mode 100644 index 722574429..000000000 Binary files a/src/ios/icons/ios/icon-small-120.png and /dev/null differ diff --git a/src/ios/icons/ios/icon-small-40.png b/src/ios/icons/ios/icon-small-40.png deleted file mode 100644 index 665b26d98..000000000 Binary files a/src/ios/icons/ios/icon-small-40.png and /dev/null differ diff --git a/src/ios/icons/ios/icon-small-80.png b/src/ios/icons/ios/icon-small-80.png deleted file mode 100644 index 37e13351a..000000000 Binary files a/src/ios/icons/ios/icon-small-80.png and /dev/null differ diff --git a/src/ios/icons/ios/icon-small.png b/src/ios/icons/ios/icon-small.png deleted file mode 100644 index ff9493b37..000000000 Binary files a/src/ios/icons/ios/icon-small.png and /dev/null differ diff --git a/src/ios/icons/ios/icon-small@2x.png b/src/ios/icons/ios/icon-small@2x.png deleted file mode 100644 index ff7fca16c..000000000 Binary files a/src/ios/icons/ios/icon-small@2x.png and /dev/null differ diff --git a/src/ios/icons/ios/icon-small@3x.png b/src/ios/icons/ios/icon-small@3x.png deleted file mode 100644 index 280b9204b..000000000 Binary files a/src/ios/icons/ios/icon-small@3x.png and /dev/null differ diff --git a/src/ios/icons/ios/icon-store.png b/src/ios/icons/ios/icon-store.png deleted file mode 100644 index 0484a9c2b..000000000 Binary files a/src/ios/icons/ios/icon-store.png and /dev/null differ diff --git a/src/ios/icons/ios/icon.png b/src/ios/icons/ios/icon.png deleted file mode 100644 index d7bd2f9a9..000000000 Binary files a/src/ios/icons/ios/icon.png and /dev/null differ diff --git a/src/ios/icons/ios/icon@2x.png b/src/ios/icons/ios/icon@2x.png deleted file mode 100644 index 4ea7cfa9a..000000000 Binary files a/src/ios/icons/ios/icon@2x.png and /dev/null differ diff --git a/src/ios/icons/playstore.png b/src/ios/icons/playstore.png new file mode 100644 index 000000000..f42f06bdf Binary files /dev/null and b/src/ios/icons/playstore.png differ diff --git a/src/ios/icons/uploaded.png b/src/ios/icons/uploaded.png deleted file mode 100644 index 6a969f8c9..000000000 Binary files a/src/ios/icons/uploaded.png and /dev/null differ