diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs
index 885ee0620e..2530f34939 100644
--- a/osu.Desktop/OsuGameDesktop.cs
+++ b/osu.Desktop/OsuGameDesktop.cs
@@ -146,9 +146,13 @@ namespace osu.Desktop
{
base.SetHost(host);
- var iconStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico");
- if (iconStream != null)
- host.Window.SetIconFromStream(iconStream);
+ // Apple operating systems use a better icon provided via external assets.
+ if (!RuntimeInfo.IsApple)
+ {
+ var iconStream = Assembly.GetExecutingAssembly().GetManifestResourceStream(GetType(), "lazer.ico");
+ if (iconStream != null)
+ host.Window.SetIconFromStream(iconStream);
+ }
host.Window.Title = Name;
}
diff --git a/osu.Game.Rulesets.Catch.Tests.iOS/Info.plist b/osu.Game.Rulesets.Catch.Tests.iOS/Info.plist
index f87043e1d1..a3b9dda48c 100644
--- a/osu.Game.Rulesets.Catch.Tests.iOS/Info.plist
+++ b/osu.Game.Rulesets.Catch.Tests.iOS/Info.plist
@@ -35,11 +35,9 @@
UIInterfaceOrientationLandscapeRight
UIInterfaceOrientationLandscapeLeft
- XSAppIconAssets
- Assets.xcassets/AppIcon.appiconset
UIApplicationSupportsIndirectInputEvents
CADisableMinimumFrameDurationOnPhone
-
\ No newline at end of file
+
diff --git a/osu.Game.Rulesets.Mania.Tests.iOS/Info.plist b/osu.Game.Rulesets.Mania.Tests.iOS/Info.plist
index 740036309f..83cb8f2e8c 100644
--- a/osu.Game.Rulesets.Mania.Tests.iOS/Info.plist
+++ b/osu.Game.Rulesets.Mania.Tests.iOS/Info.plist
@@ -35,11 +35,9 @@
UIInterfaceOrientationLandscapeRight
UIInterfaceOrientationLandscapeLeft
- XSAppIconAssets
- Assets.xcassets/AppIcon.appiconset
UIApplicationSupportsIndirectInputEvents
CADisableMinimumFrameDurationOnPhone
-
\ No newline at end of file
+
diff --git a/osu.Game.Rulesets.Osu.Tests.iOS/Info.plist b/osu.Game.Rulesets.Osu.Tests.iOS/Info.plist
index 7f489874e7..6f0ea84107 100644
--- a/osu.Game.Rulesets.Osu.Tests.iOS/Info.plist
+++ b/osu.Game.Rulesets.Osu.Tests.iOS/Info.plist
@@ -35,11 +35,9 @@
UIInterfaceOrientationLandscapeRight
UIInterfaceOrientationLandscapeLeft
- XSAppIconAssets
- Assets.xcassets/AppIcon.appiconset
UIApplicationSupportsIndirectInputEvents
CADisableMinimumFrameDurationOnPhone
-
\ No newline at end of file
+
diff --git a/osu.Game.Rulesets.Taiko.Tests.iOS/Info.plist b/osu.Game.Rulesets.Taiko.Tests.iOS/Info.plist
index 162ee75c22..1ef6b69ff3 100644
--- a/osu.Game.Rulesets.Taiko.Tests.iOS/Info.plist
+++ b/osu.Game.Rulesets.Taiko.Tests.iOS/Info.plist
@@ -35,11 +35,9 @@
UIInterfaceOrientationLandscapeRight
UIInterfaceOrientationLandscapeLeft
- XSAppIconAssets
- Assets.xcassets/AppIcon.appiconset
UIApplicationSupportsIndirectInputEvents
CADisableMinimumFrameDurationOnPhone
-
\ No newline at end of file
+
diff --git a/osu.Game.Tests.iOS/Info.plist b/osu.Game.Tests.iOS/Info.plist
index d2d0583e46..e08b9bf6e6 100644
--- a/osu.Game.Tests.iOS/Info.plist
+++ b/osu.Game.Tests.iOS/Info.plist
@@ -35,8 +35,31 @@
UIInterfaceOrientationLandscapeRight
UIInterfaceOrientationLandscapeLeft
- XSAppIconAssets
- Assets.xcassets/AppIcon.appiconset
+ CFBundleIcons~ipad
+
+ CFBundlePrimaryIcon
+
+ CFBundleIconFiles
+
+ AppIcon60x60
+
+ CFBundleIconName
+ AppIcon
+
+
+ CFBundleIcons
+
+ CFBundlePrimaryIcon
+
+ CFBundleIconFiles
+
+ AppIcon60x60
+ AppIcon76x76
+
+ CFBundleIconName
+ AppIcon
+
+
UIApplicationSupportsIndirectInputEvents
CADisableMinimumFrameDurationOnPhone
diff --git a/osu.iOS/AppIcon60x60@2x.png b/osu.iOS/AppIcon60x60@2x.png
new file mode 100644
index 0000000000..ee8f3efcfb
Binary files /dev/null and b/osu.iOS/AppIcon60x60@2x.png differ
diff --git a/osu.iOS/AppIcon76x76@2x~ipad.png b/osu.iOS/AppIcon76x76@2x~ipad.png
new file mode 100644
index 0000000000..bd437f9384
Binary files /dev/null and b/osu.iOS/AppIcon76x76@2x~ipad.png differ
diff --git a/osu.iOS/Assets.car b/osu.iOS/Assets.car
new file mode 100644
index 0000000000..b87f48c6ea
Binary files /dev/null and b/osu.iOS/Assets.car differ
diff --git a/osu.iOS/Assets.xcassets/AppIcon.appiconset/300076680-5cbe0121-ed68-414f-9ddc-dd993ac97e62.png b/osu.iOS/Assets.xcassets/AppIcon.appiconset/300076680-5cbe0121-ed68-414f-9ddc-dd993ac97e62.png
deleted file mode 100644
index 7b62835cdc..0000000000
Binary files a/osu.iOS/Assets.xcassets/AppIcon.appiconset/300076680-5cbe0121-ed68-414f-9ddc-dd993ac97e62.png and /dev/null differ
diff --git a/osu.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/osu.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index 29df54b400..0000000000
--- a/osu.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "images" : [
- {
- "filename" : "300076680-5cbe0121-ed68-414f-9ddc-dd993ac97e62.png",
- "idiom" : "universal",
- "platform" : "ios",
- "size" : "1024x1024"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
diff --git a/osu.iOS/Assets.xcassets/Contents.json b/osu.iOS/Assets.xcassets/Contents.json
deleted file mode 100644
index 4caf392f92..0000000000
--- a/osu.iOS/Assets.xcassets/Contents.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/osu.iOS/Info.plist b/osu.iOS/Info.plist
index e002949177..8d9985d279 100644
--- a/osu.iOS/Info.plist
+++ b/osu.iOS/Info.plist
@@ -49,8 +49,31 @@
UIInterfaceOrientationLandscapeRight
UIInterfaceOrientationLandscapeLeft
- XSAppIconAssets
- Assets.xcassets/AppIcon.appiconset
+ CFBundleIcons~ipad
+
+ CFBundlePrimaryIcon
+
+ CFBundleIconFiles
+
+ AppIcon60x60
+
+ CFBundleIconName
+ AppIcon
+
+
+ CFBundleIcons
+
+ CFBundlePrimaryIcon
+
+ CFBundleIconFiles
+
+ AppIcon60x60
+ AppIcon76x76
+
+ CFBundleIconName
+ AppIcon
+
+
UTExportedTypeDeclarations
diff --git a/osu.iOS/osu.iOS.csproj b/osu.iOS/osu.iOS.csproj
index 3e8beddaa4..04c00b4c35 100644
--- a/osu.iOS/osu.iOS.csproj
+++ b/osu.iOS/osu.iOS.csproj
@@ -22,6 +22,11 @@
+
+
+
+
+