[hrm] create asset catalog

conceptdev · Oct 31, 2014 · 8cc0ae1 · 8cc0ae1
1 parent 3314986
commit 8cc0ae1
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -181,3 +181,7 @@ UpgradeLog*.htm
 
 # Microsoft Fakes
 FakesAssemblies/
+
+*.userprefs
+
+*.userprefs
diff --git a/HeartRateMonitor/HeartRateMonitor.csproj b/HeartRateMonitor/HeartRateMonitor.csproj
@@ -99,13 +99,6 @@
     <Folder Include="Resources\" />
   </ItemGroup>
   <ItemGroup>
-    <BundleResource Include="Resources\Icon-60%402x.png" />
-    <BundleResource Include="Resources\Icon-76.png" />
-    <BundleResource Include="Resources\Icon-76%402x.png" />
-    <BundleResource Include="Resources\Icon-Small-40%402x.png" />
-    <BundleResource Include="Resources\Icon-Small-40.png" />
-    <BundleResource Include="Resources\Icon-Small%402x.png" />
-    <BundleResource Include="Resources\Icon-Small.png" />
     <BundleResource Include="Resources\Default-568h%402x.png" />
     <BundleResource Include="Resources\Default%402x.png" />
     <BundleResource Include="Resources\Default.png" />
@@ -117,4 +110,14 @@
   <ItemGroup>
     <InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
   </ItemGroup>
+  <ItemGroup>
+    <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Contents.json" />
+    <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-60%402x.png" />
+    <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-76.png" />
+    <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-76%402x.png" />
+    <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-Small.png" />
+    <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-Small%402x.png" />
+    <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-Small-40.png" />
+    <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-Small-40%402x.png" />
+  </ItemGroup>
 </Project>
diff --git a/HeartRateMonitor/HeartRateMonitor.userprefs b/HeartRateMonitor/HeartRateMonitor.userprefs
diff --git a/HeartRateMonitor/Info.plist b/HeartRateMonitor/Info.plist
@@ -25,17 +25,9 @@
 	<string>1</string>
 	<key>MinimumOSVersion</key>
 	<string>8.0</string>
-	<key>CFBundleIconFiles</key>
-	<array>
-		<string>Icon-60@2x</string>
-		<string>Icon-76</string>
-		<string>Icon-76@2x</string>
-		<string>Icon-Small-40@2x</string>
-		<string>Icon-Small-40</string>
-		<string>Icon-Small@2x</string>
-		<string>Icon-Small</string>
-	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
+	<key>XSAppIconAssets</key>
+	<string>Resources/Images.xcassets/AppIcons.appiconset</string>
 </dict>
 </plist>
diff --git a/HeartRateMonitor/MainScreen.cs b/HeartRateMonitor/MainScreen.cs
@@ -37,7 +37,7 @@ public class MainScreen : UIViewController
 		public override void ViewDidLoad ()
 		{	
 			base.ViewDidLoad ();
-			
+
 			#region UI controls
 			statusLabel = new UILabel (new RectangleF(10, 30, 300, 30));
 			statusLabel.Text = "waiting...";

diff --git a/HeartRateMonitor/Resources/Images.xcassets/AppIcons.appiconset/Contents.json b/HeartRateMonitor/Resources/Images.xcassets/AppIcons.appiconset/Contents.json
@@ -0,0 +1 @@
+{"images":[{"idiom":"iphone","filename":"[email protected]","size":"60x60","scale":"2x"},{"idiom":"ipad","filename":"Icon-76.png","size":"76x76","scale":"1x"},{"idiom":"ipad","filename":"[email protected]","size":"76x76","scale":"2x"},{"idiom":"iphone","filename":"Icon-Small.png","size":"29x29","scale":"1x"},{"idiom":"ipad","filename":"Icon-Small.png","size":"29x29","scale":"1x"},{"idiom":"iphone","filename":"[email protected]","size":"29x29","scale":"2x"},{"idiom":"ipad","filename":"[email protected]","size":"29x29","scale":"2x"},{"idiom":"ipad","filename":"Icon-Small-40.png","size":"40x40","scale":"1x"},{"idiom":"iphone","filename":"[email protected]","size":"40x40","scale":"2x"},{"idiom":"ipad","filename":"[email protected]","size":"40x40","scale":"2x"}],"info":{"version":1,"author":"xcode"}}
diff --git a/HeartRateMonitor/Resources/[email protected] → ...assets/AppIcons.appiconset/[email protected] b/HeartRateMonitor/Resources/[email protected] → ...assets/AppIcons.appiconset/[email protected]
diff --git a/HeartRateMonitor/Resources/Icon-76.png → ....xcassets/AppIcons.appiconset/Icon-76.png b/HeartRateMonitor/Resources/Icon-76.png → ....xcassets/AppIcons.appiconset/Icon-76.png
diff --git a/HeartRateMonitor/Resources/[email protected] → ...assets/AppIcons.appiconset/[email protected] b/HeartRateMonitor/Resources/[email protected] → ...assets/AppIcons.appiconset/[email protected]
diff --git a/HeartRateMonitor/Resources/Icon-Small-40.png → ...ets/AppIcons.appiconset/Icon-Small-40.png b/HeartRateMonitor/Resources/Icon-Small-40.png → ...ets/AppIcons.appiconset/Icon-Small-40.png
diff --git a/...ateMonitor/Resources/[email protected] → .../AppIcons.appiconset/[email protected] b/...ateMonitor/Resources/[email protected] → .../AppIcons.appiconset/[email protected]
diff --git a/HeartRateMonitor/Resources/Icon-Small.png → ...assets/AppIcons.appiconset/Icon-Small.png b/HeartRateMonitor/Resources/Icon-Small.png → ...assets/AppIcons.appiconset/Icon-Small.png
diff --git a/HeartRateMonitor/Resources/[email protected] → ...ets/AppIcons.appiconset/[email protected] b/HeartRateMonitor/Resources/[email protected] → ...ets/AppIcons.appiconset/[email protected]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"images":[{"idiom":"iphone","filename":"[email protected]","size":"60x60","scale":"2x"},{"idiom":"ipad","filename":"Icon-76.png","size":"76x76","scale":"1x"},{"idiom":"ipad","filename":"[email protected]","size":"76x76","scale":"2x"},{"idiom":"iphone","filename":"Icon-Small.png","size":"29x29","scale":"1x"},{"idiom":"ipad","filename":"Icon-Small.png","size":"29x29","scale":"1x"},{"idiom":"iphone","filename":"[email protected]","size":"29x29","scale":"2x"},{"idiom":"ipad","filename":"[email protected]","size":"29x29","scale":"2x"},{"idiom":"ipad","filename":"Icon-Small-40.png","size":"40x40","scale":"1x"},{"idiom":"iphone","filename":"[email protected]","size":"40x40","scale":"2x"},{"idiom":"ipad","filename":"[email protected]","size":"40x40","scale":"2x"}],"info":{"version":1,"author":"xcode"}}