Skip to content
This repository has been archived by the owner on May 15, 2024. It is now read-only.

Commit

Permalink
Update Samples.iOS app to be compatible with App Store (#1508)
Browse files Browse the repository at this point in the history
  • Loading branch information
@janusw
janusw authored Nov 11, 2020
1 parent 536f20c commit 2e0ec19
Show file tree
Hide file tree
Showing 18 changed files with 275 additions and 37 deletions.
252 changes: 252 additions & 0 deletions Samples/Samples.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,252 @@
{
"images": [
{
"filename": "Icon-Small-40.png",
"size": "20x20",
"scale": "2x",
"idiom": "iphone"
},
{
"filename": "Icon-60.png",
"size": "20x20",
"scale": "3x",
"idiom": "iphone"
},
{
"filename": "Icon-Small@2x.png",
"size": "29x29",
"scale": "2x",
"idiom": "iphone"
},
{
"filename": "Icon-Small@3x.png",
"size": "29x29",
"scale": "3x",
"idiom": "iphone"
},
{
"filename": "Icon-Small-40@2x.png",
"size": "40x40",
"scale": "2x",
"idiom": "iphone"
},
{
"filename": "Icon-Small-40@3x.png",
"size": "40x40",
"scale": "3x",
"idiom": "iphone"
},
{
"filename": "Icon-60@2x.png",
"size": "60x60",
"scale": "2x",
"idiom": "iphone"
},
{
"filename": "Icon-60@3x.png",
"size": "60x60",
"scale": "3x",
"idiom": "iphone"
},
{
"size": "20x20",
"scale": "1x",
"idiom": "ipad"
},
{
"filename": "Icon-Small-40.png",
"size": "20x20",
"scale": "2x",
"idiom": "ipad"
},
{
"filename": "Icon-Small.png",
"size": "29x29",
"scale": "1x",
"idiom": "ipad"
},
{
"filename": "Icon-Small@2x.png",
"size": "29x29",
"scale": "2x",
"idiom": "ipad"
},
{
"filename": "Icon-Small-40.png",
"size": "40x40",
"scale": "1x",
"idiom": "ipad"
},
{
"filename": "Icon-Small-40@2x.png",
"size": "40x40",
"scale": "2x",
"idiom": "ipad"
},
{
"filename": "Icon-167.png",
"size": "83.5x83.5",
"scale": "2x",
"idiom": "ipad"
},
{
"filename": "Icon-76.png",
"size": "76x76",
"scale": "1x",
"idiom": "ipad"
},
{
"filename": "Icon-76@2x.png",
"size": "76x76",
"scale": "2x",
"idiom": "ipad"
},
{
"filename": "Icon-1024.png",
"size": "1024x1024",
"scale": "1x",
"idiom": "ios-marketing"
},
{
"filename": "Icon-60@2x.png",
"size": "60x60",
"scale": "2x",
"idiom": "car"
},
{
"filename": "Icon-60@3x.png",
"size": "60x60",
"scale": "3x",
"idiom": "car"
},
{
"role": "notificationCenter",
"size": "24x24",
"subtype": "38mm",
"scale": "2x",
"idiom": "watch"
},
{
"role": "notificationCenter",
"size": "27.5x27.5",
"subtype": "42mm",
"scale": "2x",
"idiom": "watch"
},
{
"role": "companionSettings",
"filename": "Icon-Small@2x.png",
"size": "29x29",
"scale": "2x",
"idiom": "watch"
},
{
"role": "companionSettings",
"filename": "Icon-Small@3x.png",
"size": "29x29",
"scale": "3x",
"idiom": "watch"
},
{
"role": "appLauncher",
"size": "40x40",
"subtype": "38mm",
"scale": "2x",
"idiom": "watch"
},
{
"role": "appLauncher",
"size": "44x44",
"subtype": "40mm",
"scale": "2x",
"idiom": "watch"
},
{
"role": "appLauncher",
"size": "50x50",
"subtype": "44mm",
"scale": "2x",
"idiom": "watch"
},
{
"role": "quickLook",
"size": "86x86",
"subtype": "38mm",
"scale": "2x",
"idiom": "watch"
},
{
"role": "quickLook",
"size": "98x98",
"subtype": "42mm",
"scale": "2x",
"idiom": "watch"
},
{
"role": "quickLook",
"size": "108x108",
"subtype": "44mm",
"scale": "2x",
"idiom": "watch"
},
{
"size": "1024x1024",
"scale": "1x",
"idiom": "watch-marketing"
},
{
"size": "16x16",
"scale": "1x",
"idiom": "mac"
},
{
"size": "16x16",
"scale": "2x",
"idiom": "mac"
},
{
"size": "32x32",
"scale": "1x",
"idiom": "mac"
},
{
"size": "32x32",
"scale": "2x",
"idiom": "mac"
},
{
"size": "128x128",
"scale": "1x",
"idiom": "mac"
},
{
"size": "128x128",
"scale": "2x",
"idiom": "mac"
},
{
"size": "256x256",
"scale": "1x",
"idiom": "mac"
},
{
"size": "256x256",
"scale": "2x",
"idiom": "mac"
},
{
"size": "512x512",
"scale": "1x",
"idiom": "mac"
},
{
"size": "512x512",
"scale": "2x",
"idiom": "mac"
}
],
"info": {
"version": 1,
"author": "xcode"
}
}
Binary file added Samples/Samples.iOS/Assets.xcassets/AppIcon.appiconset/Icon-1024.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Samples/Samples.iOS/Assets.xcassets/AppIcon.appiconset/Icon-167.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 Samples/Samples.iOS/Resources/Icon-60.png → ...s.xcassets/AppIcon.appiconset/Icon-60.png
View file
File renamed without changes
0 Samples/Samples.iOS/Resources/Icon-60@2x.png → ...cassets/AppIcon.appiconset/Icon-60@2x.png
View file
File renamed without changes
0 Samples/Samples.iOS/Resources/Icon-60@3x.png → ...cassets/AppIcon.appiconset/Icon-60@3x.png
View file
File renamed without changes
0 Samples/Samples.iOS/Resources/Icon-76.png → ...s.xcassets/AppIcon.appiconset/Icon-76.png
View file
File renamed without changes
0 Samples/Samples.iOS/Resources/Icon-76@2x.png → ...cassets/AppIcon.appiconset/Icon-76@2x.png
View file
File renamed without changes
0 ...s/Samples.iOS/Resources/Icon-Small-40.png → ...sets/AppIcon.appiconset/Icon-Small-40.png
View file
File renamed without changes
0 ...amples.iOS/Resources/Icon-Small-40@2x.png → ...s/AppIcon.appiconset/Icon-Small-40@2x.png
View file
File renamed without changes
0 ...amples.iOS/Resources/Icon-Small-40@3x.png → ...s/AppIcon.appiconset/Icon-Small-40@3x.png
View file
File renamed without changes
0 Samples/Samples.iOS/Resources/Icon-Small.png → ...cassets/AppIcon.appiconset/Icon-Small.png
View file
File renamed without changes
0 ...s/Samples.iOS/Resources/Icon-Small@2x.png → ...sets/AppIcon.appiconset/Icon-Small@2x.png
View file
File renamed without changes
0 ...s/Samples.iOS/Resources/Icon-Small@3x.png → ...sets/AppIcon.appiconset/Icon-Small@3x.png
View file
File renamed without changes
22 changes: 3 additions & 19 deletions Samples/Samples.iOS/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,6 @@
<string>com.xamarin.essentials</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>CFBundleIconFiles</key>
<array>
<string>Icon-60@2x</string>
<string>Icon-60@3x</string>
<string>Icon-76</string>
<string>Icon-76@2x</string>
<string>Default</string>
<string>Default@2x</string>
<string>Default-568h@2x</string>
<string>Default-Portrait</string>
<string>Default-Portrait@2x</string>
<string>Icon-Small-40</string>
<string>Icon-Small-40@2x</string>
<string>Icon-Small-40@3x</string>
<string>Icon-Small</string>
<string>Icon-Small@2x</string>
<string>Icon-Small@3x</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>CFBundleName</key>
Expand All @@ -60,7 +42,7 @@
<dict>
<key>CFBundleURLSchemes</key>
<array>
<string>appcenter-APP_SECRET</string>
<string>appcenter-APP-SECRET</string>
</array>
</dict>
<dict>
Expand Down Expand Up @@ -90,5 +72,7 @@
<string>Catpure Video</string>
<key>NSContactsUsageDescription</key>
<string>Contacts</string>
<key>XSAppIconAssets</key>
<string>Assets.xcassets/AppIcon.appiconset</string>
</dict>
</plist>
Binary file removed Samples/Samples.iOS/Resources/Icon-76@3x.png
View file
Binary file not shown.
34 changes: 18 additions & 16 deletions Samples/Samples.iOS/Samples.iOS.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<MtouchArch>ARM64</MtouchArch>
<CodesignKey>iPhone Developer</CodesignKey>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchExtraArgs>--linkskip=Xamarin.Forms.Platform.iOS --linkskip=Xamarin.Forms.Platform --linkskip=Xamarin.Forms.Core --linkskip=Xamarin.Forms.Xaml --linkskip=Samples</MtouchExtraArgs>
<MtouchExtraArgs>--linkskip=Xamarin.Forms.Platform.iOS --linkskip=Xamarin.Forms.Platform --linkskip=Xamarin.Forms.Core --linkskip=Xamarin.Forms.Xaml --linkskip=Samples --optimize=force-rejected-types-removal --warn-on-type-ref=UIKit.UIWebView</MtouchExtraArgs>
<MtouchLink>Full</MtouchLink>
</PropertyGroup>
<ItemGroup>
Expand All @@ -83,11 +83,11 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Xamarin.Essentials\Xamarin.Essentials.csproj">
<Project>{63a4f6a1-48bf-4d32-aed7-82f605edb042}</Project>
<Project>{CD6D6AE6-83A1-41B1-BD7C-C555A77C288B}</Project>
<Name>Xamarin.Essentials</Name>
</ProjectReference>
<ProjectReference Include="..\Samples\Samples.csproj">
<Project>{045E53B5-3E59-4497-B996-EF6732E33ED5}</Project>
<Project>{B4227123-2EEB-494A-A221-C061B5659AED}</Project>
<Name>Samples</Name>
</ProjectReference>
</ItemGroup>
Expand All @@ -101,18 +101,6 @@
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\FileSystemTemplate.txt" />
<BundleResource Include="Resources\Icon-60%402x.png" />
<BundleResource Include="Resources\Icon-60%403x.png" />
<BundleResource Include="Resources\Icon-76.png" />
<BundleResource Include="Resources\Icon-76%402x.png" />
<BundleResource Include="Resources\Icon-Small-40.png" />
<BundleResource Include="Resources\Icon-Small-40%402x.png" />
<BundleResource Include="Resources\Icon-Small-40%403x.png" />
<BundleResource Include="Resources\Icon-Small.png" />
<BundleResource Include="Resources\Icon-Small%402x.png" />
<BundleResource Include="Resources\Icon-Small%403x.png" />
<BundleResource Include="Resources\Icon-60.png" />
<BundleResource Include="Resources\Icon-76%403x.png" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
Expand Down Expand Up @@ -142,10 +130,24 @@
<ImageAsset Include="Assets.xcassets\app_info_action_icon.imageset\app_info_action_icon%403x.png">
<Visible>false</Visible>
</ImageAsset>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-60%402x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-76.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-76%402x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small%402x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40%402x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-167.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-1024.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-60.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small%403x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-60%403x.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon-Small-40%403x.png" />
</ItemGroup>
<ItemGroup>
<Folder Include="Assets.xcassets\battery_action_icon.imageset\" />
<Folder Include="Assets.xcassets\app_info_action_icon.imageset\" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>
</Project>
4 changes: 2 additions & 2 deletions appcenter-post-clone.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ echo "Variables:"
# Updating manifest
sed -i '' "s/AC_IOS/$AC_IOS/g" $BUILD_REPOSITORY_LOCALPATH/Samples/Samples/Helpers/CommonConstants

sed -i '' "s/APP_SECRET/$APP_SECRET/g" $BUILD_REPOSITORY_LOCALPATH/Samples/Samples.iOS/Info.plist
sed -i '' "s/APP-SECRET/$APP_SECRET/g" $BUILD_REPOSITORY_LOCALPATH/Samples/Samples.iOS/Info.plist

echo "Manifest updated!"
echo "Manifest updated!"

0 comments on commit 2e0ec19

Please sign in to comment.