Skip to content

Commit

Permalink
Moved icon images to xcassets archive, removed launch images as we no…
Browse files Browse the repository at this point in the history
…w use a xib file (ios 8+) , versioned for relase (#120)

Signed-off-by: Dan Cunningham <[email protected]>
  • Loading branch information
digitaldan authored Apr 24, 2017
1 parent e0120bb commit 8af8f2b
Show file tree
Hide file tree
Showing 22 changed files with 64 additions and 211 deletions.
6 changes: 3 additions & 3 deletions MainLaunchScreen.xib
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_0" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment version="1792" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<deployment version="2048" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand Down
116 changes: 32 additions & 84 deletions openHAB.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Binary file removed openHAB/[email protected]
Binary file not shown.
Binary file removed openHAB/Default-Landscape@2x~ipad.png
Binary file not shown.
Binary file removed openHAB/Default-Landscape~ipad.png
Binary file not shown.
Binary file removed openHAB/Default-Portrait@2x~ipad.png
Binary file not shown.
Binary file removed openHAB/Default-Portrait~ipad.png
Binary file not shown.
Binary file removed openHAB/Default.png
Binary file not shown.
Binary file removed openHAB/[email protected]
Binary file not shown.
30 changes: 20 additions & 10 deletions openHAB/Images.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"idiom" : "iphone",
"filename" : "icon-58x58.png",
"scale" : "2x"
},
{
Expand All @@ -21,8 +22,9 @@
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"idiom" : "iphone",
"filename" : "icon-80x80.png",
"scale" : "2x"
},
{
Expand All @@ -31,8 +33,9 @@
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"idiom" : "iphone",
"filename" : "icon-120x120.png",
"scale" : "2x"
},
{
Expand All @@ -51,38 +54,45 @@
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"idiom" : "ipad",
"filename" : "icon-29x29.png",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"idiom" : "ipad",
"filename" : "icon-58x58.png",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"idiom" : "ipad",
"filename" : "icon-40x40.png",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"idiom" : "ipad",
"filename" : "icon-80x80.png",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"idiom" : "ipad",
"filename" : "icon-76x76.png",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"idiom" : "ipad",
"filename" : "icon-152x152.png",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"idiom" : "ipad",
"filename" : "icon-167x167.png",
"scale" : "2x"
}
],
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
6 changes: 6 additions & 0 deletions openHAB/Images.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
51 changes: 0 additions & 51 deletions openHAB/Images.xcassets/LaunchImage.launchimage/Contents.json

This file was deleted.

Binary file removed openHAB/[email protected]
Binary file not shown.
66 changes: 3 additions & 63 deletions openHAB/openHAB-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,6 @@
<string>${PRODUCT_NAME}</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIcons</key>
<dict>
<key>CFBundlePrimaryIcon</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>icon-58x58</string>
<string>icon-80x80</string>
<string>icon-120x120</string>
</array>
</dict>
</dict>
<key>CFBundleIcons~ipad</key>
<dict>
<key>CFBundlePrimaryIcon</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>icon-58x58</string>
<string>icon-29x29</string>
<string>icon-80x80</string>
<string>icon-40x40</string>
<string>icon-152x152</string>
<string>icon-76x76</string>
<string>icon-120x120</string>
<string>icon-167x167</string>
</array>
</dict>
</dict>
<key>CFBundleIdentifier</key>
<string>es.spaphone.openhab</string>
<key>CFBundleInfoDictionaryVersion</key>
Expand All @@ -61,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.7.5.0</string>
<string>1.7.5.3</string>
<key>LSApplicationCategoryType</key>
<string></string>
<key>LSRequiresIPhoneOS</key>
Expand All @@ -71,39 +42,6 @@
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>UILaunchImages~ipad</key>
<array>
<dict>
<key>UILaunchImageMinimumOSVersion</key>
<string>7.0</string>
<key>UILaunchImageName</key>
<string>Default-Landscape</string>
<key>UILaunchImageOrientation</key>
<string>Landscape</string>
<key>UILaunchImageSize</key>
<string>{768, 1024}</string>
</dict>
<dict>
<key>UILaunchImageMinimumOSVersion</key>
<string>7.0</string>
<key>UILaunchImageName</key>
<string>Default-Portrait</string>
<key>UILaunchImageOrientation</key>
<string>Portrait</string>
<key>UILaunchImageSize</key>
<string>{768, 1024}</string>
</dict>
<dict>
<key>UILaunchImageMinimumOSVersion</key>
<string>7.0</string>
<key>UILaunchImageName</key>
<string>Default-Portrait</string>
<key>UILaunchImageOrientation</key>
<string>Portrait</string>
<key>UILaunchImageSize</key>
<string>{768, 1024}</string>
</dict>
</array>
<key>UILaunchStoryboardName</key>
<string>MainLaunchScreen</string>
<key>UIMainStoryboardFile</key>
Expand All @@ -114,6 +52,8 @@
<array>
<string>armv7</string>
</array>
<key>UIRequiresFullScreen</key>
<true/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
Expand Down

0 comments on commit 8af8f2b

Please sign in to comment.