diff --git a/MasterPassword/Java/masterpassword-gui/src/main/resources/media/exit b/MasterPassword/Java/masterpassword-gui/src/main/resources/media/exit deleted file mode 100644 index e69de29b..00000000 diff --git a/MasterPassword/Java/masterpassword-gui/src/main/resources/media/start b/MasterPassword/Java/masterpassword-gui/src/main/resources/media/start deleted file mode 100644 index 864f6922..00000000 --- a/MasterPassword/Java/masterpassword-gui/src/main/resources/media/start +++ /dev/null @@ -1 +0,0 @@ -3269 diff --git a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj index eecf7a85..934bdbdc 100644 --- a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj +++ b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj @@ -27,7 +27,6 @@ DA16B342170661E0000A0EAB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC632871486D95D0075AEA5 /* Security.framework */; }; DA16B344170661EE000A0EAB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA16B343170661EE000A0EAB /* Cocoa.framework */; }; DA16B345170661F2000A0EAB /* libPearl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC77CAD148291A600BCF976 /* libPearl.a */; }; - DA1E4D50176E0E280065E0EF /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DA1E4D4F176E0E280065E0EF /* Media.xcassets */; }; DA2508F119511D3600AC23F1 /* MPPasswordWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA2508F019511D3600AC23F1 /* MPPasswordWindowController.xib */; }; DA2508F719513C1400AC23F1 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA16B343170661EE000A0EAB /* Cocoa.framework */; }; DA250925195148E200AC23F1 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAEBC45214F6364500987BF6 /* QuartzCore.framework */; }; @@ -72,9 +71,9 @@ DA5E5D0B1724A667003798D8 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5CC41724A667003798D8 /* MainMenu.xib */; }; DA5E5D0C1724A667003798D8 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5CC61724A667003798D8 /* main.m */; }; DA5E5D0D1724A667003798D8 /* MasterPassword.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5CC71724A667003798D8 /* MasterPassword.xcdatamodeld */; }; - DA5E5D551724F9C8003798D8 /* MasterPassword.iconset in Resources */ = {isa = PBXBuildFile; fileRef = DA5E5D541724F9C8003798D8 /* MasterPassword.iconset */; }; DA60717C195D040500CA98B5 /* icon_gear.png in Resources */ = {isa = PBXBuildFile; fileRef = DA607092195D03E200CA98B5 /* icon_gear.png */; }; DA60717D195D040500CA98B5 /* icon_gear@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA607093195D03E200CA98B5 /* icon_gear@2x.png */; }; + DA6558A419A99609009A0BEB /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DA6558A319A99609009A0BEB /* Images.xcassets */; }; DA8ED895192906920099B726 /* PearlTween.m in Sources */ = {isa = PBXBuildFile; fileRef = DA8ED891192906920099B726 /* PearlTween.m */; }; DA8ED896192906920099B726 /* PearlTween.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8ED892192906920099B726 /* PearlTween.h */; }; DA8ED897192906920099B726 /* map-macro.h in Headers */ = {isa = PBXBuildFile; fileRef = DA8ED894192906920099B726 /* map-macro.h */; }; @@ -249,7 +248,6 @@ DA0933CF1747B91B00DE1CEF /* appstore.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = appstore.png; sourceTree = ""; }; DA16B340170661DB000A0EAB /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; DA16B343170661EE000A0EAB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; - DA1E4D4F176E0E280065E0EF /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Media.xcassets; path = MasterPassword/Media.xcassets; sourceTree = ""; }; DA2508F019511D3600AC23F1 /* MPPasswordWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MPPasswordWindowController.xib; sourceTree = ""; }; DA2508F619513C1400AC23F1 /* libRMBlurredView.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRMBlurredView.a; sourceTree = BUILT_PRODUCTS_DIR; }; DA2508F919513C1400AC23F1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -324,7 +322,6 @@ DA5E5CC91724A667003798D8 /* MasterPassword 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 2.xcdatamodel"; sourceTree = ""; }; DA5E5CCA1724A667003798D8 /* MasterPassword 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 3.xcdatamodel"; sourceTree = ""; }; DA5E5CCB1724A667003798D8 /* MasterPassword 4.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 4.xcdatamodel"; sourceTree = ""; }; - DA5E5D541724F9C8003798D8 /* MasterPassword.iconset */ = {isa = PBXFileReference; lastKnownFileType = folder.iconset; path = MasterPassword.iconset; sourceTree = ""; }; DA606FEA195D03E200CA98B5 /* icon_action.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_action.png; sourceTree = ""; }; DA606FEB195D03E200CA98B5 /* icon_action@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_action@2x.png"; sourceTree = ""; }; DA606FEC195D03E200CA98B5 /* icon_addressbook-person.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_addressbook-person.png"; sourceTree = ""; }; @@ -727,6 +724,7 @@ DA607179195D03E300CA98B5 /* icon_volume-mute@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_volume-mute@2x.png"; sourceTree = ""; }; DA60717A195D03E300CA98B5 /* icon_wrench.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_wrench.png; sourceTree = ""; }; DA60717B195D03E300CA98B5 /* icon_wrench@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_wrench@2x.png"; sourceTree = ""; }; + DA6558A319A99609009A0BEB /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; DA6701B716406A4100B61001 /* Accounts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = System/Library/Frameworks/Accounts.framework; sourceTree = SDKROOT; }; DA6701DD16406B7300B61001 /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; }; DA672D2E14F92C6B004A189C /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; @@ -936,7 +934,6 @@ DA5BFA39147E415C00F98B1E = { isa = PBXGroup; children = ( - DA1E4D4F176E0E280065E0EF /* Media.xcassets */, DA5E5C961724A667003798D8 /* ObjC */, DACA23B41705DF7D002C6C22 /* Resources */, DACA22121705DDC5002C6C22 /* External */, @@ -1537,13 +1534,13 @@ DACA23B51705DF7D002C6C22 /* Media */ = { isa = PBXGroup; children = ( + DA6558A319A99609009A0BEB /* Images.xcassets */, DA606FE9195D03E200CA98B5 /* Insignia */, DAAA81AF195A8D1300FA30D9 /* gradient.png */, DA2509261951B86C00AC23F1 /* small-screen.png */, DA2509271951B86C00AC23F1 /* screen.png */, DA0933CF1747B91B00DE1CEF /* appstore.png */, DA0933CB1747AD2D00DE1CEF /* shot-laptop-leaning-iphone.png */, - DA5E5D541724F9C8003798D8 /* MasterPassword.iconset */, DACA24161705DF7D002C6C22 /* Background */, DACA24311705DF7D002C6C22 /* Avatars */, DACA241C1705DF7D002C6C22 /* logo-bare.png */, @@ -2009,6 +2006,7 @@ DACA27141705DF81002C6C22 /* avatar-7.png in Resources */, DAF4EF57190A828100023C90 /* Exo2.0-Regular.otf in Resources */, DACA27151705DF81002C6C22 /* avatar-0.png in Resources */, + DA6558A419A99609009A0BEB /* Images.xcassets in Resources */, DACA27161705DF81002C6C22 /* avatar-12.png in Resources */, DACA27171705DF81002C6C22 /* avatar-15.png in Resources */, DAF4EF59190A828100023C90 /* Exo2.0-Bold.otf in Resources */, @@ -2021,7 +2019,6 @@ DACA271B1705DF81002C6C22 /* avatar-7@2x.png in Resources */, DACA271C1705DF81002C6C22 /* avatar-17@2x.png in Resources */, DACA271D1705DF81002C6C22 /* avatar-14.png in Resources */, - DA1E4D50176E0E280065E0EF /* Media.xcassets in Resources */, DACA271E1705DF81002C6C22 /* avatar-18@2x.png in Resources */, DACA271F1705DF81002C6C22 /* avatar-8.png in Resources */, DACA27201705DF81002C6C22 /* avatar-13.png in Resources */, @@ -2061,7 +2058,6 @@ DA5E5D081724A667003798D8 /* MasterPassword.entitlements in Resources */, DA5E5D0A1724A667003798D8 /* InfoPlist.strings in Resources */, DA5E5D0B1724A667003798D8 /* MainMenu.xib in Resources */, - DA5E5D551724F9C8003798D8 /* MasterPassword.iconset in Resources */, DA0933CC1747AD2D00DE1CEF /* shot-laptop-leaning-iphone.png in Resources */, DA0933D01747B91B00DE1CEF /* appstore.png in Resources */, ); diff --git a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/Contents.json b/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 7cd4f8e1..00000000 --- a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "images" : [ - { - "size" : "16x16", - "idiom" : "mac", - "filename" : "icon_16x16.png", - "scale" : "1x" - }, - { - "size" : "16x16", - "idiom" : "mac", - "filename" : "icon_16x16@2x.png", - "scale" : "2x" - }, - { - "size" : "32x32", - "idiom" : "mac", - "filename" : "icon_32x32.png", - "scale" : "1x" - }, - { - "size" : "32x32", - "idiom" : "mac", - "filename" : "icon_32x32@2x.png", - "scale" : "2x" - }, - { - "size" : "128x128", - "idiom" : "mac", - "filename" : "icon_128x128.png", - "scale" : "1x" - }, - { - "size" : "128x128", - "idiom" : "mac", - "filename" : "icon_128x128@2x.png", - "scale" : "2x" - }, - { - "size" : "256x256", - "idiom" : "mac", - "filename" : "icon_256x256.png", - "scale" : "1x" - }, - { - "size" : "256x256", - "idiom" : "mac", - "filename" : "icon_256x256@2x.png", - "scale" : "2x" - }, - { - "size" : "512x512", - "idiom" : "mac", - "filename" : "icon_512x512.png", - "scale" : "1x" - }, - { - "size" : "512x512", - "idiom" : "mac", - "filename" : "icon_512x512@2x.png", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_128x128.png b/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_128x128.png deleted file mode 100644 index 9ebfa432..00000000 Binary files a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_128x128.png and /dev/null differ diff --git a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_128x128@2x.png deleted file mode 100644 index aa733362..00000000 Binary files a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_128x128@2x.png and /dev/null differ diff --git a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_16x16.png b/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_16x16.png deleted file mode 100644 index 114947ee..00000000 Binary files a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_16x16.png and /dev/null differ diff --git a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_16x16@2x.png deleted file mode 100644 index bee7cd6b..00000000 Binary files a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_16x16@2x.png and /dev/null differ diff --git a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_256x256.png b/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_256x256.png deleted file mode 100644 index aa733362..00000000 Binary files a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_256x256.png and /dev/null differ diff --git a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_256x256@2x.png deleted file mode 100644 index 02a96bfd..00000000 Binary files a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_256x256@2x.png and /dev/null differ diff --git a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_32x32.png b/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_32x32.png deleted file mode 100644 index bee7cd6b..00000000 Binary files a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_32x32.png and /dev/null differ diff --git a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_32x32@2x.png deleted file mode 100644 index ee15c8bc..00000000 Binary files a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_32x32@2x.png and /dev/null differ diff --git a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_512x512.png b/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_512x512.png deleted file mode 100644 index 02a96bfd..00000000 Binary files a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_512x512.png and /dev/null differ diff --git a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_512x512@2x.png deleted file mode 100644 index 65cbc734..00000000 Binary files a/MasterPassword/ObjC/Mac/MasterPassword/Media.xcassets/AppIcon.appiconset/icon_512x512@2x.png and /dev/null differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Contents.json b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Contents.json index 61a1eaae..c4b43412 100644 --- a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,11 +1,5 @@ { "images" : [ - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-Small.png", - "scale" : "1x" - }, { "size" : "29x29", "idiom" : "iphone", @@ -18,27 +12,114 @@ "filename" : "Icon-40@2x.png", "scale" : "2x" }, - { - "size" : "57x57", - "idiom" : "iphone", - "filename" : "Icon.png", - "scale" : "1x" - }, - { - "size" : "57x57", - "idiom" : "iphone", - "filename" : "Icon@2x.png", - "scale" : "2x" - }, { "size" : "60x60", "idiom" : "iphone", "filename" : "Icon-60@2x.png", "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-Small~ipad.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-Small~ipad@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-40~ipad.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-40~ipad@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-76~ipad.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-76~ipad@2x.png", + "scale" : "2x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "icon_16x16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "icon_16x16@2x.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "icon_32x32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "icon_32x32@2x.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "icon_128x128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "icon_128x128@2x.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "icon_256x256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "icon_256x256@2x.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "icon_512x512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "icon_512x512@2x.png", + "scale" : "2x" } ], "info" : { "version" : 1, "author" : "xcode" + }, + "properties" : { + "pre-rendered" : true } } \ No newline at end of file diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-40.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-40.png index 205a46be..de0c2876 100644 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-40.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-40.png differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-40~ipad.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-40~ipad.png new file mode 100644 index 00000000..de0c2876 Binary files /dev/null and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-40~ipad.png differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-40~ipad@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-40~ipad@2x.png new file mode 100644 index 00000000..68d9e639 Binary files /dev/null and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-40~ipad@2x.png differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-60.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-60.png index 6593beba..350dbb1b 100644 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-60.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-60.png differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-72.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-72.png deleted file mode 100644 index e66be008..00000000 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-72.png and /dev/null differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png deleted file mode 100644 index 9d1da4ca..00000000 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-72@2x.png and /dev/null differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-76~ipad.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-76~ipad.png new file mode 100644 index 00000000..1fa3cb12 Binary files /dev/null and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-76~ipad.png differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-76~ipad@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-76~ipad@2x.png new file mode 100644 index 00000000..637a56b9 Binary files /dev/null and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-76~ipad@2x.png differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png deleted file mode 100644 index 5cca60b5..00000000 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png and /dev/null differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png deleted file mode 100644 index 371885ff..00000000 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png and /dev/null differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small.png index 16a44fab..f9deb443 100644 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small.png differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small~ipad.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small~ipad.png new file mode 100644 index 00000000..65da0751 Binary files /dev/null and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small~ipad.png differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small~ipad@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small~ipad@2x.png new file mode 100644 index 00000000..a840c1e0 Binary files /dev/null and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon-Small~ipad@2x.png differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon.png deleted file mode 100644 index a016e95b..00000000 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon.png and /dev/null differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon@2x.png deleted file mode 100644 index c5445477..00000000 Binary files a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/Icon@2x.png and /dev/null differ diff --git a/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_128x128.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_128x128.png new file mode 100644 index 00000000..62a21fe2 Binary files /dev/null and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_128x128.png differ diff --git a/MasterPassword/Resources/Media/MasterPassword.iconset/icon_128x128@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png similarity index 99% rename from MasterPassword/Resources/Media/MasterPassword.iconset/icon_128x128@2x.png rename to MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png index 138e2fbb..96610d57 100644 Binary files a/MasterPassword/Resources/Media/MasterPassword.iconset/icon_128x128@2x.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png differ diff --git a/MasterPassword/Resources/Media/MasterPassword.iconset/icon_16x16.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_16x16.png similarity index 91% rename from MasterPassword/Resources/Media/MasterPassword.iconset/icon_16x16.png rename to MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_16x16.png index b4d694aa..680965a8 100644 Binary files a/MasterPassword/Resources/Media/MasterPassword.iconset/icon_16x16.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_16x16.png differ diff --git a/MasterPassword/Resources/Media/MasterPassword.iconset/icon_16x16@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png similarity index 96% rename from MasterPassword/Resources/Media/MasterPassword.iconset/icon_16x16@2x.png rename to MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png index 9a148498..aba97379 100644 Binary files a/MasterPassword/Resources/Media/MasterPassword.iconset/icon_16x16@2x.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png differ diff --git a/MasterPassword/Resources/Media/MasterPassword.iconset/icon_256x256.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_256x256.png similarity index 99% rename from MasterPassword/Resources/Media/MasterPassword.iconset/icon_256x256.png rename to MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_256x256.png index 138e2fbb..96610d57 100644 Binary files a/MasterPassword/Resources/Media/MasterPassword.iconset/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/iTunesArtwork b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png similarity index 100% rename from MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/iTunesArtwork rename to MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png diff --git a/MasterPassword/Resources/Media/MasterPassword.iconset/icon_32x32.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_32x32.png similarity index 96% rename from MasterPassword/Resources/Media/MasterPassword.iconset/icon_32x32.png rename to MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_32x32.png index 9a148498..aba97379 100644 Binary files a/MasterPassword/Resources/Media/MasterPassword.iconset/icon_32x32.png and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_32x32.png differ diff --git a/MasterPassword/Resources/Media/MasterPassword.iconset/icon_32x32@2x.png b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png similarity index 96% rename from MasterPassword/Resources/Media/MasterPassword.iconset/icon_32x32@2x.png rename to MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png index 3b1cfbbb..946c7a72 100644 Binary files a/MasterPassword/Resources/Media/MasterPassword.iconset/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 new file mode 100644 index 00000000..9832bb7f Binary files /dev/null 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 new file mode 100644 index 00000000..5a3e887e Binary files /dev/null and b/MasterPassword/Resources/Media/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png differ diff --git a/MasterPassword/Resources/Media/MasterPassword.iconset/icon_128x128.png b/MasterPassword/Resources/Media/MasterPassword.iconset/icon_128x128.png deleted file mode 100644 index 810ae325..00000000 Binary files a/MasterPassword/Resources/Media/MasterPassword.iconset/icon_128x128.png and /dev/null differ diff --git a/MasterPassword/Resources/Media/MasterPassword.iconset/icon_256x256@2x.png b/MasterPassword/Resources/Media/MasterPassword.iconset/icon_256x256@2x.png deleted file mode 100644 index d8e89f80..00000000 Binary files a/MasterPassword/Resources/Media/MasterPassword.iconset/icon_256x256@2x.png and /dev/null differ diff --git a/MasterPassword/Resources/Media/MasterPassword.iconset/icon_512x512.png b/MasterPassword/Resources/Media/MasterPassword.iconset/icon_512x512.png deleted file mode 100644 index d8e89f80..00000000 Binary files a/MasterPassword/Resources/Media/MasterPassword.iconset/icon_512x512.png and /dev/null differ diff --git a/MasterPassword/Resources/Media/MasterPassword.iconset/icon_512x512@2x.png b/MasterPassword/Resources/Media/MasterPassword.iconset/icon_512x512@2x.png deleted file mode 100644 index dbd707c9..00000000 Binary files a/MasterPassword/Resources/Media/MasterPassword.iconset/icon_512x512@2x.png and /dev/null differ diff --git a/Scripts/convertImages b/Scripts/convertImages index 7973b5e6..3e1893f7 100755 --- a/Scripts/convertImages +++ b/Scripts/convertImages @@ -15,17 +15,30 @@ downsize() { inf "Converting appiconsets" -icons=( - [114]="Icon@2x.png" - [120]="Icon-60@2x.png" - [80]="Icon-40@2x.png" - [144]="Icon-72@2x.png" - [58]="Icon-Small@2x.png" - [100]="Icon-Small-50@2x.png" - [512]="iTunesArtwork" +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 ) -for size in $(reverse "${!icons[@]}"); do - file=Images.xcassets/AppIcon.appiconset/${icons[size]} +for name in "${!icons[@]}"; do + size=${icons[$name]} + file=Images.xcassets/AppIcon.appiconset/$name echo "$PWD/$file" if [[ "iTunesArtwork@2x.png" -nt $file ]]; then @@ -37,37 +50,6 @@ done -inf "Populating iconsets" -icons=( - "icon_512x512.png" - "icon_256x256@2x.png" - "icon_256x256.png" - "icon_128x128@2x.png" - "icon_128x128.png" - "icon_32x32@2x.png" - "icon_32x32.png" - "icon_16x16@2x.png" - "icon_16x16.png" -) -for iconset in *.iconset; do - [[ -d $iconset ]] || continue - - for dest in "${icons[@]}"; do - src=$iconset/icon_512x512@2x.png - dest=$iconset/$dest - IFS='_x@.' read _ _ points scale _ <<< "${dest##*/}" - [[ $scale = *[^[:digit:]]* ]] && scale=1 - size=$(( points * scale )) - - if [[ ! -e $dest || "$src" -nt "$dest" ]]; then - pinf "$src -> $dest ($size px)" - downsize "$src" "$dest" "$size" - fnip - fi - done -done - - hr inf "Converting @2x/-hd artwork" for file in ./**/*{@2x,-ipadhd,-hd}.png; do