diff --git a/Gruntfile.js b/Gruntfile.js index 4bd01513ca9..3c2064c2cd7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -210,7 +210,7 @@ module.exports = function(grunt) { files: [{ expand: true, cwd: 'webkitbuilds/', - src: ['.desktop', '../www/img/app/favicon.ico', '../www/img/app/512x512.png'], + src: ['.desktop', '../www/img/app/favicon.ico', '../resources/<%= pkg.name %>/linux/512x512.png'], dest: 'webkitbuilds/<%= pkg.title %>/linux64/', flatten: true, filter: 'isFile' @@ -223,7 +223,7 @@ module.exports = function(grunt) { platforms: ['win64', 'osx64', 'linux64'], buildDir: './webkitbuilds', version: '0.16.0', - macIcns: './www/img/app/logo.icns', + macIcns: './resources/<%= pkg.name %>/mac/app.icns', exeIco: './www/img/app/logo.ico' }, src: ['./package.json', './www/**/*'] diff --git a/app-template/apply.js b/app-template/apply.js index 4f20f052f1c..191f2b571f9 100755 --- a/app-template/apply.js +++ b/app-template/apply.js @@ -65,6 +65,10 @@ Object.keys(templates).forEach(function(k) { if(k === 'config-template.xml'){ k = 'config.xml'; } + + if (!fs.existsSync('../' + targetDir)){ + fs.mkdirSync('../' + targetDir); + } fs.writeFileSync('../' + targetDir + k, content, 'utf8'); }); diff --git a/app-template/bitpay/img/512x512.png b/app-template/bitpay/img/512x512.png deleted file mode 100755 index 19185804cfc..00000000000 Binary files a/app-template/bitpay/img/512x512.png and /dev/null differ diff --git a/app-template/bitpay/img/Background.png b/app-template/bitpay/img/Background.png deleted file mode 100644 index 7056c17cbf6..00000000000 Binary files a/app-template/bitpay/img/Background.png and /dev/null differ diff --git a/app-template/bitpay/img/logo.icns b/app-template/bitpay/img/logo.icns deleted file mode 100644 index d8f330e8f97..00000000000 Binary files a/app-template/bitpay/img/logo.icns and /dev/null differ diff --git a/app-template/build-macos.sh b/app-template/build-macos.sh index 2df04ef3af9..f214b1fb480 100755 --- a/app-template/build-macos.sh +++ b/app-template/build-macos.sh @@ -17,13 +17,18 @@ fi # set up your app name, architecture, and background image file name APP_NAME="*USERVISIBLENAME*" -DMG_BACKGROUND_IMG="Background.png" +rm dmg-background.tiff +ln -s ../resources/*PACKAGENAME*/mac/dmg-background.tiff dmg-background.tiff +rm volume-icon.icns +ln -s ../resources/*PACKAGENAME*/mac/volume-icon.icns volume-icon.icns +DMG_VOLUME_ICON="volume-icon.icns" +DMG_BACKGROUND_IMG="dmg-background.tiff" PATH_NAME="${APP_NAME}/osx64/" # you should not need to change these APP_EXE="${PATH_NAME}${APP_NAME}.app/Contents/MacOS/nwjs" -VOL_NAME="${APP_NAME}-osx" +VOL_NAME="${APP_NAME}" DMG_TMP="${VOL_NAME}-temp.dmg" DMG_FINAL="${VOL_NAME}.dmg" STAGING_DIR="tmp" @@ -95,17 +100,43 @@ DEVICE=$(hdiutil attach -readwrite -noverify "${DMG_TMP}" | \ sleep 2 # add a link to the Applications dir -echo "Add link to /Applications" +echo "Adding link to /Applications" pushd /Volumes/"${VOL_NAME}" -ln -s /Applications +# We name the symlink with a *non-breaking space* to avoid displaying extra text +ln -s /Applications " " # <- not your ordinary space popd +# "bless" the folder to open it in Finder automatically when the volume is mounted +echo "Blessing disk image" +bless --folder /Volumes/"${VOL_NAME}" --openfolder /Volumes/"${VOL_NAME}" + # add a background image +echo "Adding background to disk image" mkdir /Volumes/"${VOL_NAME}"/.background cp "${DMG_BACKGROUND_IMG}" /Volumes/"${VOL_NAME}"/.background/ +echo "Adding volume icon to disk image" +# use fileicon node_module +cp "${DMG_VOLUME_ICON}" /Volumes/"${VOL_NAME}"/.VolumeIcon.icns +`npm bin`/fileicon set /Volumes/"${VOL_NAME}"/ /Volumes/"${VOL_NAME}"/.VolumeIcon.icns + # tell the Finder to resize the window, set the background, # change the icon size, place the icons in the right position, etc. +echo "Designing the unboxing experience..." +WINDOW_X=400 +WINDOW_Y=100 +WINDOW_WIDTH=500 +WINDOW_HEIGHT=375 +ICON_SIZE=100 +ICON_LR_PADDING=140 +ICON_Y=185 + +WINDOW_RIGHT=$(expr $WINDOW_X + $WINDOW_WIDTH) +WINDOW_BOTTOM=$(expr $WINDOW_Y + $WINDOW_HEIGHT) +RIGHT_ICON_PADDING_RIGHT=$(expr $WINDOW_WIDTH - $ICON_LR_PADDING) +HIDE_X=100 # no need to exceed WINDOW_WIDTH – will only create another scrollbar +HIDE_Y=$(expr $WINDOW_HEIGHT + $ICON_SIZE) + echo ' tell application "Finder" tell disk "'${VOL_NAME}'" @@ -113,13 +144,17 @@ echo ' set current view of container window to icon view set toolbar visible of container window to false set statusbar visible of container window to false - set the bounds of container window to {400, 100, 920, 440} + set the bounds of container window to {'${WINDOW_X}', '${WINDOW_Y}', '${WINDOW_RIGHT}', '${WINDOW_BOTTOM}'} set viewOptions to the icon view options of container window set arrangement of viewOptions to not arranged - set icon size of viewOptions to 72 + set icon size of viewOptions to '${ICON_SIZE}' set background picture of viewOptions to file ".background:'${DMG_BACKGROUND_IMG}'" - set position of item "'${APP_NAME}'.app" of container window to {160, 205} - set position of item "Applications" of container window to {360, 205} + set position of item "'${APP_NAME}'.app" of container window to {'${ICON_LR_PADDING}', '${ICON_Y}'} + set position of item " " of container window to {'${RIGHT_ICON_PADDING_RIGHT}', '${ICON_Y}'} + set position of item ".background" of container window to {'${HIDE_X}', '${HIDE_Y}'} + set position of item ".VolumeIcon.icns" of container window to {'${HIDE_X}', '${HIDE_Y}'} + set position of item ".fseventsd" of container window to {'${HIDE_X}', '${HIDE_Y}'} + set position of item "Icon?" of container window to {'${HIDE_X}', '${HIDE_Y}'} close open update without registering applications diff --git a/app-template/copay/img/512x512.png b/app-template/copay/img/512x512.png deleted file mode 100755 index 8df12162993..00000000000 Binary files a/app-template/copay/img/512x512.png and /dev/null differ diff --git a/app-template/copay/img/Background.png b/app-template/copay/img/Background.png deleted file mode 100644 index 8e7f9a152e2..00000000000 Binary files a/app-template/copay/img/Background.png and /dev/null differ diff --git a/app-template/copay/img/logo.icns b/app-template/copay/img/logo.icns deleted file mode 100644 index b19117e91f0..00000000000 Binary files a/app-template/copay/img/logo.icns and /dev/null differ diff --git a/app-template/package.json b/app-template/package.json index 16130160b2c..4629b968568 100644 --- a/app-template/package.json +++ b/app-template/package.json @@ -1,4 +1,7 @@ { + "//":"Having trouble with this file? Try `npm run reset`", + "//":"Want git to ignore changes to this file? Run `npm run ignore`", + "name": "*PACKAGENAME*", "description": "*DESCRIPTION*", "author": "BitPay", @@ -79,8 +82,7 @@ "shelljs": "^0.3.0" }, "scripts": { - "preinstall": "bower install && npm install fs-extra", - "postinstall": "echo && echo \"To finish, choose a distribution by running 'npm run apply:copay' or 'npm run apply:bitpay'.\" && echo", + "postinstall": "bower install && echo && echo \"To finish, choose a distribution by running 'npm run apply:copay' or 'npm run apply:bitpay'.\" && echo", "start": "npm run build:www && ionic serve --nolivereload --nogulp -s", "start:ios": "npm run build:www && npm run build:ios && npm run open:ios", "start:android": "npm run build:www && npm run build:android && npm run run:android", @@ -98,21 +100,24 @@ "final:www": "npm run build:www-release", "final:ios": "npm run final:www && npm run build:ios-release && npm run open:ios", "final:android": "npm run final:www && npm run build:android-release && npm run run:android", - "final:desktop": "grunt desktop", - "sign:android": "rm -f platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play && ../android-sdk-macosx/build-tools/21.1.1/zipalign -v 4 platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-signed-aligned.apk", + "final:desktop": "npm run build:desktop && npm run build:macos", "run:android": "cordova run android --device", "log:android": "adb logcat | grep chromium", + "sign:android": "rm -f platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play && ../android-sdk-macosx/build-tools/21.1.1/zipalign -v 4 platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-signed-aligned.apk", "apply:copay": "cd app-template && node apply.js copay && cordova prepare", "apply:bitpay": "cd app-template && node apply.js bitpay && cordova prepare", "test": "./node_modules/.bin/grunt test-coveralls", "clean": "trash platforms && trash plugins && cordova prepare", - "clean-all": "git clean -dfx && npm install" + "ignore": "git update-index --skip-worktree package.json", + "reset": "git update-index --no-skip-worktree package.json", + "clean-all": "npm run reset && git clean -dfx" }, "devDependencies": { "cordova": "^6.3.1", "grunt": "^1.0.1", "ionic": "^2.1.0", "trash-cli": "^1.4.0", - "lodash": "^4.3.0" + "lodash": "^4.3.0", + "fileicon": "^0.1.8" } } diff --git a/package.json b/package.json index a1fb7d86553..1253e6de312 100644 --- a/package.json +++ b/package.json @@ -1,116 +1,18 @@ - { - "//":"Changes to this file will be overwritten", - "//":" Modify it in the app-template directory", - - "name": "bitpay", - "description": "Secure Bitcoin Wallet", - "author": "BitPay", - "version": "0.14.0", - "keywords": [ - "bitcoin", - "wallet", - "bitpay", - "copay", - "multisignature", - "bitcore" - ], - "main": "www/index.html", - "window": { - "title": "BitPay - Secure Bitcoin Wallet", - "icon": "www/img/icon-128.png", - "toolbar": false, - "show": true, - "visible": true, - "resizable": true, - "frame": true, - "width": 400, - "height": 650, - "position": "center", - "fullscreen": false - }, - "webkit": { - "page-cache": false, - "java": false, - "plugin": false +{ + "name": "distribution-not-selected", + "description": "Choose a distribution by running 'npm run apply:copay' or 'npm run apply:bitpay'.", + "primary-package-json": "See the tempate in app-template/package.json", + "scripts": { + "postinstall": "npm run apply:copay", + "start": "echo && echo \"Choose a distribution by running 'npm run apply:copay' or 'npm run apply:bitpay'.\" && echo", + "preapply": "npm i fs-extra && git update-index --skip-worktree package.json", + "apply:copay": "npm run preapply && cd app-template && node apply.js copay && cd .. && npm i", + "apply:bitpay": "npm run preapply && cd app-template && node apply.js bitpay && cd .. && npm i" }, - "dom_storage_quota": 200, - "id": "jid1-x7bV5evAaI1P9Q", - "homepage": "https://bitpay.com", "license": "MIT", "repository": { + "url": "git://github.com/bitpay/copay.git", "url": "git://github.com/bitpay/bitpay-wallet.git", "type": "git" - }, - "bugs": { - "url": "https://github.com/bitpay/bitpay-wallet/issues" - }, - "dependencies": { - "adm-zip": "^0.4.7", - "angular": "1.4.6", - "angular-mocks": "1.4.10", - "bezier-easing": "^2.0.3", - "bhttp": "^1.2.1", - "bitauth": "^0.3.2", - "bitcore-wallet-client": "4.3.2", - "bower": "^1.7.9", - "chai": "^3.5.0", - "cordova-android": "5.1.1", - "cordova-custom-config": "^3.0.5", - "cordova-plugin-qrscanner": "^2.3.1", - "coveralls": "^2.11.9", - "express": "^4.11.2", - "fs": "0.0.2", - "fs-extra": "^0.30.0", - "grunt-angular-gettext": "^2.2.3", - "grunt-browserify": "^5.0.0", - "grunt-cli": "^1.2.0", - "grunt-contrib-compress": "^1.3.0", - "grunt-contrib-concat": "^1.0.1", - "grunt-contrib-copy": "^1.0.0", - "grunt-contrib-uglify": "^2.0.0", - "grunt-contrib-watch": "^1.0.0", - "grunt-exec": "^1.0.0", - "grunt-nw-builder": "^2.0.3", - "grunt-sass": "^1.2.0", - "load-grunt-tasks": "^3.5.0", - "mocha": "^2.4.5", - "phantomjs-prebuilt": "^2.1.7", - "shelljs": "^0.3.0" - }, - "scripts": { - "preinstall": "bower install && npm install fs-extra", - "postinstall": "echo && echo \"To finish, choose a distribution by running 'npm run apply:copay' or 'npm run apply:bitpay'.\" && echo", - "start": "npm run build:www && ionic serve --nolivereload --nogulp -s", - "start:ios": "npm run build:www && npm run build:ios && npm run open:ios", - "start:android": "npm run build:www && npm run build:android && npm run run:android", - "start:desktop": "grunt desktop", - "watch": "grunt watch", - "build:www": "grunt", - "build:www-release": "grunt prod", - "build:ios": "cordova prepare ios && cordova build ios --debug", - "build:android": "cordova prepare android && cordova build android --debug", - "build:ios-release": "cordova prepare ios && cordova build ios --release", - "build:android-release": "cordova prepare android && cordova build android --release", - "open:ios": "open platforms/ios/*.xcodeproj", - "open:android": "open -a open -a /Applications/Android\\ Studio.app platforms/android", - "final:www": "npm run build:www-release", - "final:ios": "npm run final:www && npm run build:ios-release && npm run open:ios", - "final:android": "npm run final:www && npm run build:android-release && npm run run:android", - "final:desktop": "grunt desktop", - "sign:android": "rm -f platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play && ../android-sdk-macosx/build-tools/21.1.1/zipalign -v 4 platforms/android/build/outputs/apk/android-release-signed.apk platforms/android/build/outputs/apk/android-release-signed-aligned.apk", - "run:android": "cordova run android --device", - "log:android": "adb logcat | grep chromium", - "apply:copay": "cd app-template && node apply.js copay && cordova prepare", - "apply:bitpay": "cd app-template && node apply.js bitpay && cordova prepare", - "test": "./node_modules/.bin/grunt test-coveralls", - "clean": "trash platforms && trash plugins && cordova prepare", - "clean-all": "git clean -dfx && npm install" - }, - "devDependencies": { - "cordova": "^6.3.1", - "grunt": "^1.0.1", - "ionic": "^2.1.0", - "trash-cli": "^1.4.0", - "lodash": "^4.3.0" } } diff --git a/resources/bitpay/android/icon/drawable-hdpi-icon.png b/resources/bitpay/android/icon/drawable-hdpi-icon.png index 3ef114537a2..015ed9fbe16 100644 Binary files a/resources/bitpay/android/icon/drawable-hdpi-icon.png and b/resources/bitpay/android/icon/drawable-hdpi-icon.png differ diff --git a/resources/bitpay/android/icon/drawable-ldpi-icon.png b/resources/bitpay/android/icon/drawable-ldpi-icon.png index ddf74e8d671..e57bbcc792f 100644 Binary files a/resources/bitpay/android/icon/drawable-ldpi-icon.png and b/resources/bitpay/android/icon/drawable-ldpi-icon.png differ diff --git a/resources/bitpay/android/icon/drawable-mdpi-icon.png b/resources/bitpay/android/icon/drawable-mdpi-icon.png index 27f8f741f2c..3e1746faf2e 100644 Binary files a/resources/bitpay/android/icon/drawable-mdpi-icon.png and b/resources/bitpay/android/icon/drawable-mdpi-icon.png differ diff --git a/resources/bitpay/android/icon/drawable-xhdpi-icon.png b/resources/bitpay/android/icon/drawable-xhdpi-icon.png index cfbc36d362e..c1ee5b74021 100644 Binary files a/resources/bitpay/android/icon/drawable-xhdpi-icon.png and b/resources/bitpay/android/icon/drawable-xhdpi-icon.png differ diff --git a/resources/bitpay/android/icon/drawable-xxhdpi-icon.png b/resources/bitpay/android/icon/drawable-xxhdpi-icon.png index f39e5995795..c8365dcfc3e 100644 Binary files a/resources/bitpay/android/icon/drawable-xxhdpi-icon.png and b/resources/bitpay/android/icon/drawable-xxhdpi-icon.png differ diff --git a/resources/bitpay/android/icon/drawable-xxxhdpi-icon.png b/resources/bitpay/android/icon/drawable-xxxhdpi-icon.png index 9b657ae10b1..90b15afbd2a 100644 Binary files a/resources/bitpay/android/icon/drawable-xxxhdpi-icon.png and b/resources/bitpay/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/resources/bitpay/ios/app-store/feature-graphic-1024.png b/resources/bitpay/ios/app-store/feature-graphic-1024.png index 2d73d59e758..e706290bf4f 100644 Binary files a/resources/bitpay/ios/app-store/feature-graphic-1024.png and b/resources/bitpay/ios/app-store/feature-graphic-1024.png differ diff --git a/resources/bitpay/ios/app-store/icon-1024.png b/resources/bitpay/ios/app-store/icon-1024.png index dcd084afbc0..3eedd7063b4 100644 Binary files a/resources/bitpay/ios/app-store/icon-1024.png and b/resources/bitpay/ios/app-store/icon-1024.png differ diff --git a/resources/bitpay/ios/icon/icon-40.png b/resources/bitpay/ios/icon/icon-40.png index 553a27377d1..49ecb89a192 100644 Binary files a/resources/bitpay/ios/icon/icon-40.png and b/resources/bitpay/ios/icon/icon-40.png differ diff --git a/resources/bitpay/ios/icon/icon-40@2x.png b/resources/bitpay/ios/icon/icon-40@2x.png index bae535524b6..90aea63de5d 100644 Binary files a/resources/bitpay/ios/icon/icon-40@2x.png and b/resources/bitpay/ios/icon/icon-40@2x.png differ diff --git a/resources/bitpay/ios/icon/icon-50.png b/resources/bitpay/ios/icon/icon-50.png index 96b4f26621f..0c7dbf6d7fe 100644 Binary files a/resources/bitpay/ios/icon/icon-50.png and b/resources/bitpay/ios/icon/icon-50.png differ diff --git a/resources/bitpay/ios/icon/icon-50@2x.png b/resources/bitpay/ios/icon/icon-50@2x.png index 4a7e23e13b6..162d90e0213 100644 Binary files a/resources/bitpay/ios/icon/icon-50@2x.png and b/resources/bitpay/ios/icon/icon-50@2x.png differ diff --git a/resources/bitpay/ios/icon/icon-60.png b/resources/bitpay/ios/icon/icon-60.png index 813581fecba..e999b6f998b 100644 Binary files a/resources/bitpay/ios/icon/icon-60.png and b/resources/bitpay/ios/icon/icon-60.png differ diff --git a/resources/bitpay/ios/icon/icon-60@2x.png b/resources/bitpay/ios/icon/icon-60@2x.png index 00bc353fd2d..faddc2ff0dc 100644 Binary files a/resources/bitpay/ios/icon/icon-60@2x.png and b/resources/bitpay/ios/icon/icon-60@2x.png differ diff --git a/resources/bitpay/ios/icon/icon-60@3x.png b/resources/bitpay/ios/icon/icon-60@3x.png index 404e2fc9ea1..6b1926392fb 100644 Binary files a/resources/bitpay/ios/icon/icon-60@3x.png and b/resources/bitpay/ios/icon/icon-60@3x.png differ diff --git a/resources/bitpay/ios/icon/icon-72.png b/resources/bitpay/ios/icon/icon-72.png index 3ef114537a2..f8f770df719 100644 Binary files a/resources/bitpay/ios/icon/icon-72.png and b/resources/bitpay/ios/icon/icon-72.png differ diff --git a/resources/bitpay/ios/icon/icon-72@2x.png b/resources/bitpay/ios/icon/icon-72@2x.png index f39e5995795..a76579145c8 100644 Binary files a/resources/bitpay/ios/icon/icon-72@2x.png and b/resources/bitpay/ios/icon/icon-72@2x.png differ diff --git a/resources/bitpay/ios/icon/icon-76.png b/resources/bitpay/ios/icon/icon-76.png index b281694548f..1a10434ba8a 100644 Binary files a/resources/bitpay/ios/icon/icon-76.png and b/resources/bitpay/ios/icon/icon-76.png differ diff --git a/resources/bitpay/ios/icon/icon-76@2x.png b/resources/bitpay/ios/icon/icon-76@2x.png index 184ec521344..79c0e893e72 100644 Binary files a/resources/bitpay/ios/icon/icon-76@2x.png and b/resources/bitpay/ios/icon/icon-76@2x.png differ diff --git a/resources/bitpay/ios/icon/icon-83.5@2x.png b/resources/bitpay/ios/icon/icon-83.5@2x.png index 430be7d109c..9d65e9dd8c0 100644 Binary files a/resources/bitpay/ios/icon/icon-83.5@2x.png and b/resources/bitpay/ios/icon/icon-83.5@2x.png differ diff --git a/resources/bitpay/ios/icon/icon-small.png b/resources/bitpay/ios/icon/icon-small.png index 5be9f2a0604..3ba43105719 100644 Binary files a/resources/bitpay/ios/icon/icon-small.png and b/resources/bitpay/ios/icon/icon-small.png differ diff --git a/resources/bitpay/ios/icon/icon-small@2x.png b/resources/bitpay/ios/icon/icon-small@2x.png index 299a2b5cfb1..0c62edde793 100644 Binary files a/resources/bitpay/ios/icon/icon-small@2x.png and b/resources/bitpay/ios/icon/icon-small@2x.png differ diff --git a/resources/bitpay/ios/icon/icon-small@3x.png b/resources/bitpay/ios/icon/icon-small@3x.png index 099c921f460..2d9a9376e48 100644 Binary files a/resources/bitpay/ios/icon/icon-small@3x.png and b/resources/bitpay/ios/icon/icon-small@3x.png differ diff --git a/resources/bitpay/ios/icon/icon.png b/resources/bitpay/ios/icon/icon.png index 347b6bca4ed..f9a3b1dfde2 100644 Binary files a/resources/bitpay/ios/icon/icon.png and b/resources/bitpay/ios/icon/icon.png differ diff --git a/resources/bitpay/ios/icon/icon@2x.png b/resources/bitpay/ios/icon/icon@2x.png index 2bdc07fa3e4..947e9bf9e3e 100644 Binary files a/resources/bitpay/ios/icon/icon@2x.png and b/resources/bitpay/ios/icon/icon@2x.png differ diff --git a/resources/bitpay/ios/splash/Default-Landscape@2x~ipad.png b/resources/bitpay/ios/splash/Default-Landscape@2x~ipad.png index ccd9ed2ba45..b438f7bb234 100644 Binary files a/resources/bitpay/ios/splash/Default-Landscape@2x~ipad.png and b/resources/bitpay/ios/splash/Default-Landscape@2x~ipad.png differ diff --git a/resources/bitpay/ios/splash/Default-Portrait@2x~ipad.png b/resources/bitpay/ios/splash/Default-Portrait@2x~ipad.png index 01150bcf7ff..c4b71c2a94a 100644 Binary files a/resources/bitpay/ios/splash/Default-Portrait@2x~ipad.png and b/resources/bitpay/ios/splash/Default-Portrait@2x~ipad.png differ diff --git a/resources/bitpay/linux/512x512.png b/resources/bitpay/linux/512x512.png new file mode 100644 index 00000000000..92b75419a10 Binary files /dev/null and b/resources/bitpay/linux/512x512.png differ diff --git a/resources/bitpay/mac/app.icns b/resources/bitpay/mac/app.icns new file mode 100644 index 00000000000..7f42b46c7ff Binary files /dev/null and b/resources/bitpay/mac/app.icns differ diff --git a/resources/bitpay/mac/dmg-background.tiff b/resources/bitpay/mac/dmg-background.tiff new file mode 100644 index 00000000000..9b8ce3ab058 Binary files /dev/null and b/resources/bitpay/mac/dmg-background.tiff differ diff --git a/resources/bitpay/mac/volume-icon.icns b/resources/bitpay/mac/volume-icon.icns new file mode 100644 index 00000000000..d0f2e0184d3 Binary files /dev/null and b/resources/bitpay/mac/volume-icon.icns differ diff --git a/resources/bitpay/windows/icon/Square150x150Logo.scale-100.png b/resources/bitpay/windows/icon/Square150x150Logo.scale-100.png index 187ff1800ad..4646a054a1e 100644 Binary files a/resources/bitpay/windows/icon/Square150x150Logo.scale-100.png and b/resources/bitpay/windows/icon/Square150x150Logo.scale-100.png differ diff --git a/resources/bitpay/windows/icon/Square150x150Logo.scale-240.png b/resources/bitpay/windows/icon/Square150x150Logo.scale-240.png index 83b663430e5..aa02a7c5cd9 100644 Binary files a/resources/bitpay/windows/icon/Square150x150Logo.scale-240.png and b/resources/bitpay/windows/icon/Square150x150Logo.scale-240.png differ diff --git a/resources/bitpay/windows/icon/Square30x30Logo.scale-100.png b/resources/bitpay/windows/icon/Square30x30Logo.scale-100.png index 26b06d14da2..2fa06c01e42 100644 Binary files a/resources/bitpay/windows/icon/Square30x30Logo.scale-100.png and b/resources/bitpay/windows/icon/Square30x30Logo.scale-100.png differ diff --git a/resources/bitpay/windows/icon/Square310x310Logo.scale-100.png b/resources/bitpay/windows/icon/Square310x310Logo.scale-100.png index 8157616e843..4ed2c4181e0 100644 Binary files a/resources/bitpay/windows/icon/Square310x310Logo.scale-100.png and b/resources/bitpay/windows/icon/Square310x310Logo.scale-100.png differ diff --git a/resources/bitpay/windows/icon/Square44x44Logo.scale-100.png b/resources/bitpay/windows/icon/Square44x44Logo.scale-100.png index 5673d305723..c37a539cef5 100644 Binary files a/resources/bitpay/windows/icon/Square44x44Logo.scale-100.png and b/resources/bitpay/windows/icon/Square44x44Logo.scale-100.png differ diff --git a/resources/bitpay/windows/icon/Square44x44Logo.scale-240.png b/resources/bitpay/windows/icon/Square44x44Logo.scale-240.png index ee6eb9a4123..50985828222 100644 Binary files a/resources/bitpay/windows/icon/Square44x44Logo.scale-240.png and b/resources/bitpay/windows/icon/Square44x44Logo.scale-240.png differ diff --git a/resources/bitpay/windows/icon/Square70x70Logo.scale-100.png b/resources/bitpay/windows/icon/Square70x70Logo.scale-100.png index 57bec27593f..ddc186470da 100644 Binary files a/resources/bitpay/windows/icon/Square70x70Logo.scale-100.png and b/resources/bitpay/windows/icon/Square70x70Logo.scale-100.png differ diff --git a/resources/bitpay/windows/icon/Square71x71Logo.scale-100.png b/resources/bitpay/windows/icon/Square71x71Logo.scale-100.png index f78ce05168a..5d1a62218e6 100644 Binary files a/resources/bitpay/windows/icon/Square71x71Logo.scale-100.png and b/resources/bitpay/windows/icon/Square71x71Logo.scale-100.png differ diff --git a/resources/bitpay/windows/icon/Square71x71Logo.scale-240.png b/resources/bitpay/windows/icon/Square71x71Logo.scale-240.png index 2ebebf328d6..7010f24c170 100644 Binary files a/resources/bitpay/windows/icon/Square71x71Logo.scale-240.png and b/resources/bitpay/windows/icon/Square71x71Logo.scale-240.png differ diff --git a/resources/bitpay/windows/icon/StoreLogo.scale-100.png b/resources/bitpay/windows/icon/StoreLogo.scale-100.png index 96b4f26621f..0c7dbf6d7fe 100644 Binary files a/resources/bitpay/windows/icon/StoreLogo.scale-100.png and b/resources/bitpay/windows/icon/StoreLogo.scale-100.png differ diff --git a/resources/bitpay/windows/icon/StoreLogo.scale-240.png b/resources/bitpay/windows/icon/StoreLogo.scale-240.png index 00bc353fd2d..faddc2ff0dc 100644 Binary files a/resources/bitpay/windows/icon/StoreLogo.scale-240.png and b/resources/bitpay/windows/icon/StoreLogo.scale-240.png differ diff --git a/resources/bitpay/windows/icon/Wide310x150Logo.scale-100.png b/resources/bitpay/windows/icon/Wide310x150Logo.scale-100.png index 63b58bb2408..8a6dd5ac47d 100644 Binary files a/resources/bitpay/windows/icon/Wide310x150Logo.scale-100.png and b/resources/bitpay/windows/icon/Wide310x150Logo.scale-100.png differ diff --git a/resources/bitpay/windows/icon/Wide310x150Logo.scale-240.png b/resources/bitpay/windows/icon/Wide310x150Logo.scale-240.png index 5772b37edd9..d5cdfe5fb6c 100644 Binary files a/resources/bitpay/windows/icon/Wide310x150Logo.scale-240.png and b/resources/bitpay/windows/icon/Wide310x150Logo.scale-240.png differ diff --git a/resources/copay/android/app-store/feature-graphic-1024.png b/resources/copay/android/app-store/feature-graphic-1024.png index 2fafddae7c2..a20fa1ce2e3 100644 Binary files a/resources/copay/android/app-store/feature-graphic-1024.png and b/resources/copay/android/app-store/feature-graphic-1024.png differ diff --git a/resources/copay/android/icon/drawable-hdpi-icon.png b/resources/copay/android/icon/drawable-hdpi-icon.png index 02126994a85..8ae109ea8a7 100644 Binary files a/resources/copay/android/icon/drawable-hdpi-icon.png and b/resources/copay/android/icon/drawable-hdpi-icon.png differ diff --git a/resources/copay/android/icon/drawable-ldpi-icon.png b/resources/copay/android/icon/drawable-ldpi-icon.png index 0c5c1f3943d..96c0d167d45 100644 Binary files a/resources/copay/android/icon/drawable-ldpi-icon.png and b/resources/copay/android/icon/drawable-ldpi-icon.png differ diff --git a/resources/copay/android/icon/drawable-mdpi-icon.png b/resources/copay/android/icon/drawable-mdpi-icon.png index a0245f10f68..c7991ebc0c1 100644 Binary files a/resources/copay/android/icon/drawable-mdpi-icon.png and b/resources/copay/android/icon/drawable-mdpi-icon.png differ diff --git a/resources/copay/android/icon/drawable-xhdpi-icon.png b/resources/copay/android/icon/drawable-xhdpi-icon.png index 601f36a33e5..c4f6914b22f 100644 Binary files a/resources/copay/android/icon/drawable-xhdpi-icon.png and b/resources/copay/android/icon/drawable-xhdpi-icon.png differ diff --git a/resources/copay/android/icon/drawable-xxhdpi-icon.png b/resources/copay/android/icon/drawable-xxhdpi-icon.png index b424e90bb36..204555da3f9 100644 Binary files a/resources/copay/android/icon/drawable-xxhdpi-icon.png and b/resources/copay/android/icon/drawable-xxhdpi-icon.png differ diff --git a/resources/copay/android/icon/drawable-xxxhdpi-icon.png b/resources/copay/android/icon/drawable-xxxhdpi-icon.png index b761ab519ab..6667aab7ca9 100644 Binary files a/resources/copay/android/icon/drawable-xxxhdpi-icon.png and b/resources/copay/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/resources/copay/ios/app-store/icon-1024.png b/resources/copay/ios/app-store/icon-1024.png index fa9f82a110d..d0e204acb54 100644 Binary files a/resources/copay/ios/app-store/icon-1024.png and b/resources/copay/ios/app-store/icon-1024.png differ diff --git a/resources/copay/ios/splash/Default-Landscape@2x~ipad.png b/resources/copay/ios/splash/Default-Landscape@2x~ipad.png index 8985d03833a..884d65be6e4 100644 Binary files a/resources/copay/ios/splash/Default-Landscape@2x~ipad.png and b/resources/copay/ios/splash/Default-Landscape@2x~ipad.png differ diff --git a/resources/copay/ios/splash/Default-Portrait@2x~ipad.png b/resources/copay/ios/splash/Default-Portrait@2x~ipad.png index 8ea39983eb4..a389944ff55 100644 Binary files a/resources/copay/ios/splash/Default-Portrait@2x~ipad.png and b/resources/copay/ios/splash/Default-Portrait@2x~ipad.png differ diff --git a/resources/copay/linux/512x512.png b/resources/copay/linux/512x512.png new file mode 100644 index 00000000000..cba4cf27a6b Binary files /dev/null and b/resources/copay/linux/512x512.png differ diff --git a/resources/copay/mac/app.icns b/resources/copay/mac/app.icns new file mode 100644 index 00000000000..466d76ac6be Binary files /dev/null and b/resources/copay/mac/app.icns differ diff --git a/resources/copay/mac/dmg-background.tiff b/resources/copay/mac/dmg-background.tiff new file mode 100644 index 00000000000..6c6a4b34b99 Binary files /dev/null and b/resources/copay/mac/dmg-background.tiff differ diff --git a/resources/copay/mac/volume-icon.icns b/resources/copay/mac/volume-icon.icns new file mode 100644 index 00000000000..1f443a01d12 Binary files /dev/null and b/resources/copay/mac/volume-icon.icns differ diff --git a/resources/generate.sh b/resources/generate.sh new file mode 100644 index 00000000000..51e7c1dad2b --- /dev/null +++ b/resources/generate.sh @@ -0,0 +1,28 @@ +# This script requires Sketch on macOS – see readme.md for details + +# export all slices marked for export to the proper directory +echo "Exporting all assets from src.sketch..." +sketchtool export layers src.sketch + +function postprocess { + echo "Beginning postprocessing for $1..." + + echo "Postprocessing assets for macOS..." + iconset $1 app + iconset $1 volume-icon + + echo "Creating Retina-ready DMG background..." + tiffutil -cathidpicheck $1/mac/dmg-background.png $1/mac/dmg-background@2x.png -out $1/mac/dmg-background.tiff + echo "Removing raw background pngs..." + rm $1/mac/dmg-background.png $1/mac/dmg-background@2x.png +} + +function iconset { + echo "Converting $1 $2 iconset to icns..." + iconutil --convert icns $1/mac/$2.iconset --output $1/mac/$2.icns + echo "Removing $1 $2 iconset..." + rm -r $1/mac/$2.iconset +} + +postprocess copay +postprocess bitpay diff --git a/resources/install.sh b/resources/install.sh new file mode 100644 index 00000000000..15d7b59388a --- /dev/null +++ b/resources/install.sh @@ -0,0 +1,2 @@ +# This installs sketchtool: https://www.sketchapp.com/tool/ +sh /Applications/Sketch.app/Contents/Resources/sketchtool/install.sh diff --git a/resources/readme.md b/resources/readme.md new file mode 100644 index 00000000000..02c29f7af95 --- /dev/null +++ b/resources/readme.md @@ -0,0 +1,29 @@ +# Copay Project Resources + +This directory contains a `src.sketch` file from which all other assets are exported or derived. + +## Requirements + +You'll need [Sketch](https://www.sketchapp.com/) to make any changes to this directory. + +Sketch is only available for macOS, and several processes in `generate.sh` require utilities that ship with the OS, so this process must be performed on macOS. + +## Install sketchtool + +If you do not have `sketchtool` installed, you'll first need to install it. + +```sh +install.sh +``` + +## Generate assets + +To make an update, first make the change in `src.sketch`, then run: + +```sh +sh generate.sh +``` + +## Commit the changes + +Be sure to commit the modified `src.sketch`, as well as any modified exported assets. diff --git a/resources/src.sketch b/resources/src.sketch index d46ff057337..1c50f9c474c 100644 Binary files a/resources/src.sketch and b/resources/src.sketch differ diff --git a/webkitbuilds/Background.png b/webkitbuilds/Background.png deleted file mode 120000 index 3c2950b393d..00000000000 --- a/webkitbuilds/Background.png +++ /dev/null @@ -1 +0,0 @@ -../www/img/app/Background.png \ No newline at end of file diff --git a/webkitbuilds/README.md b/webkitbuilds/README.md deleted file mode 100644 index 139597f9cb0..00000000000 --- a/webkitbuilds/README.md +++ /dev/null @@ -1,2 +0,0 @@ - -