diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 819396882a..71087608e6 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -588,7 +588,6 @@ B717A820BE02C6FE2CB53F6E /* WaitlistScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B697816AF93DA06EC58C5D70 /* WaitlistScreenViewModelProtocol.swift */; }; B721125D17A0BA86794F29FB /* MockServerSelectionScreenState.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8E057FB1F07A5C201C89061 /* MockServerSelectionScreenState.swift */; }; B796A25F282C0A340D1B9C12 /* ImageRoomTimelineItemContent.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2B5EDCD05D50BA9B815C66C /* ImageRoomTimelineItemContent.swift */; }; - B80C4FABB5529DF12436FFDA /* AppIcon.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 16DC8C5B2991724903F1FA6A /* AppIcon.pdf */; }; B828C600A54B2EE20871A451 /* PerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD700E035C85738EE4B97129 /* PerformanceTests.swift */; }; B879446FD8E65A711EF8F9F7 /* AdvancedSettingsScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B63B69F9A2BC74DD40DC75C8 /* AdvancedSettingsScreenViewModel.swift */; }; B89990DD875B0B603D4D4332 /* NotificationItemProxyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B927CF5EF7FCCDA5EDC474B /* NotificationItemProxyProtocol.swift */; }; @@ -935,7 +934,6 @@ 15A657D96779D1DEB8EF1327 /* CreateRoomViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateRoomViewModel.swift; sourceTree = ""; }; 16037EE9E9A52AF37B7818E3 /* AnalyticsSettingsScreenUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsSettingsScreenUITests.swift; sourceTree = ""; }; 16D09C79746BDCD9173EB3A7 /* RoomDetailsEditScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomDetailsEditScreenModels.swift; sourceTree = ""; }; - 16DC8C5B2991724903F1FA6A /* AppIcon.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = AppIcon.pdf; sourceTree = ""; }; 1715E3D7F53C0748AA50C91C /* PostHogAnalyticsClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostHogAnalyticsClient.swift; sourceTree = ""; }; 1734A445A58ED855B977A0A8 /* TracingConfigurationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TracingConfigurationTests.swift; sourceTree = ""; }; 184CF8C196BE143AE226628D /* DecorationTimelineItemProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DecorationTimelineItemProtocol.swift; sourceTree = ""; }; @@ -1920,7 +1918,6 @@ 2774D635E78D8B98390EA694 /* Resources */ = { isa = PBXGroup; children = ( - 16DC8C5B2991724903F1FA6A /* AppIcon.pdf */, 01C4C7DB37597D7D8379511A /* Assets.xcassets */, A0C06C0F6A8621B22BFAEB56 /* Localizations */, 8AEA6A91159FA0D3EAFCCB0D /* Sounds */, @@ -4151,7 +4148,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - B80C4FABB5529DF12436FFDA /* AppIcon.pdf in Resources */, 992F5E750F5030C4BA2D0D03 /* Assets.xcassets in Resources */, 2CA6ABBC9A88EB89EA52FCCB /* ConfettiScene.scn in Resources */, B6DA66EFC13A90846B625836 /* InfoPlist.strings in Resources */, diff --git a/ElementX/Resources/AppIcon.pdf b/ElementX/Resources/AppIcon.pdf deleted file mode 100644 index 49e6a26487..0000000000 Binary files a/ElementX/Resources/AppIcon.pdf and /dev/null differ diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png new file mode 100644 index 0000000000..ff092127cc Binary files /dev/null and b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png differ diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json index f1cfba4a82..cefcc878e0 100644 --- a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "app_icon.png", + "filename" : "AppIcon.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/app_icon.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/app_icon.png deleted file mode 100644 index 3555101ff3..0000000000 Binary files a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/app_icon.png and /dev/null differ diff --git a/Tools/Scripts/README.md b/Tools/Scripts/README.md index 024858b963..4d4348e862 100644 --- a/Tools/Scripts/README.md +++ b/Tools/Scripts/README.md @@ -1,28 +1,5 @@ # Scripts -## Iconizer -Generates all app icon variants from one single .pdf file. - -Usage: -``` -sh iconizer.sh ../ElementX/Supporting\ Files/AppIcon.pdf ../ElementX/Supporting\ Files -``` - -## Localizer -Generates all app localization files and imports them to the project, by downloading strings from [element-android](https://github.com/vector-im/element-android/tree/develop/vector/src/main/res) and converting them to `strings` and `stringsdict` files. - -Usage: -``` -./localizer.py -``` - -## Boot Test Simulator -Boots a desired simulator and makes status bar overrides on that. - -Usage: -``` -./bootTestSimulator.py 'iPhone 13 Pro Max' -``` ## Create screen templates New screen flows are currently using the MVVM-Coordinator pattern. Run [Tools/Scripts/createScreen.sh](Tools/Scripts/createScreen.sh) to create a new screen and all its required dependencies. diff --git a/Tools/Scripts/iconizer.sh b/Tools/Scripts/iconizer.sh deleted file mode 100644 index baf0985c55..0000000000 --- a/Tools/Scripts/iconizer.sh +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh - -# -# Iconizer shell script by Steve Richey (srichey@floatlearning.com) -# Modified by Rich Ellis (rich@richellis.net) based on contributions on Github from crishoj, giria -# https://gist.github.com/steverichey/8493f3bd31ae71a9c933/forks -# -# This is a simple tool to generate all necessary app icon sizes and the JSON file for an *EXISTING* Xcode project from one file. -# To use: specify the path to your vector graphic (PDF format) and the path to your Xcode folder containing Assets.xcassets -# Example: sh iconizer.sh MyVectorGraphic.pdf MyXcodeProject -# -# Requires ImageMagick: http://www.imagemagick.org/ -# Requires GhostScript: http://www.ghostscript.com/ -# -# Install dependencies with Homebrew: http://brew.sh/ -# brew install imagemagic -# brew install ghostscript - -# Exit on first error -set -e - -if [ $# -ne 2 ] - then - echo "\nUsage: sh iconizer.sh file.pdf FolderName\n" -elif [ ! -e "$1" ] - then - echo "Did not find file $1, expected path to a vector image file.\n" -elif [ ${1: -4} != ".pdf" ] - then - echo "File $1 is not a vector image file! Expected PDF file.\n" -elif [ ! -d "./$2/Assets.xcassets/AppIcon.appiconset/" ] - then - echo "Did not find Xcode folder $2, expected folder which contains Assets.xcassets/AppIcon.appiconset/ \n" -elif [ ! -x "$(command -v convert)" ] - then - echo "Executable 'convert' not found in path. Please install ImageMagick." -elif [ ! -x "$(command -v gs)" ] - then - echo "Executable 'gs' not found in path. Please install GhostScript." -else - echo "Creating icons from $1 into $2/Assets.xcassets/AppIcon.appiconset/..." - - for i in 16 20 29 32 40 50 57 58 60 64 72 76 80 87 100 114 120 128 144 152 167 180 256 512 1024 - do - file_name="./$2/Assets.xcassets/AppIcon.appiconset/appicon_$i.png" - if [ ! -e "$file_name" ] - then - echo "Creating $i px icon" - convert -density 400 "$1" -scale $ix$i "$file_name" - fi - done - - echo "Created app icon files, writing Contents.json file..." - - echo '{"images":[ - -{\n"size":"1024x1024",\n"idiom":"ios-marketing",\n"filename":"appicon_1024.png",\n"scale":"1x"\n}, - - - -{\n"size":"20x20",\n"idiom":"iphone",\n"filename":"appicon_40.png",\n"scale":"2x"\n}, -{\n"size":"20x20",\n"idiom":"iphone",\n"filename":"appicon_60.png",\n"scale":"3x"\n}, - -{\n"size":"29x29",\n"idiom":"iphone",\n"filename":"appicon_29.png",\n"scale":"1x"\n}, -{\n"size":"29x29",\n"idiom":"iphone",\n"filename":"appicon_58.png",\n"scale":"2x"\n}, -{\n"size":"29x29",\n"idiom":"iphone",\n"filename":"appicon_87.png",\n"scale":"3x"\n}, - -{\n"size":"40x40",\n"idiom":"iphone",\n"filename":"appicon_80.png",\n"scale":"2x"\n}, -{\n"size":"40x40",\n"idiom":"iphone",\n"filename":"appicon_120.png",\n"scale":"3x"\n}, - -{\n"size":"57x57",\n"idiom":"iphone",\n"filename":"appicon_57.png",\n"scale":"1x"\n}, -{\n"size":"57x57",\n"idiom":"iphone",\n"filename":"appicon_114.png",\n"scale":"2x"\n}, - -{\n"size":"60x60",\n"idiom":"iphone",\n"filename":"appicon_120.png",\n"scale":"2x"\n}, -{\n"size":"60x60",\n"idiom":"iphone",\n"filename":"appicon_180.png",\n"scale":"3x"\n}, - - - -{\n"size":"20x20",\n"idiom":"ipad",\n"filename":"appicon_20.png",\n"scale":"1x"\n}, -{\n"size":"20x20",\n"idiom":"ipad",\n"filename":"appicon_40.png",\n"scale":"2x"\n}, - -{\n"size":"29x29",\n"idiom":"ipad",\n"filename":"appicon_29.png",\n"scale":"1x"\n}, -{\n"size":"29x29",\n"idiom":"ipad",\n"filename":"appicon_58.png",\n"scale":"2x"\n}, - -{\n"size":"40x40",\n"idiom":"ipad",\n"filename":"appicon_40.png",\n"scale":"1x"\n}, -{\n"size":"40x40",\n"idiom":"ipad",\n"filename":"appicon_80.png",\n"scale":"2x"\n}, - -{\n"size":"50x50",\n"idiom":"ipad",\n"filename":"appicon_50.png",\n"scale":"1x"\n}, -{\n"size":"50x50",\n"idiom":"ipad",\n"filename":"appicon_100.png",\n"scale":"2x"\n}, - -{\n"size":"72x72",\n"idiom":"ipad",\n"filename":"appicon_72.png",\n"scale":"1x"\n}, -{\n"size":"72x72",\n"idiom":"ipad",\n"filename":"appicon_144.png",\n"scale":"2x"\n}, - -{\n"size":"76x76",\n"idiom":"ipad",\n"filename":"appicon_76.png",\n"scale":"1x"\n}, -{\n"size":"76x76",\n"idiom":"ipad",\n"filename":"appicon_152.png",\n"scale":"2x"\n}, - -{\n"size":"83.5x83.5",\n"idiom":"ipad",\n"filename":"appicon_167.png",\n"scale":"2x"\n}, - - - - -{\n"size":"60x60",\n"idiom":"car",\n"filename":"appicon_120.png",\n"scale":"2x"\n}, -{\n"size":"60x60",\n"idiom":"car",\n"filename":"appicon_180.png",\n"scale":"3x"\n}, - - - - -{\n"size":"16x16",\n"idiom":"mac",\n"filename":"appicon_16.png",\n"scale":"1x"\n}, -{\n"size":"16x16",\n"idiom":"mac",\n"filename":"appicon_32.png",\n"scale":"2x"\n}, - -{\n"size":"32x32",\n"idiom":"mac",\n"filename":"appicon_32.png",\n"scale":"1x"\n}, -{\n"size":"32x32",\n"idiom":"mac",\n"filename":"appicon_64.png",\n"scale":"2x"\n}, - -{\n"size":"128x128",\n"idiom":"mac",\n"filename":"appicon_128.png",\n"scale":"1x"\n}, -{\n"size":"128x128",\n"idiom":"mac",\n"filename":"appicon_256.png",\n"scale":"2x"\n}, - -{\n"size":"256x256",\n"idiom":"mac",\n"filename":"appicon_256.png",\n"scale":"1x"\n}, -{\n"size":"256x256",\n"idiom":"mac",\n"filename":"appicon_512.png",\n"scale":"2x"\n}, - -{\n"size":"512x512",\n"idiom":"mac",\n"filename":"appicon_512.png",\n"scale":"1x"\n}, -{\n"size":"512x512",\n"idiom":"mac",\n"filename":"appicon_1024.png",\n"scale":"2x"\n}\n], - - - -"info":{\n"version":1,\n"author":"xcode"\n}\n}' > "./$2/Assets.xcassets/AppIcon.appiconset/Contents.json" - - echo "Complete!" -fi diff --git a/changelog.d/pr-1720.change b/changelog.d/pr-1720.change new file mode 100644 index 0000000000..b386d9b4ef --- /dev/null +++ b/changelog.d/pr-1720.change @@ -0,0 +1 @@ +Update app icon. \ No newline at end of file