diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_128x128.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_128x128.png index 62a21fe2..eb8e26ce 100644 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_128x128.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_128x128.png differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png index 96610d57..ef7cfa27 100644 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_16x16.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_16x16.png index 680965a8..7b2702d3 100644 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_16x16.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_16x16.png differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png index aba97379..b2d66af9 100644 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_256x256.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_256x256.png index 96610d57..ef7cfa27 100644 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_256x256.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_256x256.png differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png index 4aba9c1b..9c44abf6 100644 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_32x32.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_32x32.png index aba97379..b2d66af9 100644 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_32x32.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_32x32.png differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png index 946c7a72..a493fd56 100644 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_512x512.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_512x512.png index 9832bb7f..9c44abf6 100644 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_512x512.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_512x512.png differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png index 5a3e887e..3d18b7d8 100644 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png differ diff --git a/MasterPassword/Resources/Media/iTunesArtwork.png b/MasterPassword/Resources/Media/ios-icon.png similarity index 100% rename from MasterPassword/Resources/Media/iTunesArtwork.png rename to MasterPassword/Resources/Media/ios-icon.png diff --git a/MasterPassword/Resources/Media/iTunesArtwork@2x.png b/MasterPassword/Resources/Media/ios-icon@2x.png similarity index 100% rename from MasterPassword/Resources/Media/iTunesArtwork@2x.png rename to MasterPassword/Resources/Media/ios-icon@2x.png diff --git a/MasterPassword/Resources/Media/mac-icon.png b/MasterPassword/Resources/Media/mac-icon.png new file mode 100644 index 00000000..9c44abf6 Binary files /dev/null and b/MasterPassword/Resources/Media/mac-icon.png differ diff --git a/MasterPassword/Resources/Media/mac-icon@2x.png b/MasterPassword/Resources/Media/mac-icon@2x.png new file mode 100644 index 00000000..b7d560e6 Binary files /dev/null and b/MasterPassword/Resources/Media/mac-icon@2x.png differ diff --git a/MasterPassword/Resources/Raw/MasterPassword.sketch/Data b/MasterPassword/Resources/Raw/MasterPassword.sketch/Data index f94ee931..d867b8eb 100644 Binary files a/MasterPassword/Resources/Raw/MasterPassword.sketch/Data and b/MasterPassword/Resources/Raw/MasterPassword.sketch/Data differ diff --git a/MasterPassword/Resources/Raw/MasterPassword.sketch/metadata b/MasterPassword/Resources/Raw/MasterPassword.sketch/metadata index c2e128c1..2959dfa6 100644 --- a/MasterPassword/Resources/Raw/MasterPassword.sketch/metadata +++ b/MasterPassword/Resources/Raw/MasterPassword.sketch/metadata @@ -17,7 +17,7 @@ Inconsolata length - 76976 + 101442 version 37 diff --git a/Scripts/convertImages b/Scripts/convertImages index 3e1893f7..1f6648d0 100755 --- a/Scripts/convertImages +++ b/Scripts/convertImages @@ -16,34 +16,35 @@ downsize() { inf "Converting appiconsets" declare -A icons=( - ["Icon-60@2x.png"]=120 - ["Icon-40@2x.png"]=80 - ["Icon-40~ipad.png"]=40 - ["Icon-40~ipad@2x.png"]=80 - ["Icon-Small@2x.png"]=58 - ["Icon-Small~ipad.png"]=29 - ["Icon-Small~ipad@2x.png"]=58 - ["Icon-76~ipad.png"]=76 - ["Icon-76~ipad@2x.png"]=152 - ["icon_512x512.png"]=512 - ["icon_512x512@2x.png"]=1024 - ["icon_256x256@2x.png"]=512 - ["icon_256x256.png"]=256 - ["icon_128x128@2x.png"]=256 - ["icon_128x128.png"]=128 - ["icon_32x32@2x.png"]=64 - ["icon_32x32.png"]=32 - ["icon_16x16@2x.png"]=32 - ["icon_16x16.png"]=16 + ["ios-Icon-60@2x.png"]=120 + ["ios-Icon-40@2x.png"]=80 + ["ios-Icon-40~ipad.png"]=40 + ["ios-Icon-40~ipad@2x.png"]=80 + ["ios-Icon-Small@2x.png"]=58 + ["ios-Icon-Small~ipad.png"]=29 + ["ios-Icon-Small~ipad@2x.png"]=58 + ["ios-Icon-76~ipad.png"]=76 + ["ios-Icon-76~ipad@2x.png"]=152 + ["mac-icon_512x512.png"]=512 + ["mac-icon_512x512@2x.png"]=1024 + ["mac-icon_256x256@2x.png"]=512 + ["mac-icon_256x256.png"]=256 + ["mac-icon_128x128@2x.png"]=256 + ["mac-icon_128x128.png"]=128 + ["mac-icon_32x32@2x.png"]=64 + ["mac-icon_32x32.png"]=32 + ["mac-icon_16x16@2x.png"]=32 + ["mac-icon_16x16.png"]=16 ) for name in "${!icons[@]}"; do size=${icons[$name]} - file=Images.xcassets/AppIcon.appiconset/$name + source=${name%%-*}-icon@2x.png + file=Images.xcassets/AppIcon.appiconset/${name#*-} echo "$PWD/$file" - if [[ "iTunesArtwork@2x.png" -nt $file ]]; then + if [[ $source -nt $file ]]; then pinf "$file ($size px)" - downsize "iTunesArtwork@2x.png" "$file" "${size}x${size}" + downsize "$source" "$file" "${size}x${size}" fnip fi done