diff --git a/resources/bitpay/ios/app-store/feature-graphic-1024.png b/resources/bitpay/android/app-store/feature-graphic-1024.png similarity index 100% rename from resources/bitpay/ios/app-store/feature-graphic-1024.png rename to resources/bitpay/android/app-store/feature-graphic-1024.png diff --git a/resources/bitpay/android/app-store/icon-512x512.png b/resources/bitpay/android/app-store/icon-512x512.png new file mode 100644 index 000000000..92b75419a Binary files /dev/null and b/resources/bitpay/android/app-store/icon-512x512.png differ diff --git a/resources/bitpay/windows/icon.ico b/resources/bitpay/windows/icon.ico new file mode 100644 index 000000000..4629745bd Binary files /dev/null and b/resources/bitpay/windows/icon.ico differ diff --git a/resources/copay/android/app-store/icon-512x512.png b/resources/copay/android/app-store/icon-512x512.png new file mode 100644 index 000000000..cba4cf27a Binary files /dev/null and b/resources/copay/android/app-store/icon-512x512.png differ diff --git a/resources/copay/windows/icon.ico b/resources/copay/windows/icon.ico new file mode 100644 index 000000000..b810ca475 Binary files /dev/null and b/resources/copay/windows/icon.ico differ diff --git a/resources/generate.sh b/resources/generate.sh index 51e7c1dad..0acf4b436 100644 --- a/resources/generate.sh +++ b/resources/generate.sh @@ -2,9 +2,11 @@ # export all slices marked for export to the proper directory echo "Exporting all assets from src.sketch..." +# sketchtool is installed by install.sh sketchtool export layers src.sketch function postprocess { + # $1 = distribution name echo "Beginning postprocessing for $1..." echo "Postprocessing assets for macOS..." @@ -15,6 +17,14 @@ function postprocess { 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 + + echo "Postprocessing assets for Windows..." + + echo "Combining windows/ico pngs into a single ICO file..." + # convert ships with imagemagick + convert $1/windows/ico/ico_16x16.png $1/windows/ico/ico_24x24.png $1/windows/ico/ico_32x32.png $1/windows/ico/ico_48x48.png $1/windows/ico/ico_64x64.png $1/windows/ico/ico_128x128.png $1/windows/ico/ico_256x256.png $1/windows/icon.ico + echo "Removing raw windows/ico pngs..." + rm -r $1/windows/ico/* && rmdir $1/windows/ico } function iconset { diff --git a/resources/install.sh b/resources/install.sh index 15d7b5938..37c444946 100644 --- a/resources/install.sh +++ b/resources/install.sh @@ -1,2 +1,8 @@ +echo "Installing sketchtool... (this requires Sketch.app)" # This installs sketchtool: https://www.sketchapp.com/tool/ sh /Applications/Sketch.app/Contents/Resources/sketchtool/install.sh + +echo "Installing imagemagick... (This requires Homebrew)" +# This requires Homebrew: http://brew.sh/ +brew install imagemagick +# imagemagick provides the `convert` utility, used to generate ICO files diff --git a/resources/readme.md b/resources/readme.md index dde1971dc..9d6d0f9f4 100644 --- a/resources/readme.md +++ b/resources/readme.md @@ -4,9 +4,9 @@ This directory contains a `src.sketch` file from which all other assets are expo ## Requirements -You'll need [Sketch](https://www.sketchapp.com/) to make any changes to this directory. +You'll need [Sketch](https://www.sketchapp.com/) to make any changes to this directory. You'll also need to have [Homebrew](http://brew.sh/) installed to regenerate all assets. -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. +Sketch and Homebrew are only available for macOS, and several processes in `generate.sh` require utilities that ship with macOS, so this process requires macOS. ## Install sketchtool diff --git a/resources/src.sketch b/resources/src.sketch index 212d9de82..c5af3aa96 100644 Binary files a/resources/src.sketch and b/resources/src.sketch differ