github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 22:23:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #17 from nventive/dev/jela/ios2

Browse source 
Adjust missing assets
This commit is contained in:
Jérôme Laban 2019-05-21 16:11:28 -04:00 • committed by GitHub
commit 8efc70802e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 47 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

65
src/Calculator.iOS/Calculator.iOS.csproj
View file

@ -128,36 +128,39 @@
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" /> <Reference Include="Xamarin.iOS" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ImageAsset Include="Media.xcassets\AppIcons.appiconset\Contents.json"> <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Contents.json">
<Visible>false</Visible> <Visible>false</Visible>
</ImageAsset> </ImageAsset>
<ImageAsset Include="Media.xcassets\AppIcons.appiconset\ios-marketing-1024x1024@1x.png"> <ImageAsset Include="Media.xcassets\AppIcons.appiconset\ios-marketing-1024x1024@1x.png">
<Visible>false</Visible> <Visible>false</Visible>
</ImageAsset> </ImageAsset>
<ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPad-76x76@2x.png"> <ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPad-76x76@2x.png">
<Visible>false</Visible> <Visible>false</Visible>
</ImageAsset> </ImageAsset>
<ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPad-84x84@2x.png"> <ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPad-84x84@2x.png">
<Visible>false</Visible> <Visible>false</Visible>
</ImageAsset> </ImageAsset>
<ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPhone-20x20@2x.png"> <ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPhone-120x120@3x.png">
<Visible>false</Visible> <Visible>false</Visible>
</ImageAsset> </ImageAsset>
<ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPhone-20x20@3x.png"> <ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPhone-152x152@3x.png">
<Visible>false</Visible> <Visible>false</Visible>
</ImageAsset> </ImageAsset>
<ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPhone-40x40@3x.png"> <ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPhone-20x20@2x.png">
<Visible>false</Visible> <Visible>false</Visible>
</ImageAsset> </ImageAsset>
<ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPhone-60x60@2x.png"> <ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPhone-20x20@3x.png">
<Visible>false</Visible> <Visible>false</Visible>
</ImageAsset> </ImageAsset>
<ImageAsset Include="Media.xcassets\LaunchImages.launchimage\Contents.json"> <ImageAsset Include="Media.xcassets\AppIcons.appiconset\iPhone-60x60@2x.png">
<Visible>false</Visible> <Visible>false</Visible>
</ImageAsset> </ImageAsset>
</ItemGroup> <ImageAsset Include="Media.xcassets\LaunchImages.launchimage\Contents.json">
<ItemGroup> <Visible>false</Visible>
</ImageAsset>
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Fonts\winjs-symbols.ttf" /> <BundleResource Include="Resources\Fonts\winjs-symbols.ttf" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -175,4 +178,4 @@
</ItemGroup> </ItemGroup>
<Import Project="..\Calculator.Shared\Calculator.Shared.projitems" Label="Shared" Condition="Exists('..\Calculator.Shared\Calculator.Shared.projitems')" /> <Import Project="..\Calculator.Shared\Calculator.Shared.projitems" Label="Shared" Condition="Exists('..\Calculator.Shared\Calculator.Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project> </Project>

26
src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/Contents.json
View file

@ -67,24 +67,12 @@
"idiom": "iphone", "idiom": "iphone",
"filename": "iPhone-20x20@3x.png" "filename": "iPhone-20x20@3x.png"
}, },
{
"scale": "3x",
"size": "40x40",
"idiom": "iphone",
"filename": "iPhone-40x40@3x.png"
},
{ {
"scale": "2x", "scale": "2x",
"size": "60x60", "size": "60x60",
"idiom": "iphone", "idiom": "iphone",
"filename": "iPhone-60x60@2x.png" "filename": "iPhone-60x60@2x.png"
}, },
{
"scale": "2x",
"size": "76x76",
"idiom": "ipad",
"filename": "iPad-76x76@2x.png squaretile-sdk-ipad.png"
},
{ {
"scale": "2x", "scale": "2x",
"size": "83.5x83.5", "size": "83.5x83.5",
@ -96,6 +84,18 @@
"size": "1024x1024", "size": "1024x1024",
"idiom": "ios-marketing", "idiom": "ios-marketing",
"filename": "ios-marketing-1024x1024@1x.png" "filename": "ios-marketing-1024x1024@1x.png"
},
{
"scale": "2x",
"size": "76x76",
"idiom": "ipad",
"filename": "iPhone-152x152@3x.png"
},
{
"scale": "3x",
"size": "40x40",
"idiom": "iphone",
"filename": "iPhone-120x120@3x.png"
} }
], ],
"properties": {}, "properties": {},
@ -103,4 +103,4 @@
"version": 1, "version": 1,
"author": "xcode" "author": "xcode"
} }
} }

BIN
src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPhone-120x120@3x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPhone-152x152@3x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
src/Calculator.iOS/Media.xcassets/AppIcons.appiconset/iPhone-40x40@3x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 971 B