fix app icon in 10.12

thompsonate · Jan 2, 2018 · 9fa211f · 9fa211f
1 parent fb95681
commit 9fa211f
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 9 deletions.
diff --git a/Shifty/Assets.xcassets/shiftyCircleIcon.imageset/Contents.json b/Shifty/Assets.xcassets/shiftyCircleIcon.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "shifty-icon-small.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/...yColorIcon.imageset/shifty-icon-small.png → ...CircleIcon.imageset/shifty-icon-small.png b/...yColorIcon.imageset/shifty-icon-small.png → ...CircleIcon.imageset/shifty-icon-small.png
diff --git a/Shifty/Assets.xcassets/shiftyColorIcon.imageset/Contents.json b/Shifty/Assets.xcassets/shiftyColorIcon.imageset/Contents.json
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "shifty-icon-small.png",
+      "filename" : "shifty-color-512.png",
       "scale" : "1x"
     },
     {

diff --git a/Shifty/Assets.xcassets/shiftyColorIcon.imageset/shifty-color-512.png b/Shifty/Assets.xcassets/shiftyColorIcon.imageset/shifty-color-512.png
diff --git a/Shifty/Base.lproj/CustomTimeWindow.xib b/Shifty/Base.lproj/CustomTimeWindow.xib
@@ -32,7 +32,7 @@
                             <constraint firstAttribute="width" constant="65" id="OsD-2Y-1B9"/>
                             <constraint firstAttribute="width" secondItem="YTT-ok-XCv" secondAttribute="height" multiplier="1:1" id="kN7-u2-9WH"/>
                         </constraints>
-                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="AppIcon" id="H23-Be-uWH"/>
+                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="shiftyColorIcon" id="H23-Be-uWH"/>
                     </imageView>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="Lby-a4-HBQ">
                         <rect key="frame" x="105" y="61" width="250" height="49"/>
@@ -190,6 +190,6 @@ Gw
         </window>
     </objects>
     <resources>
-        <image name="AppIcon" width="128" height="128"/>
+        <image name="shiftyColorIcon" width="245.75999450683594" height="245.75999450683594"/>
     </resources>
 </document>
diff --git a/Shifty/Info.plist b/Shifty/Info.plist
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.2</string>
+	<string>0.5</string>
 	<key>CFBundleVersion</key>
-	<string>32</string>
+	<string>37</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/Shifty/PrefAboutViewController.swift b/Shifty/PrefAboutViewController.swift
@@ -21,7 +21,7 @@ class PrefAboutViewController: NSViewController, MASPreferencesViewController {
     var viewIdentifier: String = "PrefAboutViewController"
 
     var toolbarItemImage: NSImage? {
-        get { return #imageLiteral(resourceName: "shiftyColorIcon") }
+        get { return #imageLiteral(resourceName: "shiftyCircleIcon") }
     }
 
     var toolbarItemLabel: String? {

diff --git a/Shifty/Setup.storyboard b/Shifty/Setup.storyboard
@@ -57,7 +57,7 @@
                                     <constraint firstAttribute="width" constant="64" id="C38-De-3i5"/>
                                     <constraint firstAttribute="width" secondItem="zqM-VP-MKT" secondAttribute="height" multiplier="1:1" id="VTn-Ih-aLU"/>
                                 </constraints>
-                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="AppIcon" id="Csb-ai-sDK"/>
+                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="shiftyColorIcon" id="Csb-ai-sDK"/>
                             </imageView>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="mxU-q0-bpJ">
                                 <rect key="frame" x="93" y="317" width="265" height="36"/>
@@ -550,17 +550,17 @@ DQ
         </scene>
     </scenes>
     <resources>
-        <image name="AppIcon" width="128" height="128"/>
         <image name="NSGoLeftTemplate" width="9" height="12"/>
         <image name="NSLeftFacingTriangleTemplate" width="9" height="12"/>
         <image name="chromeIcon" width="32" height="32"/>
         <image name="menuBarScreenshot" width="362" height="155.5"/>
         <image name="safariIcon" width="32" height="32"/>
+        <image name="shiftyColorIcon" width="245.75999450683594" height="245.75999450683594"/>
         <image name="vivaldiIcon" width="32" height="32"/>
         <image name="websiteFeatureScreenshot" width="329" height="167"/>
     </resources>
     <inferredMetricsTieBreakers>
         <segue reference="RBK-ii-duJ"/>
-        <segue reference="OTp-Xx-YUK"/>
+        <segue reference="Ibe-5u-Fbi"/>
     </inferredMetricsTieBreakers>
 </document>