diff --git a/Gruntfile.js b/Gruntfile.js index 97955c4..0073d39 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -552,7 +552,17 @@ module.exports = function(grunt) { 'img/icon-78-android.png', 'img/icon-80-ios.png', 'img/icon-87-ios.png', - 'img/icon-96-android.png' + 'img/icon-96-android.png', + 'img/Default-568h@2x~iphone.png', + 'img/Default-667h.png', + 'img/Default-736h.png', + 'img/Default-Landscape-736h.png', + 'img/Default-Landscape@2x~ipad.png', + 'img/Default-Landscape~ipad.png', + 'img/Default-Portrait@2x~ipad.png', + 'img/Default-Portrait~ipad.png', + 'img/Default@2x~iphone.png', + 'img/Default~iphone.png' ], master: ['index.html'] }, diff --git a/res/cca_build.sh b/res/cca_build.sh index ddaf425..c933a87 100755 --- a/res/cca_build.sh +++ b/res/cca_build.sh @@ -1,10 +1,18 @@ #!/bin/sh +# reads values from JSON +jsonValue() { + KEY=$1 + num=$2 + awk -F"[,:}]" '{for(i=1;i<=NF;i++){if($i~/'$KEY'\042/){print $(i+1)}}}' | tr -d '"' | sed -n ${num}p +} + # go to root cd `dirname $0` cd .. DIR=release/cca +PROJNAME=`less dist/manifest.json | jsonValue name 1 | sed -e 's/^ *//' -e 's/ *$//'` # create rm -rf $DIR @@ -15,5 +23,38 @@ cca create $DIR/Whiteout --link-to=dist/manifest.json cd $DIR/Whiteout cca prepare +# +# post-build tweaks +# + +echo "" +echo "## Running post-build tweaks" + # cp signing config -cp ../../../res/android-release-keys.properties . \ No newline at end of file +echo "Copy Android signing config" +cp ../../../res/android-release-keys.properties . + +# status bar should not overlay the web view +echo "Tweaking iOS status bar to not overlay the web view" +sed -i "" 's/StatusBarOverlaysWebView" value="true"/StatusBarOverlaysWebView" value="false"/' "platforms/ios/$PROJNAME/config.xml" + +# status bar should use dark font on light background +echo "Tweaking iOS status bar to use dark font on light background" +sed -i "" 's/StatusBarStyle" value="lightcontent"/StatusBarStyle" value="darkcontent"/' "platforms/ios/$PROJNAME/config.xml" + +# copy splash screens +echo "Copying splash screens" +cp ../../../src/img/Default* "platforms/ios/$PROJNAME/Resources/splash" + +# fixing missing/wrong icons +echo "Fixing wrong/missing iOS icons" +cp ../../../src/img/icon-60-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-60.png" +cp ../../../src/img/icon-180-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-60@3x.png" +cp ../../../src/img/icon-87-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-small@3x.png" +cp ../../../src/img/icon-120-ios.png "platforms/ios/$PROJNAME/Resources/icons/icon-40@3x.png" + +# print reminder for manual work in xcode +echo "" +echo "### Reminder for manual steps required for iOS release" +echo "### Change deployment target to iOS 8.1" +echo "### Add retina icons to build, migrate to icon set, fix splash screens config" diff --git a/src/background.js b/src/background.js index 17d0cb3..61f7e85 100644 --- a/src/background.js +++ b/src/background.js @@ -2,12 +2,7 @@ chrome.app.runtime.onLaunched.addListener(function() { - chrome.runtime.getPlatformInfo(function(info) { - // don't render statusbar over app UI on iOS - if (info.os === 'cordova-ios' && window.StatusBar) { - window.StatusBar.overlaysWebView(false); - } - + chrome.runtime.getPlatformInfo(function() { // open chrome app in new window chrome.app.window.create('index.html', { id: '0', diff --git a/src/img/Default-568h@2x~iphone.png b/src/img/Default-568h@2x~iphone.png new file mode 100644 index 0000000..6f0d4ff Binary files /dev/null and b/src/img/Default-568h@2x~iphone.png differ diff --git a/src/img/Default-667h.png b/src/img/Default-667h.png new file mode 100644 index 0000000..1e08f47 Binary files /dev/null and b/src/img/Default-667h.png differ diff --git a/src/img/Default-736h.png b/src/img/Default-736h.png new file mode 100644 index 0000000..3a743a4 Binary files /dev/null and b/src/img/Default-736h.png differ diff --git a/src/img/Default-Landscape-736h.png b/src/img/Default-Landscape-736h.png new file mode 100644 index 0000000..453f1b3 Binary files /dev/null and b/src/img/Default-Landscape-736h.png differ diff --git a/src/img/Default-Landscape@2x~ipad.png b/src/img/Default-Landscape@2x~ipad.png new file mode 100644 index 0000000..70c37f6 Binary files /dev/null and b/src/img/Default-Landscape@2x~ipad.png differ diff --git a/src/img/Default-Landscape~ipad.png b/src/img/Default-Landscape~ipad.png new file mode 100644 index 0000000..cef2cc0 Binary files /dev/null and b/src/img/Default-Landscape~ipad.png differ diff --git a/src/img/Default-Portrait@2x~ipad.png b/src/img/Default-Portrait@2x~ipad.png new file mode 100644 index 0000000..dc2b82e Binary files /dev/null and b/src/img/Default-Portrait@2x~ipad.png differ diff --git a/src/img/Default-Portrait~ipad.png b/src/img/Default-Portrait~ipad.png new file mode 100644 index 0000000..79efb8c Binary files /dev/null and b/src/img/Default-Portrait~ipad.png differ diff --git a/src/img/Default@2x~iphone.png b/src/img/Default@2x~iphone.png new file mode 100644 index 0000000..66d184a Binary files /dev/null and b/src/img/Default@2x~iphone.png differ diff --git a/src/img/Default~iphone.png b/src/img/Default~iphone.png new file mode 100644 index 0000000..115c3e5 Binary files /dev/null and b/src/img/Default~iphone.png differ