diff --git a/App/App.xcodeproj/project.pbxproj b/App/App.xcodeproj/project.pbxproj index 0083e5a12f..f4adb2c57c 100644 --- a/App/App.xcodeproj/project.pbxproj +++ b/App/App.xcodeproj/project.pbxproj @@ -1,883 +1,1241 @@ - - - - - archiveVersion - 1 - classes - - - objectVersion - 46 - objects - - 1DD70E29001F47FB00000000 - - isa - PBXFileReference - name - BUCK - path - BUCK - sourceTree - SOURCE_ROOT - explicitFileType - text.script.python - - 1DD70E296ABF6A1200000000 - - isa - PBXFileReference - name - Empty.swift - path - SupportFiles/Empty.swift - sourceTree - SOURCE_ROOT - - 1DD70E2906C06BEE00000000 - - isa - PBXFileReference - name - Info.plist - path - Info.plist - sourceTree - ]]> - explicitFileType - text.plist - - B401C979EAB5339800000000 - - isa - PBXGroup - name - Sources - sourceTree - ]]> - children - - 1DD70E296ABF6A1200000000 - 1DD70E2906C06BEE00000000 - - - B401C9790001020100000000 - - isa - PBXGroup - name - App - sourceTree - ]]> - children - - 1DD70E29001F47FB00000000 - B401C979EAB5339800000000 - - - 1DD70E29001F47FB00000001 - - isa - PBXFileReference - name - BUCK - path - BUCK - sourceTree - SOURCE_ROOT - explicitFileType - text.script.python - - 1DD70E29988E33D500000000 - - isa - PBXFileReference - name - Application.swift - path - Sources/Application.swift - sourceTree - SOURCE_ROOT - - 1DD70E29BF88817800000000 - - isa - PBXFileReference - name - main.m - path - Sources/main.m - sourceTree - SOURCE_ROOT - lastKnownFileType - sourcecode.c.objc - - B401C979EAB5339800000001 - - isa - PBXGroup - name - Sources - sourceTree - ]]> - children - - 1DD70E29988E33D500000000 - 1DD70E29BF88817800000000 - - - B401C979C43AA77A00000000 - - isa - PBXGroup - name - AppLibrary - sourceTree - ]]> - children - - 1DD70E29001F47FB00000001 - B401C979EAB5339800000001 - - - 1DD70E29898E549400000000 - - isa - PBXFileReference - name - App-Debug.xcconfig - path - ../buck-out/gen/App/App-Debug.xcconfig - sourceTree - SOURCE_ROOT - explicitFileType - text.xcconfig - - 1DD70E29446E16FE00000000 - - isa - PBXFileReference - name - App-Profile.xcconfig - path - ../buck-out/gen/App/App-Profile.xcconfig - sourceTree - SOURCE_ROOT - explicitFileType - text.xcconfig - - 1DD70E29B804C26000000000 - - isa - PBXFileReference - name - App-Release.xcconfig - path - ../buck-out/gen/App/App-Release.xcconfig - sourceTree - SOURCE_ROOT - explicitFileType - text.xcconfig - - 1DD70E294E27EDFB00000000 - - isa - PBXFileReference - name - AppLibrary-Debug.xcconfig - path - ../buck-out/gen/App/AppLibrary-Debug.xcconfig - sourceTree - SOURCE_ROOT - explicitFileType - text.xcconfig - - 1DD70E294906F2A500000000 - - isa - PBXFileReference - name - AppLibrary-Profile.xcconfig - path - ../buck-out/gen/App/AppLibrary-Profile.xcconfig - sourceTree - SOURCE_ROOT - explicitFileType - text.xcconfig - - 1DD70E29BC9D9E0700000000 - - isa - PBXFileReference - name - AppLibrary-Release.xcconfig - path - ../buck-out/gen/App/AppLibrary-Release.xcconfig - sourceTree - SOURCE_ROOT - explicitFileType - text.xcconfig - - B401C9792F7F325000000000 - - isa - PBXGroup - name - Buck (Do Not Modify) - sourceTree - ]]> - children - - 1DD70E29898E549400000000 - 1DD70E29446E16FE00000000 - 1DD70E29B804C26000000000 - 1DD70E294E27EDFB00000000 - 1DD70E294906F2A500000000 - 1DD70E29BC9D9E0700000000 - - - B401C979B781F65D00000000 - - isa - PBXGroup - name - Configurations - sourceTree - ]]> - children - - B401C9792F7F325000000000 - - - 1DD70E297ADFB9F200000000 - - isa - PBXFileReference - name - libAppLibrary.a - path - libAppLibrary.a - sourceTree - BUILT_PRODUCTS_DIR - explicitFileType - archive.ar - - 1DD70E296A98D72D00000000 - - isa - PBXFileReference - name - libAsyncDisplayKit.dylib - path - libAsyncDisplayKit.dylib - sourceTree - BUILT_PRODUCTS_DIR - explicitFileType - compiled.mach-o.dylib - - 1DD70E29FF334B1F00000000 - - isa - PBXFileReference - name - libDisplay.dylib - path - libDisplay.dylib - sourceTree - BUILT_PRODUCTS_DIR - explicitFileType - compiled.mach-o.dylib - - 1DD70E29B22505DC00000000 - - isa - PBXFileReference - name - libMtProtoKit.dylib - path - libMtProtoKit.dylib - sourceTree - BUILT_PRODUCTS_DIR - explicitFileType - compiled.mach-o.dylib - - 1DD70E29DB6520C800000000 - - isa - PBXFileReference - name - libPostbox.dylib - path - libPostbox.dylib - sourceTree - BUILT_PRODUCTS_DIR - explicitFileType - compiled.mach-o.dylib - - 1DD70E29D65BA68200000000 - - isa - PBXFileReference - name - libSwiftSignalKit.dylib - path - libSwiftSignalKit.dylib - sourceTree - BUILT_PRODUCTS_DIR - explicitFileType - compiled.mach-o.dylib - - 1DD70E29119CDA0700000000 - - isa - PBXFileReference - name - libTelegramCore.dylib - path - libTelegramCore.dylib - sourceTree - BUILT_PRODUCTS_DIR - explicitFileType - compiled.mach-o.dylib - - 1DD70E291E5A1E9C00000000 - - isa - PBXFileReference - name - libTelegramUI.dylib - path - libTelegramUI.dylib - sourceTree - BUILT_PRODUCTS_DIR - explicitFileType - compiled.mach-o.dylib - - B401C97968022A5500000000 - - isa - PBXGroup - name - Frameworks - sourceTree - ]]> - children - - 1DD70E297ADFB9F200000000 - 1DD70E296A98D72D00000000 - 1DD70E29FF334B1F00000000 - 1DD70E29B22505DC00000000 - 1DD70E29DB6520C800000000 - 1DD70E29D65BA68200000000 - 1DD70E29119CDA0700000000 - 1DD70E291E5A1E9C00000000 - - - 1DD70E2933D47CB400000000 - - isa - PBXFileReference - name - App.app - path - App.app - sourceTree - BUILT_PRODUCTS_DIR - explicitFileType - wrapper.application - - 1DD70E297ADFB9F200000001 - - isa - PBXFileReference - name - libAppLibrary.a - path - libAppLibrary.a - sourceTree - BUILT_PRODUCTS_DIR - explicitFileType - archive.ar - - B401C979C806358400000000 - - isa - PBXGroup - name - Products - sourceTree - ]]> - children - - 1DD70E2933D47CB400000000 - 1DD70E297ADFB9F200000001 - - - B401C979EFB6AC4600000000 - - isa - PBXGroup - name - mainGroup - sourceTree - ]]> - children - - B401C9790001020100000000 - B401C979C43AA77A00000000 - B401C979B781F65D00000000 - B401C97968022A5500000000 - B401C979C806358400000000 - - - E7A30F046ABF6A1200000000 - - isa - PBXBuildFile - fileRef - 1DD70E296ABF6A1200000000 - - 1870857F0000000000000000 - - isa - PBXSourcesBuildPhase - files - - E7A30F046ABF6A1200000000 - - - E7A30F047ADFB9F200000000 - - isa - PBXBuildFile - fileRef - 1DD70E297ADFB9F200000000 - - E7A30F046A98D72D00000000 - - isa - PBXBuildFile - fileRef - 1DD70E296A98D72D00000000 - - E7A30F04FF334B1F00000000 - - isa - PBXBuildFile - fileRef - 1DD70E29FF334B1F00000000 - - E7A30F04B22505DC00000000 - - isa - PBXBuildFile - fileRef - 1DD70E29B22505DC00000000 - - E7A30F04DB6520C800000000 - - isa - PBXBuildFile - fileRef - 1DD70E29DB6520C800000000 - - E7A30F04D65BA68200000000 - - isa - PBXBuildFile - fileRef - 1DD70E29D65BA68200000000 - - E7A30F04119CDA0700000000 - - isa - PBXBuildFile - fileRef - 1DD70E29119CDA0700000000 - - E7A30F041E5A1E9C00000000 - - isa - PBXBuildFile - fileRef - 1DD70E291E5A1E9C00000000 - - 4F426D880000000000000000 - - isa - PBXFrameworksBuildPhase - files - - E7A30F047ADFB9F200000000 - E7A30F046A98D72D00000000 - E7A30F04FF334B1F00000000 - E7A30F04B22505DC00000000 - E7A30F04DB6520C800000000 - E7A30F04D65BA68200000000 - E7A30F04119CDA0700000000 - E7A30F041E5A1E9C00000000 - - - E7A30F046A98D72D00000001 - - isa - PBXBuildFile - fileRef - 1DD70E296A98D72D00000000 - - E7A30F04FF334B1F00000001 - - isa - PBXBuildFile - fileRef - 1DD70E29FF334B1F00000000 - - E7A30F04B22505DC00000001 - - isa - PBXBuildFile - fileRef - 1DD70E29B22505DC00000000 - - E7A30F04DB6520C800000001 - - isa - PBXBuildFile - fileRef - 1DD70E29DB6520C800000000 - - E7A30F04D65BA68200000001 - - isa - PBXBuildFile - fileRef - 1DD70E29D65BA68200000000 - - E7A30F04119CDA0700000001 - - isa - PBXBuildFile - fileRef - 1DD70E29119CDA0700000000 - - E7A30F041E5A1E9C00000001 - - isa - PBXBuildFile - fileRef - 1DD70E291E5A1E9C00000000 - - FAF5FAC90000000000000000 - - isa - PBXCopyFilesBuildPhase - files - - E7A30F046A98D72D00000001 - E7A30F04FF334B1F00000001 - E7A30F04B22505DC00000001 - E7A30F04DB6520C800000001 - E7A30F04D65BA68200000001 - E7A30F04119CDA0700000001 - E7A30F041E5A1E9C00000001 - - dstSubfolderSpec - 10 - dstPath - - - 4952437303EDA63300000000 - - isa - XCBuildConfiguration - name - Debug - buildSettings - - - baseConfigurationReference - 1DD70E29898E549400000000 - - 4952437350C7218900000000 - - isa - XCBuildConfiguration - name - Profile - buildSettings - - - baseConfigurationReference - 1DD70E29446E16FE00000000 - - 49524373A439BFE700000000 - - isa - XCBuildConfiguration - name - Release - buildSettings - - - baseConfigurationReference - 1DD70E29B804C26000000000 - - 218C37090000000000000000 - - isa - XCConfigurationList - buildConfigurations - - 4952437303EDA63300000000 - 4952437350C7218900000000 - 49524373A439BFE700000000 - - defaultConfigurationIsVisible - - - E66DC04E0001020100000000 - - isa - PBXNativeTarget - name - App - productName - App - productReference - 1DD70E2933D47CB400000000 - productType - com.apple.product-type.application - dependencies - - - buildPhases - - 1870857F0000000000000000 - 4F426D880000000000000000 - FAF5FAC90000000000000000 - - buildConfigurationList - 218C37090000000000000000 - - E7A30F04988E33D500000000 - - isa - PBXBuildFile - fileRef - 1DD70E29988E33D500000000 - - E7A30F04BF88817800000000 - - isa - PBXBuildFile - fileRef - 1DD70E29BF88817800000000 - - 1870857F0000000000000001 - - isa - PBXSourcesBuildPhase - files - - E7A30F04988E33D500000000 - E7A30F04BF88817800000000 - - - E7A30F04FF334B1F00000002 - - isa - PBXBuildFile - fileRef - 1DD70E29FF334B1F00000000 - - E7A30F04DB6520C800000002 - - isa - PBXBuildFile - fileRef - 1DD70E29DB6520C800000000 - - E7A30F04D65BA68200000002 - - isa - PBXBuildFile - fileRef - 1DD70E29D65BA68200000000 - - E7A30F04119CDA0700000002 - - isa - PBXBuildFile - fileRef - 1DD70E29119CDA0700000000 - - E7A30F041E5A1E9C00000002 - - isa - PBXBuildFile - fileRef - 1DD70E291E5A1E9C00000000 - - FAF5FAC90000000000000001 - - isa - PBXCopyFilesBuildPhase - files - - E7A30F04FF334B1F00000002 - E7A30F04DB6520C800000002 - E7A30F04D65BA68200000002 - E7A30F04119CDA0700000002 - E7A30F041E5A1E9C00000002 - - name - Fake Swift Dependencies (Copy Files Phase) - runOnlyForDeploymentPostprocessing - 1 - dstSubfolderSpec - 16 - dstPath - - - 4952437303EDA63300000001 - - isa - XCBuildConfiguration - name - Debug - buildSettings - - - baseConfigurationReference - 1DD70E294E27EDFB00000000 - - 4952437350C7218900000001 - - isa - XCBuildConfiguration - name - Profile - buildSettings - - - baseConfigurationReference - 1DD70E294906F2A500000000 - - 49524373A439BFE700000001 - - isa - XCBuildConfiguration - name - Release - buildSettings - - - baseConfigurationReference - 1DD70E29BC9D9E0700000000 - - 218C37090000000000000001 - - isa - XCConfigurationList - buildConfigurations - - 4952437303EDA63300000001 - 4952437350C7218900000001 - 49524373A439BFE700000001 - - defaultConfigurationIsVisible - - - E66DC04EC43AA77A00000000 - - isa - PBXNativeTarget - name - AppLibrary - productName - AppLibrary - productReference - 1DD70E297ADFB9F200000001 - productType - com.apple.product-type.library.static - dependencies - - - buildPhases - - 1870857F0000000000000001 - FAF5FAC90000000000000001 - - buildConfigurationList - 218C37090000000000000001 - - 4952437303EDA63300000002 - - isa - XCBuildConfiguration - name - Debug - buildSettings - - - - 4952437350C7218900000002 - - isa - XCBuildConfiguration - name - Profile - buildSettings - - - - 49524373A439BFE700000002 - - isa - XCBuildConfiguration - name - Release - buildSettings - - - - 218C37090000000000000002 - - isa - XCConfigurationList - buildConfigurations - - 4952437303EDA63300000002 - 4952437350C7218900000002 - 49524373A439BFE700000002 - - defaultConfigurationIsVisible - - - 96C847930001020100000000 - - isa - PBXProject - mainGroup - B401C979EFB6AC4600000000 - targets - - E66DC04E0001020100000000 - E66DC04EC43AA77A00000000 - - buildConfigurationList - 218C37090000000000000002 - compatibilityVersion - Xcode 3.2 - attributes - - LastUpgradeCheck - 9999 - - - - rootObject - 96C847930001020100000000 - - \ No newline at end of file +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + E7A30F0400ACCBB200000000 /* stp_card_jcb_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2900ACCBB200000000 /* stp_card_jcb_template@2x.png */; }; + E7A30F0400BF759200000000 /* anim_read.json in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2900BF759200000000 /* anim_read.json */; }; + E7A30F040261A45100000000 /* stp_card_jcb_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E290261A45100000000 /* stp_card_jcb_template@3x.png */; }; + E7A30F0402BAF11C00000000 /* 0.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2902BAF11C00000000 /* 0.m4a */; }; + E7A30F0402C9089D00000000 /* 1.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2902C9089D00000000 /* 1.m4a */; }; + E7A30F0402D7201E00000000 /* 2.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2902D7201E00000000 /* 2.m4a */; }; + E7A30F0402E5379F00000000 /* 3.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2902E5379F00000000 /* 3.m4a */; }; + E7A30F0402F34F2000000000 /* 4.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2902F34F2000000000 /* 4.m4a */; }; + E7A30F04030166A100000000 /* 5.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29030166A100000000 /* 5.m4a */; }; + E7A30F04030F7E2200000000 /* 6.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29030F7E2200000000 /* 6.m4a */; }; + E7A30F04031D95A300000000 /* 7.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29031D95A300000000 /* 7.m4a */; }; + E7A30F04032BAD2400000000 /* 8.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29032BAD2400000000 /* 8.m4a */; }; + E7A30F040339C4A500000000 /* 9.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E290339C4A500000000 /* 9.m4a */; }; + E7A30F04038EEE9000000000 /* BlueClassicIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29038EEE9000000000 /* BlueClassicIcon@2x.png */; }; + E7A30F04039E80E800000000 /* BlackClassicIconLargeIpad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29039E80E800000000 /* BlackClassicIconLargeIpad@2x.png */; }; + E7A30F040543C72F00000000 /* BlueClassicIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E290543C72F00000000 /* BlueClassicIcon@3x.png */; }; + E7A30F0405F13DFA00000000 /* BlueFilledIconIpad.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2905F13DFA00000000 /* BlueFilledIconIpad.png */; }; + E7A30F04061BC94A00000000 /* GenericUserScript.js in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29061BC94A00000000 /* GenericUserScript.js */; }; + E7A30F040933E8F400000000 /* stp_card_form_front@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E290933E8F400000000 /* stp_card_form_front@2x.png */; }; + E7A30F040AE8C19300000000 /* stp_card_form_front@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E290AE8C19300000000 /* stp_card_form_front@3x.png */; }; + E7A30F040BE206B800000000 /* heart.tgs in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E290BE206B800000000 /* heart.tgs */; }; + E7A30F041040865A00000000 /* PhotoEditorCaption@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E291040865A00000000 /* PhotoEditorCaption@2x.png */; }; + E7A30F04119CDA0700000000 /* libTelegramCore.dylib in Fake Swift Dependencies (Copy Files Phase) */ = {isa = PBXBuildFile; fileRef = 1DD70E29119CDA0700000000 /* libTelegramCore.dylib */; }; + E7A30F04119CDA0700000001 /* libTelegramCore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DD70E29119CDA0700000000 /* libTelegramCore.dylib */; }; + E7A30F04119CDA0700000002 /* libTelegramCore.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1DD70E29119CDA0700000000 /* libTelegramCore.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + E7A30F0411F55EF900000000 /* PhotoEditorCaption@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2911F55EF900000000 /* PhotoEditorCaption@3x.png */; }; + E7A30F041292048700000000 /* Instagram.html in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E291292048700000000 /* Instagram.html */; }; + E7A30F041493803B00000000 /* lol.tgs in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E291493803B00000000 /* lol.tgs */; }; + E7A30F041572F3F900000000 /* stp_card_mastercard_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E291572F3F900000000 /* stp_card_mastercard_template@2x.png */; }; + E7A30F0415A3422A00000000 /* thumbsup.tgs in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2915A3422A00000000 /* thumbsup.tgs */; }; + E7A30F041727CC9800000000 /* stp_card_mastercard_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E291727CC9800000000 /* stp_card_mastercard_template@3x.png */; }; + E7A30F0417567CC800000000 /* powerful_infinity_white@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2917567CC800000000 /* powerful_infinity_white@2x.png */; }; + E7A30F041882772900000000 /* PhotoEditorMute@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E291882772900000000 /* PhotoEditorMute@2x.png */; }; + E7A30F0418FC359D00000000 /* BlackFilledIconIpad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2918FC359D00000000 /* BlackFilledIconIpad@2x.png */; }; + E7A30F04193BD71700000000 /* stp_card_jcb@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29193BD71700000000 /* stp_card_jcb@2x.png */; }; + E7A30F041AF0AFB600000000 /* stp_card_jcb@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E291AF0AFB600000000 /* stp_card_jcb@3x.png */; }; + E7A30F041BA19CD900000000 /* BlueNotificationIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E291BA19CD900000000 /* BlueNotificationIcon.png */; }; + E7A30F041E5A1E9C00000000 /* libTelegramUI.dylib in Fake Swift Dependencies (Copy Files Phase) */ = {isa = PBXBuildFile; fileRef = 1DD70E291E5A1E9C00000000 /* libTelegramUI.dylib */; }; + E7A30F041E5A1E9C00000001 /* libTelegramUI.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DD70E291E5A1E9C00000000 /* libTelegramUI.dylib */; }; + E7A30F041E5A1E9C00000002 /* libTelegramUI.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1DD70E291E5A1E9C00000000 /* libTelegramUI.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + E7A30F041FC4F2F000000000 /* stp_card_mastercard@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E291FC4F2F000000000 /* stp_card_mastercard@2x.png */; }; + E7A30F042179CB8F00000000 /* stp_card_mastercard@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E292179CB8F00000000 /* stp_card_mastercard@3x.png */; }; + E7A30F04225D12D700000000 /* private_door@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29225D12D700000000 /* private_door@2x.png */; }; + E7A30F0423B3C2EF00000000 /* ic_pencil@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2923B3C2EF00000000 /* ic_pencil@2x.png */; }; + E7A30F042602319200000000 /* poop.tgs in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E292602319200000000 /* poop.tgs */; }; + E7A30F0428A3C00D00000000 /* NavigationShadow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2928A3C00D00000000 /* NavigationShadow@2x.png */; }; + E7A30F042925AEA200000000 /* Icons.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E292925AEA200000000 /* Icons.xcassets */; }; + E7A30F042D05879B00000000 /* anim_unarchive.json in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E292D05879B00000000 /* anim_unarchive.json */; }; + E7A30F042DEB974300000000 /* PhotoEditorMuteActive@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E292DEB974300000000 /* PhotoEditorMuteActive@2x.png */; }; + E7A30F042DF18A2400000000 /* BlueIconIpad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E292DF18A2400000000 /* BlueIconIpad@2x.png */; }; + E7A30F042E63F3BE00000000 /* BlackNotificationIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E292E63F3BE00000000 /* BlackNotificationIcon.png */; }; + E7A30F043453BAB500000000 /* BlackClassicIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E293453BAB500000000 /* BlackClassicIcon@2x.png */; }; + E7A30F043549D4C400000000 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E293549D4C400000000 /* Images.xcassets */; }; + E7A30F043608935400000000 /* BlackClassicIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E293608935400000000 /* BlackClassicIcon@3x.png */; }; + E7A30F0436B60A1F00000000 /* BlackFilledIconIpad.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2936B60A1F00000000 /* BlackFilledIconIpad.png */; }; + E7A30F043830E74200000000 /* meh.tgs in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E293830E74200000000 /* meh.tgs */; }; + E7A30F043AA15AF800000000 /* BlueIconIpad.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E293AA15AF800000000 /* BlueIconIpad.png */; }; + E7A30F043C169B2E00000000 /* powerful_mask@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E293C169B2E00000000 /* powerful_mask@2x.png */; }; + E7A30F043C514E0100000000 /* begin_record.caf in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E293C514E0100000000 /* begin_record.caf */; }; + E7A30F043E51265C00000000 /* cry.tgs in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E293E51265C00000000 /* cry.tgs */; }; + E7A30F043F61D17900000000 /* MessageSent.caf in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E293F61D17900000000 /* MessageSent.caf */; }; + E7A30F0440197DFD00000000 /* VimeoUserScript.js in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2940197DFD00000000 /* VimeoUserScript.js */; }; + E7A30F04406BEF2900000000 /* anim_archiveAvatar.json in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29406BEF2900000000 /* anim_archiveAvatar.json */; }; + E7A30F04443B21A300000000 /* stp_card_amex@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29443B21A300000000 /* stp_card_amex@2x.png */; }; + E7A30F04453E9D0800000000 /* powerful_star@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29453E9D0800000000 /* powerful_star@2x.png */; }; + E7A30F0445EFFA4200000000 /* stp_card_amex@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2945EFFA4200000000 /* stp_card_amex@3x.png */; }; + E7A30F0445FD987A00000000 /* smile.tgs in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2945FD987A00000000 /* smile.tgs */; }; + E7A30F0448ED794E00000000 /* telegram_plane1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2948ED794E00000000 /* telegram_plane1@2x.png */; }; + E7A30F044D77B07700000000 /* anim_infotip.json in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E294D77B07700000000 /* anim_infotip.json */; }; + E7A30F044D95CA7700000000 /* stp_card_form_applepay@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E294D95CA7700000000 /* stp_card_form_applepay@2x.png */; }; + E7A30F044F4AA31600000000 /* stp_card_form_applepay@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E294F4AA31600000000 /* stp_card_form_applepay@3x.png */; }; + E7A30F04501FCBD600000000 /* telegram_sphere@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29501FCBD600000000 /* telegram_sphere@2x.png */; }; + E7A30F0451A94A6400000000 /* start_arrow_ipad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2951A94A6400000000 /* start_arrow_ipad@2x.png */; }; + E7A30F045283D1B900000000 /* celebrate.tgs in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E295283D1B900000000 /* celebrate.tgs */; }; + E7A30F0456813D8800000000 /* PhoneCountries.txt in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2956813D8800000000 /* PhoneCountries.txt */; }; + E7A30F0457CD649600000000 /* voip_end.caf in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2957CD649600000000 /* voip_end.caf */; }; + E7A30F045AFA9C2600000000 /* BlueClassicIconIpad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E295AFA9C2600000000 /* BlueClassicIconIpad@2x.png */; }; + E7A30F045B2A553100000000 /* BlueFilledIconLargeIpad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E295B2A553100000000 /* BlueFilledIconLargeIpad@2x.png */; }; + E7A30F045B60B39500000000 /* start_arrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E295B60B39500000000 /* start_arrow@2x.png */; }; + E7A30F045D05708E00000000 /* TwitchUserScript.js in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E295D05708E00000000 /* TwitchUserScript.js */; }; + E7A30F045FFC844500000000 /* notification.caf in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E295FFC844500000000 /* notification.caf */; }; + E7A30F046587237E00000000 /* YoutubeUserScript.js in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E296587237E00000000 /* YoutubeUserScript.js */; }; + E7A30F0465E934B700000000 /* voip_fail.caf in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2965E934B700000000 /* voip_fail.caf */; }; + E7A30F0466DD7C1700000000 /* BlueClassicNotificationIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2966DD7C1700000000 /* BlueClassicNotificationIcon.png */; }; + E7A30F0467C217F600000000 /* anim_unmute.json in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2967C217F600000000 /* anim_unmute.json */; }; + E7A30F0468FBAA6A00000000 /* LegacyComponentsResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2968FBAA6A00000000 /* LegacyComponentsResources.bundle */; }; + E7A30F046A98D72D00000000 /* libAsyncDisplayKit.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DD70E296A98D72D00000000 /* libAsyncDisplayKit.dylib */; }; + E7A30F046A98D72D00000001 /* libAsyncDisplayKit.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1DD70E296A98D72D00000000 /* libAsyncDisplayKit.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + E7A30F046ABF6A1200000000 /* Empty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DD70E296ABF6A1200000000 /* Empty.swift */; }; + E7A30F046AD832AE00000000 /* ic_cam_lens@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E296AD832AE00000000 /* ic_cam_lens@2x.png */; }; + E7A30F046C599FD900000000 /* NavigationBackArrowLight@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E296C599FD900000000 /* NavigationBackArrowLight@2x.png */; }; + E7A30F046E8A8A4800000000 /* sad.tgs in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E296E8A8A4800000000 /* sad.tgs */; }; + E7A30F046F409B3900000000 /* voip_connecting.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E296F409B3900000000 /* voip_connecting.mp3 */; }; + E7A30F04705B110100000000 /* stp_card_visa@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29705B110100000000 /* stp_card_visa@2x.png */; }; + E7A30F04720FE9A000000000 /* stp_card_visa@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29720FE9A000000000 /* stp_card_visa@3x.png */; }; + E7A30F04748244C600000000 /* Twitch.html in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29748244C600000000 /* Twitch.html */; }; + E7A30F0474B4E65D00000000 /* 100.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2974B4E65D00000000 /* 100.m4a */; }; + E7A30F0474C2FDDE00000000 /* 101.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2974C2FDDE00000000 /* 101.m4a */; }; + E7A30F0474D1155F00000000 /* 102.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2974D1155F00000000 /* 102.m4a */; }; + E7A30F0474DF2CE000000000 /* 103.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2974DF2CE000000000 /* 103.m4a */; }; + E7A30F0474ED446100000000 /* 104.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2974ED446100000000 /* 104.m4a */; }; + E7A30F0474FB5BE200000000 /* 105.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2974FB5BE200000000 /* 105.m4a */; }; + E7A30F047509736300000000 /* 106.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E297509736300000000 /* 106.m4a */; }; + E7A30F0475178AE400000000 /* 107.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2975178AE400000000 /* 107.m4a */; }; + E7A30F047525A26500000000 /* 108.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E297525A26500000000 /* 108.m4a */; }; + E7A30F047533B9E600000000 /* 109.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E297533B9E600000000 /* 109.m4a */; }; + E7A30F0475FF5D6600000000 /* anim_hide.json in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2975FF5D6600000000 /* anim_hide.json */; }; + E7A30F047669BEFC00000000 /* 110.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E297669BEFC00000000 /* 110.m4a */; }; + E7A30F047677D67D00000000 /* 111.m4a in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E297677D67D00000000 /* 111.m4a */; }; + E7A30F0477E4942F00000000 /* BlueIconLargeIpad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2977E4942F00000000 /* BlueIconLargeIpad@2x.png */; }; + E7A30F047809716A00000000 /* ChatWallpaperBuiltin0.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E297809716A00000000 /* ChatWallpaperBuiltin0.jpg */; }; + E7A30F04793765CC00000000 /* ic_smile_eye@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29793765CC00000000 /* ic_smile_eye@2x.png */; }; + E7A30F04799DE7B600000000 /* Youtube.html in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29799DE7B600000000 /* Youtube.html */; }; + E7A30F047ADFB9F200000000 /* libAppLibrary.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DD70E297ADFB9F200000000 /* libAppLibrary.a */; }; + E7A30F047E472C5600000000 /* BlackFilledIconLargeIpad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E297E472C5600000000 /* BlackFilledIconLargeIpad@2x.png */; }; + E7A30F0485169C9700000000 /* ic_cam@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2985169C9700000000 /* ic_cam@2x.png */; }; + E7A30F04853D725600000000 /* SFCompactRounded-Semibold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29853D725600000000 /* SFCompactRounded-Semibold.otf */; }; + E7A30F04884756EF00000000 /* anim_mute.json in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29884756EF00000000 /* anim_mute.json */; }; + E7A30F0488BEEF0900000000 /* BlackIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2988BEEF0900000000 /* BlackIcon@2x.png */; }; + E7A30F048A46FE9000000000 /* ic_bubble@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E298A46FE9000000000 /* ic_bubble@2x.png */; }; + E7A30F048A73C7A800000000 /* BlackIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E298A73C7A800000000 /* BlackIcon@3x.png */; }; + E7A30F048AA6EB1400000000 /* BlackIconLargeIpad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E298AA6EB1400000000 /* BlackIconLargeIpad@2x.png */; }; + E7A30F048CC42D1400000000 /* stp_card_applepay@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E298CC42D1400000000 /* stp_card_applepay@2x.png */; }; + E7A30F048DB231DC00000000 /* stp_card_placeholder_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E298DB231DC00000000 /* stp_card_placeholder_template@2x.png */; }; + E7A30F048E7905B300000000 /* stp_card_applepay@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E298E7905B300000000 /* stp_card_applepay@3x.png */; }; + E7A30F048E96E34200000000 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E298E96E34200000000 /* LaunchScreen.xib */; }; + E7A30F048F670A7B00000000 /* stp_card_placeholder_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E298F670A7B00000000 /* stp_card_placeholder_template@3x.png */; }; + E7A30F0494DA3D4400000000 /* stp_card_diners_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2994DA3D4400000000 /* stp_card_diners_template@2x.png */; }; + E7A30F04968F15E300000000 /* stp_card_diners_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29968F15E300000000 /* stp_card_diners_template@3x.png */; }; + E7A30F04976A9EA600000000 /* stp_card_amex_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29976A9EA600000000 /* stp_card_amex_template@2x.png */; }; + E7A30F04988E33D500000000 /* Application.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DD70E29988E33D500000000 /* Application.swift */; }; + E7A30F04991F774500000000 /* stp_card_amex_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29991F774500000000 /* stp_card_amex_template@3x.png */; }; + E7A30F0499319B4600000000 /* ic_bubble_dot@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E2999319B4600000000 /* ic_bubble_dot@2x.png */; }; + E7A30F049F00BA0200000000 /* anim_archive.json in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E299F00BA0200000000 /* anim_archive.json */; }; + E7A30F049F5C287E00000000 /* stp_card_form_back@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E299F5C287E00000000 /* stp_card_form_back@2x.png */; }; + E7A30F04A0160D3000000000 /* stp_card_discover_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29A0160D3000000000 /* stp_card_discover_template@2x.png */; }; + E7A30F04A111011D00000000 /* stp_card_form_back@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29A111011D00000000 /* stp_card_form_back@3x.png */; }; + E7A30F04A1CAE5CF00000000 /* stp_card_discover_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29A1CAE5CF00000000 /* stp_card_discover_template@3x.png */; }; + E7A30F04A28B5AB000000000 /* anim_archiveswipe.json in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29A28B5AB000000000 /* anim_archiveswipe.json */; }; + E7A30F04A4169AE300000000 /* AppIcons.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29A4169AE300000000 /* AppIcons.xcassets */; }; + E7A30F04A75B899200000000 /* BlackClassicNotificationIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29A75B899200000000 /* BlackClassicNotificationIcon.png */; }; + E7A30F04A86C10B100000000 /* BlackClassicIconIpad.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29A86C10B100000000 /* BlackClassicIconIpad.png */; }; + E7A30F04A9DA63C800000000 /* fast_arrow_shadow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29A9DA63C800000000 /* fast_arrow_shadow@2x.png */; }; + E7A30F04ABD35C0F00000000 /* anim_pin.json in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29ABD35C0F00000000 /* anim_pin.json */; }; + E7A30F04B22505DC00000000 /* libMtProtoKit.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DD70E29B22505DC00000000 /* libMtProtoKit.dylib */; }; + E7A30F04B22505DC00000001 /* libMtProtoKit.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1DD70E29B22505DC00000000 /* libMtProtoKit.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + E7A30F04B308DE2800000000 /* anim_unpin.json in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29B308DE2800000000 /* anim_unpin.json */; }; + E7A30F04B3538C4D00000000 /* fast_spiral@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29B3538C4D00000000 /* fast_spiral@2x.png */; }; + E7A30F04B3A6F94500000000 /* stp_card_diners@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29B3A6F94500000000 /* stp_card_diners@2x.png */; }; + E7A30F04B55BD1E400000000 /* stp_card_diners@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29B55BD1E400000000 /* stp_card_diners@3x.png */; }; + E7A30F04B78460EB00000000 /* poker.tgs in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29B78460EB00000000 /* poker.tgs */; }; + E7A30F04B9D1C16900000000 /* private_screw@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29B9D1C16900000000 /* private_screw@2x.png */; }; + E7A30F04BA96313500000000 /* Vimeo.html in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29BA96313500000000 /* Vimeo.html */; }; + E7A30F04BAE267F200000000 /* powerful_infinity@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29BAE267F200000000 /* powerful_infinity@2x.png */; }; + E7A30F04BE69B5E500000000 /* anim_group.json in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29BE69B5E500000000 /* anim_group.json */; }; + E7A30F04BF5CBB6200000000 /* knot_up1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29BF5CBB6200000000 /* knot_up1@2x.png */; }; + E7A30F04BF88817800000000 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DD70E29BF88817800000000 /* main.m */; }; + E7A30F04C097583600000000 /* BlueClassicIconIpad.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29C097583600000000 /* BlueClassicIconIpad.png */; }; + E7A30F04C320736D00000000 /* BlueClassicIconLargeIpad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29C320736D00000000 /* BlueClassicIconLargeIpad@2x.png */; }; + E7A30F04C364694E00000000 /* ok.tgs in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29C364694E00000000 /* ok.tgs */; }; + E7A30F04C3C271B400000000 /* stp_card_cvc_amex@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29C3C271B400000000 /* stp_card_cvc_amex@2x.png */; }; + E7A30F04C54DDB8700000000 /* BlackFilledIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29C54DDB8700000000 /* BlackFilledIcon@2x.png */; }; + E7A30F04C5774A5300000000 /* stp_card_cvc_amex@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29C5774A5300000000 /* stp_card_cvc_amex@3x.png */; }; + E7A30F04C682CDCB00000000 /* BlackClassicIconIpad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29C682CDCB00000000 /* BlackClassicIconIpad@2x.png */; }; + E7A30F04C702B42600000000 /* BlackFilledIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29C702B42600000000 /* BlackFilledIcon@3x.png */; }; + E7A30F04C78B98B000000000 /* voip_ringback.caf in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29C78B98B000000000 /* voip_ringback.caf */; }; + E7A30F04CAE3F0A300000000 /* BlueNotificationIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29CAE3F0A300000000 /* BlueNotificationIcon@2x.png */; }; + E7A30F04CC98C94200000000 /* BlueNotificationIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29CC98C94200000000 /* BlueNotificationIcon@3x.png */; }; + E7A30F04CE4715BE00000000 /* anim_ungroup.json in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29CE4715BE00000000 /* anim_ungroup.json */; }; + E7A30F04CED3B81F00000000 /* BlackIconIpad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29CED3B81F00000000 /* BlackIconIpad@2x.png */; }; + E7A30F04CFF88DE800000000 /* ic_videocam@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29CFF88DE800000000 /* ic_videocam@2x.png */; }; + E7A30F04D061F39E00000000 /* BlackNotificationIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29D061F39E00000000 /* BlackNotificationIcon@2x.png */; }; + E7A30F04D216CC3D00000000 /* BlackNotificationIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29D216CC3D00000000 /* BlackNotificationIcon@3x.png */; }; + E7A30F04D373AFE200000000 /* BlueFilledIconIpad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29D373AFE200000000 /* BlueFilledIconIpad@2x.png */; }; + E7A30F04D42F293000000000 /* stp_card_cvc@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29D42F293000000000 /* stp_card_cvc@2x.png */; }; + E7A30F04D43F404C00000000 /* BlueFilledIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29D43F404C00000000 /* BlueFilledIcon@2x.png */; }; + E7A30F04D548E25500000000 /* stp_card_applepay_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29D548E25500000000 /* stp_card_applepay_template@2x.png */; }; + E7A30F04D5E401CF00000000 /* stp_card_cvc@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29D5E401CF00000000 /* stp_card_cvc@3x.png */; }; + E7A30F04D5F418EB00000000 /* BlueFilledIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29D5F418EB00000000 /* BlueFilledIcon@3x.png */; }; + E7A30F04D64F57BC00000000 /* fast_body@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29D64F57BC00000000 /* fast_body@2x.png */; }; + E7A30F04D65BA68200000000 /* libSwiftSignalKit.dylib in Fake Swift Dependencies (Copy Files Phase) */ = {isa = PBXBuildFile; fileRef = 1DD70E29D65BA68200000000 /* libSwiftSignalKit.dylib */; }; + E7A30F04D65BA68200000001 /* libSwiftSignalKit.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DD70E29D65BA68200000000 /* libSwiftSignalKit.dylib */; }; + E7A30F04D65BA68200000002 /* libSwiftSignalKit.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1DD70E29D65BA68200000000 /* libSwiftSignalKit.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + E7A30F04D6FDBAF400000000 /* stp_card_applepay_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29D6FDBAF400000000 /* stp_card_applepay_template@3x.png */; }; + E7A30F04D743E0A500000000 /* BlueClassicNotificationIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29D743E0A500000000 /* BlueClassicNotificationIcon@2x.png */; }; + E7A30F04D8F8B94400000000 /* BlueClassicNotificationIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29D8F8B94400000000 /* BlueClassicNotificationIcon@3x.png */; }; + E7A30F04DB6520C800000000 /* libPostbox.dylib in Fake Swift Dependencies (Copy Files Phase) */ = {isa = PBXBuildFile; fileRef = 1DD70E29DB6520C800000000 /* libPostbox.dylib */; }; + E7A30F04DB6520C800000001 /* libPostbox.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DD70E29DB6520C800000000 /* libPostbox.dylib */; }; + E7A30F04DB6520C800000002 /* libPostbox.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1DD70E29DB6520C800000000 /* libPostbox.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + E7A30F04DBA6021D00000000 /* anim_delete.json in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29DBA6021D00000000 /* anim_delete.json */; }; + E7A30F04DC82BB6100000000 /* anim_success.json in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29DC82BB6100000000 /* anim_success.json */; }; + E7A30F04DCE9E9AA00000000 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = C73440C0DCE9E9AA00000000 /* Localizable.strings */; }; + E7A30F04E03A369900000000 /* anim_unread.json in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29E03A369900000000 /* anim_unread.json */; }; + E7A30F04E0F809FE00000000 /* ic_smile@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29E0F809FE00000000 /* ic_smile@2x.png */; }; + E7A30F04E16766DD00000000 /* BlackIconIpad.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29E16766DD00000000 /* BlackIconIpad.png */; }; + E7A30F04E1BF190800000000 /* stp_card_visa_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29E1BF190800000000 /* stp_card_visa_template@2x.png */; }; + E7A30F04E373F1A700000000 /* stp_card_visa_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29E373F1A700000000 /* stp_card_visa_template@3x.png */; }; + E7A30F04E4269D4A00000000 /* BlackClassicNotificationIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29E4269D4A00000000 /* BlackClassicNotificationIcon@2x.png */; }; + E7A30F04E5D6389D00000000 /* WhiteFilledIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29E5D6389D00000000 /* WhiteFilledIcon@2x.png */; }; + E7A30F04E5DB75E900000000 /* BlackClassicNotificationIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29E5DB75E900000000 /* BlackClassicNotificationIcon@3x.png */; }; + E7A30F04E78B113C00000000 /* WhiteFilledIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29E78B113C00000000 /* WhiteFilledIcon@3x.png */; }; + E7A30F04EB14130700000000 /* currencies.json in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29EB14130700000000 /* currencies.json */; }; + E7A30F04EE385A8D00000000 /* surprised.tgs in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29EE385A8D00000000 /* surprised.tgs */; }; + E7A30F04EEB88B8E00000000 /* BlueIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29EEB88B8E00000000 /* BlueIcon@2x.png */; }; + E7A30F04EFAF72C800000000 /* PresentationStrings.mapping in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29EFAF72C800000000 /* PresentationStrings.mapping */; }; + E7A30F04F06D642D00000000 /* BlueIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29F06D642D00000000 /* BlueIcon@3x.png */; }; + E7A30F04F1FA330600000000 /* Emoji.mapping in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29F1FA330600000000 /* Emoji.mapping */; }; + E7A30F04F6D6001100000000 /* ic_pin@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29F6D6001100000000 /* ic_pin@2x.png */; }; + E7A30F04F76B198200000000 /* Generic.html in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29F76B198200000000 /* Generic.html */; }; + E7A30F04F8214FD900000000 /* stp_card_discover@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29F8214FD900000000 /* stp_card_discover@2x.png */; }; + E7A30F04F9D6287800000000 /* stp_card_discover@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29F9D6287800000000 /* stp_card_discover@3x.png */; }; + E7A30F04FA28CA1200000000 /* voip_busy.caf in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29FA28CA1200000000 /* voip_busy.caf */; }; + E7A30F04FABB82B800000000 /* start_arrow_ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29FABB82B800000000 /* start_arrow_ipad.png */; }; + E7A30F04FB06A0E800000000 /* knot_down@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29FB06A0E800000000 /* knot_down@2x.png */; }; + E7A30F04FE6965DB00000000 /* fast_arrow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DD70E29FE6965DB00000000 /* fast_arrow@2x.png */; }; + E7A30F04FF334B1F00000000 /* libDisplay.dylib in Fake Swift Dependencies (Copy Files Phase) */ = {isa = PBXBuildFile; fileRef = 1DD70E29FF334B1F00000000 /* libDisplay.dylib */; }; + E7A30F04FF334B1F00000001 /* libDisplay.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DD70E29FF334B1F00000000 /* libDisplay.dylib */; }; + E7A30F04FF334B1F00000002 /* libDisplay.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1DD70E29FF334B1F00000000 /* libDisplay.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + FAF5FAC90000000000000000 /* Fake Swift Dependencies (Copy Files Phase) */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 0; + dstPath = ""; + dstSubfolderSpec = 16; + files = ( + E7A30F04FF334B1F00000000 /* libDisplay.dylib in Fake Swift Dependencies (Copy Files Phase) */, + E7A30F04DB6520C800000000 /* libPostbox.dylib in Fake Swift Dependencies (Copy Files Phase) */, + E7A30F04D65BA68200000000 /* libSwiftSignalKit.dylib in Fake Swift Dependencies (Copy Files Phase) */, + E7A30F04119CDA0700000000 /* libTelegramCore.dylib in Fake Swift Dependencies (Copy Files Phase) */, + E7A30F041E5A1E9C00000000 /* libTelegramUI.dylib in Fake Swift Dependencies (Copy Files Phase) */, + ); + name = "Fake Swift Dependencies (Copy Files Phase)"; + runOnlyForDeploymentPostprocessing = 1; + }; + FAF5FAC90000000000000001 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 0; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + E7A30F046A98D72D00000001 /* libAsyncDisplayKit.dylib in CopyFiles */, + E7A30F04FF334B1F00000002 /* libDisplay.dylib in CopyFiles */, + E7A30F04B22505DC00000001 /* libMtProtoKit.dylib in CopyFiles */, + E7A30F04DB6520C800000002 /* libPostbox.dylib in CopyFiles */, + E7A30F04D65BA68200000002 /* libSwiftSignalKit.dylib in CopyFiles */, + E7A30F04119CDA0700000002 /* libTelegramCore.dylib in CopyFiles */, + E7A30F041E5A1E9C00000002 /* libTelegramUI.dylib in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1DD70E2900000C3100000000 /* ar */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; name = ar; path = "../Telegram-iOS/ar.lproj/Localizable.strings"; sourceTree = SOURCE_ROOT; }; + 1DD70E2900000C5E00000000 /* ca */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; name = ca; path = "../Telegram-iOS/ca.lproj/Localizable.strings"; sourceTree = SOURCE_ROOT; }; + 1DD70E2900000C8100000000 /* de */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; name = de; path = "../Telegram-iOS/de.lproj/Localizable.strings"; sourceTree = SOURCE_ROOT; }; + 1DD70E2900000CA900000000 /* en */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; name = en; path = "../Telegram-iOS/en.lproj/Localizable.strings"; sourceTree = SOURCE_ROOT; }; + 1DD70E2900000CAE00000000 /* es */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; name = es; path = "../Telegram-iOS/es.lproj/Localizable.strings"; sourceTree = SOURCE_ROOT; }; + 1DD70E2900000CCC00000000 /* fr */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; name = fr; path = "../Telegram-iOS/fr.lproj/Localizable.strings"; sourceTree = SOURCE_ROOT; }; + 1DD70E2900000D1B00000000 /* id */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; name = id; path = "../Telegram-iOS/id.lproj/Localizable.strings"; sourceTree = SOURCE_ROOT; }; + 1DD70E2900000D2B00000000 /* it */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; name = it; path = "../Telegram-iOS/it.lproj/Localizable.strings"; sourceTree = SOURCE_ROOT; }; + 1DD70E2900000D6400000000 /* ko */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; name = ko; path = "../Telegram-iOS/ko.lproj/Localizable.strings"; sourceTree = SOURCE_ROOT; }; + 1DD70E2900000DA600000000 /* ms */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; name = ms; path = "../Telegram-iOS/ms.lproj/Localizable.strings"; sourceTree = SOURCE_ROOT; }; + 1DD70E2900000DBE00000000 /* nl */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; name = nl; path = "../Telegram-iOS/nl.lproj/Localizable.strings"; sourceTree = SOURCE_ROOT; }; + 1DD70E2900000E0400000000 /* pt */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; name = pt; path = "../Telegram-iOS/pt.lproj/Localizable.strings"; sourceTree = SOURCE_ROOT; }; + 1DD70E2900000E4300000000 /* ru */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; name = ru; path = "../Telegram-iOS/ru.lproj/Localizable.strings"; sourceTree = SOURCE_ROOT; }; + 1DD70E2900000E7E00000000 /* tr */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; name = tr; path = "../Telegram-iOS/tr.lproj/Localizable.strings"; sourceTree = SOURCE_ROOT; }; + 1DD70E2900000E9600000000 /* uk */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; name = uk; path = "../Telegram-iOS/uk.lproj/Localizable.strings"; sourceTree = SOURCE_ROOT; }; + 1DD70E29001F47FB00000000 /* BUCK */ = {isa = PBXFileReference; explicitFileType = text.script.python; path = BUCK; sourceTree = SOURCE_ROOT; }; + 1DD70E29001F47FB00000001 /* BUCK */ = {isa = PBXFileReference; explicitFileType = text.script.python; path = BUCK; sourceTree = SOURCE_ROOT; }; + 1DD70E2900ACCBB200000000 /* stp_card_jcb_template@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_jcb_template@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_jcb_template@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E2900BF759200000000 /* anim_read.json */ = {isa = PBXFileReference; explicitFileType = text.json; name = anim_read.json; path = ../submodules/TelegramUI/TelegramUI/Resources/Animations/anim_read.json; sourceTree = SOURCE_ROOT; }; + 1DD70E290261A45100000000 /* stp_card_jcb_template@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_jcb_template@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_jcb_template@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E2902BAF11C00000000 /* 0.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 0.m4a; path = "../Telegram-iOS/Resources/notifications/0.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E2902C9089D00000000 /* 1.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 1.m4a; path = "../Telegram-iOS/Resources/notifications/1.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E2902D7201E00000000 /* 2.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 2.m4a; path = "../Telegram-iOS/Resources/notifications/2.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E2902E5379F00000000 /* 3.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 3.m4a; path = "../Telegram-iOS/Resources/notifications/3.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E2902F34F2000000000 /* 4.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 4.m4a; path = "../Telegram-iOS/Resources/notifications/4.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E29030166A100000000 /* 5.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 5.m4a; path = "../Telegram-iOS/Resources/notifications/5.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E29030F7E2200000000 /* 6.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 6.m4a; path = "../Telegram-iOS/Resources/notifications/6.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E29031D95A300000000 /* 7.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 7.m4a; path = "../Telegram-iOS/Resources/notifications/7.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E29032BAD2400000000 /* 8.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 8.m4a; path = "../Telegram-iOS/Resources/notifications/8.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E290339C4A500000000 /* 9.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 9.m4a; path = "../Telegram-iOS/Resources/notifications/9.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E29038EEE9000000000 /* BlueClassicIcon@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlueClassicIcon@2x.png"; path = "../Telegram-iOS/BlueClassicIcon@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29039E80E800000000 /* BlackClassicIconLargeIpad@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlackClassicIconLargeIpad@2x.png"; path = "../Telegram-iOS/BlackClassicIconLargeIpad@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E290543C72F00000000 /* BlueClassicIcon@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlueClassicIcon@3x.png"; path = "../Telegram-iOS/BlueClassicIcon@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E2905F13DFA00000000 /* BlueFilledIconIpad.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = BlueFilledIconIpad.png; path = "../Telegram-iOS/BlueFilledIconIpad.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29061BC94A00000000 /* GenericUserScript.js */ = {isa = PBXFileReference; explicitFileType = sourcecode.javascript; name = GenericUserScript.js; path = ../submodules/TelegramUI/TelegramUI/Resources/WebEmbed/GenericUserScript.js; sourceTree = SOURCE_ROOT; }; + 1DD70E2906C06BEE00000000 /* Info.plist */ = {isa = PBXFileReference; explicitFileType = text.plist; path = Info.plist; sourceTree = ""; }; + 1DD70E290933E8F400000000 /* stp_card_form_front@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_form_front@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_form_front@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E290AE8C19300000000 /* stp_card_form_front@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_form_front@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_form_front@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E290BE206B800000000 /* heart.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; name = heart.tgs; path = ../submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/heart.tgs; sourceTree = SOURCE_ROOT; }; + 1DD70E291040865A00000000 /* PhotoEditorCaption@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "PhotoEditorCaption@2x.png"; path = "../Telegram-iOS/Resources/PhotoEditor/PhotoEditorCaption@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29119CDA0700000000 /* libTelegramCore.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = libTelegramCore.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + 1DD70E2911F55EF900000000 /* PhotoEditorCaption@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "PhotoEditorCaption@3x.png"; path = "../Telegram-iOS/Resources/PhotoEditor/PhotoEditorCaption@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E291292048700000000 /* Instagram.html */ = {isa = PBXFileReference; explicitFileType = text.html; name = Instagram.html; path = ../submodules/TelegramUI/TelegramUI/Resources/WebEmbed/Instagram.html; sourceTree = SOURCE_ROOT; }; + 1DD70E291493803B00000000 /* lol.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; name = lol.tgs; path = ../submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/lol.tgs; sourceTree = SOURCE_ROOT; }; + 1DD70E291572F3F900000000 /* stp_card_mastercard_template@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_mastercard_template@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_mastercard_template@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E2915A3422A00000000 /* thumbsup.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; name = thumbsup.tgs; path = ../submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/thumbsup.tgs; sourceTree = SOURCE_ROOT; }; + 1DD70E291727CC9800000000 /* stp_card_mastercard_template@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_mastercard_template@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_mastercard_template@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E2917567CC800000000 /* powerful_infinity_white@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "powerful_infinity_white@2x.png"; path = "../Telegram-iOS/Resources/intro/powerful_infinity_white@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E291882772900000000 /* PhotoEditorMute@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "PhotoEditorMute@2x.png"; path = "../Telegram-iOS/Resources/PhotoEditor/PhotoEditorMute@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E2918FC359D00000000 /* BlackFilledIconIpad@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlackFilledIconIpad@2x.png"; path = "../Telegram-iOS/BlackFilledIconIpad@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29193BD71700000000 /* stp_card_jcb@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_jcb@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_jcb@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E291AF0AFB600000000 /* stp_card_jcb@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_jcb@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_jcb@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E291BA19CD900000000 /* BlueNotificationIcon.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = BlueNotificationIcon.png; path = "../Telegram-iOS/BlueNotificationIcon.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E291E5A1E9C00000000 /* libTelegramUI.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = libTelegramUI.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + 1DD70E291FC4F2F000000000 /* stp_card_mastercard@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_mastercard@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_mastercard@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E292179CB8F00000000 /* stp_card_mastercard@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_mastercard@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_mastercard@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29225D12D700000000 /* private_door@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "private_door@2x.png"; path = "../Telegram-iOS/Resources/intro/private_door@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E2923B3C2EF00000000 /* ic_pencil@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "ic_pencil@2x.png"; path = "../Telegram-iOS/Resources/intro/ic_pencil@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E292602319200000000 /* poop.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; name = poop.tgs; path = ../submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/poop.tgs; sourceTree = SOURCE_ROOT; }; + 1DD70E2928A3C00D00000000 /* NavigationShadow@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "NavigationShadow@2x.png"; path = "../Telegram-iOS/Resources/NavigationShadow@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E292925AEA200000000 /* Icons.xcassets */ = {isa = PBXFileReference; explicitFileType = folder.assetcatalog; name = Icons.xcassets; path = "../Telegram-iOS/Icons.xcassets"; sourceTree = SOURCE_ROOT; }; + 1DD70E292D05879B00000000 /* anim_unarchive.json */ = {isa = PBXFileReference; explicitFileType = text.json; name = anim_unarchive.json; path = ../submodules/TelegramUI/TelegramUI/Resources/Animations/anim_unarchive.json; sourceTree = SOURCE_ROOT; }; + 1DD70E292DEB974300000000 /* PhotoEditorMuteActive@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "PhotoEditorMuteActive@2x.png"; path = "../Telegram-iOS/Resources/PhotoEditor/PhotoEditorMuteActive@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E292DF18A2400000000 /* BlueIconIpad@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlueIconIpad@2x.png"; path = "../Telegram-iOS/BlueIconIpad@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E292E63F3BE00000000 /* BlackNotificationIcon.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = BlackNotificationIcon.png; path = "../Telegram-iOS/BlackNotificationIcon.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E293453BAB500000000 /* BlackClassicIcon@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlackClassicIcon@2x.png"; path = "../Telegram-iOS/BlackClassicIcon@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E293549D4C400000000 /* Images.xcassets */ = {isa = PBXFileReference; explicitFileType = folder.assetcatalog; name = Images.xcassets; path = ../submodules/TelegramUI/Images.xcassets; sourceTree = SOURCE_ROOT; }; + 1DD70E293608935400000000 /* BlackClassicIcon@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlackClassicIcon@3x.png"; path = "../Telegram-iOS/BlackClassicIcon@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E2936B60A1F00000000 /* BlackFilledIconIpad.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = BlackFilledIconIpad.png; path = "../Telegram-iOS/BlackFilledIconIpad.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E293830E74200000000 /* meh.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; name = meh.tgs; path = ../submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/meh.tgs; sourceTree = SOURCE_ROOT; }; + 1DD70E293AA15AF800000000 /* BlueIconIpad.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = BlueIconIpad.png; path = "../Telegram-iOS/BlueIconIpad.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E293C169B2E00000000 /* powerful_mask@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "powerful_mask@2x.png"; path = "../Telegram-iOS/Resources/intro/powerful_mask@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E293C514E0100000000 /* begin_record.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = begin_record.caf; path = "../Telegram-iOS/Resources/begin_record.caf"; sourceTree = SOURCE_ROOT; }; + 1DD70E293E51265C00000000 /* cry.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; name = cry.tgs; path = ../submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/cry.tgs; sourceTree = SOURCE_ROOT; }; + 1DD70E293F61D17900000000 /* MessageSent.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = MessageSent.caf; path = ../submodules/TelegramUI/TelegramUI/Sounds/MessageSent.caf; sourceTree = SOURCE_ROOT; }; + 1DD70E2940197DFD00000000 /* VimeoUserScript.js */ = {isa = PBXFileReference; explicitFileType = sourcecode.javascript; name = VimeoUserScript.js; path = ../submodules/TelegramUI/TelegramUI/Resources/WebEmbed/VimeoUserScript.js; sourceTree = SOURCE_ROOT; }; + 1DD70E29406BEF2900000000 /* anim_archiveAvatar.json */ = {isa = PBXFileReference; explicitFileType = text.json; name = anim_archiveAvatar.json; path = ../submodules/TelegramUI/TelegramUI/Resources/Animations/anim_archiveAvatar.json; sourceTree = SOURCE_ROOT; }; + 1DD70E29443B21A300000000 /* stp_card_amex@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_amex@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_amex@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29453E9D0800000000 /* powerful_star@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "powerful_star@2x.png"; path = "../Telegram-iOS/Resources/intro/powerful_star@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E2945EFFA4200000000 /* stp_card_amex@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_amex@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_amex@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E2945FD987A00000000 /* smile.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; name = smile.tgs; path = ../submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/smile.tgs; sourceTree = SOURCE_ROOT; }; + 1DD70E2948ED794E00000000 /* telegram_plane1@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "telegram_plane1@2x.png"; path = "../Telegram-iOS/Resources/intro/telegram_plane1@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E294906F2A500000000 /* AppLibrary-Profile.xcconfig */ = {isa = PBXFileReference; explicitFileType = text.xcconfig; name = "AppLibrary-Profile.xcconfig"; path = "../buck-out/gen/App/AppLibrary-Profile.xcconfig"; sourceTree = SOURCE_ROOT; }; + 1DD70E294D77B07700000000 /* anim_infotip.json */ = {isa = PBXFileReference; explicitFileType = text.json; name = anim_infotip.json; path = ../submodules/TelegramUI/TelegramUI/Resources/Animations/anim_infotip.json; sourceTree = SOURCE_ROOT; }; + 1DD70E294D95CA7700000000 /* stp_card_form_applepay@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_form_applepay@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_form_applepay@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E294E27EDFB00000000 /* AppLibrary-Debug.xcconfig */ = {isa = PBXFileReference; explicitFileType = text.xcconfig; name = "AppLibrary-Debug.xcconfig"; path = "../buck-out/gen/App/AppLibrary-Debug.xcconfig"; sourceTree = SOURCE_ROOT; }; + 1DD70E294F4AA31600000000 /* stp_card_form_applepay@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_form_applepay@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_form_applepay@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29501FCBD600000000 /* telegram_sphere@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "telegram_sphere@2x.png"; path = "../Telegram-iOS/Resources/intro/telegram_sphere@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E2951A94A6400000000 /* start_arrow_ipad@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "start_arrow_ipad@2x.png"; path = "../Telegram-iOS/Resources/intro/start_arrow_ipad@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E295283D1B900000000 /* celebrate.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; name = celebrate.tgs; path = ../submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/celebrate.tgs; sourceTree = SOURCE_ROOT; }; + 1DD70E2956813D8800000000 /* PhoneCountries.txt */ = {isa = PBXFileReference; explicitFileType = text; name = PhoneCountries.txt; path = ../submodules/TelegramUI/TelegramUI/Resources/PhoneCountries.txt; sourceTree = SOURCE_ROOT; }; + 1DD70E2957CD649600000000 /* voip_end.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = voip_end.caf; path = "../Telegram-iOS/Resources/voip_end.caf"; sourceTree = SOURCE_ROOT; }; + 1DD70E295AFA9C2600000000 /* BlueClassicIconIpad@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlueClassicIconIpad@2x.png"; path = "../Telegram-iOS/BlueClassicIconIpad@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E295B2A553100000000 /* BlueFilledIconLargeIpad@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlueFilledIconLargeIpad@2x.png"; path = "../Telegram-iOS/BlueFilledIconLargeIpad@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E295B60B39500000000 /* start_arrow@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "start_arrow@2x.png"; path = "../Telegram-iOS/Resources/intro/start_arrow@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E295D05708E00000000 /* TwitchUserScript.js */ = {isa = PBXFileReference; explicitFileType = sourcecode.javascript; name = TwitchUserScript.js; path = ../submodules/TelegramUI/TelegramUI/Resources/WebEmbed/TwitchUserScript.js; sourceTree = SOURCE_ROOT; }; + 1DD70E295FFC844500000000 /* notification.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = notification.caf; path = ../submodules/TelegramUI/TelegramUI/Sounds/notification.caf; sourceTree = SOURCE_ROOT; }; + 1DD70E296587237E00000000 /* YoutubeUserScript.js */ = {isa = PBXFileReference; explicitFileType = sourcecode.javascript; name = YoutubeUserScript.js; path = ../submodules/TelegramUI/TelegramUI/Resources/WebEmbed/YoutubeUserScript.js; sourceTree = SOURCE_ROOT; }; + 1DD70E2965E934B700000000 /* voip_fail.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = voip_fail.caf; path = "../Telegram-iOS/Resources/voip_fail.caf"; sourceTree = SOURCE_ROOT; }; + 1DD70E2966DD7C1700000000 /* BlueClassicNotificationIcon.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = BlueClassicNotificationIcon.png; path = "../Telegram-iOS/BlueClassicNotificationIcon.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E2967C217F600000000 /* anim_unmute.json */ = {isa = PBXFileReference; explicitFileType = text.json; name = anim_unmute.json; path = ../submodules/TelegramUI/TelegramUI/Resources/Animations/anim_unmute.json; sourceTree = SOURCE_ROOT; }; + 1DD70E2968FBAA6A00000000 /* LegacyComponentsResources.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; name = LegacyComponentsResources.bundle; path = ../submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle; sourceTree = SOURCE_ROOT; }; + 1DD70E296A98D72D00000000 /* libAsyncDisplayKit.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = libAsyncDisplayKit.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + 1DD70E296ABF6A1200000000 /* Empty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Empty.swift; path = SupportFiles/Empty.swift; sourceTree = SOURCE_ROOT; }; + 1DD70E296AD832AE00000000 /* ic_cam_lens@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "ic_cam_lens@2x.png"; path = "../Telegram-iOS/Resources/intro/ic_cam_lens@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E296C599FD900000000 /* NavigationBackArrowLight@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "NavigationBackArrowLight@2x.png"; path = "../Telegram-iOS/Resources/NavigationBackArrowLight@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E296E8A8A4800000000 /* sad.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; name = sad.tgs; path = ../submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/sad.tgs; sourceTree = SOURCE_ROOT; }; + 1DD70E296F409B3900000000 /* voip_connecting.mp3 */ = {isa = PBXFileReference; explicitFileType = audio.mp3; name = voip_connecting.mp3; path = "../Telegram-iOS/Resources/voip_connecting.mp3"; sourceTree = SOURCE_ROOT; }; + 1DD70E29705B110100000000 /* stp_card_visa@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_visa@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_visa@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29720FE9A000000000 /* stp_card_visa@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_visa@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_visa@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29748244C600000000 /* Twitch.html */ = {isa = PBXFileReference; explicitFileType = text.html; name = Twitch.html; path = ../submodules/TelegramUI/TelegramUI/Resources/WebEmbed/Twitch.html; sourceTree = SOURCE_ROOT; }; + 1DD70E2974B4E65D00000000 /* 100.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 100.m4a; path = "../Telegram-iOS/Resources/notifications/100.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E2974C2FDDE00000000 /* 101.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 101.m4a; path = "../Telegram-iOS/Resources/notifications/101.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E2974D1155F00000000 /* 102.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 102.m4a; path = "../Telegram-iOS/Resources/notifications/102.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E2974DF2CE000000000 /* 103.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 103.m4a; path = "../Telegram-iOS/Resources/notifications/103.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E2974ED446100000000 /* 104.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 104.m4a; path = "../Telegram-iOS/Resources/notifications/104.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E2974FB5BE200000000 /* 105.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 105.m4a; path = "../Telegram-iOS/Resources/notifications/105.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E297509736300000000 /* 106.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 106.m4a; path = "../Telegram-iOS/Resources/notifications/106.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E2975178AE400000000 /* 107.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 107.m4a; path = "../Telegram-iOS/Resources/notifications/107.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E297525A26500000000 /* 108.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 108.m4a; path = "../Telegram-iOS/Resources/notifications/108.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E297533B9E600000000 /* 109.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 109.m4a; path = "../Telegram-iOS/Resources/notifications/109.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E2975FF5D6600000000 /* anim_hide.json */ = {isa = PBXFileReference; explicitFileType = text.json; name = anim_hide.json; path = ../submodules/TelegramUI/TelegramUI/Resources/Animations/anim_hide.json; sourceTree = SOURCE_ROOT; }; + 1DD70E297669BEFC00000000 /* 110.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 110.m4a; path = "../Telegram-iOS/Resources/notifications/110.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E297677D67D00000000 /* 111.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; name = 111.m4a; path = "../Telegram-iOS/Resources/notifications/111.m4a"; sourceTree = SOURCE_ROOT; }; + 1DD70E2977E4942F00000000 /* BlueIconLargeIpad@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlueIconLargeIpad@2x.png"; path = "../Telegram-iOS/BlueIconLargeIpad@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E297809716A00000000 /* ChatWallpaperBuiltin0.jpg */ = {isa = PBXFileReference; explicitFileType = image.jpeg; name = ChatWallpaperBuiltin0.jpg; path = ../submodules/TelegramUI/TelegramUI/Resources/ChatWallpaperBuiltin0.jpg; sourceTree = SOURCE_ROOT; }; + 1DD70E29793765CC00000000 /* ic_smile_eye@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "ic_smile_eye@2x.png"; path = "../Telegram-iOS/Resources/intro/ic_smile_eye@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29799DE7B600000000 /* Youtube.html */ = {isa = PBXFileReference; explicitFileType = text.html; name = Youtube.html; path = ../submodules/TelegramUI/TelegramUI/Resources/WebEmbed/Youtube.html; sourceTree = SOURCE_ROOT; }; + 1DD70E297ADFB9F200000000 /* libAppLibrary.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libAppLibrary.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 1DD70E297ADFB9F200000001 /* libAppLibrary.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libAppLibrary.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 1DD70E297D676FDE00000000 /* Telegram-Profile.xcconfig */ = {isa = PBXFileReference; explicitFileType = text.xcconfig; name = "Telegram-Profile.xcconfig"; path = "../buck-out/gen/App/Telegram-Profile.xcconfig"; sourceTree = SOURCE_ROOT; }; + 1DD70E297E472C5600000000 /* BlackFilledIconLargeIpad@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlackFilledIconLargeIpad@2x.png"; path = "../Telegram-iOS/BlackFilledIconLargeIpad@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E2985169C9700000000 /* ic_cam@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "ic_cam@2x.png"; path = "../Telegram-iOS/Resources/intro/ic_cam@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29853D725600000000 /* SFCompactRounded-Semibold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "SFCompactRounded-Semibold.otf"; path = "../submodules/TelegramUI/TelegramUI/Resources/Fonts/SFCompactRounded-Semibold.otf"; sourceTree = SOURCE_ROOT; }; + 1DD70E29884756EF00000000 /* anim_mute.json */ = {isa = PBXFileReference; explicitFileType = text.json; name = anim_mute.json; path = ../submodules/TelegramUI/TelegramUI/Resources/Animations/anim_mute.json; sourceTree = SOURCE_ROOT; }; + 1DD70E2988BEEF0900000000 /* BlackIcon@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlackIcon@2x.png"; path = "../Telegram-iOS/BlackIcon@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E298A46FE9000000000 /* ic_bubble@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "ic_bubble@2x.png"; path = "../Telegram-iOS/Resources/intro/ic_bubble@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E298A73C7A800000000 /* BlackIcon@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlackIcon@3x.png"; path = "../Telegram-iOS/BlackIcon@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E298AA6EB1400000000 /* BlackIconLargeIpad@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlackIconLargeIpad@2x.png"; path = "../Telegram-iOS/BlackIconLargeIpad@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E298CC42D1400000000 /* stp_card_applepay@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_applepay@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_applepay@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E298DB231DC00000000 /* stp_card_placeholder_template@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_placeholder_template@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_placeholder_template@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E298E7905B300000000 /* stp_card_applepay@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_applepay@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_applepay@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E298E96E34200000000 /* LaunchScreen.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = LaunchScreen.xib; path = "../Telegram-iOS/Base.lproj/LaunchScreen.xib"; sourceTree = SOURCE_ROOT; }; + 1DD70E298F670A7B00000000 /* stp_card_placeholder_template@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_placeholder_template@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_placeholder_template@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E2994DA3D4400000000 /* stp_card_diners_template@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_diners_template@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_diners_template@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29968F15E300000000 /* stp_card_diners_template@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_diners_template@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_diners_template@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29976A9EA600000000 /* stp_card_amex_template@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_amex_template@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_amex_template@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29988E33D500000000 /* Application.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Application.swift; path = Sources/Application.swift; sourceTree = SOURCE_ROOT; }; + 1DD70E29991F774500000000 /* stp_card_amex_template@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_amex_template@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_amex_template@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E2999319B4600000000 /* ic_bubble_dot@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "ic_bubble_dot@2x.png"; path = "../Telegram-iOS/Resources/intro/ic_bubble_dot@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E299F00BA0200000000 /* anim_archive.json */ = {isa = PBXFileReference; explicitFileType = text.json; name = anim_archive.json; path = ../submodules/TelegramUI/TelegramUI/Resources/Animations/anim_archive.json; sourceTree = SOURCE_ROOT; }; + 1DD70E299F5C287E00000000 /* stp_card_form_back@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_form_back@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_form_back@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29A0160D3000000000 /* stp_card_discover_template@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_discover_template@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_discover_template@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29A111011D00000000 /* stp_card_form_back@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_form_back@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_form_back@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29A1CAE5CF00000000 /* stp_card_discover_template@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_discover_template@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_discover_template@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29A28B5AB000000000 /* anim_archiveswipe.json */ = {isa = PBXFileReference; explicitFileType = text.json; name = anim_archiveswipe.json; path = ../submodules/TelegramUI/TelegramUI/Resources/Animations/anim_archiveswipe.json; sourceTree = SOURCE_ROOT; }; + 1DD70E29A4169AE300000000 /* AppIcons.xcassets */ = {isa = PBXFileReference; explicitFileType = folder.assetcatalog; name = AppIcons.xcassets; path = "../Telegram-iOS/AppIcons.xcassets"; sourceTree = SOURCE_ROOT; }; + 1DD70E29A75B899200000000 /* BlackClassicNotificationIcon.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = BlackClassicNotificationIcon.png; path = "../Telegram-iOS/BlackClassicNotificationIcon.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29A86C10B100000000 /* BlackClassicIconIpad.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = BlackClassicIconIpad.png; path = "../Telegram-iOS/BlackClassicIconIpad.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29A8C8657400000000 /* Telegram-Debug.xcconfig */ = {isa = PBXFileReference; explicitFileType = text.xcconfig; name = "Telegram-Debug.xcconfig"; path = "../buck-out/gen/App/Telegram-Debug.xcconfig"; sourceTree = SOURCE_ROOT; }; + 1DD70E29A9DA63C800000000 /* fast_arrow_shadow@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "fast_arrow_shadow@2x.png"; path = "../Telegram-iOS/Resources/intro/fast_arrow_shadow@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29ABD35C0F00000000 /* anim_pin.json */ = {isa = PBXFileReference; explicitFileType = text.json; name = anim_pin.json; path = ../submodules/TelegramUI/TelegramUI/Resources/Animations/anim_pin.json; sourceTree = SOURCE_ROOT; }; + 1DD70E29B22505DC00000000 /* libMtProtoKit.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = libMtProtoKit.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + 1DD70E29B308DE2800000000 /* anim_unpin.json */ = {isa = PBXFileReference; explicitFileType = text.json; name = anim_unpin.json; path = ../submodules/TelegramUI/TelegramUI/Resources/Animations/anim_unpin.json; sourceTree = SOURCE_ROOT; }; + 1DD70E29B3538C4D00000000 /* fast_spiral@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "fast_spiral@2x.png"; path = "../Telegram-iOS/Resources/intro/fast_spiral@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29B3A6F94500000000 /* stp_card_diners@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_diners@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_diners@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29B55BD1E400000000 /* stp_card_diners@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_diners@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_diners@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29B78460EB00000000 /* poker.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; name = poker.tgs; path = ../submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/poker.tgs; sourceTree = SOURCE_ROOT; }; + 1DD70E29B9D1C16900000000 /* private_screw@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "private_screw@2x.png"; path = "../Telegram-iOS/Resources/intro/private_screw@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29BA96313500000000 /* Vimeo.html */ = {isa = PBXFileReference; explicitFileType = text.html; name = Vimeo.html; path = ../submodules/TelegramUI/TelegramUI/Resources/WebEmbed/Vimeo.html; sourceTree = SOURCE_ROOT; }; + 1DD70E29BAE267F200000000 /* powerful_infinity@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "powerful_infinity@2x.png"; path = "../Telegram-iOS/Resources/intro/powerful_infinity@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29BC9D9E0700000000 /* AppLibrary-Release.xcconfig */ = {isa = PBXFileReference; explicitFileType = text.xcconfig; name = "AppLibrary-Release.xcconfig"; path = "../buck-out/gen/App/AppLibrary-Release.xcconfig"; sourceTree = SOURCE_ROOT; }; + 1DD70E29BE69B5E500000000 /* anim_group.json */ = {isa = PBXFileReference; explicitFileType = text.json; name = anim_group.json; path = ../submodules/TelegramUI/TelegramUI/Resources/Animations/anim_group.json; sourceTree = SOURCE_ROOT; }; + 1DD70E29BF5CBB6200000000 /* knot_up1@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "knot_up1@2x.png"; path = "../Telegram-iOS/Resources/intro/knot_up1@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29BF88817800000000 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Sources/main.m; sourceTree = SOURCE_ROOT; }; + 1DD70E29C097583600000000 /* BlueClassicIconIpad.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = BlueClassicIconIpad.png; path = "../Telegram-iOS/BlueClassicIconIpad.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29C320736D00000000 /* BlueClassicIconLargeIpad@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlueClassicIconLargeIpad@2x.png"; path = "../Telegram-iOS/BlueClassicIconLargeIpad@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29C364694E00000000 /* ok.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; name = ok.tgs; path = ../submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/ok.tgs; sourceTree = SOURCE_ROOT; }; + 1DD70E29C3C271B400000000 /* stp_card_cvc_amex@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_cvc_amex@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_cvc_amex@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29C54DDB8700000000 /* BlackFilledIcon@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlackFilledIcon@2x.png"; path = "../Telegram-iOS/BlackFilledIcon@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29C5774A5300000000 /* stp_card_cvc_amex@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_cvc_amex@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_cvc_amex@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29C682CDCB00000000 /* BlackClassicIconIpad@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlackClassicIconIpad@2x.png"; path = "../Telegram-iOS/BlackClassicIconIpad@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29C702B42600000000 /* BlackFilledIcon@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlackFilledIcon@3x.png"; path = "../Telegram-iOS/BlackFilledIcon@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29C78B98B000000000 /* voip_ringback.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = voip_ringback.caf; path = "../Telegram-iOS/Resources/voip_ringback.caf"; sourceTree = SOURCE_ROOT; }; + 1DD70E29CAE3F0A300000000 /* BlueNotificationIcon@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlueNotificationIcon@2x.png"; path = "../Telegram-iOS/BlueNotificationIcon@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29CC98C94200000000 /* BlueNotificationIcon@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlueNotificationIcon@3x.png"; path = "../Telegram-iOS/BlueNotificationIcon@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29CE4715BE00000000 /* anim_ungroup.json */ = {isa = PBXFileReference; explicitFileType = text.json; name = anim_ungroup.json; path = ../submodules/TelegramUI/TelegramUI/Resources/Animations/anim_ungroup.json; sourceTree = SOURCE_ROOT; }; + 1DD70E29CED3B81F00000000 /* BlackIconIpad@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlackIconIpad@2x.png"; path = "../Telegram-iOS/BlackIconIpad@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29CFF88DE800000000 /* ic_videocam@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "ic_videocam@2x.png"; path = "../Telegram-iOS/Resources/intro/ic_videocam@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29D061F39E00000000 /* BlackNotificationIcon@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlackNotificationIcon@2x.png"; path = "../Telegram-iOS/BlackNotificationIcon@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29D216CC3D00000000 /* BlackNotificationIcon@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlackNotificationIcon@3x.png"; path = "../Telegram-iOS/BlackNotificationIcon@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29D373AFE200000000 /* BlueFilledIconIpad@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlueFilledIconIpad@2x.png"; path = "../Telegram-iOS/BlueFilledIconIpad@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29D42F293000000000 /* stp_card_cvc@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_cvc@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_cvc@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29D43F404C00000000 /* BlueFilledIcon@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlueFilledIcon@2x.png"; path = "../Telegram-iOS/BlueFilledIcon@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29D548E25500000000 /* stp_card_applepay_template@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_applepay_template@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_applepay_template@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29D5E401CF00000000 /* stp_card_cvc@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_cvc@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_cvc@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29D5F418EB00000000 /* BlueFilledIcon@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlueFilledIcon@3x.png"; path = "../Telegram-iOS/BlueFilledIcon@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29D64F57BC00000000 /* fast_body@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "fast_body@2x.png"; path = "../Telegram-iOS/Resources/intro/fast_body@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29D65BA68200000000 /* libSwiftSignalKit.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = libSwiftSignalKit.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + 1DD70E29D6FDBAF400000000 /* stp_card_applepay_template@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_applepay_template@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_applepay_template@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29D743E0A500000000 /* BlueClassicNotificationIcon@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlueClassicNotificationIcon@2x.png"; path = "../Telegram-iOS/BlueClassicNotificationIcon@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29D83C37D400000000 /* Telegram.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; path = Telegram.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 1DD70E29D8F8B94400000000 /* BlueClassicNotificationIcon@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlueClassicNotificationIcon@3x.png"; path = "../Telegram-iOS/BlueClassicNotificationIcon@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29DB6520C800000000 /* libPostbox.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = libPostbox.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + 1DD70E29DBA6021D00000000 /* anim_delete.json */ = {isa = PBXFileReference; explicitFileType = text.json; name = anim_delete.json; path = ../submodules/TelegramUI/TelegramUI/Resources/Animations/anim_delete.json; sourceTree = SOURCE_ROOT; }; + 1DD70E29DC82BB6100000000 /* anim_success.json */ = {isa = PBXFileReference; explicitFileType = text.json; name = anim_success.json; path = ../submodules/TelegramUI/TelegramUI/Resources/Animations/anim_success.json; sourceTree = SOURCE_ROOT; }; + 1DD70E29E03A369900000000 /* anim_unread.json */ = {isa = PBXFileReference; explicitFileType = text.json; name = anim_unread.json; path = ../submodules/TelegramUI/TelegramUI/Resources/Animations/anim_unread.json; sourceTree = SOURCE_ROOT; }; + 1DD70E29E0F809FE00000000 /* ic_smile@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "ic_smile@2x.png"; path = "../Telegram-iOS/Resources/intro/ic_smile@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29E16766DD00000000 /* BlackIconIpad.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = BlackIconIpad.png; path = "../Telegram-iOS/BlackIconIpad.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29E1BF190800000000 /* stp_card_visa_template@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_visa_template@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_visa_template@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29E373F1A700000000 /* stp_card_visa_template@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_visa_template@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_visa_template@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29E4269D4A00000000 /* BlackClassicNotificationIcon@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlackClassicNotificationIcon@2x.png"; path = "../Telegram-iOS/BlackClassicNotificationIcon@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29E5D6389D00000000 /* WhiteFilledIcon@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "WhiteFilledIcon@2x.png"; path = "../Telegram-iOS/WhiteFilledIcon@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29E5DB75E900000000 /* BlackClassicNotificationIcon@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlackClassicNotificationIcon@3x.png"; path = "../Telegram-iOS/BlackClassicNotificationIcon@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29E78B113C00000000 /* WhiteFilledIcon@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "WhiteFilledIcon@3x.png"; path = "../Telegram-iOS/WhiteFilledIcon@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29EB14130700000000 /* currencies.json */ = {isa = PBXFileReference; explicitFileType = text.json; name = currencies.json; path = ../submodules/TelegramUI/TelegramUI/Resources/currencies.json; sourceTree = SOURCE_ROOT; }; + 1DD70E29EE385A8D00000000 /* surprised.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; name = surprised.tgs; path = ../submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions/surprised.tgs; sourceTree = SOURCE_ROOT; }; + 1DD70E29EEB88B8E00000000 /* BlueIcon@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlueIcon@2x.png"; path = "../Telegram-iOS/BlueIcon@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29EFAF72C800000000 /* PresentationStrings.mapping */ = {isa = PBXFileReference; lastKnownFileType = file; name = PresentationStrings.mapping; path = ../submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping; sourceTree = SOURCE_ROOT; }; + 1DD70E29F06D642D00000000 /* BlueIcon@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "BlueIcon@3x.png"; path = "../Telegram-iOS/BlueIcon@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29F0FE1B4000000000 /* Telegram-Release.xcconfig */ = {isa = PBXFileReference; explicitFileType = text.xcconfig; name = "Telegram-Release.xcconfig"; path = "../buck-out/gen/App/Telegram-Release.xcconfig"; sourceTree = SOURCE_ROOT; }; + 1DD70E29F1FA330600000000 /* Emoji.mapping */ = {isa = PBXFileReference; lastKnownFileType = file; name = Emoji.mapping; path = ../submodules/TelegramUI/TelegramUI/Resources/Emoji.mapping; sourceTree = SOURCE_ROOT; }; + 1DD70E29F6D6001100000000 /* ic_pin@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "ic_pin@2x.png"; path = "../Telegram-iOS/Resources/intro/ic_pin@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29F76B198200000000 /* Generic.html */ = {isa = PBXFileReference; explicitFileType = text.html; name = Generic.html; path = ../submodules/TelegramUI/TelegramUI/Resources/WebEmbed/Generic.html; sourceTree = SOURCE_ROOT; }; + 1DD70E29F8214FD900000000 /* stp_card_discover@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_discover@2x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_discover@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29F9D6287800000000 /* stp_card_discover@3x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "stp_card_discover@3x.png"; path = "../submodules/TelegramUI/TelegramUI/Resources/Stripe/stp_card_discover@3x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29FA28CA1200000000 /* voip_busy.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = voip_busy.caf; path = "../Telegram-iOS/Resources/voip_busy.caf"; sourceTree = SOURCE_ROOT; }; + 1DD70E29FABB82B800000000 /* start_arrow_ipad.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = start_arrow_ipad.png; path = "../Telegram-iOS/Resources/intro/start_arrow_ipad.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29FB06A0E800000000 /* knot_down@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "knot_down@2x.png"; path = "../Telegram-iOS/Resources/intro/knot_down@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29FE6965DB00000000 /* fast_arrow@2x.png */ = {isa = PBXFileReference; explicitFileType = image.png; name = "fast_arrow@2x.png"; path = "../Telegram-iOS/Resources/intro/fast_arrow@2x.png"; sourceTree = SOURCE_ROOT; }; + 1DD70E29FF334B1F00000000 /* libDisplay.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; path = libDisplay.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 4F426D880000000000000000 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 0; + files = ( + E7A30F047ADFB9F200000000 /* libAppLibrary.a in Frameworks */, + E7A30F046A98D72D00000000 /* libAsyncDisplayKit.dylib in Frameworks */, + E7A30F04FF334B1F00000001 /* libDisplay.dylib in Frameworks */, + E7A30F04B22505DC00000000 /* libMtProtoKit.dylib in Frameworks */, + E7A30F04DB6520C800000001 /* libPostbox.dylib in Frameworks */, + E7A30F04D65BA68200000001 /* libSwiftSignalKit.dylib in Frameworks */, + E7A30F04119CDA0700000001 /* libTelegramCore.dylib in Frameworks */, + E7A30F041E5A1E9C00000001 /* libTelegramUI.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + B401C979013EDE0500000000 /* Resources */ = { + isa = PBXGroup; + children = ( + 1DD70E2902BAF11C00000000 /* 0.m4a */, + 1DD70E2902C9089D00000000 /* 1.m4a */, + 1DD70E2974B4E65D00000000 /* 100.m4a */, + 1DD70E2974C2FDDE00000000 /* 101.m4a */, + 1DD70E2974D1155F00000000 /* 102.m4a */, + 1DD70E2974DF2CE000000000 /* 103.m4a */, + 1DD70E2974ED446100000000 /* 104.m4a */, + 1DD70E2974FB5BE200000000 /* 105.m4a */, + 1DD70E297509736300000000 /* 106.m4a */, + 1DD70E2975178AE400000000 /* 107.m4a */, + 1DD70E297525A26500000000 /* 108.m4a */, + 1DD70E297533B9E600000000 /* 109.m4a */, + 1DD70E297669BEFC00000000 /* 110.m4a */, + 1DD70E297677D67D00000000 /* 111.m4a */, + 1DD70E2902D7201E00000000 /* 2.m4a */, + 1DD70E2902E5379F00000000 /* 3.m4a */, + 1DD70E2902F34F2000000000 /* 4.m4a */, + 1DD70E29030166A100000000 /* 5.m4a */, + 1DD70E29030F7E2200000000 /* 6.m4a */, + 1DD70E29031D95A300000000 /* 7.m4a */, + 1DD70E29032BAD2400000000 /* 8.m4a */, + 1DD70E290339C4A500000000 /* 9.m4a */, + 1DD70E29A4169AE300000000 /* AppIcons.xcassets */, + 1DD70E293453BAB500000000 /* BlackClassicIcon@2x.png */, + 1DD70E293608935400000000 /* BlackClassicIcon@3x.png */, + 1DD70E29A86C10B100000000 /* BlackClassicIconIpad.png */, + 1DD70E29C682CDCB00000000 /* BlackClassicIconIpad@2x.png */, + 1DD70E29039E80E800000000 /* BlackClassicIconLargeIpad@2x.png */, + 1DD70E29A75B899200000000 /* BlackClassicNotificationIcon.png */, + 1DD70E29E4269D4A00000000 /* BlackClassicNotificationIcon@2x.png */, + 1DD70E29E5DB75E900000000 /* BlackClassicNotificationIcon@3x.png */, + 1DD70E29C54DDB8700000000 /* BlackFilledIcon@2x.png */, + 1DD70E29C702B42600000000 /* BlackFilledIcon@3x.png */, + 1DD70E2936B60A1F00000000 /* BlackFilledIconIpad.png */, + 1DD70E2918FC359D00000000 /* BlackFilledIconIpad@2x.png */, + 1DD70E297E472C5600000000 /* BlackFilledIconLargeIpad@2x.png */, + 1DD70E2988BEEF0900000000 /* BlackIcon@2x.png */, + 1DD70E298A73C7A800000000 /* BlackIcon@3x.png */, + 1DD70E29E16766DD00000000 /* BlackIconIpad.png */, + 1DD70E29CED3B81F00000000 /* BlackIconIpad@2x.png */, + 1DD70E298AA6EB1400000000 /* BlackIconLargeIpad@2x.png */, + 1DD70E292E63F3BE00000000 /* BlackNotificationIcon.png */, + 1DD70E29D061F39E00000000 /* BlackNotificationIcon@2x.png */, + 1DD70E29D216CC3D00000000 /* BlackNotificationIcon@3x.png */, + 1DD70E29038EEE9000000000 /* BlueClassicIcon@2x.png */, + 1DD70E290543C72F00000000 /* BlueClassicIcon@3x.png */, + 1DD70E29C097583600000000 /* BlueClassicIconIpad.png */, + 1DD70E295AFA9C2600000000 /* BlueClassicIconIpad@2x.png */, + 1DD70E29C320736D00000000 /* BlueClassicIconLargeIpad@2x.png */, + 1DD70E2966DD7C1700000000 /* BlueClassicNotificationIcon.png */, + 1DD70E29D743E0A500000000 /* BlueClassicNotificationIcon@2x.png */, + 1DD70E29D8F8B94400000000 /* BlueClassicNotificationIcon@3x.png */, + 1DD70E29D43F404C00000000 /* BlueFilledIcon@2x.png */, + 1DD70E29D5F418EB00000000 /* BlueFilledIcon@3x.png */, + 1DD70E2905F13DFA00000000 /* BlueFilledIconIpad.png */, + 1DD70E29D373AFE200000000 /* BlueFilledIconIpad@2x.png */, + 1DD70E295B2A553100000000 /* BlueFilledIconLargeIpad@2x.png */, + 1DD70E29EEB88B8E00000000 /* BlueIcon@2x.png */, + 1DD70E29F06D642D00000000 /* BlueIcon@3x.png */, + 1DD70E293AA15AF800000000 /* BlueIconIpad.png */, + 1DD70E292DF18A2400000000 /* BlueIconIpad@2x.png */, + 1DD70E2977E4942F00000000 /* BlueIconLargeIpad@2x.png */, + 1DD70E291BA19CD900000000 /* BlueNotificationIcon.png */, + 1DD70E29CAE3F0A300000000 /* BlueNotificationIcon@2x.png */, + 1DD70E29CC98C94200000000 /* BlueNotificationIcon@3x.png */, + 1DD70E297809716A00000000 /* ChatWallpaperBuiltin0.jpg */, + 1DD70E29F1FA330600000000 /* Emoji.mapping */, + 1DD70E29F76B198200000000 /* Generic.html */, + 1DD70E29061BC94A00000000 /* GenericUserScript.js */, + 1DD70E292925AEA200000000 /* Icons.xcassets */, + 1DD70E293549D4C400000000 /* Images.xcassets */, + 1DD70E291292048700000000 /* Instagram.html */, + 1DD70E298E96E34200000000 /* LaunchScreen.xib */, + 1DD70E2968FBAA6A00000000 /* LegacyComponentsResources.bundle */, + C73440C0DCE9E9AA00000000 /* Localizable.strings */, + 1DD70E293F61D17900000000 /* MessageSent.caf */, + 1DD70E296C599FD900000000 /* NavigationBackArrowLight@2x.png */, + 1DD70E2928A3C00D00000000 /* NavigationShadow@2x.png */, + 1DD70E2956813D8800000000 /* PhoneCountries.txt */, + 1DD70E291040865A00000000 /* PhotoEditorCaption@2x.png */, + 1DD70E2911F55EF900000000 /* PhotoEditorCaption@3x.png */, + 1DD70E291882772900000000 /* PhotoEditorMute@2x.png */, + 1DD70E292DEB974300000000 /* PhotoEditorMuteActive@2x.png */, + 1DD70E29EFAF72C800000000 /* PresentationStrings.mapping */, + 1DD70E29853D725600000000 /* SFCompactRounded-Semibold.otf */, + 1DD70E29748244C600000000 /* Twitch.html */, + 1DD70E295D05708E00000000 /* TwitchUserScript.js */, + 1DD70E29BA96313500000000 /* Vimeo.html */, + 1DD70E2940197DFD00000000 /* VimeoUserScript.js */, + 1DD70E29E5D6389D00000000 /* WhiteFilledIcon@2x.png */, + 1DD70E29E78B113C00000000 /* WhiteFilledIcon@3x.png */, + 1DD70E29799DE7B600000000 /* Youtube.html */, + 1DD70E296587237E00000000 /* YoutubeUserScript.js */, + 1DD70E299F00BA0200000000 /* anim_archive.json */, + 1DD70E29406BEF2900000000 /* anim_archiveAvatar.json */, + 1DD70E29A28B5AB000000000 /* anim_archiveswipe.json */, + 1DD70E29DBA6021D00000000 /* anim_delete.json */, + 1DD70E29BE69B5E500000000 /* anim_group.json */, + 1DD70E2975FF5D6600000000 /* anim_hide.json */, + 1DD70E294D77B07700000000 /* anim_infotip.json */, + 1DD70E29884756EF00000000 /* anim_mute.json */, + 1DD70E29ABD35C0F00000000 /* anim_pin.json */, + 1DD70E2900BF759200000000 /* anim_read.json */, + 1DD70E29DC82BB6100000000 /* anim_success.json */, + 1DD70E292D05879B00000000 /* anim_unarchive.json */, + 1DD70E29CE4715BE00000000 /* anim_ungroup.json */, + 1DD70E2967C217F600000000 /* anim_unmute.json */, + 1DD70E29B308DE2800000000 /* anim_unpin.json */, + 1DD70E29E03A369900000000 /* anim_unread.json */, + 1DD70E293C514E0100000000 /* begin_record.caf */, + 1DD70E295283D1B900000000 /* celebrate.tgs */, + 1DD70E293E51265C00000000 /* cry.tgs */, + 1DD70E29EB14130700000000 /* currencies.json */, + 1DD70E29FE6965DB00000000 /* fast_arrow@2x.png */, + 1DD70E29A9DA63C800000000 /* fast_arrow_shadow@2x.png */, + 1DD70E29D64F57BC00000000 /* fast_body@2x.png */, + 1DD70E29B3538C4D00000000 /* fast_spiral@2x.png */, + 1DD70E290BE206B800000000 /* heart.tgs */, + 1DD70E298A46FE9000000000 /* ic_bubble@2x.png */, + 1DD70E2999319B4600000000 /* ic_bubble_dot@2x.png */, + 1DD70E2985169C9700000000 /* ic_cam@2x.png */, + 1DD70E296AD832AE00000000 /* ic_cam_lens@2x.png */, + 1DD70E2923B3C2EF00000000 /* ic_pencil@2x.png */, + 1DD70E29F6D6001100000000 /* ic_pin@2x.png */, + 1DD70E29E0F809FE00000000 /* ic_smile@2x.png */, + 1DD70E29793765CC00000000 /* ic_smile_eye@2x.png */, + 1DD70E29CFF88DE800000000 /* ic_videocam@2x.png */, + 1DD70E29FB06A0E800000000 /* knot_down@2x.png */, + 1DD70E29BF5CBB6200000000 /* knot_up1@2x.png */, + 1DD70E291493803B00000000 /* lol.tgs */, + 1DD70E293830E74200000000 /* meh.tgs */, + 1DD70E295FFC844500000000 /* notification.caf */, + 1DD70E29C364694E00000000 /* ok.tgs */, + 1DD70E29B78460EB00000000 /* poker.tgs */, + 1DD70E292602319200000000 /* poop.tgs */, + 1DD70E29BAE267F200000000 /* powerful_infinity@2x.png */, + 1DD70E2917567CC800000000 /* powerful_infinity_white@2x.png */, + 1DD70E293C169B2E00000000 /* powerful_mask@2x.png */, + 1DD70E29453E9D0800000000 /* powerful_star@2x.png */, + 1DD70E29225D12D700000000 /* private_door@2x.png */, + 1DD70E29B9D1C16900000000 /* private_screw@2x.png */, + 1DD70E296E8A8A4800000000 /* sad.tgs */, + 1DD70E2945FD987A00000000 /* smile.tgs */, + 1DD70E295B60B39500000000 /* start_arrow@2x.png */, + 1DD70E29FABB82B800000000 /* start_arrow_ipad.png */, + 1DD70E2951A94A6400000000 /* start_arrow_ipad@2x.png */, + 1DD70E29443B21A300000000 /* stp_card_amex@2x.png */, + 1DD70E2945EFFA4200000000 /* stp_card_amex@3x.png */, + 1DD70E29976A9EA600000000 /* stp_card_amex_template@2x.png */, + 1DD70E29991F774500000000 /* stp_card_amex_template@3x.png */, + 1DD70E298CC42D1400000000 /* stp_card_applepay@2x.png */, + 1DD70E298E7905B300000000 /* stp_card_applepay@3x.png */, + 1DD70E29D548E25500000000 /* stp_card_applepay_template@2x.png */, + 1DD70E29D6FDBAF400000000 /* stp_card_applepay_template@3x.png */, + 1DD70E29D42F293000000000 /* stp_card_cvc@2x.png */, + 1DD70E29D5E401CF00000000 /* stp_card_cvc@3x.png */, + 1DD70E29C3C271B400000000 /* stp_card_cvc_amex@2x.png */, + 1DD70E29C5774A5300000000 /* stp_card_cvc_amex@3x.png */, + 1DD70E29B3A6F94500000000 /* stp_card_diners@2x.png */, + 1DD70E29B55BD1E400000000 /* stp_card_diners@3x.png */, + 1DD70E2994DA3D4400000000 /* stp_card_diners_template@2x.png */, + 1DD70E29968F15E300000000 /* stp_card_diners_template@3x.png */, + 1DD70E29F8214FD900000000 /* stp_card_discover@2x.png */, + 1DD70E29F9D6287800000000 /* stp_card_discover@3x.png */, + 1DD70E29A0160D3000000000 /* stp_card_discover_template@2x.png */, + 1DD70E29A1CAE5CF00000000 /* stp_card_discover_template@3x.png */, + 1DD70E294D95CA7700000000 /* stp_card_form_applepay@2x.png */, + 1DD70E294F4AA31600000000 /* stp_card_form_applepay@3x.png */, + 1DD70E299F5C287E00000000 /* stp_card_form_back@2x.png */, + 1DD70E29A111011D00000000 /* stp_card_form_back@3x.png */, + 1DD70E290933E8F400000000 /* stp_card_form_front@2x.png */, + 1DD70E290AE8C19300000000 /* stp_card_form_front@3x.png */, + 1DD70E29193BD71700000000 /* stp_card_jcb@2x.png */, + 1DD70E291AF0AFB600000000 /* stp_card_jcb@3x.png */, + 1DD70E2900ACCBB200000000 /* stp_card_jcb_template@2x.png */, + 1DD70E290261A45100000000 /* stp_card_jcb_template@3x.png */, + 1DD70E291FC4F2F000000000 /* stp_card_mastercard@2x.png */, + 1DD70E292179CB8F00000000 /* stp_card_mastercard@3x.png */, + 1DD70E291572F3F900000000 /* stp_card_mastercard_template@2x.png */, + 1DD70E291727CC9800000000 /* stp_card_mastercard_template@3x.png */, + 1DD70E298DB231DC00000000 /* stp_card_placeholder_template@2x.png */, + 1DD70E298F670A7B00000000 /* stp_card_placeholder_template@3x.png */, + 1DD70E29705B110100000000 /* stp_card_visa@2x.png */, + 1DD70E29720FE9A000000000 /* stp_card_visa@3x.png */, + 1DD70E29E1BF190800000000 /* stp_card_visa_template@2x.png */, + 1DD70E29E373F1A700000000 /* stp_card_visa_template@3x.png */, + 1DD70E29EE385A8D00000000 /* surprised.tgs */, + 1DD70E2948ED794E00000000 /* telegram_plane1@2x.png */, + 1DD70E29501FCBD600000000 /* telegram_sphere@2x.png */, + 1DD70E2915A3422A00000000 /* thumbsup.tgs */, + 1DD70E29FA28CA1200000000 /* voip_busy.caf */, + 1DD70E296F409B3900000000 /* voip_connecting.mp3 */, + 1DD70E2957CD649600000000 /* voip_end.caf */, + 1DD70E2965E934B700000000 /* voip_fail.caf */, + 1DD70E29C78B98B000000000 /* voip_ringback.caf */, + ); + name = Resources; + sourceTree = ""; + }; + B401C9792F7F325000000000 /* Buck (Do Not Modify) */ = { + isa = PBXGroup; + children = ( + 1DD70E294E27EDFB00000000 /* AppLibrary-Debug.xcconfig */, + 1DD70E294906F2A500000000 /* AppLibrary-Profile.xcconfig */, + 1DD70E29BC9D9E0700000000 /* AppLibrary-Release.xcconfig */, + 1DD70E29A8C8657400000000 /* Telegram-Debug.xcconfig */, + 1DD70E297D676FDE00000000 /* Telegram-Profile.xcconfig */, + 1DD70E29F0FE1B4000000000 /* Telegram-Release.xcconfig */, + ); + name = "Buck (Do Not Modify)"; + sourceTree = ""; + }; + B401C97968022A5500000000 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 1DD70E297ADFB9F200000000 /* libAppLibrary.a */, + 1DD70E296A98D72D00000000 /* libAsyncDisplayKit.dylib */, + 1DD70E29FF334B1F00000000 /* libDisplay.dylib */, + 1DD70E29B22505DC00000000 /* libMtProtoKit.dylib */, + 1DD70E29DB6520C800000000 /* libPostbox.dylib */, + 1DD70E29D65BA68200000000 /* libSwiftSignalKit.dylib */, + 1DD70E29119CDA0700000000 /* libTelegramCore.dylib */, + 1DD70E291E5A1E9C00000000 /* libTelegramUI.dylib */, + ); + name = Frameworks; + sourceTree = ""; + }; + B401C979B2C34D2100000000 /* Telegram */ = { + isa = PBXGroup; + children = ( + 1DD70E29001F47FB00000001 /* BUCK */, + B401C979013EDE0500000000 /* Resources */, + B401C979EAB5339800000001 /* Sources */, + ); + name = Telegram; + sourceTree = ""; + }; + B401C979B781F65D00000000 /* Configurations */ = { + isa = PBXGroup; + children = ( + B401C9792F7F325000000000 /* Buck (Do Not Modify) */, + ); + name = Configurations; + sourceTree = ""; + }; + B401C979C43AA77A00000000 /* AppLibrary */ = { + isa = PBXGroup; + children = ( + 1DD70E29001F47FB00000000 /* BUCK */, + B401C979EAB5339800000000 /* Sources */, + ); + name = AppLibrary; + sourceTree = ""; + }; + B401C979C806358400000000 /* Products */ = { + isa = PBXGroup; + children = ( + 1DD70E29D83C37D400000000 /* Telegram.app */, + 1DD70E297ADFB9F200000001 /* libAppLibrary.a */, + ); + name = Products; + sourceTree = ""; + }; + B401C979EAB5339800000000 /* Sources */ = { + isa = PBXGroup; + children = ( + 1DD70E29988E33D500000000 /* Application.swift */, + 1DD70E29BF88817800000000 /* main.m */, + ); + name = Sources; + sourceTree = ""; + }; + B401C979EAB5339800000001 /* Sources */ = { + isa = PBXGroup; + children = ( + 1DD70E296ABF6A1200000000 /* Empty.swift */, + 1DD70E2906C06BEE00000000 /* Info.plist */, + ); + name = Sources; + sourceTree = ""; + }; + B401C979EFB6AC4600000000 /* mainGroup */ = { + isa = PBXGroup; + children = ( + B401C979C43AA77A00000000 /* AppLibrary */, + B401C979B781F65D00000000 /* Configurations */, + B401C97968022A5500000000 /* Frameworks */, + B401C979C806358400000000 /* Products */, + B401C979B2C34D2100000000 /* Telegram */, + ); + name = mainGroup; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + E66DC04EB2C34D2100000000 /* Telegram */ = { + isa = PBXNativeTarget; + buildConfigurationList = 218C37090000000000000001 /* Build configuration list for PBXNativeTarget "Telegram" */; + buildPhases = ( + 1870857F0000000000000001 /* Sources */, + 4F426D880000000000000000 /* Frameworks */, + 8A032D2C0000000000000000 /* Resources */, + FAF5FAC90000000000000001 /* CopyFiles */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Telegram; + productName = Telegram; + productReference = 1DD70E29D83C37D400000000 /* Telegram.app */; + productType = "com.apple.product-type.application"; + }; + E66DC04EC43AA77A00000000 /* AppLibrary */ = { + isa = PBXNativeTarget; + buildConfigurationList = 218C37090000000000000000 /* Build configuration list for PBXNativeTarget "AppLibrary" */; + buildPhases = ( + 1870857F0000000000000000 /* Sources */, + FAF5FAC90000000000000000 /* Fake Swift Dependencies (Copy Files Phase) */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = AppLibrary; + productName = AppLibrary; + productReference = 1DD70E297ADFB9F200000001 /* libAppLibrary.a */; + productType = "com.apple.product-type.library.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 96C847930001020100000000 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 9999; + TargetAttributes = { + E66DC04EB2C34D2100000000 = { + DevelopmentTeam = X834Q8SBVP; + }; + }; + }; + buildConfigurationList = 218C37090000000000000002 /* Build configuration list for PBXProject "App" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ar, + ca, + de, + es, + fr, + id, + it, + ko, + ms, + nl, + pt, + ru, + tr, + uk, + ); + mainGroup = B401C979EFB6AC4600000000 /* mainGroup */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + E66DC04EC43AA77A00000000 /* AppLibrary */, + E66DC04EB2C34D2100000000 /* Telegram */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 8A032D2C0000000000000000 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 0; + files = ( + E7A30F049F00BA0200000000 /* anim_archive.json in Resources */, + E7A30F04406BEF2900000000 /* anim_archiveAvatar.json in Resources */, + E7A30F04A28B5AB000000000 /* anim_archiveswipe.json in Resources */, + E7A30F04DBA6021D00000000 /* anim_delete.json in Resources */, + E7A30F04BE69B5E500000000 /* anim_group.json in Resources */, + E7A30F0475FF5D6600000000 /* anim_hide.json in Resources */, + E7A30F044D77B07700000000 /* anim_infotip.json in Resources */, + E7A30F04884756EF00000000 /* anim_mute.json in Resources */, + E7A30F04ABD35C0F00000000 /* anim_pin.json in Resources */, + E7A30F0400BF759200000000 /* anim_read.json in Resources */, + E7A30F04DC82BB6100000000 /* anim_success.json in Resources */, + E7A30F042D05879B00000000 /* anim_unarchive.json in Resources */, + E7A30F04CE4715BE00000000 /* anim_ungroup.json in Resources */, + E7A30F0467C217F600000000 /* anim_unmute.json in Resources */, + E7A30F04B308DE2800000000 /* anim_unpin.json in Resources */, + E7A30F04E03A369900000000 /* anim_unread.json in Resources */, + E7A30F045283D1B900000000 /* celebrate.tgs in Resources */, + E7A30F043E51265C00000000 /* cry.tgs in Resources */, + E7A30F040BE206B800000000 /* heart.tgs in Resources */, + E7A30F041493803B00000000 /* lol.tgs in Resources */, + E7A30F043830E74200000000 /* meh.tgs in Resources */, + E7A30F04C364694E00000000 /* ok.tgs in Resources */, + E7A30F04B78460EB00000000 /* poker.tgs in Resources */, + E7A30F042602319200000000 /* poop.tgs in Resources */, + E7A30F046E8A8A4800000000 /* sad.tgs in Resources */, + E7A30F0445FD987A00000000 /* smile.tgs in Resources */, + E7A30F04EE385A8D00000000 /* surprised.tgs in Resources */, + E7A30F0415A3422A00000000 /* thumbsup.tgs in Resources */, + E7A30F047809716A00000000 /* ChatWallpaperBuiltin0.jpg in Resources */, + E7A30F04F1FA330600000000 /* Emoji.mapping in Resources */, + E7A30F04853D725600000000 /* SFCompactRounded-Semibold.otf in Resources */, + E7A30F0456813D8800000000 /* PhoneCountries.txt in Resources */, + E7A30F04EFAF72C800000000 /* PresentationStrings.mapping in Resources */, + E7A30F04443B21A300000000 /* stp_card_amex@2x.png in Resources */, + E7A30F0445EFFA4200000000 /* stp_card_amex@3x.png in Resources */, + E7A30F04976A9EA600000000 /* stp_card_amex_template@2x.png in Resources */, + E7A30F04991F774500000000 /* stp_card_amex_template@3x.png in Resources */, + E7A30F048CC42D1400000000 /* stp_card_applepay@2x.png in Resources */, + E7A30F048E7905B300000000 /* stp_card_applepay@3x.png in Resources */, + E7A30F04D548E25500000000 /* stp_card_applepay_template@2x.png in Resources */, + E7A30F04D6FDBAF400000000 /* stp_card_applepay_template@3x.png in Resources */, + E7A30F04D42F293000000000 /* stp_card_cvc@2x.png in Resources */, + E7A30F04D5E401CF00000000 /* stp_card_cvc@3x.png in Resources */, + E7A30F04C3C271B400000000 /* stp_card_cvc_amex@2x.png in Resources */, + E7A30F04C5774A5300000000 /* stp_card_cvc_amex@3x.png in Resources */, + E7A30F04B3A6F94500000000 /* stp_card_diners@2x.png in Resources */, + E7A30F04B55BD1E400000000 /* stp_card_diners@3x.png in Resources */, + E7A30F0494DA3D4400000000 /* stp_card_diners_template@2x.png in Resources */, + E7A30F04968F15E300000000 /* stp_card_diners_template@3x.png in Resources */, + E7A30F04F8214FD900000000 /* stp_card_discover@2x.png in Resources */, + E7A30F04F9D6287800000000 /* stp_card_discover@3x.png in Resources */, + E7A30F04A0160D3000000000 /* stp_card_discover_template@2x.png in Resources */, + E7A30F04A1CAE5CF00000000 /* stp_card_discover_template@3x.png in Resources */, + E7A30F044D95CA7700000000 /* stp_card_form_applepay@2x.png in Resources */, + E7A30F044F4AA31600000000 /* stp_card_form_applepay@3x.png in Resources */, + E7A30F049F5C287E00000000 /* stp_card_form_back@2x.png in Resources */, + E7A30F04A111011D00000000 /* stp_card_form_back@3x.png in Resources */, + E7A30F040933E8F400000000 /* stp_card_form_front@2x.png in Resources */, + E7A30F040AE8C19300000000 /* stp_card_form_front@3x.png in Resources */, + E7A30F04193BD71700000000 /* stp_card_jcb@2x.png in Resources */, + E7A30F041AF0AFB600000000 /* stp_card_jcb@3x.png in Resources */, + E7A30F0400ACCBB200000000 /* stp_card_jcb_template@2x.png in Resources */, + E7A30F040261A45100000000 /* stp_card_jcb_template@3x.png in Resources */, + E7A30F041FC4F2F000000000 /* stp_card_mastercard@2x.png in Resources */, + E7A30F042179CB8F00000000 /* stp_card_mastercard@3x.png in Resources */, + E7A30F041572F3F900000000 /* stp_card_mastercard_template@2x.png in Resources */, + E7A30F041727CC9800000000 /* stp_card_mastercard_template@3x.png in Resources */, + E7A30F048DB231DC00000000 /* stp_card_placeholder_template@2x.png in Resources */, + E7A30F048F670A7B00000000 /* stp_card_placeholder_template@3x.png in Resources */, + E7A30F04705B110100000000 /* stp_card_visa@2x.png in Resources */, + E7A30F04720FE9A000000000 /* stp_card_visa@3x.png in Resources */, + E7A30F04E1BF190800000000 /* stp_card_visa_template@2x.png in Resources */, + E7A30F04E373F1A700000000 /* stp_card_visa_template@3x.png in Resources */, + E7A30F04F76B198200000000 /* Generic.html in Resources */, + E7A30F04061BC94A00000000 /* GenericUserScript.js in Resources */, + E7A30F041292048700000000 /* Instagram.html in Resources */, + E7A30F04748244C600000000 /* Twitch.html in Resources */, + E7A30F045D05708E00000000 /* TwitchUserScript.js in Resources */, + E7A30F04BA96313500000000 /* Vimeo.html in Resources */, + E7A30F0440197DFD00000000 /* VimeoUserScript.js in Resources */, + E7A30F04799DE7B600000000 /* Youtube.html in Resources */, + E7A30F046587237E00000000 /* YoutubeUserScript.js in Resources */, + E7A30F04EB14130700000000 /* currencies.json in Resources */, + E7A30F043F61D17900000000 /* MessageSent.caf in Resources */, + E7A30F045FFC844500000000 /* notification.caf in Resources */, + E7A30F046C599FD900000000 /* NavigationBackArrowLight@2x.png in Resources */, + E7A30F0428A3C00D00000000 /* NavigationShadow@2x.png in Resources */, + E7A30F041040865A00000000 /* PhotoEditorCaption@2x.png in Resources */, + E7A30F0411F55EF900000000 /* PhotoEditorCaption@3x.png in Resources */, + E7A30F041882772900000000 /* PhotoEditorMute@2x.png in Resources */, + E7A30F042DEB974300000000 /* PhotoEditorMuteActive@2x.png in Resources */, + E7A30F043C514E0100000000 /* begin_record.caf in Resources */, + E7A30F04FE6965DB00000000 /* fast_arrow@2x.png in Resources */, + E7A30F04A9DA63C800000000 /* fast_arrow_shadow@2x.png in Resources */, + E7A30F04D64F57BC00000000 /* fast_body@2x.png in Resources */, + E7A30F04B3538C4D00000000 /* fast_spiral@2x.png in Resources */, + E7A30F048A46FE9000000000 /* ic_bubble@2x.png in Resources */, + E7A30F0499319B4600000000 /* ic_bubble_dot@2x.png in Resources */, + E7A30F0485169C9700000000 /* ic_cam@2x.png in Resources */, + E7A30F046AD832AE00000000 /* ic_cam_lens@2x.png in Resources */, + E7A30F0423B3C2EF00000000 /* ic_pencil@2x.png in Resources */, + E7A30F04F6D6001100000000 /* ic_pin@2x.png in Resources */, + E7A30F04E0F809FE00000000 /* ic_smile@2x.png in Resources */, + E7A30F04793765CC00000000 /* ic_smile_eye@2x.png in Resources */, + E7A30F04CFF88DE800000000 /* ic_videocam@2x.png in Resources */, + E7A30F04FB06A0E800000000 /* knot_down@2x.png in Resources */, + E7A30F04BF5CBB6200000000 /* knot_up1@2x.png in Resources */, + E7A30F04BAE267F200000000 /* powerful_infinity@2x.png in Resources */, + E7A30F0417567CC800000000 /* powerful_infinity_white@2x.png in Resources */, + E7A30F043C169B2E00000000 /* powerful_mask@2x.png in Resources */, + E7A30F04453E9D0800000000 /* powerful_star@2x.png in Resources */, + E7A30F04225D12D700000000 /* private_door@2x.png in Resources */, + E7A30F04B9D1C16900000000 /* private_screw@2x.png in Resources */, + E7A30F045B60B39500000000 /* start_arrow@2x.png in Resources */, + E7A30F04FABB82B800000000 /* start_arrow_ipad.png in Resources */, + E7A30F0451A94A6400000000 /* start_arrow_ipad@2x.png in Resources */, + E7A30F0448ED794E00000000 /* telegram_plane1@2x.png in Resources */, + E7A30F04501FCBD600000000 /* telegram_sphere@2x.png in Resources */, + E7A30F0402BAF11C00000000 /* 0.m4a in Resources */, + E7A30F0402C9089D00000000 /* 1.m4a in Resources */, + E7A30F0474B4E65D00000000 /* 100.m4a in Resources */, + E7A30F0474C2FDDE00000000 /* 101.m4a in Resources */, + E7A30F0474D1155F00000000 /* 102.m4a in Resources */, + E7A30F0474DF2CE000000000 /* 103.m4a in Resources */, + E7A30F0474ED446100000000 /* 104.m4a in Resources */, + E7A30F0474FB5BE200000000 /* 105.m4a in Resources */, + E7A30F047509736300000000 /* 106.m4a in Resources */, + E7A30F0475178AE400000000 /* 107.m4a in Resources */, + E7A30F047525A26500000000 /* 108.m4a in Resources */, + E7A30F047533B9E600000000 /* 109.m4a in Resources */, + E7A30F047669BEFC00000000 /* 110.m4a in Resources */, + E7A30F047677D67D00000000 /* 111.m4a in Resources */, + E7A30F0402D7201E00000000 /* 2.m4a in Resources */, + E7A30F0402E5379F00000000 /* 3.m4a in Resources */, + E7A30F0402F34F2000000000 /* 4.m4a in Resources */, + E7A30F04030166A100000000 /* 5.m4a in Resources */, + E7A30F04030F7E2200000000 /* 6.m4a in Resources */, + E7A30F04031D95A300000000 /* 7.m4a in Resources */, + E7A30F04032BAD2400000000 /* 8.m4a in Resources */, + E7A30F040339C4A500000000 /* 9.m4a in Resources */, + E7A30F04FA28CA1200000000 /* voip_busy.caf in Resources */, + E7A30F046F409B3900000000 /* voip_connecting.mp3 in Resources */, + E7A30F0457CD649600000000 /* voip_end.caf in Resources */, + E7A30F0465E934B700000000 /* voip_fail.caf in Resources */, + E7A30F04C78B98B000000000 /* voip_ringback.caf in Resources */, + E7A30F043453BAB500000000 /* BlackClassicIcon@2x.png in Resources */, + E7A30F043608935400000000 /* BlackClassicIcon@3x.png in Resources */, + E7A30F04A86C10B100000000 /* BlackClassicIconIpad.png in Resources */, + E7A30F04C682CDCB00000000 /* BlackClassicIconIpad@2x.png in Resources */, + E7A30F04039E80E800000000 /* BlackClassicIconLargeIpad@2x.png in Resources */, + E7A30F04A75B899200000000 /* BlackClassicNotificationIcon.png in Resources */, + E7A30F04E4269D4A00000000 /* BlackClassicNotificationIcon@2x.png in Resources */, + E7A30F04E5DB75E900000000 /* BlackClassicNotificationIcon@3x.png in Resources */, + E7A30F04C54DDB8700000000 /* BlackFilledIcon@2x.png in Resources */, + E7A30F04C702B42600000000 /* BlackFilledIcon@3x.png in Resources */, + E7A30F0436B60A1F00000000 /* BlackFilledIconIpad.png in Resources */, + E7A30F0418FC359D00000000 /* BlackFilledIconIpad@2x.png in Resources */, + E7A30F047E472C5600000000 /* BlackFilledIconLargeIpad@2x.png in Resources */, + E7A30F0488BEEF0900000000 /* BlackIcon@2x.png in Resources */, + E7A30F048A73C7A800000000 /* BlackIcon@3x.png in Resources */, + E7A30F04E16766DD00000000 /* BlackIconIpad.png in Resources */, + E7A30F04CED3B81F00000000 /* BlackIconIpad@2x.png in Resources */, + E7A30F048AA6EB1400000000 /* BlackIconLargeIpad@2x.png in Resources */, + E7A30F042E63F3BE00000000 /* BlackNotificationIcon.png in Resources */, + E7A30F04D061F39E00000000 /* BlackNotificationIcon@2x.png in Resources */, + E7A30F04D216CC3D00000000 /* BlackNotificationIcon@3x.png in Resources */, + E7A30F04038EEE9000000000 /* BlueClassicIcon@2x.png in Resources */, + E7A30F040543C72F00000000 /* BlueClassicIcon@3x.png in Resources */, + E7A30F04C097583600000000 /* BlueClassicIconIpad.png in Resources */, + E7A30F045AFA9C2600000000 /* BlueClassicIconIpad@2x.png in Resources */, + E7A30F04C320736D00000000 /* BlueClassicIconLargeIpad@2x.png in Resources */, + E7A30F0466DD7C1700000000 /* BlueClassicNotificationIcon.png in Resources */, + E7A30F04D743E0A500000000 /* BlueClassicNotificationIcon@2x.png in Resources */, + E7A30F04D8F8B94400000000 /* BlueClassicNotificationIcon@3x.png in Resources */, + E7A30F04D43F404C00000000 /* BlueFilledIcon@2x.png in Resources */, + E7A30F04D5F418EB00000000 /* BlueFilledIcon@3x.png in Resources */, + E7A30F0405F13DFA00000000 /* BlueFilledIconIpad.png in Resources */, + E7A30F04D373AFE200000000 /* BlueFilledIconIpad@2x.png in Resources */, + E7A30F045B2A553100000000 /* BlueFilledIconLargeIpad@2x.png in Resources */, + E7A30F04EEB88B8E00000000 /* BlueIcon@2x.png in Resources */, + E7A30F04F06D642D00000000 /* BlueIcon@3x.png in Resources */, + E7A30F043AA15AF800000000 /* BlueIconIpad.png in Resources */, + E7A30F042DF18A2400000000 /* BlueIconIpad@2x.png in Resources */, + E7A30F0477E4942F00000000 /* BlueIconLargeIpad@2x.png in Resources */, + E7A30F041BA19CD900000000 /* BlueNotificationIcon.png in Resources */, + E7A30F04CAE3F0A300000000 /* BlueNotificationIcon@2x.png in Resources */, + E7A30F04CC98C94200000000 /* BlueNotificationIcon@3x.png in Resources */, + E7A30F04E5D6389D00000000 /* WhiteFilledIcon@2x.png in Resources */, + E7A30F04E78B113C00000000 /* WhiteFilledIcon@3x.png in Resources */, + E7A30F048E96E34200000000 /* LaunchScreen.xib in Resources */, + E7A30F0468FBAA6A00000000 /* LegacyComponentsResources.bundle in Resources */, + E7A30F04A4169AE300000000 /* AppIcons.xcassets in Resources */, + E7A30F042925AEA200000000 /* Icons.xcassets in Resources */, + E7A30F043549D4C400000000 /* Images.xcassets in Resources */, + E7A30F04DCE9E9AA00000000 /* Localizable.strings in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 1870857F0000000000000000 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 0; + files = ( + E7A30F04988E33D500000000 /* Application.swift in Sources */, + E7A30F04BF88817800000000 /* main.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 1870857F0000000000000001 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 0; + files = ( + E7A30F046ABF6A1200000000 /* Empty.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + C73440C0DCE9E9AA00000000 /* Localizable.strings */ = { + isa = PBXVariantGroup; + children = ( + 1DD70E2900000C3100000000 /* ar */, + 1DD70E2900000C5E00000000 /* ca */, + 1DD70E2900000C8100000000 /* de */, + 1DD70E2900000CA900000000 /* en */, + 1DD70E2900000CAE00000000 /* es */, + 1DD70E2900000CCC00000000 /* fr */, + 1DD70E2900000D1B00000000 /* id */, + 1DD70E2900000D2B00000000 /* it */, + 1DD70E2900000D6400000000 /* ko */, + 1DD70E2900000DA600000000 /* ms */, + 1DD70E2900000DBE00000000 /* nl */, + 1DD70E2900000E0400000000 /* pt */, + 1DD70E2900000E4300000000 /* ru */, + 1DD70E2900000E7E00000000 /* tr */, + 1DD70E2900000E9600000000 /* uk */, + ); + name = Localizable.strings; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 4952437303EDA63300000000 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 1DD70E294E27EDFB00000000 /* AppLibrary-Debug.xcconfig */; + buildSettings = { + }; + name = Debug; + }; + 4952437303EDA63300000001 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 1DD70E29A8C8657400000000 /* Telegram-Debug.xcconfig */; + buildSettings = { + }; + name = Debug; + }; + 4952437303EDA63300000002 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Debug; + }; + 4952437350C7218900000000 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 1DD70E294906F2A500000000 /* AppLibrary-Profile.xcconfig */; + buildSettings = { + }; + name = Profile; + }; + 4952437350C7218900000001 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 1DD70E297D676FDE00000000 /* Telegram-Profile.xcconfig */; + buildSettings = { + }; + name = Profile; + }; + 4952437350C7218900000002 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Profile; + }; + 49524373A439BFE700000000 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 1DD70E29BC9D9E0700000000 /* AppLibrary-Release.xcconfig */; + buildSettings = { + }; + name = Release; + }; + 49524373A439BFE700000001 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 1DD70E29F0FE1B4000000000 /* Telegram-Release.xcconfig */; + buildSettings = { + }; + name = Release; + }; + 49524373A439BFE700000002 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 218C37090000000000000000 /* Build configuration list for PBXNativeTarget "AppLibrary" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 4952437303EDA63300000000 /* Debug */, + 4952437350C7218900000000 /* Profile */, + 49524373A439BFE700000000 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 218C37090000000000000001 /* Build configuration list for PBXNativeTarget "Telegram" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 4952437303EDA63300000001 /* Debug */, + 4952437350C7218900000001 /* Profile */, + 49524373A439BFE700000001 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 218C37090000000000000002 /* Build configuration list for PBXProject "App" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 4952437303EDA63300000002 /* Debug */, + 4952437350C7218900000002 /* Profile */, + 49524373A439BFE700000002 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 96C847930001020100000000 /* Project object */; +} diff --git a/App/App.xcodeproj/xcshareddata/xcschemes/App.xcscheme b/App/App.xcodeproj/xcshareddata/xcschemes/App.xcscheme index 6ca885fee6..636972782d 100644 --- a/App/App.xcodeproj/xcshareddata/xcschemes/App.xcscheme +++ b/App/App.xcodeproj/xcshareddata/xcschemes/App.xcscheme @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/App/App.xcworkspace/buck-project.meta.json b/App/App.xcworkspace/buck-project.meta.json deleted file mode 100644 index f0a3491a77..0000000000 --- a/App/App.xcworkspace/buck-project.meta.json +++ /dev/null @@ -1 +0,0 @@ -{"required-targets":["//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_ac3_parser.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_adts_parser.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_avcodec.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_avdct.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_avfft.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_d3d11va.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_dirac.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_dv_profile.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_dxva2.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_jni.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_mediacodec.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_qsv.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_vaapi.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_vdpau.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_version.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_videotoolbox.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_vorbis_parser.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_xvmc.h","//submodules/FFMpeg:ffmpeg_header_libavformat_sub_avformat.h","//submodules/FFMpeg:ffmpeg_header_libavformat_sub_avio.h","//submodules/FFMpeg:ffmpeg_header_libavformat_sub_version.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_adler32.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_aes.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_aes_ctr.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_attributes.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_audio_fifo.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_avassert.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_avconfig.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_avstring.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_avutil.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_base64.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_blowfish.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_bprint.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_bswap.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_buffer.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_camellia.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_cast5.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_channel_layout.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_common.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_cpu.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_crc.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_des.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_dict.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_display.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_downmix_info.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_encryption_info.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_error.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_eval.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_ffversion.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_fifo.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_file.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_frame.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hash.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hmac.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext_cuda.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext_d3d11va.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext_drm.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext_dxva2.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext_mediacodec.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext_qsv.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext_vaapi.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext_vdpau.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext_videotoolbox.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_imgutils.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_intfloat.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_intreadwrite.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_lfg.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_log.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_lzo.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_macros.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_mastering_display_metadata.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_mathematics.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_md5.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_mem.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_motion_vector.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_murmur3.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_opt.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_parseutils.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_pixdesc.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_pixelutils.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_pixfmt.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_random_seed.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_rational.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_rc4.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_replaygain.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_ripemd.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_samplefmt.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_sha.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_sha512.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_spherical.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_stereo3d.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_tea.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_threadmessage.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_time.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_timecode.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_timestamp.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_tree.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_twofish.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_version.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_xtea.h","//submodules/FFMpeg:ffmpeg_header_libswresample_sub_swresample.h","//submodules/FFMpeg:ffmpeg_header_libswresample_sub_version.h","//submodules/FFMpeg:libffmpeg_build","//submodules/MtProtoKit:openssl_libs","//submodules/Opus:opus_lib_file","//submodules/WebP:WebP_lib_file"],"xcconfig-paths":["buck-out/gen/App/App-Debug.xcconfig","buck-out/gen/App/App-Profile.xcconfig","buck-out/gen/App/App-Release.xcconfig","buck-out/gen/App/AppLibrary-Debug.xcconfig","buck-out/gen/App/AppLibrary-Profile.xcconfig","buck-out/gen/App/AppLibrary-Release.xcconfig","buck-out/gen/submodules/AccountContext/AccountContext-Debug.xcconfig","buck-out/gen/submodules/AccountContext/AccountContext-Profile.xcconfig","buck-out/gen/submodules/AccountContext/AccountContext-Release.xcconfig","buck-out/gen/submodules/ActionSheetPeerItem/ActionSheetPeerItem-Debug.xcconfig","buck-out/gen/submodules/ActionSheetPeerItem/ActionSheetPeerItem-Profile.xcconfig","buck-out/gen/submodules/ActionSheetPeerItem/ActionSheetPeerItem-Release.xcconfig","buck-out/gen/submodules/ActivityIndicator/ActivityIndicator-Debug.xcconfig","buck-out/gen/submodules/ActivityIndicator/ActivityIndicator-Profile.xcconfig","buck-out/gen/submodules/ActivityIndicator/ActivityIndicator-Release.xcconfig","buck-out/gen/submodules/AlertUI/AlertUI-Debug.xcconfig","buck-out/gen/submodules/AlertUI/AlertUI-Profile.xcconfig","buck-out/gen/submodules/AlertUI/AlertUI-Release.xcconfig","buck-out/gen/submodules/AnimationUI/AnimationUI-Debug.xcconfig","buck-out/gen/submodules/AnimationUI/AnimationUI-Profile.xcconfig","buck-out/gen/submodules/AnimationUI/AnimationUI-Release.xcconfig","buck-out/gen/submodules/AsyncDisplayKit/AsyncDisplayKit#shared-Debug.xcconfig","buck-out/gen/submodules/AsyncDisplayKit/AsyncDisplayKit#shared-Profile.xcconfig","buck-out/gen/submodules/AsyncDisplayKit/AsyncDisplayKit#shared-Release.xcconfig","buck-out/gen/submodules/AuthorizationUI/AuthorizationUI-Debug.xcconfig","buck-out/gen/submodules/AuthorizationUI/AuthorizationUI-Profile.xcconfig","buck-out/gen/submodules/AuthorizationUI/AuthorizationUI-Release.xcconfig","buck-out/gen/submodules/AvatarNode/AvatarNode-Debug.xcconfig","buck-out/gen/submodules/AvatarNode/AvatarNode-Profile.xcconfig","buck-out/gen/submodules/AvatarNode/AvatarNode-Release.xcconfig","buck-out/gen/submodules/BotPaymentsUI/BotPaymentsUI-Debug.xcconfig","buck-out/gen/submodules/BotPaymentsUI/BotPaymentsUI-Profile.xcconfig","buck-out/gen/submodules/BotPaymentsUI/BotPaymentsUI-Release.xcconfig","buck-out/gen/submodules/BuildConfig/BuildConfig-Debug.xcconfig","buck-out/gen/submodules/BuildConfig/BuildConfig-Profile.xcconfig","buck-out/gen/submodules/BuildConfig/BuildConfig-Release.xcconfig","buck-out/gen/submodules/CallListUI/CallListUI-Debug.xcconfig","buck-out/gen/submodules/CallListUI/CallListUI-Profile.xcconfig","buck-out/gen/submodules/CallListUI/CallListUI-Release.xcconfig","buck-out/gen/submodules/ChatListSearchItemHeader/ChatListSearchItemHeader-Debug.xcconfig","buck-out/gen/submodules/ChatListSearchItemHeader/ChatListSearchItemHeader-Profile.xcconfig","buck-out/gen/submodules/ChatListSearchItemHeader/ChatListSearchItemHeader-Release.xcconfig","buck-out/gen/submodules/ChatListSearchItemNode/ChatListSearchItemNode-Debug.xcconfig","buck-out/gen/submodules/ChatListSearchItemNode/ChatListSearchItemNode-Profile.xcconfig","buck-out/gen/submodules/ChatListSearchItemNode/ChatListSearchItemNode-Release.xcconfig","buck-out/gen/submodules/ChatListSearchRecentPeersNode/ChatListSearchRecentPeersNode-Debug.xcconfig","buck-out/gen/submodules/ChatListSearchRecentPeersNode/ChatListSearchRecentPeersNode-Profile.xcconfig","buck-out/gen/submodules/ChatListSearchRecentPeersNode/ChatListSearchRecentPeersNode-Release.xcconfig","buck-out/gen/submodules/ChatListUI/ChatListUI-Debug.xcconfig","buck-out/gen/submodules/ChatListUI/ChatListUI-Profile.xcconfig","buck-out/gen/submodules/ChatListUI/ChatListUI-Release.xcconfig","buck-out/gen/submodules/ChatTitleActivityNode/ChatTitleActivityNode-Debug.xcconfig","buck-out/gen/submodules/ChatTitleActivityNode/ChatTitleActivityNode-Profile.xcconfig","buck-out/gen/submodules/ChatTitleActivityNode/ChatTitleActivityNode-Release.xcconfig","buck-out/gen/submodules/CheckNode/CheckNode-Debug.xcconfig","buck-out/gen/submodules/CheckNode/CheckNode-Profile.xcconfig","buck-out/gen/submodules/CheckNode/CheckNode-Release.xcconfig","buck-out/gen/submodules/ComposePollUI/ComposePollUI-Debug.xcconfig","buck-out/gen/submodules/ComposePollUI/ComposePollUI-Profile.xcconfig","buck-out/gen/submodules/ComposePollUI/ComposePollUI-Release.xcconfig","buck-out/gen/submodules/ContactListUI/ContactListUI-Debug.xcconfig","buck-out/gen/submodules/ContactListUI/ContactListUI-Profile.xcconfig","buck-out/gen/submodules/ContactListUI/ContactListUI-Release.xcconfig","buck-out/gen/submodules/ContactsPeerItem/ContactsPeerItem-Debug.xcconfig","buck-out/gen/submodules/ContactsPeerItem/ContactsPeerItem-Profile.xcconfig","buck-out/gen/submodules/ContactsPeerItem/ContactsPeerItem-Release.xcconfig","buck-out/gen/submodules/ContextUI/ContextUI-Debug.xcconfig","buck-out/gen/submodules/ContextUI/ContextUI-Profile.xcconfig","buck-out/gen/submodules/ContextUI/ContextUI-Release.xcconfig","buck-out/gen/submodules/CounterContollerTitleView/CounterContollerTitleView-Debug.xcconfig","buck-out/gen/submodules/CounterContollerTitleView/CounterContollerTitleView-Profile.xcconfig","buck-out/gen/submodules/CounterContollerTitleView/CounterContollerTitleView-Release.xcconfig","buck-out/gen/submodules/CountrySelectionUI/CountrySelectionUI-Debug.xcconfig","buck-out/gen/submodules/CountrySelectionUI/CountrySelectionUI-Profile.xcconfig","buck-out/gen/submodules/CountrySelectionUI/CountrySelectionUI-Release.xcconfig","buck-out/gen/submodules/Crc32/Crc32-Debug.xcconfig","buck-out/gen/submodules/Crc32/Crc32-Profile.xcconfig","buck-out/gen/submodules/Crc32/Crc32-Release.xcconfig","buck-out/gen/submodules/DateSelectionUI/DateSelectionUI-Debug.xcconfig","buck-out/gen/submodules/DateSelectionUI/DateSelectionUI-Profile.xcconfig","buck-out/gen/submodules/DateSelectionUI/DateSelectionUI-Release.xcconfig","buck-out/gen/submodules/DeleteChatPeerActionSheetItem/DeleteChatPeerActionSheetItem-Debug.xcconfig","buck-out/gen/submodules/DeleteChatPeerActionSheetItem/DeleteChatPeerActionSheetItem-Profile.xcconfig","buck-out/gen/submodules/DeleteChatPeerActionSheetItem/DeleteChatPeerActionSheetItem-Release.xcconfig","buck-out/gen/submodules/DeviceAccess/DeviceAccess-Debug.xcconfig","buck-out/gen/submodules/DeviceAccess/DeviceAccess-Profile.xcconfig","buck-out/gen/submodules/DeviceAccess/DeviceAccess-Release.xcconfig","buck-out/gen/submodules/DeviceLocationManager/DeviceLocationManager-Debug.xcconfig","buck-out/gen/submodules/DeviceLocationManager/DeviceLocationManager-Profile.xcconfig","buck-out/gen/submodules/DeviceLocationManager/DeviceLocationManager-Release.xcconfig","buck-out/gen/submodules/DeviceProximity/DeviceProximity-Debug.xcconfig","buck-out/gen/submodules/DeviceProximity/DeviceProximity-Profile.xcconfig","buck-out/gen/submodules/DeviceProximity/DeviceProximity-Release.xcconfig","buck-out/gen/submodules/DirectionalPanGesture/DirectionalPanGesture-Debug.xcconfig","buck-out/gen/submodules/DirectionalPanGesture/DirectionalPanGesture-Profile.xcconfig","buck-out/gen/submodules/DirectionalPanGesture/DirectionalPanGesture-Release.xcconfig","buck-out/gen/submodules/Display/Display#shared-Debug.xcconfig","buck-out/gen/submodules/Display/Display#shared-Profile.xcconfig","buck-out/gen/submodules/Display/Display#shared-Release.xcconfig","buck-out/gen/submodules/Emoji/Emoji-Debug.xcconfig","buck-out/gen/submodules/Emoji/Emoji-Profile.xcconfig","buck-out/gen/submodules/Emoji/Emoji-Release.xcconfig","buck-out/gen/submodules/EncryptionKeyVisualization/EncryptionKeyVisualization-Debug.xcconfig","buck-out/gen/submodules/EncryptionKeyVisualization/EncryptionKeyVisualization-Profile.xcconfig","buck-out/gen/submodules/EncryptionKeyVisualization/EncryptionKeyVisualization-Release.xcconfig","buck-out/gen/submodules/FFMpeg/FFMpeg-Debug.xcconfig","buck-out/gen/submodules/FFMpeg/FFMpeg-Profile.xcconfig","buck-out/gen/submodules/FFMpeg/FFMpeg-Release.xcconfig","buck-out/gen/submodules/FFMpeg/libffmpeg-Debug.xcconfig","buck-out/gen/submodules/FFMpeg/libffmpeg-Profile.xcconfig","buck-out/gen/submodules/FFMpeg/libffmpeg-Release.xcconfig","buck-out/gen/submodules/GZip/GZip-Debug.xcconfig","buck-out/gen/submodules/GZip/GZip-Profile.xcconfig","buck-out/gen/submodules/GZip/GZip-Release.xcconfig","buck-out/gen/submodules/GalleryUI/GalleryUI-Debug.xcconfig","buck-out/gen/submodules/GalleryUI/GalleryUI-Profile.xcconfig","buck-out/gen/submodules/GalleryUI/GalleryUI-Release.xcconfig","buck-out/gen/submodules/GameUI/GameUI-Debug.xcconfig","buck-out/gen/submodules/GameUI/GameUI-Profile.xcconfig","buck-out/gen/submodules/GameUI/GameUI-Release.xcconfig","buck-out/gen/submodules/Geocoding/Geocoding-Debug.xcconfig","buck-out/gen/submodules/Geocoding/Geocoding-Profile.xcconfig","buck-out/gen/submodules/Geocoding/Geocoding-Release.xcconfig","buck-out/gen/submodules/GridMessageSelectionNode/GridMessageSelectionNode-Debug.xcconfig","buck-out/gen/submodules/GridMessageSelectionNode/GridMessageSelectionNode-Profile.xcconfig","buck-out/gen/submodules/GridMessageSelectionNode/GridMessageSelectionNode-Release.xcconfig","buck-out/gen/submodules/HashtagSearchUI/HashtagSearchUI-Debug.xcconfig","buck-out/gen/submodules/HashtagSearchUI/HashtagSearchUI-Profile.xcconfig","buck-out/gen/submodules/HashtagSearchUI/HashtagSearchUI-Release.xcconfig","buck-out/gen/submodules/HexColor/HexColor-Debug.xcconfig","buck-out/gen/submodules/HexColor/HexColor-Profile.xcconfig","buck-out/gen/submodules/HexColor/HexColor-Release.xcconfig","buck-out/gen/submodules/HockeySDK-iOS/HockeySDK-Debug.xcconfig","buck-out/gen/submodules/HockeySDK-iOS/HockeySDK-Profile.xcconfig","buck-out/gen/submodules/HockeySDK-iOS/HockeySDK-Release.xcconfig","buck-out/gen/submodules/HorizontalPeerItem/HorizontalPeerItem-Debug.xcconfig","buck-out/gen/submodules/HorizontalPeerItem/HorizontalPeerItem-Profile.xcconfig","buck-out/gen/submodules/HorizontalPeerItem/HorizontalPeerItem-Release.xcconfig","buck-out/gen/submodules/ImageBlur/ImageBlur-Debug.xcconfig","buck-out/gen/submodules/ImageBlur/ImageBlur-Profile.xcconfig","buck-out/gen/submodules/ImageBlur/ImageBlur-Release.xcconfig","buck-out/gen/submodules/ImageCompression/ImageCompression-Debug.xcconfig","buck-out/gen/submodules/ImageCompression/ImageCompression-Profile.xcconfig","buck-out/gen/submodules/ImageCompression/ImageCompression-Release.xcconfig","buck-out/gen/submodules/ImageTransparency/ImageTransparency-Debug.xcconfig","buck-out/gen/submodules/ImageTransparency/ImageTransparency-Profile.xcconfig","buck-out/gen/submodules/ImageTransparency/ImageTransparency-Release.xcconfig","buck-out/gen/submodules/InstantPageCache/InstantPageCache-Debug.xcconfig","buck-out/gen/submodules/InstantPageCache/InstantPageCache-Profile.xcconfig","buck-out/gen/submodules/InstantPageCache/InstantPageCache-Release.xcconfig","buck-out/gen/submodules/InstantPageUI/InstantPageUI-Debug.xcconfig","buck-out/gen/submodules/InstantPageUI/InstantPageUI-Profile.xcconfig","buck-out/gen/submodules/InstantPageUI/InstantPageUI-Release.xcconfig","buck-out/gen/submodules/ItemListAddressItem/ItemListAddressItem-Debug.xcconfig","buck-out/gen/submodules/ItemListAddressItem/ItemListAddressItem-Profile.xcconfig","buck-out/gen/submodules/ItemListAddressItem/ItemListAddressItem-Release.xcconfig","buck-out/gen/submodules/ItemListAvatarAndNameInfoItem/ItemListAvatarAndNameInfoItem-Debug.xcconfig","buck-out/gen/submodules/ItemListAvatarAndNameInfoItem/ItemListAvatarAndNameInfoItem-Profile.xcconfig","buck-out/gen/submodules/ItemListAvatarAndNameInfoItem/ItemListAvatarAndNameInfoItem-Release.xcconfig","buck-out/gen/submodules/ItemListPeerActionItem/ItemListPeerActionItem-Debug.xcconfig","buck-out/gen/submodules/ItemListPeerActionItem/ItemListPeerActionItem-Profile.xcconfig","buck-out/gen/submodules/ItemListPeerActionItem/ItemListPeerActionItem-Release.xcconfig","buck-out/gen/submodules/ItemListPeerItem/ItemListPeerItem-Debug.xcconfig","buck-out/gen/submodules/ItemListPeerItem/ItemListPeerItem-Profile.xcconfig","buck-out/gen/submodules/ItemListPeerItem/ItemListPeerItem-Release.xcconfig","buck-out/gen/submodules/ItemListStickerPackItem/ItemListStickerPackItem-Debug.xcconfig","buck-out/gen/submodules/ItemListStickerPackItem/ItemListStickerPackItem-Profile.xcconfig","buck-out/gen/submodules/ItemListStickerPackItem/ItemListStickerPackItem-Release.xcconfig","buck-out/gen/submodules/ItemListUI/ItemListUI-Debug.xcconfig","buck-out/gen/submodules/ItemListUI/ItemListUI-Profile.xcconfig","buck-out/gen/submodules/ItemListUI/ItemListUI-Release.xcconfig","buck-out/gen/submodules/JoinLinkPreviewUI/JoinLinkPreviewUI-Debug.xcconfig","buck-out/gen/submodules/JoinLinkPreviewUI/JoinLinkPreviewUI-Profile.xcconfig","buck-out/gen/submodules/JoinLinkPreviewUI/JoinLinkPreviewUI-Release.xcconfig","buck-out/gen/submodules/LanguageLinkPreviewUI/LanguageLinkPreviewUI-Debug.xcconfig","buck-out/gen/submodules/LanguageLinkPreviewUI/LanguageLinkPreviewUI-Profile.xcconfig","buck-out/gen/submodules/LanguageLinkPreviewUI/LanguageLinkPreviewUI-Release.xcconfig","buck-out/gen/submodules/LanguageSuggestionUI/LanguageSuggestionUI-Debug.xcconfig","buck-out/gen/submodules/LanguageSuggestionUI/LanguageSuggestionUI-Profile.xcconfig","buck-out/gen/submodules/LanguageSuggestionUI/LanguageSuggestionUI-Release.xcconfig","buck-out/gen/submodules/LegacyComponents/LegacyComponents-Debug.xcconfig","buck-out/gen/submodules/LegacyComponents/LegacyComponents-Profile.xcconfig","buck-out/gen/submodules/LegacyComponents/LegacyComponents-Release.xcconfig","buck-out/gen/submodules/LegacyDataImport/LegacyDataImport-Debug.xcconfig","buck-out/gen/submodules/LegacyDataImport/LegacyDataImport-Profile.xcconfig","buck-out/gen/submodules/LegacyDataImport/LegacyDataImport-Release.xcconfig","buck-out/gen/submodules/LegacyMediaPickerUI/LegacyMediaPickerUI-Debug.xcconfig","buck-out/gen/submodules/LegacyMediaPickerUI/LegacyMediaPickerUI-Profile.xcconfig","buck-out/gen/submodules/LegacyMediaPickerUI/LegacyMediaPickerUI-Release.xcconfig","buck-out/gen/submodules/LegacyUI/LegacyUI-Debug.xcconfig","buck-out/gen/submodules/LegacyUI/LegacyUI-Profile.xcconfig","buck-out/gen/submodules/LegacyUI/LegacyUI-Release.xcconfig","buck-out/gen/submodules/LightweightAccountData/LightweightAccountData-Debug.xcconfig","buck-out/gen/submodules/LightweightAccountData/LightweightAccountData-Profile.xcconfig","buck-out/gen/submodules/LightweightAccountData/LightweightAccountData-Release.xcconfig","buck-out/gen/submodules/ListSectionHeaderNode/ListSectionHeaderNode-Debug.xcconfig","buck-out/gen/submodules/ListSectionHeaderNode/ListSectionHeaderNode-Profile.xcconfig","buck-out/gen/submodules/ListSectionHeaderNode/ListSectionHeaderNode-Release.xcconfig","buck-out/gen/submodules/LiveLocationManager/LiveLocationManager-Debug.xcconfig","buck-out/gen/submodules/LiveLocationManager/LiveLocationManager-Profile.xcconfig","buck-out/gen/submodules/LiveLocationManager/LiveLocationManager-Release.xcconfig","buck-out/gen/submodules/LiveLocationPositionNode/LiveLocationPositionNode-Debug.xcconfig","buck-out/gen/submodules/LiveLocationPositionNode/LiveLocationPositionNode-Profile.xcconfig","buck-out/gen/submodules/LiveLocationPositionNode/LiveLocationPositionNode-Release.xcconfig","buck-out/gen/submodules/LiveLocationTimerNode/LiveLocationTimerNode-Debug.xcconfig","buck-out/gen/submodules/LiveLocationTimerNode/LiveLocationTimerNode-Profile.xcconfig","buck-out/gen/submodules/LiveLocationTimerNode/LiveLocationTimerNode-Release.xcconfig","buck-out/gen/submodules/LocalAuth/LocalAuth-Debug.xcconfig","buck-out/gen/submodules/LocalAuth/LocalAuth-Profile.xcconfig","buck-out/gen/submodules/LocalAuth/LocalAuth-Release.xcconfig","buck-out/gen/submodules/LocalMediaResources/LocalMediaResources-Debug.xcconfig","buck-out/gen/submodules/LocalMediaResources/LocalMediaResources-Profile.xcconfig","buck-out/gen/submodules/LocalMediaResources/LocalMediaResources-Release.xcconfig","buck-out/gen/submodules/LocalizedPeerData/LocalizedPeerData-Debug.xcconfig","buck-out/gen/submodules/LocalizedPeerData/LocalizedPeerData-Profile.xcconfig","buck-out/gen/submodules/LocalizedPeerData/LocalizedPeerData-Release.xcconfig","buck-out/gen/submodules/LocationUI/LocationUI-Debug.xcconfig","buck-out/gen/submodules/LocationUI/LocationUI-Profile.xcconfig","buck-out/gen/submodules/LocationUI/LocationUI-Release.xcconfig","buck-out/gen/submodules/MapResourceToAvatarSizes/MapResourceToAvatarSizes-Debug.xcconfig","buck-out/gen/submodules/MapResourceToAvatarSizes/MapResourceToAvatarSizes-Profile.xcconfig","buck-out/gen/submodules/MapResourceToAvatarSizes/MapResourceToAvatarSizes-Release.xcconfig","buck-out/gen/submodules/MediaPlayer/UniversalMediaPlayer-Debug.xcconfig","buck-out/gen/submodules/MediaPlayer/UniversalMediaPlayer-Profile.xcconfig","buck-out/gen/submodules/MediaPlayer/UniversalMediaPlayer-Release.xcconfig","buck-out/gen/submodules/MediaResources/MediaResources-Debug.xcconfig","buck-out/gen/submodules/MediaResources/MediaResources-Profile.xcconfig","buck-out/gen/submodules/MediaResources/MediaResources-Release.xcconfig","buck-out/gen/submodules/MergeLists/MergeLists-Debug.xcconfig","buck-out/gen/submodules/MergeLists/MergeLists-Profile.xcconfig","buck-out/gen/submodules/MergeLists/MergeLists-Release.xcconfig","buck-out/gen/submodules/MimeTypes/MimeTypes-Debug.xcconfig","buck-out/gen/submodules/MimeTypes/MimeTypes-Profile.xcconfig","buck-out/gen/submodules/MimeTypes/MimeTypes-Release.xcconfig","buck-out/gen/submodules/MosaicLayout/MosaicLayout-Debug.xcconfig","buck-out/gen/submodules/MosaicLayout/MosaicLayout-Profile.xcconfig","buck-out/gen/submodules/MosaicLayout/MosaicLayout-Release.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKit#shared-Debug.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKit#shared-Profile.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKit#shared-Release.xcconfig","buck-out/gen/submodules/MtProtoKit/openssl-Debug.xcconfig","buck-out/gen/submodules/MtProtoKit/openssl-Profile.xcconfig","buck-out/gen/submodules/MtProtoKit/openssl-Release.xcconfig","buck-out/gen/submodules/MusicAlbumArtResources/MusicAlbumArtResources-Debug.xcconfig","buck-out/gen/submodules/MusicAlbumArtResources/MusicAlbumArtResources-Profile.xcconfig","buck-out/gen/submodules/MusicAlbumArtResources/MusicAlbumArtResources-Release.xcconfig","buck-out/gen/submodules/NotificationMuteSettingsUI/NotificationMuteSettingsUI-Debug.xcconfig","buck-out/gen/submodules/NotificationMuteSettingsUI/NotificationMuteSettingsUI-Profile.xcconfig","buck-out/gen/submodules/NotificationMuteSettingsUI/NotificationMuteSettingsUI-Release.xcconfig","buck-out/gen/submodules/NotificationSoundSelectionUI/NotificationSoundSelectionUI-Debug.xcconfig","buck-out/gen/submodules/NotificationSoundSelectionUI/NotificationSoundSelectionUI-Profile.xcconfig","buck-out/gen/submodules/NotificationSoundSelectionUI/NotificationSoundSelectionUI-Release.xcconfig","buck-out/gen/submodules/OpenInExternalAppUI/OpenInExternalAppUI-Debug.xcconfig","buck-out/gen/submodules/OpenInExternalAppUI/OpenInExternalAppUI-Profile.xcconfig","buck-out/gen/submodules/OpenInExternalAppUI/OpenInExternalAppUI-Release.xcconfig","buck-out/gen/submodules/Opus/opus-Debug.xcconfig","buck-out/gen/submodules/Opus/opus-Profile.xcconfig","buck-out/gen/submodules/Opus/opus-Release.xcconfig","buck-out/gen/submodules/Opus/opus_lib-Debug.xcconfig","buck-out/gen/submodules/Opus/opus_lib-Profile.xcconfig","buck-out/gen/submodules/Opus/opus_lib-Release.xcconfig","buck-out/gen/submodules/OpusBinding/OpusBinding-Debug.xcconfig","buck-out/gen/submodules/OpusBinding/OpusBinding-Profile.xcconfig","buck-out/gen/submodules/OpusBinding/OpusBinding-Release.xcconfig","buck-out/gen/submodules/OverlayStatusController/OverlayStatusController-Debug.xcconfig","buck-out/gen/submodules/OverlayStatusController/OverlayStatusController-Profile.xcconfig","buck-out/gen/submodules/OverlayStatusController/OverlayStatusController-Release.xcconfig","buck-out/gen/submodules/PasscodeUI/PasscodeUI-Debug.xcconfig","buck-out/gen/submodules/PasscodeUI/PasscodeUI-Profile.xcconfig","buck-out/gen/submodules/PasscodeUI/PasscodeUI-Release.xcconfig","buck-out/gen/submodules/PassportUI/PassportUI-Debug.xcconfig","buck-out/gen/submodules/PassportUI/PassportUI-Profile.xcconfig","buck-out/gen/submodules/PassportUI/PassportUI-Release.xcconfig","buck-out/gen/submodules/PasswordSetupUI/PasswordSetupUI-Debug.xcconfig","buck-out/gen/submodules/PasswordSetupUI/PasswordSetupUI-Profile.xcconfig","buck-out/gen/submodules/PasswordSetupUI/PasswordSetupUI-Release.xcconfig","buck-out/gen/submodules/Pdf/Pdf-Debug.xcconfig","buck-out/gen/submodules/Pdf/Pdf-Profile.xcconfig","buck-out/gen/submodules/Pdf/Pdf-Release.xcconfig","buck-out/gen/submodules/PeerAvatarGalleryUI/PeerAvatarGalleryUI-Debug.xcconfig","buck-out/gen/submodules/PeerAvatarGalleryUI/PeerAvatarGalleryUI-Profile.xcconfig","buck-out/gen/submodules/PeerAvatarGalleryUI/PeerAvatarGalleryUI-Release.xcconfig","buck-out/gen/submodules/PeerInfoUI/PeerInfoUI-Debug.xcconfig","buck-out/gen/submodules/PeerInfoUI/PeerInfoUI-Profile.xcconfig","buck-out/gen/submodules/PeerInfoUI/PeerInfoUI-Release.xcconfig","buck-out/gen/submodules/PeerOnlineMarkerNode/PeerOnlineMarkerNode-Debug.xcconfig","buck-out/gen/submodules/PeerOnlineMarkerNode/PeerOnlineMarkerNode-Profile.xcconfig","buck-out/gen/submodules/PeerOnlineMarkerNode/PeerOnlineMarkerNode-Release.xcconfig","buck-out/gen/submodules/PeerPresenceStatusManager/PeerPresenceStatusManager-Debug.xcconfig","buck-out/gen/submodules/PeerPresenceStatusManager/PeerPresenceStatusManager-Profile.xcconfig","buck-out/gen/submodules/PeerPresenceStatusManager/PeerPresenceStatusManager-Release.xcconfig","buck-out/gen/submodules/PeersNearbyIconNode/PeersNearbyIconNode-Debug.xcconfig","buck-out/gen/submodules/PeersNearbyIconNode/PeersNearbyIconNode-Profile.xcconfig","buck-out/gen/submodules/PeersNearbyIconNode/PeersNearbyIconNode-Release.xcconfig","buck-out/gen/submodules/PeersNearbyUI/PeersNearbyUI-Debug.xcconfig","buck-out/gen/submodules/PeersNearbyUI/PeersNearbyUI-Profile.xcconfig","buck-out/gen/submodules/PeersNearbyUI/PeersNearbyUI-Release.xcconfig","buck-out/gen/submodules/PersistentStringHash/PersistentStringHash-Debug.xcconfig","buck-out/gen/submodules/PersistentStringHash/PersistentStringHash-Profile.xcconfig","buck-out/gen/submodules/PersistentStringHash/PersistentStringHash-Release.xcconfig","buck-out/gen/submodules/PhoneInputNode/PhoneInputNode-Debug.xcconfig","buck-out/gen/submodules/PhoneInputNode/PhoneInputNode-Profile.xcconfig","buck-out/gen/submodules/PhoneInputNode/PhoneInputNode-Release.xcconfig","buck-out/gen/submodules/PhotoResources/PhotoResources-Debug.xcconfig","buck-out/gen/submodules/PhotoResources/PhotoResources-Profile.xcconfig","buck-out/gen/submodules/PhotoResources/PhotoResources-Release.xcconfig","buck-out/gen/submodules/PlatformRestrictionMatching/PlatformRestrictionMatching-Debug.xcconfig","buck-out/gen/submodules/PlatformRestrictionMatching/PlatformRestrictionMatching-Profile.xcconfig","buck-out/gen/submodules/PlatformRestrictionMatching/PlatformRestrictionMatching-Release.xcconfig","buck-out/gen/submodules/Postbox/Postbox#shared-Debug.xcconfig","buck-out/gen/submodules/Postbox/Postbox#shared-Profile.xcconfig","buck-out/gen/submodules/Postbox/Postbox#shared-Release.xcconfig","buck-out/gen/submodules/ProgressNavigationButtonNode/ProgressNavigationButtonNode-Debug.xcconfig","buck-out/gen/submodules/ProgressNavigationButtonNode/ProgressNavigationButtonNode-Profile.xcconfig","buck-out/gen/submodules/ProgressNavigationButtonNode/ProgressNavigationButtonNode-Release.xcconfig","buck-out/gen/submodules/QrCode/QrCode-Debug.xcconfig","buck-out/gen/submodules/QrCode/QrCode-Profile.xcconfig","buck-out/gen/submodules/QrCode/QrCode-Release.xcconfig","buck-out/gen/submodules/RLottie/RLottie-Debug.xcconfig","buck-out/gen/submodules/RLottie/RLottie-Profile.xcconfig","buck-out/gen/submodules/RLottie/RLottie-Release.xcconfig","buck-out/gen/submodules/RMIntro/RMIntro-Debug.xcconfig","buck-out/gen/submodules/RMIntro/RMIntro-Profile.xcconfig","buck-out/gen/submodules/RMIntro/RMIntro-Release.xcconfig","buck-out/gen/submodules/RadialStatusNode/RadialStatusNode-Debug.xcconfig","buck-out/gen/submodules/RadialStatusNode/RadialStatusNode-Profile.xcconfig","buck-out/gen/submodules/RadialStatusNode/RadialStatusNode-Release.xcconfig","buck-out/gen/submodules/RaiseToListen/RaiseToListen-Debug.xcconfig","buck-out/gen/submodules/RaiseToListen/RaiseToListen-Profile.xcconfig","buck-out/gen/submodules/RaiseToListen/RaiseToListen-Release.xcconfig","buck-out/gen/submodules/ReactionSelectionNode/ReactionSelectionNode-Debug.xcconfig","buck-out/gen/submodules/ReactionSelectionNode/ReactionSelectionNode-Profile.xcconfig","buck-out/gen/submodules/ReactionSelectionNode/ReactionSelectionNode-Release.xcconfig","buck-out/gen/submodules/SSignalKit/SSignalKit/SSignalKit-Debug.xcconfig","buck-out/gen/submodules/SSignalKit/SSignalKit/SSignalKit-Profile.xcconfig","buck-out/gen/submodules/SSignalKit/SSignalKit/SSignalKit-Release.xcconfig","buck-out/gen/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit#shared-Debug.xcconfig","buck-out/gen/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit#shared-Profile.xcconfig","buck-out/gen/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit#shared-Release.xcconfig","buck-out/gen/submodules/SaveToCameraRoll/SaveToCameraRoll-Debug.xcconfig","buck-out/gen/submodules/SaveToCameraRoll/SaveToCameraRoll-Profile.xcconfig","buck-out/gen/submodules/SaveToCameraRoll/SaveToCameraRoll-Release.xcconfig","buck-out/gen/submodules/ScreenCaptureDetection/ScreenCaptureDetection-Debug.xcconfig","buck-out/gen/submodules/ScreenCaptureDetection/ScreenCaptureDetection-Profile.xcconfig","buck-out/gen/submodules/ScreenCaptureDetection/ScreenCaptureDetection-Release.xcconfig","buck-out/gen/submodules/SearchBarNode/SearchBarNode-Debug.xcconfig","buck-out/gen/submodules/SearchBarNode/SearchBarNode-Profile.xcconfig","buck-out/gen/submodules/SearchBarNode/SearchBarNode-Release.xcconfig","buck-out/gen/submodules/SearchUI/SearchUI-Debug.xcconfig","buck-out/gen/submodules/SearchUI/SearchUI-Profile.xcconfig","buck-out/gen/submodules/SearchUI/SearchUI-Release.xcconfig","buck-out/gen/submodules/SelectablePeerNode/SelectablePeerNode-Debug.xcconfig","buck-out/gen/submodules/SelectablePeerNode/SelectablePeerNode-Profile.xcconfig","buck-out/gen/submodules/SelectablePeerNode/SelectablePeerNode-Release.xcconfig","buck-out/gen/submodules/SettingsUI/SettingsUI-Debug.xcconfig","buck-out/gen/submodules/SettingsUI/SettingsUI-Profile.xcconfig","buck-out/gen/submodules/SettingsUI/SettingsUI-Release.xcconfig","buck-out/gen/submodules/ShareController/ShareController-Debug.xcconfig","buck-out/gen/submodules/ShareController/ShareController-Profile.xcconfig","buck-out/gen/submodules/ShareController/ShareController-Release.xcconfig","buck-out/gen/submodules/ShareItems/ShareItems-Debug.xcconfig","buck-out/gen/submodules/ShareItems/ShareItems-Profile.xcconfig","buck-out/gen/submodules/ShareItems/ShareItems-Release.xcconfig","buck-out/gen/submodules/SinglePhoneInputNode/SinglePhoneInputNode-Debug.xcconfig","buck-out/gen/submodules/SinglePhoneInputNode/SinglePhoneInputNode-Profile.xcconfig","buck-out/gen/submodules/SinglePhoneInputNode/SinglePhoneInputNode-Release.xcconfig","buck-out/gen/submodules/SolidRoundedButtonNode/SolidRoundedButtonNode-Debug.xcconfig","buck-out/gen/submodules/SolidRoundedButtonNode/SolidRoundedButtonNode-Profile.xcconfig","buck-out/gen/submodules/SolidRoundedButtonNode/SolidRoundedButtonNode-Release.xcconfig","buck-out/gen/submodules/StickerPackPreviewUI/StickerPackPreviewUI-Debug.xcconfig","buck-out/gen/submodules/StickerPackPreviewUI/StickerPackPreviewUI-Profile.xcconfig","buck-out/gen/submodules/StickerPackPreviewUI/StickerPackPreviewUI-Release.xcconfig","buck-out/gen/submodules/StickerResources/StickerResources-Debug.xcconfig","buck-out/gen/submodules/StickerResources/StickerResources-Profile.xcconfig","buck-out/gen/submodules/StickerResources/StickerResources-Release.xcconfig","buck-out/gen/submodules/Stripe/Stripe-Debug.xcconfig","buck-out/gen/submodules/Stripe/Stripe-Profile.xcconfig","buck-out/gen/submodules/Stripe/Stripe-Release.xcconfig","buck-out/gen/submodules/SwipeToDismissGesture/SwipeToDismissGesture-Debug.xcconfig","buck-out/gen/submodules/SwipeToDismissGesture/SwipeToDismissGesture-Profile.xcconfig","buck-out/gen/submodules/SwipeToDismissGesture/SwipeToDismissGesture-Release.xcconfig","buck-out/gen/submodules/SwitchNode/SwitchNode-Debug.xcconfig","buck-out/gen/submodules/SwitchNode/SwitchNode-Profile.xcconfig","buck-out/gen/submodules/SwitchNode/SwitchNode-Release.xcconfig","buck-out/gen/submodules/TelegramApi/TelegramApi-Debug.xcconfig","buck-out/gen/submodules/TelegramApi/TelegramApi-Profile.xcconfig","buck-out/gen/submodules/TelegramApi/TelegramApi-Release.xcconfig","buck-out/gen/submodules/TelegramAudio/TelegramAudio-Debug.xcconfig","buck-out/gen/submodules/TelegramAudio/TelegramAudio-Profile.xcconfig","buck-out/gen/submodules/TelegramAudio/TelegramAudio-Release.xcconfig","buck-out/gen/submodules/TelegramBaseController/TelegramBaseController-Debug.xcconfig","buck-out/gen/submodules/TelegramBaseController/TelegramBaseController-Profile.xcconfig","buck-out/gen/submodules/TelegramBaseController/TelegramBaseController-Release.xcconfig","buck-out/gen/submodules/TelegramCallsUI/TelegramCallsUI-Debug.xcconfig","buck-out/gen/submodules/TelegramCallsUI/TelegramCallsUI-Profile.xcconfig","buck-out/gen/submodules/TelegramCallsUI/TelegramCallsUI-Release.xcconfig","buck-out/gen/submodules/TelegramCore/TelegramCore#shared-Debug.xcconfig","buck-out/gen/submodules/TelegramCore/TelegramCore#shared-Profile.xcconfig","buck-out/gen/submodules/TelegramCore/TelegramCore#shared-Release.xcconfig","buck-out/gen/submodules/TelegramNotices/TelegramNotices-Debug.xcconfig","buck-out/gen/submodules/TelegramNotices/TelegramNotices-Profile.xcconfig","buck-out/gen/submodules/TelegramNotices/TelegramNotices-Release.xcconfig","buck-out/gen/submodules/TelegramPermissions/TelegramPermissions-Debug.xcconfig","buck-out/gen/submodules/TelegramPermissions/TelegramPermissions-Profile.xcconfig","buck-out/gen/submodules/TelegramPermissions/TelegramPermissions-Release.xcconfig","buck-out/gen/submodules/TelegramPermissionsUI/TelegramPermissionsUI-Debug.xcconfig","buck-out/gen/submodules/TelegramPermissionsUI/TelegramPermissionsUI-Profile.xcconfig","buck-out/gen/submodules/TelegramPermissionsUI/TelegramPermissionsUI-Release.xcconfig","buck-out/gen/submodules/TelegramPresentationData/TelegramPresentationData-Debug.xcconfig","buck-out/gen/submodules/TelegramPresentationData/TelegramPresentationData-Profile.xcconfig","buck-out/gen/submodules/TelegramPresentationData/TelegramPresentationData-Release.xcconfig","buck-out/gen/submodules/TelegramStringFormatting/TelegramStringFormatting-Debug.xcconfig","buck-out/gen/submodules/TelegramStringFormatting/TelegramStringFormatting-Profile.xcconfig","buck-out/gen/submodules/TelegramStringFormatting/TelegramStringFormatting-Release.xcconfig","buck-out/gen/submodules/TelegramUI/TelegramUI#shared-Debug.xcconfig","buck-out/gen/submodules/TelegramUI/TelegramUI#shared-Profile.xcconfig","buck-out/gen/submodules/TelegramUI/TelegramUI#shared-Release.xcconfig","buck-out/gen/submodules/TelegramUIPreferences/TelegramUIPreferences-Debug.xcconfig","buck-out/gen/submodules/TelegramUIPreferences/TelegramUIPreferences-Profile.xcconfig","buck-out/gen/submodules/TelegramUIPreferences/TelegramUIPreferences-Release.xcconfig","buck-out/gen/submodules/TelegramUniversalVideoContent/TelegramUniversalVideoContent-Debug.xcconfig","buck-out/gen/submodules/TelegramUniversalVideoContent/TelegramUniversalVideoContent-Profile.xcconfig","buck-out/gen/submodules/TelegramUniversalVideoContent/TelegramUniversalVideoContent-Release.xcconfig","buck-out/gen/submodules/TelegramUpdateUI/TelegramUpdateUI-Debug.xcconfig","buck-out/gen/submodules/TelegramUpdateUI/TelegramUpdateUI-Profile.xcconfig","buck-out/gen/submodules/TelegramUpdateUI/TelegramUpdateUI-Release.xcconfig","buck-out/gen/submodules/TelegramVoip/TelegramVoip-Debug.xcconfig","buck-out/gen/submodules/TelegramVoip/TelegramVoip-Profile.xcconfig","buck-out/gen/submodules/TelegramVoip/TelegramVoip-Release.xcconfig","buck-out/gen/submodules/TemporaryCachedPeerDataManager/TemporaryCachedPeerDataManager-Debug.xcconfig","buck-out/gen/submodules/TemporaryCachedPeerDataManager/TemporaryCachedPeerDataManager-Profile.xcconfig","buck-out/gen/submodules/TemporaryCachedPeerDataManager/TemporaryCachedPeerDataManager-Release.xcconfig","buck-out/gen/submodules/TextFormat/TextFormat-Debug.xcconfig","buck-out/gen/submodules/TextFormat/TextFormat-Profile.xcconfig","buck-out/gen/submodules/TextFormat/TextFormat-Release.xcconfig","buck-out/gen/submodules/TextSelectionNode/TextSelectionNode-Debug.xcconfig","buck-out/gen/submodules/TextSelectionNode/TextSelectionNode-Profile.xcconfig","buck-out/gen/submodules/TextSelectionNode/TextSelectionNode-Release.xcconfig","buck-out/gen/submodules/TinyThumbnail/TinyThumbnail-Debug.xcconfig","buck-out/gen/submodules/TinyThumbnail/TinyThumbnail-Profile.xcconfig","buck-out/gen/submodules/TinyThumbnail/TinyThumbnail-Release.xcconfig","buck-out/gen/submodules/TouchDownGesture/TouchDownGesture-Debug.xcconfig","buck-out/gen/submodules/TouchDownGesture/TouchDownGesture-Profile.xcconfig","buck-out/gen/submodules/TouchDownGesture/TouchDownGesture-Release.xcconfig","buck-out/gen/submodules/Tuples/Tuples-Debug.xcconfig","buck-out/gen/submodules/Tuples/Tuples-Profile.xcconfig","buck-out/gen/submodules/Tuples/Tuples-Release.xcconfig","buck-out/gen/submodules/UndoUI/UndoUI-Debug.xcconfig","buck-out/gen/submodules/UndoUI/UndoUI-Profile.xcconfig","buck-out/gen/submodules/UndoUI/UndoUI-Release.xcconfig","buck-out/gen/submodules/UrlEscaping/UrlEscaping-Debug.xcconfig","buck-out/gen/submodules/UrlEscaping/UrlEscaping-Profile.xcconfig","buck-out/gen/submodules/UrlEscaping/UrlEscaping-Release.xcconfig","buck-out/gen/submodules/UrlHandling/UrlHandling-Debug.xcconfig","buck-out/gen/submodules/UrlHandling/UrlHandling-Profile.xcconfig","buck-out/gen/submodules/UrlHandling/UrlHandling-Release.xcconfig","buck-out/gen/submodules/WallpaperResources/WallpaperResources-Debug.xcconfig","buck-out/gen/submodules/WallpaperResources/WallpaperResources-Profile.xcconfig","buck-out/gen/submodules/WallpaperResources/WallpaperResources-Release.xcconfig","buck-out/gen/submodules/WatchBridge/WatchBridge-Debug.xcconfig","buck-out/gen/submodules/WatchBridge/WatchBridge-Profile.xcconfig","buck-out/gen/submodules/WatchBridge/WatchBridge-Release.xcconfig","buck-out/gen/submodules/WatchBridgeAudio/WatchBridgeAudio-Debug.xcconfig","buck-out/gen/submodules/WatchBridgeAudio/WatchBridgeAudio-Profile.xcconfig","buck-out/gen/submodules/WatchBridgeAudio/WatchBridgeAudio-Release.xcconfig","buck-out/gen/submodules/WatchCommon/WatchCommon-Debug.xcconfig","buck-out/gen/submodules/WatchCommon/WatchCommon-Profile.xcconfig","buck-out/gen/submodules/WatchCommon/WatchCommon-Release.xcconfig","buck-out/gen/submodules/WebP/WebPImage-Debug.xcconfig","buck-out/gen/submodules/WebP/WebPImage-Profile.xcconfig","buck-out/gen/submodules/WebP/WebPImage-Release.xcconfig","buck-out/gen/submodules/WebP/WebP_lib-Debug.xcconfig","buck-out/gen/submodules/WebP/WebP_lib-Profile.xcconfig","buck-out/gen/submodules/WebP/WebP_lib-Release.xcconfig","buck-out/gen/submodules/WebSearchUI/WebSearchUI-Debug.xcconfig","buck-out/gen/submodules/WebSearchUI/WebSearchUI-Profile.xcconfig","buck-out/gen/submodules/WebSearchUI/WebSearchUI-Release.xcconfig","buck-out/gen/submodules/WebUI/WebUI-Debug.xcconfig","buck-out/gen/submodules/WebUI/WebUI-Profile.xcconfig","buck-out/gen/submodules/WebUI/WebUI-Release.xcconfig","buck-out/gen/submodules/WebsiteType/WebsiteType-Debug.xcconfig","buck-out/gen/submodules/WebsiteType/WebsiteType-Profile.xcconfig","buck-out/gen/submodules/WebsiteType/WebsiteType-Release.xcconfig","buck-out/gen/submodules/YuvConversion/YuvConversion-Debug.xcconfig","buck-out/gen/submodules/YuvConversion/YuvConversion-Profile.xcconfig","buck-out/gen/submodules/YuvConversion/YuvConversion-Release.xcconfig","buck-out/gen/submodules/libphonenumber/libphonenumber-Debug.xcconfig","buck-out/gen/submodules/libphonenumber/libphonenumber-Profile.xcconfig","buck-out/gen/submodules/libphonenumber/libphonenumber-Release.xcconfig","buck-out/gen/submodules/libtgvoip/libtgvoip-Debug.xcconfig","buck-out/gen/submodules/libtgvoip/libtgvoip-Profile.xcconfig","buck-out/gen/submodules/libtgvoip/libtgvoip-Release.xcconfig","buck-out/gen/submodules/lottie-ios/Lottie-Debug.xcconfig","buck-out/gen/submodules/lottie-ios/Lottie-Profile.xcconfig","buck-out/gen/submodules/lottie-ios/Lottie-Release.xcconfig","buck-out/gen/submodules/sqlcipher/sqlcipher-Debug.xcconfig","buck-out/gen/submodules/sqlcipher/sqlcipher-Profile.xcconfig","buck-out/gen/submodules/sqlcipher/sqlcipher-Release.xcconfig"],"copy-in-xcode":[]} \ No newline at end of file diff --git a/App/App.xcworkspace/contents.xcworkspacedata b/App/App.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 0df6cedd5b..0000000000 --- a/App/App.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/App/BUCK b/App/BUCK index 70b10d176e..4bf0d7f273 100644 --- a/App/BUCK +++ b/App/BUCK @@ -19,6 +19,7 @@ ui_tests = [ static_library_dependencies = [ ] + framework_dependencies = [ "//submodules/MtProtoKit:MtProtoKit", "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit", @@ -29,6 +30,18 @@ framework_dependencies = [ "//submodules/TelegramUI:TelegramUI", ] +resource_dependencies = [ + "//submodules/LegacyComponents:LegacyComponentsResources", + "//submodules/TelegramUI:TelegramUIAssets", + "//submodules/TelegramUI:TelegramUIResources", + "//:AppResources", + "//:AppStringResources", + "//:Icons", + "//:AppIcons", + "//:AdditionalIcons", + "//:LaunchScreen", +] + build_phase_scripts = [ ] @@ -56,7 +69,7 @@ apple_binary( "//App:", "//App/...", ], - configs = app_binary_configs("App"), + configs = app_binary_configs("Telegram"), swift_version = native.read_config("swift", "version"), srcs = [ "SupportFiles/Empty.swift", @@ -64,32 +77,32 @@ apple_binary( deps = [ ":AppLibrary", ] + + resource_dependencies, ) xcode_workspace_config( name = "workspace", - workspace_name = "App", - src_target = ":App", + workspace_name = "Telegram_Buck", + src_target = ":Telegram", ) apple_bundle( - name = "App", + name = "Telegram", visibility = [ "//App:", ], extension = "app", binary = ":AppBinary", - product_name = "App", + product_name = "Telegram", info_plist = "Info.plist", - info_plist_substitutions = app_info_plist_substitutions("App"), + info_plist_substitutions = app_info_plist_substitutions("Telegram"), deps = [ - #"//submodules/Emoji:EmojiFiles", ] + framework_bundle_dependencies(framework_dependencies), ) apple_package( name = "AppPackage", - bundle = ":App", + bundle = ":Telegram", ) diff --git a/App/Info.plist b/App/Info.plist index 64ef73c0b6..0c3c9d00ae 100644 --- a/App/Info.plist +++ b/App/Info.plist @@ -2,19 +2,180 @@ + CFBundleAllowMixedLocalizations + CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) + en + CFBundleDisplayName + ${APP_NAME} CFBundleExecutable - App - CFBundleIconFiles - - Icon.png - Icon@2x.png - Icon-72.png - Icon-72@2x.png - Icon-Small-50.png - Icon-Small-50@2x.png - + $(EXECUTABLE_NAME) + CFBundleIcons + + CFBundleAlternateIcons + + Black + + CFBundleIconFiles + + BlackIcon + BlackNotificationIcon + + UIPrerenderedIcon + + + BlackClassic + + CFBundleIconFiles + + BlackClassicIcon + BlackClassicNotificationIcon + + UIPrerenderedIcon + + + BlackFilled + + CFBundleIconFiles + + BlackFilledIcon + + UIPrerenderedIcon + + + Blue + + CFBundleIconFiles + + BlueIcon + BlueNotificationIcon + + UIPrerenderedIcon + + + BlueClassic + + CFBundleIconFiles + + BlueClassicIcon + BlueClassicNotificationIcon + + UIPrerenderedIcon + + + BlueFilled + + CFBundleIconFiles + + BlueFilledIcon + + UIPrerenderedIcon + + + WhiteFilled + + CFBundleIconFiles + + WhiteFilledIcon + + UIPrerenderedIcon + + + + CFBundlePrimaryIcon + + CFBundleIconName + AppIconLLC + UIPrerenderedIcon + + + + CFBundleIcons~ipad + + CFBundleAlternateIcons + + Black + + CFBundleIconFiles + + BlackIconIpad + BlackIconLargeIpad + BlackNotificationIcon + + UIPrerenderedIcon + + + BlackClassic + + CFBundleIconFiles + + BlackClassicIconIpad + BlackClassicIconLargeIpad + BlackClassicNotificationIcon + + UIPrerenderedIcon + + + BlackFilled + + CFBundleIconFiles + + BlackFilledIconIpad + BlackFilledIconLargeIpad + + UIPrerenderedIcon + + + Blue + + CFBundleIconFiles + + BlueIconIpad + BlueIconLargeIpad + BlueNotificationIcon + + UIPrerenderedIcon + + + BlueClassic + + CFBundleIconFiles + + BlueClassicIconIpad + BlueClassicIconLargeIpad + BlueClassicNotificationIcon + + UIPrerenderedIcon + + + BlueFilled + + CFBundleIconFiles + + BlueFilledIconIpad + BlueFilledIconLargeIpad + + UIPrerenderedIcon + + + WhiteFilled + + CFBundleIconFiles + + WhiteFilledIcon + + UIPrerenderedIcon + + + + CFBundlePrimaryIcon + + CFBundleIconName + AppIconLLC + UIPrerenderedIcon + + + CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion @@ -24,17 +185,134 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + 5.11 + CFBundleSignature + ???? + CFBundleURLTypes + + + CFBundleTypeRole + Viewer + CFBundleURLName + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleURLSchemes + + telegram + + + + CFBundleTypeRole + Editor + CFBundleURLName + $(PRODUCT_BUNDLE_IDENTIFIER).compatibility + CFBundleURLSchemes + + tg + $(APP_SPECIFIC_URL_SCHEME) + + + + CFBundleTypeRole + Viewer + CFBundleURLName + $(PRODUCT_BUNDLE_IDENTIFIER).dropbox + CFBundleURLSchemes + + db-pa9wtoz9l514anx + + + CFBundleVersion - 1 + ${BUILD_NUMBER} + ITSAppUsesNonExemptEncryption + + LSApplicationQueriesSchemes + + instagram + comgooglemaps-x-callback + foursquare + here-location + yandexmaps + yandexnavi + comgooglemaps + youtube + twitter + vk + waze + googlechrome + googlechromes + firefox + touch-http + touch-https + yandexbrowser-open-url + vimeo + vine + coub + uber + citymapper + lyft + opera-http + opera-https + firefox-focus + ddgQuickLink + moovit + LSRequiresIPhoneOS + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + + NSCameraUsageDescription + We need this so that you can take and share photos and videos. + NSContactsUsageDescription + Telegram stores your contacts heavily encrypted in the cloud to let you connect with your friends across all your devices. + NSFaceIDUsageDescription + You can use Face ID to unlock the app. + NSLocationAlwaysUsageDescription + When you send your location to your friends, Telegram needs access to show them a map. You also need this to send locations from an Apple Watch. + NSLocationWhenInUseUsageDescription + When you send your location to your friends, Telegram needs access to show them a map. + NSMicrophoneUsageDescription + We need this so that you can record and share voice messages and videos with sound. + NSMotionUsageDescription + When you send your location to your friends, Telegram needs access to show them a map. + NSPhotoLibraryAddUsageDescription + We need this so that you can share photos and videos from your photo library. + NSPhotoLibraryUsageDescription + We need this so that you can share photos and videos from your photo library. + NSSiriUsageDescription + You can use Siri to send messages. + NSUserActivityTypes + + INSendMessageIntent + RemindAboutChatIntent + + UIAppFonts + + SFCompactRounded-Semibold.otf + + UIBackgroundModes + + audio + fetch + location + remote-notification + voip + + UIFileSharingEnabled + UILaunchStoryboardName LaunchScreen UIRequiredDeviceCapabilities - arm64 + armv7 + UIRequiresPersistentWiFi + + UIStatusBarStyle + UIStatusBarStyleDefault UISupportedInterfaceOrientations UIInterfaceOrientationPortrait @@ -48,5 +326,35 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + UIViewControllerBasedStatusBarAppearance + + UIViewEdgeAntialiasing + + UIViewGroupOpacity + + UTImportedTypeDeclarations + + + UTTypeConformsTo + + public.data + + UTTypeDescription + Telegram iOS Color Theme File + UTTypeIconFiles + + BlueIcon@3x.png + + UTTypeIdentifier + org.telegram.Telegram-iOS.theme + UTTypeTagSpecification + + public.filename-extension + + tgios-theme + + + + diff --git a/App/Info_bak.plist b/App/Info_bak.plist new file mode 100644 index 0000000000..64ef73c0b6 --- /dev/null +++ b/App/Info_bak.plist @@ -0,0 +1,52 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + App + CFBundleIconFiles + + Icon.png + Icon@2x.png + Icon-72.png + Icon-72@2x.png + Icon-Small-50.png + Icon-Small-50@2x.png + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIRequiredDeviceCapabilities + + arm64 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/App/Telegram_Buck.xcworkspace/buck-project.meta.json b/App/Telegram_Buck.xcworkspace/buck-project.meta.json new file mode 100644 index 0000000000..d2de42c689 --- /dev/null +++ b/App/Telegram_Buck.xcworkspace/buck-project.meta.json @@ -0,0 +1 @@ +{"required-targets":["//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_ac3_parser.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_adts_parser.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_avcodec.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_avdct.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_avfft.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_d3d11va.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_dirac.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_dv_profile.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_dxva2.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_jni.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_mediacodec.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_qsv.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_vaapi.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_vdpau.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_version.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_videotoolbox.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_vorbis_parser.h","//submodules/FFMpeg:ffmpeg_header_libavcodec_sub_xvmc.h","//submodules/FFMpeg:ffmpeg_header_libavformat_sub_avformat.h","//submodules/FFMpeg:ffmpeg_header_libavformat_sub_avio.h","//submodules/FFMpeg:ffmpeg_header_libavformat_sub_version.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_adler32.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_aes.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_aes_ctr.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_attributes.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_audio_fifo.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_avassert.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_avconfig.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_avstring.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_avutil.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_base64.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_blowfish.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_bprint.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_bswap.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_buffer.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_camellia.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_cast5.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_channel_layout.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_common.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_cpu.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_crc.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_des.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_dict.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_display.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_downmix_info.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_encryption_info.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_error.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_eval.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_ffversion.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_fifo.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_file.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_frame.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hash.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hmac.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext_cuda.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext_d3d11va.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext_drm.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext_dxva2.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext_mediacodec.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext_qsv.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext_vaapi.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext_vdpau.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_hwcontext_videotoolbox.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_imgutils.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_intfloat.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_intreadwrite.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_lfg.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_log.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_lzo.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_macros.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_mastering_display_metadata.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_mathematics.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_md5.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_mem.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_motion_vector.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_murmur3.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_opt.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_parseutils.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_pixdesc.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_pixelutils.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_pixfmt.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_random_seed.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_rational.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_rc4.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_replaygain.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_ripemd.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_samplefmt.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_sha.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_sha512.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_spherical.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_stereo3d.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_tea.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_threadmessage.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_time.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_timecode.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_timestamp.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_tree.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_twofish.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_version.h","//submodules/FFMpeg:ffmpeg_header_libavutil_sub_xtea.h","//submodules/FFMpeg:ffmpeg_header_libswresample_sub_swresample.h","//submodules/FFMpeg:ffmpeg_header_libswresample_sub_version.h","//submodules/FFMpeg:libffmpeg_build","//submodules/MtProtoKit:openssl_libs","//submodules/Opus:opus_lib_file","//submodules/WebP:WebP_lib_file"],"xcconfig-paths":["buck-out/gen/App/AppLibrary-Debug.xcconfig","buck-out/gen/App/AppLibrary-Profile.xcconfig","buck-out/gen/App/AppLibrary-Release.xcconfig","buck-out/gen/App/Telegram-Debug.xcconfig","buck-out/gen/App/Telegram-Profile.xcconfig","buck-out/gen/App/Telegram-Release.xcconfig","buck-out/gen/submodules/AccountContext/AccountContext-Debug.xcconfig","buck-out/gen/submodules/AccountContext/AccountContext-Profile.xcconfig","buck-out/gen/submodules/AccountContext/AccountContext-Release.xcconfig","buck-out/gen/submodules/ActionSheetPeerItem/ActionSheetPeerItem-Debug.xcconfig","buck-out/gen/submodules/ActionSheetPeerItem/ActionSheetPeerItem-Profile.xcconfig","buck-out/gen/submodules/ActionSheetPeerItem/ActionSheetPeerItem-Release.xcconfig","buck-out/gen/submodules/ActivityIndicator/ActivityIndicator-Debug.xcconfig","buck-out/gen/submodules/ActivityIndicator/ActivityIndicator-Profile.xcconfig","buck-out/gen/submodules/ActivityIndicator/ActivityIndicator-Release.xcconfig","buck-out/gen/submodules/AlertUI/AlertUI-Debug.xcconfig","buck-out/gen/submodules/AlertUI/AlertUI-Profile.xcconfig","buck-out/gen/submodules/AlertUI/AlertUI-Release.xcconfig","buck-out/gen/submodules/AnimationUI/AnimationUI-Debug.xcconfig","buck-out/gen/submodules/AnimationUI/AnimationUI-Profile.xcconfig","buck-out/gen/submodules/AnimationUI/AnimationUI-Release.xcconfig","buck-out/gen/submodules/AppBundle/AppBundle-Debug.xcconfig","buck-out/gen/submodules/AppBundle/AppBundle-Profile.xcconfig","buck-out/gen/submodules/AppBundle/AppBundle-Release.xcconfig","buck-out/gen/submodules/AsyncDisplayKit/AsyncDisplayKit#shared-Debug.xcconfig","buck-out/gen/submodules/AsyncDisplayKit/AsyncDisplayKit#shared-Profile.xcconfig","buck-out/gen/submodules/AsyncDisplayKit/AsyncDisplayKit#shared-Release.xcconfig","buck-out/gen/submodules/AuthorizationUI/AuthorizationUI-Debug.xcconfig","buck-out/gen/submodules/AuthorizationUI/AuthorizationUI-Profile.xcconfig","buck-out/gen/submodules/AuthorizationUI/AuthorizationUI-Release.xcconfig","buck-out/gen/submodules/AvatarNode/AvatarNode-Debug.xcconfig","buck-out/gen/submodules/AvatarNode/AvatarNode-Profile.xcconfig","buck-out/gen/submodules/AvatarNode/AvatarNode-Release.xcconfig","buck-out/gen/submodules/BotPaymentsUI/BotPaymentsUI-Debug.xcconfig","buck-out/gen/submodules/BotPaymentsUI/BotPaymentsUI-Profile.xcconfig","buck-out/gen/submodules/BotPaymentsUI/BotPaymentsUI-Release.xcconfig","buck-out/gen/submodules/BuildConfig/BuildConfig-Debug.xcconfig","buck-out/gen/submodules/BuildConfig/BuildConfig-Profile.xcconfig","buck-out/gen/submodules/BuildConfig/BuildConfig-Release.xcconfig","buck-out/gen/submodules/CallListUI/CallListUI-Debug.xcconfig","buck-out/gen/submodules/CallListUI/CallListUI-Profile.xcconfig","buck-out/gen/submodules/CallListUI/CallListUI-Release.xcconfig","buck-out/gen/submodules/ChatListSearchItemHeader/ChatListSearchItemHeader-Debug.xcconfig","buck-out/gen/submodules/ChatListSearchItemHeader/ChatListSearchItemHeader-Profile.xcconfig","buck-out/gen/submodules/ChatListSearchItemHeader/ChatListSearchItemHeader-Release.xcconfig","buck-out/gen/submodules/ChatListSearchItemNode/ChatListSearchItemNode-Debug.xcconfig","buck-out/gen/submodules/ChatListSearchItemNode/ChatListSearchItemNode-Profile.xcconfig","buck-out/gen/submodules/ChatListSearchItemNode/ChatListSearchItemNode-Release.xcconfig","buck-out/gen/submodules/ChatListSearchRecentPeersNode/ChatListSearchRecentPeersNode-Debug.xcconfig","buck-out/gen/submodules/ChatListSearchRecentPeersNode/ChatListSearchRecentPeersNode-Profile.xcconfig","buck-out/gen/submodules/ChatListSearchRecentPeersNode/ChatListSearchRecentPeersNode-Release.xcconfig","buck-out/gen/submodules/ChatListUI/ChatListUI-Debug.xcconfig","buck-out/gen/submodules/ChatListUI/ChatListUI-Profile.xcconfig","buck-out/gen/submodules/ChatListUI/ChatListUI-Release.xcconfig","buck-out/gen/submodules/ChatTitleActivityNode/ChatTitleActivityNode-Debug.xcconfig","buck-out/gen/submodules/ChatTitleActivityNode/ChatTitleActivityNode-Profile.xcconfig","buck-out/gen/submodules/ChatTitleActivityNode/ChatTitleActivityNode-Release.xcconfig","buck-out/gen/submodules/CheckNode/CheckNode-Debug.xcconfig","buck-out/gen/submodules/CheckNode/CheckNode-Profile.xcconfig","buck-out/gen/submodules/CheckNode/CheckNode-Release.xcconfig","buck-out/gen/submodules/ComposePollUI/ComposePollUI-Debug.xcconfig","buck-out/gen/submodules/ComposePollUI/ComposePollUI-Profile.xcconfig","buck-out/gen/submodules/ComposePollUI/ComposePollUI-Release.xcconfig","buck-out/gen/submodules/ContactListUI/ContactListUI-Debug.xcconfig","buck-out/gen/submodules/ContactListUI/ContactListUI-Profile.xcconfig","buck-out/gen/submodules/ContactListUI/ContactListUI-Release.xcconfig","buck-out/gen/submodules/ContactsPeerItem/ContactsPeerItem-Debug.xcconfig","buck-out/gen/submodules/ContactsPeerItem/ContactsPeerItem-Profile.xcconfig","buck-out/gen/submodules/ContactsPeerItem/ContactsPeerItem-Release.xcconfig","buck-out/gen/submodules/ContextUI/ContextUI-Debug.xcconfig","buck-out/gen/submodules/ContextUI/ContextUI-Profile.xcconfig","buck-out/gen/submodules/ContextUI/ContextUI-Release.xcconfig","buck-out/gen/submodules/CounterContollerTitleView/CounterContollerTitleView-Debug.xcconfig","buck-out/gen/submodules/CounterContollerTitleView/CounterContollerTitleView-Profile.xcconfig","buck-out/gen/submodules/CounterContollerTitleView/CounterContollerTitleView-Release.xcconfig","buck-out/gen/submodules/CountrySelectionUI/CountrySelectionUI-Debug.xcconfig","buck-out/gen/submodules/CountrySelectionUI/CountrySelectionUI-Profile.xcconfig","buck-out/gen/submodules/CountrySelectionUI/CountrySelectionUI-Release.xcconfig","buck-out/gen/submodules/Crc32/Crc32-Debug.xcconfig","buck-out/gen/submodules/Crc32/Crc32-Profile.xcconfig","buck-out/gen/submodules/Crc32/Crc32-Release.xcconfig","buck-out/gen/submodules/DateSelectionUI/DateSelectionUI-Debug.xcconfig","buck-out/gen/submodules/DateSelectionUI/DateSelectionUI-Profile.xcconfig","buck-out/gen/submodules/DateSelectionUI/DateSelectionUI-Release.xcconfig","buck-out/gen/submodules/DeleteChatPeerActionSheetItem/DeleteChatPeerActionSheetItem-Debug.xcconfig","buck-out/gen/submodules/DeleteChatPeerActionSheetItem/DeleteChatPeerActionSheetItem-Profile.xcconfig","buck-out/gen/submodules/DeleteChatPeerActionSheetItem/DeleteChatPeerActionSheetItem-Release.xcconfig","buck-out/gen/submodules/DeviceAccess/DeviceAccess-Debug.xcconfig","buck-out/gen/submodules/DeviceAccess/DeviceAccess-Profile.xcconfig","buck-out/gen/submodules/DeviceAccess/DeviceAccess-Release.xcconfig","buck-out/gen/submodules/DeviceLocationManager/DeviceLocationManager-Debug.xcconfig","buck-out/gen/submodules/DeviceLocationManager/DeviceLocationManager-Profile.xcconfig","buck-out/gen/submodules/DeviceLocationManager/DeviceLocationManager-Release.xcconfig","buck-out/gen/submodules/DeviceProximity/DeviceProximity-Debug.xcconfig","buck-out/gen/submodules/DeviceProximity/DeviceProximity-Profile.xcconfig","buck-out/gen/submodules/DeviceProximity/DeviceProximity-Release.xcconfig","buck-out/gen/submodules/DirectionalPanGesture/DirectionalPanGesture-Debug.xcconfig","buck-out/gen/submodules/DirectionalPanGesture/DirectionalPanGesture-Profile.xcconfig","buck-out/gen/submodules/DirectionalPanGesture/DirectionalPanGesture-Release.xcconfig","buck-out/gen/submodules/Display/Display#shared-Debug.xcconfig","buck-out/gen/submodules/Display/Display#shared-Profile.xcconfig","buck-out/gen/submodules/Display/Display#shared-Release.xcconfig","buck-out/gen/submodules/Emoji/Emoji-Debug.xcconfig","buck-out/gen/submodules/Emoji/Emoji-Profile.xcconfig","buck-out/gen/submodules/Emoji/Emoji-Release.xcconfig","buck-out/gen/submodules/EncryptionKeyVisualization/EncryptionKeyVisualization-Debug.xcconfig","buck-out/gen/submodules/EncryptionKeyVisualization/EncryptionKeyVisualization-Profile.xcconfig","buck-out/gen/submodules/EncryptionKeyVisualization/EncryptionKeyVisualization-Release.xcconfig","buck-out/gen/submodules/FFMpeg/FFMpeg-Debug.xcconfig","buck-out/gen/submodules/FFMpeg/FFMpeg-Profile.xcconfig","buck-out/gen/submodules/FFMpeg/FFMpeg-Release.xcconfig","buck-out/gen/submodules/FFMpeg/libffmpeg-Debug.xcconfig","buck-out/gen/submodules/FFMpeg/libffmpeg-Profile.xcconfig","buck-out/gen/submodules/FFMpeg/libffmpeg-Release.xcconfig","buck-out/gen/submodules/GZip/GZip-Debug.xcconfig","buck-out/gen/submodules/GZip/GZip-Profile.xcconfig","buck-out/gen/submodules/GZip/GZip-Release.xcconfig","buck-out/gen/submodules/GalleryUI/GalleryUI-Debug.xcconfig","buck-out/gen/submodules/GalleryUI/GalleryUI-Profile.xcconfig","buck-out/gen/submodules/GalleryUI/GalleryUI-Release.xcconfig","buck-out/gen/submodules/GameUI/GameUI-Debug.xcconfig","buck-out/gen/submodules/GameUI/GameUI-Profile.xcconfig","buck-out/gen/submodules/GameUI/GameUI-Release.xcconfig","buck-out/gen/submodules/Geocoding/Geocoding-Debug.xcconfig","buck-out/gen/submodules/Geocoding/Geocoding-Profile.xcconfig","buck-out/gen/submodules/Geocoding/Geocoding-Release.xcconfig","buck-out/gen/submodules/GridMessageSelectionNode/GridMessageSelectionNode-Debug.xcconfig","buck-out/gen/submodules/GridMessageSelectionNode/GridMessageSelectionNode-Profile.xcconfig","buck-out/gen/submodules/GridMessageSelectionNode/GridMessageSelectionNode-Release.xcconfig","buck-out/gen/submodules/HashtagSearchUI/HashtagSearchUI-Debug.xcconfig","buck-out/gen/submodules/HashtagSearchUI/HashtagSearchUI-Profile.xcconfig","buck-out/gen/submodules/HashtagSearchUI/HashtagSearchUI-Release.xcconfig","buck-out/gen/submodules/HexColor/HexColor-Debug.xcconfig","buck-out/gen/submodules/HexColor/HexColor-Profile.xcconfig","buck-out/gen/submodules/HexColor/HexColor-Release.xcconfig","buck-out/gen/submodules/HockeySDK-iOS/HockeySDK-Debug.xcconfig","buck-out/gen/submodules/HockeySDK-iOS/HockeySDK-Profile.xcconfig","buck-out/gen/submodules/HockeySDK-iOS/HockeySDK-Release.xcconfig","buck-out/gen/submodules/HorizontalPeerItem/HorizontalPeerItem-Debug.xcconfig","buck-out/gen/submodules/HorizontalPeerItem/HorizontalPeerItem-Profile.xcconfig","buck-out/gen/submodules/HorizontalPeerItem/HorizontalPeerItem-Release.xcconfig","buck-out/gen/submodules/ImageBlur/ImageBlur-Debug.xcconfig","buck-out/gen/submodules/ImageBlur/ImageBlur-Profile.xcconfig","buck-out/gen/submodules/ImageBlur/ImageBlur-Release.xcconfig","buck-out/gen/submodules/ImageCompression/ImageCompression-Debug.xcconfig","buck-out/gen/submodules/ImageCompression/ImageCompression-Profile.xcconfig","buck-out/gen/submodules/ImageCompression/ImageCompression-Release.xcconfig","buck-out/gen/submodules/ImageTransparency/ImageTransparency-Debug.xcconfig","buck-out/gen/submodules/ImageTransparency/ImageTransparency-Profile.xcconfig","buck-out/gen/submodules/ImageTransparency/ImageTransparency-Release.xcconfig","buck-out/gen/submodules/InstantPageCache/InstantPageCache-Debug.xcconfig","buck-out/gen/submodules/InstantPageCache/InstantPageCache-Profile.xcconfig","buck-out/gen/submodules/InstantPageCache/InstantPageCache-Release.xcconfig","buck-out/gen/submodules/InstantPageUI/InstantPageUI-Debug.xcconfig","buck-out/gen/submodules/InstantPageUI/InstantPageUI-Profile.xcconfig","buck-out/gen/submodules/InstantPageUI/InstantPageUI-Release.xcconfig","buck-out/gen/submodules/ItemListAddressItem/ItemListAddressItem-Debug.xcconfig","buck-out/gen/submodules/ItemListAddressItem/ItemListAddressItem-Profile.xcconfig","buck-out/gen/submodules/ItemListAddressItem/ItemListAddressItem-Release.xcconfig","buck-out/gen/submodules/ItemListAvatarAndNameInfoItem/ItemListAvatarAndNameInfoItem-Debug.xcconfig","buck-out/gen/submodules/ItemListAvatarAndNameInfoItem/ItemListAvatarAndNameInfoItem-Profile.xcconfig","buck-out/gen/submodules/ItemListAvatarAndNameInfoItem/ItemListAvatarAndNameInfoItem-Release.xcconfig","buck-out/gen/submodules/ItemListPeerActionItem/ItemListPeerActionItem-Debug.xcconfig","buck-out/gen/submodules/ItemListPeerActionItem/ItemListPeerActionItem-Profile.xcconfig","buck-out/gen/submodules/ItemListPeerActionItem/ItemListPeerActionItem-Release.xcconfig","buck-out/gen/submodules/ItemListPeerItem/ItemListPeerItem-Debug.xcconfig","buck-out/gen/submodules/ItemListPeerItem/ItemListPeerItem-Profile.xcconfig","buck-out/gen/submodules/ItemListPeerItem/ItemListPeerItem-Release.xcconfig","buck-out/gen/submodules/ItemListStickerPackItem/ItemListStickerPackItem-Debug.xcconfig","buck-out/gen/submodules/ItemListStickerPackItem/ItemListStickerPackItem-Profile.xcconfig","buck-out/gen/submodules/ItemListStickerPackItem/ItemListStickerPackItem-Release.xcconfig","buck-out/gen/submodules/ItemListUI/ItemListUI-Debug.xcconfig","buck-out/gen/submodules/ItemListUI/ItemListUI-Profile.xcconfig","buck-out/gen/submodules/ItemListUI/ItemListUI-Release.xcconfig","buck-out/gen/submodules/JoinLinkPreviewUI/JoinLinkPreviewUI-Debug.xcconfig","buck-out/gen/submodules/JoinLinkPreviewUI/JoinLinkPreviewUI-Profile.xcconfig","buck-out/gen/submodules/JoinLinkPreviewUI/JoinLinkPreviewUI-Release.xcconfig","buck-out/gen/submodules/LanguageLinkPreviewUI/LanguageLinkPreviewUI-Debug.xcconfig","buck-out/gen/submodules/LanguageLinkPreviewUI/LanguageLinkPreviewUI-Profile.xcconfig","buck-out/gen/submodules/LanguageLinkPreviewUI/LanguageLinkPreviewUI-Release.xcconfig","buck-out/gen/submodules/LanguageSuggestionUI/LanguageSuggestionUI-Debug.xcconfig","buck-out/gen/submodules/LanguageSuggestionUI/LanguageSuggestionUI-Profile.xcconfig","buck-out/gen/submodules/LanguageSuggestionUI/LanguageSuggestionUI-Release.xcconfig","buck-out/gen/submodules/LegacyComponents/LegacyComponents-Debug.xcconfig","buck-out/gen/submodules/LegacyComponents/LegacyComponents-Profile.xcconfig","buck-out/gen/submodules/LegacyComponents/LegacyComponents-Release.xcconfig","buck-out/gen/submodules/LegacyDataImport/LegacyDataImport-Debug.xcconfig","buck-out/gen/submodules/LegacyDataImport/LegacyDataImport-Profile.xcconfig","buck-out/gen/submodules/LegacyDataImport/LegacyDataImport-Release.xcconfig","buck-out/gen/submodules/LegacyMediaPickerUI/LegacyMediaPickerUI-Debug.xcconfig","buck-out/gen/submodules/LegacyMediaPickerUI/LegacyMediaPickerUI-Profile.xcconfig","buck-out/gen/submodules/LegacyMediaPickerUI/LegacyMediaPickerUI-Release.xcconfig","buck-out/gen/submodules/LegacyUI/LegacyUI-Debug.xcconfig","buck-out/gen/submodules/LegacyUI/LegacyUI-Profile.xcconfig","buck-out/gen/submodules/LegacyUI/LegacyUI-Release.xcconfig","buck-out/gen/submodules/LightweightAccountData/LightweightAccountData-Debug.xcconfig","buck-out/gen/submodules/LightweightAccountData/LightweightAccountData-Profile.xcconfig","buck-out/gen/submodules/LightweightAccountData/LightweightAccountData-Release.xcconfig","buck-out/gen/submodules/ListSectionHeaderNode/ListSectionHeaderNode-Debug.xcconfig","buck-out/gen/submodules/ListSectionHeaderNode/ListSectionHeaderNode-Profile.xcconfig","buck-out/gen/submodules/ListSectionHeaderNode/ListSectionHeaderNode-Release.xcconfig","buck-out/gen/submodules/LiveLocationManager/LiveLocationManager-Debug.xcconfig","buck-out/gen/submodules/LiveLocationManager/LiveLocationManager-Profile.xcconfig","buck-out/gen/submodules/LiveLocationManager/LiveLocationManager-Release.xcconfig","buck-out/gen/submodules/LiveLocationPositionNode/LiveLocationPositionNode-Debug.xcconfig","buck-out/gen/submodules/LiveLocationPositionNode/LiveLocationPositionNode-Profile.xcconfig","buck-out/gen/submodules/LiveLocationPositionNode/LiveLocationPositionNode-Release.xcconfig","buck-out/gen/submodules/LiveLocationTimerNode/LiveLocationTimerNode-Debug.xcconfig","buck-out/gen/submodules/LiveLocationTimerNode/LiveLocationTimerNode-Profile.xcconfig","buck-out/gen/submodules/LiveLocationTimerNode/LiveLocationTimerNode-Release.xcconfig","buck-out/gen/submodules/LocalAuth/LocalAuth-Debug.xcconfig","buck-out/gen/submodules/LocalAuth/LocalAuth-Profile.xcconfig","buck-out/gen/submodules/LocalAuth/LocalAuth-Release.xcconfig","buck-out/gen/submodules/LocalMediaResources/LocalMediaResources-Debug.xcconfig","buck-out/gen/submodules/LocalMediaResources/LocalMediaResources-Profile.xcconfig","buck-out/gen/submodules/LocalMediaResources/LocalMediaResources-Release.xcconfig","buck-out/gen/submodules/LocalizedPeerData/LocalizedPeerData-Debug.xcconfig","buck-out/gen/submodules/LocalizedPeerData/LocalizedPeerData-Profile.xcconfig","buck-out/gen/submodules/LocalizedPeerData/LocalizedPeerData-Release.xcconfig","buck-out/gen/submodules/LocationUI/LocationUI-Debug.xcconfig","buck-out/gen/submodules/LocationUI/LocationUI-Profile.xcconfig","buck-out/gen/submodules/LocationUI/LocationUI-Release.xcconfig","buck-out/gen/submodules/MapResourceToAvatarSizes/MapResourceToAvatarSizes-Debug.xcconfig","buck-out/gen/submodules/MapResourceToAvatarSizes/MapResourceToAvatarSizes-Profile.xcconfig","buck-out/gen/submodules/MapResourceToAvatarSizes/MapResourceToAvatarSizes-Release.xcconfig","buck-out/gen/submodules/MediaPlayer/UniversalMediaPlayer-Debug.xcconfig","buck-out/gen/submodules/MediaPlayer/UniversalMediaPlayer-Profile.xcconfig","buck-out/gen/submodules/MediaPlayer/UniversalMediaPlayer-Release.xcconfig","buck-out/gen/submodules/MediaResources/MediaResources-Debug.xcconfig","buck-out/gen/submodules/MediaResources/MediaResources-Profile.xcconfig","buck-out/gen/submodules/MediaResources/MediaResources-Release.xcconfig","buck-out/gen/submodules/MergeLists/MergeLists-Debug.xcconfig","buck-out/gen/submodules/MergeLists/MergeLists-Profile.xcconfig","buck-out/gen/submodules/MergeLists/MergeLists-Release.xcconfig","buck-out/gen/submodules/MessageReactionListUI/MessageReactionListUI-Debug.xcconfig","buck-out/gen/submodules/MessageReactionListUI/MessageReactionListUI-Profile.xcconfig","buck-out/gen/submodules/MessageReactionListUI/MessageReactionListUI-Release.xcconfig","buck-out/gen/submodules/MimeTypes/MimeTypes-Debug.xcconfig","buck-out/gen/submodules/MimeTypes/MimeTypes-Profile.xcconfig","buck-out/gen/submodules/MimeTypes/MimeTypes-Release.xcconfig","buck-out/gen/submodules/MosaicLayout/MosaicLayout-Debug.xcconfig","buck-out/gen/submodules/MosaicLayout/MosaicLayout-Profile.xcconfig","buck-out/gen/submodules/MosaicLayout/MosaicLayout-Release.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKit#shared-Debug.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKit#shared-Profile.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKit#shared-Release.xcconfig","buck-out/gen/submodules/MtProtoKit/openssl-Debug.xcconfig","buck-out/gen/submodules/MtProtoKit/openssl-Profile.xcconfig","buck-out/gen/submodules/MtProtoKit/openssl-Release.xcconfig","buck-out/gen/submodules/MusicAlbumArtResources/MusicAlbumArtResources-Debug.xcconfig","buck-out/gen/submodules/MusicAlbumArtResources/MusicAlbumArtResources-Profile.xcconfig","buck-out/gen/submodules/MusicAlbumArtResources/MusicAlbumArtResources-Release.xcconfig","buck-out/gen/submodules/NotificationMuteSettingsUI/NotificationMuteSettingsUI-Debug.xcconfig","buck-out/gen/submodules/NotificationMuteSettingsUI/NotificationMuteSettingsUI-Profile.xcconfig","buck-out/gen/submodules/NotificationMuteSettingsUI/NotificationMuteSettingsUI-Release.xcconfig","buck-out/gen/submodules/NotificationSoundSelectionUI/NotificationSoundSelectionUI-Debug.xcconfig","buck-out/gen/submodules/NotificationSoundSelectionUI/NotificationSoundSelectionUI-Profile.xcconfig","buck-out/gen/submodules/NotificationSoundSelectionUI/NotificationSoundSelectionUI-Release.xcconfig","buck-out/gen/submodules/OpenInExternalAppUI/OpenInExternalAppUI-Debug.xcconfig","buck-out/gen/submodules/OpenInExternalAppUI/OpenInExternalAppUI-Profile.xcconfig","buck-out/gen/submodules/OpenInExternalAppUI/OpenInExternalAppUI-Release.xcconfig","buck-out/gen/submodules/Opus/opus-Debug.xcconfig","buck-out/gen/submodules/Opus/opus-Profile.xcconfig","buck-out/gen/submodules/Opus/opus-Release.xcconfig","buck-out/gen/submodules/Opus/opus_lib-Debug.xcconfig","buck-out/gen/submodules/Opus/opus_lib-Profile.xcconfig","buck-out/gen/submodules/Opus/opus_lib-Release.xcconfig","buck-out/gen/submodules/OpusBinding/OpusBinding-Debug.xcconfig","buck-out/gen/submodules/OpusBinding/OpusBinding-Profile.xcconfig","buck-out/gen/submodules/OpusBinding/OpusBinding-Release.xcconfig","buck-out/gen/submodules/OverlayStatusController/OverlayStatusController-Debug.xcconfig","buck-out/gen/submodules/OverlayStatusController/OverlayStatusController-Profile.xcconfig","buck-out/gen/submodules/OverlayStatusController/OverlayStatusController-Release.xcconfig","buck-out/gen/submodules/PasscodeUI/PasscodeUI-Debug.xcconfig","buck-out/gen/submodules/PasscodeUI/PasscodeUI-Profile.xcconfig","buck-out/gen/submodules/PasscodeUI/PasscodeUI-Release.xcconfig","buck-out/gen/submodules/PassportUI/PassportUI-Debug.xcconfig","buck-out/gen/submodules/PassportUI/PassportUI-Profile.xcconfig","buck-out/gen/submodules/PassportUI/PassportUI-Release.xcconfig","buck-out/gen/submodules/PasswordSetupUI/PasswordSetupUI-Debug.xcconfig","buck-out/gen/submodules/PasswordSetupUI/PasswordSetupUI-Profile.xcconfig","buck-out/gen/submodules/PasswordSetupUI/PasswordSetupUI-Release.xcconfig","buck-out/gen/submodules/Pdf/Pdf-Debug.xcconfig","buck-out/gen/submodules/Pdf/Pdf-Profile.xcconfig","buck-out/gen/submodules/Pdf/Pdf-Release.xcconfig","buck-out/gen/submodules/PeerAvatarGalleryUI/PeerAvatarGalleryUI-Debug.xcconfig","buck-out/gen/submodules/PeerAvatarGalleryUI/PeerAvatarGalleryUI-Profile.xcconfig","buck-out/gen/submodules/PeerAvatarGalleryUI/PeerAvatarGalleryUI-Release.xcconfig","buck-out/gen/submodules/PeerInfoUI/PeerInfoUI-Debug.xcconfig","buck-out/gen/submodules/PeerInfoUI/PeerInfoUI-Profile.xcconfig","buck-out/gen/submodules/PeerInfoUI/PeerInfoUI-Release.xcconfig","buck-out/gen/submodules/PeerOnlineMarkerNode/PeerOnlineMarkerNode-Debug.xcconfig","buck-out/gen/submodules/PeerOnlineMarkerNode/PeerOnlineMarkerNode-Profile.xcconfig","buck-out/gen/submodules/PeerOnlineMarkerNode/PeerOnlineMarkerNode-Release.xcconfig","buck-out/gen/submodules/PeerPresenceStatusManager/PeerPresenceStatusManager-Debug.xcconfig","buck-out/gen/submodules/PeerPresenceStatusManager/PeerPresenceStatusManager-Profile.xcconfig","buck-out/gen/submodules/PeerPresenceStatusManager/PeerPresenceStatusManager-Release.xcconfig","buck-out/gen/submodules/PeersNearbyIconNode/PeersNearbyIconNode-Debug.xcconfig","buck-out/gen/submodules/PeersNearbyIconNode/PeersNearbyIconNode-Profile.xcconfig","buck-out/gen/submodules/PeersNearbyIconNode/PeersNearbyIconNode-Release.xcconfig","buck-out/gen/submodules/PeersNearbyUI/PeersNearbyUI-Debug.xcconfig","buck-out/gen/submodules/PeersNearbyUI/PeersNearbyUI-Profile.xcconfig","buck-out/gen/submodules/PeersNearbyUI/PeersNearbyUI-Release.xcconfig","buck-out/gen/submodules/PersistentStringHash/PersistentStringHash-Debug.xcconfig","buck-out/gen/submodules/PersistentStringHash/PersistentStringHash-Profile.xcconfig","buck-out/gen/submodules/PersistentStringHash/PersistentStringHash-Release.xcconfig","buck-out/gen/submodules/PhoneInputNode/PhoneInputNode-Debug.xcconfig","buck-out/gen/submodules/PhoneInputNode/PhoneInputNode-Profile.xcconfig","buck-out/gen/submodules/PhoneInputNode/PhoneInputNode-Release.xcconfig","buck-out/gen/submodules/PhotoResources/PhotoResources-Debug.xcconfig","buck-out/gen/submodules/PhotoResources/PhotoResources-Profile.xcconfig","buck-out/gen/submodules/PhotoResources/PhotoResources-Release.xcconfig","buck-out/gen/submodules/PlatformRestrictionMatching/PlatformRestrictionMatching-Debug.xcconfig","buck-out/gen/submodules/PlatformRestrictionMatching/PlatformRestrictionMatching-Profile.xcconfig","buck-out/gen/submodules/PlatformRestrictionMatching/PlatformRestrictionMatching-Release.xcconfig","buck-out/gen/submodules/Postbox/Postbox#shared-Debug.xcconfig","buck-out/gen/submodules/Postbox/Postbox#shared-Profile.xcconfig","buck-out/gen/submodules/Postbox/Postbox#shared-Release.xcconfig","buck-out/gen/submodules/ProgressNavigationButtonNode/ProgressNavigationButtonNode-Debug.xcconfig","buck-out/gen/submodules/ProgressNavigationButtonNode/ProgressNavigationButtonNode-Profile.xcconfig","buck-out/gen/submodules/ProgressNavigationButtonNode/ProgressNavigationButtonNode-Release.xcconfig","buck-out/gen/submodules/QrCode/QrCode-Debug.xcconfig","buck-out/gen/submodules/QrCode/QrCode-Profile.xcconfig","buck-out/gen/submodules/QrCode/QrCode-Release.xcconfig","buck-out/gen/submodules/RLottie/RLottie-Debug.xcconfig","buck-out/gen/submodules/RLottie/RLottie-Profile.xcconfig","buck-out/gen/submodules/RLottie/RLottie-Release.xcconfig","buck-out/gen/submodules/RMIntro/RMIntro-Debug.xcconfig","buck-out/gen/submodules/RMIntro/RMIntro-Profile.xcconfig","buck-out/gen/submodules/RMIntro/RMIntro-Release.xcconfig","buck-out/gen/submodules/RadialStatusNode/RadialStatusNode-Debug.xcconfig","buck-out/gen/submodules/RadialStatusNode/RadialStatusNode-Profile.xcconfig","buck-out/gen/submodules/RadialStatusNode/RadialStatusNode-Release.xcconfig","buck-out/gen/submodules/RaiseToListen/RaiseToListen-Debug.xcconfig","buck-out/gen/submodules/RaiseToListen/RaiseToListen-Profile.xcconfig","buck-out/gen/submodules/RaiseToListen/RaiseToListen-Release.xcconfig","buck-out/gen/submodules/ReactionSelectionNode/ReactionSelectionNode-Debug.xcconfig","buck-out/gen/submodules/ReactionSelectionNode/ReactionSelectionNode-Profile.xcconfig","buck-out/gen/submodules/ReactionSelectionNode/ReactionSelectionNode-Release.xcconfig","buck-out/gen/submodules/SSignalKit/SSignalKit/SSignalKit-Debug.xcconfig","buck-out/gen/submodules/SSignalKit/SSignalKit/SSignalKit-Profile.xcconfig","buck-out/gen/submodules/SSignalKit/SSignalKit/SSignalKit-Release.xcconfig","buck-out/gen/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit#shared-Debug.xcconfig","buck-out/gen/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit#shared-Profile.xcconfig","buck-out/gen/submodules/SSignalKit/SwiftSignalKit/SwiftSignalKit#shared-Release.xcconfig","buck-out/gen/submodules/SaveToCameraRoll/SaveToCameraRoll-Debug.xcconfig","buck-out/gen/submodules/SaveToCameraRoll/SaveToCameraRoll-Profile.xcconfig","buck-out/gen/submodules/SaveToCameraRoll/SaveToCameraRoll-Release.xcconfig","buck-out/gen/submodules/ScreenCaptureDetection/ScreenCaptureDetection-Debug.xcconfig","buck-out/gen/submodules/ScreenCaptureDetection/ScreenCaptureDetection-Profile.xcconfig","buck-out/gen/submodules/ScreenCaptureDetection/ScreenCaptureDetection-Release.xcconfig","buck-out/gen/submodules/SearchBarNode/SearchBarNode-Debug.xcconfig","buck-out/gen/submodules/SearchBarNode/SearchBarNode-Profile.xcconfig","buck-out/gen/submodules/SearchBarNode/SearchBarNode-Release.xcconfig","buck-out/gen/submodules/SearchUI/SearchUI-Debug.xcconfig","buck-out/gen/submodules/SearchUI/SearchUI-Profile.xcconfig","buck-out/gen/submodules/SearchUI/SearchUI-Release.xcconfig","buck-out/gen/submodules/SelectablePeerNode/SelectablePeerNode-Debug.xcconfig","buck-out/gen/submodules/SelectablePeerNode/SelectablePeerNode-Profile.xcconfig","buck-out/gen/submodules/SelectablePeerNode/SelectablePeerNode-Release.xcconfig","buck-out/gen/submodules/SettingsUI/SettingsUI-Debug.xcconfig","buck-out/gen/submodules/SettingsUI/SettingsUI-Profile.xcconfig","buck-out/gen/submodules/SettingsUI/SettingsUI-Release.xcconfig","buck-out/gen/submodules/ShareController/ShareController-Debug.xcconfig","buck-out/gen/submodules/ShareController/ShareController-Profile.xcconfig","buck-out/gen/submodules/ShareController/ShareController-Release.xcconfig","buck-out/gen/submodules/ShareItems/ShareItems-Debug.xcconfig","buck-out/gen/submodules/ShareItems/ShareItems-Profile.xcconfig","buck-out/gen/submodules/ShareItems/ShareItems-Release.xcconfig","buck-out/gen/submodules/SinglePhoneInputNode/SinglePhoneInputNode-Debug.xcconfig","buck-out/gen/submodules/SinglePhoneInputNode/SinglePhoneInputNode-Profile.xcconfig","buck-out/gen/submodules/SinglePhoneInputNode/SinglePhoneInputNode-Release.xcconfig","buck-out/gen/submodules/SolidRoundedButtonNode/SolidRoundedButtonNode-Debug.xcconfig","buck-out/gen/submodules/SolidRoundedButtonNode/SolidRoundedButtonNode-Profile.xcconfig","buck-out/gen/submodules/SolidRoundedButtonNode/SolidRoundedButtonNode-Release.xcconfig","buck-out/gen/submodules/StickerPackPreviewUI/StickerPackPreviewUI-Debug.xcconfig","buck-out/gen/submodules/StickerPackPreviewUI/StickerPackPreviewUI-Profile.xcconfig","buck-out/gen/submodules/StickerPackPreviewUI/StickerPackPreviewUI-Release.xcconfig","buck-out/gen/submodules/StickerResources/StickerResources-Debug.xcconfig","buck-out/gen/submodules/StickerResources/StickerResources-Profile.xcconfig","buck-out/gen/submodules/StickerResources/StickerResources-Release.xcconfig","buck-out/gen/submodules/Stripe/Stripe-Debug.xcconfig","buck-out/gen/submodules/Stripe/Stripe-Profile.xcconfig","buck-out/gen/submodules/Stripe/Stripe-Release.xcconfig","buck-out/gen/submodules/SwipeToDismissGesture/SwipeToDismissGesture-Debug.xcconfig","buck-out/gen/submodules/SwipeToDismissGesture/SwipeToDismissGesture-Profile.xcconfig","buck-out/gen/submodules/SwipeToDismissGesture/SwipeToDismissGesture-Release.xcconfig","buck-out/gen/submodules/SwitchNode/SwitchNode-Debug.xcconfig","buck-out/gen/submodules/SwitchNode/SwitchNode-Profile.xcconfig","buck-out/gen/submodules/SwitchNode/SwitchNode-Release.xcconfig","buck-out/gen/submodules/TelegramApi/TelegramApi-Debug.xcconfig","buck-out/gen/submodules/TelegramApi/TelegramApi-Profile.xcconfig","buck-out/gen/submodules/TelegramApi/TelegramApi-Release.xcconfig","buck-out/gen/submodules/TelegramAudio/TelegramAudio-Debug.xcconfig","buck-out/gen/submodules/TelegramAudio/TelegramAudio-Profile.xcconfig","buck-out/gen/submodules/TelegramAudio/TelegramAudio-Release.xcconfig","buck-out/gen/submodules/TelegramBaseController/TelegramBaseController-Debug.xcconfig","buck-out/gen/submodules/TelegramBaseController/TelegramBaseController-Profile.xcconfig","buck-out/gen/submodules/TelegramBaseController/TelegramBaseController-Release.xcconfig","buck-out/gen/submodules/TelegramCallsUI/TelegramCallsUI-Debug.xcconfig","buck-out/gen/submodules/TelegramCallsUI/TelegramCallsUI-Profile.xcconfig","buck-out/gen/submodules/TelegramCallsUI/TelegramCallsUI-Release.xcconfig","buck-out/gen/submodules/TelegramCore/TelegramCore#shared-Debug.xcconfig","buck-out/gen/submodules/TelegramCore/TelegramCore#shared-Profile.xcconfig","buck-out/gen/submodules/TelegramCore/TelegramCore#shared-Release.xcconfig","buck-out/gen/submodules/TelegramNotices/TelegramNotices-Debug.xcconfig","buck-out/gen/submodules/TelegramNotices/TelegramNotices-Profile.xcconfig","buck-out/gen/submodules/TelegramNotices/TelegramNotices-Release.xcconfig","buck-out/gen/submodules/TelegramPermissions/TelegramPermissions-Debug.xcconfig","buck-out/gen/submodules/TelegramPermissions/TelegramPermissions-Profile.xcconfig","buck-out/gen/submodules/TelegramPermissions/TelegramPermissions-Release.xcconfig","buck-out/gen/submodules/TelegramPermissionsUI/TelegramPermissionsUI-Debug.xcconfig","buck-out/gen/submodules/TelegramPermissionsUI/TelegramPermissionsUI-Profile.xcconfig","buck-out/gen/submodules/TelegramPermissionsUI/TelegramPermissionsUI-Release.xcconfig","buck-out/gen/submodules/TelegramPresentationData/TelegramPresentationData-Debug.xcconfig","buck-out/gen/submodules/TelegramPresentationData/TelegramPresentationData-Profile.xcconfig","buck-out/gen/submodules/TelegramPresentationData/TelegramPresentationData-Release.xcconfig","buck-out/gen/submodules/TelegramStringFormatting/TelegramStringFormatting-Debug.xcconfig","buck-out/gen/submodules/TelegramStringFormatting/TelegramStringFormatting-Profile.xcconfig","buck-out/gen/submodules/TelegramStringFormatting/TelegramStringFormatting-Release.xcconfig","buck-out/gen/submodules/TelegramUI/TelegramUI#shared-Debug.xcconfig","buck-out/gen/submodules/TelegramUI/TelegramUI#shared-Profile.xcconfig","buck-out/gen/submodules/TelegramUI/TelegramUI#shared-Release.xcconfig","buck-out/gen/submodules/TelegramUIPreferences/TelegramUIPreferences-Debug.xcconfig","buck-out/gen/submodules/TelegramUIPreferences/TelegramUIPreferences-Profile.xcconfig","buck-out/gen/submodules/TelegramUIPreferences/TelegramUIPreferences-Release.xcconfig","buck-out/gen/submodules/TelegramUniversalVideoContent/TelegramUniversalVideoContent-Debug.xcconfig","buck-out/gen/submodules/TelegramUniversalVideoContent/TelegramUniversalVideoContent-Profile.xcconfig","buck-out/gen/submodules/TelegramUniversalVideoContent/TelegramUniversalVideoContent-Release.xcconfig","buck-out/gen/submodules/TelegramUpdateUI/TelegramUpdateUI-Debug.xcconfig","buck-out/gen/submodules/TelegramUpdateUI/TelegramUpdateUI-Profile.xcconfig","buck-out/gen/submodules/TelegramUpdateUI/TelegramUpdateUI-Release.xcconfig","buck-out/gen/submodules/TelegramVoip/TelegramVoip-Debug.xcconfig","buck-out/gen/submodules/TelegramVoip/TelegramVoip-Profile.xcconfig","buck-out/gen/submodules/TelegramVoip/TelegramVoip-Release.xcconfig","buck-out/gen/submodules/TemporaryCachedPeerDataManager/TemporaryCachedPeerDataManager-Debug.xcconfig","buck-out/gen/submodules/TemporaryCachedPeerDataManager/TemporaryCachedPeerDataManager-Profile.xcconfig","buck-out/gen/submodules/TemporaryCachedPeerDataManager/TemporaryCachedPeerDataManager-Release.xcconfig","buck-out/gen/submodules/TextFormat/TextFormat-Debug.xcconfig","buck-out/gen/submodules/TextFormat/TextFormat-Profile.xcconfig","buck-out/gen/submodules/TextFormat/TextFormat-Release.xcconfig","buck-out/gen/submodules/TextSelectionNode/TextSelectionNode-Debug.xcconfig","buck-out/gen/submodules/TextSelectionNode/TextSelectionNode-Profile.xcconfig","buck-out/gen/submodules/TextSelectionNode/TextSelectionNode-Release.xcconfig","buck-out/gen/submodules/TinyThumbnail/TinyThumbnail-Debug.xcconfig","buck-out/gen/submodules/TinyThumbnail/TinyThumbnail-Profile.xcconfig","buck-out/gen/submodules/TinyThumbnail/TinyThumbnail-Release.xcconfig","buck-out/gen/submodules/TouchDownGesture/TouchDownGesture-Debug.xcconfig","buck-out/gen/submodules/TouchDownGesture/TouchDownGesture-Profile.xcconfig","buck-out/gen/submodules/TouchDownGesture/TouchDownGesture-Release.xcconfig","buck-out/gen/submodules/Tuples/Tuples-Debug.xcconfig","buck-out/gen/submodules/Tuples/Tuples-Profile.xcconfig","buck-out/gen/submodules/Tuples/Tuples-Release.xcconfig","buck-out/gen/submodules/UndoUI/UndoUI-Debug.xcconfig","buck-out/gen/submodules/UndoUI/UndoUI-Profile.xcconfig","buck-out/gen/submodules/UndoUI/UndoUI-Release.xcconfig","buck-out/gen/submodules/UrlEscaping/UrlEscaping-Debug.xcconfig","buck-out/gen/submodules/UrlEscaping/UrlEscaping-Profile.xcconfig","buck-out/gen/submodules/UrlEscaping/UrlEscaping-Release.xcconfig","buck-out/gen/submodules/UrlHandling/UrlHandling-Debug.xcconfig","buck-out/gen/submodules/UrlHandling/UrlHandling-Profile.xcconfig","buck-out/gen/submodules/UrlHandling/UrlHandling-Release.xcconfig","buck-out/gen/submodules/WallpaperResources/WallpaperResources-Debug.xcconfig","buck-out/gen/submodules/WallpaperResources/WallpaperResources-Profile.xcconfig","buck-out/gen/submodules/WallpaperResources/WallpaperResources-Release.xcconfig","buck-out/gen/submodules/WatchBridge/WatchBridge-Debug.xcconfig","buck-out/gen/submodules/WatchBridge/WatchBridge-Profile.xcconfig","buck-out/gen/submodules/WatchBridge/WatchBridge-Release.xcconfig","buck-out/gen/submodules/WatchBridgeAudio/WatchBridgeAudio-Debug.xcconfig","buck-out/gen/submodules/WatchBridgeAudio/WatchBridgeAudio-Profile.xcconfig","buck-out/gen/submodules/WatchBridgeAudio/WatchBridgeAudio-Release.xcconfig","buck-out/gen/submodules/WatchCommon/WatchCommon-Debug.xcconfig","buck-out/gen/submodules/WatchCommon/WatchCommon-Profile.xcconfig","buck-out/gen/submodules/WatchCommon/WatchCommon-Release.xcconfig","buck-out/gen/submodules/WebP/WebPImage-Debug.xcconfig","buck-out/gen/submodules/WebP/WebPImage-Profile.xcconfig","buck-out/gen/submodules/WebP/WebPImage-Release.xcconfig","buck-out/gen/submodules/WebP/WebP_lib-Debug.xcconfig","buck-out/gen/submodules/WebP/WebP_lib-Profile.xcconfig","buck-out/gen/submodules/WebP/WebP_lib-Release.xcconfig","buck-out/gen/submodules/WebSearchUI/WebSearchUI-Debug.xcconfig","buck-out/gen/submodules/WebSearchUI/WebSearchUI-Profile.xcconfig","buck-out/gen/submodules/WebSearchUI/WebSearchUI-Release.xcconfig","buck-out/gen/submodules/WebUI/WebUI-Debug.xcconfig","buck-out/gen/submodules/WebUI/WebUI-Profile.xcconfig","buck-out/gen/submodules/WebUI/WebUI-Release.xcconfig","buck-out/gen/submodules/WebsiteType/WebsiteType-Debug.xcconfig","buck-out/gen/submodules/WebsiteType/WebsiteType-Profile.xcconfig","buck-out/gen/submodules/WebsiteType/WebsiteType-Release.xcconfig","buck-out/gen/submodules/YuvConversion/YuvConversion-Debug.xcconfig","buck-out/gen/submodules/YuvConversion/YuvConversion-Profile.xcconfig","buck-out/gen/submodules/YuvConversion/YuvConversion-Release.xcconfig","buck-out/gen/submodules/libphonenumber/libphonenumber-Debug.xcconfig","buck-out/gen/submodules/libphonenumber/libphonenumber-Profile.xcconfig","buck-out/gen/submodules/libphonenumber/libphonenumber-Release.xcconfig","buck-out/gen/submodules/libtgvoip/libtgvoip-Debug.xcconfig","buck-out/gen/submodules/libtgvoip/libtgvoip-Profile.xcconfig","buck-out/gen/submodules/libtgvoip/libtgvoip-Release.xcconfig","buck-out/gen/submodules/lottie-ios/Lottie-Debug.xcconfig","buck-out/gen/submodules/lottie-ios/Lottie-Profile.xcconfig","buck-out/gen/submodules/lottie-ios/Lottie-Release.xcconfig","buck-out/gen/submodules/sqlcipher/sqlcipher-Debug.xcconfig","buck-out/gen/submodules/sqlcipher/sqlcipher-Profile.xcconfig","buck-out/gen/submodules/sqlcipher/sqlcipher-Release.xcconfig"],"copy-in-xcode":[]} \ No newline at end of file diff --git a/App/Telegram_Buck.xcworkspace/contents.xcworkspacedata b/App/Telegram_Buck.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000..f5e50db414 --- /dev/null +++ b/App/Telegram_Buck.xcworkspace/contents.xcworkspacedata @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/App/App.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/App/Telegram_Buck.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from App/App.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to App/Telegram_Buck.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/App/App.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/App/Telegram_Buck.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from App/App.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to App/Telegram_Buck.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/App/App.xcworkspace/xcshareddata/xcschemes/App.xcscheme b/App/Telegram_Buck.xcworkspace/xcshareddata/xcschemes/Telegram_Buck.xcscheme similarity index 98% rename from App/App.xcworkspace/xcshareddata/xcschemes/App.xcscheme rename to App/Telegram_Buck.xcworkspace/xcshareddata/xcschemes/Telegram_Buck.xcscheme index f407d980a6..bb0a071231 100644 --- a/App/App.xcworkspace/xcshareddata/xcschemes/App.xcscheme +++ b/App/Telegram_Buck.xcworkspace/xcshareddata/xcschemes/Telegram_Buck.xcscheme @@ -20,6 +20,20 @@ ReferencedContainer = "container:../submodules/AsyncDisplayKit/AsyncDisplayKit.xcodeproj"> + + + + + + + + + + + + - - - - @@ -2356,9 +2384,9 @@ runnableDebuggingMode = "0"> @@ -2375,9 +2403,9 @@ runnableDebuggingMode = "0"> diff --git a/BUCK b/BUCK new file mode 100644 index 0000000000..34b66d07fa --- /dev/null +++ b/BUCK @@ -0,0 +1,49 @@ + +apple_resource( + name = "AppResources", + files = glob([ + "Telegram-iOS/Resources/**/*", + ], exclude = ["Telegram-iOS/Resources/**/.*"]), + visibility = ["PUBLIC"], +) + +apple_resource( + name = "AppStringResources", + files = [], + variants = glob([ + "Telegram-iOS/*.lproj/Localizable.strings", + ]), + visibility = ["PUBLIC"], +) + +apple_asset_catalog( + name = 'Icons', + dirs = [ + "Telegram-iOS/Icons.xcassets", + ], + visibility = ["PUBLIC"], +) + +apple_asset_catalog( + name = 'AppIcons', + dirs = [ + "Telegram-iOS/AppIcons.xcassets", + ], + visibility = ["PUBLIC"], +) + +apple_resource( + name = "AdditionalIcons", + files = glob([ + "Telegram-iOS/*.png", + ]), + visibility = ["PUBLIC"], +) + +apple_resource( + name = 'LaunchScreen', + files = [ + 'Telegram-iOS/Base.lproj/LaunchScreen.xib', + ], + visibility = ["PUBLIC"], +) diff --git a/Config/app_configuration.bzl b/Config/app_configuration.bzl index 5ae7cd7e15..dbc6f547a5 100644 --- a/Config/app_configuration.bzl +++ b/Config/app_configuration.bzl @@ -1,9 +1,20 @@ -AppConfig = { - "apiId": "8", - "apiHash": "7245de8e747a0d6fbe11f7cc14fcc0bb", - "hockeyAppId": "ad8831329ffc8f8aff9a2b0b86558b24", - "isInternalBuild": "true", - "isAppStoreBuild": "false", - "appstoreId": "686449807", - "appSpecificUrlScheme": "tgapp", -} + +def appConfig(): + apiId = native.read_config("custom", "apiId") + apiHash = native.read_config("custom", "apiHash") + hockeyAppId = native.read_config("custom", "hockeyAppId") + isInternalBuild = native.read_config("custom", "isInternalBuild") + isAppStoreBuild = native.read_config("custom", "isAppStoreBuild") + appStoreId = native.read_config("custom", "appStoreId") + appSpecificUrlScheme = native.read_config("custom", "appSpecificUrlScheme") + buildNumber = native.read_config("custom", "buildNumber") + return { + "apiId": apiId, + "apiHash": apiHash, + "hockeyAppId": hockeyAppId, + "isInternalBuild": isInternalBuild, + "isAppStoreBuild": isAppStoreBuild, + "appStoreId": appStoreId, + "appSpecificUrlScheme": appSpecificUrlScheme, + "buildNumber": buildNumber, + } diff --git a/Config/buck_rule_macros.bzl b/Config/buck_rule_macros.bzl index 08ff783602..f9ad73a2d7 100644 --- a/Config/buck_rule_macros.bzl +++ b/Config/buck_rule_macros.bzl @@ -14,23 +14,37 @@ def apple_lib( swift_version = None, modular = True, compiler_flags = None, + platform_compiler_flags = None, swift_compiler_flags = None, warning_as_error = False, suppress_warnings = False, has_cpp = False, framework = False): swift_version = swift_version or native.read_config('swift', 'version') - compiler_flags = compiler_flags or [] swift_compiler_flags = swift_compiler_flags or [] if native.read_config("xcode", "beta") == "True": warning_as_error = False + if platform_compiler_flags != None: + if compiler_flags != None: + fail("compiler_flags and platform_compiler_flags are mutually exclusive") + compiler_flags = [] + for i in range(len(platform_compiler_flags)): + if warning_as_error: + platform_compiler_flags[i][1].append("-Werror") + elif suppress_warnings: + platform_compiler_flags[i][1].append("-w") + else: + compiler_flags = compiler_flags or [] + if warning_as_error: + compiler_flags.append("-Werror") + elif suppress_warnings: + compiler_flags.append("-w") + if warning_as_error: - compiler_flags.append("-Werror") swift_compiler_flags.append("-warnings-as-errors") elif suppress_warnings: - compiler_flags.append("-w") swift_compiler_flags.append("-suppress-warnings") if framework: @@ -61,6 +75,7 @@ def apple_lib( configs = framework_library_configs(name), modular = modular, compiler_flags = compiler_flags, + platform_compiler_flags = platform_compiler_flags, swift_compiler_flags = swift_compiler_flags, preferred_linkage = "shared", link_style = "static", @@ -84,6 +99,7 @@ def apple_lib( configs = framework_library_configs(name), modular = modular, compiler_flags = compiler_flags, + platform_compiler_flags = platform_compiler_flags, swift_compiler_flags = swift_compiler_flags, preferred_linkage = "shared", link_style = "static", @@ -116,6 +132,7 @@ def apple_lib( configs = library_configs(), modular = modular, compiler_flags = compiler_flags, + platform_compiler_flags = platform_compiler_flags, swift_compiler_flags = swift_compiler_flags, ) @@ -134,6 +151,7 @@ def static_library( info_plist_substitutions = {}, modular = True, compiler_flags = None, + platform_compiler_flags = None, swift_compiler_flags = None, warning_as_error = False, suppress_warnings = True): @@ -145,6 +163,7 @@ def static_library( headers = headers, modular = modular, compiler_flags = compiler_flags, + platform_compiler_flags = platform_compiler_flags, swift_compiler_flags = swift_compiler_flags, extra_xcode_files = extra_xcode_files, deps = deps, @@ -170,6 +189,7 @@ def framework( info_plist_substitutions = {}, modular = True, compiler_flags = None, + platform_compiler_flags = None, swift_compiler_flags = None, warning_as_error = False, suppress_warnings = True): @@ -181,6 +201,7 @@ def framework( headers = headers, modular = modular, compiler_flags = compiler_flags, + platform_compiler_flags = platform_compiler_flags, swift_compiler_flags = swift_compiler_flags, extra_xcode_files = extra_xcode_files, deps = deps, diff --git a/Config/configs.bzl b/Config/configs.bzl index 5f61681a31..6315741916 100644 --- a/Config/configs.bzl +++ b/Config/configs.bzl @@ -1,4 +1,5 @@ load("//Config:utils.bzl", "config_with_updated_linker_flags", "configs_with_config") +load("//Config:app_configuration.bzl", "appConfig") DEVELOPMENT_LANGUAGE = "en" @@ -94,6 +95,7 @@ def app_binary_configs(name): "CODE_SIGN_ENTITLEMENTS": "Telegram-iOS.entitlements", "DEVELOPMENT_TEAM": "X834Q8SBVP", "PROVISIONING_PROFILE_SPECIFIER": "match Development org.telegram.Telegram-iOS", + "ASSETCATALOG_COMPILER_APPICON_NAME": "AppIcon", } binary_config = merge_dict(SHARED_CONFIGS, binary_specific_config) binary_config = merge_dict(binary_config, optimization_config()) @@ -116,7 +118,10 @@ def app_info_plist_substitutions(name): "EXECUTABLE_NAME": name, "PRODUCT_BUNDLE_IDENTIFIER": "org.telegram.Telegram-iOS", "PRODUCT_NAME": name, + "APP_NAME": name, "CURRENT_PROJECT_VERSION": "1", "CODE_SIGN_IDENTITY": "iPhone Developer: Peter Iakovlev (9J4EJ3F97G)", + "APP_SPECIFIC_URL_SCHEME": appConfig()["appSpecificUrlScheme"], + "BUILD_NUMBER": appConfig()["buildNumber"], } return substitutions diff --git a/Makefile b/Makefile index c258fb8169..0ddd0d8dc6 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,21 @@ .PHONY : build build_arm64 build_verbose targets project kill_xcode clean +BUCK_OPTIONS=--config custom.apiId="${TELEGRAM_API_ID}" --config custom.apiHash="${TELGRAM_API_HASH}" --config custom.hockeyAppId="${TELGRAM_HOCKEYAPP_ID}" --config custom.isInternalBuild="${TELEGRAM_IS_INTERNAL_BUILD}" --config custom.isAppStoreBuild="${TELEGRAM_IS_APPSTORE_BUILD}" --config custom.appStoreId="${TELEGRAM_APPSTORE_ID}" --config custom.appSpecificUrlScheme="${TELEGRAM_APP_SPECIFIC_URL_SCHEME}" --config custom.buildNumber="${TELEGRAM_BUILD_NUMBER}" BUCK=/Users/peter/build/buck-next/buck/buck-out/gen/programs/buck.pex -build: - $(BUCK) build //App:AppPackage#iphoneos-arm64,iphoneos-armv7 - sh package_app.sh $(BUCK) iphoneos-arm64,iphoneos-armv7 +check_env: + sh check_env.sh -build_arm64: - $(BUCK) build //App:AppPackage#iphoneos-arm64 - sh package_app.sh $(BUCK) iphoneos-arm64 +build: check_env + $(BUCK) build //App:AppPackage#iphoneos-arm64,iphoneos-armv7 ${BUCK_OPTIONS} + sh package_app.sh $(BUCK) "${BUCK_OPTIONS}" iphoneos-arm64,iphoneos-armv7 -build_verbose: - $(BUCK) build //App:AppPackage#iphoneos-armv7,iphoneos-arm64 --verbose 8 +build_arm64: check_env + $(BUCK) build //App:AppPackage#iphoneos-arm64 ${BUCK_OPTIONS} + sh package_app.sh $(BUCK) "${BUCK_OPTIONS}" iphoneos-arm64 + +build_verbose: check_env + $(BUCK) build //App:AppPackage#iphoneos-armv7,iphoneos-arm64 --verbose 8 ${BUCK_OPTIONS} targets: $(BUCK) targets //... @@ -23,7 +27,6 @@ kill_xcode: clean: kill_xcode sh clean.sh -project: kill_xcode - $(BUCK) project //App:workspace --config custom.mode=project - open App/App.xcworkspace - +project: check_env kill_xcode + $(BUCK) project //App:workspace --config custom.mode=project ${BUCK_OPTIONS} + open App/Telegram_Buck.xcworkspace diff --git a/Telegram-iOS.xcodeproj/project.pbxproj b/Telegram-iOS.xcodeproj/project.pbxproj index 600bb45c29..477187b983 100644 --- a/Telegram-iOS.xcodeproj/project.pbxproj +++ b/Telegram-iOS.xcodeproj/project.pbxproj @@ -219,20 +219,20 @@ 09EC5CDA22CBBF9600292E42 /* telegram_plane1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 09EC5CD922CBBF9600292E42 /* telegram_plane1@2x.png */; }; 09FDAEE62140477F00BF856F /* MtProtoKitDynamic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09FDAEE52140477F00BF856F /* MtProtoKitDynamic.framework */; }; D000CACF21FB6E380011B15D /* NotificationService.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = D000CAC821FB6E370011B15D /* NotificationService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - D001D5AA1F878DA300DF975A /* PhoneCountries.txt in Resources */ = {isa = PBXBuildFile; fileRef = D001D5A91F878DA300DF975A /* PhoneCountries.txt */; }; D008185022B5797A008A895F /* BuildConfig.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D008184F22B5797A008A895F /* BuildConfig.framework */; }; D008185222B57986008A895F /* BuildConfig.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D008185122B57986008A895F /* BuildConfig.framework */; }; D008185422B57994008A895F /* BuildConfig.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D008185322B57994008A895F /* BuildConfig.framework */; }; D008185622B579A1008A895F /* BuildConfig.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D008185522B579A1008A895F /* BuildConfig.framework */; }; D008185822B579AD008A895F /* BuildConfig.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D008185722B579AD008A895F /* BuildConfig.framework */; }; D00818A522B58CCB008A895F /* WatchCommonWatch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D00818A422B58CCB008A895F /* WatchCommonWatch.framework */; }; - D00859A91B28189D00EAF753 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D00859A81B28189D00EAF753 /* Images.xcassets */; }; + D00859A91B28189D00EAF753 /* Icons.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D00859A81B28189D00EAF753 /* Icons.xcassets */; }; D00859AC1B28189D00EAF753 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = D00859AA1B28189D00EAF753 /* LaunchScreen.xib */; }; D00ED75A1FE94630001F38BD /* AppIntentVocabulary.plist in Resources */ = {isa = PBXBuildFile; fileRef = D00ED7581FE94630001F38BD /* AppIntentVocabulary.plist */; }; D00ED75D1FE95287001F38BD /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D00ED75B1FE95287001F38BD /* InfoPlist.strings */; }; D015E04D225D2D8F00CB9E8A /* WebP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D015E04C225D2D8F00CB9E8A /* WebP.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; D015E050225D303F00CB9E8A /* WebP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D015E04C225D2D8F00CB9E8A /* WebP.framework */; }; D015E051225D303F00CB9E8A /* WebP.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D015E04C225D2D8F00CB9E8A /* WebP.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + D01748C7231976B200AF3D3A /* LegacyComponentsResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D01748C6231976B100AF3D3A /* LegacyComponentsResources.bundle */; }; D021D4D9219CAEDD0064BEBA /* Config-Fork.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = D021D4D8219CAEDD0064BEBA /* Config-Fork.xcconfig */; }; D02CF5FD215D9ABF00E0F56A /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0AA1A671D568BA400152314 /* UserNotifications.framework */; }; D02CF5FE215D9ABF00E0F56A /* UserNotificationsUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0AA1A691D568BA400152314 /* UserNotificationsUI.framework */; }; @@ -400,6 +400,94 @@ D0E8C2E02285EA6A009F26E8 /* BlackIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E8C2DF2285EA6A009F26E8 /* BlackIcon@3x.png */; }; D0ECCB7F1FE9C38500609802 /* Telegram_iOS_UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0ECCB7E1FE9C38500609802 /* Telegram_iOS_UITests.swift */; }; D0ECCB8A1FE9C4AC00609802 /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0ECCB891FE9C4AC00609802 /* SnapshotHelper.swift */; }; + D0EFF27C2319835B00CF5164 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF27B2319835A00CF5164 /* Images.xcassets */; }; + D0EFF2D52319838800CF5164 /* PhoneCountries.txt in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF27D2319838400CF5164 /* PhoneCountries.txt */; }; + D0EFF2D62319838800CF5164 /* currencies.json in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF27E2319838500CF5164 /* currencies.json */; }; + D0EFF2D72319838800CF5164 /* Emoji.mapping in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF27F2319838500CF5164 /* Emoji.mapping */; }; + D0EFF2D82319838800CF5164 /* lol.tgs in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2812319838500CF5164 /* lol.tgs */; }; + D0EFF2D92319838800CF5164 /* thumbsup.tgs in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2822319838500CF5164 /* thumbsup.tgs */; }; + D0EFF2DA2319838800CF5164 /* poker.tgs in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2832319838500CF5164 /* poker.tgs */; }; + D0EFF2DB2319838800CF5164 /* cry.tgs in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2842319838500CF5164 /* cry.tgs */; }; + D0EFF2DC2319838800CF5164 /* meh.tgs in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2852319838500CF5164 /* meh.tgs */; }; + D0EFF2DD2319838800CF5164 /* sad.tgs in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2862319838500CF5164 /* sad.tgs */; }; + D0EFF2DE2319838800CF5164 /* surprised.tgs in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2872319838500CF5164 /* surprised.tgs */; }; + D0EFF2DF2319838800CF5164 /* ok.tgs in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2882319838500CF5164 /* ok.tgs */; }; + D0EFF2E02319838800CF5164 /* heart.tgs in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2892319838500CF5164 /* heart.tgs */; }; + D0EFF2E12319838800CF5164 /* poop.tgs in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF28A2319838500CF5164 /* poop.tgs */; }; + D0EFF2E22319838800CF5164 /* celebrate.tgs in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF28B2319838600CF5164 /* celebrate.tgs */; }; + D0EFF2E32319838800CF5164 /* smile.tgs in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF28C2319838600CF5164 /* smile.tgs */; }; + D0EFF2E42319838800CF5164 /* ChatWallpaperBuiltin0.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF28D2319838600CF5164 /* ChatWallpaperBuiltin0.jpg */; }; + D0EFF2E52319838800CF5164 /* stp_card_visa_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF28F2319838600CF5164 /* stp_card_visa_template@3x.png */; }; + D0EFF2E62319838800CF5164 /* stp_card_form_back@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2902319838600CF5164 /* stp_card_form_back@3x.png */; }; + D0EFF2E72319838800CF5164 /* stp_card_amex@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2912319838600CF5164 /* stp_card_amex@3x.png */; }; + D0EFF2E82319838800CF5164 /* stp_card_diners@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2922319838600CF5164 /* stp_card_diners@2x.png */; }; + D0EFF2E92319838800CF5164 /* stp_card_diners_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2932319838600CF5164 /* stp_card_diners_template@2x.png */; }; + D0EFF2EA2319838800CF5164 /* stp_card_amex_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2942319838600CF5164 /* stp_card_amex_template@3x.png */; }; + D0EFF2EB2319838800CF5164 /* stp_card_diners_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2952319838600CF5164 /* stp_card_diners_template@3x.png */; }; + D0EFF2EC2319838800CF5164 /* stp_card_amex_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2962319838600CF5164 /* stp_card_amex_template@2x.png */; }; + D0EFF2ED2319838800CF5164 /* stp_card_diners@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2972319838600CF5164 /* stp_card_diners@3x.png */; }; + D0EFF2EE2319838800CF5164 /* stp_card_amex@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2982319838600CF5164 /* stp_card_amex@2x.png */; }; + D0EFF2EF2319838800CF5164 /* stp_card_form_back@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2992319838600CF5164 /* stp_card_form_back@2x.png */; }; + D0EFF2F02319838800CF5164 /* stp_card_visa_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF29A2319838600CF5164 /* stp_card_visa_template@2x.png */; }; + D0EFF2F12319838800CF5164 /* stp_card_form_front@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF29B2319838600CF5164 /* stp_card_form_front@2x.png */; }; + D0EFF2F22319838800CF5164 /* stp_card_applepay_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF29C2319838600CF5164 /* stp_card_applepay_template@2x.png */; }; + D0EFF2F32319838800CF5164 /* stp_card_cvc_amex@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF29D2319838600CF5164 /* stp_card_cvc_amex@3x.png */; }; + D0EFF2F42319838800CF5164 /* stp_card_discover@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF29E2319838600CF5164 /* stp_card_discover@3x.png */; }; + D0EFF2F52319838800CF5164 /* stp_card_cvc@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF29F2319838600CF5164 /* stp_card_cvc@2x.png */; }; + D0EFF2F62319838800CF5164 /* stp_card_jcb_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2A02319838600CF5164 /* stp_card_jcb_template@3x.png */; }; + D0EFF2F72319838800CF5164 /* stp_card_jcb@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2A12319838600CF5164 /* stp_card_jcb@3x.png */; }; + D0EFF2F82319838800CF5164 /* stp_card_jcb@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2A22319838600CF5164 /* stp_card_jcb@2x.png */; }; + D0EFF2F92319838800CF5164 /* stp_card_cvc@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2A32319838600CF5164 /* stp_card_cvc@3x.png */; }; + D0EFF2FA2319838800CF5164 /* stp_card_jcb_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2A42319838600CF5164 /* stp_card_jcb_template@2x.png */; }; + D0EFF2FB2319838800CF5164 /* stp_card_discover@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2A52319838600CF5164 /* stp_card_discover@2x.png */; }; + D0EFF2FC2319838800CF5164 /* stp_card_cvc_amex@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2A62319838600CF5164 /* stp_card_cvc_amex@2x.png */; }; + D0EFF2FD2319838800CF5164 /* stp_card_applepay_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2A72319838600CF5164 /* stp_card_applepay_template@3x.png */; }; + D0EFF2FE2319838800CF5164 /* stp_card_form_front@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2A82319838600CF5164 /* stp_card_form_front@3x.png */; }; + D0EFF2FF2319838800CF5164 /* stp_card_visa@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2A92319838600CF5164 /* stp_card_visa@3x.png */; }; + D0EFF3002319838800CF5164 /* stp_card_placeholder_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2AA2319838600CF5164 /* stp_card_placeholder_template@3x.png */; }; + D0EFF3012319838800CF5164 /* stp_card_applepay@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2AB2319838600CF5164 /* stp_card_applepay@2x.png */; }; + D0EFF3022319838800CF5164 /* stp_card_applepay@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2AC2319838600CF5164 /* stp_card_applepay@3x.png */; }; + D0EFF3032319838800CF5164 /* stp_card_placeholder_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2AD2319838600CF5164 /* stp_card_placeholder_template@2x.png */; }; + D0EFF3042319838800CF5164 /* stp_card_visa@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2AE2319838600CF5164 /* stp_card_visa@2x.png */; }; + D0EFF3052319838800CF5164 /* stp_card_mastercard_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2AF2319838600CF5164 /* stp_card_mastercard_template@3x.png */; }; + D0EFF3062319838800CF5164 /* stp_card_discover_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2B02319838600CF5164 /* stp_card_discover_template@2x.png */; }; + D0EFF3072319838800CF5164 /* stp_card_form_applepay@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2B12319838600CF5164 /* stp_card_form_applepay@3x.png */; }; + D0EFF3082319838800CF5164 /* stp_card_mastercard@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2B22319838600CF5164 /* stp_card_mastercard@2x.png */; }; + D0EFF3092319838800CF5164 /* stp_card_mastercard@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2B32319838600CF5164 /* stp_card_mastercard@3x.png */; }; + D0EFF30A2319838800CF5164 /* stp_card_discover_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2B42319838600CF5164 /* stp_card_discover_template@3x.png */; }; + D0EFF30B2319838800CF5164 /* stp_card_form_applepay@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2B52319838600CF5164 /* stp_card_form_applepay@2x.png */; }; + D0EFF30C2319838800CF5164 /* stp_card_mastercard_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2B62319838600CF5164 /* stp_card_mastercard_template@2x.png */; }; + D0EFF30D2319838800CF5164 /* anim_read.json in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2B82319838700CF5164 /* anim_read.json */; }; + D0EFF30E2319838800CF5164 /* anim_archive.json in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2B92319838700CF5164 /* anim_archive.json */; }; + D0EFF30F2319838800CF5164 /* anim_pin.json in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2BA2319838700CF5164 /* anim_pin.json */; }; + D0EFF3102319838800CF5164 /* anim_infotip.json in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2BB2319838700CF5164 /* anim_infotip.json */; }; + D0EFF3112319838800CF5164 /* anim_unmute.json in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2BC2319838700CF5164 /* anim_unmute.json */; }; + D0EFF3122319838800CF5164 /* anim_unpin.json in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2BD2319838700CF5164 /* anim_unpin.json */; }; + D0EFF3132319838800CF5164 /* anim_success.json in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2BE2319838700CF5164 /* anim_success.json */; }; + D0EFF3142319838800CF5164 /* anim_unread.json in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2BF2319838700CF5164 /* anim_unread.json */; }; + D0EFF3152319838800CF5164 /* anim_archiveswipe.json in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2C02319838700CF5164 /* anim_archiveswipe.json */; }; + D0EFF3162319838800CF5164 /* anim_delete.json in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2C12319838700CF5164 /* anim_delete.json */; }; + D0EFF3172319838800CF5164 /* anim_archiveAvatar.json in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2C22319838700CF5164 /* anim_archiveAvatar.json */; }; + D0EFF3182319838800CF5164 /* anim_unarchive.json in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2C32319838700CF5164 /* anim_unarchive.json */; }; + D0EFF3192319838800CF5164 /* anim_ungroup.json in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2C42319838700CF5164 /* anim_ungroup.json */; }; + D0EFF31A2319838800CF5164 /* anim_hide.json in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2C52319838700CF5164 /* anim_hide.json */; }; + D0EFF31B2319838800CF5164 /* anim_group.json in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2C62319838700CF5164 /* anim_group.json */; }; + D0EFF31C2319838800CF5164 /* anim_mute.json in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2C72319838700CF5164 /* anim_mute.json */; }; + D0EFF31D2319838800CF5164 /* PresentationStrings.mapping in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2C82319838700CF5164 /* PresentationStrings.mapping */; }; + D0EFF31E2319838800CF5164 /* VimeoUserScript.js in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2CA2319838700CF5164 /* VimeoUserScript.js */; }; + D0EFF31F2319838800CF5164 /* TwitchUserScript.js in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2CB2319838700CF5164 /* TwitchUserScript.js */; }; + D0EFF3202319838800CF5164 /* Youtube.html in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2CC2319838700CF5164 /* Youtube.html */; }; + D0EFF3212319838800CF5164 /* Twitch.html in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2CD2319838700CF5164 /* Twitch.html */; }; + D0EFF3222319838800CF5164 /* Vimeo.html in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2CE2319838700CF5164 /* Vimeo.html */; }; + D0EFF3232319838800CF5164 /* Instagram.html in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2CF2319838700CF5164 /* Instagram.html */; }; + D0EFF3242319838800CF5164 /* Generic.html in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2D02319838700CF5164 /* Generic.html */; }; + D0EFF3252319838800CF5164 /* GenericUserScript.js in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2D12319838700CF5164 /* GenericUserScript.js */; }; + D0EFF3262319838800CF5164 /* YoutubeUserScript.js in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2D22319838700CF5164 /* YoutubeUserScript.js */; }; + D0EFF3272319838800CF5164 /* SFCompactRounded-Semibold.otf in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF2D42319838700CF5164 /* SFCompactRounded-Semibold.otf */; }; + D0EFF32B231983BF00CF5164 /* MessageSent.caf in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF329231983BF00CF5164 /* MessageSent.caf */; }; + D0EFF32C231983BF00CF5164 /* notification.caf in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF32A231983BF00CF5164 /* notification.caf */; }; + D0EFF33023198D3200CF5164 /* NavigationBackArrowLight@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF32E23198D3200CF5164 /* NavigationBackArrowLight@2x.png */; }; + D0EFF33123198D3200CF5164 /* NavigationShadow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0EFF32F23198D3200CF5164 /* NavigationShadow@2x.png */; }; D0F575132083B96B00F1C1E1 /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0F575122083B96B00F1C1E1 /* CloudKit.framework */; }; D0FC1948201D2DA800FEDBB2 /* SFCompactRounded-Semibold.otf in Resources */ = {isa = PBXBuildFile; fileRef = D0FC1947201D2DA700FEDBB2 /* SFCompactRounded-Semibold.otf */; }; /* End PBXBuildFile section */ @@ -881,7 +969,6 @@ D000CAC221FB6E170011B15D /* NotificationService-AppStore.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "NotificationService-AppStore.entitlements"; sourceTree = ""; }; D000CAC321FB6E170011B15D /* NotificationService-AppStoreLLC.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "NotificationService-AppStoreLLC.entitlements"; sourceTree = ""; }; D000CAC821FB6E370011B15D /* NotificationService.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = NotificationService.appex; sourceTree = BUILT_PRODUCTS_DIR; }; - D001D5A91F878DA300DF975A /* PhoneCountries.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PhoneCountries.txt; path = "Telegram-iOS/Resources/PhoneCountries.txt"; sourceTree = ""; }; D006CFA121A8D12600FDCD32 /* ModernProto.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ModernProto.framework; path = "../../../Library/Developer/Xcode/DerivedData/Telegram-iOS-ffbqcdyqpehxdvcwhyaorlehrrdc/Build/Products/Debug Hockeyapp-iphoneos/ModernProto.framework"; sourceTree = ""; }; D008184B22B578EC008A895F /* WatchCommon.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WatchCommon.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D008184D22B5796E008A895F /* BuildConfig.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BuildConfig.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -895,13 +982,14 @@ D00818CE22B595DB008A895F /* LightweightAccountData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LightweightAccountData.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D008599C1B28189D00EAF753 /* Telegram.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Telegram.app; sourceTree = BUILT_PRODUCTS_DIR; }; D00859A01B28189D00EAF753 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - D00859A81B28189D00EAF753 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; + D00859A81B28189D00EAF753 /* Icons.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Icons.xcassets; sourceTree = ""; }; D00859AB1B28189D00EAF753 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; D00859B61B28189D00EAF753 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; D00859B71B28189D00EAF753 /* Telegram_iOSTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Telegram_iOSTests.swift; sourceTree = ""; }; D00ED7591FE94630001F38BD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = en; path = en.lproj/AppIntentVocabulary.plist; sourceTree = ""; }; D00ED75C1FE95287001F38BD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; D015E04C225D2D8F00CB9E8A /* WebP.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WebP.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D01748C6231976B100AF3D3A /* LegacyComponentsResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = LegacyComponentsResources.bundle; path = submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle; sourceTree = ""; }; D01A47521F4DBEB100383CC1 /* libHockeySDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libHockeySDK.a; path = "../../build/HockeySDK-iOS/Support/build/Debug-iphoneos/libHockeySDK.a"; sourceTree = ""; }; D01A47541F4DBED700383CC1 /* HockeySDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = HockeySDK.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D021D4D7219CAEDD0064BEBA /* Telegram-iOS-Fork.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "Telegram-iOS-Fork.entitlements"; sourceTree = ""; }; @@ -1129,6 +1217,94 @@ D0ECCB801FE9C38500609802 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; D0ECCB891FE9C4AC00609802 /* SnapshotHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SnapshotHelper.swift; sourceTree = ""; }; D0ED633C21FF3F28001D4648 /* NotificationService-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NotificationService-Bridging-Header.h"; sourceTree = ""; }; + D0EFF27B2319835A00CF5164 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = submodules/TelegramUI/Images.xcassets; sourceTree = ""; }; + D0EFF27D2319838400CF5164 /* PhoneCountries.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PhoneCountries.txt; path = submodules/TelegramUI/TelegramUI/Resources/PhoneCountries.txt; sourceTree = ""; }; + D0EFF27E2319838500CF5164 /* currencies.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = currencies.json; path = submodules/TelegramUI/TelegramUI/Resources/currencies.json; sourceTree = ""; }; + D0EFF27F2319838500CF5164 /* Emoji.mapping */ = {isa = PBXFileReference; lastKnownFileType = file; name = Emoji.mapping; path = submodules/TelegramUI/TelegramUI/Resources/Emoji.mapping; sourceTree = ""; }; + D0EFF2812319838500CF5164 /* lol.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; path = lol.tgs; sourceTree = ""; }; + D0EFF2822319838500CF5164 /* thumbsup.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; path = thumbsup.tgs; sourceTree = ""; }; + D0EFF2832319838500CF5164 /* poker.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; path = poker.tgs; sourceTree = ""; }; + D0EFF2842319838500CF5164 /* cry.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; path = cry.tgs; sourceTree = ""; }; + D0EFF2852319838500CF5164 /* meh.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; path = meh.tgs; sourceTree = ""; }; + D0EFF2862319838500CF5164 /* sad.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; path = sad.tgs; sourceTree = ""; }; + D0EFF2872319838500CF5164 /* surprised.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; path = surprised.tgs; sourceTree = ""; }; + D0EFF2882319838500CF5164 /* ok.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; path = ok.tgs; sourceTree = ""; }; + D0EFF2892319838500CF5164 /* heart.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; path = heart.tgs; sourceTree = ""; }; + D0EFF28A2319838500CF5164 /* poop.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; path = poop.tgs; sourceTree = ""; }; + D0EFF28B2319838600CF5164 /* celebrate.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; path = celebrate.tgs; sourceTree = ""; }; + D0EFF28C2319838600CF5164 /* smile.tgs */ = {isa = PBXFileReference; lastKnownFileType = file; path = smile.tgs; sourceTree = ""; }; + D0EFF28D2319838600CF5164 /* ChatWallpaperBuiltin0.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = ChatWallpaperBuiltin0.jpg; path = submodules/TelegramUI/TelegramUI/Resources/ChatWallpaperBuiltin0.jpg; sourceTree = ""; }; + D0EFF28F2319838600CF5164 /* stp_card_visa_template@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_visa_template@3x.png"; sourceTree = ""; }; + D0EFF2902319838600CF5164 /* stp_card_form_back@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_form_back@3x.png"; sourceTree = ""; }; + D0EFF2912319838600CF5164 /* stp_card_amex@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_amex@3x.png"; sourceTree = ""; }; + D0EFF2922319838600CF5164 /* stp_card_diners@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_diners@2x.png"; sourceTree = ""; }; + D0EFF2932319838600CF5164 /* stp_card_diners_template@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_diners_template@2x.png"; sourceTree = ""; }; + D0EFF2942319838600CF5164 /* stp_card_amex_template@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_amex_template@3x.png"; sourceTree = ""; }; + D0EFF2952319838600CF5164 /* stp_card_diners_template@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_diners_template@3x.png"; sourceTree = ""; }; + D0EFF2962319838600CF5164 /* stp_card_amex_template@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_amex_template@2x.png"; sourceTree = ""; }; + D0EFF2972319838600CF5164 /* stp_card_diners@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_diners@3x.png"; sourceTree = ""; }; + D0EFF2982319838600CF5164 /* stp_card_amex@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_amex@2x.png"; sourceTree = ""; }; + D0EFF2992319838600CF5164 /* stp_card_form_back@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_form_back@2x.png"; sourceTree = ""; }; + D0EFF29A2319838600CF5164 /* stp_card_visa_template@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_visa_template@2x.png"; sourceTree = ""; }; + D0EFF29B2319838600CF5164 /* stp_card_form_front@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_form_front@2x.png"; sourceTree = ""; }; + D0EFF29C2319838600CF5164 /* stp_card_applepay_template@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_applepay_template@2x.png"; sourceTree = ""; }; + D0EFF29D2319838600CF5164 /* stp_card_cvc_amex@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_cvc_amex@3x.png"; sourceTree = ""; }; + D0EFF29E2319838600CF5164 /* stp_card_discover@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_discover@3x.png"; sourceTree = ""; }; + D0EFF29F2319838600CF5164 /* stp_card_cvc@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_cvc@2x.png"; sourceTree = ""; }; + D0EFF2A02319838600CF5164 /* stp_card_jcb_template@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_jcb_template@3x.png"; sourceTree = ""; }; + D0EFF2A12319838600CF5164 /* stp_card_jcb@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_jcb@3x.png"; sourceTree = ""; }; + D0EFF2A22319838600CF5164 /* stp_card_jcb@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_jcb@2x.png"; sourceTree = ""; }; + D0EFF2A32319838600CF5164 /* stp_card_cvc@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_cvc@3x.png"; sourceTree = ""; }; + D0EFF2A42319838600CF5164 /* stp_card_jcb_template@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_jcb_template@2x.png"; sourceTree = ""; }; + D0EFF2A52319838600CF5164 /* stp_card_discover@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_discover@2x.png"; sourceTree = ""; }; + D0EFF2A62319838600CF5164 /* stp_card_cvc_amex@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_cvc_amex@2x.png"; sourceTree = ""; }; + D0EFF2A72319838600CF5164 /* stp_card_applepay_template@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_applepay_template@3x.png"; sourceTree = ""; }; + D0EFF2A82319838600CF5164 /* stp_card_form_front@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_form_front@3x.png"; sourceTree = ""; }; + D0EFF2A92319838600CF5164 /* stp_card_visa@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_visa@3x.png"; sourceTree = ""; }; + D0EFF2AA2319838600CF5164 /* stp_card_placeholder_template@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_placeholder_template@3x.png"; sourceTree = ""; }; + D0EFF2AB2319838600CF5164 /* stp_card_applepay@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_applepay@2x.png"; sourceTree = ""; }; + D0EFF2AC2319838600CF5164 /* stp_card_applepay@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_applepay@3x.png"; sourceTree = ""; }; + D0EFF2AD2319838600CF5164 /* stp_card_placeholder_template@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_placeholder_template@2x.png"; sourceTree = ""; }; + D0EFF2AE2319838600CF5164 /* stp_card_visa@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_visa@2x.png"; sourceTree = ""; }; + D0EFF2AF2319838600CF5164 /* stp_card_mastercard_template@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_mastercard_template@3x.png"; sourceTree = ""; }; + D0EFF2B02319838600CF5164 /* stp_card_discover_template@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_discover_template@2x.png"; sourceTree = ""; }; + D0EFF2B12319838600CF5164 /* stp_card_form_applepay@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_form_applepay@3x.png"; sourceTree = ""; }; + D0EFF2B22319838600CF5164 /* stp_card_mastercard@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_mastercard@2x.png"; sourceTree = ""; }; + D0EFF2B32319838600CF5164 /* stp_card_mastercard@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_mastercard@3x.png"; sourceTree = ""; }; + D0EFF2B42319838600CF5164 /* stp_card_discover_template@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_discover_template@3x.png"; sourceTree = ""; }; + D0EFF2B52319838600CF5164 /* stp_card_form_applepay@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_form_applepay@2x.png"; sourceTree = ""; }; + D0EFF2B62319838600CF5164 /* stp_card_mastercard_template@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_mastercard_template@2x.png"; sourceTree = ""; }; + D0EFF2B82319838700CF5164 /* anim_read.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_read.json; sourceTree = ""; }; + D0EFF2B92319838700CF5164 /* anim_archive.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_archive.json; sourceTree = ""; }; + D0EFF2BA2319838700CF5164 /* anim_pin.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_pin.json; sourceTree = ""; }; + D0EFF2BB2319838700CF5164 /* anim_infotip.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_infotip.json; sourceTree = ""; }; + D0EFF2BC2319838700CF5164 /* anim_unmute.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_unmute.json; sourceTree = ""; }; + D0EFF2BD2319838700CF5164 /* anim_unpin.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_unpin.json; sourceTree = ""; }; + D0EFF2BE2319838700CF5164 /* anim_success.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_success.json; sourceTree = ""; }; + D0EFF2BF2319838700CF5164 /* anim_unread.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_unread.json; sourceTree = ""; }; + D0EFF2C02319838700CF5164 /* anim_archiveswipe.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_archiveswipe.json; sourceTree = ""; }; + D0EFF2C12319838700CF5164 /* anim_delete.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_delete.json; sourceTree = ""; }; + D0EFF2C22319838700CF5164 /* anim_archiveAvatar.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_archiveAvatar.json; sourceTree = ""; }; + D0EFF2C32319838700CF5164 /* anim_unarchive.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_unarchive.json; sourceTree = ""; }; + D0EFF2C42319838700CF5164 /* anim_ungroup.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_ungroup.json; sourceTree = ""; }; + D0EFF2C52319838700CF5164 /* anim_hide.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_hide.json; sourceTree = ""; }; + D0EFF2C62319838700CF5164 /* anim_group.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_group.json; sourceTree = ""; }; + D0EFF2C72319838700CF5164 /* anim_mute.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_mute.json; sourceTree = ""; }; + D0EFF2C82319838700CF5164 /* PresentationStrings.mapping */ = {isa = PBXFileReference; lastKnownFileType = file; name = PresentationStrings.mapping; path = submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping; sourceTree = ""; }; + D0EFF2CA2319838700CF5164 /* VimeoUserScript.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = VimeoUserScript.js; sourceTree = ""; }; + D0EFF2CB2319838700CF5164 /* TwitchUserScript.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = TwitchUserScript.js; sourceTree = ""; }; + D0EFF2CC2319838700CF5164 /* Youtube.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = Youtube.html; sourceTree = ""; }; + D0EFF2CD2319838700CF5164 /* Twitch.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = Twitch.html; sourceTree = ""; }; + D0EFF2CE2319838700CF5164 /* Vimeo.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = Vimeo.html; sourceTree = ""; }; + D0EFF2CF2319838700CF5164 /* Instagram.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = Instagram.html; sourceTree = ""; }; + D0EFF2D02319838700CF5164 /* Generic.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = Generic.html; sourceTree = ""; }; + D0EFF2D12319838700CF5164 /* GenericUserScript.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = GenericUserScript.js; sourceTree = ""; }; + D0EFF2D22319838700CF5164 /* YoutubeUserScript.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = YoutubeUserScript.js; sourceTree = ""; }; + D0EFF2D42319838700CF5164 /* SFCompactRounded-Semibold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SFCompactRounded-Semibold.otf"; sourceTree = ""; }; + D0EFF329231983BF00CF5164 /* MessageSent.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = MessageSent.caf; sourceTree = ""; }; + D0EFF32A231983BF00CF5164 /* notification.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = notification.caf; sourceTree = ""; }; + D0EFF32E23198D3200CF5164 /* NavigationBackArrowLight@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "NavigationBackArrowLight@2x.png"; path = "Telegram-iOS/Resources/NavigationBackArrowLight@2x.png"; sourceTree = ""; }; + D0EFF32F23198D3200CF5164 /* NavigationShadow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "NavigationShadow@2x.png"; path = "Telegram-iOS/Resources/NavigationShadow@2x.png"; sourceTree = ""; }; D0F575122083B96B00F1C1E1 /* CloudKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudKit.framework; path = System/Library/Frameworks/CloudKit.framework; sourceTree = SDKROOT; }; D0FC1947201D2DA700FEDBB2 /* SFCompactRounded-Semibold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "SFCompactRounded-Semibold.otf"; path = "Telegram-iOS/Resources/SFCompactRounded-Semibold.otf"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -1951,7 +2127,7 @@ D079FD001F06BBD10038FADE /* Telegram-iOS-AppStore.entitlements */, D0E3A7071B285B5000A402D9 /* Telegram-iOS-Hockeyapp.entitlements */, D021D4D7219CAEDD0064BEBA /* Telegram-iOS-Fork.entitlements */, - D00859A81B28189D00EAF753 /* Images.xcassets */, + D00859A81B28189D00EAF753 /* Icons.xcassets */, D00859AA1B28189D00EAF753 /* LaunchScreen.xib */, D008599F1B28189D00EAF753 /* Supporting Files */, ); @@ -2085,6 +2261,21 @@ D023EBB31DDB2F0E00BD496D /* Resources */ = { isa = PBXGroup; children = ( + D0EFF32E23198D3200CF5164 /* NavigationBackArrowLight@2x.png */, + D0EFF32F23198D3200CF5164 /* NavigationShadow@2x.png */, + D0EFF328231983BF00CF5164 /* Sounds */, + D0EFF2B72319838700CF5164 /* Animations */, + D0EFF2802319838500CF5164 /* BuiltinReactions */, + D0EFF28D2319838600CF5164 /* ChatWallpaperBuiltin0.jpg */, + D0EFF27E2319838500CF5164 /* currencies.json */, + D0EFF27F2319838500CF5164 /* Emoji.mapping */, + D0EFF2D32319838700CF5164 /* Fonts */, + D0EFF27D2319838400CF5164 /* PhoneCountries.txt */, + D0EFF2C82319838700CF5164 /* PresentationStrings.mapping */, + D0EFF28E2319838600CF5164 /* Stripe */, + D0EFF2C92319838700CF5164 /* WebEmbed */, + D0EFF27B2319835A00CF5164 /* Images.xcassets */, + D01748C6231976B100AF3D3A /* LegacyComponentsResources.bundle */, D0E8B8AC2044496C00605593 /* voip_busy.caf */, D0E8B8A82044496B00605593 /* voip_connecting.mp3 */, D0E8B8A92044496C00605593 /* voip_end.caf */, @@ -2092,7 +2283,6 @@ D0E8B8AB2044496C00605593 /* voip_ringback.caf */, D0FC1947201D2DA700FEDBB2 /* SFCompactRounded-Semibold.otf */, D0CFBB921FD88C2900B65C0D /* begin_record.caf */, - D001D5A91F878DA300DF975A /* PhoneCountries.txt */, D04DCC0A1F71C80000B021D7 /* notifications */, D050F21B1E49DEDE00988324 /* intro */, ); @@ -2480,6 +2670,134 @@ path = "Telegram-iOS UITests"; sourceTree = ""; }; + D0EFF2802319838500CF5164 /* BuiltinReactions */ = { + isa = PBXGroup; + children = ( + D0EFF2812319838500CF5164 /* lol.tgs */, + D0EFF2822319838500CF5164 /* thumbsup.tgs */, + D0EFF2832319838500CF5164 /* poker.tgs */, + D0EFF2842319838500CF5164 /* cry.tgs */, + D0EFF2852319838500CF5164 /* meh.tgs */, + D0EFF2862319838500CF5164 /* sad.tgs */, + D0EFF2872319838500CF5164 /* surprised.tgs */, + D0EFF2882319838500CF5164 /* ok.tgs */, + D0EFF2892319838500CF5164 /* heart.tgs */, + D0EFF28A2319838500CF5164 /* poop.tgs */, + D0EFF28B2319838600CF5164 /* celebrate.tgs */, + D0EFF28C2319838600CF5164 /* smile.tgs */, + ); + name = BuiltinReactions; + path = submodules/TelegramUI/TelegramUI/Resources/BuiltinReactions; + sourceTree = ""; + }; + D0EFF28E2319838600CF5164 /* Stripe */ = { + isa = PBXGroup; + children = ( + D0EFF28F2319838600CF5164 /* stp_card_visa_template@3x.png */, + D0EFF2902319838600CF5164 /* stp_card_form_back@3x.png */, + D0EFF2912319838600CF5164 /* stp_card_amex@3x.png */, + D0EFF2922319838600CF5164 /* stp_card_diners@2x.png */, + D0EFF2932319838600CF5164 /* stp_card_diners_template@2x.png */, + D0EFF2942319838600CF5164 /* stp_card_amex_template@3x.png */, + D0EFF2952319838600CF5164 /* stp_card_diners_template@3x.png */, + D0EFF2962319838600CF5164 /* stp_card_amex_template@2x.png */, + D0EFF2972319838600CF5164 /* stp_card_diners@3x.png */, + D0EFF2982319838600CF5164 /* stp_card_amex@2x.png */, + D0EFF2992319838600CF5164 /* stp_card_form_back@2x.png */, + D0EFF29A2319838600CF5164 /* stp_card_visa_template@2x.png */, + D0EFF29B2319838600CF5164 /* stp_card_form_front@2x.png */, + D0EFF29C2319838600CF5164 /* stp_card_applepay_template@2x.png */, + D0EFF29D2319838600CF5164 /* stp_card_cvc_amex@3x.png */, + D0EFF29E2319838600CF5164 /* stp_card_discover@3x.png */, + D0EFF29F2319838600CF5164 /* stp_card_cvc@2x.png */, + D0EFF2A02319838600CF5164 /* stp_card_jcb_template@3x.png */, + D0EFF2A12319838600CF5164 /* stp_card_jcb@3x.png */, + D0EFF2A22319838600CF5164 /* stp_card_jcb@2x.png */, + D0EFF2A32319838600CF5164 /* stp_card_cvc@3x.png */, + D0EFF2A42319838600CF5164 /* stp_card_jcb_template@2x.png */, + D0EFF2A52319838600CF5164 /* stp_card_discover@2x.png */, + D0EFF2A62319838600CF5164 /* stp_card_cvc_amex@2x.png */, + D0EFF2A72319838600CF5164 /* stp_card_applepay_template@3x.png */, + D0EFF2A82319838600CF5164 /* stp_card_form_front@3x.png */, + D0EFF2A92319838600CF5164 /* stp_card_visa@3x.png */, + D0EFF2AA2319838600CF5164 /* stp_card_placeholder_template@3x.png */, + D0EFF2AB2319838600CF5164 /* stp_card_applepay@2x.png */, + D0EFF2AC2319838600CF5164 /* stp_card_applepay@3x.png */, + D0EFF2AD2319838600CF5164 /* stp_card_placeholder_template@2x.png */, + D0EFF2AE2319838600CF5164 /* stp_card_visa@2x.png */, + D0EFF2AF2319838600CF5164 /* stp_card_mastercard_template@3x.png */, + D0EFF2B02319838600CF5164 /* stp_card_discover_template@2x.png */, + D0EFF2B12319838600CF5164 /* stp_card_form_applepay@3x.png */, + D0EFF2B22319838600CF5164 /* stp_card_mastercard@2x.png */, + D0EFF2B32319838600CF5164 /* stp_card_mastercard@3x.png */, + D0EFF2B42319838600CF5164 /* stp_card_discover_template@3x.png */, + D0EFF2B52319838600CF5164 /* stp_card_form_applepay@2x.png */, + D0EFF2B62319838600CF5164 /* stp_card_mastercard_template@2x.png */, + ); + name = Stripe; + path = submodules/TelegramUI/TelegramUI/Resources/Stripe; + sourceTree = ""; + }; + D0EFF2B72319838700CF5164 /* Animations */ = { + isa = PBXGroup; + children = ( + D0EFF2B82319838700CF5164 /* anim_read.json */, + D0EFF2B92319838700CF5164 /* anim_archive.json */, + D0EFF2BA2319838700CF5164 /* anim_pin.json */, + D0EFF2BB2319838700CF5164 /* anim_infotip.json */, + D0EFF2BC2319838700CF5164 /* anim_unmute.json */, + D0EFF2BD2319838700CF5164 /* anim_unpin.json */, + D0EFF2BE2319838700CF5164 /* anim_success.json */, + D0EFF2BF2319838700CF5164 /* anim_unread.json */, + D0EFF2C02319838700CF5164 /* anim_archiveswipe.json */, + D0EFF2C12319838700CF5164 /* anim_delete.json */, + D0EFF2C22319838700CF5164 /* anim_archiveAvatar.json */, + D0EFF2C32319838700CF5164 /* anim_unarchive.json */, + D0EFF2C42319838700CF5164 /* anim_ungroup.json */, + D0EFF2C52319838700CF5164 /* anim_hide.json */, + D0EFF2C62319838700CF5164 /* anim_group.json */, + D0EFF2C72319838700CF5164 /* anim_mute.json */, + ); + name = Animations; + path = submodules/TelegramUI/TelegramUI/Resources/Animations; + sourceTree = ""; + }; + D0EFF2C92319838700CF5164 /* WebEmbed */ = { + isa = PBXGroup; + children = ( + D0EFF2CA2319838700CF5164 /* VimeoUserScript.js */, + D0EFF2CB2319838700CF5164 /* TwitchUserScript.js */, + D0EFF2CC2319838700CF5164 /* Youtube.html */, + D0EFF2CD2319838700CF5164 /* Twitch.html */, + D0EFF2CE2319838700CF5164 /* Vimeo.html */, + D0EFF2CF2319838700CF5164 /* Instagram.html */, + D0EFF2D02319838700CF5164 /* Generic.html */, + D0EFF2D12319838700CF5164 /* GenericUserScript.js */, + D0EFF2D22319838700CF5164 /* YoutubeUserScript.js */, + ); + name = WebEmbed; + path = submodules/TelegramUI/TelegramUI/Resources/WebEmbed; + sourceTree = ""; + }; + D0EFF2D32319838700CF5164 /* Fonts */ = { + isa = PBXGroup; + children = ( + D0EFF2D42319838700CF5164 /* SFCompactRounded-Semibold.otf */, + ); + name = Fonts; + path = submodules/TelegramUI/TelegramUI/Resources/Fonts; + sourceTree = ""; + }; + D0EFF328231983BF00CF5164 /* Sounds */ = { + isa = PBXGroup; + children = ( + D0EFF329231983BF00CF5164 /* MessageSent.caf */, + D0EFF32A231983BF00CF5164 /* notification.caf */, + ); + name = Sounds; + path = submodules/TelegramUI/TelegramUI/Sounds; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -2827,21 +3145,32 @@ buildActionMask = 2147483647; files = ( D0CE6F6B213EDA4400BCD44B /* InfoPlist.strings in Resources */, + D0EFF2E02319838800CF5164 /* heart.tgs in Resources */, D08DB0AC213F4D1D00F2ADBF /* ic_bubble_dot@2x.png in Resources */, D08DB0B0213F4D1D00F2ADBF /* ic_pin@2x.png in Resources */, D04DCC211F71C80000B021D7 /* 0.m4a in Resources */, D04DCC261F71C80000B021D7 /* 103.m4a in Resources */, 09A218F222A1570A00DE6898 /* BlueFilledIcon@2x.png in Resources */, + D0EFF2EC2319838800CF5164 /* stp_card_amex_template@2x.png in Resources */, + D0EFF30B2319838800CF5164 /* stp_card_form_applepay@2x.png in Resources */, + D0EFF2F52319838800CF5164 /* stp_card_cvc@2x.png in Resources */, 09E9600922C23FF200B13673 /* BlueNotificationIcon.png in Resources */, + D0EFF30F2319838800CF5164 /* anim_pin.json in Resources */, 090E777722A6945900CD99F5 /* BlueClassicIcon@2x.png in Resources */, D0CE6F69213EDA4400BCD44B /* AppIntentVocabulary.plist in Resources */, D08DB0C0213F4D1D00F2ADBF /* telegram_sphere@2x.png in Resources */, + D0EFF3062319838800CF5164 /* stp_card_discover_template@2x.png in Resources */, D08DB0AB213F4D1D00F2ADBF /* ic_bubble@2x.png in Resources */, + D0EFF32C231983BF00CF5164 /* notification.caf in Resources */, D04DCC341F71C80000B021D7 /* 7.m4a in Resources */, 09E9600722C23FF200B13673 /* BlackNotificationIcon@3x.png in Resources */, 09EBE2A522B004EA00F670AB /* BlueFilledIconIpad.png in Resources */, 094DDF5C22E8C310004B0256 /* AppIntentVocabulary.plist in Resources */, 094DDF3C22E7A98E004B0256 /* Localizable.strings in Resources */, + D0EFF2F62319838800CF5164 /* stp_card_jcb_template@3x.png in Resources */, + D0EFF2D92319838800CF5164 /* thumbsup.tgs in Resources */, + D0EFF3022319838800CF5164 /* stp_card_applepay@3x.png in Resources */, + D0EFF2E62319838800CF5164 /* stp_card_form_back@3x.png in Resources */, 094DDF3422E7A61B004B0256 /* AppIntentVocabulary.plist in Resources */, D0CE6F60213EDA4400BCD44B /* AppIntentVocabulary.plist in Resources */, D0CE6F63213EDA4400BCD44B /* AppIntentVocabulary.plist in Resources */, @@ -2855,21 +3184,40 @@ D0CE6F68213EDA4400BCD44B /* InfoPlist.strings in Resources */, 09A218EE22A1570A00DE6898 /* BlueFilledIcon@3x.png in Resources */, 09E9600C22C23FF200B13673 /* BlueNotificationIcon@3x.png in Resources */, + D0EFF2FE2319838800CF5164 /* stp_card_form_front@3x.png in Resources */, 09E9601422C2441000B13673 /* BlackClassicNotificationIcon@3x.png in Resources */, D0CE6F6A213EDA4400BCD44B /* Localizable.strings in Resources */, + D0EFF3132319838800CF5164 /* anim_success.json in Resources */, + D0EFF3212319838800CF5164 /* Twitch.html in Resources */, + D0EFF2FF2319838800CF5164 /* stp_card_visa@3x.png in Resources */, + D0EFF2F02319838800CF5164 /* stp_card_visa_template@2x.png in Resources */, 09A4193522B7A4D500637EB4 /* BlackClassicIconIpad@2x.png in Resources */, + D0EFF3122319838800CF5164 /* anim_unpin.json in Resources */, + D0EFF3112319838800CF5164 /* anim_unmute.json in Resources */, + D0EFF2E32319838800CF5164 /* smile.tgs in Resources */, + D0EFF3142319838800CF5164 /* anim_unread.json in Resources */, 09E9601622C2441000B13673 /* BlueClassicNotificationIcon@2x.png in Resources */, + D0EFF2D52319838800CF5164 /* PhoneCountries.txt in Resources */, 09E9601322C2441000B13673 /* BlackClassicNotificationIcon@2x.png in Resources */, + D0EFF3052319838800CF5164 /* stp_card_mastercard_template@3x.png in Resources */, D0E8C2DE2285EA55009F26E8 /* BlackIcon@2x.png in Resources */, + D0EFF3272319838800CF5164 /* SFCompactRounded-Semibold.otf in Resources */, D09DCBB71D0C856B00F51FFE /* Localizable.strings in Resources */, 094DDF5722E8C310004B0256 /* Localizable.strings in Resources */, + D0EFF2E92319838800CF5164 /* stp_card_diners_template@2x.png in Resources */, D0CE6F66213EDA4400BCD44B /* AppIntentVocabulary.plist in Resources */, + D0EFF2E72319838800CF5164 /* stp_card_amex@3x.png in Resources */, D08DB0B8213F4D1D00F2ADBF /* powerful_mask@2x.png in Resources */, D08DB0B4213F4D1D00F2ADBF /* knot_down@2x.png in Resources */, + D0EFF2DB2319838800CF5164 /* cry.tgs in Resources */, + D0EFF2F72319838800CF5164 /* stp_card_jcb@3x.png in Resources */, 094DDF4822E7A9A8004B0256 /* AppIntentVocabulary.plist in Resources */, 09EC5CDA22CBBF9600292E42 /* telegram_plane1@2x.png in Resources */, + D0EFF3082319838800CF5164 /* stp_card_mastercard@2x.png in Resources */, D08DB0BC213F4D1D00F2ADBF /* start_arrow@2x.png in Resources */, + D0EFF2FB2319838800CF5164 /* stp_card_discover@2x.png in Resources */, D08DB0B6213F4D1D00F2ADBF /* powerful_infinity@2x.png in Resources */, + D0EFF3042319838800CF5164 /* stp_card_visa@2x.png in Resources */, 094DDF5B22E8C310004B0256 /* InfoPlist.strings in Resources */, 09EBE2AA22B004EA00F670AB /* BlueIconLargeIpad@2x.png in Resources */, D0CE6F5B213EDA4400BCD44B /* Localizable.strings in Resources */, @@ -2877,10 +3225,13 @@ 094DDF5922E8C310004B0256 /* AppIntentVocabulary.plist in Resources */, 09A4193422B7A4D500637EB4 /* BlackClassicIconIpad.png in Resources */, 094DDF4622E7A9A8004B0256 /* Localizable.strings in Resources */, + D0EFF27C2319835B00CF5164 /* Images.xcassets in Resources */, 09A4193222B7A4D500637EB4 /* BlueClassicIconIpad.png in Resources */, + D0EFF2D82319838800CF5164 /* lol.tgs in Resources */, D0CE6F62213EDA4400BCD44B /* InfoPlist.strings in Resources */, D08DB0A8213F4D1D00F2ADBF /* fast_arrow_shadow@2x.png in Resources */, D0CFBB931FD88C2900B65C0D /* begin_record.caf in Resources */, + D0EFF3002319838800CF5164 /* stp_card_placeholder_template@3x.png in Resources */, D04DCC2C1F71C80000B021D7 /* 109.m4a in Resources */, D08DB0BD213F4D1D00F2ADBF /* start_arrow_ipad.png in Resources */, 09EBE2AB22B004EA00F670AB /* BlackIconLargeIpad@2x.png in Resources */, @@ -2888,92 +3239,147 @@ D0CE6F64213EDA4400BCD44B /* Localizable.strings in Resources */, D0CE6F6C213EDA4400BCD44B /* AppIntentVocabulary.plist in Resources */, 094DDF3E22E7A98E004B0256 /* AppIntentVocabulary.plist in Resources */, + D0EFF3252319838800CF5164 /* GenericUserScript.js in Resources */, 094DDF3D22E7A98E004B0256 /* InfoPlist.strings in Resources */, D04DCC231F71C80000B021D7 /* 100.m4a in Resources */, + D0EFF2EF2319838800CF5164 /* stp_card_form_back@2x.png in Resources */, + D0EFF33123198D3200CF5164 /* NavigationShadow@2x.png in Resources */, + D0EFF31D2319838800CF5164 /* PresentationStrings.mapping in Resources */, + D0EFF2EE2319838800CF5164 /* stp_card_amex@2x.png in Resources */, 09E9600A22C23FF200B13673 /* BlueNotificationIcon@2x.png in Resources */, 094DDF3222E7A61B004B0256 /* Localizable.strings in Resources */, 09A218EF22A1570A00DE6898 /* BlueIcon@2x.png in Resources */, D04DCC281F71C80000B021D7 /* 105.m4a in Resources */, + D0EFF32B231983BF00CF5164 /* MessageSent.caf in Resources */, D08DB0BB213F4D1D00F2ADBF /* private_screw@2x.png in Resources */, D0CE6F5F213EDA4400BCD44B /* InfoPlist.strings in Resources */, + D0EFF2EA2319838800CF5164 /* stp_card_amex_template@3x.png in Resources */, D04DCC2D1F71C80000B021D7 /* 110.m4a in Resources */, 094DDF5A22E8C310004B0256 /* Localizable.strings in Resources */, + D0EFF2DF2319838800CF5164 /* ok.tgs in Resources */, D04DCC2B1F71C80000B021D7 /* 108.m4a in Resources */, D00859AC1B28189D00EAF753 /* LaunchScreen.xib in Resources */, D08DB0B5213F4D1D00F2ADBF /* knot_up1@2x.png in Resources */, D0E8B8AD2044496C00605593 /* voip_connecting.mp3 in Resources */, + D0EFF31F2319838800CF5164 /* TwitchUserScript.js in Resources */, + D0EFF2F42319838800CF5164 /* stp_card_discover@3x.png in Resources */, D08DB0BE213F4D1D00F2ADBF /* start_arrow_ipad@2x.png in Resources */, D08DB0A9213F4D1D00F2ADBF /* fast_body@2x.png in Resources */, D04DCC321F71C80000B021D7 /* 5.m4a in Resources */, D04DCC241F71C80000B021D7 /* 101.m4a in Resources */, 09A4193122B7A4D500637EB4 /* BlackClassicIconLargeIpad@2x.png in Resources */, + D0EFF3262319838800CF5164 /* YoutubeUserScript.js in Resources */, + D0EFF2E42319838800CF5164 /* ChatWallpaperBuiltin0.jpg in Resources */, D04DCC351F71C80000B021D7 /* 8.m4a in Resources */, + D0EFF3182319838800CF5164 /* anim_unarchive.json in Resources */, + D0EFF2DA2319838800CF5164 /* poker.tgs in Resources */, D08DB0B1213F4D1D00F2ADBF /* ic_smile@2x.png in Resources */, + D0EFF3102319838800CF5164 /* anim_infotip.json in Resources */, + D0EFF2DC2319838800CF5164 /* meh.tgs in Resources */, 09EBE2A722B004EA00F670AB /* BlueIconIpad.png in Resources */, + D0EFF33023198D3200CF5164 /* NavigationBackArrowLight@2x.png in Resources */, D0CE6F57213EDA4400BCD44B /* AppIntentVocabulary.plist in Resources */, + D0EFF2FD2319838800CF5164 /* stp_card_applepay_template@3x.png in Resources */, D0CE6F59213EDA4400BCD44B /* InfoPlist.strings in Resources */, D08DB0B9213F4D1D00F2ADBF /* powerful_star@2x.png in Resources */, D04DCC271F71C80000B021D7 /* 104.m4a in Resources */, 09E9600B22C23FF200B13673 /* BlackNotificationIcon@2x.png in Resources */, 090E777522A6945900CD99F5 /* BlueClassicIcon@3x.png in Resources */, + D0EFF2F92319838800CF5164 /* stp_card_cvc@3x.png in Resources */, + D0EFF2FA2319838800CF5164 /* stp_card_jcb_template@2x.png in Resources */, + D0EFF2F12319838800CF5164 /* stp_card_form_front@2x.png in Resources */, 09A218F122A1570A00DE6898 /* BlackFilledIcon@3x.png in Resources */, D04DCC2A1F71C80000B021D7 /* 107.m4a in Resources */, D08DB0BA213F4D1D00F2ADBF /* private_door@2x.png in Resources */, + D0EFF2E52319838800CF5164 /* stp_card_visa_template@3x.png in Resources */, 09A218F022A1570A00DE6898 /* BlackFilledIcon@2x.png in Resources */, + D0EFF30C2319838800CF5164 /* stp_card_mastercard_template@2x.png in Resources */, D08DB0AE213F4D1D00F2ADBF /* ic_cam_lens@2x.png in Resources */, + D0EFF3192319838800CF5164 /* anim_ungroup.json in Resources */, + D0EFF30D2319838800CF5164 /* anim_read.json in Resources */, + D0EFF2D72319838800CF5164 /* Emoji.mapping in Resources */, + D0EFF3202319838800CF5164 /* Youtube.html in Resources */, 09A218F322A1570A00DE6898 /* BlueIcon@3x.png in Resources */, + D0EFF2F32319838800CF5164 /* stp_card_cvc_amex@3x.png in Resources */, + D0EFF2D62319838800CF5164 /* currencies.json in Resources */, D04DCC2F1F71C80000B021D7 /* 2.m4a in Resources */, + D0EFF2DE2319838800CF5164 /* surprised.tgs in Resources */, 09EBE2AC22B004EA00F670AB /* BlackIconIpad.png in Resources */, + D0EFF2E12319838800CF5164 /* poop.tgs in Resources */, + D0EFF31B2319838800CF5164 /* anim_group.json in Resources */, 09EBE2B022B004EA00F670AB /* BlueFilledIconLargeIpad@2x.png in Resources */, + D0EFF3222319838800CF5164 /* Vimeo.html in Resources */, + D0EFF2E22319838800CF5164 /* celebrate.tgs in Resources */, D0CE6F58213EDA4400BCD44B /* Localizable.strings in Resources */, D08DB0AF213F4D1D00F2ADBF /* ic_pencil@2x.png in Resources */, 094DDF5822E8C310004B0256 /* InfoPlist.strings in Resources */, + D0EFF2DD2319838800CF5164 /* sad.tgs in Resources */, 09E9601822C2441000B13673 /* BlueClassicNotificationIcon@3x.png in Resources */, + D01748C7231976B200AF3D3A /* LegacyComponentsResources.bundle in Resources */, D0CE6F67213EDA4400BCD44B /* Localizable.strings in Resources */, + D0EFF3242319838800CF5164 /* Generic.html in Resources */, 09A4193322B7A4D500637EB4 /* BlueClassicIconLargeIpad@2x.png in Resources */, D04DCC291F71C80000B021D7 /* 106.m4a in Resources */, D0CE6F5E213EDA4400BCD44B /* Localizable.strings in Resources */, D052974622B0073F004ABAF6 /* WhiteFilledIcon@3x.png in Resources */, D08DB0B7213F4D1D00F2ADBF /* powerful_infinity_white@2x.png in Resources */, - D00859A91B28189D00EAF753 /* Images.xcassets in Resources */, + D00859A91B28189D00EAF753 /* Icons.xcassets in Resources */, 094DDF0922E7A0D3004B0256 /* InfoPlist.strings in Resources */, - D001D5AA1F878DA300DF975A /* PhoneCountries.txt in Resources */, + D0EFF3172319838800CF5164 /* anim_archiveAvatar.json in Resources */, + D0EFF3092319838800CF5164 /* stp_card_mastercard@3x.png in Resources */, + D0EFF2F22319838800CF5164 /* stp_card_applepay_template@2x.png in Resources */, 094DDF0822E7A0D3004B0256 /* Localizable.strings in Resources */, 094DDF4722E7A9A8004B0256 /* InfoPlist.strings in Resources */, D0CE6F56213EDA4400BCD44B /* InfoPlist.strings in Resources */, D0CE6F65213EDA4400BCD44B /* InfoPlist.strings in Resources */, + D0EFF31E2319838800CF5164 /* VimeoUserScript.js in Resources */, D0E8B8B12044496C00605593 /* voip_busy.caf in Resources */, + D0EFF3072319838800CF5164 /* stp_card_form_applepay@3x.png in Resources */, + D0EFF3152319838800CF5164 /* anim_archiveswipe.json in Resources */, + D0EFF3032319838800CF5164 /* stp_card_placeholder_template@2x.png in Resources */, 09EBE2A622B004EA00F670AB /* BlueIconIpad@2x.png in Resources */, D08DB0A7213F4D1D00F2ADBF /* fast_arrow@2x.png in Resources */, 094DDF0A22E7A0D3004B0256 /* AppIntentVocabulary.plist in Resources */, D0E8B8AF2044496C00605593 /* voip_fail.caf in Resources */, D0CE6F55213EDA4400BCD44B /* Localizable.strings in Resources */, + D0EFF2E82319838800CF5164 /* stp_card_diners@2x.png in Resources */, D08DB0B2213F4D1D00F2ADBF /* ic_smile_eye@2x.png in Resources */, D08DB0B3213F4D1D00F2ADBF /* ic_videocam@2x.png in Resources */, D04DCC2E1F71C80000B021D7 /* 111.m4a in Resources */, D08DB0AA213F4D1D00F2ADBF /* fast_spiral@2x.png in Resources */, + D0EFF2EB2319838800CF5164 /* stp_card_diners_template@3x.png in Resources */, D0CE6F5C213EDA4400BCD44B /* InfoPlist.strings in Resources */, D052974722B0073F004ABAF6 /* WhiteFilledIcon@2x.png in Resources */, D0CE6F5D213EDA4400BCD44B /* AppIntentVocabulary.plist in Resources */, D0CE6F61213EDA4400BCD44B /* Localizable.strings in Resources */, D04DCC311F71C80000B021D7 /* 4.m4a in Resources */, D0FC1948201D2DA800FEDBB2 /* SFCompactRounded-Semibold.otf in Resources */, + D0EFF31C2319838800CF5164 /* anim_mute.json in Resources */, D04DCC331F71C80000B021D7 /* 6.m4a in Resources */, D04DCC251F71C80000B021D7 /* 102.m4a in Resources */, 09EBE2A822B004EA00F670AB /* BlackFilledIconIpad@2x.png in Resources */, D021D4D9219CAEDD0064BEBA /* Config-Fork.xcconfig in Resources */, + D0EFF31A2319838800CF5164 /* anim_hide.json in Resources */, D08DB0AD213F4D1D00F2ADBF /* ic_cam@2x.png in Resources */, + D0EFF3232319838800CF5164 /* Instagram.html in Resources */, + D0EFF30E2319838800CF5164 /* anim_archive.json in Resources */, 094DDF3322E7A61B004B0256 /* InfoPlist.strings in Resources */, 090E777622A6945900CD99F5 /* BlackClassicIcon@3x.png in Resources */, D0E8B8B02044496C00605593 /* voip_ringback.caf in Resources */, 09E9600822C23FF200B13673 /* BlackNotificationIcon.png in Resources */, + D0EFF2ED2319838800CF5164 /* stp_card_diners@3x.png in Resources */, + D0EFF2F82319838800CF5164 /* stp_card_jcb@2x.png in Resources */, + D0EFF3012319838800CF5164 /* stp_card_applepay@2x.png in Resources */, 09EBE2A922B004EA00F670AB /* BlackFilledIconLargeIpad@2x.png in Resources */, + D0EFF30A2319838800CF5164 /* stp_card_discover_template@3x.png in Resources */, 090E777422A6945900CD99F5 /* BlackClassicIcon@2x.png in Resources */, + D0EFF2FC2319838800CF5164 /* stp_card_cvc_amex@2x.png in Resources */, D00ED75A1FE94630001F38BD /* AppIntentVocabulary.plist in Resources */, D04DCC221F71C80000B021D7 /* 1.m4a in Resources */, 09EBE2AD22B004EA00F670AB /* BlackFilledIconIpad.png in Resources */, 09E9601522C2441000B13673 /* BlueClassicNotificationIcon.png in Resources */, D0E8C2E02285EA6A009F26E8 /* BlackIcon@3x.png in Resources */, + D0EFF3162319838800CF5164 /* anim_delete.json in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Telegram-iOS.xcworkspace/contents.xcworkspacedata b/Telegram-iOS.xcworkspace/contents.xcworkspacedata index 1d692dab05..ba3aded920 100644 --- a/Telegram-iOS.xcworkspace/contents.xcworkspacedata +++ b/Telegram-iOS.xcworkspace/contents.xcworkspacedata @@ -60,6 +60,9 @@ + + @@ -177,7 +180,7 @@ location = "container:" name = "Image Processing"> + location = "group:submodules/YuvConversion/YuvConversion_Xcode.xcodeproj"> diff --git a/Telegram-iOS/Images.xcassets/AppIcon.appiconset/Contents.json b/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIcon.appiconset/Contents.json rename to Telegram-iOS/Icons.xcassets/AppIcon.appiconset/Contents.json diff --git a/Telegram-iOS/Images.xcassets/AppIcon.appiconset/icon@1024px.png b/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@1024px.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIcon.appiconset/icon@1024px.png rename to Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@1024px.png diff --git a/Telegram-iOS/Images.xcassets/AppIcon.appiconset/icon@120px.png b/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@120px.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIcon.appiconset/icon@120px.png rename to Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@120px.png diff --git a/Telegram-iOS/Images.xcassets/AppIcon.appiconset/icon@152px.png b/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@152px.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIcon.appiconset/icon@152px.png rename to Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@152px.png diff --git a/Telegram-iOS/Images.xcassets/AppIcon.appiconset/icon@167px.png b/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@167px.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIcon.appiconset/icon@167px.png rename to Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@167px.png diff --git a/Telegram-iOS/Images.xcassets/AppIcon.appiconset/icon@180px.png b/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@180px.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIcon.appiconset/icon@180px.png rename to Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@180px.png diff --git a/Telegram-iOS/Images.xcassets/AppIcon.appiconset/icon@76px.png b/Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@76px.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIcon.appiconset/icon@76px.png rename to Telegram-iOS/Icons.xcassets/AppIcon.appiconset/icon@76px.png diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueIcon@2x-1.png b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@2x-1.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueIcon@2x-1.png rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@2x-1.png diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueIcon@2x.png b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@2x.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueIcon@2x.png rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@2x.png diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueIcon@3x.png b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@3x.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueIcon@3x.png rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIcon@3x.png diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueIconIpad.png b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconIpad.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueIconIpad.png rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconIpad.png diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueIconIpad@2x.png b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconIpad@2x.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueIconIpad@2x.png rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconIpad@2x.png diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueIconLargeIpad@2x.png b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconLargeIpad@2x.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueIconLargeIpad@2x.png rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueIconLargeIpad@2x.png diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueNotificationIcon.png b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueNotificationIcon.png rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon.png diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x-1.png b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x-1.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x-1.png rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x-1.png diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x.png b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x.png rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@2x.png diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@3x.png b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@3x.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@3x.png rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/BlueNotificationIcon@3x.png diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/Contents.json b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Contents.json similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/Contents.json rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Contents.json diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/Simple-iTunesArtwork.png b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple-iTunesArtwork.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/Simple-iTunesArtwork.png rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple-iTunesArtwork.png diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/Simple@29x29.png b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@29x29.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/Simple@29x29.png rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@29x29.png diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/Simple@40x40-1.png b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@40x40-1.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/Simple@40x40-1.png rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@40x40-1.png diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/Simple@58x58-1.png b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@58x58-1.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/Simple@58x58-1.png rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@58x58-1.png diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/Simple@58x58.png b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@58x58.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/Simple@58x58.png rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@58x58.png diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/Simple@80x80-1.png b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@80x80-1.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/Simple@80x80-1.png rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@80x80-1.png diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/Simple@80x80.png b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@80x80.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/Simple@80x80.png rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@80x80.png diff --git a/Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/Simple@87x87.png b/Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@87x87.png similarity index 100% rename from Telegram-iOS/Images.xcassets/AppIconLLC.appiconset/Simple@87x87.png rename to Telegram-iOS/Icons.xcassets/AppIconLLC.appiconset/Simple@87x87.png diff --git a/Telegram-iOS/Images.xcassets/Contents.json b/Telegram-iOS/Icons.xcassets/Contents.json similarity index 100% rename from Telegram-iOS/Images.xcassets/Contents.json rename to Telegram-iOS/Icons.xcassets/Contents.json diff --git a/Telegram-iOS/Images.xcassets/Shortcuts/Contents.json b/Telegram-iOS/Icons.xcassets/Shortcuts/Contents.json similarity index 100% rename from Telegram-iOS/Images.xcassets/Shortcuts/Contents.json rename to Telegram-iOS/Icons.xcassets/Shortcuts/Contents.json diff --git a/Telegram-iOS/Images.xcassets/Shortcuts/SavedMessages.imageset/Contents.json b/Telegram-iOS/Icons.xcassets/Shortcuts/SavedMessages.imageset/Contents.json similarity index 100% rename from Telegram-iOS/Images.xcassets/Shortcuts/SavedMessages.imageset/Contents.json rename to Telegram-iOS/Icons.xcassets/Shortcuts/SavedMessages.imageset/Contents.json diff --git a/Telegram-iOS/Images.xcassets/Shortcuts/SavedMessages.imageset/SavedMessagesIcon@2x.png b/Telegram-iOS/Icons.xcassets/Shortcuts/SavedMessages.imageset/SavedMessagesIcon@2x.png similarity index 100% rename from Telegram-iOS/Images.xcassets/Shortcuts/SavedMessages.imageset/SavedMessagesIcon@2x.png rename to Telegram-iOS/Icons.xcassets/Shortcuts/SavedMessages.imageset/SavedMessagesIcon@2x.png diff --git a/Telegram-iOS/Images.xcassets/Shortcuts/SavedMessages.imageset/SavedMessagesIcon@3x.png b/Telegram-iOS/Icons.xcassets/Shortcuts/SavedMessages.imageset/SavedMessagesIcon@3x.png similarity index 100% rename from Telegram-iOS/Images.xcassets/Shortcuts/SavedMessages.imageset/SavedMessagesIcon@3x.png rename to Telegram-iOS/Icons.xcassets/Shortcuts/SavedMessages.imageset/SavedMessagesIcon@3x.png diff --git a/submodules/Display/Display/NavigationBackArrowLight@2x.png b/Telegram-iOS/Resources/NavigationBackArrowLight@2x.png similarity index 100% rename from submodules/Display/Display/NavigationBackArrowLight@2x.png rename to Telegram-iOS/Resources/NavigationBackArrowLight@2x.png diff --git a/submodules/Display/Display/NavigationShadow@2x.png b/Telegram-iOS/Resources/NavigationShadow@2x.png similarity index 100% rename from submodules/Display/Display/NavigationShadow@2x.png rename to Telegram-iOS/Resources/NavigationShadow@2x.png diff --git a/Telegram-iOS/Resources/PhoneCountries.txt b/Telegram-iOS/Resources/PhoneCountries.txt deleted file mode 100644 index 0f0932ed27..0000000000 --- a/Telegram-iOS/Resources/PhoneCountries.txt +++ /dev/null @@ -1,232 +0,0 @@ -1876;JM;Jamaica -1869;KN;Saint Kitts & Nevis -1868;TT;Trinidad & Tobago -1784;VC;Saint Vincent & the Grenadines -1767;DM;Dominica -1758;LC;Saint Lucia -1721;SX;Sint Maarten -1684;AS;American Samoa -1671;GU;Guam -1670;MP;Northern Mariana Islands -1664;MS;Montserrat -1649;TC;Turks & Caicos Islands -1473;GD;Grenada -1441;BM;Bermuda -1345;KY;Cayman Islands -1340;VI;US Virgin Islands -1284;VG;British Virgin Islands -1268;AG;Antigua & Barbuda -1264;AI;Anguilla -1246;BB;Barbados -1242;BS;Bahamas -998;UZ;Uzbekistan -996;KG;Kyrgyzstan -995;GE;Georgia -994;AZ;Azerbaijan -993;TM;Turkmenistan -992;TJ;Tajikistan -977;NP;Nepal -976;MN;Mongolia -975;BT;Bhutan -974;QA;Qatar -973;BH;Bahrain -972;IL;Israel -971;AE;United Arab Emirates -970;PS;Palestine -968;OM;Oman -967;YE;Yemen -966;SA;Saudi Arabia -965;KW;Kuwait -964;IQ;Iraq -963;SY;Syrian Arab Republic -962;JO;Jordan -961;LB;Lebanon -960;MV;Maldives -886;TW;Taiwan -880;BD;Bangladesh -856;LA;Laos -855;KH;Cambodia -853;MO;Macau -852;HK;Hong Kong -850;KP;North Korea -692;MH;Marshall Islands -691;FM;Micronesia -690;TK;Tokelau -689;PF;French Polynesia -688;TV;Tuvalu -687;NC;New Caledonia -686;KI;Kiribati -685;WS;Samoa -683;NU;Niue -682;CK;Cook Islands -681;WF;Wallis & Futuna -680;PW;Palau -679;FJ;Fiji -678;VU;Vanuatu -677;SB;Solomon Islands -676;TO;Tonga -675;PG;Papua New Guinea -674;NR;Nauru -673;BN;Brunei Darussalam -672;NF;Norfolk Island -670;TL;Timor-Leste -599;BQ;Bonaire, Sint Eustatius & Saba -599;CW;Curaçao -598;UY;Uruguay -597;SR;Suriname -596;MQ;Martinique -595;PY;Paraguay -594;GF;French Guiana -593;EC;Ecuador -592;GY;Guyana -591;BO;Bolivia -590;GP;Guadeloupe -509;HT;Haiti -508;PM;Saint Pierre & Miquelon -507;PA;Panama -506;CR;Costa Rica -505;NI;Nicaragua -504;HN;Honduras -503;SV;El Salvador -502;GT;Guatemala -501;BZ;Belize -500;FK;Falkland Islands -423;LI;Liechtenstein -421;SK;Slovakia -420;CZ;Czech Republic -383;XK;Kosovo -389;MK;Macedonia -387;BA;Bosnia & Herzegovina -386;SI;Slovenia -385;HR;Croatia -382;ME;Montenegro -381;RS;Serbia -380;UA;Ukraine -378;SM;San Marino -377;MC;Monaco -376;AD;Andorra -375;BY;Belarus -374;AM;Armenia -373;MD;Moldova -372;EE;Estonia -371;LV;Latvia -370;LT;Lithuania -359;BG;Bulgaria -358;FI;Finland -357;CY;Cyprus -356;MT;Malta -355;AL;Albania -354;IS;Iceland -353;IE;Ireland -352;LU;Luxembourg -351;PT;Portugal -350;GI;Gibraltar -299;GL;Greenland -298;FO;Faroe Islands -297;AW;Aruba -291;ER;Eritrea -290;SH;Saint Helena -269;KM;Comoros -268;SZ;Swaziland -267;BW;Botswana -266;LS;Lesotho -265;MW;Malawi -264;NA;Namibia -263;ZW;Zimbabwe -262;RE;Réunion -261;MG;Madagascar -260;ZM;Zambia -258;MZ;Mozambique -257;BI;Burundi -256;UG;Uganda -255;TZ;Tanzania -254;KE;Kenya -253;DJ;Djibouti -252;SO;Somalia -251;ET;Ethiopia -250;RW;Rwanda -249;SD;Sudan -248;SC;Seychelles -247;SH;Saint Helena -246;IO;Diego Garcia -245;GW;Guinea-Bissau -244;AO;Angola -243;CD;Congo (Dem. Rep.) -242;CG;Congo (Rep.) -241;GA;Gabon -240;GQ;Equatorial Guinea -239;ST;São Tomé & Príncipe -238;CV;Cape Verde -237;CM;Cameroon -236;CF;Central African Rep. -235;TD;Chad -234;NG;Nigeria -233;GH;Ghana -232;SL;Sierra Leone -231;LR;Liberia -230;MU;Mauritius -229;BJ;Benin -228;TG;Togo -227;NE;Niger -226;BF;Burkina Faso -225;CI;Côte d`Ivoire -224;GN;Guinea -223;ML;Mali -222;MR;Mauritania -221;SN;Senegal -220;GM;Gambia -218;LY;Libya -216;TN;Tunisia -213;DZ;Algeria -212;MA;Morocco -211;SS;South Sudan -98;IR;Iran -95;MM;Myanmar -94;LK;Sri Lanka -93;AF;Afghanistan -92;PK;Pakistan -91;IN;India -90;TR;Turkey -86;CN;China -84;VN;Vietnam -82;KR;South Korea -81;JP;Japan -66;TH;Thailand -65;SG;Singapore -64;NZ;New Zealand -63;PH;Philippines -62;ID;Indonesia -61;AU;Australia -60;MY;Malaysia -58;VE;Venezuela -57;CO;Colombia -56;CL;Chile -55;BR;Brazil -54;AR;Argentina -53;CU;Cuba -52;MX;Mexico -51;PE;Peru -49;DE;Germany -48;PL;Poland -47;NO;Norway -46;SE;Sweden -45;DK;Denmark -44;GB;United Kingdom -43;AT;Austria -41;CH;Switzerland -40;RO;Romania -39;IT;Italy -36;HU;Hungary -34;ES;Spain -33;FR;France -32;BE;Belgium -31;NL;Netherlands -30;GR;Greece -27;ZA;South Africa -20;EG;Egypt -7;RU;Russian Federation -7;KZ;Kazakhstan -1;US;USA -1;PR;Puerto Rico -1;DO;Dominican Rep. -1;CA;Canada diff --git a/Telegram-iOS/Resources/SFCompactRounded-Semibold.otf b/Telegram-iOS/Resources/SFCompactRounded-Semibold.otf deleted file mode 100644 index 100e58bff7..0000000000 Binary files a/Telegram-iOS/Resources/SFCompactRounded-Semibold.otf and /dev/null differ diff --git a/check_env.sh b/check_env.sh new file mode 100644 index 0000000000..ed48e66473 --- /dev/null +++ b/check_env.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +if [ -z "$TELEGRAM_ENV_SET" ]; then + echo "Error: Telegram build environment is not set up. Use sh public.sh make ${command}" + exit 1 +fi diff --git a/log.txt b/log.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/package_app.sh b/package_app.sh index 9d854cc47f..b224755cf7 100644 --- a/package_app.sh +++ b/package_app.sh @@ -1,14 +1,16 @@ #!/bin/sh set -x +set -e if [ -z "$1" ] || [ -z "$2" ]; then echo "Usage: sh package_app.sh path/to/buck platform-flavors" exit 1 fi -PLATFORM_FLAVORS="$2" BUCK="$1" +BUCK_OPTIONS="$2" +PLATFORM_FLAVORS="$3" BUILD_PATH="build" APP_NAME="Telegram" @@ -26,19 +28,19 @@ mkdir -p "$DSYMS_DIR" cp "buck-out/gen/App/AppPackage#$PLATFORM_FLAVORS.ipa" "$IPA_PATH.original" rm -rf "$IPA_PATH.original.unpacked" -rm "$BUILD_PATH/${APP_NAME}_signed.ipa" +rm -f "$BUILD_PATH/${APP_NAME}_signed.ipa" mkdir -p "$IPA_PATH.original.unpacked" unzip "$IPA_PATH.original" -d "$IPA_PATH.original.unpacked/" rm "$IPA_PATH.original" UNPACKED_PATH="$IPA_PATH.original.unpacked" -APP_PATH="$UNPACKED_PATH/Payload/App.app" +APP_PATH="$UNPACKED_PATH/Payload/Telegram.app" FRAMEWORKS_DIR="$APP_PATH/Frameworks" rm -rf "$IPA_PATH.original.unpacked/SwiftSupport/iphoneos/"* rm -rf "$FRAMEWORKS_DIR"/* -for DEPENDENCY in $($BUCK query "kind('apple_library|apple_binary', deps('//App:App#$PLATFORM_FLAVORS', 1))"); do +for DEPENDENCY in $(${BUCK} query "kind('apple_library|apple_binary', deps('//App:Telegram#$PLATFORM_FLAVORS', 1))" ${BUCK_OPTIONS}); do case "$DEPENDENCY" in *"#"*) ;; @@ -49,8 +51,10 @@ for DEPENDENCY in $($BUCK query "kind('apple_library|apple_binary', deps('//App: DEPENDENCY_PATH=$(echo "$DEPENDENCY" | sed -e "s#^//##" | sed -e "s#:#/#") DEPENDENCY_NAME=$(echo "$DEPENDENCY" | sed -e "s/#.*//" | sed -e "s/^.*\://") DYLIB_PATH="buck-out/gen/$DEPENDENCY_PATH/lib$DEPENDENCY_NAME.dylib" - TARGET_DYLIB_PATH="$FRAMEWORKS_DIR/lib$DEPENDENCY_NAME.dylib" - cp "$DYLIB_PATH" "$TARGET_DYLIB_PATH" + if [ -f "$DYLIB_PATH" ]; then + TARGET_DYLIB_PATH="$FRAMEWORKS_DIR/lib$DEPENDENCY_NAME.dylib" + cp "$DYLIB_PATH" "$TARGET_DYLIB_PATH" + fi DSYM_PATH="buck-out/gen/$(echo "$DEPENDENCY" | sed -e "s/#/#apple-dsym,/" | sed -e "s#^//##" | sed -e "s#:#/#").dSYM" cp -f -r "$DSYM_PATH" "$DSYMS_DIR/" done @@ -59,7 +63,7 @@ for LIB in $(ls "$FRAMEWORKS_DIR"/*.dylib); do strip -S -T "$LIB" done -xcrun swift-stdlib-tool --scan-folder "$IPA_PATH.original.unpacked/Payload/App.app" --scan-folder "$IPA_PATH.original.unpacked/Payload/App.app/Frameworks" --strip-bitcode --platform iphoneos --copy --destination "$IPA_PATH.original.unpacked/SwiftSupport/iphoneos" +xcrun swift-stdlib-tool --scan-folder "$IPA_PATH.original.unpacked/Payload/Telegram.app" --scan-folder "$IPA_PATH.original.unpacked/Payload/Telegram.app/Frameworks" --strip-bitcode --platform iphoneos --copy --destination "$IPA_PATH.original.unpacked/SwiftSupport/iphoneos" for LIB in $(ls "$IPA_PATH.original.unpacked/SwiftSupport/iphoneos/"*.dylib); do codesign --remove-signature "$LIB" diff --git a/submodules/AccountContext/AccountContext.xcodeproj/project.pbxproj b/submodules/AccountContext/AccountContext.xcodeproj/project.pbxproj index 77c200f9b1..0d092d262f 100644 --- a/submodules/AccountContext/AccountContext.xcodeproj/project.pbxproj +++ b/submodules/AccountContext/AccountContext.xcodeproj/project.pbxproj @@ -288,6 +288,17 @@ sourceTree SOURCE_ROOT + 1DD70E297819F1E000000000 + + isa + PBXFileReference + name + ThemeUpdateManager.swift + path + Sources/ThemeUpdateManager.swift + sourceTree + SOURCE_ROOT + 1DD70E29A055C05700000000 isa @@ -355,6 +366,7 @@ 1DD70E29BEA4BC8700000000 1DD70E29A82E88C500000000 1DD70E290F2FA2FD00000000 + 1DD70E297819F1E000000000 1DD70E29A055C05700000000 1DD70E29900C6ACF00000000 1DD70E29CEBFB42300000000 @@ -873,6 +885,13 @@ fileRef 1DD70E290F2FA2FD00000000 + E7A30F047819F1E000000000 + + isa + PBXBuildFile + fileRef + 1DD70E297819F1E000000000 + E7A30F04A055C05700000000 isa @@ -924,6 +943,7 @@ E7A30F04BEA4BC8700000000 E7A30F04A82E88C500000000 E7A30F040F2FA2FD00000000 + E7A30F047819F1E000000000 E7A30F04A055C05700000000 E7A30F04900C6ACF00000000 E7A30F04CEBFB42300000000 diff --git a/submodules/AnimationUI/AnimationUI.xcodeproj/project.pbxproj b/submodules/AnimationUI/AnimationUI.xcodeproj/project.pbxproj index 3288ad7589..905f2feda1 100644 --- a/submodules/AnimationUI/AnimationUI.xcodeproj/project.pbxproj +++ b/submodules/AnimationUI/AnimationUI.xcodeproj/project.pbxproj @@ -68,17 +68,6 @@ sourceTree SOURCE_ROOT - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E2968DC800500000000 isa @@ -104,7 +93,6 @@ 1DD70E29F846183C00000000 1DD70E29D847F9AB00000000 1DD70E291FD1D5AC00000000 - 1DD70E291289FAA500000000 1DD70E2968DC800500000000 @@ -397,13 +385,6 @@ fileRef 1DD70E291FD1D5AC00000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F0468DC800500000000 isa @@ -421,7 +402,6 @@ E7A30F04F846183C00000000 E7A30F04D847F9AB00000000 E7A30F041FD1D5AC00000000 - E7A30F041289FAA500000000 E7A30F0468DC800500000000 diff --git a/submodules/AnimationUI/AnimationUI_Xcode.xcodeproj/project.pbxproj b/submodules/AnimationUI/AnimationUI_Xcode.xcodeproj/project.pbxproj index 495c71077b..85107a7fc7 100644 --- a/submodules/AnimationUI/AnimationUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/AnimationUI/AnimationUI_Xcode.xcodeproj/project.pbxproj @@ -29,7 +29,7 @@ D06018A922F361F900796784 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D06018A822F361F800796784 /* UIKit.framework */; }; D06018AB22F361FC00796784 /* AsyncDisplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D06018AA22F361FC00796784 /* AsyncDisplayKit.framework */; }; D06018AD22F361FF00796784 /* Lottie.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D06018AC22F361FF00796784 /* Lottie.framework */; }; - D06018AF22F3641F00796784 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D06018AE22F3641F00796784 /* FrameworkBundle.swift */; }; + D0EFF2442319802E00CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF2432319802E00CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -57,7 +57,7 @@ D06018A822F361F800796784 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; D06018AA22F361FC00796784 /* AsyncDisplayKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AsyncDisplayKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D06018AC22F361FF00796784 /* Lottie.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Lottie.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D06018AE22F3641F00796784 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; + D0EFF2432319802E00CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -65,6 +65,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF2442319802E00CF5164 /* AppBundle.framework in Frameworks */, D03E3E8E2304B6EC0049C28B /* YuvConversion.framework in Frameworks */, D03E3E642304B5640049C28B /* MobileCoreServices.framework in Frameworks */, D03E3E622304B55F0049C28B /* SwiftSignalKit.framework in Frameworks */, @@ -114,7 +115,6 @@ D03E3E4E2304B50A0049C28B /* AnimatedStickerUtils.swift */, D06018A322F361E800796784 /* AnimationNode.swift */, D060186F22F35FCD00796784 /* AnimationUI.h */, - D06018AE22F3641F00796784 /* FrameworkBundle.swift */, ); path = Sources; sourceTree = ""; @@ -122,6 +122,7 @@ D06018A522F361F400796784 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF2432319802E00CF5164 /* AppBundle.framework */, D03E3E8D2304B6EC0049C28B /* YuvConversion.framework */, D03E3E632304B5640049C28B /* MobileCoreServices.framework */, D03E3E612304B55F0049C28B /* SwiftSignalKit.framework */, @@ -224,7 +225,6 @@ files = ( D03E3E672304B61A0049C28B /* AnimationRenderer.swift in Sources */, D03E3E4F2304B50A0049C28B /* AnimatedStickerNode.swift in Sources */, - D06018AF22F3641F00796784 /* FrameworkBundle.swift in Sources */, D03E3E502304B50A0049C28B /* AnimatedStickerUtils.swift in Sources */, D03E3E682304B61A0049C28B /* SoftwareAnimationRenderer.swift in Sources */, D06018A422F361E800796784 /* AnimationNode.swift in Sources */, diff --git a/submodules/AnimationUI/BUCK b/submodules/AnimationUI/BUCK index b2ac31610c..042eeaa82d 100644 --- a/submodules/AnimationUI/BUCK +++ b/submodules/AnimationUI/BUCK @@ -18,6 +18,7 @@ static_library( "//submodules/GZip:GZip", "//submodules/RLottie:RLottie", "//submodules/lottie-ios:Lottie", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/AnimationUI/Sources/AnimationNode.swift b/submodules/AnimationUI/Sources/AnimationNode.swift index 2ef1462a22..f8eb9ba649 100644 --- a/submodules/AnimationUI/Sources/AnimationNode.swift +++ b/submodules/AnimationUI/Sources/AnimationNode.swift @@ -2,6 +2,7 @@ import Foundation import UIKit import AsyncDisplayKit import Lottie +import AppBundle public final class AnimationNode : ASDisplayNode { private let scale: CGFloat @@ -24,8 +25,8 @@ public final class AnimationNode : ASDisplayNode { super.init() self.setViewBlock({ - if let animation = animation, let url = frameworkBundle.url(forResource: animation, withExtension: "json"), let composition = LOTComposition(filePath: url.path) { - let view = LOTAnimationView(model: composition, in: frameworkBundle) + if let animation = animation, let url = getAppBundle().url(forResource: animation, withExtension: "json"), let composition = LOTComposition(filePath: url.path) { + let view = LOTAnimationView(model: composition, in: getAppBundle()) view.animationSpeed = self.speed view.backgroundColor = .clear view.isOpaque = false @@ -48,7 +49,7 @@ public final class AnimationNode : ASDisplayNode { } public func setAnimation(name: String) { - if let url = frameworkBundle.url(forResource: name, withExtension: "json"), let composition = LOTComposition(filePath: url.path) { + if let url = getAppBundle().url(forResource: name, withExtension: "json"), let composition = LOTComposition(filePath: url.path) { self.animationView()?.sceneModel = composition } } diff --git a/submodules/AnimationUI/Sources/FrameworkBundle.swift b/submodules/AnimationUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 2d6a4df5c4..0000000000 --- a/submodules/AnimationUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,6 +0,0 @@ -import Foundation - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) diff --git a/submodules/AppBundle/AppBundle.xcodeproj/project.pbxproj b/submodules/AppBundle/AppBundle.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..3db1a77eb0 --- /dev/null +++ b/submodules/AppBundle/AppBundle.xcodeproj/project.pbxproj @@ -0,0 +1,343 @@ + + + + + archiveVersion + 1 + classes + + + objectVersion + 46 + objects + + 1DD70E29001F47FB00000000 + + isa + PBXFileReference + name + BUCK + path + BUCK + sourceTree + SOURCE_ROOT + explicitFileType + text.script.python + + 1DD70E2942D2F31D00000000 + + isa + PBXFileReference + name + AppBundle.h + path + Sources/AppBundle.h + sourceTree + SOURCE_ROOT + lastKnownFileType + sourcecode.c.h + + 1DD70E2942D2F32200000000 + + isa + PBXFileReference + name + AppBundle.m + path + Sources/AppBundle.m + sourceTree + SOURCE_ROOT + lastKnownFileType + sourcecode.c.objc + + B401C979EAB5339800000000 + + isa + PBXGroup + name + Sources + sourceTree + ]]> + children + + 1DD70E2942D2F31D00000000 + 1DD70E2942D2F32200000000 + + + B401C979B3E1D9E300000000 + + isa + PBXGroup + name + AppBundle + sourceTree + ]]> + children + + 1DD70E29001F47FB00000000 + B401C979EAB5339800000000 + + + 1DD70E293DCA7C7200000000 + + isa + PBXFileReference + name + AppBundle-Debug.xcconfig + path + ../../buck-out/gen/submodules/AppBundle/AppBundle-Debug.xcconfig + sourceTree + SOURCE_ROOT + explicitFileType + text.xcconfig + + 1DD70E29DA3FBF5C00000000 + + isa + PBXFileReference + name + AppBundle-Profile.xcconfig + path + ../../buck-out/gen/submodules/AppBundle/AppBundle-Profile.xcconfig + sourceTree + SOURCE_ROOT + explicitFileType + text.xcconfig + + 1DD70E294DD66ABE00000000 + + isa + PBXFileReference + name + AppBundle-Release.xcconfig + path + ../../buck-out/gen/submodules/AppBundle/AppBundle-Release.xcconfig + sourceTree + SOURCE_ROOT + explicitFileType + text.xcconfig + + B401C9792F7F325000000000 + + isa + PBXGroup + name + Buck (Do Not Modify) + sourceTree + ]]> + children + + 1DD70E293DCA7C7200000000 + 1DD70E29DA3FBF5C00000000 + 1DD70E294DD66ABE00000000 + + + B401C979B781F65D00000000 + + isa + PBXGroup + name + Configurations + sourceTree + ]]> + children + + B401C9792F7F325000000000 + + + 1DD70E295222FB7100000000 + + isa + PBXFileReference + name + libAppBundle.a + path + libAppBundle.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + B401C979C806358400000000 + + isa + PBXGroup + name + Products + sourceTree + ]]> + children + + 1DD70E295222FB7100000000 + + + B401C979EFB6AC4600000000 + + isa + PBXGroup + name + mainGroup + sourceTree + ]]> + children + + B401C979B3E1D9E300000000 + B401C979B781F65D00000000 + B401C979C806358400000000 + + + E7A30F0442D2F32200000000 + + isa + PBXBuildFile + fileRef + 1DD70E2942D2F32200000000 + + 1870857F0000000000000000 + + isa + PBXSourcesBuildPhase + files + + E7A30F0442D2F32200000000 + + + 4952437303EDA63300000000 + + isa + XCBuildConfiguration + name + Debug + buildSettings + + + baseConfigurationReference + 1DD70E293DCA7C7200000000 + + 4952437350C7218900000000 + + isa + XCBuildConfiguration + name + Profile + buildSettings + + + baseConfigurationReference + 1DD70E29DA3FBF5C00000000 + + 49524373A439BFE700000000 + + isa + XCBuildConfiguration + name + Release + buildSettings + + + baseConfigurationReference + 1DD70E294DD66ABE00000000 + + 218C37090000000000000000 + + isa + XCConfigurationList + buildConfigurations + + 4952437303EDA63300000000 + 4952437350C7218900000000 + 49524373A439BFE700000000 + + defaultConfigurationIsVisible + + + E66DC04EB3E1D9E300000000 + + isa + PBXNativeTarget + name + AppBundle + productName + AppBundle + productReference + 1DD70E295222FB7100000000 + productType + com.apple.product-type.library.static + dependencies + + + buildPhases + + 1870857F0000000000000000 + + buildConfigurationList + 218C37090000000000000000 + + 4952437303EDA63300000001 + + isa + XCBuildConfiguration + name + Debug + buildSettings + + + + 4952437350C7218900000001 + + isa + XCBuildConfiguration + name + Profile + buildSettings + + + + 49524373A439BFE700000001 + + isa + XCBuildConfiguration + name + Release + buildSettings + + + + 218C37090000000000000001 + + isa + XCConfigurationList + buildConfigurations + + 4952437303EDA63300000001 + 4952437350C7218900000001 + 49524373A439BFE700000001 + + defaultConfigurationIsVisible + + + 96C84793B3E1D9E300000000 + + isa + PBXProject + mainGroup + B401C979EFB6AC4600000000 + targets + + E66DC04EB3E1D9E300000000 + + buildConfigurationList + 218C37090000000000000001 + compatibilityVersion + Xcode 3.2 + attributes + + LastUpgradeCheck + 9999 + + + + rootObject + 96C84793B3E1D9E300000000 + + \ No newline at end of file diff --git a/submodules/AppBundle/AppBundle.xcodeproj/xcshareddata/xcschemes/AppBundle.xcscheme b/submodules/AppBundle/AppBundle.xcodeproj/xcshareddata/xcschemes/AppBundle.xcscheme new file mode 100644 index 0000000000..dc37f524cc --- /dev/null +++ b/submodules/AppBundle/AppBundle.xcodeproj/xcshareddata/xcschemes/AppBundle.xcscheme @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/submodules/AppBundle/AppBundle_Xcode.xcodeproj/project.pbxproj b/submodules/AppBundle/AppBundle_Xcode.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..96019b014e --- /dev/null +++ b/submodules/AppBundle/AppBundle_Xcode.xcodeproj/project.pbxproj @@ -0,0 +1,528 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 50; + objects = { + +/* Begin PBXBuildFile section */ + D01748D923197B1000AF3D3A /* AppBundle.h in Headers */ = {isa = PBXBuildFile; fileRef = D01748D723197B1000AF3D3A /* AppBundle.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D01748E523197B4800AF3D3A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D01748E423197B4800AF3D3A /* Foundation.framework */; }; + D01748E723197B6500AF3D3A /* AppBundle.m in Sources */ = {isa = PBXBuildFile; fileRef = D01748E623197B6500AF3D3A /* AppBundle.m */; }; + D0EFF23A23197E5600CF5164 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF23923197E5600CF5164 /* UIKit.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + D01748D423197B1000AF3D3A /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D01748D723197B1000AF3D3A /* AppBundle.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppBundle.h; sourceTree = ""; }; + D01748D823197B1000AF3D3A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + D01748E423197B4800AF3D3A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + D01748E623197B6500AF3D3A /* AppBundle.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppBundle.m; sourceTree = ""; }; + D0EFF23923197E5600CF5164 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + D01748D123197B1000AF3D3A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + D0EFF23A23197E5600CF5164 /* UIKit.framework in Frameworks */, + D01748E523197B4800AF3D3A /* Foundation.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + D01748CA23197B1000AF3D3A = { + isa = PBXGroup; + children = ( + D01748D823197B1000AF3D3A /* Info.plist */, + D01748D623197B1000AF3D3A /* Sources */, + D01748D523197B1000AF3D3A /* Products */, + D01748E323197B4700AF3D3A /* Frameworks */, + ); + sourceTree = ""; + }; + D01748D523197B1000AF3D3A /* Products */ = { + isa = PBXGroup; + children = ( + D01748D423197B1000AF3D3A /* AppBundle.framework */, + ); + name = Products; + sourceTree = ""; + }; + D01748D623197B1000AF3D3A /* Sources */ = { + isa = PBXGroup; + children = ( + D01748E623197B6500AF3D3A /* AppBundle.m */, + D01748D723197B1000AF3D3A /* AppBundle.h */, + ); + path = Sources; + sourceTree = ""; + }; + D01748E323197B4700AF3D3A /* Frameworks */ = { + isa = PBXGroup; + children = ( + D0EFF23923197E5600CF5164 /* UIKit.framework */, + D01748E423197B4800AF3D3A /* Foundation.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + D01748CF23197B1000AF3D3A /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + D01748D923197B1000AF3D3A /* AppBundle.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + D01748D323197B1000AF3D3A /* AppBundle */ = { + isa = PBXNativeTarget; + buildConfigurationList = D01748DC23197B1000AF3D3A /* Build configuration list for PBXNativeTarget "AppBundle" */; + buildPhases = ( + D01748CF23197B1000AF3D3A /* Headers */, + D01748D023197B1000AF3D3A /* Sources */, + D01748D123197B1000AF3D3A /* Frameworks */, + D01748D223197B1000AF3D3A /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = AppBundle; + productName = AppBundle; + productReference = D01748D423197B1000AF3D3A /* AppBundle.framework */; + productType = "com.apple.product-type.framework"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + D01748CB23197B1000AF3D3A /* Project object */ = { + isa = PBXProject; + attributes = { + DefaultBuildSystemTypeForWorkspace = Latest; + LastUpgradeCheck = 1030; + ORGANIZATIONNAME = "Telegram Messenger LLP"; + TargetAttributes = { + D01748D323197B1000AF3D3A = { + CreatedOnToolsVersion = 10.3; + }; + }; + }; + buildConfigurationList = D01748CE23197B1000AF3D3A /* Build configuration list for PBXProject "AppBundle_Xcode" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = D01748CA23197B1000AF3D3A; + productRefGroup = D01748D523197B1000AF3D3A /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + D01748D323197B1000AF3D3A /* AppBundle */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + D01748D223197B1000AF3D3A /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + D01748D023197B1000AF3D3A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + D01748E723197B6500AF3D3A /* AppBundle.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + D01748DA23197B1000AF3D3A /* DebugAppStoreLLC */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = DebugAppStoreLLC; + }; + D01748DB23197B1000AF3D3A /* ReleaseAppStoreLLC */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = ReleaseAppStoreLLC; + }; + D01748DD23197B1000AF3D3A /* DebugAppStoreLLC */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Manual; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACH_O_TYPE = staticlib; + PRODUCT_BUNDLE_IDENTIFIER = org.telegram.AppBundle; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = DebugAppStoreLLC; + }; + D01748DE23197B1000AF3D3A /* ReleaseAppStoreLLC */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Manual; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACH_O_TYPE = staticlib; + PRODUCT_BUNDLE_IDENTIFIER = org.telegram.AppBundle; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = ReleaseAppStoreLLC; + }; + D01748DF23197B3200AF3D3A /* DebugHockeyapp */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = DebugHockeyapp; + }; + D01748E023197B3200AF3D3A /* DebugHockeyapp */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Manual; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACH_O_TYPE = staticlib; + PRODUCT_BUNDLE_IDENTIFIER = org.telegram.AppBundle; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = DebugHockeyapp; + }; + D01748E123197B3B00AF3D3A /* ReleaseHockeyappInternal */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = ReleaseHockeyappInternal; + }; + D01748E223197B3B00AF3D3A /* ReleaseHockeyappInternal */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Manual; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = ""; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACH_O_TYPE = staticlib; + PRODUCT_BUNDLE_IDENTIFIER = org.telegram.AppBundle; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = ReleaseHockeyappInternal; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + D01748CE23197B1000AF3D3A /* Build configuration list for PBXProject "AppBundle_Xcode" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D01748DA23197B1000AF3D3A /* DebugAppStoreLLC */, + D01748DF23197B3200AF3D3A /* DebugHockeyapp */, + D01748DB23197B1000AF3D3A /* ReleaseAppStoreLLC */, + D01748E123197B3B00AF3D3A /* ReleaseHockeyappInternal */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = ReleaseAppStoreLLC; + }; + D01748DC23197B1000AF3D3A /* Build configuration list for PBXNativeTarget "AppBundle" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + D01748DD23197B1000AF3D3A /* DebugAppStoreLLC */, + D01748E023197B3200AF3D3A /* DebugHockeyapp */, + D01748DE23197B1000AF3D3A /* ReleaseAppStoreLLC */, + D01748E223197B3B00AF3D3A /* ReleaseHockeyappInternal */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = ReleaseAppStoreLLC; + }; +/* End XCConfigurationList section */ + }; + rootObject = D01748CB23197B1000AF3D3A /* Project object */; +} diff --git a/submodules/AppBundle/BUCK b/submodules/AppBundle/BUCK new file mode 100644 index 0000000000..7c15ea5d15 --- /dev/null +++ b/submodules/AppBundle/BUCK @@ -0,0 +1,21 @@ +load("//Config:buck_rule_macros.bzl", "static_library") + +static_library( + name = "AppBundle", + srcs = glob([ + "Sources/**/*.swift", + "Sources/**/*.m", + ]), + headers = glob([ + "Sources/**/*.h", + ]), + exported_headers = glob([ + "Sources/**/*.h", + ]), + deps = [ + ], + frameworks = [ + "$SDKROOT/System/Library/Frameworks/Foundation.framework", + "$SDKROOT/System/Library/Frameworks/UIKit.framework", + ], +) diff --git a/submodules/AppBundle/Info.plist b/submodules/AppBundle/Info.plist new file mode 100644 index 0000000000..e1fe4cfb7b --- /dev/null +++ b/submodules/AppBundle/Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + + diff --git a/submodules/AppBundle/Sources/AppBundle.h b/submodules/AppBundle/Sources/AppBundle.h new file mode 100644 index 0000000000..b78e84bc8d --- /dev/null +++ b/submodules/AppBundle/Sources/AppBundle.h @@ -0,0 +1,16 @@ +#import +#import + +//! Project version number for AppBundle. +FOUNDATION_EXPORT double AppBundleVersionNumber; + +//! Project version string for AppBundle. +FOUNDATION_EXPORT const unsigned char AppBundleVersionString[]; + +NSBundle * _Nonnull getAppBundle(void); + +@interface UIImage (AppBundle) + +- (instancetype _Nullable)initWithBundleImageName:(NSString * _Nonnull)bundleImageName; + +@end diff --git a/submodules/AppBundle/Sources/AppBundle.m b/submodules/AppBundle/Sources/AppBundle.m new file mode 100644 index 0000000000..69026173b2 --- /dev/null +++ b/submodules/AppBundle/Sources/AppBundle.m @@ -0,0 +1,19 @@ +#import "AppBundle.h" + +NSBundle * _Nonnull getAppBundle() { + NSBundle *bundle = [NSBundle mainBundle]; + if ([[bundle.bundleURL pathExtension] isEqualToString:@"appex"]) { + bundle = [NSBundle bundleWithURL:[[bundle.bundleURL URLByDeletingLastPathComponent] URLByDeletingLastPathComponent]]; + } else if ([[bundle.bundleURL pathExtension] isEqualToString:@"Frameworks"]) { + bundle = [NSBundle bundleWithURL:[bundle.bundleURL URLByDeletingLastPathComponent]]; + } + return bundle; +} + +@implementation UIImage (AppBundle) + +- (instancetype _Nullable)initWithBundleImageName:(NSString * _Nonnull)bundleImageName { + return [UIImage imageNamed:bundleImageName inBundle:getAppBundle() compatibleWithTraitCollection:nil]; +} + +@end diff --git a/submodules/AvatarNode/AvatarNode.xcodeproj/project.pbxproj b/submodules/AvatarNode/AvatarNode.xcodeproj/project.pbxproj index 8ee044ccec..7a4345f8d2 100644 --- a/submodules/AvatarNode/AvatarNode.xcodeproj/project.pbxproj +++ b/submodules/AvatarNode/AvatarNode.xcodeproj/project.pbxproj @@ -35,17 +35,6 @@ sourceTree SOURCE_ROOT - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E29D83ECBE000000000 isa @@ -68,7 +57,6 @@ children 1DD70E29119E958000000000 - 1DD70E291289FAA500000000 1DD70E29D83ECBE000000000 @@ -368,13 +356,6 @@ fileRef 1DD70E29119E958000000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F04D83ECBE000000000 isa @@ -389,7 +370,6 @@ files E7A30F04119E958000000000 - E7A30F041289FAA500000000 E7A30F04D83ECBE000000000 diff --git a/submodules/AvatarNode/AvatarNode_Xcode.xcodeproj/project.pbxproj b/submodules/AvatarNode/AvatarNode_Xcode.xcodeproj/project.pbxproj index ecbd956d77..1e6ac43597 100644 --- a/submodules/AvatarNode/AvatarNode_Xcode.xcodeproj/project.pbxproj +++ b/submodules/AvatarNode/AvatarNode_Xcode.xcodeproj/project.pbxproj @@ -16,7 +16,7 @@ D0879B0D22F7088F00C4D6B3 /* Display.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0879B0C22F7088F00C4D6B3 /* Display.framework */; }; D0879B0F22F7089400C4D6B3 /* TelegramPresentationData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0879B0E22F7089400C4D6B3 /* TelegramPresentationData.framework */; }; D0879B1522F70BAF00C4D6B3 /* PeerAvatar.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0879B1422F70BAF00C4D6B3 /* PeerAvatar.swift */; }; - D0879B1722F70BFB00C4D6B3 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0879B1622F70BFB00C4D6B3 /* FrameworkBundle.swift */; }; + D0EFF2582319812900CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF2572319812900CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -31,7 +31,7 @@ D0879B0C22F7088F00C4D6B3 /* Display.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Display.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0879B0E22F7089400C4D6B3 /* TelegramPresentationData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramPresentationData.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0879B1422F70BAF00C4D6B3 /* PeerAvatar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PeerAvatar.swift; sourceTree = ""; }; - D0879B1622F70BFB00C4D6B3 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; + D0EFF2572319812900CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -39,6 +39,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF2582319812900CF5164 /* AppBundle.framework in Frameworks */, D0879B0F22F7089400C4D6B3 /* TelegramPresentationData.framework in Frameworks */, D0879B0D22F7088F00C4D6B3 /* Display.framework in Frameworks */, D0879B0B22F7088B00C4D6B3 /* AsyncDisplayKit.framework in Frameworks */, @@ -74,7 +75,6 @@ children = ( D0879B1422F70BAF00C4D6B3 /* PeerAvatar.swift */, D0879B0122F7087800C4D6B3 /* AvatarNode.swift */, - D0879B1622F70BFB00C4D6B3 /* FrameworkBundle.swift */, D0879AF522F7079F00C4D6B3 /* AvatarNode.h */, ); path = Sources; @@ -83,6 +83,7 @@ D0879B0322F7087F00C4D6B3 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF2572319812900CF5164 /* AppBundle.framework */, D0879B0E22F7089400C4D6B3 /* TelegramPresentationData.framework */, D0879B0C22F7088F00C4D6B3 /* Display.framework */, D0879B0A22F7088B00C4D6B3 /* AsyncDisplayKit.framework */, @@ -175,7 +176,6 @@ files = ( D0879B1522F70BAF00C4D6B3 /* PeerAvatar.swift in Sources */, D0879B0222F7087800C4D6B3 /* AvatarNode.swift in Sources */, - D0879B1722F70BFB00C4D6B3 /* FrameworkBundle.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/submodules/AvatarNode/BUCK b/submodules/AvatarNode/BUCK index 66d6862bdc..93c3fb0d60 100644 --- a/submodules/AvatarNode/BUCK +++ b/submodules/AvatarNode/BUCK @@ -11,6 +11,7 @@ static_library( "//submodules/TelegramCore:TelegramCore#shared", "//submodules/TelegramPresentationData:TelegramPresentationData", "//submodules/AnimationUI:AnimationUI", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/AvatarNode/Sources/AvatarNode.swift b/submodules/AvatarNode/Sources/AvatarNode.swift index 91c25c2819..d94d57f7c5 100644 --- a/submodules/AvatarNode/Sources/AvatarNode.swift +++ b/submodules/AvatarNode/Sources/AvatarNode.swift @@ -7,6 +7,7 @@ import TelegramCore import SwiftSignalKit import TelegramPresentationData import AnimationUI +import AppBundle private let deletedIcon = UIImage(bundleImageName: "Avatar/DeletedIcon")?.precomposed() private let savedMessagesIcon = generateTintedImage(image: UIImage(bundleImageName: "Avatar/SavedMessagesIcon"), color: .white) diff --git a/submodules/AvatarNode/Sources/FrameworkBundle.swift b/submodules/AvatarNode/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/AvatarNode/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/BotPaymentsUI/BUCK b/submodules/BotPaymentsUI/BUCK index 69089759d8..a29631df06 100644 --- a/submodules/BotPaymentsUI/BUCK +++ b/submodules/BotPaymentsUI/BUCK @@ -18,6 +18,7 @@ static_library( "//submodules/TelegramNotices:TelegramNotices", "//submodules/Stripe:Stripe", "//submodules/CountrySelectionUI:CountrySelectionUI", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/BotPaymentsUI/BotPaymentsUI.xcodeproj/project.pbxproj b/submodules/BotPaymentsUI/BotPaymentsUI.xcodeproj/project.pbxproj index 4c1ce1fa6b..3170cf34bc 100644 --- a/submodules/BotPaymentsUI/BotPaymentsUI.xcodeproj/project.pbxproj +++ b/submodules/BotPaymentsUI/BotPaymentsUI.xcodeproj/project.pbxproj @@ -299,17 +299,6 @@ sourceTree SOURCE_ROOT - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - B401C979EAB5339800000000 isa @@ -345,7 +334,6 @@ 1DD70E29CC5195E600000000 1DD70E29938515F200000000 1DD70E29CDAC281400000000 - 1DD70E291289FAA500000000 B401C97922643F8800000000 @@ -1176,13 +1164,6 @@ fileRef 1DD70E29CDAC281400000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - 1870857F0000000000000000 isa @@ -1214,7 +1195,6 @@ E7A30F04CC5195E600000000 E7A30F04938515F200000000 E7A30F04CDAC281400000000 - E7A30F041289FAA500000000 E7A30F04D65BA68200000000 diff --git a/submodules/BotPaymentsUI/BotPaymentsUI_Xcode.xcodeproj/project.pbxproj b/submodules/BotPaymentsUI/BotPaymentsUI_Xcode.xcodeproj/project.pbxproj index 84108cc736..7f0005e3a4 100644 --- a/submodules/BotPaymentsUI/BotPaymentsUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/BotPaymentsUI/BotPaymentsUI_Xcode.xcodeproj/project.pbxproj @@ -40,12 +40,12 @@ D0C9C7B52301FFE500FAB518 /* TelegramCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C7B42301FFE500FAB518 /* TelegramCore.framework */; }; D0C9C7B72301FFE900FAB518 /* SwiftSignalKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C7B62301FFE900FAB518 /* SwiftSignalKit.framework */; }; D0C9C7B92301FFEF00FAB518 /* TelegramPresentationData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C7B82301FFEF00FAB518 /* TelegramPresentationData.framework */; }; - D0C9C7BF2302023D00FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C7BE2302023D00FAB518 /* FrameworkBundle.swift */; }; D0C9C7E32302035800FAB518 /* LocalAuth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C7E22302035800FAB518 /* LocalAuth.framework */; }; D0C9C7E72302041100FAB518 /* AccountContext.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C7E62302041100FAB518 /* AccountContext.framework */; }; D0C9C7E9230205A500FAB518 /* ItemListUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C7E8230205A500FAB518 /* ItemListUI.framework */; }; D0C9C7EB230205D700FAB518 /* PasswordSetupUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C7EA230205D700FAB518 /* PasswordSetupUI.framework */; }; D0C9C7EF2302061E00FAB518 /* PhotoResources.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C7EE2302061E00FAB518 /* PhotoResources.framework */; }; + D0EFF27A2319832400CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF2792319832400CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -84,12 +84,12 @@ D0C9C7B42301FFE500FAB518 /* TelegramCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C7B62301FFE900FAB518 /* SwiftSignalKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SwiftSignalKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C7B82301FFEF00FAB518 /* TelegramPresentationData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramPresentationData.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D0C9C7BE2302023D00FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D0C9C7E22302035800FAB518 /* LocalAuth.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LocalAuth.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C7E62302041100FAB518 /* AccountContext.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AccountContext.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C7E8230205A500FAB518 /* ItemListUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ItemListUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C7EA230205D700FAB518 /* PasswordSetupUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PasswordSetupUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C7EE2302061E00FAB518 /* PhotoResources.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PhotoResources.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D0EFF2792319832400CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -97,6 +97,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF27A2319832400CF5164 /* AppBundle.framework in Frameworks */, D0C9C7EF2302061E00FAB518 /* PhotoResources.framework in Frameworks */, D0C9C7EB230205D700FAB518 /* PasswordSetupUI.framework in Frameworks */, D0C9C7E9230205A500FAB518 /* ItemListUI.framework in Frameworks */, @@ -161,7 +162,6 @@ D0C9C77D2301FFCA00FAB518 /* BotPaymentTextItemNode.swift */, D0C9C7812301FFCA00FAB518 /* BotReceiptController.swift */, D0C9C7862301FFCB00FAB518 /* BotReceiptControllerNode.swift */, - D0C9C7BE2302023D00FAB518 /* FrameworkBundle.swift */, D0C9C6CB2301FC9300FAB518 /* BotPaymentsUI.h */, ); path = Sources; @@ -170,6 +170,7 @@ D0C9C7AB2301FFD300FAB518 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF2792319832400CF5164 /* AppBundle.framework */, D0C9C7EE2302061E00FAB518 /* PhotoResources.framework */, D0C9C7EA230205D700FAB518 /* PasswordSetupUI.framework */, D0C9C7E8230205A500FAB518 /* ItemListUI.framework */, @@ -286,7 +287,6 @@ D0C9C7A12301FFD000FAB518 /* BotCheckoutWebInteractionControllerNode.swift in Sources */, D0C9C7922301FFD000FAB518 /* BotCheckoutPasswordEntryController.swift in Sources */, D0C9C7932301FFD000FAB518 /* BotPaymentActionItemNode.swift in Sources */, - D0C9C7BF2302023D00FAB518 /* FrameworkBundle.swift in Sources */, D0C9C7A72301FFD000FAB518 /* BotCheckoutNativeCardEntryControllerNode.swift in Sources */, D0C9C7A52301FFD000FAB518 /* BotPaymentFieldItemNode.swift in Sources */, D0C9C79C2301FFD000FAB518 /* BotCheckoutWebInteractionController.swift in Sources */, diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutPaymentMethodSheet.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutPaymentMethodSheet.swift index 630da03eb4..bf43dd2e23 100644 --- a/submodules/BotPaymentsUI/Sources/BotCheckoutPaymentMethodSheet.swift +++ b/submodules/BotPaymentsUI/Sources/BotCheckoutPaymentMethodSheet.swift @@ -5,6 +5,7 @@ import AsyncDisplayKit import SwiftSignalKit import TelegramCore import AccountContext +import AppBundle struct BotCheckoutPaymentWebToken: Equatable { let title: String diff --git a/submodules/BotPaymentsUI/Sources/FrameworkBundle.swift b/submodules/BotPaymentsUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/BotPaymentsUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/BuildConfig/BUCK b/submodules/BuildConfig/BUCK index cdf9a1bed4..1acc7024d4 100644 --- a/submodules/BuildConfig/BUCK +++ b/submodules/BuildConfig/BUCK @@ -1,5 +1,5 @@ load("//Config:buck_rule_macros.bzl", "static_library") -load("//Config:app_configuration.bzl", "AppConfig") +load("//Config:app_configuration.bzl", "appConfig") static_library( name = "BuildConfig", @@ -7,14 +7,13 @@ static_library( "Sources/*.m", ]), compiler_flags = [ - '-DAPP_CONFIG_API_ID=' + AppConfig["apiId"], - '-DAPP_CONFIG_API_HASH="' + AppConfig["apiHash"] + '"', - '-DAPP_CONFIG_HOCKEYAPP_ID="' + AppConfig["hockeyAppId"] + '"', - '-DAPP_CONFIG_IS_INTERNAL_BUILD=' + AppConfig["isInternalBuild"], - '-DAPP_CONFIG_IS_APPSTORE_BUILD=' + AppConfig["isAppStoreBuild"], - '-DAPP_CONFIG_APPSTORE_ID=' + AppConfig["appstoreId"], - '-DAPP_SPECIFIC_URL_SCHEME="' + AppConfig["appSpecificUrlScheme"] + '"', - + '-DAPP_CONFIG_API_ID=' + appConfig()["apiId"], + '-DAPP_CONFIG_API_HASH="' + appConfig()["apiHash"] + '"', + '-DAPP_CONFIG_HOCKEYAPP_ID="' + appConfig()["hockeyAppId"] + '"', + '-DAPP_CONFIG_IS_INTERNAL_BUILD=' + appConfig()["isInternalBuild"], + '-DAPP_CONFIG_IS_APPSTORE_BUILD=' + appConfig()["isAppStoreBuild"], + '-DAPP_CONFIG_APPSTORE_ID=' + appConfig()["appStoreId"], + '-DAPP_SPECIFIC_URL_SCHEME="' + appConfig()["appSpecificUrlScheme"] + '"', ], headers = glob([ "Sources/*.h", diff --git a/submodules/CallListUI/CallListUI.xcodeproj/project.pbxproj b/submodules/CallListUI/CallListUI.xcodeproj/project.pbxproj index d8d2d640a6..796faba925 100644 --- a/submodules/CallListUI/CallListUI.xcodeproj/project.pbxproj +++ b/submodules/CallListUI/CallListUI.xcodeproj/project.pbxproj @@ -101,17 +101,6 @@ sourceTree SOURCE_ROOT - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - B401C979EAB5339800000000 isa @@ -129,7 +118,6 @@ 1DD70E29AB92F37700000000 1DD70E2970B6869800000000 1DD70E291FE77B5B00000000 - 1DD70E291289FAA500000000 B401C979C8F48FD000000000 @@ -750,13 +738,6 @@ fileRef 1DD70E291FE77B5B00000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - 1870857F0000000000000000 isa @@ -770,7 +751,6 @@ E7A30F04AB92F37700000000 E7A30F0470B6869800000000 E7A30F041FE77B5B00000000 - E7A30F041289FAA500000000 E7A30F04D65BA68200000000 diff --git a/submodules/CallListUI/CallListUI_Xcode.xcodeproj/project.pbxproj b/submodules/CallListUI/CallListUI_Xcode.xcodeproj/project.pbxproj index d8988982ba..bd3fd10a95 100644 --- a/submodules/CallListUI/CallListUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/CallListUI/CallListUI_Xcode.xcodeproj/project.pbxproj @@ -30,7 +30,6 @@ D0C9CA7C23022DCC00FAB518 /* TelegramUIPreferences.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9CA7B23022DCC00FAB518 /* TelegramUIPreferences.framework */; }; D0C9CA7E23022DD900FAB518 /* TelegramNotices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9CA7D23022DD900FAB518 /* TelegramNotices.framework */; }; D0C9CA8023022E1F00FAB518 /* MergeLists.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9CA7F23022E1F00FAB518 /* MergeLists.framework */; }; - D0C9CA8423022E6600FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9CA8323022E6600FAB518 /* FrameworkBundle.swift */; }; D0C9CA8623022FCD00FAB518 /* CallListHoleItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9CA8523022FCD00FAB518 /* CallListHoleItem.swift */; }; /* End PBXBuildFile section */ @@ -60,7 +59,6 @@ D0C9CA7B23022DCC00FAB518 /* TelegramUIPreferences.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramUIPreferences.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9CA7D23022DD900FAB518 /* TelegramNotices.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramNotices.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9CA7F23022E1F00FAB518 /* MergeLists.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MergeLists.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D0C9CA8323022E6600FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D0C9CA8523022FCD00FAB518 /* CallListHoleItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallListHoleItem.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -119,7 +117,6 @@ D0C9CA5523022D5E00FAB518 /* CallListNodeEntries.swift */, D0C9CA5623022D5E00FAB518 /* CallListNodeLocation.swift */, D0C9CA5723022D5E00FAB518 /* CallListViewTransition.swift */, - D0C9CA8323022E6600FAB518 /* FrameworkBundle.swift */, D0C9CA4823022CEB00FAB518 /* CallListUI.h */, ); path = Sources; @@ -234,7 +231,6 @@ D0C9CA5B23022D5F00FAB518 /* CallListNodeEntries.swift in Sources */, D0C9CA5F23022D5F00FAB518 /* CallListController.swift in Sources */, D0C9CA5E23022D5F00FAB518 /* CallListControllerNode.swift in Sources */, - D0C9CA8423022E6600FAB518 /* FrameworkBundle.swift in Sources */, D0C9CA5A23022D5F00FAB518 /* CallListCallItem.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/submodules/CallListUI/Sources/CallListController.swift b/submodules/CallListUI/Sources/CallListController.swift index fa6e82e03e..17ac428fbb 100644 --- a/submodules/CallListUI/Sources/CallListController.swift +++ b/submodules/CallListUI/Sources/CallListController.swift @@ -9,6 +9,7 @@ import TelegramPresentationData import ItemListUI import AccountContext import AlertUI +import AppBundle public enum CallListControllerMode { case tab diff --git a/submodules/CallListUI/Sources/FrameworkBundle.swift b/submodules/CallListUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/CallListUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/ChatListUI/BUCK b/submodules/ChatListUI/BUCK index fe20d2e97f..4543d32fe2 100644 --- a/submodules/ChatListUI/BUCK +++ b/submodules/ChatListUI/BUCK @@ -36,6 +36,7 @@ static_library( "//submodules/ContactsPeerItem:ContactsPeerItem", "//submodules/ContactListUI:ContactListUI", "//submodules/PhotoResources:PhotoResources", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/ChatListUI/ChatListUI.xcodeproj/project.pbxproj b/submodules/ChatListUI/ChatListUI.xcodeproj/project.pbxproj index 70b8bb15cb..1390f46a28 100644 --- a/submodules/ChatListUI/ChatListUI.xcodeproj/project.pbxproj +++ b/submodules/ChatListUI/ChatListUI.xcodeproj/project.pbxproj @@ -281,17 +281,6 @@ sourceTree SOURCE_ROOT - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - B401C979EAB5339800000000 isa @@ -312,7 +301,6 @@ 1DD70E299588C17700000000 1DD70E294EC20C1300000000 1DD70E29E691DAEC00000000 - 1DD70E291289FAA500000000 B401C9790758854A00000000 @@ -1465,13 +1453,6 @@ fileRef 1DD70E29E691DAEC00000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - 1870857F0000000000000000 isa @@ -1499,7 +1480,6 @@ E7A30F049588C17700000000 E7A30F044EC20C1300000000 E7A30F04E691DAEC00000000 - E7A30F041289FAA500000000 E7A30F04D65BA68200000000 diff --git a/submodules/ChatListUI/ChatListUI_Xcode.xcodeproj/project.pbxproj b/submodules/ChatListUI/ChatListUI_Xcode.xcodeproj/project.pbxproj index 7c5da4b686..c1fd596638 100644 --- a/submodules/ChatListUI/ChatListUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/ChatListUI/ChatListUI_Xcode.xcodeproj/project.pbxproj @@ -55,12 +55,12 @@ D0C9CB012302373000FAB518 /* PeerOnlineMarkerNode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9CB002302373000FAB518 /* PeerOnlineMarkerNode.framework */; }; D0C9CB032302373000FAB518 /* PeerPresenceStatusManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9CB022302373000FAB518 /* PeerPresenceStatusManager.framework */; }; D0C9CB052302373000FAB518 /* TemporaryCachedPeerDataManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9CB042302373000FAB518 /* TemporaryCachedPeerDataManager.framework */; }; - D0C9CB07230237D000FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9CB06230237D000FAB518 /* FrameworkBundle.swift */; }; D0C9CB442302B15D00FAB518 /* ChatTitleActivityNode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9CB432302B15D00FAB518 /* ChatTitleActivityNode.framework */; }; D0C9CB802302B37B00FAB518 /* DeleteChatPeerActionSheetItem.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9CB7F2302B37B00FAB518 /* DeleteChatPeerActionSheetItem.framework */; }; D0C9CBB42302B64C00FAB518 /* LanguageSuggestionUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9CBB32302B64C00FAB518 /* LanguageSuggestionUI.framework */; }; D0C9CBE62303387E00FAB518 /* ContactsPeerItem.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9CBE52303387E00FAB518 /* ContactsPeerItem.framework */; }; D0C9CBE82303407100FAB518 /* ContactListUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9CBE72303407100FAB518 /* ContactListUI.framework */; }; + D0EFF272231982C700CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF271231982C700CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -114,12 +114,12 @@ D0C9CB002302373000FAB518 /* PeerOnlineMarkerNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PeerOnlineMarkerNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9CB022302373000FAB518 /* PeerPresenceStatusManager.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PeerPresenceStatusManager.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9CB042302373000FAB518 /* TemporaryCachedPeerDataManager.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TemporaryCachedPeerDataManager.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D0C9CB06230237D000FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D0C9CB432302B15D00FAB518 /* ChatTitleActivityNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ChatTitleActivityNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9CB7F2302B37B00FAB518 /* DeleteChatPeerActionSheetItem.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = DeleteChatPeerActionSheetItem.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9CBB32302B64C00FAB518 /* LanguageSuggestionUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LanguageSuggestionUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9CBE52303387E00FAB518 /* ContactsPeerItem.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ContactsPeerItem.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9CBE72303407100FAB518 /* ContactListUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ContactListUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D0EFF271231982C700CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -127,6 +127,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF272231982C700CF5164 /* AppBundle.framework in Frameworks */, D0C9CBE82303407100FAB518 /* ContactListUI.framework in Frameworks */, D0C9CBE62303387E00FAB518 /* ContactsPeerItem.framework in Frameworks */, D0C9CBB42302B64C00FAB518 /* LanguageSuggestionUI.framework in Frameworks */, @@ -195,7 +196,6 @@ D0C9CAA9230235E400FAB518 /* ChatListTitleLockView.swift */, D0C9CAA7230235E300FAB518 /* ChatListTitleProxyNode.swift */, D0C9CAA8230235E400FAB518 /* ChatListTitleView.swift */, - D0C9CB06230237D000FAB518 /* FrameworkBundle.swift */, D0C9CA98230234D400FAB518 /* ChatListUI.h */, ); path = Sources; @@ -204,6 +204,7 @@ D0C9CAB62302360600FAB518 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF271231982C700CF5164 /* AppBundle.framework */, D0C9CBE72303407100FAB518 /* ContactListUI.framework */, D0C9CBE52303387E00FAB518 /* ContactsPeerItem.framework */, D0C9CBB32302B64C00FAB518 /* LanguageSuggestionUI.framework */, @@ -346,7 +347,6 @@ D0C9CAAD230235E500FAB518 /* ChatListSearchContainerNode.swift in Sources */, D0C9CAB1230235E500FAB518 /* ChatListTitleView.swift in Sources */, D0C9CAF4230236F700FAB518 /* ChatListViewTransition.swift in Sources */, - D0C9CB07230237D000FAB518 /* FrameworkBundle.swift in Sources */, D0C9CAF5230236F700FAB518 /* ChatListNodeEntries.swift in Sources */, D0C9CAF1230236F700FAB518 /* ChatListBadgeNode.swift in Sources */, D0C9CAB5230235E500FAB518 /* ChatListEmptyNode.swift in Sources */, diff --git a/submodules/ChatListUI/Sources/ChatListController.swift b/submodules/ChatListUI/Sources/ChatListController.swift index 4efb5d9f71..434d90d411 100644 --- a/submodules/ChatListUI/Sources/ChatListController.swift +++ b/submodules/ChatListUI/Sources/ChatListController.swift @@ -15,6 +15,7 @@ import TelegramNotices import SearchUI import DeleteChatPeerActionSheetItem import LanguageSuggestionUI +import AppBundle public func useSpecialTabBarIcons() -> Bool { return (Date(timeIntervalSince1970: 1545642000)...Date(timeIntervalSince1970: 1546387200)).contains(Date()) diff --git a/submodules/ChatListUI/Sources/ChatListTitleProxyNode.swift b/submodules/ChatListUI/Sources/ChatListTitleProxyNode.swift index 645e5dd761..617d4fea7b 100644 --- a/submodules/ChatListUI/Sources/ChatListTitleProxyNode.swift +++ b/submodules/ChatListUI/Sources/ChatListTitleProxyNode.swift @@ -4,6 +4,7 @@ import Display import AsyncDisplayKit import TelegramPresentationData import ActivityIndicator +import AppBundle enum ChatTitleProxyStatus { case connecting diff --git a/submodules/ChatListUI/Sources/FrameworkBundle.swift b/submodules/ChatListUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/ChatListUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/ChatListUI/Sources/Node/ChatListArchiveInfoItem.swift b/submodules/ChatListUI/Sources/Node/ChatListArchiveInfoItem.swift index b6c9defbd5..13e836f1d9 100644 --- a/submodules/ChatListUI/Sources/Node/ChatListArchiveInfoItem.swift +++ b/submodules/ChatListUI/Sources/Node/ChatListArchiveInfoItem.swift @@ -6,6 +6,7 @@ import Display import SwiftSignalKit import TelegramPresentationData import ListSectionHeaderNode +import AppBundle class ChatListArchiveInfoItem: ListViewItem { let theme: PresentationTheme diff --git a/submodules/ContactListUI/BUCK b/submodules/ContactListUI/BUCK index a95e22bb63..9b4477027d 100644 --- a/submodules/ContactListUI/BUCK +++ b/submodules/ContactListUI/BUCK @@ -24,6 +24,7 @@ static_library( "//submodules/TelegramNotices:TelegramNotices", "//submodules/AlertUI:AlertUI", "//submodules/ShareController:ShareController", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/ContactListUI/ContactListUI.xcodeproj/project.pbxproj b/submodules/ContactListUI/ContactListUI.xcodeproj/project.pbxproj index e7ed0f4a34..6e19e03e6b 100644 --- a/submodules/ContactListUI/ContactListUI.xcodeproj/project.pbxproj +++ b/submodules/ContactListUI/ContactListUI.xcodeproj/project.pbxproj @@ -168,17 +168,6 @@ sourceTree SOURCE_ROOT - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E2947849BFD00000000 isa @@ -229,7 +218,6 @@ 1DD70E29D5D22BD400000000 1DD70E2955D77CF600000000 1DD70E2912C86E8D00000000 - 1DD70E291289FAA500000000 1DD70E2947849BFD00000000 1DD70E29CB13B09F00000000 1DD70E29D3C9BBF800000000 @@ -1066,13 +1054,6 @@ fileRef 1DD70E2912C86E8D00000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F0447849BFD00000000 isa @@ -1107,7 +1088,6 @@ E7A30F04D5D22BD400000000 E7A30F0455D77CF600000000 E7A30F0412C86E8D00000000 - E7A30F041289FAA500000000 E7A30F0447849BFD00000000 E7A30F04CB13B09F00000000 E7A30F04D3C9BBF800000000 diff --git a/submodules/ContactListUI/ContactListUI_Xcode.xcodeproj/project.pbxproj b/submodules/ContactListUI/ContactListUI_Xcode.xcodeproj/project.pbxproj index 74c9237560..76109f32df 100644 --- a/submodules/ContactListUI/ContactListUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/ContactListUI/ContactListUI_Xcode.xcodeproj/project.pbxproj @@ -26,7 +26,6 @@ D0C9C831230207E600FAB518 /* ContactsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C82B230207E600FAB518 /* ContactsController.swift */; }; D0C9C832230207E600FAB518 /* ContactsControllerNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C82C230207E600FAB518 /* ContactsControllerNode.swift */; }; D0C9C833230207E600FAB518 /* InviteContactsControllerNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C82D230207E600FAB518 /* InviteContactsControllerNode.swift */; }; - D0C9C835230207EE00FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C834230207EE00FAB518 /* FrameworkBundle.swift */; }; D0C9C8392302088800FAB518 /* Display.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C8382302088800FAB518 /* Display.framework */; }; D0C9C83B2302088C00FAB518 /* AsyncDisplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C83A2302088C00FAB518 /* AsyncDisplayKit.framework */; }; D0C9C83D2302089300FAB518 /* MergeLists.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C83C2302089300FAB518 /* MergeLists.framework */; }; @@ -36,6 +35,7 @@ D0C9C91323020DBF00FAB518 /* ContactsPeerItem.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C91223020DBF00FAB518 /* ContactsPeerItem.framework */; }; D0C9C94F2302140500FAB518 /* ChatListSearchItemNode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C94E2302140500FAB518 /* ChatListSearchItemNode.framework */; }; D0C9C98D2302153C00FAB518 /* TelegramPermissionsUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C98C2302153C00FAB518 /* TelegramPermissionsUI.framework */; }; + D0EFF2782319830300CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF2772319830300CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -60,7 +60,6 @@ D0C9C82B230207E600FAB518 /* ContactsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactsController.swift; sourceTree = ""; }; D0C9C82C230207E600FAB518 /* ContactsControllerNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContactsControllerNode.swift; sourceTree = ""; }; D0C9C82D230207E600FAB518 /* InviteContactsControllerNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InviteContactsControllerNode.swift; sourceTree = ""; }; - D0C9C834230207EE00FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D0C9C8382302088800FAB518 /* Display.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Display.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C83A2302088C00FAB518 /* AsyncDisplayKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AsyncDisplayKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C83C2302089300FAB518 /* MergeLists.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MergeLists.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -70,6 +69,7 @@ D0C9C91223020DBF00FAB518 /* ContactsPeerItem.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ContactsPeerItem.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C94E2302140500FAB518 /* ChatListSearchItemNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ChatListSearchItemNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C98C2302153C00FAB518 /* TelegramPermissionsUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramPermissionsUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D0EFF2772319830300CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -77,6 +77,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF2782319830300CF5164 /* AppBundle.framework in Frameworks */, D0C9C98D2302153C00FAB518 /* TelegramPermissionsUI.framework in Frameworks */, D0C9C94F2302140500FAB518 /* ChatListSearchItemNode.framework in Frameworks */, D0C9C91323020DBF00FAB518 /* ContactsPeerItem.framework in Frameworks */, @@ -131,7 +132,6 @@ D0C9C80B2302077E00FAB518 /* ContactListActionItem.swift */, D0C9C80A2302077E00FAB518 /* ContactListNameIndexHeader.swift */, D0C9C80D2302077F00FAB518 /* ContactListNode.swift */, - D0C9C834230207EE00FAB518 /* FrameworkBundle.swift */, D0C9C7FD230206F600FAB518 /* ContactListUI.h */, ); path = Sources; @@ -140,6 +140,7 @@ D0C9C817230207B900FAB518 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF2772319830300CF5164 /* AppBundle.framework */, D0C9C98C2302153C00FAB518 /* TelegramPermissionsUI.framework */, D0C9C94E2302140500FAB518 /* ChatListSearchItemNode.framework */, D0C9C91223020DBF00FAB518 /* ContactsPeerItem.framework */, @@ -248,7 +249,6 @@ D0C9C8132302077F00FAB518 /* ContactListNode.swift in Sources */, D0C9C8102302077F00FAB518 /* ContactListNameIndexHeader.swift in Sources */, D0C9C82F230207E600FAB518 /* InviteContactsController.swift in Sources */, - D0C9C835230207EE00FAB518 /* FrameworkBundle.swift in Sources */, D0C9C8112302077F00FAB518 /* ContactListActionItem.swift in Sources */, D0C9C831230207E600FAB518 /* ContactsController.swift in Sources */, D0C9C8122302077F00FAB518 /* ContactAddItem.swift in Sources */, diff --git a/submodules/ContactListUI/Sources/ContactAddItem.swift b/submodules/ContactListUI/Sources/ContactAddItem.swift index db676a4fe8..57259e3343 100644 --- a/submodules/ContactListUI/Sources/ContactAddItem.swift +++ b/submodules/ContactListUI/Sources/ContactAddItem.swift @@ -6,6 +6,7 @@ import Display import SwiftSignalKit import TelegramCore import TelegramPresentationData +import AppBundle private let titleFont = Font.regular(17.0) diff --git a/submodules/ContactListUI/Sources/ContactListNode.swift b/submodules/ContactListUI/Sources/ContactListNode.swift index 0cd7dbcb7f..59d795a9b1 100644 --- a/submodules/ContactListUI/Sources/ContactListNode.swift +++ b/submodules/ContactListUI/Sources/ContactListNode.swift @@ -19,6 +19,7 @@ import ChatListSearchItemNode import ChatListSearchItemHeader import SearchUI import TelegramPermissionsUI +import AppBundle private let dropDownIcon = { () -> UIImage in UIGraphicsBeginImageContextWithOptions(CGSize(width: 12.0, height: 12.0), false, 0.0) diff --git a/submodules/ContactListUI/Sources/ContactsController.swift b/submodules/ContactListUI/Sources/ContactsController.swift index 0d20dfbf71..138c67ec4b 100644 --- a/submodules/ContactListUI/Sources/ContactsController.swift +++ b/submodules/ContactListUI/Sources/ContactsController.swift @@ -15,6 +15,7 @@ import TelegramNotices import ContactsPeerItem import SearchUI import TelegramPermissionsUI +import AppBundle private func fixListNodeScrolling(_ listNode: ListView, searchNode: NavigationBarSearchContentNode) -> Bool { if searchNode.expansionProgress > 0.0 && searchNode.expansionProgress < 1.0 { diff --git a/submodules/ContactListUI/Sources/ContactsControllerNode.swift b/submodules/ContactListUI/Sources/ContactsControllerNode.swift index e2b8618087..8bfd38edcd 100644 --- a/submodules/ContactListUI/Sources/ContactsControllerNode.swift +++ b/submodules/ContactListUI/Sources/ContactsControllerNode.swift @@ -11,6 +11,7 @@ import DeviceAccess import AccountContext import SearchBarNode import SearchUI +import AppBundle private final class ContactsControllerNodeView: UITracingLayerView, PreviewingHostView { var previewingDelegate: PreviewingHostViewDelegate? { diff --git a/submodules/ContactListUI/Sources/FrameworkBundle.swift b/submodules/ContactListUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/ContactListUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/ContactListUI/Sources/InviteContactsControllerNode.swift b/submodules/ContactListUI/Sources/InviteContactsControllerNode.swift index e5a3fba84e..bd61b4e668 100644 --- a/submodules/ContactListUI/Sources/InviteContactsControllerNode.swift +++ b/submodules/ContactListUI/Sources/InviteContactsControllerNode.swift @@ -14,6 +14,7 @@ import SearchBarNode import SearchUI import ContactsPeerItem import ChatListSearchItemHeader +import AppBundle private enum InviteContactsEntryId: Hashable { case option(index: Int) diff --git a/submodules/ContextUI/ContextUI.xcodeproj/project.pbxproj b/submodules/ContextUI/ContextUI.xcodeproj/project.pbxproj index 7471eac946..6124b875c6 100644 --- a/submodules/ContextUI/ContextUI.xcodeproj/project.pbxproj +++ b/submodules/ContextUI/ContextUI.xcodeproj/project.pbxproj @@ -177,6 +177,19 @@ B401C979EAB5339800000000 + 1DD70E292420028600000000 + + isa + PBXFileReference + name + libAnimationUI.a + path + libAnimationUI.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + 1DD70E29FF334B1F00000000 isa @@ -190,6 +203,19 @@ explicitFileType compiled.mach-o.dylib + 1DD70E29D6F14E1000000000 + + isa + PBXFileReference + name + libImageBlur.a + path + libImageBlur.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + 1DD70E2936DE2CF900000000 isa @@ -216,6 +242,32 @@ explicitFileType compiled.mach-o.dylib + 1DD70E29AD66967300000000 + + isa + PBXFileReference + name + libReactionSelectionNode.a + path + libReactionSelectionNode.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E293594DCC000000000 + + isa + PBXFileReference + name + libStickerResources.a + path + libStickerResources.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + 1DD70E29D65BA68200000000 isa @@ -281,6 +333,19 @@ explicitFileType archive.ar + 1DD70E29CD296A8300000000 + + isa + PBXFileReference + name + libTuples.a + path + libTuples.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + B401C97968022A5500000000 isa @@ -291,14 +356,19 @@ ]]> children + 1DD70E292420028600000000 1DD70E29FF334B1F00000000 + 1DD70E29D6F14E1000000000 1DD70E2936DE2CF900000000 1DD70E29DB6520C800000000 + 1DD70E29AD66967300000000 + 1DD70E293594DCC000000000 1DD70E29D65BA68200000000 1DD70E29119CDA0700000000 1DD70E2984A59C1D00000000 1DD70E292395015100000000 1DD70E29F40A586F00000000 + 1DD70E29CD296A8300000000 1DD70E296C9831F100000000 @@ -426,6 +496,13 @@ fileRef 1DD70E2936DE2CF900000000 + E7A30F04D6F14E1000000000 + + isa + PBXBuildFile + fileRef + 1DD70E29D6F14E1000000000 + E7A30F042395015100000000 isa @@ -433,6 +510,27 @@ fileRef 1DD70E292395015100000000 + E7A30F04CD296A8300000000 + + isa + PBXBuildFile + fileRef + 1DD70E29CD296A8300000000 + + E7A30F043594DCC000000000 + + isa + PBXBuildFile + fileRef + 1DD70E293594DCC000000000 + + E7A30F042420028600000000 + + isa + PBXBuildFile + fileRef + 1DD70E292420028600000000 + E7A30F0484A59C1D00000000 isa @@ -440,6 +538,13 @@ fileRef 1DD70E2984A59C1D00000000 + E7A30F04AD66967300000000 + + isa + PBXBuildFile + fileRef + 1DD70E29AD66967300000000 + E7A30F04F40A586F00000000 isa @@ -458,8 +563,13 @@ E7A30F04D65BA68200000000 E7A30F04119CDA0700000000 E7A30F0436DE2CF900000000 + E7A30F04D6F14E1000000000 E7A30F042395015100000000 + E7A30F04CD296A8300000000 + E7A30F043594DCC000000000 + E7A30F042420028600000000 E7A30F0484A59C1D00000000 + E7A30F04AD66967300000000 E7A30F04F40A586F00000000 name diff --git a/submodules/CountrySelectionUI/BUCK b/submodules/CountrySelectionUI/BUCK index e6bfe1447c..d42c4ed704 100644 --- a/submodules/CountrySelectionUI/BUCK +++ b/submodules/CountrySelectionUI/BUCK @@ -12,6 +12,7 @@ static_library( "//submodules/TelegramPresentationData:TelegramPresentationData", "//submodules/TelegramStringFormatting:TelegramStringFormatting", "//submodules/SearchBarNode:SearchBarNode", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/CountrySelectionUI/CountrySelectionUI.xcodeproj/project.pbxproj b/submodules/CountrySelectionUI/CountrySelectionUI.xcodeproj/project.pbxproj index 71be39fccc..62d7106f07 100644 --- a/submodules/CountrySelectionUI/CountrySelectionUI.xcodeproj/project.pbxproj +++ b/submodules/CountrySelectionUI/CountrySelectionUI.xcodeproj/project.pbxproj @@ -124,17 +124,6 @@ sourceTree SOURCE_ROOT - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - B401C979EAB5339800000000 isa @@ -148,7 +137,6 @@ 1DD70E29B790435100000000 1DD70E2973938DF300000000 1DD70E29373FDCD900000000 - 1DD70E291289FAA500000000 B401C979C262DBCA00000000 @@ -422,13 +410,6 @@ fileRef 1DD70E29373FDCD900000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - 1870857F0000000000000000 isa @@ -438,7 +419,6 @@ E7A30F04B790435100000000 E7A30F0473938DF300000000 E7A30F04373FDCD900000000 - E7A30F041289FAA500000000 E7A30F04FF334B1F00000000 diff --git a/submodules/CountrySelectionUI/CountrySelectionUI_Xcode.xcodeproj/project.pbxproj b/submodules/CountrySelectionUI/CountrySelectionUI_Xcode.xcodeproj/project.pbxproj index 93a5689204..d52f585933 100644 --- a/submodules/CountrySelectionUI/CountrySelectionUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/CountrySelectionUI/CountrySelectionUI_Xcode.xcodeproj/project.pbxproj @@ -16,9 +16,9 @@ D0C9C2AB2300A1A500FAB518 /* AsyncDisplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C2AA2300A1A500FAB518 /* AsyncDisplayKit.framework */; }; D0C9C2AD2300A1AC00FAB518 /* TelegramPresentationData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C2AC2300A1AC00FAB518 /* TelegramPresentationData.framework */; }; D0C9C2AF2300A1B100FAB518 /* TelegramStringFormatting.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C2AE2300A1B100FAB518 /* TelegramStringFormatting.framework */; }; - D0C9C2B52300A1F300FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C2B42300A1F300FAB518 /* FrameworkBundle.swift */; }; D0C9C2D02300A2D400FAB518 /* SearchBarNode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C2CF2300A2D400FAB518 /* SearchBarNode.framework */; }; D0C9C4472300DE5100FAB518 /* CountryList.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C4462300DE5100FAB518 /* CountryList.swift */; }; + D0EFF2462319804800CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF2452319804800CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -33,9 +33,9 @@ D0C9C2AA2300A1A500FAB518 /* AsyncDisplayKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AsyncDisplayKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C2AC2300A1AC00FAB518 /* TelegramPresentationData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramPresentationData.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C2AE2300A1B100FAB518 /* TelegramStringFormatting.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramStringFormatting.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D0C9C2B42300A1F300FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D0C9C2CF2300A2D400FAB518 /* SearchBarNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SearchBarNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C4462300DE5100FAB518 /* CountryList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CountryList.swift; sourceTree = ""; }; + D0EFF2452319804800CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -43,6 +43,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF2462319804800CF5164 /* AppBundle.framework in Frameworks */, D0C9C2D02300A2D400FAB518 /* SearchBarNode.framework in Frameworks */, D0C9C2AF2300A1B100FAB518 /* TelegramStringFormatting.framework in Frameworks */, D0C9C2AD2300A1AC00FAB518 /* TelegramPresentationData.framework in Frameworks */, @@ -80,7 +81,6 @@ D0C9C4462300DE5100FAB518 /* CountryList.swift */, D0C9C29F2300A18B00FAB518 /* AuthorizationSequenceCountrySelectionController.swift */, D0C9C2A02300A18C00FAB518 /* AuthorizationSequenceCountrySelectionControllerNode.swift */, - D0C9C2B42300A1F300FAB518 /* FrameworkBundle.swift */, D0C9C2932300A11000FAB518 /* CountrySelectionUI.h */, ); path = Sources; @@ -89,6 +89,7 @@ D0C9C2A32300A19900FAB518 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF2452319804800CF5164 /* AppBundle.framework */, D0C9C2CF2300A2D400FAB518 /* SearchBarNode.framework */, D0C9C2AE2300A1B100FAB518 /* TelegramStringFormatting.framework */, D0C9C2AC2300A1AC00FAB518 /* TelegramPresentationData.framework */, @@ -183,7 +184,6 @@ D0C9C4472300DE5100FAB518 /* CountryList.swift in Sources */, D0C9C2A22300A18C00FAB518 /* AuthorizationSequenceCountrySelectionControllerNode.swift in Sources */, D0C9C2A12300A18C00FAB518 /* AuthorizationSequenceCountrySelectionController.swift in Sources */, - D0C9C2B52300A1F300FAB518 /* FrameworkBundle.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/submodules/CountrySelectionUI/Sources/AuthorizationSequenceCountrySelectionController.swift b/submodules/CountrySelectionUI/Sources/AuthorizationSequenceCountrySelectionController.swift index 977e8b9507..634d08f6c1 100644 --- a/submodules/CountrySelectionUI/Sources/AuthorizationSequenceCountrySelectionController.swift +++ b/submodules/CountrySelectionUI/Sources/AuthorizationSequenceCountrySelectionController.swift @@ -5,9 +5,10 @@ import AsyncDisplayKit import TelegramPresentationData import TelegramStringFormatting import SearchBarNode +import AppBundle private func loadCountryCodes() -> [(String, Int)] { - guard let filePath = frameworkBundle.path(forResource: "PhoneCountries", ofType: "txt") else { + guard let filePath = getAppBundle().path(forResource: "PhoneCountries", ofType: "txt") else { return [] } guard let stringData = try? Data(contentsOf: URL(fileURLWithPath: filePath)) else { diff --git a/submodules/CountrySelectionUI/Sources/AuthorizationSequenceCountrySelectionControllerNode.swift b/submodules/CountrySelectionUI/Sources/AuthorizationSequenceCountrySelectionControllerNode.swift index 4f005b50a3..02e1095c8d 100644 --- a/submodules/CountrySelectionUI/Sources/AuthorizationSequenceCountrySelectionControllerNode.swift +++ b/submodules/CountrySelectionUI/Sources/AuthorizationSequenceCountrySelectionControllerNode.swift @@ -5,9 +5,10 @@ import Display import TelegramCore import TelegramPresentationData import TelegramStringFormatting +import AppBundle private func loadCountryCodes() -> [(String, Int)] { - guard let filePath = frameworkBundle.path(forResource: "PhoneCountries", ofType: "txt") else { + guard let filePath = getAppBundle().path(forResource: "PhoneCountries", ofType: "txt") else { return [] } guard let stringData = try? Data(contentsOf: URL(fileURLWithPath: filePath)) else { diff --git a/submodules/CountrySelectionUI/Sources/FrameworkBundle.swift b/submodules/CountrySelectionUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/CountrySelectionUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/Display/BUCK b/submodules/Display/BUCK index fd888b797c..5a427b027d 100644 --- a/submodules/Display/BUCK +++ b/submodules/Display/BUCK @@ -15,6 +15,7 @@ framework( deps = [ "//submodules/AsyncDisplayKit:AsyncDisplayKit#dynamic", "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dynamic", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/Display/Display/NavigationBackButtonNode.swift b/submodules/Display/Display/NavigationBackButtonNode.swift index 5b82bbab24..2aa17d953e 100644 --- a/submodules/Display/Display/NavigationBackButtonNode.swift +++ b/submodules/Display/Display/NavigationBackButtonNode.swift @@ -1,5 +1,6 @@ import UIKit import AsyncDisplayKit +import AppBundle public class NavigationBackButtonNode: ASControlNode { private func fontForCurrentState() -> UIFont { @@ -60,7 +61,7 @@ public class NavigationBackButtonNode: ASControlNode { self.label.displaysAsynchronously = false self.addSubnode(self.arrow) - let arrowImage = UIImage(named: "NavigationBackArrowLight", in: Bundle(for: NavigationBackButtonNode.self), compatibleWith: nil)?.precomposed() + let arrowImage = UIImage(named: "NavigationBackArrowLight", in: getAppBundle(), compatibleWith: nil)?.precomposed() self.arrow.contents = arrowImage?.cgImage self.arrow.frame = CGRect(origin: CGPoint(), size: arrowImage?.size ?? CGSize()) diff --git a/submodules/Display/Display/NavigationTransitionCoordinator.swift b/submodules/Display/Display/NavigationTransitionCoordinator.swift index 6254c7defe..7ebe56c0fa 100644 --- a/submodules/Display/Display/NavigationTransitionCoordinator.swift +++ b/submodules/Display/Display/NavigationTransitionCoordinator.swift @@ -1,4 +1,5 @@ import UIKit +import AppBundle enum NavigationTransition { case Push @@ -8,7 +9,7 @@ enum NavigationTransition { private let shadowWidth: CGFloat = 16.0 private func generateShadow() -> UIImage? { - return UIImage(named: "NavigationShadow", in: Bundle(for: NavigationBackButtonNode.self), compatibleWith: nil)?.precomposed().resizableImage(withCapInsets: UIEdgeInsets(), resizingMode: .tile) + return UIImage(named: "NavigationShadow", in: getAppBundle(), compatibleWith: nil)?.precomposed().resizableImage(withCapInsets: UIEdgeInsets(), resizingMode: .tile) } private let shadowImage = generateShadow() diff --git a/submodules/Display/Display_Xcode.xcodeproj/project.pbxproj b/submodules/Display/Display_Xcode.xcodeproj/project.pbxproj index b4241bb3e0..3525be327c 100644 --- a/submodules/Display/Display_Xcode.xcodeproj/project.pbxproj +++ b/submodules/Display/Display_Xcode.xcodeproj/project.pbxproj @@ -55,7 +55,6 @@ D03AA4EB202E02B10056C405 /* ListViewReorderingGestureRecognizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03AA4EA202E02B10056C405 /* ListViewReorderingGestureRecognizer.swift */; }; D03AA5162030C5F80056C405 /* ListViewTempItemNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03AA5152030C5F80056C405 /* ListViewTempItemNode.swift */; }; D03B0E701D6331FB00955575 /* StatusBarHost.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03B0E6F1D6331FB00955575 /* StatusBarHost.swift */; }; - D03E7DE41C96A90100C07816 /* NavigationShadow@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D03E7DE31C96A90100C07816 /* NavigationShadow@2x.png */; }; D03E7DE61C96B96E00C07816 /* NavigationBarTransitionContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03E7DE51C96B96E00C07816 /* NavigationBarTransitionContainer.swift */; }; D03E7DF81C96C5F200C07816 /* NSWeakReference.h in Headers */ = {isa = PBXBuildFile; fileRef = D03E7DF61C96C5F200C07816 /* NSWeakReference.h */; settings = {ATTRIBUTES = (Public, ); }; }; D03E7DF91C96C5F200C07816 /* NSWeakReference.m in Sources */ = {isa = PBXBuildFile; fileRef = D03E7DF71C96C5F200C07816 /* NSWeakReference.m */; }; @@ -101,7 +100,6 @@ D05CC3201B695A9600E235A3 /* NavigationControllerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = D05CC3141B695A9600E235A3 /* NavigationControllerProxy.h */; settings = {ATTRIBUTES = (Public, ); }; }; D05CC3241B695B0700E235A3 /* NavigationBarProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = D05CC3221B695B0700E235A3 /* NavigationBarProxy.h */; settings = {ATTRIBUTES = (Public, ); }; }; D05CC3251B695B0700E235A3 /* NavigationBarProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = D05CC3231B695B0700E235A3 /* NavigationBarProxy.m */; }; - D05CC3271B69725400E235A3 /* NavigationBackArrowLight@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D05CC3261B69725400E235A3 /* NavigationBackArrowLight@2x.png */; }; D05CC3291B69750D00E235A3 /* InteractiveTransitionGestureRecognizer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D05CC3281B69750D00E235A3 /* InteractiveTransitionGestureRecognizer.swift */; }; D060185F22F35E7400796784 /* ShakeAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = D060185E22F35E7400796784 /* ShakeAnimation.swift */; }; D06B76DB20592A97006E9EEA /* LayoutSizes.swift in Sources */ = {isa = PBXBuildFile; fileRef = D06B76DA20592A97006E9EEA /* LayoutSizes.swift */; }; @@ -231,7 +229,6 @@ D03AA4EA202E02B10056C405 /* ListViewReorderingGestureRecognizer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListViewReorderingGestureRecognizer.swift; sourceTree = ""; }; D03AA5152030C5F80056C405 /* ListViewTempItemNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListViewTempItemNode.swift; sourceTree = ""; }; D03B0E6F1D6331FB00955575 /* StatusBarHost.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusBarHost.swift; sourceTree = ""; }; - D03E7DE31C96A90100C07816 /* NavigationShadow@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "NavigationShadow@2x.png"; sourceTree = ""; }; D03E7DE51C96B96E00C07816 /* NavigationBarTransitionContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationBarTransitionContainer.swift; sourceTree = ""; }; D03E7DF61C96C5F200C07816 /* NSWeakReference.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSWeakReference.h; sourceTree = ""; }; D03E7DF71C96C5F200C07816 /* NSWeakReference.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSWeakReference.m; sourceTree = ""; }; @@ -280,7 +277,6 @@ D05CC3141B695A9600E235A3 /* NavigationControllerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationControllerProxy.h; sourceTree = ""; }; D05CC3221B695B0700E235A3 /* NavigationBarProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationBarProxy.h; sourceTree = ""; }; D05CC3231B695B0700E235A3 /* NavigationBarProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NavigationBarProxy.m; sourceTree = ""; }; - D05CC3261B69725400E235A3 /* NavigationBackArrowLight@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "NavigationBackArrowLight@2x.png"; sourceTree = ""; }; D05CC3281B69750D00E235A3 /* InteractiveTransitionGestureRecognizer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InteractiveTransitionGestureRecognizer.swift; sourceTree = ""; }; D060185E22F35E7400796784 /* ShakeAnimation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShakeAnimation.swift; sourceTree = ""; }; D06B76DA20592A97006E9EEA /* LayoutSizes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayoutSizes.swift; sourceTree = ""; }; @@ -575,8 +571,6 @@ D05CC2E11B69534100E235A3 /* Supporting Files */ = { isa = PBXGroup; children = ( - D03E7DE31C96A90100C07816 /* NavigationShadow@2x.png */, - D05CC3261B69725400E235A3 /* NavigationBackArrowLight@2x.png */, D05CC2661B69316F00E235A3 /* Display.h */, D05CC2681B69316F00E235A3 /* Info.plist */, ); @@ -852,8 +846,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - D03E7DE41C96A90100C07816 /* NavigationShadow@2x.png in Resources */, - D05CC3271B69725400E235A3 /* NavigationBackArrowLight@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/submodules/Emoji/Sources/EmojiUtils.swift b/submodules/Emoji/Sources/EmojiUtils.swift index a28f276a3e..bcabb02c29 100644 --- a/submodules/Emoji/Sources/EmojiUtils.swift +++ b/submodules/Emoji/Sources/EmojiUtils.swift @@ -56,7 +56,6 @@ public extension String { } var isSingleEmoji: Bool { - print(Bundle(for: FrameworkClass.self).bundlePath) return self.emojis.count == 1 && self.containsEmoji } diff --git a/submodules/GalleryUI/BUCK b/submodules/GalleryUI/BUCK index 819a42cee6..f32a3d2406 100644 --- a/submodules/GalleryUI/BUCK +++ b/submodules/GalleryUI/BUCK @@ -21,6 +21,7 @@ static_library( "//submodules/ShareController:ShareController", "//submodules/SwipeToDismissGesture:SwipeToDismissGesture", "//submodules/CheckNode:CheckNode", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/GalleryUI/GalleryUI.xcodeproj/project.pbxproj b/submodules/GalleryUI/GalleryUI.xcodeproj/project.pbxproj index d871224da1..4892500c80 100644 --- a/submodules/GalleryUI/GalleryUI.xcodeproj/project.pbxproj +++ b/submodules/GalleryUI/GalleryUI.xcodeproj/project.pbxproj @@ -815,17 +815,6 @@ sourceTree SOURCE_ROOT - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E29FA38189300000000 isa @@ -1015,7 +1004,6 @@ B401C979043AF7A000000000 1DD70E2978DEFDFE00000000 1DD70E2975D0EAEC00000000 - 1DD70E291289FAA500000000 1DD70E29FA38189300000000 1DD70E29C7EAF23500000000 1DD70E29E35656AE00000000 @@ -1139,13 +1127,6 @@ fileRef 1DD70E2975D0EAEC00000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F04FA38189300000000 isa @@ -1271,7 +1252,6 @@ E7A30F049E33F93A00000000 E7A30F0478DEFDFE00000000 E7A30F0475D0EAEC00000000 - E7A30F041289FAA500000000 E7A30F04FA38189300000000 E7A30F04C7EAF23500000000 E7A30F04E35656AE00000000 diff --git a/submodules/GalleryUI/GalleryUI_Xcode.xcodeproj/project.pbxproj b/submodules/GalleryUI/GalleryUI_Xcode.xcodeproj/project.pbxproj index ceb0f97aa4..4da522f0f3 100644 --- a/submodules/GalleryUI/GalleryUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/GalleryUI/GalleryUI_Xcode.xcodeproj/project.pbxproj @@ -19,7 +19,6 @@ D0C9C3102300A58500FAB518 /* GalleryFooterContentNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C3032300A58500FAB518 /* GalleryFooterContentNode.swift */; }; D0C9C3112300A58500FAB518 /* GalleryVideoDecoration.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C3042300A58500FAB518 /* GalleryVideoDecoration.swift */; }; D0C9C3122300A58500FAB518 /* GalleryThumbnailContainerNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C3052300A58500FAB518 /* GalleryThumbnailContainerNode.swift */; }; - D0C9C3132300A58500FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C3062300A58500FAB518 /* FrameworkBundle.swift */; }; D0C9C3142300A58500FAB518 /* GalleryPagerNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C3072300A58500FAB518 /* GalleryPagerNode.swift */; }; D0C9C31B2300A9B900FAB518 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C31A2300A9B900FAB518 /* Foundation.framework */; }; D0C9C31D2300A9BD00FAB518 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C31C2300A9BD00FAB518 /* UIKit.framework */; }; @@ -49,6 +48,7 @@ D0C9C43B2300D6DC00FAB518 /* OpenInExternalAppUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C43A2300D6DC00FAB518 /* OpenInExternalAppUI.framework */; }; D0C9C4412300D91200FAB518 /* GalleryItemTransitionNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C4402300D91200FAB518 /* GalleryItemTransitionNode.swift */; }; D0C9C91723020E6100FAB518 /* ShareController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C91623020E6100FAB518 /* ShareController.framework */; }; + D0EFF262231981A300CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF261231981A300CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -66,7 +66,6 @@ D0C9C3032300A58500FAB518 /* GalleryFooterContentNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GalleryFooterContentNode.swift; sourceTree = ""; }; D0C9C3042300A58500FAB518 /* GalleryVideoDecoration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GalleryVideoDecoration.swift; sourceTree = ""; }; D0C9C3052300A58500FAB518 /* GalleryThumbnailContainerNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GalleryThumbnailContainerNode.swift; sourceTree = ""; }; - D0C9C3062300A58500FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D0C9C3072300A58500FAB518 /* GalleryPagerNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GalleryPagerNode.swift; sourceTree = ""; }; D0C9C31A2300A9B900FAB518 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; D0C9C31C2300A9BD00FAB518 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -96,6 +95,7 @@ D0C9C43A2300D6DC00FAB518 /* OpenInExternalAppUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OpenInExternalAppUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C4402300D91200FAB518 /* GalleryItemTransitionNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryItemTransitionNode.swift; sourceTree = ""; }; D0C9C91623020E6100FAB518 /* ShareController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ShareController.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D0EFF261231981A300CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -103,6 +103,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF262231981A300CF5164 /* AppBundle.framework in Frameworks */, D0C9C91723020E6100FAB518 /* ShareController.framework in Frameworks */, D0C9C43B2300D6DC00FAB518 /* OpenInExternalAppUI.framework in Frameworks */, D0C9C3FD2300D59B00FAB518 /* ScreenCaptureDetection.framework in Frameworks */, @@ -165,7 +166,6 @@ D0C9C3072300A58500FAB518 /* GalleryPagerNode.swift */, D0C9C3052300A58500FAB518 /* GalleryThumbnailContainerNode.swift */, D0C9C3042300A58500FAB518 /* GalleryVideoDecoration.swift */, - D0C9C3062300A58500FAB518 /* FrameworkBundle.swift */, D0C9C2F32300A51400FAB518 /* GalleryUI.h */, D0C9C4402300D91200FAB518 /* GalleryItemTransitionNode.swift */, ); @@ -175,6 +175,7 @@ D0C9C3192300A9B900FAB518 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF261231981A300CF5164 /* AppBundle.framework */, D0C9C91623020E6100FAB518 /* ShareController.framework */, D0C9C43A2300D6DC00FAB518 /* OpenInExternalAppUI.framework */, D0C9C3FC2300D59B00FAB518 /* ScreenCaptureDetection.framework */, @@ -306,7 +307,6 @@ D0C9C34D2300AA8A00FAB518 /* ChatAnimationGalleryItem.swift in Sources */, D0C9C3442300AA8A00FAB518 /* ChatImageGalleryItem.swift in Sources */, D0C9C34F2300AA8A00FAB518 /* ChatDocumentGalleryItem.swift in Sources */, - D0C9C3132300A58500FAB518 /* FrameworkBundle.swift in Sources */, D0C9C3082300A58500FAB518 /* GalleryItem.swift in Sources */, D0C9C3112300A58500FAB518 /* GalleryVideoDecoration.swift in Sources */, D0C9C34A2300AA8A00FAB518 /* ChatItemGalleryFooterContentNode.swift in Sources */, diff --git a/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift b/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift index 1d26d5c47d..8f6e8ae671 100644 --- a/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift +++ b/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift @@ -13,6 +13,7 @@ import AccountContext import RadialStatusNode import ShareController import OpenInExternalAppUI +import AppBundle private let deleteImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionTrash"), color: .white) private let actionImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionAction"), color: .white) diff --git a/submodules/GalleryUI/Sources/FrameworkBundle.swift b/submodules/GalleryUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 3f7a202833..0000000000 --- a/submodules/GalleryUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,14 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) -private let screenScaleFactor = Int(UIScreen.main.scale) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/GalleryUI/Sources/Items/ChatAnimationGalleryItem.swift b/submodules/GalleryUI/Sources/Items/ChatAnimationGalleryItem.swift index f179391722..6e8741fb8a 100644 --- a/submodules/GalleryUI/Sources/Items/ChatAnimationGalleryItem.swift +++ b/submodules/GalleryUI/Sources/Items/ChatAnimationGalleryItem.swift @@ -11,6 +11,7 @@ import AnimationUI import AccountContext import RadialStatusNode import StickerResources +import AppBundle class ChatAnimationGalleryItem: GalleryItem { let context: AccountContext diff --git a/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift b/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift index 0f65cb8abe..7d7914b285 100644 --- a/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift +++ b/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift @@ -10,6 +10,7 @@ import UniversalMediaPlayer import AccountContext import RadialStatusNode import TelegramUniversalVideoContent +import AppBundle public enum UniversalVideoGalleryItemContentInfo { case message(Message) diff --git a/submodules/GalleryUI/Sources/SecretMediaPreviewController.swift b/submodules/GalleryUI/Sources/SecretMediaPreviewController.swift index 9244ec960a..c2b2d7c83d 100644 --- a/submodules/GalleryUI/Sources/SecretMediaPreviewController.swift +++ b/submodules/GalleryUI/Sources/SecretMediaPreviewController.swift @@ -9,6 +9,7 @@ import TelegramPresentationData import AccountContext import RadialStatusNode import ScreenCaptureDetection +import AppBundle private func galleryMediaForMedia(media: Media) -> Media? { if let media = media as? TelegramMediaImage { diff --git a/submodules/InstantPageUI/BUCK b/submodules/InstantPageUI/BUCK index b5a18477a9..72be45275a 100644 --- a/submodules/InstantPageUI/BUCK +++ b/submodules/InstantPageUI/BUCK @@ -18,6 +18,7 @@ static_library( "//submodules/LiveLocationPositionNode:LiveLocationPositionNode", "//submodules/MosaicLayout:MosaicLayout", "//submodules/LocationUI:LocationUI", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/InstantPageUI/InstantPageUI.xcodeproj/project.pbxproj b/submodules/InstantPageUI/InstantPageUI.xcodeproj/project.pbxproj index 7d7dfbc3a0..93b606aff1 100644 --- a/submodules/InstantPageUI/InstantPageUI.xcodeproj/project.pbxproj +++ b/submodules/InstantPageUI/InstantPageUI.xcodeproj/project.pbxproj @@ -803,17 +803,6 @@ explicitFileType text.script.python - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E293EE5EB7000000000 isa @@ -1407,7 +1396,6 @@ ]]> children - 1DD70E291289FAA500000000 1DD70E293EE5EB7000000000 1DD70E29025B7C1D00000000 1DD70E298CDC0AFE00000000 @@ -1519,13 +1507,6 @@ B401C979C806358400000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F043EE5EB7000000000 isa @@ -1903,7 +1884,6 @@ PBXSourcesBuildPhase files - E7A30F041289FAA500000000 E7A30F043EE5EB7000000000 E7A30F04025B7C1D00000000 E7A30F048CDC0AFE00000000 diff --git a/submodules/InstantPageUI/InstantPageUI_Xcode.xcodeproj/project.pbxproj b/submodules/InstantPageUI/InstantPageUI_Xcode.xcodeproj/project.pbxproj index 8f903cc37b..de9739cefd 100644 --- a/submodules/InstantPageUI/InstantPageUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/InstantPageUI/InstantPageUI_Xcode.xcodeproj/project.pbxproj @@ -71,11 +71,11 @@ D0C9C5F72301D04A00FAB518 /* GalleryUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C5F62301D04A00FAB518 /* GalleryUI.framework */; }; D0C9C5F92301D04F00FAB518 /* AsyncDisplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C5F82301D04F00FAB518 /* AsyncDisplayKit.framework */; }; D0C9C5FB2301D05400FAB518 /* Display.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C5FA2301D05400FAB518 /* Display.framework */; }; - D0C9C5FD2301D0A900FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C5FC2301D0A900FAB518 /* FrameworkBundle.swift */; }; D0C9C6272301D21600FAB518 /* MusicAlbumArtResources.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C6262301D21600FAB518 /* MusicAlbumArtResources.framework */; }; D0C9C6572301D30C00FAB518 /* LiveLocationPositionNode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C6562301D30C00FAB518 /* LiveLocationPositionNode.framework */; }; D0C9C67D2301D45A00FAB518 /* MosaicLayout.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C67C2301D45A00FAB518 /* MosaicLayout.framework */; }; D0C9C6BB2301D92000FAB518 /* LocationUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C6BA2301D92000FAB518 /* LocationUI.framework */; }; + D0EFF266231981C400CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF265231981C400CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -145,11 +145,11 @@ D0C9C5F62301D04A00FAB518 /* GalleryUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = GalleryUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C5F82301D04F00FAB518 /* AsyncDisplayKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AsyncDisplayKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C5FA2301D05400FAB518 /* Display.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Display.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D0C9C5FC2301D0A900FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D0C9C6262301D21600FAB518 /* MusicAlbumArtResources.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MusicAlbumArtResources.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C6562301D30C00FAB518 /* LiveLocationPositionNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LiveLocationPositionNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C67C2301D45A00FAB518 /* MosaicLayout.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MosaicLayout.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C6BA2301D92000FAB518 /* LocationUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LocationUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D0EFF265231981C400CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -157,6 +157,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF266231981C400CF5164 /* AppBundle.framework in Frameworks */, D0C9C6BB2301D92000FAB518 /* LocationUI.framework in Frameworks */, D0C9C67D2301D45A00FAB518 /* MosaicLayout.framework in Frameworks */, D0C9C6572301D30C00FAB518 /* LiveLocationPositionNode.framework in Frameworks */, @@ -251,7 +252,6 @@ D0C9C5AC2301D04200FAB518 /* InstantPageTileNode.swift */, D0C9C5952301D03F00FAB518 /* InstantPageWebEmbedItem.swift */, D0C9C5AA2301D04200FAB518 /* InstantPageWebEmbedNode.swift */, - D0C9C5FC2301D0A900FAB518 /* FrameworkBundle.swift */, D0C9C56D2301CFA600FAB518 /* InstantPageUI.h */, ); path = Sources; @@ -260,6 +260,7 @@ D0C9C5792301D01200FAB518 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF265231981C400CF5164 /* AppBundle.framework */, D0C9C6BA2301D92000FAB518 /* LocationUI.framework */, D0C9C67C2301D45A00FAB518 /* MosaicLayout.framework */, D0C9C6562301D30C00FAB518 /* LiveLocationPositionNode.framework */, @@ -377,7 +378,6 @@ D0C9C5EF2301D04700FAB518 /* InstantPageLayout.swift in Sources */, D0C9C5F02301D04700FAB518 /* InstantPageItem.swift in Sources */, D0C9C5DB2301D04700FAB518 /* InstantPageSlideshowItemNode.swift in Sources */, - D0C9C5FD2301D0A900FAB518 /* FrameworkBundle.swift in Sources */, D0C9C5E92301D04700FAB518 /* InstantPageTheme.swift in Sources */, D0C9C5D52301D04700FAB518 /* InstantPageSettingsNode.swift in Sources */, D0C9C5CF2301D04700FAB518 /* InstantPageSettingsFontFamilyItemNode.swift in Sources */, diff --git a/submodules/InstantPageUI/Sources/FrameworkBundle.swift b/submodules/InstantPageUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/InstantPageUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/InstantPageUI/Sources/InstantPageGalleryFooterContentNode.swift b/submodules/InstantPageUI/Sources/InstantPageGalleryFooterContentNode.swift index 6d4bd12264..77199ced8c 100644 --- a/submodules/InstantPageUI/Sources/InstantPageGalleryFooterContentNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageGalleryFooterContentNode.swift @@ -11,6 +11,7 @@ import TextFormat import AccountContext import ShareController import GalleryUI +import AppBundle private let actionImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionAction"), color: .white) diff --git a/submodules/InstantPageUI/Sources/InstantPageImageNode.swift b/submodules/InstantPageUI/Sources/InstantPageImageNode.swift index bcdae5eb38..4dd56cc27d 100644 --- a/submodules/InstantPageUI/Sources/InstantPageImageNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageImageNode.swift @@ -11,6 +11,7 @@ import RadialStatusNode import PhotoResources import MediaResources import LiveLocationPositionNode +import AppBundle private struct FetchControls { let fetch: (Bool) -> Void diff --git a/submodules/InstantPageUI/Sources/InstantPageNavigationBar.swift b/submodules/InstantPageUI/Sources/InstantPageNavigationBar.swift index 886077b6bf..5fea9c5f6f 100644 --- a/submodules/InstantPageUI/Sources/InstantPageNavigationBar.swift +++ b/submodules/InstantPageUI/Sources/InstantPageNavigationBar.swift @@ -3,6 +3,7 @@ import UIKit import Display import AsyncDisplayKit import TelegramPresentationData +import AppBundle private let backArrowImage = NavigationBarTheme.generateBackArrowImage(color: .white) private let moreImage = generateTintedImage(image: UIImage(bundleImageName: "Instant View/MoreIcon"), color: .white) diff --git a/submodules/InstantPageUI/Sources/InstantPagePeerReferenceNode.swift b/submodules/InstantPageUI/Sources/InstantPagePeerReferenceNode.swift index ac1cb8cf7f..f95e305c22 100644 --- a/submodules/InstantPageUI/Sources/InstantPagePeerReferenceNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPagePeerReferenceNode.swift @@ -8,6 +8,7 @@ import Display import TelegramPresentationData import ActivityIndicator import AccountContext +import AppBundle private enum JoinState: Equatable { case none diff --git a/submodules/InstantPageUI/Sources/InstantPageSettingsBacklightItemNode.swift b/submodules/InstantPageUI/Sources/InstantPageSettingsBacklightItemNode.swift index eb66c3839e..f8b2423583 100644 --- a/submodules/InstantPageUI/Sources/InstantPageSettingsBacklightItemNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageSettingsBacklightItemNode.swift @@ -2,7 +2,7 @@ import Foundation import UIKit import AsyncDisplayKit import Display - +import AppBundle import LegacyComponents private func generateKnobImage() -> UIImage? { diff --git a/submodules/InstantPageUI/Sources/InstantPageSettingsFontSizeItemNode.swift b/submodules/InstantPageUI/Sources/InstantPageSettingsFontSizeItemNode.swift index 1469b1824f..188e08161c 100644 --- a/submodules/InstantPageUI/Sources/InstantPageSettingsFontSizeItemNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageSettingsFontSizeItemNode.swift @@ -2,7 +2,7 @@ import Foundation import UIKit import AsyncDisplayKit import Display - +import AppBundle import LegacyComponents private func generateKnobImage() -> UIImage? { diff --git a/submodules/InstantPageUI/Sources/InstantPageSettingsNode.swift b/submodules/InstantPageUI/Sources/InstantPageSettingsNode.swift index 8e2df91941..b269e96484 100644 --- a/submodules/InstantPageUI/Sources/InstantPageSettingsNode.swift +++ b/submodules/InstantPageUI/Sources/InstantPageSettingsNode.swift @@ -6,6 +6,7 @@ import Postbox import SwiftSignalKit import TelegramPresentationData import TelegramUIPreferences +import AppBundle private func generateArrowImage(color: UIColor) -> UIImage? { let smallRadius: CGFloat = 5.0 diff --git a/submodules/ItemListAddressItem/BUCK b/submodules/ItemListAddressItem/BUCK index 0056fd9caa..f999b68ec5 100644 --- a/submodules/ItemListAddressItem/BUCK +++ b/submodules/ItemListAddressItem/BUCK @@ -13,6 +13,7 @@ static_library( "//submodules/ItemListUI:ItemListUI", "//submodules/AccountContext:AccountContext", "//submodules/TextFormat:TextFormat", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/ItemListAddressItem/ItemListAddressItem.xcodeproj/project.pbxproj b/submodules/ItemListAddressItem/ItemListAddressItem.xcodeproj/project.pbxproj index 7c7eaae676..455bc5af13 100644 --- a/submodules/ItemListAddressItem/ItemListAddressItem.xcodeproj/project.pbxproj +++ b/submodules/ItemListAddressItem/ItemListAddressItem.xcodeproj/project.pbxproj @@ -467,17 +467,6 @@ explicitFileType text.script.python - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E290A17F01B00000000 isa @@ -499,7 +488,6 @@ ]]> children - 1DD70E291289FAA500000000 1DD70E290A17F01B00000000 @@ -559,13 +547,6 @@ B401C979C806358400000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F040A17F01B00000000 isa @@ -579,7 +560,6 @@ PBXSourcesBuildPhase files - E7A30F041289FAA500000000 E7A30F040A17F01B00000000 diff --git a/submodules/ItemListAddressItem/ItemListAddressItem_Xcode.xcodeproj/project.pbxproj b/submodules/ItemListAddressItem/ItemListAddressItem_Xcode.xcodeproj/project.pbxproj index 01adfaf460..6e33937ac5 100644 --- a/submodules/ItemListAddressItem/ItemListAddressItem_Xcode.xcodeproj/project.pbxproj +++ b/submodules/ItemListAddressItem/ItemListAddressItem_Xcode.xcodeproj/project.pbxproj @@ -18,7 +18,7 @@ D03E42DE230571DD0049C28B /* ItemListUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E42DD230571DD0049C28B /* ItemListUI.framework */; }; D03E42E0230571E20049C28B /* AccountContext.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E42DF230571E20049C28B /* AccountContext.framework */; }; D03E42E2230571E60049C28B /* TextFormat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E42E1230571E60049C28B /* TextFormat.framework */; }; - D03E42E8230572780049C28B /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03E42E7230572780049C28B /* FrameworkBundle.swift */; }; + D0EFF2562319811E00CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF2552319811E00CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -35,7 +35,7 @@ D03E42DD230571DD0049C28B /* ItemListUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ItemListUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E42DF230571E20049C28B /* AccountContext.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AccountContext.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E42E1230571E60049C28B /* TextFormat.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TextFormat.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D03E42E7230572780049C28B /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; + D0EFF2552319811E00CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -43,6 +43,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF2562319811E00CF5164 /* AppBundle.framework in Frameworks */, D03E42E2230571E60049C28B /* TextFormat.framework in Frameworks */, D03E42E0230571E20049C28B /* AccountContext.framework in Frameworks */, D03E42DE230571DD0049C28B /* ItemListUI.framework in Frameworks */, @@ -80,7 +81,6 @@ isa = PBXGroup; children = ( D03E42CA230571700049C28B /* ItemListAddressItem.swift */, - D03E42E7230572780049C28B /* FrameworkBundle.swift */, D03E42C2230571620049C28B /* ItemListAddressItem.h */, ); path = Sources; @@ -89,6 +89,7 @@ D03E42D0230571C20049C28B /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF2552319811E00CF5164 /* AppBundle.framework */, D03E42E1230571E60049C28B /* TextFormat.framework */, D03E42DF230571E20049C28B /* AccountContext.framework */, D03E42DD230571DD0049C28B /* ItemListUI.framework */, @@ -182,7 +183,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - D03E42E8230572780049C28B /* FrameworkBundle.swift in Sources */, D03E42CB230571710049C28B /* ItemListAddressItem.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/submodules/ItemListAddressItem/Sources/FrameworkBundle.swift b/submodules/ItemListAddressItem/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/ItemListAddressItem/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/ItemListAddressItem/Sources/ItemListAddressItem.swift b/submodules/ItemListAddressItem/Sources/ItemListAddressItem.swift index 60893ed4a7..ee53aee5e8 100644 --- a/submodules/ItemListAddressItem/Sources/ItemListAddressItem.swift +++ b/submodules/ItemListAddressItem/Sources/ItemListAddressItem.swift @@ -7,6 +7,7 @@ import TelegramPresentationData import ItemListUI import AccountContext import TextFormat +import AppBundle public final class ItemListAddressItem: ListViewItem, ItemListItem { let theme: PresentationTheme diff --git a/submodules/ItemListAvatarAndNameInfoItem/BUCK b/submodules/ItemListAvatarAndNameInfoItem/BUCK index f8a2bf277b..76b3319fce 100644 --- a/submodules/ItemListAvatarAndNameInfoItem/BUCK +++ b/submodules/ItemListAvatarAndNameInfoItem/BUCK @@ -17,6 +17,7 @@ static_library( "//submodules/AvatarNode:AvatarNode", "//submodules/ActivityIndicator:ActivityIndicator", "//submodules/ItemListUI:ItemListUI", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/ItemListAvatarAndNameInfoItem/ItemListAvatarAndNameInfoItem.xcodeproj/project.pbxproj b/submodules/ItemListAvatarAndNameInfoItem/ItemListAvatarAndNameInfoItem.xcodeproj/project.pbxproj index dfdb7e1c3a..cc0befc30a 100644 --- a/submodules/ItemListAvatarAndNameInfoItem/ItemListAvatarAndNameInfoItem.xcodeproj/project.pbxproj +++ b/submodules/ItemListAvatarAndNameInfoItem/ItemListAvatarAndNameInfoItem.xcodeproj/project.pbxproj @@ -495,17 +495,6 @@ explicitFileType text.script.python - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E29E343141000000000 isa @@ -527,7 +516,6 @@ ]]> children - 1DD70E291289FAA500000000 1DD70E29E343141000000000 @@ -587,13 +575,6 @@ B401C979C806358400000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F04E343141000000000 isa @@ -607,7 +588,6 @@ PBXSourcesBuildPhase files - E7A30F041289FAA500000000 E7A30F04E343141000000000 diff --git a/submodules/ItemListAvatarAndNameInfoItem/ItemListAvatarAndNameInfoItem_Xcode.xcodeproj/project.pbxproj b/submodules/ItemListAvatarAndNameInfoItem/ItemListAvatarAndNameInfoItem_Xcode.xcodeproj/project.pbxproj index de2f1b650f..9be8a12ade 100644 --- a/submodules/ItemListAvatarAndNameInfoItem/ItemListAvatarAndNameInfoItem_Xcode.xcodeproj/project.pbxproj +++ b/submodules/ItemListAvatarAndNameInfoItem/ItemListAvatarAndNameInfoItem_Xcode.xcodeproj/project.pbxproj @@ -22,7 +22,7 @@ D03E3DCC2304AF6D0049C28B /* AvatarNode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E3DCB2304AF6D0049C28B /* AvatarNode.framework */; }; D03E3DCE2304AF720049C28B /* TelegramStringFormatting.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E3DCD2304AF720049C28B /* TelegramStringFormatting.framework */; }; D03E3DD02304AF760049C28B /* PeerPresenceStatusManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E3DCF2304AF760049C28B /* PeerPresenceStatusManager.framework */; }; - D03E3DD42304AFE80049C28B /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03E3DD32304AFE80049C28B /* FrameworkBundle.swift */; }; + D0EFF2542319810F00CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF2532319810F00CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -43,7 +43,7 @@ D03E3DCB2304AF6D0049C28B /* AvatarNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AvatarNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E3DCD2304AF720049C28B /* TelegramStringFormatting.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramStringFormatting.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E3DCF2304AF760049C28B /* PeerPresenceStatusManager.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PeerPresenceStatusManager.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D03E3DD32304AFE80049C28B /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; + D0EFF2532319810F00CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -51,6 +51,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF2542319810F00CF5164 /* AppBundle.framework in Frameworks */, D03E3DD02304AF760049C28B /* PeerPresenceStatusManager.framework in Frameworks */, D03E3DCE2304AF720049C28B /* TelegramStringFormatting.framework in Frameworks */, D03E3DCC2304AF6D0049C28B /* AvatarNode.framework in Frameworks */, @@ -93,7 +94,6 @@ children = ( D03E3DB42304AF2E0049C28B /* ItemListAvatarAndNameItem.swift */, D03E3DA82304AEDD0049C28B /* ItemListAvatarAndNameInfoItem.h */, - D03E3DD32304AFE80049C28B /* FrameworkBundle.swift */, ); path = Sources; sourceTree = ""; @@ -101,6 +101,7 @@ D03E3DB62304AF3A0049C28B /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF2532319810F00CF5164 /* AppBundle.framework */, D03E3DCF2304AF760049C28B /* PeerPresenceStatusManager.framework */, D03E3DCD2304AF720049C28B /* TelegramStringFormatting.framework */, D03E3DCB2304AF6D0049C28B /* AvatarNode.framework */, @@ -198,7 +199,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - D03E3DD42304AFE80049C28B /* FrameworkBundle.swift in Sources */, D03E3DB52304AF2E0049C28B /* ItemListAvatarAndNameItem.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/submodules/ItemListAvatarAndNameInfoItem/Sources/FrameworkBundle.swift b/submodules/ItemListAvatarAndNameInfoItem/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/ItemListAvatarAndNameInfoItem/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameItem.swift b/submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameItem.swift index b730cb973e..735bd17b34 100644 --- a/submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameItem.swift +++ b/submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameItem.swift @@ -11,6 +11,7 @@ import ActivityIndicator import AvatarNode import TelegramStringFormatting import PeerPresenceStatusManager +import AppBundle private let updatingAvatarOverlayImage = generateFilledCircleImage(diameter: 66.0, color: UIColor(white: 0.0, alpha: 0.4), backgroundColor: nil) diff --git a/submodules/LegacyComponents/BUCK b/submodules/LegacyComponents/BUCK index 39bd8cc190..d07844597c 100644 --- a/submodules/LegacyComponents/BUCK +++ b/submodules/LegacyComponents/BUCK @@ -5,6 +5,7 @@ apple_resource( dirs = [ "LegacyComponents/Resources/LegacyComponentsResources.bundle", ], + visibility = ["PUBLIC"], ) static_library( @@ -357,8 +358,8 @@ static_library( "LegacyComponents/TGMediaAssetsUtils.h", ], deps = [ - ":LegacyComponentsResources", "//submodules/SSignalKit/SSignalKit:SSignalKit", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/LegacyComponents/LegacyComponents/LegacyComponentsInternal.m b/submodules/LegacyComponents/LegacyComponents/LegacyComponentsInternal.m index bcc18ecbb0..cbed53166d 100644 --- a/submodules/LegacyComponents/LegacyComponents/LegacyComponentsInternal.m +++ b/submodules/LegacyComponents/LegacyComponents/LegacyComponentsInternal.m @@ -6,6 +6,8 @@ #import +#import + TGLocalization *legacyEffectiveLocalization() { return [[LegacyComponentsGlobals provider] effectiveLocalization]; } @@ -127,11 +129,11 @@ void TGDispatchAfter(double delay, dispatch_queue_t queue, dispatch_block_t bloc dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)((delay) * NSEC_PER_SEC)), queue, block); } -static NSBundle *frameworkBundle() { +static NSBundle *resourcesBundle() { static NSBundle *currentBundle = nil; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - currentBundle = [NSBundle bundleForClass:[LegacyComponentsGlobals class]]; + currentBundle = getAppBundle(); NSString *updatedPath = [[currentBundle bundlePath] stringByAppendingPathComponent:@"LegacyComponentsResources.bundle"]; currentBundle = [NSBundle bundleWithPath:updatedPath]; }); @@ -142,7 +144,7 @@ UIImage *TGComponentsImageNamed(NSString *name) { if (iosMajorVersion() < 8) return [UIImage imageNamed:[NSString stringWithFormat:@"LegacyComponentsResources.bundle/%@", name]]; - UIImage *image = [UIImage imageNamed:name inBundle:frameworkBundle() compatibleWithTraitCollection:nil]; + UIImage *image = [UIImage imageNamed:name inBundle:resourcesBundle() compatibleWithTraitCollection:nil]; if (image == nil) { assert(true); } @@ -150,5 +152,5 @@ UIImage *TGComponentsImageNamed(NSString *name) { } NSString *TGComponentsPathForResource(NSString *name, NSString *type) { - return [frameworkBundle() pathForResource:name ofType:type]; + return [resourcesBundle() pathForResource:name ofType:type]; } diff --git a/submodules/LegacyComponents/LegacyComponents_Xcode.xcodeproj/project.pbxproj b/submodules/LegacyComponents/LegacyComponents_Xcode.xcodeproj/project.pbxproj index b38c09fa04..1486613e64 100644 --- a/submodules/LegacyComponents/LegacyComponents_Xcode.xcodeproj/project.pbxproj +++ b/submodules/LegacyComponents/LegacyComponents_Xcode.xcodeproj/project.pbxproj @@ -1154,6 +1154,7 @@ D0BFAE5420AB33F900793CF2 /* TGIconSwitchView.h in Headers */ = {isa = PBXBuildFile; fileRef = D0BFAE5220AB33F800793CF2 /* TGIconSwitchView.h */; settings = {ATTRIBUTES = (Public, ); }; }; D0BFAE5720AB34AB00793CF2 /* TGAnimationUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = D0BFAE5520AB34AA00793CF2 /* TGAnimationUtils.h */; settings = {ATTRIBUTES = (Public, ); }; }; D0BFAE5820AB34AB00793CF2 /* TGAnimationUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = D0BFAE5620AB34AA00793CF2 /* TGAnimationUtils.m */; }; + D0EFF24023197FD500CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF23F23197FD500CF5164 /* AppBundle.framework */; }; D0F7C9C41F55DA49005B255A /* TGVideoCameraMovieRecorder.h in Headers */ = {isa = PBXBuildFile; fileRef = D0F7C9C21F55DA49005B255A /* TGVideoCameraMovieRecorder.h */; settings = {ATTRIBUTES = (Public, ); }; }; D0F7C9C51F55DA49005B255A /* TGVideoCameraMovieRecorder.m in Sources */ = {isa = PBXBuildFile; fileRef = D0F7C9C31F55DA49005B255A /* TGVideoCameraMovieRecorder.m */; }; D0F7C9C81F55DA83005B255A /* TGVideoCameraGLRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = D0F7C9C61F55DA83005B255A /* TGVideoCameraGLRenderer.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -2318,6 +2319,7 @@ D0BFAE5520AB34AA00793CF2 /* TGAnimationUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TGAnimationUtils.h; sourceTree = ""; }; D0BFAE5620AB34AA00793CF2 /* TGAnimationUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TGAnimationUtils.m; sourceTree = ""; }; D0EB42021F3142F400838FE6 /* LegacyComponentsResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = LegacyComponentsResources.bundle; path = Resources/LegacyComponentsResources.bundle; sourceTree = ""; }; + D0EFF23F23197FD500CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0F7C9C21F55DA49005B255A /* TGVideoCameraMovieRecorder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TGVideoCameraMovieRecorder.h; sourceTree = ""; }; D0F7C9C31F55DA49005B255A /* TGVideoCameraMovieRecorder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TGVideoCameraMovieRecorder.m; sourceTree = ""; }; D0F7C9C61F55DA83005B255A /* TGVideoCameraGLRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TGVideoCameraGLRenderer.h; sourceTree = ""; }; @@ -2336,6 +2338,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF24023197FD500CF5164 /* AppBundle.framework in Frameworks */, 09750F761F2FA816001B9886 /* SSignalKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -2782,6 +2785,7 @@ D01779051F20E0DE0044446D /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF23F23197FD500CF5164 /* AppBundle.framework */, 09750F741F2FA5E8001B9886 /* SSignalKit.framework */, ); name = Frameworks; diff --git a/submodules/LegacyMediaPickerUI/LegacyMediaPickerUI.xcodeproj/project.pbxproj b/submodules/LegacyMediaPickerUI/LegacyMediaPickerUI.xcodeproj/project.pbxproj index 6a29249e90..66a572b39a 100644 --- a/submodules/LegacyMediaPickerUI/LegacyMediaPickerUI.xcodeproj/project.pbxproj +++ b/submodules/LegacyMediaPickerUI/LegacyMediaPickerUI.xcodeproj/project.pbxproj @@ -447,6 +447,17 @@ sourceTree SOURCE_ROOT + 1DD70E291209BB0400000000 + + isa + PBXFileReference + name + LegacyICloudFilePicker.swift + path + Sources/LegacyICloudFilePicker.swift + sourceTree + SOURCE_ROOT + 1DD70E293C87ECC500000000 isa @@ -529,6 +540,7 @@ 1DD70E29B883E7D000000000 1DD70E29A10DBC7500000000 + 1DD70E291209BB0400000000 1DD70E293C87ECC500000000 1DD70E29F44A23ED00000000 1DD70E29F44A23F200000000 @@ -607,6 +619,13 @@ fileRef 1DD70E29A10DBC7500000000 + E7A30F041209BB0400000000 + + isa + PBXBuildFile + fileRef + 1DD70E291209BB0400000000 + E7A30F043C87ECC500000000 isa @@ -650,6 +669,7 @@ E7A30F04B883E7D000000000 E7A30F04A10DBC7500000000 + E7A30F041209BB0400000000 E7A30F043C87ECC500000000 E7A30F04F44A23F200000000 E7A30F047E812ACF00000000 diff --git a/submodules/LiveLocationPositionNode/BUCK b/submodules/LiveLocationPositionNode/BUCK index 847f6998fe..c7239974f1 100644 --- a/submodules/LiveLocationPositionNode/BUCK +++ b/submodules/LiveLocationPositionNode/BUCK @@ -12,6 +12,7 @@ static_library( "//submodules/TelegramCore:TelegramCore#shared", "//submodules/TelegramPresentationData:TelegramPresentationData", "//submodules/AvatarNode:AvatarNode", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/LiveLocationPositionNode/LiveLocationPositionNode.xcodeproj/project.pbxproj b/submodules/LiveLocationPositionNode/LiveLocationPositionNode.xcodeproj/project.pbxproj index 723bd209fd..5802d65b29 100644 --- a/submodules/LiveLocationPositionNode/LiveLocationPositionNode.xcodeproj/project.pbxproj +++ b/submodules/LiveLocationPositionNode/LiveLocationPositionNode.xcodeproj/project.pbxproj @@ -282,17 +282,6 @@ sourceTree SOURCE_ROOT - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - B401C979EAB5339800000000 isa @@ -304,7 +293,6 @@ children 1DD70E29500D752000000000 - 1DD70E291289FAA500000000 B401C97946DD664C00000000 @@ -370,13 +358,6 @@ fileRef 1DD70E29500D752000000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - 1870857F0000000000000000 isa @@ -384,7 +365,6 @@ files E7A30F04500D752000000000 - E7A30F041289FAA500000000 E7A30F04FF334B1F00000000 diff --git a/submodules/LiveLocationPositionNode/LiveLocationPositionNode_Xcode.xcodeproj/project.pbxproj b/submodules/LiveLocationPositionNode/LiveLocationPositionNode_Xcode.xcodeproj/project.pbxproj index 8d20c24eda..1302f57523 100644 --- a/submodules/LiveLocationPositionNode/LiveLocationPositionNode_Xcode.xcodeproj/project.pbxproj +++ b/submodules/LiveLocationPositionNode/LiveLocationPositionNode_Xcode.xcodeproj/project.pbxproj @@ -17,7 +17,7 @@ D0C9C6512301D2DA00FAB518 /* Postbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C6502301D2DA00FAB518 /* Postbox.framework */; }; D0C9C6532301D2E000FAB518 /* TelegramPresentationData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C6522301D2E000FAB518 /* TelegramPresentationData.framework */; }; D0C9C6552301D2E400FAB518 /* AvatarNode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C6542301D2E400FAB518 /* AvatarNode.framework */; }; - D0C9C65B2301D34000FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C65A2301D34000FAB518 /* FrameworkBundle.swift */; }; + D0EFF24E231980D200CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF24D231980D200CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -33,7 +33,7 @@ D0C9C6502301D2DA00FAB518 /* Postbox.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Postbox.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C6522301D2E000FAB518 /* TelegramPresentationData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramPresentationData.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C6542301D2E400FAB518 /* AvatarNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AvatarNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D0C9C65A2301D34000FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; + D0EFF24D231980D200CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -41,6 +41,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF24E231980D200CF5164 /* AppBundle.framework in Frameworks */, D0C9C6552301D2E400FAB518 /* AvatarNode.framework in Frameworks */, D0C9C6532301D2E000FAB518 /* TelegramPresentationData.framework in Frameworks */, D0C9C6512301D2DA00FAB518 /* Postbox.framework in Frameworks */, @@ -77,7 +78,6 @@ isa = PBXGroup; children = ( D0C9C6432301D2BC00FAB518 /* ChatMessageLiveLocationPositionNode.swift */, - D0C9C65A2301D34000FAB518 /* FrameworkBundle.swift */, D0C9C6372301D25D00FAB518 /* LiveLocationPositionNode.h */, ); path = Sources; @@ -86,6 +86,7 @@ D0C9C6452301D2C700FAB518 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF24D231980D200CF5164 /* AppBundle.framework */, D0C9C6542301D2E400FAB518 /* AvatarNode.framework */, D0C9C6522301D2E000FAB518 /* TelegramPresentationData.framework */, D0C9C6502301D2DA00FAB518 /* Postbox.framework */, @@ -178,7 +179,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - D0C9C65B2301D34000FAB518 /* FrameworkBundle.swift in Sources */, D0C9C6442301D2BC00FAB518 /* ChatMessageLiveLocationPositionNode.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/submodules/LiveLocationPositionNode/Sources/ChatMessageLiveLocationPositionNode.swift b/submodules/LiveLocationPositionNode/Sources/ChatMessageLiveLocationPositionNode.swift index 7d49098b6f..7da5cabc9e 100644 --- a/submodules/LiveLocationPositionNode/Sources/ChatMessageLiveLocationPositionNode.swift +++ b/submodules/LiveLocationPositionNode/Sources/ChatMessageLiveLocationPositionNode.swift @@ -6,6 +6,7 @@ import TelegramCore import Postbox import TelegramPresentationData import AvatarNode +import AppBundle private let avatarFont = UIFont(name: ".SFCompactRounded-Semibold", size: 24.0)! private let avatarBackgroundImage = UIImage(bundleImageName: "Chat/Message/LocationPin")?.precomposed() diff --git a/submodules/LiveLocationPositionNode/Sources/FrameworkBundle.swift b/submodules/LiveLocationPositionNode/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/LiveLocationPositionNode/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/LocationUI/BUCK b/submodules/LocationUI/BUCK index 613577ee01..b97fa70d56 100644 --- a/submodules/LocationUI/BUCK +++ b/submodules/LocationUI/BUCK @@ -17,6 +17,7 @@ static_library( "//submodules/AccountContext:AccountContext", "//submodules/OpenInExternalAppUI:OpenInExternalAppUI", "//submodules/LegacyUI:LegacyUI", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/LocationUI/LocationUI.xcodeproj/project.pbxproj b/submodules/LocationUI/LocationUI.xcodeproj/project.pbxproj index ac70663b1f..aebaf8253f 100644 --- a/submodules/LocationUI/LocationUI.xcodeproj/project.pbxproj +++ b/submodules/LocationUI/LocationUI.xcodeproj/project.pbxproj @@ -663,17 +663,6 @@ explicitFileType text.script.python - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E29E1165C1F00000000 isa @@ -706,7 +695,6 @@ ]]> children - 1DD70E291289FAA500000000 1DD70E29E1165C1F00000000 1DD70E29FAFE229100000000 @@ -767,13 +755,6 @@ B401C979C806358400000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F04E1165C1F00000000 isa @@ -794,7 +775,6 @@ PBXSourcesBuildPhase files - E7A30F041289FAA500000000 E7A30F04E1165C1F00000000 E7A30F04FAFE229100000000 diff --git a/submodules/LocationUI/LocationUI_Xcode.xcodeproj/project.pbxproj b/submodules/LocationUI/LocationUI_Xcode.xcodeproj/project.pbxproj index 8536397cd7..fb3f7e6dbb 100644 --- a/submodules/LocationUI/LocationUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/LocationUI/LocationUI_Xcode.xcodeproj/project.pbxproj @@ -22,8 +22,8 @@ D0C9C6B12301D8E500FAB518 /* ShareController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C6B02301D8E500FAB518 /* ShareController.framework */; }; D0C9C6B32301D8EB00FAB518 /* AccountContext.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C6B22301D8EB00FAB518 /* AccountContext.framework */; }; D0C9C6B52301D8F000FAB518 /* OpenInExternalAppUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C6B42301D8F000FAB518 /* OpenInExternalAppUI.framework */; }; - D0C9C6B72301D8FE00FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C6B62301D8FE00FAB518 /* FrameworkBundle.swift */; }; D0C9C6BD2301D94000FAB518 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C6BC2301D94000FAB518 /* CoreLocation.framework */; }; + D0EFF268231981E400CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF267231981E400CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -44,8 +44,8 @@ D0C9C6B02301D8E500FAB518 /* ShareController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ShareController.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C6B22301D8EB00FAB518 /* AccountContext.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AccountContext.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C6B42301D8F000FAB518 /* OpenInExternalAppUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OpenInExternalAppUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D0C9C6B62301D8FE00FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D0C9C6BC2301D94000FAB518 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; + D0EFF267231981E400CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -53,6 +53,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF268231981E400CF5164 /* AppBundle.framework in Frameworks */, D0C9C6BD2301D94000FAB518 /* CoreLocation.framework in Frameworks */, D0C9C6B52301D8F000FAB518 /* OpenInExternalAppUI.framework in Frameworks */, D0C9C6B32301D8EB00FAB518 /* AccountContext.framework in Frameworks */, @@ -95,7 +96,6 @@ children = ( D0C9C6A92301D8CB00FAB518 /* LegacyLocationController.swift */, D0C9C6A82301D8CB00FAB518 /* LegacyLocationPicker.swift */, - D0C9C6B62301D8FE00FAB518 /* FrameworkBundle.swift */, D0C9C68D2301D83500FAB518 /* LocationUI.h */, ); path = Sources; @@ -104,6 +104,7 @@ D0C9C6992301D89600FAB518 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF267231981E400CF5164 /* AppBundle.framework */, D0C9C6BC2301D94000FAB518 /* CoreLocation.framework */, D0C9C6B42301D8F000FAB518 /* OpenInExternalAppUI.framework */, D0C9C6B22301D8EB00FAB518 /* AccountContext.framework */, @@ -203,7 +204,6 @@ files = ( D0C9C6AA2301D8CB00FAB518 /* LegacyLocationPicker.swift in Sources */, D0C9C6AB2301D8CB00FAB518 /* LegacyLocationController.swift in Sources */, - D0C9C6B72301D8FE00FAB518 /* FrameworkBundle.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/submodules/LocationUI/Sources/FrameworkBundle.swift b/submodules/LocationUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/LocationUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/LocationUI/Sources/LegacyLocationController.swift b/submodules/LocationUI/Sources/LegacyLocationController.swift index 32a18df551..4c8903b1bb 100644 --- a/submodules/LocationUI/Sources/LegacyLocationController.swift +++ b/submodules/LocationUI/Sources/LegacyLocationController.swift @@ -9,6 +9,7 @@ import AccountContext import ShareController import LegacyUI import OpenInExternalAppUI +import AppBundle private func generateClearIcon(color: UIColor) -> UIImage? { return generateTintedImage(image: UIImage(bundleImageName: "Components/Search Bar/Clear"), color: color) diff --git a/submodules/LocationUI/Sources/LegacyLocationPicker.swift b/submodules/LocationUI/Sources/LegacyLocationPicker.swift index 7e277d6947..bdb9575906 100644 --- a/submodules/LocationUI/Sources/LegacyLocationPicker.swift +++ b/submodules/LocationUI/Sources/LegacyLocationPicker.swift @@ -8,6 +8,7 @@ import SwiftSignalKit import TelegramPresentationData import AccountContext import LegacyUI +import AppBundle private func generateClearIcon(color: UIColor) -> UIImage? { return generateTintedImage(image: UIImage(bundleImageName: "Components/Search Bar/Clear"), color: color) diff --git a/submodules/MessageReactionListUI/BUCK b/submodules/MessageReactionListUI/BUCK index 0bc259397c..ac7c739abf 100644 --- a/submodules/MessageReactionListUI/BUCK +++ b/submodules/MessageReactionListUI/BUCK @@ -6,16 +6,15 @@ static_library( "Sources/**/*.swift", ]), deps = [ + "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", "//submodules/TelegramCore:TelegramCore#shared", "//submodules/Postbox:Postbox#shared", - "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", + "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared", "//submodules/Display:Display#shared", - "//submodules/LocalMediaResources:LocalMediaResources", - "//submodules/TinyThumbnail:TinyThumbnail", - "//submodules/ImageBlur:ImageBlur", - "//submodules/MediaResources:MediaResources", - "//submodules/PhotoResources:PhotoResources", - "//submodules/PersistentStringHash:PersistentStringHash", + "//submodules/TelegramPresentationData:TelegramPresentationData", + "//submodules/AccountContext:AccountContext", + "//submodules/MergeLists:MergeLists", + "//submodules/ItemListPeerItem:ItemListPeerItem", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/MessageReactionListUI/MessageReactionListUI.xcodeproj/project.pbxproj b/submodules/MessageReactionListUI/MessageReactionListUI.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..f7fe13fca9 --- /dev/null +++ b/submodules/MessageReactionListUI/MessageReactionListUI.xcodeproj/project.pbxproj @@ -0,0 +1,1015 @@ + + + + + archiveVersion + 1 + classes + + + objectVersion + 46 + objects + + 1DD70E29ADE5417300000000 + + isa + PBXFileReference + name + MessageReactionListUI-Debug.xcconfig + path + ../../buck-out/gen/submodules/MessageReactionListUI/MessageReactionListUI-Debug.xcconfig + sourceTree + SOURCE_ROOT + explicitFileType + text.xcconfig + + 1DD70E29AEBD481D00000000 + + isa + PBXFileReference + name + MessageReactionListUI-Profile.xcconfig + path + ../../buck-out/gen/submodules/MessageReactionListUI/MessageReactionListUI-Profile.xcconfig + sourceTree + SOURCE_ROOT + explicitFileType + text.xcconfig + + 1DD70E292253F37F00000000 + + isa + PBXFileReference + name + MessageReactionListUI-Release.xcconfig + path + ../../buck-out/gen/submodules/MessageReactionListUI/MessageReactionListUI-Release.xcconfig + sourceTree + SOURCE_ROOT + explicitFileType + text.xcconfig + + B401C9792F7F325000000000 + + isa + PBXGroup + name + Buck (Do Not Modify) + sourceTree + ]]> + children + + 1DD70E29ADE5417300000000 + 1DD70E29AEBD481D00000000 + 1DD70E292253F37F00000000 + + + B401C979B781F65D00000000 + + isa + PBXGroup + name + Configurations + sourceTree + ]]> + children + + B401C9792F7F325000000000 + + + 1DD70E299D2580DA00000000 + + isa + PBXFileReference + name + libAccountContext.a + path + libAccountContext.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E29BF0846EE00000000 + + isa + PBXFileReference + name + libActivityIndicator.a + path + libActivityIndicator.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E292420028600000000 + + isa + PBXFileReference + name + libAnimationUI.a + path + libAnimationUI.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E29A54A195300000000 + + isa + PBXFileReference + name + libAvatarNode.a + path + libAvatarNode.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E2997B4D6D800000000 + + isa + PBXFileReference + name + libCheckNode.a + path + libCheckNode.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E295915423000000000 + + isa + PBXFileReference + name + libDeviceLocationManager.a + path + libDeviceLocationManager.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E29FF334B1F00000000 + + isa + PBXFileReference + name + libDisplay.dylib + path + libDisplay.dylib + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + compiled.mach-o.dylib + + 1DD70E29D6F14E1000000000 + + isa + PBXFileReference + name + libImageBlur.a + path + libImageBlur.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E299A24C4DE00000000 + + isa + PBXFileReference + name + libItemListPeerItem.a + path + libItemListPeerItem.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E295A26607D00000000 + + isa + PBXFileReference + name + libItemListUI.a + path + libItemListUI.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E29CE34063500000000 + + isa + PBXFileReference + name + libLocalizedPeerData.a + path + libLocalizedPeerData.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E2936DE2CF900000000 + + isa + PBXFileReference + name + libMediaResources.a + path + libMediaResources.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E29C37F741500000000 + + isa + PBXFileReference + name + libMergeLists.a + path + libMergeLists.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E29D233F68C00000000 + + isa + PBXFileReference + name + libPeerPresenceStatusManager.a + path + libPeerPresenceStatusManager.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E290F1A3C6400000000 + + isa + PBXFileReference + name + libPlatformRestrictionMatching.a + path + libPlatformRestrictionMatching.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E29DB6520C800000000 + + isa + PBXFileReference + name + libPostbox.dylib + path + libPostbox.dylib + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + compiled.mach-o.dylib + + 1DD70E29CBE117ED00000000 + + isa + PBXFileReference + name + libProgressNavigationButtonNode.a + path + libProgressNavigationButtonNode.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E293594DCC000000000 + + isa + PBXFileReference + name + libStickerResources.a + path + libStickerResources.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E29D65BA68200000000 + + isa + PBXFileReference + name + libSwiftSignalKit.dylib + path + libSwiftSignalKit.dylib + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + compiled.mach-o.dylib + + 1DD70E2925BBFEEE00000000 + + isa + PBXFileReference + name + libSwitchNode.a + path + libSwitchNode.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E29F33FDAC300000000 + + isa + PBXFileReference + name + libTelegramAudio.a + path + libTelegramAudio.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E29119CDA0700000000 + + isa + PBXFileReference + name + libTelegramCore.dylib + path + libTelegramCore.dylib + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + compiled.mach-o.dylib + + 1DD70E2984A59C1D00000000 + + isa + PBXFileReference + name + libTelegramPresentationData.a + path + libTelegramPresentationData.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E29DD3C940F00000000 + + isa + PBXFileReference + name + libTelegramStringFormatting.a + path + libTelegramStringFormatting.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E292395015100000000 + + isa + PBXFileReference + name + libTelegramUIPreferences.a + path + libTelegramUIPreferences.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E29BA06E3A600000000 + + isa + PBXFileReference + name + libTemporaryCachedPeerDataManager.a + path + libTemporaryCachedPeerDataManager.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E29F0C15F9C00000000 + + isa + PBXFileReference + name + libTextFormat.a + path + libTextFormat.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E29CD296A8300000000 + + isa + PBXFileReference + name + libTuples.a + path + libTuples.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E2951398CF200000000 + + isa + PBXFileReference + name + libUniversalMediaPlayer.a + path + libUniversalMediaPlayer.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + B401C97968022A5500000000 + + isa + PBXGroup + name + Frameworks + sourceTree + ]]> + children + + 1DD70E299D2580DA00000000 + 1DD70E29BF0846EE00000000 + 1DD70E292420028600000000 + 1DD70E29A54A195300000000 + 1DD70E2997B4D6D800000000 + 1DD70E295915423000000000 + 1DD70E29FF334B1F00000000 + 1DD70E29D6F14E1000000000 + 1DD70E299A24C4DE00000000 + 1DD70E295A26607D00000000 + 1DD70E29CE34063500000000 + 1DD70E2936DE2CF900000000 + 1DD70E29C37F741500000000 + 1DD70E29D233F68C00000000 + 1DD70E290F1A3C6400000000 + 1DD70E29DB6520C800000000 + 1DD70E29CBE117ED00000000 + 1DD70E293594DCC000000000 + 1DD70E29D65BA68200000000 + 1DD70E2925BBFEEE00000000 + 1DD70E29F33FDAC300000000 + 1DD70E29119CDA0700000000 + 1DD70E2984A59C1D00000000 + 1DD70E29DD3C940F00000000 + 1DD70E292395015100000000 + 1DD70E29BA06E3A600000000 + 1DD70E29F0C15F9C00000000 + 1DD70E29CD296A8300000000 + 1DD70E2951398CF200000000 + + + 1DD70E29001F47FB00000000 + + isa + PBXFileReference + name + BUCK + path + BUCK + sourceTree + SOURCE_ROOT + explicitFileType + text.script.python + + 1DD70E298DEA121500000000 + + isa + PBXFileReference + name + MessageReactionCategoryNode.swift + path + Sources/MessageReactionCategoryNode.swift + sourceTree + SOURCE_ROOT + + 1DD70E29C02D1D4F00000000 + + isa + PBXFileReference + name + MessageReactionListController.swift + path + Sources/MessageReactionListController.swift + sourceTree + SOURCE_ROOT + + B401C979EAB5339800000000 + + isa + PBXGroup + name + Sources + sourceTree + ]]> + children + + 1DD70E298DEA121500000000 + 1DD70E29C02D1D4F00000000 + + + B401C979639FD30200000000 + + isa + PBXGroup + name + MessageReactionListUI + sourceTree + ]]> + children + + 1DD70E29001F47FB00000000 + B401C979EAB5339800000000 + + + 1DD70E29730E785000000000 + + isa + PBXFileReference + name + libMessageReactionListUI.a + path + libMessageReactionListUI.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + B401C979C806358400000000 + + isa + PBXGroup + name + Products + sourceTree + ]]> + children + + 1DD70E29730E785000000000 + + + B401C979EFB6AC4600000000 + + isa + PBXGroup + name + mainGroup + sourceTree + ]]> + children + + B401C979B781F65D00000000 + B401C97968022A5500000000 + B401C979639FD30200000000 + B401C979C806358400000000 + + + E7A30F048DEA121500000000 + + isa + PBXBuildFile + fileRef + 1DD70E298DEA121500000000 + + E7A30F04C02D1D4F00000000 + + isa + PBXBuildFile + fileRef + 1DD70E29C02D1D4F00000000 + + 1870857F0000000000000000 + + isa + PBXSourcesBuildPhase + files + + E7A30F048DEA121500000000 + E7A30F04C02D1D4F00000000 + + + E7A30F04D65BA68200000000 + + isa + PBXBuildFile + fileRef + 1DD70E29D65BA68200000000 + + E7A30F045915423000000000 + + isa + PBXBuildFile + fileRef + 1DD70E295915423000000000 + + E7A30F04FF334B1F00000000 + + isa + PBXBuildFile + fileRef + 1DD70E29FF334B1F00000000 + + E7A30F04DB6520C800000000 + + isa + PBXBuildFile + fileRef + 1DD70E29DB6520C800000000 + + E7A30F04F33FDAC300000000 + + isa + PBXBuildFile + fileRef + 1DD70E29F33FDAC300000000 + + E7A30F04119CDA0700000000 + + isa + PBXBuildFile + fileRef + 1DD70E29119CDA0700000000 + + E7A30F0451398CF200000000 + + isa + PBXBuildFile + fileRef + 1DD70E2951398CF200000000 + + E7A30F0436DE2CF900000000 + + isa + PBXBuildFile + fileRef + 1DD70E2936DE2CF900000000 + + E7A30F042395015100000000 + + isa + PBXBuildFile + fileRef + 1DD70E292395015100000000 + + E7A30F0484A59C1D00000000 + + isa + PBXBuildFile + fileRef + 1DD70E2984A59C1D00000000 + + E7A30F04CE34063500000000 + + isa + PBXBuildFile + fileRef + 1DD70E29CE34063500000000 + + E7A30F040F1A3C6400000000 + + isa + PBXBuildFile + fileRef + 1DD70E290F1A3C6400000000 + + E7A30F04F0C15F9C00000000 + + isa + PBXBuildFile + fileRef + 1DD70E29F0C15F9C00000000 + + E7A30F04DD3C940F00000000 + + isa + PBXBuildFile + fileRef + 1DD70E29DD3C940F00000000 + + E7A30F04BA06E3A600000000 + + isa + PBXBuildFile + fileRef + 1DD70E29BA06E3A600000000 + + E7A30F049D2580DA00000000 + + isa + PBXBuildFile + fileRef + 1DD70E299D2580DA00000000 + + E7A30F04D6F14E1000000000 + + isa + PBXBuildFile + fileRef + 1DD70E29D6F14E1000000000 + + E7A30F04CD296A8300000000 + + isa + PBXBuildFile + fileRef + 1DD70E29CD296A8300000000 + + E7A30F043594DCC000000000 + + isa + PBXBuildFile + fileRef + 1DD70E293594DCC000000000 + + E7A30F042420028600000000 + + isa + PBXBuildFile + fileRef + 1DD70E292420028600000000 + + E7A30F04A54A195300000000 + + isa + PBXBuildFile + fileRef + 1DD70E29A54A195300000000 + + E7A30F0497B4D6D800000000 + + isa + PBXBuildFile + fileRef + 1DD70E2997B4D6D800000000 + + E7A30F04C37F741500000000 + + isa + PBXBuildFile + fileRef + 1DD70E29C37F741500000000 + + E7A30F04BF0846EE00000000 + + isa + PBXBuildFile + fileRef + 1DD70E29BF0846EE00000000 + + E7A30F04CBE117ED00000000 + + isa + PBXBuildFile + fileRef + 1DD70E29CBE117ED00000000 + + E7A30F0425BBFEEE00000000 + + isa + PBXBuildFile + fileRef + 1DD70E2925BBFEEE00000000 + + E7A30F045A26607D00000000 + + isa + PBXBuildFile + fileRef + 1DD70E295A26607D00000000 + + E7A30F04D233F68C00000000 + + isa + PBXBuildFile + fileRef + 1DD70E29D233F68C00000000 + + E7A30F049A24C4DE00000000 + + isa + PBXBuildFile + fileRef + 1DD70E299A24C4DE00000000 + + FAF5FAC90000000000000000 + + isa + PBXCopyFilesBuildPhase + files + + E7A30F04D65BA68200000000 + E7A30F045915423000000000 + E7A30F04FF334B1F00000000 + E7A30F04DB6520C800000000 + E7A30F04F33FDAC300000000 + E7A30F04119CDA0700000000 + E7A30F0451398CF200000000 + E7A30F0436DE2CF900000000 + E7A30F042395015100000000 + E7A30F0484A59C1D00000000 + E7A30F04CE34063500000000 + E7A30F040F1A3C6400000000 + E7A30F04F0C15F9C00000000 + E7A30F04DD3C940F00000000 + E7A30F04BA06E3A600000000 + E7A30F049D2580DA00000000 + E7A30F04D6F14E1000000000 + E7A30F04CD296A8300000000 + E7A30F043594DCC000000000 + E7A30F042420028600000000 + E7A30F04A54A195300000000 + E7A30F0497B4D6D800000000 + E7A30F04C37F741500000000 + E7A30F04BF0846EE00000000 + E7A30F04CBE117ED00000000 + E7A30F0425BBFEEE00000000 + E7A30F045A26607D00000000 + E7A30F04D233F68C00000000 + E7A30F049A24C4DE00000000 + + name + Fake Swift Dependencies (Copy Files Phase) + runOnlyForDeploymentPostprocessing + 1 + dstSubfolderSpec + 16 + dstPath + + + 4952437303EDA63300000000 + + isa + XCBuildConfiguration + name + Debug + buildSettings + + + baseConfigurationReference + 1DD70E29ADE5417300000000 + + 4952437350C7218900000000 + + isa + XCBuildConfiguration + name + Profile + buildSettings + + + baseConfigurationReference + 1DD70E29AEBD481D00000000 + + 49524373A439BFE700000000 + + isa + XCBuildConfiguration + name + Release + buildSettings + + + baseConfigurationReference + 1DD70E292253F37F00000000 + + 218C37090000000000000000 + + isa + XCConfigurationList + buildConfigurations + + 4952437303EDA63300000000 + 4952437350C7218900000000 + 49524373A439BFE700000000 + + defaultConfigurationIsVisible + + + E66DC04E639FD30200000000 + + isa + PBXNativeTarget + name + MessageReactionListUI + productName + MessageReactionListUI + productReference + 1DD70E29730E785000000000 + productType + com.apple.product-type.library.static + dependencies + + + buildPhases + + 1870857F0000000000000000 + FAF5FAC90000000000000000 + + buildConfigurationList + 218C37090000000000000000 + + 4952437303EDA63300000001 + + isa + XCBuildConfiguration + name + Debug + buildSettings + + + + 4952437350C7218900000001 + + isa + XCBuildConfiguration + name + Profile + buildSettings + + + + 49524373A439BFE700000001 + + isa + XCBuildConfiguration + name + Release + buildSettings + + + + 218C37090000000000000001 + + isa + XCConfigurationList + buildConfigurations + + 4952437303EDA63300000001 + 4952437350C7218900000001 + 49524373A439BFE700000001 + + defaultConfigurationIsVisible + + + 96C84793639FD30200000000 + + isa + PBXProject + mainGroup + B401C979EFB6AC4600000000 + targets + + E66DC04E639FD30200000000 + + buildConfigurationList + 218C37090000000000000001 + compatibilityVersion + Xcode 3.2 + attributes + + LastUpgradeCheck + 9999 + + + + rootObject + 96C84793639FD30200000000 + + \ No newline at end of file diff --git a/submodules/MessageReactionListUI/MessageReactionListUI.xcodeproj/xcshareddata/xcschemes/MessageReactionListUI.xcscheme b/submodules/MessageReactionListUI/MessageReactionListUI.xcodeproj/xcshareddata/xcschemes/MessageReactionListUI.xcscheme new file mode 100644 index 0000000000..230d2151ca --- /dev/null +++ b/submodules/MessageReactionListUI/MessageReactionListUI.xcodeproj/xcshareddata/xcschemes/MessageReactionListUI.xcscheme @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/submodules/OpenInExternalAppUI/BUCK b/submodules/OpenInExternalAppUI/BUCK index 2915332ff7..6022b3bef3 100644 --- a/submodules/OpenInExternalAppUI/BUCK +++ b/submodules/OpenInExternalAppUI/BUCK @@ -15,6 +15,7 @@ static_library( "//submodules/TelegramPresentationData:TelegramPresentationData", "//submodules/PhotoResources:PhotoResources", "//submodules/UrlEscaping:UrlEscaping", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/OpenInExternalAppUI/OpenInExternalAppUI.xcodeproj/project.pbxproj b/submodules/OpenInExternalAppUI/OpenInExternalAppUI.xcodeproj/project.pbxproj index fbfbbc0033..88224d5764 100644 --- a/submodules/OpenInExternalAppUI/OpenInExternalAppUI.xcodeproj/project.pbxproj +++ b/submodules/OpenInExternalAppUI/OpenInExternalAppUI.xcodeproj/project.pbxproj @@ -411,17 +411,6 @@ explicitFileType text.script.python - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E29BC094D7B00000000 isa @@ -465,7 +454,6 @@ ]]> children - 1DD70E291289FAA500000000 1DD70E29BC094D7B00000000 1DD70E29DAE6437F00000000 1DD70E298AC3E5D400000000 @@ -527,13 +515,6 @@ B401C979C806358400000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F04BC094D7B00000000 isa @@ -561,7 +542,6 @@ PBXSourcesBuildPhase files - E7A30F041289FAA500000000 E7A30F04BC094D7B00000000 E7A30F04DAE6437F00000000 E7A30F048AC3E5D400000000 diff --git a/submodules/OpenInExternalAppUI/OpenInExternalAppUI_Xcode.xcodeproj/project.pbxproj b/submodules/OpenInExternalAppUI/OpenInExternalAppUI_Xcode.xcodeproj/project.pbxproj index e0469f8a62..ed93bc31ae 100644 --- a/submodules/OpenInExternalAppUI/OpenInExternalAppUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/OpenInExternalAppUI/OpenInExternalAppUI_Xcode.xcodeproj/project.pbxproj @@ -24,7 +24,7 @@ D0C9C4352300D6B500FAB518 /* PhotoResources.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C4342300D6B500FAB518 /* PhotoResources.framework */; }; D0C9C4372300D6C100FAB518 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C4362300D6C000FAB518 /* CoreLocation.framework */; }; D0C9C4392300D6C400FAB518 /* UrlEscaping.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C4382300D6C400FAB518 /* UrlEscaping.framework */; }; - D0C9C43F2300D75500FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C43E2300D75500FAB518 /* FrameworkBundle.swift */; }; + D0EFF25A2319813400CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF2592319813400CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -47,7 +47,7 @@ D0C9C4342300D6B500FAB518 /* PhotoResources.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PhotoResources.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C4362300D6C000FAB518 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; D0C9C4382300D6C400FAB518 /* UrlEscaping.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = UrlEscaping.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D0C9C43E2300D75500FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; + D0EFF2592319813400CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -55,6 +55,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF25A2319813400CF5164 /* AppBundle.framework in Frameworks */, D0C9C4392300D6C400FAB518 /* UrlEscaping.framework in Frameworks */, D0C9C4372300D6C100FAB518 /* CoreLocation.framework in Frameworks */, D0C9C4352300D6B500FAB518 /* PhotoResources.framework in Frameworks */, @@ -98,7 +99,6 @@ D0C9C41A2300D67800FAB518 /* OpenInActionSheetController.swift */, D0C9C41B2300D67800FAB518 /* OpenInAppIconResources.swift */, D0C9C4192300D67800FAB518 /* OpenInOptions.swift */, - D0C9C43E2300D75500FAB518 /* FrameworkBundle.swift */, D0C9C40D2300D60C00FAB518 /* OpenInExternalAppUI.h */, ); path = Sources; @@ -107,6 +107,7 @@ D0C9C41F2300D68A00FAB518 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF2592319813400CF5164 /* AppBundle.framework */, D0C9C4382300D6C400FAB518 /* UrlEscaping.framework */, D0C9C4362300D6C000FAB518 /* CoreLocation.framework */, D0C9C4342300D6B500FAB518 /* PhotoResources.framework */, @@ -204,7 +205,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - D0C9C43F2300D75500FAB518 /* FrameworkBundle.swift in Sources */, D0C9C41D2300D67800FAB518 /* OpenInActionSheetController.swift in Sources */, D0C9C41C2300D67800FAB518 /* OpenInOptions.swift in Sources */, D0C9C41E2300D67800FAB518 /* OpenInAppIconResources.swift in Sources */, diff --git a/submodules/OpenInExternalAppUI/Sources/FrameworkBundle.swift b/submodules/OpenInExternalAppUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/OpenInExternalAppUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/OpenInExternalAppUI/Sources/OpenInActionSheetController.swift b/submodules/OpenInExternalAppUI/Sources/OpenInActionSheetController.swift index 2b59aa3d95..900de7cdab 100644 --- a/submodules/OpenInExternalAppUI/Sources/OpenInActionSheetController.swift +++ b/submodules/OpenInExternalAppUI/Sources/OpenInActionSheetController.swift @@ -9,6 +9,7 @@ import MapKit import TelegramPresentationData import AccountContext import PhotoResources +import AppBundle public struct OpenInControllerAction { public let title: String diff --git a/submodules/PasscodeUI/BUCK b/submodules/PasscodeUI/BUCK index 56dc1ce5af..306511e065 100644 --- a/submodules/PasscodeUI/BUCK +++ b/submodules/PasscodeUI/BUCK @@ -18,6 +18,7 @@ static_library( "//submodules/LegacyComponents:LegacyComponents", "//submodules/TelegramStringFormatting:TelegramStringFormatting", "//submodules/ImageBlur:ImageBlur", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/PasscodeUI/PasscodeUI.xcodeproj/project.pbxproj b/submodules/PasscodeUI/PasscodeUI.xcodeproj/project.pbxproj index 877b968393..769fc9bc55 100644 --- a/submodules/PasscodeUI/PasscodeUI.xcodeproj/project.pbxproj +++ b/submodules/PasscodeUI/PasscodeUI.xcodeproj/project.pbxproj @@ -355,17 +355,6 @@ explicitFileType text.script.python - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E2944FAB31100000000 isa @@ -486,7 +475,6 @@ ]]> children - 1DD70E291289FAA500000000 1DD70E2944FAB31100000000 1DD70E298C702AD500000000 1DD70E297F6C137700000000 @@ -555,13 +543,6 @@ B401C979C806358400000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F0444FAB31100000000 isa @@ -638,7 +619,6 @@ PBXSourcesBuildPhase files - E7A30F041289FAA500000000 E7A30F0444FAB31100000000 E7A30F048C702AD500000000 E7A30F047F6C137700000000 diff --git a/submodules/PasscodeUI/PasscodeUI_Xcode.xcodeproj/project.pbxproj b/submodules/PasscodeUI/PasscodeUI_Xcode.xcodeproj/project.pbxproj index 7c5dbbf5ae..2cf5134e1f 100644 --- a/submodules/PasscodeUI/PasscodeUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/PasscodeUI/PasscodeUI_Xcode.xcodeproj/project.pbxproj @@ -32,7 +32,7 @@ D0C9CA32230229DE00FAB518 /* TelegramCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9CA31230229DE00FAB518 /* TelegramCore.framework */; }; D0C9CA34230229F100FAB518 /* LegacyComponents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9CA33230229F100FAB518 /* LegacyComponents.framework */; }; D0C9CA3623022A7400FAB518 /* TelegramStringFormatting.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9CA3523022A7400FAB518 /* TelegramStringFormatting.framework */; }; - D0C9CA3A23022AA300FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9CA3923022AA300FAB518 /* FrameworkBundle.swift */; }; + D0EFF274231982DF00CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF273231982DF00CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -63,7 +63,7 @@ D0C9CA31230229DE00FAB518 /* TelegramCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9CA33230229F100FAB518 /* LegacyComponents.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LegacyComponents.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9CA3523022A7400FAB518 /* TelegramStringFormatting.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramStringFormatting.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D0C9CA3923022AA300FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; + D0EFF273231982DF00CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -71,6 +71,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF274231982DF00CF5164 /* AppBundle.framework in Frameworks */, D0C9CA3623022A7400FAB518 /* TelegramStringFormatting.framework in Frameworks */, D0C9CA34230229F100FAB518 /* LegacyComponents.framework in Frameworks */, D0C9CA32230229DE00FAB518 /* TelegramCore.framework in Frameworks */, @@ -122,7 +123,6 @@ D0C9CA092302293300FAB518 /* PasscodeLockIconNode.swift */, D0C9CA0D2302293400FAB518 /* PasscodeSetupController.swift */, D0C9CA072302293300FAB518 /* PasscodeSetupControllerNode.swift */, - D0C9CA3923022AA300FAB518 /* FrameworkBundle.swift */, D0C9C9F8230228D400FAB518 /* PasscodeUI.h */, ); path = Sources; @@ -131,6 +131,7 @@ D0C9CA1A2302298D00FAB518 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF273231982DF00CF5164 /* AppBundle.framework */, D0C9CA3523022A7400FAB518 /* TelegramStringFormatting.framework */, D0C9CA33230229F100FAB518 /* LegacyComponents.framework */, D0C9CA31230229DE00FAB518 /* TelegramCore.framework */, @@ -237,7 +238,6 @@ D0C9CA142302293400FAB518 /* PasscodeEntryInputFieldNode.swift in Sources */, D0C9CA122302293400FAB518 /* PasscodeLayout.swift in Sources */, D0C9CA132302293400FAB518 /* PasscodeLockIconNode.swift in Sources */, - D0C9CA3A23022AA300FAB518 /* FrameworkBundle.swift in Sources */, D0C9CA102302293400FAB518 /* PasscodeEntryController.swift in Sources */, D0C9CA112302293400FAB518 /* PasscodeSetupControllerNode.swift in Sources */, ); diff --git a/submodules/PasscodeUI/Sources/FrameworkBundle.swift b/submodules/PasscodeUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/PasscodeUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/PasscodeUI/Sources/PasscodeEntryControllerNode.swift b/submodules/PasscodeUI/Sources/PasscodeEntryControllerNode.swift index eedb3a847c..964b471071 100644 --- a/submodules/PasscodeUI/Sources/PasscodeEntryControllerNode.swift +++ b/submodules/PasscodeUI/Sources/PasscodeEntryControllerNode.swift @@ -8,6 +8,7 @@ import TelegramCore import TelegramPresentationData import AccountContext import LocalAuth +import AppBundle private let titleFont = Font.regular(20.0) private let subtitleFont = Font.regular(15.0) diff --git a/submodules/PassportUI/BUCK b/submodules/PassportUI/BUCK index a852478a96..bb0d57f428 100644 --- a/submodules/PassportUI/BUCK +++ b/submodules/PassportUI/BUCK @@ -21,6 +21,7 @@ static_library( "//submodules/ImageCompression:ImageCompression", "//submodules/DateSelectionUI:DateSelectionUI", "//submodules/PasswordSetupUI:PasswordSetupUI", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/PassportUI/PassportUI.xcodeproj/project.pbxproj b/submodules/PassportUI/PassportUI.xcodeproj/project.pbxproj index 69e01318db..dd6be374f8 100644 --- a/submodules/PassportUI/PassportUI.xcodeproj/project.pbxproj +++ b/submodules/PassportUI/PassportUI.xcodeproj/project.pbxproj @@ -1058,17 +1058,6 @@ sourceTree SOURCE_ROOT - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E296E38F8E200000000 isa @@ -1389,7 +1378,6 @@ B401C979002180E400000000 1DD70E29D4C9F26B00000000 - 1DD70E291289FAA500000000 1DD70E296E38F8E200000000 1DD70E2942DAF07900000000 1DD70E290BAD464900000000 @@ -1560,13 +1548,6 @@ fileRef 1DD70E29D4C9F26B00000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F046E38F8E200000000 isa @@ -1781,7 +1762,6 @@ E7A30F04B3F9004500000000 E7A30F04F5ED8FFF00000000 E7A30F04D4C9F26B00000000 - E7A30F041289FAA500000000 E7A30F046E38F8E200000000 E7A30F0442DAF07900000000 E7A30F040BAD464900000000 diff --git a/submodules/PassportUI/PassportUI_Xcode.xcodeproj/project.pbxproj b/submodules/PassportUI/PassportUI_Xcode.xcodeproj/project.pbxproj index c38de867f1..a05ab118fb 100644 --- a/submodules/PassportUI/PassportUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/PassportUI/PassportUI_Xcode.xcodeproj/project.pbxproj @@ -55,7 +55,6 @@ D0C9C255230022E000FAB518 /* TelegramPresentationData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C254230022E000FAB518 /* TelegramPresentationData.framework */; }; D0C9C25923009EC900FAB518 /* FindSecureIdValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C25823009EC900FAB518 /* FindSecureIdValue.swift */; }; D0C9C2812300A04900FAB518 /* PhoneInputNode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C2802300A04900FAB518 /* PhoneInputNode.framework */; }; - D0C9C2852300A0BF00FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C2842300A0BF00FAB518 /* FrameworkBundle.swift */; }; D0C9C2B32300A1D300FAB518 /* CountrySelectionUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C2B22300A1D300FAB518 /* CountrySelectionUI.framework */; }; D0C9C3332300AA0100FAB518 /* GalleryUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C3322300AA0100FAB518 /* GalleryUI.framework */; }; D0C9C4492300E15E00FAB518 /* LegacySecureIdAttachmentMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C4482300E15E00FAB518 /* LegacySecureIdAttachmentMenu.swift */; }; @@ -66,6 +65,7 @@ D0C9C4BF2300E5B400FAB518 /* ImageCompression.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C4BE2300E5B400FAB518 /* ImageCompression.framework */; }; D0C9C4DA2300E67200FAB518 /* DateSelectionUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C4D92300E67200FAB518 /* DateSelectionUI.framework */; }; D0C9C52D2300EFB100FAB518 /* PasswordSetupUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C52C2300EFB100FAB518 /* PasswordSetupUI.framework */; }; + D0EFF2602319818400CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF25F2319818400CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -119,7 +119,6 @@ D0C9C254230022E000FAB518 /* TelegramPresentationData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramPresentationData.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C25823009EC900FAB518 /* FindSecureIdValue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FindSecureIdValue.swift; sourceTree = ""; }; D0C9C2802300A04900FAB518 /* PhoneInputNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PhoneInputNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D0C9C2842300A0BF00FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D0C9C2B22300A1D300FAB518 /* CountrySelectionUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CountrySelectionUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C3322300AA0100FAB518 /* GalleryUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = GalleryUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C4482300E15E00FAB518 /* LegacySecureIdAttachmentMenu.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LegacySecureIdAttachmentMenu.swift; sourceTree = ""; }; @@ -130,6 +129,7 @@ D0C9C4BE2300E5B400FAB518 /* ImageCompression.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ImageCompression.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C4D92300E67200FAB518 /* DateSelectionUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = DateSelectionUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C52C2300EFB100FAB518 /* PasswordSetupUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PasswordSetupUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D0EFF25F2319818400CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -137,6 +137,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF2602319818400CF5164 /* AppBundle.framework in Frameworks */, D0C9C52D2300EFB100FAB518 /* PasswordSetupUI.framework in Frameworks */, D0C9C4DA2300E67200FAB518 /* DateSelectionUI.framework in Frameworks */, D0C9C4BF2300E5B400FAB518 /* ImageCompression.framework in Frameworks */, @@ -211,7 +212,6 @@ D0C9C25823009EC900FAB518 /* FindSecureIdValue.swift */, D0C9C4482300E15E00FAB518 /* LegacySecureIdAttachmentMenu.swift */, D0C9C44E2300E1D600FAB518 /* LegacySecureIdScanController.swift */, - D0C9C2842300A0BF00FAB518 /* FrameworkBundle.swift */, D0C9C1EE2300222100FAB518 /* PassportUI.h */, ); path = Sources; @@ -238,6 +238,7 @@ D0C9C245230022BF00FAB518 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF25F2319818400CF5164 /* AppBundle.framework */, D0C9C52C2300EFB100FAB518 /* PasswordSetupUI.framework */, D0C9C4D92300E67200FAB518 /* DateSelectionUI.framework */, D0C9C4BE2300E5B400FAB518 /* ImageCompression.framework */, @@ -361,7 +362,6 @@ D0C9C23C230022AB00FAB518 /* SecureIdAuthController.swift in Sources */, D0C9C22E230022AB00FAB518 /* FormControllerScrollerNode.swift in Sources */, D0C9C22C230022AB00FAB518 /* FormControllerActionItem.swift in Sources */, - D0C9C2852300A0BF00FAB518 /* FrameworkBundle.swift in Sources */, D0C9C237230022AB00FAB518 /* SecureIdAuthFormContentNode.swift in Sources */, D0C9C22D230022AB00FAB518 /* FormEditableBlockItemNode.swift in Sources */, D0C9C239230022AB00FAB518 /* SecureIdAuthPasswordOptionContentNode.swift in Sources */, diff --git a/submodules/PassportUI/Sources/FrameworkBundle.swift b/submodules/PassportUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/PassportUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/PassportUI/Sources/SecureIdAuthAcceptNode.swift b/submodules/PassportUI/Sources/SecureIdAuthAcceptNode.swift index ba1305eef0..9d10b38dc3 100644 --- a/submodules/PassportUI/Sources/SecureIdAuthAcceptNode.swift +++ b/submodules/PassportUI/Sources/SecureIdAuthAcceptNode.swift @@ -6,6 +6,7 @@ import Postbox import TelegramCore import SwiftSignalKit import TelegramPresentationData +import AppBundle private let textFont: UIFont = Font.regular(16.0) diff --git a/submodules/PassportUI/Sources/SecureIdAuthHeaderNode.swift b/submodules/PassportUI/Sources/SecureIdAuthHeaderNode.swift index 8727078f06..d183e98595 100644 --- a/submodules/PassportUI/Sources/SecureIdAuthHeaderNode.swift +++ b/submodules/PassportUI/Sources/SecureIdAuthHeaderNode.swift @@ -7,6 +7,7 @@ import TelegramCore import SwiftSignalKit import TelegramPresentationData import AvatarNode +import AppBundle private let avatarFont = UIFont(name: ".SFCompactRounded-Semibold", size: 26.0)! private let titleFont = Font.semibold(14.0) diff --git a/submodules/PassportUI/Sources/SecureIdAuthPasswordOptionContentNode.swift b/submodules/PassportUI/Sources/SecureIdAuthPasswordOptionContentNode.swift index 8dec00eebf..5da4d73188 100644 --- a/submodules/PassportUI/Sources/SecureIdAuthPasswordOptionContentNode.swift +++ b/submodules/PassportUI/Sources/SecureIdAuthPasswordOptionContentNode.swift @@ -4,6 +4,7 @@ import AsyncDisplayKit import Display import TelegramPresentationData import ActivityIndicator +import AppBundle private let passwordFont = Font.regular(16.0) private let buttonFont = Font.regular(17.0) diff --git a/submodules/PassportUI/Sources/SecureIdAuthPasswordSetupContentNode.swift b/submodules/PassportUI/Sources/SecureIdAuthPasswordSetupContentNode.swift index 0680a66849..6a0da6e4c1 100644 --- a/submodules/PassportUI/Sources/SecureIdAuthPasswordSetupContentNode.swift +++ b/submodules/PassportUI/Sources/SecureIdAuthPasswordSetupContentNode.swift @@ -3,6 +3,7 @@ import UIKit import AsyncDisplayKit import Display import TelegramPresentationData +import AppBundle private let titleFont = Font.regular(14.0) private let buttonFont = Font.regular(17.0) diff --git a/submodules/PassportUI/Sources/SecureIdDocumentFormControllerNode.swift b/submodules/PassportUI/Sources/SecureIdDocumentFormControllerNode.swift index 6ce48f0ca8..b2708d2a97 100644 --- a/submodules/PassportUI/Sources/SecureIdDocumentFormControllerNode.swift +++ b/submodules/PassportUI/Sources/SecureIdDocumentFormControllerNode.swift @@ -11,6 +11,7 @@ import AccountContext import GalleryUI import CountrySelectionUI import DateSelectionUI +import AppBundle private enum SecureIdDocumentFormTextField { case identifier diff --git a/submodules/PassportUI/Sources/SecureIdDocumentGalleryFooterContentNode.swift b/submodules/PassportUI/Sources/SecureIdDocumentGalleryFooterContentNode.swift index ea3162d838..94aa3f5fa9 100644 --- a/submodules/PassportUI/Sources/SecureIdDocumentGalleryFooterContentNode.swift +++ b/submodules/PassportUI/Sources/SecureIdDocumentGalleryFooterContentNode.swift @@ -9,6 +9,7 @@ import Photos import TelegramPresentationData import AccountContext import GalleryUI +import AppBundle private let deleteImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionTrash"), color: .white) diff --git a/submodules/PeerAvatarGalleryUI/BUCK b/submodules/PeerAvatarGalleryUI/BUCK index e188cb44d5..7952073484 100644 --- a/submodules/PeerAvatarGalleryUI/BUCK +++ b/submodules/PeerAvatarGalleryUI/BUCK @@ -19,6 +19,7 @@ static_library( "//submodules/PhotoResources:PhotoResources", "//submodules/RadialStatusNode:RadialStatusNode", "//submodules/ShareController:ShareController", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/PeerAvatarGalleryUI/PeerAvatarGalleryUI.xcodeproj/project.pbxproj b/submodules/PeerAvatarGalleryUI/PeerAvatarGalleryUI.xcodeproj/project.pbxproj index a45f8c89e4..125fed1831 100644 --- a/submodules/PeerAvatarGalleryUI/PeerAvatarGalleryUI.xcodeproj/project.pbxproj +++ b/submodules/PeerAvatarGalleryUI/PeerAvatarGalleryUI.xcodeproj/project.pbxproj @@ -755,17 +755,6 @@ sourceTree SOURCE_ROOT - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E2992EE2FAA00000000 isa @@ -789,7 +778,6 @@ 1DD70E29550A52FA00000000 1DD70E296334003900000000 - 1DD70E291289FAA500000000 1DD70E2992EE2FAA00000000 @@ -863,13 +851,6 @@ fileRef 1DD70E296334003900000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F0492EE2FAA00000000 isa @@ -885,7 +866,6 @@ E7A30F04550A52FA00000000 E7A30F046334003900000000 - E7A30F041289FAA500000000 E7A30F0492EE2FAA00000000 diff --git a/submodules/PeerAvatarGalleryUI/PeerAvatarGalleryUI_Xcode.xcodeproj/project.pbxproj b/submodules/PeerAvatarGalleryUI/PeerAvatarGalleryUI_Xcode.xcodeproj/project.pbxproj index 310d6cd141..74af051f36 100644 --- a/submodules/PeerAvatarGalleryUI/PeerAvatarGalleryUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/PeerAvatarGalleryUI/PeerAvatarGalleryUI_Xcode.xcodeproj/project.pbxproj @@ -28,7 +28,7 @@ D03E41622304D4650049C28B /* PhotoResources.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E41612304D4650049C28B /* PhotoResources.framework */; }; D03E41642304D4690049C28B /* RadialStatusNode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E41632304D4690049C28B /* RadialStatusNode.framework */; }; D03E41662304D46E0049C28B /* ShareController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E41652304D46E0049C28B /* ShareController.framework */; }; - D03E416A2304D4F50049C28B /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03E41692304D4F50049C28B /* FrameworkBundle.swift */; }; + D0EFF264231981BA00CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF263231981BA00CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -55,7 +55,7 @@ D03E41612304D4650049C28B /* PhotoResources.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PhotoResources.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E41632304D4690049C28B /* RadialStatusNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RadialStatusNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E41652304D46E0049C28B /* ShareController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ShareController.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D03E41692304D4F50049C28B /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; + D0EFF263231981BA00CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -63,6 +63,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF264231981BA00CF5164 /* AppBundle.framework in Frameworks */, D03E41662304D46E0049C28B /* ShareController.framework in Frameworks */, D03E41642304D4690049C28B /* RadialStatusNode.framework in Frameworks */, D03E41622304D4650049C28B /* PhotoResources.framework in Frameworks */, @@ -110,7 +111,6 @@ D03E413C2304D3F50049C28B /* AvatarGalleryController.swift */, D03E413D2304D3F60049C28B /* AvatarGalleryItemFooterContentNode.swift */, D03E413E2304D3F60049C28B /* PeerAvatarImageGalleryItem.swift */, - D03E41692304D4F50049C28B /* FrameworkBundle.swift */, D03E41302304D37B0049C28B /* PeerAvatarGalleryUI.h */, ); path = Sources; @@ -119,6 +119,7 @@ D03E41442304D40D0049C28B /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF263231981BA00CF5164 /* AppBundle.framework */, D03E41652304D46E0049C28B /* ShareController.framework */, D03E41632304D4690049C28B /* RadialStatusNode.framework */, D03E41612304D4650049C28B /* PhotoResources.framework */, @@ -220,7 +221,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - D03E416A2304D4F50049C28B /* FrameworkBundle.swift in Sources */, D03E413F2304D3F60049C28B /* AvatarGalleryController.swift in Sources */, D03E41402304D3F60049C28B /* AvatarGalleryItemFooterContentNode.swift in Sources */, D03E41412304D3F60049C28B /* PeerAvatarImageGalleryItem.swift in Sources */, diff --git a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift index d587bcf58e..e5b960bbea 100644 --- a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift +++ b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift @@ -11,6 +11,7 @@ import TelegramUIPreferences import TelegramStringFormatting import AccountContext import GalleryUI +import AppBundle private let deleteImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionTrash"), color: .white) private let actionImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionAction"), color: .white) diff --git a/submodules/PeerAvatarGalleryUI/Sources/FrameworkBundle.swift b/submodules/PeerAvatarGalleryUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/PeerAvatarGalleryUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/PeerInfoUI/BUCK b/submodules/PeerInfoUI/BUCK index 466c451fa6..c12c6592dc 100644 --- a/submodules/PeerInfoUI/BUCK +++ b/submodules/PeerInfoUI/BUCK @@ -55,6 +55,7 @@ static_library( "//submodules/ItemListAddressItem:ItemListAddressItem", "//submodules/ContactListUI:ContactListUI", "//submodules/ContextUI:ContextUI", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/PeerInfoUI/PeerInfoUI.xcodeproj/project.pbxproj b/submodules/PeerInfoUI/PeerInfoUI.xcodeproj/project.pbxproj index 00b1ea568e..ec96b618b7 100644 --- a/submodules/PeerInfoUI/PeerInfoUI.xcodeproj/project.pbxproj +++ b/submodules/PeerInfoUI/PeerInfoUI.xcodeproj/project.pbxproj @@ -767,6 +767,19 @@ explicitFileType archive.ar + 1DD70E29AD66967300000000 + + isa + PBXFileReference + name + libReactionSelectionNode.a + path + libReactionSelectionNode.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + 1DD70E291D58331200000000 isa @@ -1246,6 +1259,7 @@ 1DD70E29DB6520C800000000 1DD70E29CBE117ED00000000 1DD70E293E4DE92B00000000 + 1DD70E29AD66967300000000 1DD70E291D58331200000000 1DD70E29CF967D4300000000 1DD70E29EA9CBB5B00000000 @@ -1535,17 +1549,6 @@ sourceTree SOURCE_ROOT - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E295B494B0E00000000 isa @@ -1776,7 +1779,6 @@ 1DD70E29A3981B5400000000 1DD70E29F670175300000000 1DD70E29013401F900000000 - 1DD70E291289FAA500000000 1DD70E295B494B0E00000000 1DD70E294A7BFD0D00000000 1DD70E295DDA07D700000000 @@ -2007,13 +2009,6 @@ fileRef 1DD70E29013401F900000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F045B494B0E00000000 isa @@ -2168,7 +2163,6 @@ E7A30F04A3981B5400000000 E7A30F04F670175300000000 E7A30F04013401F900000000 - E7A30F041289FAA500000000 E7A30F045B494B0E00000000 E7A30F044A7BFD0D00000000 E7A30F045DDA07D700000000 @@ -2553,6 +2547,13 @@ fileRef 1DD70E292F91702000000000 + E7A30F04AD66967300000000 + + isa + PBXBuildFile + fileRef + 1DD70E29AD66967300000000 + E7A30F04F40A586F00000000 isa @@ -2842,6 +2843,7 @@ E7A30F04524F478E00000000 E7A30F04DF758A8500000000 E7A30F042F91702000000000 + E7A30F04AD66967300000000 E7A30F04F40A586F00000000 E7A30F046C9831F100000000 E7A30F04A59C927400000000 diff --git a/submodules/PeerInfoUI/PeerInfoUI_Xcode.xcodeproj/project.pbxproj b/submodules/PeerInfoUI/PeerInfoUI_Xcode.xcodeproj/project.pbxproj index 3b58668939..2f3aa2c5bb 100644 --- a/submodules/PeerInfoUI/PeerInfoUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/PeerInfoUI/PeerInfoUI_Xcode.xcodeproj/project.pbxproj @@ -88,7 +88,6 @@ D03E41182304D2690049C28B /* LocationUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E41172304D2690049C28B /* LocationUI.framework */; }; D03E411A2304D27E0049C28B /* StickerResources.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E41192304D27E0049C28B /* StickerResources.framework */; }; D03E411C2304D2870049C28B /* StickerPackPreviewUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E411B2304D2870049C28B /* StickerPackPreviewUI.framework */; }; - D03E411E2304D2C20049C28B /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03E411D2304D2C20049C28B /* FrameworkBundle.swift */; }; D03E41212304D3040049C28B /* UserInfoEditingPhoneItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03E411F2304D3030049C28B /* UserInfoEditingPhoneItem.swift */; }; D03E41222304D3040049C28B /* UserInfoEditingPhoneActionItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03E41202304D3040049C28B /* UserInfoEditingPhoneActionItem.swift */; }; D03E41432304D4010049C28B /* PeerAvatarGalleryUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E41422304D4010049C28B /* PeerAvatarGalleryUI.framework */; }; @@ -100,6 +99,7 @@ D03E428823056B590049C28B /* NotificationSoundSelectionUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E428723056B590049C28B /* NotificationSoundSelectionUI.framework */; }; D03E42B223056C6E0049C28B /* EncryptionKeyVisualization.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E42B123056C6D0049C28B /* EncryptionKeyVisualization.framework */; }; D03E42E42305724A0049C28B /* ItemListAddressItem.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E42E32305724A0049C28B /* ItemListAddressItem.framework */; }; + D0EFF26C2319829500CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF26B2319829500CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -186,7 +186,6 @@ D03E41172304D2690049C28B /* LocationUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LocationUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E41192304D27E0049C28B /* StickerResources.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = StickerResources.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E411B2304D2870049C28B /* StickerPackPreviewUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = StickerPackPreviewUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D03E411D2304D2C20049C28B /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D03E411F2304D3030049C28B /* UserInfoEditingPhoneItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserInfoEditingPhoneItem.swift; sourceTree = ""; }; D03E41202304D3040049C28B /* UserInfoEditingPhoneActionItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserInfoEditingPhoneActionItem.swift; sourceTree = ""; }; D03E41422304D4010049C28B /* PeerAvatarGalleryUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PeerAvatarGalleryUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -198,6 +197,7 @@ D03E428723056B590049C28B /* NotificationSoundSelectionUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = NotificationSoundSelectionUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E42B123056C6D0049C28B /* EncryptionKeyVisualization.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = EncryptionKeyVisualization.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E42E32305724A0049C28B /* ItemListAddressItem.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ItemListAddressItem.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D0EFF26B2319829500CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -205,6 +205,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF26C2319829500CF5164 /* AppBundle.framework in Frameworks */, D03E42E42305724A0049C28B /* ItemListAddressItem.framework in Frameworks */, D03E42B223056C6E0049C28B /* EncryptionKeyVisualization.framework in Frameworks */, D03E428823056B590049C28B /* NotificationSoundSelectionUI.framework in Frameworks */, @@ -323,7 +324,6 @@ D03E407B2304D1190049C28B /* SecretChatKeyController.swift */, D03E407D2304D1190049C28B /* SecretChatKeyControllerNode.swift */, D03E408E2304D11D0049C28B /* UserInfoController.swift */, - D03E411D2304D2C20049C28B /* FrameworkBundle.swift */, D03E406C2304D0B30049C28B /* PeerInfoUI.h */, ); path = Sources; @@ -332,6 +332,7 @@ D03E40C82304D13C0049C28B /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF26B2319829500CF5164 /* AppBundle.framework */, D03E42E32305724A0049C28B /* ItemListAddressItem.framework */, D03E42B123056C6D0049C28B /* EncryptionKeyVisualization.framework */, D03E428723056B590049C28B /* NotificationSoundSelectionUI.framework */, @@ -491,7 +492,6 @@ D03E40B12304D1240049C28B /* ConvertToSupergroupController.swift in Sources */, D03E41222304D3040049C28B /* UserInfoEditingPhoneActionItem.swift in Sources */, D03E40A72304D1240049C28B /* ItemListSecretChatKeyItem.swift in Sources */, - D03E411E2304D2C20049C28B /* FrameworkBundle.swift in Sources */, D03E40BD2304D1240049C28B /* ChannelStatsControllerNode.swift in Sources */, D03E40AC2304D1240049C28B /* ChannelDiscussionGroupActionSheetItem.swift in Sources */, D03E40A62304D1240049C28B /* ChannelDiscussionGroupSetupController.swift in Sources */, diff --git a/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupHeaderItem.swift b/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupHeaderItem.swift index 644872f784..03aba65955 100644 --- a/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupHeaderItem.swift +++ b/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupHeaderItem.swift @@ -6,6 +6,7 @@ import SwiftSignalKit import TelegramPresentationData import ItemListUI import TextFormat +import AppBundle class ChannelDiscussionGroupSetupHeaderItem: ListViewItem, ItemListItem { let theme: PresentationTheme diff --git a/submodules/PeerInfoUI/Sources/FrameworkBundle.swift b/submodules/PeerInfoUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/PeerInfoUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/PeerInfoUI/Sources/GroupInfoController.swift b/submodules/PeerInfoUI/Sources/GroupInfoController.swift index e4efa8bec2..11ba952010 100644 --- a/submodules/PeerInfoUI/Sources/GroupInfoController.swift +++ b/submodules/PeerInfoUI/Sources/GroupInfoController.swift @@ -33,6 +33,7 @@ import NotificationMuteSettingsUI import MapResourceToAvatarSizes import NotificationSoundSelectionUI import ItemListAddressItem +import AppBundle private final class GroupInfoArguments { let context: AccountContext diff --git a/submodules/PeerInfoUI/Sources/GroupStickerPackCurrentItem.swift b/submodules/PeerInfoUI/Sources/GroupStickerPackCurrentItem.swift index afd9cfd188..1f9fa3103d 100644 --- a/submodules/PeerInfoUI/Sources/GroupStickerPackCurrentItem.swift +++ b/submodules/PeerInfoUI/Sources/GroupStickerPackCurrentItem.swift @@ -9,6 +9,7 @@ import TelegramPresentationData import ItemListUI import ActivityIndicator import StickerResources +import AppBundle enum GroupStickerPackCurrentItemContent: Equatable { case notFound diff --git a/submodules/PeerInfoUI/Sources/UserInfoEditingPhoneItem.swift b/submodules/PeerInfoUI/Sources/UserInfoEditingPhoneItem.swift index 30aa46a336..6dcadd8838 100644 --- a/submodules/PeerInfoUI/Sources/UserInfoEditingPhoneItem.swift +++ b/submodules/PeerInfoUI/Sources/UserInfoEditingPhoneItem.swift @@ -6,6 +6,7 @@ import SwiftSignalKit import TelegramPresentationData import ItemListUI import SinglePhoneInputNode +import AppBundle private func generateClearIcon(color: UIColor) -> UIImage? { return generateTintedImage(image: UIImage(bundleImageName: "Components/Search Bar/Clear"), color: color) diff --git a/submodules/PeersNearbyUI/BUCK b/submodules/PeersNearbyUI/BUCK index db334b0278..385a18107f 100644 --- a/submodules/PeersNearbyUI/BUCK +++ b/submodules/PeersNearbyUI/BUCK @@ -23,6 +23,7 @@ static_library( "//submodules/ItemListPeerActionItem:ItemListPeerActionItem", "//submodules/PeersNearbyIconNode:PeersNearbyIconNode", "//submodules/Geocoding:Geocoding", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/PeersNearbyUI/PeersNearbyUI.xcodeproj/project.pbxproj b/submodules/PeersNearbyUI/PeersNearbyUI.xcodeproj/project.pbxproj index 7c93e8edb1..a1c4fa5ad1 100644 --- a/submodules/PeersNearbyUI/PeersNearbyUI.xcodeproj/project.pbxproj +++ b/submodules/PeersNearbyUI/PeersNearbyUI.xcodeproj/project.pbxproj @@ -635,17 +635,6 @@ explicitFileType text.script.python - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E299F0A867100000000 isa @@ -678,7 +667,6 @@ ]]> children - 1DD70E291289FAA500000000 1DD70E299F0A867100000000 1DD70E29B2209B1500000000 @@ -739,13 +727,6 @@ B401C979C806358400000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F049F0A867100000000 isa @@ -766,7 +747,6 @@ PBXSourcesBuildPhase files - E7A30F041289FAA500000000 E7A30F049F0A867100000000 E7A30F04B2209B1500000000 diff --git a/submodules/PeersNearbyUI/PeersNearbyUI_Xcode.xcodeproj/project.pbxproj b/submodules/PeersNearbyUI/PeersNearbyUI_Xcode.xcodeproj/project.pbxproj index d885b8832e..3e1b88675b 100644 --- a/submodules/PeersNearbyUI/PeersNearbyUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/PeersNearbyUI/PeersNearbyUI_Xcode.xcodeproj/project.pbxproj @@ -28,8 +28,8 @@ D03E402F2304CD100049C28B /* TelegramPermissionsUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E402E2304CD100049C28B /* TelegramPermissionsUI.framework */; }; D03E40312304CD170049C28B /* ItemListPeerActionItem.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E40302304CD170049C28B /* ItemListPeerActionItem.framework */; }; D03E40332304CD220049C28B /* PeersNearbyIconNode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E40322304CD220049C28B /* PeersNearbyIconNode.framework */; }; - D03E40372304CD6C0049C28B /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03E40362304CD6C0049C28B /* FrameworkBundle.swift */; }; D03E405B2304CE8B0049C28B /* Geocoding.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E405A2304CE8B0049C28B /* Geocoding.framework */; }; + D0EFF26E231982AF00CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF26D231982AF00CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -56,8 +56,8 @@ D03E402E2304CD100049C28B /* TelegramPermissionsUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramPermissionsUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E40302304CD170049C28B /* ItemListPeerActionItem.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ItemListPeerActionItem.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E40322304CD220049C28B /* PeersNearbyIconNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PeersNearbyIconNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D03E40362304CD6C0049C28B /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D03E405A2304CE8B0049C28B /* Geocoding.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Geocoding.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D0EFF26D231982AF00CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -65,6 +65,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF26E231982AF00CF5164 /* AppBundle.framework in Frameworks */, D03E405B2304CE8B0049C28B /* Geocoding.framework in Frameworks */, D03E40332304CD220049C28B /* PeersNearbyIconNode.framework in Frameworks */, D03E40312304CD170049C28B /* ItemListPeerActionItem.framework in Frameworks */, @@ -113,7 +114,6 @@ children = ( D03E400B2304CCBD0049C28B /* PeersNearbyController.swift */, D03E400C2304CCBD0049C28B /* PeersNearbyHeaderItem.swift */, - D03E40362304CD6C0049C28B /* FrameworkBundle.swift */, D03E3FFF2304CC5C0049C28B /* PeersNearbyUI.h */, ); path = Sources; @@ -122,6 +122,7 @@ D03E400F2304CCCD0049C28B /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF26D231982AF00CF5164 /* AppBundle.framework */, D03E405A2304CE8B0049C28B /* Geocoding.framework */, D03E40322304CD220049C28B /* PeersNearbyIconNode.framework */, D03E40302304CD170049C28B /* ItemListPeerActionItem.framework */, @@ -227,7 +228,6 @@ files = ( D03E400E2304CCBD0049C28B /* PeersNearbyHeaderItem.swift in Sources */, D03E400D2304CCBD0049C28B /* PeersNearbyController.swift in Sources */, - D03E40372304CD6C0049C28B /* FrameworkBundle.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/submodules/PeersNearbyUI/Sources/FrameworkBundle.swift b/submodules/PeersNearbyUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/PeersNearbyUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift b/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift index d2b0248f05..cd5c41fe47 100644 --- a/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift +++ b/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift @@ -16,6 +16,7 @@ import ItemListPeerItem import TelegramPermissionsUI import ItemListPeerActionItem import Geocoding +import AppBundle private struct PeerNearbyEntry { let peer: (Peer, CachedPeerData?) diff --git a/submodules/PhotoResources/BUCK b/submodules/PhotoResources/BUCK index 20e31302f8..6629d4dcae 100644 --- a/submodules/PhotoResources/BUCK +++ b/submodules/PhotoResources/BUCK @@ -18,6 +18,7 @@ static_library( "//submodules/MediaResources:MediaResources", "//submodules/TelegramUIPreferences:TelegramUIPreferences", "//submodules/WebP:WebPImage", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/PhotoResources/PhotoResources.xcodeproj/project.pbxproj b/submodules/PhotoResources/PhotoResources.xcodeproj/project.pbxproj index 0a74e40a11..f7ad8d7d31 100644 --- a/submodules/PhotoResources/PhotoResources.xcodeproj/project.pbxproj +++ b/submodules/PhotoResources/PhotoResources.xcodeproj/project.pbxproj @@ -383,17 +383,6 @@ explicitFileType text.script.python - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E2925EE3C9800000000 isa @@ -415,7 +404,6 @@ ]]> children - 1DD70E291289FAA500000000 1DD70E2925EE3C9800000000 @@ -475,13 +463,6 @@ B401C979C806358400000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F0425EE3C9800000000 isa @@ -495,7 +476,6 @@ PBXSourcesBuildPhase files - E7A30F041289FAA500000000 E7A30F0425EE3C9800000000 diff --git a/submodules/PhotoResources/PhotoResources_Xcode.xcodeproj/project.pbxproj b/submodules/PhotoResources/PhotoResources_Xcode.xcodeproj/project.pbxproj index 4714e52419..32accaaa4b 100644 --- a/submodules/PhotoResources/PhotoResources_Xcode.xcodeproj/project.pbxproj +++ b/submodules/PhotoResources/PhotoResources_Xcode.xcodeproj/project.pbxproj @@ -24,8 +24,8 @@ D0C9C0CB22FE3E1200FAB518 /* Tuples.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C0CA22FE3E1200FAB518 /* Tuples.framework */; }; D0C9C0CD22FE3E1700FAB518 /* ImageBlur.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C0CC22FE3E1700FAB518 /* ImageBlur.framework */; }; D0C9C0F522FE3F8400FAB518 /* TinyThumbnail.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C0F422FE3F8400FAB518 /* TinyThumbnail.framework */; }; - D0C9C0F922FE3FA500FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C0F822FE3FA500FAB518 /* FrameworkBundle.swift */; }; D0C9C11F22FE40B500FAB518 /* ImageTransparency.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C11E22FE40B500FAB518 /* ImageTransparency.framework */; }; + D0EFF24A231980A700CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF249231980A700CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -48,8 +48,8 @@ D0C9C0CA22FE3E1200FAB518 /* Tuples.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Tuples.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C0CC22FE3E1700FAB518 /* ImageBlur.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ImageBlur.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C0F422FE3F8400FAB518 /* TinyThumbnail.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TinyThumbnail.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D0C9C0F822FE3FA500FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D0C9C11E22FE40B500FAB518 /* ImageTransparency.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ImageTransparency.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D0EFF249231980A700CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -57,6 +57,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF24A231980A700CF5164 /* AppBundle.framework in Frameworks */, D0C9C11F22FE40B500FAB518 /* ImageTransparency.framework in Frameworks */, D0C9C0F522FE3F8400FAB518 /* TinyThumbnail.framework in Frameworks */, D0C9C0CD22FE3E1700FAB518 /* ImageBlur.framework in Frameworks */, @@ -101,7 +102,6 @@ isa = PBXGroup; children = ( D0C9C0AF22FE3DB800FAB518 /* PhotoResources.swift */, - D0C9C0F822FE3FA500FAB518 /* FrameworkBundle.swift */, D0C9C0A322FE3D6200FAB518 /* PhotoResources.h */, ); path = Sources; @@ -110,6 +110,7 @@ D0C9C0B122FE3DD000FAB518 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF249231980A700CF5164 /* AppBundle.framework */, D0C9C11E22FE40B500FAB518 /* ImageTransparency.framework */, D0C9C0F422FE3F8400FAB518 /* TinyThumbnail.framework */, D0C9C0CC22FE3E1700FAB518 /* ImageBlur.framework */, @@ -210,7 +211,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - D0C9C0F922FE3FA500FAB518 /* FrameworkBundle.swift in Sources */, D0C9C0B022FE3DB800FAB518 /* PhotoResources.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/submodules/PhotoResources/Sources/FrameworkBundle.swift b/submodules/PhotoResources/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/PhotoResources/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/PhotoResources/Sources/PhotoResources.swift b/submodules/PhotoResources/Sources/PhotoResources.swift index d98806e57b..e4723c30a8 100644 --- a/submodules/PhotoResources/Sources/PhotoResources.swift +++ b/submodules/PhotoResources/Sources/PhotoResources.swift @@ -18,6 +18,7 @@ import Tuples import ImageBlur import TinyThumbnail import ImageTransparency +import AppBundle private enum ResourceFileData { case data(Data) diff --git a/submodules/RLottie/BUCK b/submodules/RLottie/BUCK index b01fcc8165..a200dc3256 100644 --- a/submodules/RLottie/BUCK +++ b/submodules/RLottie/BUCK @@ -4,7 +4,7 @@ static_library( name = "RLottie", srcs = glob([ "Sources/rlottie/src/**/*.cpp", - ]) + [ + ], exclude = ["Sources/rlottie/src/vector/vdrawhelper_neon.cpp"]) + [ "Sources/LottieInstance.mm" ], headers = glob([ diff --git a/submodules/RLottie/RLottie.xcodeproj/project.pbxproj b/submodules/RLottie/RLottie.xcodeproj/project.pbxproj index 1312fed162..8d581eb436 100644 --- a/submodules/RLottie/RLottie.xcodeproj/project.pbxproj +++ b/submodules/RLottie/RLottie.xcodeproj/project.pbxproj @@ -1378,19 +1378,6 @@ lastKnownFileType sourcecode.c.h - 1DD70E297B64F10200000000 - - isa - PBXFileReference - name - vdrawhelper_neon.cpp - path - Sources/rlottie/src/vector/vdrawhelper_neon.cpp - sourceTree - SOURCE_ROOT - lastKnownFileType - sourcecode.cpp.cpp - 1DD70E295304167900000000 isa @@ -1761,7 +1748,6 @@ 1DD70E29B3093C0E00000000 1DD70E296402559D00000000 1DD70E298C398AE200000000 - 1DD70E297B64F10200000000 1DD70E295304167900000000 1DD70E29A69935F400000000 1DD70E29B6EA94F900000000 @@ -2040,13 +2026,6 @@ fileRef 1DD70E296402559D00000000 - E7A30F047B64F10200000000 - - isa - PBXBuildFile - fileRef - 1DD70E297B64F10200000000 - E7A30F045304167900000000 isa @@ -2158,7 +2137,6 @@ E7A30F048DF7C3D200000000 E7A30F0415AA6BC900000000 E7A30F046402559D00000000 - E7A30F047B64F10200000000 E7A30F045304167900000000 E7A30F04A69935F400000000 E7A30F0447A291AD00000000 diff --git a/submodules/ReactionSelectionNode/ReactionSelectionNode.xcodeproj/project.pbxproj b/submodules/ReactionSelectionNode/ReactionSelectionNode.xcodeproj/project.pbxproj index c95a40b9dd..b61bbac9d2 100644 --- a/submodules/ReactionSelectionNode/ReactionSelectionNode.xcodeproj/project.pbxproj +++ b/submodules/ReactionSelectionNode/ReactionSelectionNode.xcodeproj/project.pbxproj @@ -182,6 +182,19 @@ explicitFileType compiled.mach-o.dylib + 1DD70E2984A59C1D00000000 + + isa + PBXFileReference + name + libTelegramPresentationData.a + path + libTelegramPresentationData.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + 1DD70E292395015100000000 isa @@ -226,6 +239,7 @@ 1DD70E293594DCC000000000 1DD70E29D65BA68200000000 1DD70E29119CDA0700000000 + 1DD70E2984A59C1D00000000 1DD70E292395015100000000 1DD70E29CD296A8300000000 @@ -269,6 +283,17 @@ explicitFileType text.script.python + 1DD70E29CCCE0EED00000000 + + isa + PBXFileReference + name + ReactionContextNode.swift + path + Sources/ReactionContextNode.swift + sourceTree + SOURCE_ROOT + 1DD70E2930A5FA5800000000 isa @@ -323,6 +348,7 @@ ]]> children + 1DD70E29CCCE0EED00000000 1DD70E2930A5FA5800000000 1DD70E29691388CA00000000 1DD70E29962E1AD400000000 @@ -359,6 +385,13 @@ B401C979E09F1DE500000000 + E7A30F04CCCE0EED00000000 + + isa + PBXBuildFile + fileRef + 1DD70E29CCCE0EED00000000 + E7A30F0430A5FA5800000000 isa @@ -393,6 +426,7 @@ PBXSourcesBuildPhase files + E7A30F04CCCE0EED00000000 E7A30F0430A5FA5800000000 E7A30F04691388CA00000000 E7A30F04962E1AD400000000 @@ -469,6 +503,13 @@ fileRef 1DD70E292420028600000000 + E7A30F0484A59C1D00000000 + + isa + PBXBuildFile + fileRef + 1DD70E2984A59C1D00000000 + FAF5FAC90000000000000000 isa @@ -485,6 +526,7 @@ E7A30F04CD296A8300000000 E7A30F043594DCC000000000 E7A30F042420028600000000 + E7A30F0484A59C1D00000000 name Fake Swift Dependencies (Copy Files Phase) diff --git a/submodules/ReactionSelectionNode/Sources/ReactionSelectionNode.swift b/submodules/ReactionSelectionNode/Sources/ReactionSelectionNode.swift index 77c5fa1c2c..8ebb44a1f8 100644 --- a/submodules/ReactionSelectionNode/Sources/ReactionSelectionNode.swift +++ b/submodules/ReactionSelectionNode/Sources/ReactionSelectionNode.swift @@ -5,6 +5,7 @@ import Display import Postbox import TelegramCore import TelegramPresentationData +import AppBundle private func generateBubbleImage(foreground: UIColor, diameter: CGFloat, shadowBlur: CGFloat) -> UIImage? { return generateImage(CGSize(width: diameter + shadowBlur * 2.0, height: diameter + shadowBlur * 2.0), rotatedContext: { size, context in @@ -137,7 +138,7 @@ final class ReactionNode: ASDisplayNode { self.animationNode.setup(account: account, resource: .localFile(path), width: Int(renderSize.width), height: Int(renderSize.height), mode: .direct) case .reply: self.intrinsicOffset = CGPoint(x: 0.0, y: 0.0) - self.imageNode.image = UIImage(named: "Chat/Context Menu/ReactionReply", in: Bundle(for: ReactionNode.self), compatibleWith: nil) + self.imageNode.image = UIImage(named: "Chat/Context Menu/ReactionReply", in: getAppBundle(), compatibleWith: nil) } self.intrinsicSize = intrinsicSize diff --git a/submodules/SearchBarNode/BUCK b/submodules/SearchBarNode/BUCK index 6ef61f903d..b84e9214e4 100644 --- a/submodules/SearchBarNode/BUCK +++ b/submodules/SearchBarNode/BUCK @@ -11,6 +11,7 @@ static_library( "//submodules/Display:Display#shared", "//submodules/TelegramPresentationData:TelegramPresentationData", "//submodules/ActivityIndicator:ActivityIndicator", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/SearchBarNode/SearchBarNode.xcodeproj/project.pbxproj b/submodules/SearchBarNode/SearchBarNode.xcodeproj/project.pbxproj index 98b54c6dc7..68305271fa 100644 --- a/submodules/SearchBarNode/SearchBarNode.xcodeproj/project.pbxproj +++ b/submodules/SearchBarNode/SearchBarNode.xcodeproj/project.pbxproj @@ -241,17 +241,6 @@ explicitFileType text.script.python - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E29F6E36EB200000000 isa @@ -284,7 +273,6 @@ ]]> children - 1DD70E291289FAA500000000 1DD70E29F6E36EB200000000 1DD70E29033E088F00000000 @@ -319,13 +307,6 @@ B401C9796A2B91CD00000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F04F6E36EB200000000 isa @@ -346,7 +327,6 @@ PBXSourcesBuildPhase files - E7A30F041289FAA500000000 E7A30F04F6E36EB200000000 E7A30F04033E088F00000000 diff --git a/submodules/SearchBarNode/SearchBarNode_Xcode.xcodeproj/project.pbxproj b/submodules/SearchBarNode/SearchBarNode_Xcode.xcodeproj/project.pbxproj index 7738fbad24..cac7f8d5a1 100644 --- a/submodules/SearchBarNode/SearchBarNode_Xcode.xcodeproj/project.pbxproj +++ b/submodules/SearchBarNode/SearchBarNode_Xcode.xcodeproj/project.pbxproj @@ -17,7 +17,7 @@ D0C9C2DD2300A3A000FAB518 /* Display.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C2DC2300A3A000FAB518 /* Display.framework */; }; D0C9C2DF2300A3A400FAB518 /* TelegramPresentationData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C2DE2300A3A400FAB518 /* TelegramPresentationData.framework */; }; D0C9C2E12300A3A800FAB518 /* ActivityIndicator.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C2E02300A3A800FAB518 /* ActivityIndicator.framework */; }; - D0C9C2E52300A44E00FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C2E42300A44E00FAB518 /* FrameworkBundle.swift */; }; + D0EFF250231980DD00CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF24F231980DD00CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -33,7 +33,7 @@ D0C9C2DC2300A3A000FAB518 /* Display.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Display.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C2DE2300A3A400FAB518 /* TelegramPresentationData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramPresentationData.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C2E02300A3A800FAB518 /* ActivityIndicator.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ActivityIndicator.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D0C9C2E42300A44E00FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; + D0EFF24F231980DD00CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -41,6 +41,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF250231980DD00CF5164 /* AppBundle.framework in Frameworks */, D0C9C2E12300A3A800FAB518 /* ActivityIndicator.framework in Frameworks */, D0C9C2DF2300A3A400FAB518 /* TelegramPresentationData.framework in Frameworks */, D0C9C2DD2300A3A000FAB518 /* Display.framework in Frameworks */, @@ -77,7 +78,6 @@ children = ( D0C9C2CB2300A2C900FAB518 /* SearchBarNode.swift */, D0C9C2CC2300A2C900FAB518 /* SearchBarPlaceholderNode.swift */, - D0C9C2E42300A44E00FAB518 /* FrameworkBundle.swift */, D0C9C2C32300A21900FAB518 /* SearchBarNode.h */, ); path = Sources; @@ -86,6 +86,7 @@ D0C9C2D32300A38F00FAB518 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF24F231980DD00CF5164 /* AppBundle.framework */, D0C9C2E02300A3A800FAB518 /* ActivityIndicator.framework */, D0C9C2DE2300A3A400FAB518 /* TelegramPresentationData.framework */, D0C9C2DC2300A3A000FAB518 /* Display.framework */, @@ -179,7 +180,6 @@ files = ( D0C9C2CD2300A2C900FAB518 /* SearchBarNode.swift in Sources */, D0C9C2CE2300A2C900FAB518 /* SearchBarPlaceholderNode.swift in Sources */, - D0C9C2E52300A44E00FAB518 /* FrameworkBundle.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/submodules/SearchBarNode/Sources/FrameworkBundle.swift b/submodules/SearchBarNode/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/SearchBarNode/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/SearchBarNode/Sources/SearchBarNode.swift b/submodules/SearchBarNode/Sources/SearchBarNode.swift index de5796027a..0ce38d027b 100644 --- a/submodules/SearchBarNode/Sources/SearchBarNode.swift +++ b/submodules/SearchBarNode/Sources/SearchBarNode.swift @@ -5,6 +5,7 @@ import AsyncDisplayKit import Display import TelegramPresentationData import ActivityIndicator +import AppBundle private func generateLoupeIcon(color: UIColor) -> UIImage? { return generateTintedImage(image: UIImage(bundleImageName: "Components/Search Bar/Loupe"), color: color) diff --git a/submodules/SearchBarNode/Sources/SearchBarPlaceholderNode.swift b/submodules/SearchBarNode/Sources/SearchBarPlaceholderNode.swift index d893379964..6a6a57036c 100644 --- a/submodules/SearchBarNode/Sources/SearchBarPlaceholderNode.swift +++ b/submodules/SearchBarNode/Sources/SearchBarPlaceholderNode.swift @@ -3,6 +3,7 @@ import UIKit import SwiftSignalKit import AsyncDisplayKit import Display +import AppBundle private let templateLoupeIcon = UIImage(bundleImageName: "Components/Search Bar/Loupe") diff --git a/submodules/SettingsUI/BUCK b/submodules/SettingsUI/BUCK index 920db9d758..793d024e10 100644 --- a/submodules/SettingsUI/BUCK +++ b/submodules/SettingsUI/BUCK @@ -74,6 +74,7 @@ static_library( "//submodules/CounterContollerTitleView:CounterContollerTitleView", "//submodules/GridMessageSelectionNode:GridMessageSelectionNode", "//submodules/InstantPageCache:InstantPageCache", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/SettingsUI/SettingsUI.xcodeproj/project.pbxproj b/submodules/SettingsUI/SettingsUI.xcodeproj/project.pbxproj index f71a632c67..559b07fe45 100644 --- a/submodules/SettingsUI/SettingsUI.xcodeproj/project.pbxproj +++ b/submodules/SettingsUI/SettingsUI.xcodeproj/project.pbxproj @@ -1869,32 +1869,6 @@ 1DD70E29B9DFD9CF00000000 - 1DD70E2903669CFD00000000 - - isa - PBXFileReference - name - LanguageSuggestionController.swift - path - Sources/Language Suggestion/LanguageSuggestionController.swift - sourceTree - SOURCE_ROOT - - B401C979F5742BCC00000000 - - isa - PBXGroup - name - Language Suggestion - path - Sources/Language Suggestion - sourceTree - SOURCE_ROOT - children - - 1DD70E2903669CFD00000000 - - 1DD70E296091158700000000 isa @@ -2402,6 +2376,17 @@ sourceTree SOURCE_ROOT + 1DD70E29F15EBD2000000000 + + isa + PBXFileReference + name + EditThemeController.swift + path + Sources/Themes/EditThemeController.swift + sourceTree + SOURCE_ROOT + 1DD70E2942938DA300000000 isa @@ -2413,17 +2398,6 @@ sourceTree SOURCE_ROOT - 1DD70E29B9A2B33E00000000 - - isa - PBXFileReference - name - ThemeAccentColorActionSheet.swift - path - Sources/Themes/ThemeAccentColorActionSheet.swift - sourceTree - SOURCE_ROOT - 1DD70E29EF5534B100000000 isa @@ -2789,8 +2763,8 @@ children 1DD70E29CA466CC400000000 + 1DD70E29F15EBD2000000000 1DD70E2942938DA300000000 - 1DD70E29B9A2B33E00000000 1DD70E29EF5534B100000000 1DD70E2972C0CF5300000000 1DD70E29A72D9BA400000000 @@ -2961,17 +2935,6 @@ sourceTree SOURCE_ROOT - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E2913DCCEF500000000 isa @@ -3050,7 +3013,6 @@ B401C979E13BD9BC00000000 B401C9790AB0B6C400000000 - B401C979F5742BCC00000000 B401C9797B75C4C800000000 B401C979A728414100000000 B401C979935F51C800000000 @@ -3068,7 +3030,6 @@ 1DD70E294031FE9A00000000 1DD70E29593C8D9400000000 1DD70E29E31D6BCE00000000 - 1DD70E291289FAA500000000 1DD70E2913DCCEF500000000 1DD70E29A27BE59200000000 1DD70E29EF15E7A400000000 @@ -3240,13 +3201,6 @@ fileRef 1DD70E29B9DFD9CF00000000 - E7A30F0403669CFD00000000 - - isa - PBXBuildFile - fileRef - 1DD70E2903669CFD00000000 - E7A30F046091158700000000 isa @@ -3485,6 +3439,13 @@ fileRef 1DD70E29CA466CC400000000 + E7A30F04F15EBD2000000000 + + isa + PBXBuildFile + fileRef + 1DD70E29F15EBD2000000000 + E7A30F0442938DA300000000 isa @@ -3492,13 +3453,6 @@ fileRef 1DD70E2942938DA300000000 - E7A30F04B9A2B33E00000000 - - isa - PBXBuildFile - fileRef - 1DD70E29B9A2B33E00000000 - E7A30F04EF5534B100000000 isa @@ -3800,13 +3754,6 @@ fileRef 1DD70E29E31D6BCE00000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F0413DCCEF500000000 isa @@ -3874,7 +3821,6 @@ E7A30F0469501A5800000000 E7A30F0403F2897A00000000 E7A30F04B9DFD9CF00000000 - E7A30F0403669CFD00000000 E7A30F046091158700000000 E7A30F04B4ED2B2800000000 E7A30F0489377CD400000000 @@ -3909,8 +3855,8 @@ E7A30F047D502A9800000000 E7A30F04FCF079BA00000000 E7A30F04CA466CC400000000 + E7A30F04F15EBD2000000000 E7A30F0442938DA300000000 - E7A30F04B9A2B33E00000000 E7A30F04EF5534B100000000 E7A30F0472C0CF5300000000 E7A30F04A72D9BA400000000 @@ -3954,7 +3900,6 @@ E7A30F044031FE9A00000000 E7A30F04593C8D9400000000 E7A30F04E31D6BCE00000000 - E7A30F041289FAA500000000 E7A30F0413DCCEF500000000 E7A30F04A27BE59200000000 E7A30F04EF15E7A400000000 diff --git a/submodules/SettingsUI/SettingsUI_Xcode.xcodeproj/project.pbxproj b/submodules/SettingsUI/SettingsUI_Xcode.xcodeproj/project.pbxproj index ee56911597..a8f9c95e95 100644 --- a/submodules/SettingsUI/SettingsUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/SettingsUI/SettingsUI_Xcode.xcodeproj/project.pbxproj @@ -173,7 +173,6 @@ D03E47B0230763510049C28B /* UniversalMediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E47AF230763510049C28B /* UniversalMediaPlayer.framework */; }; D03E47B2230763570049C28B /* UrlEscaping.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E47B1230763570049C28B /* UrlEscaping.framework */; }; D03E47B42307635C0049C28B /* WebSearchUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E47B32307635C0049C28B /* WebSearchUI.framework */; }; - D03E47B8230766870049C28B /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03E47B7230766870049C28B /* FrameworkBundle.swift */; }; D03E47D5230767F40049C28B /* UrlHandling.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E47D4230767F40049C28B /* UrlHandling.framework */; }; D03E480C230769A30049C28B /* HexColor.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E480B230769A30049C28B /* HexColor.framework */; }; D03E483623076AE90049C28B /* QrCode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E483523076AE90049C28B /* QrCode.framework */; }; @@ -188,6 +187,7 @@ D03E48E22308649C0049C28B /* CounterContollerTitleView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E48E12308649C0049C28B /* CounterContollerTitleView.framework */; }; D03E490E2308661A0049C28B /* GridMessageSelectionNode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E490D2308661A0049C28B /* GridMessageSelectionNode.framework */; }; D03E493A2308678D0049C28B /* InstantPageCache.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E49392308678D0049C28B /* InstantPageCache.framework */; }; + D0EFF26A2319825B00CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF2692319825B00CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -359,7 +359,6 @@ D03E47AF230763510049C28B /* UniversalMediaPlayer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = UniversalMediaPlayer.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E47B1230763570049C28B /* UrlEscaping.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = UrlEscaping.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E47B32307635C0049C28B /* WebSearchUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WebSearchUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D03E47B7230766870049C28B /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D03E47D4230767F40049C28B /* UrlHandling.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = UrlHandling.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E480B230769A30049C28B /* HexColor.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = HexColor.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E483523076AE90049C28B /* QrCode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = QrCode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -374,6 +373,7 @@ D03E48E12308649C0049C28B /* CounterContollerTitleView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CounterContollerTitleView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E490D2308661A0049C28B /* GridMessageSelectionNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = GridMessageSelectionNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E49392308678D0049C28B /* InstantPageCache.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = InstantPageCache.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D0EFF2692319825B00CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -381,6 +381,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF26A2319825B00CF5164 /* AppBundle.framework in Frameworks */, D03E493A2308678D0049C28B /* InstantPageCache.framework in Frameworks */, D03E490E2308661A0049C28B /* GridMessageSelectionNode.framework in Frameworks */, D03E48E22308649C0049C28B /* CounterContollerTitleView.framework in Frameworks */, @@ -508,7 +509,6 @@ D03E48AD230775800049C28B /* OpenSettings.swift */, D03E48AF230775EF0049C28B /* AccountUtils.swift */, D03E48B12307767A0049C28B /* CachedFaqInstantPage.swift */, - D03E47B7230766870049C28B /* FrameworkBundle.swift */, D03E465023075D930049C28B /* SettingsUI.h */, ); path = Sources; @@ -684,6 +684,7 @@ D03E4732230761E10049C28B /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF2692319825B00CF5164 /* AppBundle.framework */, D03E49392308678D0049C28B /* InstantPageCache.framework */, D03E490D2308661A0049C28B /* GridMessageSelectionNode.framework */, D03E48E12308649C0049C28B /* CounterContollerTitleView.framework */, @@ -864,7 +865,6 @@ D03E466E23075E660049C28B /* TabBarAccountSwitchController.swift in Sources */, D03E46D223075F810049C28B /* ShareProxyServerActionSheetController.swift in Sources */, D03E468A23075F010049C28B /* SettingsSearchRecentQueries.swift in Sources */, - D03E47B8230766870049C28B /* FrameworkBundle.swift in Sources */, D03E472023075FE40049C28B /* WallpaperGalleryItem.swift in Sources */, D03E471723075FE40049C28B /* WallpaperGalleryDecorationNode.swift in Sources */, D03E46B123075F4E0049C28B /* ItemListWebsiteItem.swift in Sources */, diff --git a/submodules/SettingsUI/Sources/ChangePhoneNumberIntroController.swift b/submodules/SettingsUI/Sources/ChangePhoneNumberIntroController.swift index b375516a91..dac4925bf2 100644 --- a/submodules/SettingsUI/Sources/ChangePhoneNumberIntroController.swift +++ b/submodules/SettingsUI/Sources/ChangePhoneNumberIntroController.swift @@ -7,6 +7,7 @@ import TelegramPresentationData import TextFormat import AccountContext import AlertUI +import AppBundle private final class ChangePhoneNumberIntroControllerNode: ASDisplayNode { var presentationData: PresentationData diff --git a/submodules/SettingsUI/Sources/FrameworkBundle.swift b/submodules/SettingsUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/SettingsUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift b/submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift index de63a01d1c..7d5d0daa79 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift @@ -11,6 +11,7 @@ import ItemListUI import AccountContext import TelegramNotices import LocalAuth +import AppBundle private final class PrivacyAndSecurityControllerArguments { let account: Account diff --git a/submodules/SettingsUI/Sources/Privacy and Security/PrivacyIntroController.swift b/submodules/SettingsUI/Sources/Privacy and Security/PrivacyIntroController.swift index 375825a803..32f06761eb 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/PrivacyIntroController.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/PrivacyIntroController.swift @@ -7,6 +7,7 @@ import SwiftSignalKit import TelegramCore import TelegramPresentationData import AccountContext +import AppBundle enum PrivacyIntroControllerMode { case passcode diff --git a/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/RecentSessionsEmptyStateItem.swift b/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/RecentSessionsEmptyStateItem.swift index 6498ea6b3a..914cabaa17 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/RecentSessionsEmptyStateItem.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/RecentSessionsEmptyStateItem.swift @@ -4,6 +4,7 @@ import AsyncDisplayKit import Display import TelegramPresentationData import ItemListUI +import AppBundle final class RecentSessionsEmptyStateItem: ItemListControllerEmptyStateItem { let theme: PresentationTheme diff --git a/submodules/SettingsUI/Sources/SettingsController.swift b/submodules/SettingsUI/Sources/SettingsController.swift index 0117d3c335..b310caa342 100644 --- a/submodules/SettingsUI/Sources/SettingsController.swift +++ b/submodules/SettingsUI/Sources/SettingsController.swift @@ -32,6 +32,7 @@ import ItemListPeerActionItem import WebSearchUI import PeerAvatarGalleryUI import MapResourceToAvatarSizes +import AppBundle private let maximumNumberOfAccounts = 3 diff --git a/submodules/SettingsUI/Sources/Themes/ThemeGridSelectionPanelNode.swift b/submodules/SettingsUI/Sources/Themes/ThemeGridSelectionPanelNode.swift index 84fec14728..b0a69c51b3 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeGridSelectionPanelNode.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeGridSelectionPanelNode.swift @@ -6,6 +6,7 @@ import Postbox import TelegramCore import SwiftSignalKit import TelegramPresentationData +import AppBundle final class ThemeGridSelectionPanelNode: ASDisplayNode { private let deleteButton: UIButton diff --git a/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift b/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift index ac0fe94c6d..ca21e976c0 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift @@ -12,6 +12,7 @@ import ShareController import CounterContollerTitleView import WallpaperResources import OverlayStatusController +import AppBundle public enum ThemePreviewSource { case theme(TelegramTheme) diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsBrightnessItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsBrightnessItem.swift index 185e9551e8..eca45addbf 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsBrightnessItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsBrightnessItem.swift @@ -7,6 +7,7 @@ import TelegramCore import TelegramPresentationData import LegacyComponents import ItemListUI +import AppBundle class ThemeSettingsBrightnessItem: ListViewItem, ItemListItem { let theme: PresentationTheme diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift index ae4ed1c593..4114eedb9d 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift @@ -8,6 +8,7 @@ import TelegramPresentationData import TelegramUIPreferences import LegacyComponents import ItemListUI +import AppBundle class ThemeSettingsFontSizeItem: ListViewItem, ItemListItem { let theme: PresentationTheme diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift index 650577c8c4..d89d6a492a 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift @@ -10,6 +10,7 @@ import TelegramUIPreferences import ItemListUI import WallpaperResources import AccountContext +import AppBundle private var borderImages: [String: UIImage] = [:] diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift index ff9ce3907d..f59516abd3 100644 --- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift +++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift @@ -16,6 +16,7 @@ import PhotoResources import GalleryUI import LocalMediaResources import WallpaperResources +import AppBundle struct WallpaperGalleryItemArguments { let colorPreview: Bool diff --git a/submodules/ShareController/BUCK b/submodules/ShareController/BUCK index 2773dfd0e9..b1d58a8684 100644 --- a/submodules/ShareController/BUCK +++ b/submodules/ShareController/BUCK @@ -20,6 +20,7 @@ static_library( "//submodules/SelectablePeerNode:SelectablePeerNode", "//submodules/RadialStatusNode:RadialStatusNode", "//submodules/ActivityIndicator:ActivityIndicator", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/ShareController/ShareController.xcodeproj/project.pbxproj b/submodules/ShareController/ShareController.xcodeproj/project.pbxproj index ab7d3440bd..c0609aeeef 100644 --- a/submodules/ShareController/ShareController.xcodeproj/project.pbxproj +++ b/submodules/ShareController/ShareController.xcodeproj/project.pbxproj @@ -605,17 +605,6 @@ explicitFileType text.script.python - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E299AA2B4EE00000000 isa @@ -747,7 +736,6 @@ ]]> children - 1DD70E291289FAA500000000 1DD70E299AA2B4EE00000000 1DD70E29A5E42C6E00000000 1DD70E291064AF2000000000 @@ -791,13 +779,6 @@ B401C9790C093CBB00000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F049AA2B4EE00000000 isa @@ -881,7 +862,6 @@ PBXSourcesBuildPhase files - E7A30F041289FAA500000000 E7A30F049AA2B4EE00000000 E7A30F04A5E42C6E00000000 E7A30F041064AF2000000000 diff --git a/submodules/ShareController/ShareController_Xcode.xcodeproj/project.pbxproj b/submodules/ShareController/ShareController_Xcode.xcodeproj/project.pbxproj index 5b756903dd..427812cd56 100644 --- a/submodules/ShareController/ShareController_Xcode.xcodeproj/project.pbxproj +++ b/submodules/ShareController/ShareController_Xcode.xcodeproj/project.pbxproj @@ -27,7 +27,6 @@ D0879BC522F857E600C4D6B3 /* ShareSearchContainerNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0879BC022F857E600C4D6B3 /* ShareSearchContainerNode.swift */; }; D0879BC622F857E600C4D6B3 /* ShareSearchBarNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0879BC122F857E600C4D6B3 /* ShareSearchBarNode.swift */; }; D0879BEC22F85F8500C4D6B3 /* RadialStatusNode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0879BEB22F85F8500C4D6B3 /* RadialStatusNode.framework */; }; - D0879C0722F8636500C4D6B3 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0879C0622F8636500C4D6B3 /* FrameworkBundle.swift */; }; D0879C3722F8733500C4D6B3 /* SelectablePeerNode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0879C3622F8733500C4D6B3 /* SelectablePeerNode.framework */; }; D0879C9422F875B900C4D6B3 /* PeerPresenceStatusManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0879C9322F875B900C4D6B3 /* PeerPresenceStatusManager.framework */; }; D0879CCA22F876D700C4D6B3 /* ChatListSearchRecentPeersNode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0879CC922F876D700C4D6B3 /* ChatListSearchRecentPeersNode.framework */; }; @@ -35,6 +34,7 @@ D0879D9D22F87E7F00C4D6B3 /* LocalizedPeerData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0879D9C22F87E7F00C4D6B3 /* LocalizedPeerData.framework */; }; D0879DBB22F87F2700C4D6B3 /* UrlEscaping.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0879DBA22F87F2700C4D6B3 /* UrlEscaping.framework */; }; D0879DE822F8819E00C4D6B3 /* StickerResources.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0879DE722F8819E00C4D6B3 /* StickerResources.framework */; }; + D0EFF252231980F100CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF251231980F100CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -61,7 +61,6 @@ D0879BC022F857E600C4D6B3 /* ShareSearchContainerNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareSearchContainerNode.swift; sourceTree = ""; }; D0879BC122F857E600C4D6B3 /* ShareSearchBarNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShareSearchBarNode.swift; sourceTree = ""; }; D0879BEB22F85F8500C4D6B3 /* RadialStatusNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RadialStatusNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D0879C0622F8636500C4D6B3 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D0879C3622F8733500C4D6B3 /* SelectablePeerNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SelectablePeerNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0879C9322F875B900C4D6B3 /* PeerPresenceStatusManager.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PeerPresenceStatusManager.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0879CC922F876D700C4D6B3 /* ChatListSearchRecentPeersNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ChatListSearchRecentPeersNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -69,6 +68,7 @@ D0879D9C22F87E7F00C4D6B3 /* LocalizedPeerData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LocalizedPeerData.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0879DBA22F87F2700C4D6B3 /* UrlEscaping.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = UrlEscaping.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0879DE722F8819E00C4D6B3 /* StickerResources.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = StickerResources.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D0EFF251231980F100CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -76,6 +76,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF252231980F100CF5164 /* AppBundle.framework in Frameworks */, D038AC4F22F8883700320981 /* SaveToCameraRoll.framework in Frameworks */, D0879DE822F8819E00C4D6B3 /* StickerResources.framework in Frameworks */, D0879DBB22F87F2700C4D6B3 /* UrlEscaping.framework in Frameworks */, @@ -129,7 +130,6 @@ D0879BA222F854C600C4D6B3 /* ShareControllerNode.swift */, D0879BA722F854C700C4D6B3 /* ShareControllerPeerGridItem.swift */, D0879BA622F854C700C4D6B3 /* ShareControllerRecentPeersGridItem.swift */, - D0879C0622F8636500C4D6B3 /* FrameworkBundle.swift */, D0879B9622F8537800C4D6B3 /* ShareController.h */, ); path = Sources; @@ -138,6 +138,7 @@ D0879BAE22F854D200C4D6B3 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF251231980F100CF5164 /* AppBundle.framework */, D038AC5022F889E600320981 /* libc++.tbd */, D038AC4E22F8883700320981 /* SaveToCameraRoll.framework */, D0879DE722F8819E00C4D6B3 /* StickerResources.framework */, @@ -246,7 +247,6 @@ D0879BC522F857E600C4D6B3 /* ShareSearchContainerNode.swift in Sources */, D0879BC622F857E600C4D6B3 /* ShareSearchBarNode.swift in Sources */, D0879BC322F857E600C4D6B3 /* ShareLoadingContainerNode.swift in Sources */, - D0879C0722F8636500C4D6B3 /* FrameworkBundle.swift in Sources */, D0879BA922F854C700C4D6B3 /* ShareController.swift in Sources */, D0879BAD22F854C700C4D6B3 /* ShareControllerPeerGridItem.swift in Sources */, D0879BAA22F854C700C4D6B3 /* ShareContentContainerNode.swift in Sources */, diff --git a/submodules/ShareController/Sources/FrameworkBundle.swift b/submodules/ShareController/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/ShareController/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/ShareController/Sources/ShareInputFieldNode.swift b/submodules/ShareController/Sources/ShareInputFieldNode.swift index a365ae28cf..5a89d225c8 100644 --- a/submodules/ShareController/Sources/ShareInputFieldNode.swift +++ b/submodules/ShareController/Sources/ShareInputFieldNode.swift @@ -3,6 +3,7 @@ import UIKit import AsyncDisplayKit import Display import TelegramPresentationData +import AppBundle private func generateClearIcon(color: UIColor) -> UIImage? { return generateTintedImage(image: UIImage(bundleImageName: "Components/Search Bar/Clear"), color: color) diff --git a/submodules/ShareController/Sources/SharePeersContainerNode.swift b/submodules/ShareController/Sources/SharePeersContainerNode.swift index 5b933e3116..217b8469a7 100644 --- a/submodules/ShareController/Sources/SharePeersContainerNode.swift +++ b/submodules/ShareController/Sources/SharePeersContainerNode.swift @@ -10,6 +10,7 @@ import MergeLists import AvatarNode import AccountContext import PeerPresenceStatusManager +import AppBundle private let subtitleFont = Font.regular(12.0) diff --git a/submodules/ShareController/Sources/ShareSearchBarNode.swift b/submodules/ShareController/Sources/ShareSearchBarNode.swift index e623431ffc..af15892746 100644 --- a/submodules/ShareController/Sources/ShareSearchBarNode.swift +++ b/submodules/ShareController/Sources/ShareSearchBarNode.swift @@ -3,6 +3,7 @@ import UIKit import AsyncDisplayKit import Display import TelegramPresentationData +import AppBundle private func generateClearIcon(color: UIColor) -> UIImage? { return generateTintedImage(image: UIImage(bundleImageName: "Components/Search Bar/Clear"), color: color) diff --git a/submodules/TelegramCallsUI/BUCK b/submodules/TelegramCallsUI/BUCK index fa4f7a6a92..1d86a6b8f8 100644 --- a/submodules/TelegramCallsUI/BUCK +++ b/submodules/TelegramCallsUI/BUCK @@ -25,6 +25,7 @@ static_library( "//submodules/TelegramVoip:TelegramVoip", "//submodules/ItemListUI:ItemListUI", "//submodules/OverlayStatusController:OverlayStatusController", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/TelegramCallsUI/Sources/CallController.swift b/submodules/TelegramCallsUI/Sources/CallController.swift index 1d1bcf0cee..4962c6db50 100644 --- a/submodules/TelegramCallsUI/Sources/CallController.swift +++ b/submodules/TelegramCallsUI/Sources/CallController.swift @@ -11,6 +11,7 @@ import TelegramVoip import TelegramAudio import AccountContext import TelegramNotices +import AppBundle public final class CallController: ViewController { private var controllerNode: CallControllerNode { diff --git a/submodules/TelegramCallsUI/Sources/CallControllerButton.swift b/submodules/TelegramCallsUI/Sources/CallControllerButton.swift index 016e6db3e1..47aa462209 100644 --- a/submodules/TelegramCallsUI/Sources/CallControllerButton.swift +++ b/submodules/TelegramCallsUI/Sources/CallControllerButton.swift @@ -3,6 +3,7 @@ import UIKit import Display import AsyncDisplayKit import SwiftSignalKit +import AppBundle enum CallControllerButtonType { case mute diff --git a/submodules/TelegramCallsUI/Sources/CallKitIntegration.swift b/submodules/TelegramCallsUI/Sources/CallKitIntegration.swift index c44866c743..9b700b800d 100644 --- a/submodules/TelegramCallsUI/Sources/CallKitIntegration.swift +++ b/submodules/TelegramCallsUI/Sources/CallKitIntegration.swift @@ -6,6 +6,7 @@ import AVFoundation import Postbox import TelegramCore import SwiftSignalKit +import AppBundle private var sharedProviderDelegate: AnyObject? @@ -134,7 +135,7 @@ class CallKitProviderDelegate: NSObject, CXProviderDelegate { providerConfiguration.maximumCallsPerCallGroup = 1 providerConfiguration.maximumCallGroups = 1 providerConfiguration.supportedHandleTypes = [.phoneNumber, .generic] - if let image = UIImage(named: "Call/CallKitLogo", in: Bundle(for: CallKitIntegration.self), compatibleWith: nil) { + if let image = UIImage(named: "Call/CallKitLogo", in: getAppBundle(), compatibleWith: nil) { providerConfiguration.iconTemplateImageData = image.pngData() } diff --git a/submodules/TelegramCallsUI/Sources/CallRatingController.swift b/submodules/TelegramCallsUI/Sources/CallRatingController.swift index d099fc36d2..10da6c947f 100644 --- a/submodules/TelegramCallsUI/Sources/CallRatingController.swift +++ b/submodules/TelegramCallsUI/Sources/CallRatingController.swift @@ -8,6 +8,7 @@ import TelegramCore import TelegramPresentationData import TelegramVoip import AccountContext +import AppBundle private final class CallRatingAlertContentNode: AlertContentNode { private let strings: PresentationStrings diff --git a/submodules/TelegramCallsUI/Sources/CallSuggestTabController.swift b/submodules/TelegramCallsUI/Sources/CallSuggestTabController.swift index fbfcf10b01..46af7bb168 100644 --- a/submodules/TelegramCallsUI/Sources/CallSuggestTabController.swift +++ b/submodules/TelegramCallsUI/Sources/CallSuggestTabController.swift @@ -8,6 +8,7 @@ import TelegramCore import TelegramPresentationData import TelegramUIPreferences import AccountContext +import AppBundle private func generateIconImage(theme: AlertControllerTheme) -> UIImage? { return UIImage(bundleImageName: "Call List/AlertIcon") diff --git a/submodules/TelegramCallsUI/Sources/FrameworkBundle.swift b/submodules/TelegramCallsUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/TelegramCallsUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/TelegramCallsUI/TelegramCallsUI.xcodeproj/project.pbxproj b/submodules/TelegramCallsUI/TelegramCallsUI.xcodeproj/project.pbxproj index b47144ff48..ef51fdf73c 100644 --- a/submodules/TelegramCallsUI/TelegramCallsUI.xcodeproj/project.pbxproj +++ b/submodules/TelegramCallsUI/TelegramCallsUI.xcodeproj/project.pbxproj @@ -763,17 +763,6 @@ lastKnownFileType sourcecode.c.objc - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E29F7ECD55D00000000 isa @@ -831,7 +820,6 @@ 1DD70E29FD7E6DF000000000 1DD70E29B683DD4B00000000 1DD70E29B683DD5000000000 - 1DD70E291289FAA500000000 1DD70E29F7ECD55D00000000 1DD70E2978658ABA00000000 1DD70E294CAD10B900000000 @@ -958,13 +946,6 @@ fileRef 1DD70E29B683DD5000000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F04F7ECD55D00000000 isa @@ -1005,7 +986,6 @@ E7A30F040CA6BF7600000000 E7A30F04FD7E6DF000000000 E7A30F04B683DD5000000000 - E7A30F041289FAA500000000 E7A30F04F7ECD55D00000000 E7A30F0478658ABA00000000 E7A30F044CAD10B900000000 diff --git a/submodules/TelegramCallsUI/TelegramCallsUI_Xcode.xcodeproj/project.pbxproj b/submodules/TelegramCallsUI/TelegramCallsUI_Xcode.xcodeproj/project.pbxproj index bdd2583767..3e3f55daeb 100644 --- a/submodules/TelegramCallsUI/TelegramCallsUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/TelegramCallsUI/TelegramCallsUI_Xcode.xcodeproj/project.pbxproj @@ -29,12 +29,12 @@ D0C9C09122FE3CF300FAB518 /* CallRatingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C08722FE3CF300FAB518 /* CallRatingController.swift */; }; D0C9C09222FE3CF300FAB518 /* CallRouteActionSheetItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C08822FE3CF300FAB518 /* CallRouteActionSheetItem.swift */; }; D0C9C09322FE3CF300FAB518 /* CallControllerNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C08922FE3CF300FAB518 /* CallControllerNode.swift */; }; - D0C9C09522FE3D1700FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C09422FE3D1700FAB518 /* FrameworkBundle.swift */; }; D0C9C0CF22FE3E2400FAB518 /* PhotoResources.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C0CE22FE3E2400FAB518 /* PhotoResources.framework */; }; D0C9C12522FE41C600FAB518 /* CallsEmoji.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C12422FE41C600FAB518 /* CallsEmoji.m */; }; D0C9C12722FE41DB00FAB518 /* CallsEmoji.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C9C12622FE41D200FAB518 /* CallsEmoji.h */; settings = {ATTRIBUTES = (Public, ); }; }; D0C9C14B22FE439300FAB518 /* TelegramNotices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C14A22FE439300FAB518 /* TelegramNotices.framework */; }; D0C9C17B22FEF26C00FAB518 /* CallSuggestTabController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C17A22FEF26C00FAB518 /* CallSuggestTabController.swift */; }; + D0EFF25C2319816200CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF25B2319816200CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -62,12 +62,12 @@ D0C9C08722FE3CF300FAB518 /* CallRatingController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallRatingController.swift; sourceTree = ""; }; D0C9C08822FE3CF300FAB518 /* CallRouteActionSheetItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallRouteActionSheetItem.swift; sourceTree = ""; }; D0C9C08922FE3CF300FAB518 /* CallControllerNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallControllerNode.swift; sourceTree = ""; }; - D0C9C09422FE3D1700FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D0C9C0CE22FE3E2400FAB518 /* PhotoResources.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PhotoResources.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C12422FE41C600FAB518 /* CallsEmoji.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CallsEmoji.m; sourceTree = ""; }; D0C9C12622FE41D200FAB518 /* CallsEmoji.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CallsEmoji.h; sourceTree = ""; }; D0C9C14A22FE439300FAB518 /* TelegramNotices.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramNotices.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C17A22FEF26C00FAB518 /* CallSuggestTabController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallSuggestTabController.swift; sourceTree = ""; }; + D0EFF25B2319816200CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -75,6 +75,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF25C2319816200CF5164 /* AppBundle.framework in Frameworks */, D021289F230EF3B2006B8456 /* ItemListUI.framework in Frameworks */, D0C9C14B22FE439300FAB518 /* TelegramNotices.framework in Frameworks */, D0C9C0CF22FE3E2400FAB518 /* PhotoResources.framework in Frameworks */, @@ -125,7 +126,6 @@ D0AE310A22B1DD160058D3BC /* PresentationCall.swift */, D0AE310922B1DD160058D3BC /* PresentationCallManager.swift */, D0AE310B22B1DD160058D3BC /* PresentationCallToneData.swift */, - D0C9C09422FE3D1700FAB518 /* FrameworkBundle.swift */, D0C9C17A22FEF26C00FAB518 /* CallSuggestTabController.swift */, D0C9C12622FE41D200FAB518 /* CallsEmoji.h */, D0C9C12422FE41C600FAB518 /* CallsEmoji.m */, @@ -137,6 +137,7 @@ D0AE315522B1DEF10058D3BC /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF25B2319816200CF5164 /* AppBundle.framework */, D021289E230EF3B2006B8456 /* ItemListUI.framework */, D0C9C14A22FE439300FAB518 /* TelegramNotices.framework */, D0C9C0CE22FE3E2400FAB518 /* PhotoResources.framework */, @@ -247,7 +248,6 @@ D0C9C08E22FE3CF300FAB518 /* CallControllerButtonsNode.swift in Sources */, D0C9C08C22FE3CF300FAB518 /* CallControllerButton.swift in Sources */, D0C9C08D22FE3CF300FAB518 /* CallController.swift in Sources */, - D0C9C09522FE3D1700FAB518 /* FrameworkBundle.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/submodules/TelegramPermissionsUI/BUCK b/submodules/TelegramPermissionsUI/BUCK index c088ed15cc..b7dc3c5751 100644 --- a/submodules/TelegramPermissionsUI/BUCK +++ b/submodules/TelegramPermissionsUI/BUCK @@ -18,6 +18,7 @@ static_library( "//submodules/DeviceAccess:DeviceAccess", "//submodules/PeersNearbyIconNode:PeersNearbyIconNode", "//submodules/SolidRoundedButtonNode:SolidRoundedButtonNode", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/TelegramPermissionsUI/Sources/FrameworkBundle.swift b/submodules/TelegramPermissionsUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/TelegramPermissionsUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/TelegramPermissionsUI/Sources/PermissionControllerNode.swift b/submodules/TelegramPermissionsUI/Sources/PermissionControllerNode.swift index 453641556e..313306012c 100644 --- a/submodules/TelegramPermissionsUI/Sources/PermissionControllerNode.swift +++ b/submodules/TelegramPermissionsUI/Sources/PermissionControllerNode.swift @@ -7,6 +7,7 @@ import TelegramCore import TelegramPresentationData import AccountContext import TelegramPermissions +import AppBundle public struct PermissionControllerCustomIcon: Equatable { let light: UIImage? diff --git a/submodules/TelegramPermissionsUI/TelegramPermissionsUI.xcodeproj/project.pbxproj b/submodules/TelegramPermissionsUI/TelegramPermissionsUI.xcodeproj/project.pbxproj index a7ef654f2d..49497ae64d 100644 --- a/submodules/TelegramPermissionsUI/TelegramPermissionsUI.xcodeproj/project.pbxproj +++ b/submodules/TelegramPermissionsUI/TelegramPermissionsUI.xcodeproj/project.pbxproj @@ -409,17 +409,6 @@ explicitFileType text.script.python - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E293756365100000000 isa @@ -474,7 +463,6 @@ ]]> children - 1DD70E291289FAA500000000 1DD70E293756365100000000 1DD70E2944AF915000000000 1DD70E29A44DC47200000000 @@ -511,13 +499,6 @@ B401C979CF9FEE7700000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F043756365100000000 isa @@ -552,7 +533,6 @@ PBXSourcesBuildPhase files - E7A30F041289FAA500000000 E7A30F043756365100000000 E7A30F0444AF915000000000 E7A30F04A44DC47200000000 diff --git a/submodules/TelegramPermissionsUI/TelegramPermissionsUI_Xcode.xcodeproj/project.pbxproj b/submodules/TelegramPermissionsUI/TelegramPermissionsUI_Xcode.xcodeproj/project.pbxproj index 4daab3fd10..f47b344ba7 100644 --- a/submodules/TelegramPermissionsUI/TelegramPermissionsUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/TelegramPermissionsUI/TelegramPermissionsUI_Xcode.xcodeproj/project.pbxproj @@ -24,9 +24,9 @@ D0C9C9872302151500FAB518 /* DeviceAccess.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C9862302151500FAB518 /* DeviceAccess.framework */; }; D0C9C9892302151900FAB518 /* AccountContext.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C9882302151900FAB518 /* AccountContext.framework */; }; D0C9C98B2302152800FAB518 /* Postbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C98A2302152800FAB518 /* Postbox.framework */; }; - D0C9C9912302157F00FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C9902302157F00FAB518 /* FrameworkBundle.swift */; }; D0C9C9BD2302168C00FAB518 /* PeersNearbyIconNode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C9BC2302168C00FAB518 /* PeersNearbyIconNode.framework */; }; D0C9C9DC2302266A00FAB518 /* SolidRoundedButtonNode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C9DB2302266A00FAB518 /* SolidRoundedButtonNode.framework */; }; + D0EFF276231982EE00CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF275231982EE00CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -49,9 +49,9 @@ D0C9C9862302151500FAB518 /* DeviceAccess.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = DeviceAccess.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C9882302151900FAB518 /* AccountContext.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AccountContext.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C98A2302152800FAB518 /* Postbox.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Postbox.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D0C9C9902302157F00FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D0C9C9BC2302168C00FAB518 /* PeersNearbyIconNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PeersNearbyIconNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C9DB2302266A00FAB518 /* SolidRoundedButtonNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = SolidRoundedButtonNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D0EFF275231982EE00CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -59,6 +59,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF276231982EE00CF5164 /* AppBundle.framework in Frameworks */, D0C9C9DC2302266A00FAB518 /* SolidRoundedButtonNode.framework in Frameworks */, D0C9C9BD2302168C00FAB518 /* PeersNearbyIconNode.framework in Frameworks */, D0C9C98B2302152800FAB518 /* Postbox.framework in Frameworks */, @@ -104,7 +105,6 @@ D0C9C96B230214D300FAB518 /* PermissionController.swift */, D0C9C96A230214D300FAB518 /* PermissionControllerNode.swift */, D0C9C96C230214D300FAB518 /* PermissionSplitTest.swift */, - D0C9C9902302157F00FAB518 /* FrameworkBundle.swift */, D0C9C95D2302147100FAB518 /* TelegramPermissionsUI.h */, ); path = Sources; @@ -113,6 +113,7 @@ D0C9C973230214E500FAB518 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF275231982EE00CF5164 /* AppBundle.framework */, D0C9C9DB2302266A00FAB518 /* SolidRoundedButtonNode.framework */, D0C9C9BC2302168C00FAB518 /* PeersNearbyIconNode.framework */, D0C9C98A2302152800FAB518 /* Postbox.framework */, @@ -213,7 +214,6 @@ files = ( D0C9C96F230214D300FAB518 /* PermissionControllerNode.swift in Sources */, D0C9C971230214D300FAB518 /* PermissionSplitTest.swift in Sources */, - D0C9C9912302157F00FAB518 /* FrameworkBundle.swift in Sources */, D0C9C96E230214D300FAB518 /* PermissionContentNode.swift in Sources */, D0C9C970230214D300FAB518 /* PermissionController.swift in Sources */, ); diff --git a/submodules/TelegramPresentationData/BUCK b/submodules/TelegramPresentationData/BUCK index 41143dfe19..898ef3644e 100644 --- a/submodules/TelegramPresentationData/BUCK +++ b/submodules/TelegramPresentationData/BUCK @@ -19,6 +19,7 @@ static_library( "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared", "//submodules/TelegramUIPreferences:TelegramUIPreferences", "//submodules/MediaResources:MediaResources", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/TelegramPresentationData/Sources/ChatControllerBackgroundNode.swift b/submodules/TelegramPresentationData/Sources/ChatControllerBackgroundNode.swift index eedc9b666a..914406bd5a 100644 --- a/submodules/TelegramPresentationData/Sources/ChatControllerBackgroundNode.swift +++ b/submodules/TelegramPresentationData/Sources/ChatControllerBackgroundNode.swift @@ -6,6 +6,7 @@ import Display import SwiftSignalKit import Postbox import MediaResources +import AppBundle private var backgroundImageForWallpaper: (TelegramWallpaper, Bool, UIImage)? @@ -31,7 +32,7 @@ public func chatControllerBackgroundImage(theme: PresentationTheme, wallpaper in } else { switch wallpaper { case .builtin: - if let filePath = frameworkBundle.path(forResource: "ChatWallpaperBuiltin0", ofType: "jpg") { + if let filePath = getAppBundle().path(forResource: "ChatWallpaperBuiltin0", ofType: "jpg") { backgroundImage = UIImage(contentsOfFile: filePath)?.precomposed() } case let .color(color): diff --git a/submodules/TelegramPresentationData/Sources/FrameworkSpecific.swift b/submodules/TelegramPresentationData/Sources/FrameworkSpecific.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/TelegramPresentationData/Sources/FrameworkSpecific.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/TelegramPresentationData/Sources/PresentationData.swift b/submodules/TelegramPresentationData/Sources/PresentationData.swift index dd3cc87ac1..b4cffa1d1b 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationData.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationData.swift @@ -7,6 +7,7 @@ import Contacts import AddressBook import Display import TelegramUIPreferences +import AppBundle public struct PresentationDateTimeFormat: Equatable { public let timeFormat: PresentationTimeFormat @@ -121,7 +122,7 @@ public func dictFromLocalization(_ value: Localization) -> [String: String] { } private func volumeControlStatusBarIcons() -> PresentationVolumeControlStatusBarIcons { - let bundle = Bundle(for: PresentationTheme.self) + let bundle = getAppBundle() return PresentationVolumeControlStatusBarIcons(offIcon: UIImage(named: "Components/Volume/VolumeOff", in: bundle, compatibleWith: nil)!, halfIcon: UIImage(named: "Components/Volume/VolumeHalf", in: bundle, compatibleWith: nil)!, fullIcon: UIImage(named: "Components/Volume/VolumeFull", in: bundle, compatibleWith: nil)!) } diff --git a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift index fdbff0ceec..978e9d2308 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift @@ -1,4 +1,5 @@ import Foundation +import AppBundle private let fallbackDict: [String: String] = { guard let mainPath = Bundle.main.path(forResource: "en", ofType: "lproj"), let bundle = Bundle(path: mainPath) else { @@ -139,7 +140,7 @@ private final class DataReader { } private func loadMapping() -> ([Int], [String], [Int], [Int], [String]) { - guard let filePath = Bundle(for: PresentationStrings.self).path(forResource: "PresentationStrings", ofType: "mapping") else { + guard let filePath = getAppBundle().path(forResource: "PresentationStrings", ofType: "mapping") else { fatalError() } guard let data = try? Data(contentsOf: URL(fileURLWithPath: filePath)) else { diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift index 93153d7aea..c825b31b52 100644 --- a/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift +++ b/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift @@ -4,6 +4,7 @@ import Display import Postbox import TelegramCore import TelegramUIPreferences +import AppBundle private func generateCheckImage(partial: Bool, color: UIColor) -> UIImage? { return generateImage(CGSize(width: 11.0, height: 9.0), rotatedContext: { size, context in diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesCallList.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesCallList.swift index 89f5a4e0d7..519697a987 100644 --- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesCallList.swift +++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesCallList.swift @@ -1,6 +1,7 @@ import Foundation import UIKit import Display +import AppBundle public struct PresentationResourcesCallList { public static func outgoingIcon(_ theme: PresentationTheme) -> UIImage? { diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift index 4c27cc528b..903f3c4419 100644 --- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift +++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift @@ -3,6 +3,7 @@ import UIKit import Display import Postbox import TelegramCore +import AppBundle private func generateLineImage(color: UIColor) -> UIImage? { return generateImage(CGSize(width: 2.0, height: 3.0), contextGenerator: { size, context in diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChatList.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChatList.swift index acd39be630..78058fb27d 100644 --- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChatList.swift +++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChatList.swift @@ -1,6 +1,7 @@ import Foundation import UIKit import Display +import AppBundle private func generateStatusCheckImage(theme: PresentationTheme, single: Bool) -> UIImage? { return generateImage(CGSize(width: single ? 13.0 : 18.0, height: 13.0), rotatedContext: { size, context in diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesItemList.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesItemList.swift index 84a91cad0f..54e893f7c4 100644 --- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesItemList.swift +++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesItemList.swift @@ -1,6 +1,7 @@ import Foundation import UIKit import Display +import AppBundle public func generateItemListCheckIcon(color: UIColor) -> UIImage? { return generateImage(CGSize(width: 12.0, height: 10.0), rotatedContext: { size, context in diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesRootController.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesRootController.swift index ba4958757d..0e31cd52d3 100644 --- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesRootController.swift +++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesRootController.swift @@ -1,6 +1,7 @@ import Foundation import UIKit import Display +import AppBundle private func generateShareButtonImage(theme: PresentationTheme) -> UIImage? { return generateTintedImage(image: UIImage(bundleImageName: "Chat List/NavigationShare"), color: theme.rootController.navigationBar.accentTextColor) diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesSettings.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesSettings.swift index fd7466ff77..627ec72c56 100644 --- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesSettings.swift +++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesSettings.swift @@ -1,6 +1,7 @@ import Foundation import UIKit import Display +import AppBundle public struct PresentationResourcesSettings { public static let editProfile = UIImage(bundleImageName: "Settings/MenuIcons/EditProfile")?.precomposed() diff --git a/submodules/TelegramPresentationData/TelegramPresentationData.xcodeproj/project.pbxproj b/submodules/TelegramPresentationData/TelegramPresentationData.xcodeproj/project.pbxproj index 29031196c3..fd4e4ce018 100644 --- a/submodules/TelegramPresentationData/TelegramPresentationData.xcodeproj/project.pbxproj +++ b/submodules/TelegramPresentationData/TelegramPresentationData.xcodeproj/project.pbxproj @@ -414,17 +414,6 @@ lastKnownFileType sourcecode.c.objc - 1DD70E29F2EA27D500000000 - - isa - PBXFileReference - name - FrameworkSpecific.swift - path - Sources/FrameworkSpecific.swift - sourceTree - SOURCE_ROOT - 1DD70E2975F0684600000000 isa @@ -517,25 +506,14 @@ sourceTree SOURCE_ROOT - 1DD70E2970CC317A00000000 + 1DD70E29070398DB00000000 isa PBXFileReference name - PresentationThemeDecoder.swift + PresentationThemeCoder.swift path - Sources/PresentationThemeDecoder.swift - sourceTree - SOURCE_ROOT - - 1DD70E29A48E085200000000 - - isa - PBXFileReference - name - PresentationThemeEncoder.swift - path - Sources/PresentationThemeEncoder.swift + Sources/PresentationThemeCoder.swift sourceTree SOURCE_ROOT @@ -603,7 +581,6 @@ 1DD70E29D460D78C00000000 1DD70E29D49E2A0600000000 1DD70E29D49E2A0B00000000 - 1DD70E29F2EA27D500000000 1DD70E2975F0684600000000 1DD70E292EF9141500000000 1DD70E292EF9141A00000000 @@ -612,8 +589,7 @@ 1DD70E296771CE8D00000000 1DD70E29D868521400000000 1DD70E2907087D8800000000 - 1DD70E2970CC317A00000000 - 1DD70E29A48E085200000000 + 1DD70E29070398DB00000000 1DD70E2913777C2F00000000 1DD70E295646A68000000000 1DD70E293D3BD71400000000 @@ -755,13 +731,6 @@ fileRef 1DD70E29D49E2A0B00000000 - E7A30F04F2EA27D500000000 - - isa - PBXBuildFile - fileRef - 1DD70E29F2EA27D500000000 - E7A30F0475F0684600000000 isa @@ -811,19 +780,12 @@ fileRef 1DD70E2907087D8800000000 - E7A30F0470CC317A00000000 + E7A30F04070398DB00000000 isa PBXBuildFile fileRef - 1DD70E2970CC317A00000000 - - E7A30F04A48E085200000000 - - isa - PBXBuildFile - fileRef - 1DD70E29A48E085200000000 + 1DD70E29070398DB00000000 E7A30F0413777C2F00000000 @@ -874,7 +836,6 @@ E7A30F04BA1E31F900000000 E7A30F04D460D78C00000000 E7A30F04D49E2A0B00000000 - E7A30F04F2EA27D500000000 E7A30F0475F0684600000000 E7A30F042EF9141A00000000 E7A30F04F91318E900000000 @@ -882,8 +843,7 @@ E7A30F046771CE8D00000000 E7A30F04D868521400000000 E7A30F0407087D8800000000 - E7A30F0470CC317A00000000 - E7A30F04A48E085200000000 + E7A30F04070398DB00000000 E7A30F0413777C2F00000000 E7A30F045646A68000000000 E7A30F043D3BD71400000000 diff --git a/submodules/TelegramPresentationData/TelegramPresentationData_Xcode.xcodeproj/project.pbxproj b/submodules/TelegramPresentationData/TelegramPresentationData_Xcode.xcodeproj/project.pbxproj index bda6b87d51..fd7acefd40 100644 --- a/submodules/TelegramPresentationData/TelegramPresentationData_Xcode.xcodeproj/project.pbxproj +++ b/submodules/TelegramPresentationData/TelegramPresentationData_Xcode.xcodeproj/project.pbxproj @@ -17,7 +17,6 @@ D06017EF22F3578200796784 /* PresentationResourceKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = D06017E822F3578200796784 /* PresentationResourceKey.swift */; }; D06017F022F3578200796784 /* PresentationResourcesChatList.swift in Sources */ = {isa = PBXBuildFile; fileRef = D06017E922F3578200796784 /* PresentationResourcesChatList.swift */; }; D06017F122F3578200796784 /* PresentationResourcesItemList.swift in Sources */ = {isa = PBXBuildFile; fileRef = D06017EA22F3578200796784 /* PresentationResourcesItemList.swift */; }; - D06017F322F3583200796784 /* FrameworkSpecific.swift in Sources */ = {isa = PBXBuildFile; fileRef = D06017F222F3583200796784 /* FrameworkSpecific.swift */; }; D06017F522F35A4000796784 /* PresentationThemeEssentialGraphics.swift in Sources */ = {isa = PBXBuildFile; fileRef = D06017F422F35A4000796784 /* PresentationThemeEssentialGraphics.swift */; }; D06017F722F35A9200796784 /* ChatMessageBubbleImages.swift in Sources */ = {isa = PBXBuildFile; fileRef = D06017F622F35A9200796784 /* ChatMessageBubbleImages.swift */; }; D06017F922F35ACF00796784 /* WallpaperUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = D06017F822F35ACF00796784 /* WallpaperUtils.swift */; }; @@ -44,6 +43,7 @@ D0AE31D822B27AAF0058D3BC /* EDSunriseSet.h in Headers */ = {isa = PBXBuildFile; fileRef = D0AE31D622B27AAE0058D3BC /* EDSunriseSet.h */; settings = {ATTRIBUTES = (Public, ); }; }; D0AE31D922B27AAF0058D3BC /* EDSunriseSet.m in Sources */ = {isa = PBXBuildFile; fileRef = D0AE31D722B27AAE0058D3BC /* EDSunriseSet.m */; }; D0AE321422B2826A0058D3BC /* ComponentsThemes.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0AE321322B282690058D3BC /* ComponentsThemes.swift */; }; + D0EFF2422319800700CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF2412319800700CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -57,7 +57,6 @@ D06017E822F3578200796784 /* PresentationResourceKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PresentationResourceKey.swift; sourceTree = ""; }; D06017E922F3578200796784 /* PresentationResourcesChatList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PresentationResourcesChatList.swift; sourceTree = ""; }; D06017EA22F3578200796784 /* PresentationResourcesItemList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PresentationResourcesItemList.swift; sourceTree = ""; }; - D06017F222F3583200796784 /* FrameworkSpecific.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkSpecific.swift; sourceTree = ""; }; D06017F422F35A4000796784 /* PresentationThemeEssentialGraphics.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PresentationThemeEssentialGraphics.swift; sourceTree = ""; }; D06017F622F35A9200796784 /* ChatMessageBubbleImages.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatMessageBubbleImages.swift; sourceTree = ""; }; D06017F822F35ACF00796784 /* WallpaperUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WallpaperUtils.swift; sourceTree = ""; }; @@ -87,6 +86,7 @@ D0AE31D622B27AAE0058D3BC /* EDSunriseSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EDSunriseSet.h; sourceTree = ""; }; D0AE31D722B27AAE0058D3BC /* EDSunriseSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EDSunriseSet.m; sourceTree = ""; }; D0AE321322B282690058D3BC /* ComponentsThemes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ComponentsThemes.swift; sourceTree = ""; }; + D0EFF2412319800700CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -94,6 +94,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF2422319800700CF5164 /* AppBundle.framework in Frameworks */, D068EE9022F4A9B60064E921 /* MediaResources.framework in Frameworks */, D0AE31C322B274E90058D3BC /* TelegramUIPreferences.framework in Frameworks */, D0AE31BF22B274950058D3BC /* Display.framework in Frameworks */, @@ -164,7 +165,6 @@ D06017F622F35A9200796784 /* ChatMessageBubbleImages.swift */, D06017F822F35ACF00796784 /* WallpaperUtils.swift */, D084F9EF22F3AEFD004874CE /* ChatControllerBackgroundNode.swift */, - D06017F222F3583200796784 /* FrameworkSpecific.swift */, D0AE31A922B273F20058D3BC /* TelegramPresentationData.h */, ); path = Sources; @@ -173,6 +173,7 @@ D0AE31B722B2747A0058D3BC /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF2412319800700CF5164 /* AppBundle.framework */, D068EE8F22F4A9B60064E921 /* MediaResources.framework */, D084F9F122F3AFEA004874CE /* AccountContext.framework */, D0AE31C222B274E90058D3BC /* TelegramUIPreferences.framework */, @@ -269,7 +270,6 @@ D06017F122F3578200796784 /* PresentationResourcesItemList.swift in Sources */, D06017EC22F3578200796784 /* PresentationResourcesChat.swift in Sources */, D0AE31D522B27A780058D3BC /* DefaultDayPresentationTheme.swift in Sources */, - D06017F322F3583200796784 /* FrameworkSpecific.swift in Sources */, D06017F022F3578200796784 /* PresentationResourcesChatList.swift in Sources */, D0AE31D422B27A780058D3BC /* DefaultPresentationStrings.swift in Sources */, 097A581B22D528680078B73C /* PresentationThemeCodable.swift in Sources */, diff --git a/submodules/TelegramStringFormatting/BUCK b/submodules/TelegramStringFormatting/BUCK index c66bbb9674..432cd2f422 100644 --- a/submodules/TelegramStringFormatting/BUCK +++ b/submodules/TelegramStringFormatting/BUCK @@ -14,6 +14,7 @@ static_library( "//submodules/TextFormat:TextFormat", "//submodules/TelegramUIPreferences:TelegramUIPreferences", "//submodules/TelegramPresentationData:TelegramPresentationData", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/TelegramStringFormatting/Sources/CurrencyFormat.swift b/submodules/TelegramStringFormatting/Sources/CurrencyFormat.swift index b233f1bf4b..c673cecd03 100644 --- a/submodules/TelegramStringFormatting/Sources/CurrencyFormat.swift +++ b/submodules/TelegramStringFormatting/Sources/CurrencyFormat.swift @@ -1,4 +1,5 @@ import Foundation +import AppBundle private final class CurrencyFormatterEntry { let symbol: String @@ -19,7 +20,7 @@ private final class CurrencyFormatterEntry { } private func loadCurrencyFormatterEntries() -> [String: CurrencyFormatterEntry] { - guard let filePath = frameworkBundle.path(forResource: "currencies", ofType: "json") else { + guard let filePath = getAppBundle().path(forResource: "currencies", ofType: "json") else { return [:] } guard let data = try? Data(contentsOf: URL(fileURLWithPath: filePath)) else { diff --git a/submodules/TelegramStringFormatting/Sources/FrameworkBundle.swift b/submodules/TelegramStringFormatting/Sources/FrameworkBundle.swift deleted file mode 100644 index 2d6a4df5c4..0000000000 --- a/submodules/TelegramStringFormatting/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,6 +0,0 @@ -import Foundation - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) diff --git a/submodules/TelegramStringFormatting/TelegramStringFormatting.xcodeproj/project.pbxproj b/submodules/TelegramStringFormatting/TelegramStringFormatting.xcodeproj/project.pbxproj index ec53bf597b..e3e6d6daa2 100644 --- a/submodules/TelegramStringFormatting/TelegramStringFormatting.xcodeproj/project.pbxproj +++ b/submodules/TelegramStringFormatting/TelegramStringFormatting.xcodeproj/project.pbxproj @@ -302,17 +302,6 @@ sourceTree SOURCE_ROOT - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E29851AE19F00000000 isa @@ -403,7 +392,6 @@ 1DD70E29961DBD7900000000 1DD70E29FFA0F42D00000000 1DD70E29A657804A00000000 - 1DD70E291289FAA500000000 1DD70E29851AE19F00000000 1DD70E29FCB4876B00000000 1DD70E29C34D536500000000 @@ -464,13 +452,6 @@ fileRef 1DD70E29A657804A00000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F04851AE19F00000000 isa @@ -529,7 +510,6 @@ E7A30F04961DBD7900000000 E7A30F04FFA0F42D00000000 E7A30F04A657804A00000000 - E7A30F041289FAA500000000 E7A30F04851AE19F00000000 E7A30F04FCB4876B00000000 E7A30F04C34D536500000000 diff --git a/submodules/TelegramStringFormatting/TelegramStringFormatting_Xcode.xcodeproj/project.pbxproj b/submodules/TelegramStringFormatting/TelegramStringFormatting_Xcode.xcodeproj/project.pbxproj index 5d6b2727fc..999904c6fc 100644 --- a/submodules/TelegramStringFormatting/TelegramStringFormatting_Xcode.xcodeproj/project.pbxproj +++ b/submodules/TelegramStringFormatting/TelegramStringFormatting_Xcode.xcodeproj/project.pbxproj @@ -28,8 +28,8 @@ D0C9C35C2300AEBA00FAB518 /* LocalizedPeerData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C35B2300AEBA00FAB518 /* LocalizedPeerData.framework */; }; D0C9C35E2300AEF100FAB518 /* Display.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C35D2300AEF100FAB518 /* Display.framework */; }; D0C9C3622300AFCC00FAB518 /* CurrencyFormat.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C3612300AFCB00FAB518 /* CurrencyFormat.swift */; }; - D0C9C3642300AFE800FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C3632300AFE800FAB518 /* FrameworkBundle.swift */; }; D0C9CA3823022A8300FAB518 /* NumberFormat.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9CA3723022A8300FAB518 /* NumberFormat.swift */; }; + D0EFF23C23197F7700CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF23B23197F7700CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -56,8 +56,8 @@ D0C9C35B2300AEBA00FAB518 /* LocalizedPeerData.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LocalizedPeerData.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C35D2300AEF100FAB518 /* Display.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Display.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C3612300AFCB00FAB518 /* CurrencyFormat.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CurrencyFormat.swift; sourceTree = ""; }; - D0C9C3632300AFE800FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D0C9CA3723022A8300FAB518 /* NumberFormat.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NumberFormat.swift; sourceTree = ""; }; + D0EFF23B23197F7700CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -65,6 +65,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF23C23197F7700CF5164 /* AppBundle.framework in Frameworks */, D03E41722304D6B80049C28B /* Contacts.framework in Frameworks */, D03E41702304D6970049C28B /* AddressBook.framework in Frameworks */, D03E3D4F23045E510049C28B /* PlatformRestrictionMatching.framework in Frameworks */, @@ -114,7 +115,6 @@ D0879AC922F7063300C4D6B3 /* DateFormat.swift */, D0879ABC22F705AE00C4D6B3 /* PresenceStrings.swift */, D0879AB022F7021000C4D6B3 /* TelegramStringFormatting.h */, - D0C9C3632300AFE800FAB518 /* FrameworkBundle.swift */, ); path = Sources; sourceTree = ""; @@ -122,6 +122,7 @@ D0879ABE22F705B700C4D6B3 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF23B23197F7700CF5164 /* AppBundle.framework */, D03E41712304D6B80049C28B /* Contacts.framework */, D03E416F2304D6970049C28B /* AddressBook.framework */, D03E3D4E23045E510049C28B /* PlatformRestrictionMatching.framework */, @@ -217,7 +218,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - D0C9C3642300AFE800FAB518 /* FrameworkBundle.swift in Sources */, D0C9C3622300AFCC00FAB518 /* CurrencyFormat.swift in Sources */, D03E41982304D7D60049C28B /* PeerNotificationSoundStrings.swift in Sources */, D0C9C3562300AD9900FAB518 /* MessageContentKind.swift in Sources */, diff --git a/submodules/TelegramUI/BUCK b/submodules/TelegramUI/BUCK index 1a6fa8d750..4d19ba329e 100644 --- a/submodules/TelegramUI/BUCK +++ b/submodules/TelegramUI/BUCK @@ -1,5 +1,22 @@ load("//Config:buck_rule_macros.bzl", "framework") +apple_asset_catalog( + name = 'TelegramUIAssets', + dirs = [ + "Images.xcassets", + ], + visibility = ["PUBLIC"], +) + +apple_resource( + name = "TelegramUIResources", + files = glob([ + "TelegramUI/Sounds/**/*", + "TelegramUI/Resources/**/*", + ], exclude = ["TelegramUI/**/.*"]), + visibility = ["PUBLIC"], +) + framework( name = "TelegramUI", srcs = glob([ @@ -162,6 +179,8 @@ framework( "//submodules/GridMessageSelectionNode:GridMessageSelectionNode", "//submodules/InstantPageCache:InstantPageCache", "//submodules/PersistentStringHash:PersistentStringHash", + "//submodules/MessageReactionListUI:MessageReactionListUI", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/TelegramUI/TelegramUI/ChatContextResultPeekContentNode.swift b/submodules/TelegramUI/TelegramUI/ChatContextResultPeekContentNode.swift index 75da7abeaa..22afefe400 100644 --- a/submodules/TelegramUI/TelegramUI/ChatContextResultPeekContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatContextResultPeekContentNode.swift @@ -7,6 +7,7 @@ import TelegramCore import SwiftSignalKit import AVFoundation import PhotoResources +import AppBundle final class ChatContextResultPeekContent: PeekControllerContent { let account: Account diff --git a/submodules/TelegramUI/TelegramUI/ChatController.swift b/submodules/TelegramUI/TelegramUI/ChatController.swift index 86d9954aef..7dcb9549a8 100644 --- a/submodules/TelegramUI/TelegramUI/ChatController.swift +++ b/submodules/TelegramUI/TelegramUI/ChatController.swift @@ -45,6 +45,7 @@ import RaiseToListen import UrlHandling import ReactionSelectionNode import MessageReactionListUI +import AppBundle public enum ChatControllerPeekActions { case standard @@ -555,7 +556,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G var reactionItems: [ReactionContextItem] = [] /*for (value, text, name) in reactions { - if let path = frameworkBundle.path(forResource: name, ofType: "tgs", inDirectory: "BuiltinReactions") { + if let path = getAppBundle().path(forResource: name, ofType: "tgs", inDirectory: "BuiltinReactions") { reactionItems.append(ReactionContextItem(value: value, text: text, path: path)) } }*/ diff --git a/submodules/TelegramUI/TelegramUI/ChatEmptyNode.swift b/submodules/TelegramUI/TelegramUI/ChatEmptyNode.swift index 3cfdd04a63..8758a09b3e 100644 --- a/submodules/TelegramUI/TelegramUI/ChatEmptyNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatEmptyNode.swift @@ -5,6 +5,7 @@ import Display import Postbox import TelegramCore import TelegramPresentationData +import AppBundle private protocol ChatEmptyNodeContent { func updateLayout(interfaceState: ChatPresentationInterfaceState, size: CGSize, transition: ContainedViewLayoutTransition) -> CGSize diff --git a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextMenus.swift b/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextMenus.swift index 4a65f4bee8..21b2c81893 100644 --- a/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextMenus.swift +++ b/submodules/TelegramUI/TelegramUI/ChatInterfaceStateContextMenus.swift @@ -11,6 +11,7 @@ import OverlayStatusController import AccountContext import ContextUI import LegacyUI +import AppBundle private struct MessageContextMenuData { let starStatus: Bool? diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift index ce6017c57e..ff139a7c03 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageBubbleItemNode.swift @@ -19,6 +19,7 @@ import Emoji import ReactionSelectionNode import PersistentStringHash import GridMessageSelectionNode +import AppBundle private func contentNodeMessagesAndClassesForItem(_ item: ChatMessageItem) -> [(Message, AnyClass)] { var result: [(Message, AnyClass)] = [] @@ -436,7 +437,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePrevewItemNode var reactionItems: [ReactionGestureItem] = [] for (value, text, name) in reactions { - if let path = frameworkBundle.path(forResource: name, ofType: "tgs", inDirectory: "BuiltinReactions") { + if let path = getAppBundle().path(forResource: name, ofType: "tgs", inDirectory: "BuiltinReactions") { reactionItems.append(.reaction(value: value, text: text, path: path)) } } diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageCallBubbleContentNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageCallBubbleContentNode.swift index 387be91901..f7d145cb86 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageCallBubbleContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageCallBubbleContentNode.swift @@ -5,6 +5,7 @@ import Display import TelegramCore import Postbox import TelegramPresentationData +import AppBundle private let titleFont: UIFont = Font.medium(16.0) private let labelFont: UIFont = Font.regular(13.0) diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaBadge.swift b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaBadge.swift index 70f5a39887..d71b6f4a6f 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaBadge.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageInteractiveMediaBadge.swift @@ -5,6 +5,7 @@ import AsyncDisplayKit import TelegramPresentationData import TextFormat import RadialStatusNode +import AppBundle enum ChatMessageInteractiveMediaDownloadState: Equatable { case remote diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageSelectionInputPanelNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageSelectionInputPanelNode.swift index 4661cd3b29..7266c79424 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageSelectionInputPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageSelectionInputPanelNode.swift @@ -7,6 +7,7 @@ import TelegramCore import SwiftSignalKit import TelegramPresentationData import AccountContext +import AppBundle final class ChatMessageSelectionInputPanelNode: ChatInputPanelNode { private let deleteButton: HighlightableButtonNode diff --git a/submodules/TelegramUI/TelegramUI/ChatMessageSwipeToReplyNode.swift b/submodules/TelegramUI/TelegramUI/ChatMessageSwipeToReplyNode.swift index c6bf45f11a..e1fec4bd6a 100644 --- a/submodules/TelegramUI/TelegramUI/ChatMessageSwipeToReplyNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatMessageSwipeToReplyNode.swift @@ -2,6 +2,7 @@ import Foundation import UIKit import Display import AsyncDisplayKit +import AppBundle final class ChatMessageSwipeToReplyNode: ASDisplayNode { private let backgroundNode: ASImageNode diff --git a/submodules/TelegramUI/TelegramUI/ChatRecordingPreviewInputPanelNode.swift b/submodules/TelegramUI/TelegramUI/ChatRecordingPreviewInputPanelNode.swift index 8d3e9efee5..737ee1cdba 100644 --- a/submodules/TelegramUI/TelegramUI/ChatRecordingPreviewInputPanelNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatRecordingPreviewInputPanelNode.swift @@ -7,6 +7,7 @@ import Postbox import SwiftSignalKit import TelegramPresentationData import UniversalMediaPlayer +import AppBundle private func generatePauseIcon(_ theme: PresentationTheme) -> UIImage? { return generateTintedImage(image: UIImage(bundleImageName: "GlobalMusicPlayer/MinimizedPause"), color: theme.chat.inputPanel.actionControlForegroundColor) diff --git a/submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift b/submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift index f92433fc40..8c8c7e8bb1 100644 --- a/submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatSendMessageActionSheetControllerNode.swift @@ -7,6 +7,7 @@ import Postbox import TelegramCore import TelegramPresentationData import AccountContext +import AppBundle private let leftInset: CGFloat = 16.0 private let rightInset: CGFloat = 16.0 diff --git a/submodules/TelegramUI/TelegramUI/ChatTextInputAudioRecordingOverlayButton.swift b/submodules/TelegramUI/TelegramUI/ChatTextInputAudioRecordingOverlayButton.swift index 6b56c873e0..ab14602ab7 100644 --- a/submodules/TelegramUI/TelegramUI/ChatTextInputAudioRecordingOverlayButton.swift +++ b/submodules/TelegramUI/TelegramUI/ChatTextInputAudioRecordingOverlayButton.swift @@ -2,6 +2,7 @@ import Foundation import UIKit import Display import AsyncDisplayKit +import AppBundle private let innerCircleDiameter: CGFloat = 110.0 private let outerCircleDiameter = innerCircleDiameter + 50.0 diff --git a/submodules/TelegramUI/TelegramUI/ChatTextInputSlowmodePlaceholderNode.swift b/submodules/TelegramUI/TelegramUI/ChatTextInputSlowmodePlaceholderNode.swift index 4dbdd5f730..8249baab92 100644 --- a/submodules/TelegramUI/TelegramUI/ChatTextInputSlowmodePlaceholderNode.swift +++ b/submodules/TelegramUI/TelegramUI/ChatTextInputSlowmodePlaceholderNode.swift @@ -3,6 +3,7 @@ import Display import SwiftSignalKit import TelegramPresentationData import TelegramStringFormatting +import AppBundle final class ChatTextInputSlowmodePlaceholderNode: ASDisplayNode { private var theme: PresentationTheme diff --git a/submodules/TelegramUI/TelegramUI/ComposeController.swift b/submodules/TelegramUI/TelegramUI/ComposeController.swift index 080321eaca..5d23d76649 100644 --- a/submodules/TelegramUI/TelegramUI/ComposeController.swift +++ b/submodules/TelegramUI/TelegramUI/ComposeController.swift @@ -10,6 +10,7 @@ import AccountContext import AlertUI import SearchUI import TelegramPermissionsUI +import AppBundle public class ComposeController: ViewController { private let context: AccountContext diff --git a/submodules/TelegramUI/TelegramUI/ComposeControllerNode.swift b/submodules/TelegramUI/TelegramUI/ComposeControllerNode.swift index 2f2a6aea57..e60225b3dd 100644 --- a/submodules/TelegramUI/TelegramUI/ComposeControllerNode.swift +++ b/submodules/TelegramUI/TelegramUI/ComposeControllerNode.swift @@ -9,6 +9,7 @@ import AccountContext import SearchBarNode import SearchUI import ContactListUI +import AppBundle final class ComposeControllerNode: ASDisplayNode { let contactListNode: ContactListNode diff --git a/submodules/TelegramUI/TelegramUI/Config/TelegramUI.xcconfig b/submodules/TelegramUI/TelegramUI/Config/TelegramUI.xcconfig deleted file mode 100644 index f54392eba9..0000000000 --- a/submodules/TelegramUI/TelegramUI/Config/TelegramUI.xcconfig +++ /dev/null @@ -1,2 +0,0 @@ -SWIFT_INCLUDE_PATHS = $(SRCROOT)/TelegramUI -MODULEMAP_PRIVATE_FILE = $(SRCROOT)/TelegramUI/module.private.modulemap diff --git a/submodules/TelegramUI/TelegramUI/EmojiResources.swift b/submodules/TelegramUI/TelegramUI/EmojiResources.swift index 045c0e8a71..73d81059d0 100644 --- a/submodules/TelegramUI/TelegramUI/EmojiResources.swift +++ b/submodules/TelegramUI/TelegramUI/EmojiResources.swift @@ -11,6 +11,7 @@ import WebP #endif import MediaResources import Emoji +import AppBundle public struct EmojiThumbnailResourceId: MediaResourceId { public let emoji: String @@ -114,7 +115,7 @@ public class EmojiSpriteResource: TelegramMediaResource { } private var emojiMapping: [String: (UInt8, UInt8, UInt8)] = { - let path = frameworkBundle.path(forResource: "Emoji", ofType: "mapping")! + let path = getAppBundle().path(forResource: "Emoji", ofType: "mapping")! var mapping: [String: (UInt8, UInt8, UInt8)] = [:] if let data = try? Data(contentsOf: URL(fileURLWithPath: path)) { diff --git a/submodules/TelegramUI/TelegramUI/FrameworkBundle.swift b/submodules/TelegramUI/TelegramUI/FrameworkBundle.swift deleted file mode 100644 index 3f7a202833..0000000000 --- a/submodules/TelegramUI/TelegramUI/FrameworkBundle.swift +++ /dev/null @@ -1,14 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) -private let screenScaleFactor = Int(UIScreen.main.scale) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/TelegramUI/TelegramUI/GifPaneSearchContentNode.swift b/submodules/TelegramUI/TelegramUI/GifPaneSearchContentNode.swift index 7938ea2828..99b34cd924 100644 --- a/submodules/TelegramUI/TelegramUI/GifPaneSearchContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/GifPaneSearchContentNode.swift @@ -8,6 +8,7 @@ import TelegramCore import TelegramPresentationData import AccountContext import WebSearchUI +import AppBundle func paneGifSearchForQuery(account: Account, query: String, updateActivity: ((Bool) -> Void)?) -> Signal<[FileMediaReference]?, NoError> { let delayRequest = true diff --git a/submodules/TelegramUI/TelegramUI/LegacyInstantVideoController.swift b/submodules/TelegramUI/TelegramUI/LegacyInstantVideoController.swift index 4e19401c7f..c274d8502b 100644 --- a/submodules/TelegramUI/TelegramUI/LegacyInstantVideoController.swift +++ b/submodules/TelegramUI/TelegramUI/LegacyInstantVideoController.swift @@ -11,6 +11,7 @@ import AccountContext import LegacyUI import ImageCompression import LocalMediaResources +import AppBundle final class InstantVideoControllerRecordingStatus { let micLevel: Signal diff --git a/submodules/TelegramUI/TelegramUI/OverlayInstantVideoDecoration.swift b/submodules/TelegramUI/TelegramUI/OverlayInstantVideoDecoration.swift index 2b9f365df3..8ac041dde8 100644 --- a/submodules/TelegramUI/TelegramUI/OverlayInstantVideoDecoration.swift +++ b/submodules/TelegramUI/TelegramUI/OverlayInstantVideoDecoration.swift @@ -5,6 +5,7 @@ import Display import SwiftSignalKit import UniversalMediaPlayer import AccountContext +import AppBundle private let backgroundImage = UIImage(bundleImageName: "Chat/Message/OverlayInstantVideoShadow")?.precomposed() diff --git a/submodules/TelegramUI/TelegramUI/OverlayPlayerControlsNode.swift b/submodules/TelegramUI/TelegramUI/OverlayPlayerControlsNode.swift index 7a2160a066..57cd6daef7 100644 --- a/submodules/TelegramUI/TelegramUI/OverlayPlayerControlsNode.swift +++ b/submodules/TelegramUI/TelegramUI/OverlayPlayerControlsNode.swift @@ -10,6 +10,7 @@ import UniversalMediaPlayer import TelegramUIPreferences import AccountContext import PhotoResources +import AppBundle private func generateBackground(theme: PresentationTheme) -> UIImage? { return generateImage(CGSize(width: 20.0, height: 10.0 + 8.0), rotatedContext: { size, context in diff --git a/submodules/TelegramUI/TelegramUI/PaneSearchBarNode.swift b/submodules/TelegramUI/TelegramUI/PaneSearchBarNode.swift index b4890cd0ff..c7837b742d 100644 --- a/submodules/TelegramUI/TelegramUI/PaneSearchBarNode.swift +++ b/submodules/TelegramUI/TelegramUI/PaneSearchBarNode.swift @@ -5,6 +5,7 @@ import AsyncDisplayKit import Display import TelegramPresentationData import ActivityIndicator +import AppBundle private func generateLoupeIcon(color: UIColor) -> UIImage? { return generateTintedImage(image: UIImage(bundleImageName: "Components/Search Bar/Loupe"), color: color) diff --git a/submodules/TelegramUI/TelegramUI/PaneSearchBarPlaceholderItem.swift b/submodules/TelegramUI/TelegramUI/PaneSearchBarPlaceholderItem.swift index 84c0ff76f7..2f175126c7 100644 --- a/submodules/TelegramUI/TelegramUI/PaneSearchBarPlaceholderItem.swift +++ b/submodules/TelegramUI/TelegramUI/PaneSearchBarPlaceholderItem.swift @@ -3,6 +3,7 @@ import UIKit import AsyncDisplayKit import Display import TelegramPresentationData +import AppBundle private let templateLoupeIcon = UIImage(bundleImageName: "Components/Search Bar/Loupe") diff --git a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionEmptyNode.swift b/submodules/TelegramUI/TelegramUI/PeerMediaCollectionEmptyNode.swift index 66ee3035b4..c9eb63bf1a 100644 --- a/submodules/TelegramUI/TelegramUI/PeerMediaCollectionEmptyNode.swift +++ b/submodules/TelegramUI/TelegramUI/PeerMediaCollectionEmptyNode.swift @@ -4,6 +4,7 @@ import AsyncDisplayKit import Display import TelegramPresentationData import ActivityIndicator +import AppBundle final class PeerMediaCollectionEmptyNode: ASDisplayNode { private let mode: PeerMediaCollectionMode diff --git a/submodules/TelegramUI/TelegramUI/ServiceSoundManager.swift b/submodules/TelegramUI/TelegramUI/ServiceSoundManager.swift index c4ba6b38f7..6a856ca430 100644 --- a/submodules/TelegramUI/TelegramUI/ServiceSoundManager.swift +++ b/submodules/TelegramUI/TelegramUI/ServiceSoundManager.swift @@ -1,9 +1,10 @@ import Foundation import SwiftSignalKit import AudioToolbox +import AppBundle private func loadSystemSoundFromBundle(name: String) -> SystemSoundID? { - let path = "\(frameworkBundle.resourcePath!)/\(name)" + let path = "\(getAppBundle().resourcePath!)/\(name)" let url = URL(fileURLWithPath: path) var sound: SystemSoundID = 0 if AudioServicesCreateSystemSoundID(url as CFURL, &sound) == noErr { diff --git a/submodules/TelegramUI/TelegramUI/StickerPaneSearchContentNode.swift b/submodules/TelegramUI/TelegramUI/StickerPaneSearchContentNode.swift index 9913c3bb61..2cf75faa78 100644 --- a/submodules/TelegramUI/TelegramUI/StickerPaneSearchContentNode.swift +++ b/submodules/TelegramUI/TelegramUI/StickerPaneSearchContentNode.swift @@ -11,6 +11,7 @@ import MergeLists import AccountContext import StickerPackPreviewUI import Emoji +import AppBundle final class StickerPaneSearchInteraction { let open: (StickerPackCollectionInfo) -> Void diff --git a/submodules/TelegramUI/TelegramUI/TelegramRootController.swift b/submodules/TelegramUI/TelegramUI/TelegramRootController.swift index 2c5e678bdb..54bcfd3050 100644 --- a/submodules/TelegramUI/TelegramUI/TelegramRootController.swift +++ b/submodules/TelegramUI/TelegramUI/TelegramRootController.swift @@ -10,6 +10,7 @@ import ContactListUI import CallListUI import ChatListUI import SettingsUI +import AppBundle public final class TelegramRootController: NavigationController { private let context: AccountContext diff --git a/submodules/TelegramUI/TelegramUI_Xcode.xcodeproj/project.pbxproj b/submodules/TelegramUI/TelegramUI_Xcode.xcodeproj/project.pbxproj index 909c30af3e..4e5d56956a 100644 --- a/submodules/TelegramUI/TelegramUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/TelegramUI/TelegramUI_Xcode.xcodeproj/project.pbxproj @@ -9,40 +9,16 @@ /* Begin PBXBuildFile section */ 090B48C82200BCA8005083FA /* WallpaperUploadManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 090B48C72200BCA8005083FA /* WallpaperUploadManager.swift */; }; 090E63EE2196FE3A00E3C035 /* OpenAddContact.swift in Sources */ = {isa = PBXBuildFile; fileRef = 090E63ED2196FE3A00E3C035 /* OpenAddContact.swift */; }; - 090E778C22AA842300CD99F5 /* anim_success.json in Resources */ = {isa = PBXBuildFile; fileRef = 090E778B22AA842200CD99F5 /* anim_success.json */; }; 0910B0ED21FA178C00F8F87D /* WallpaperPreviewMedia.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0910B0EC21FA178C00F8F87D /* WallpaperPreviewMedia.swift */; }; 091BEAB3214552D9003AEA30 /* Vision.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D02DADBE2138D76F00116225 /* Vision.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 0921F60E228EE000001A13D7 /* ChatMessageActionUrlAuthController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0921F60D228EE000001A13D7 /* ChatMessageActionUrlAuthController.swift */; }; - 092F368D2154AAEA001A9F49 /* SFCompactRounded-Semibold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 092F368C2154AAE9001A9F49 /* SFCompactRounded-Semibold.otf */; }; - 09310D32213ED5FC0020033A /* anim_ungroup.json in Resources */ = {isa = PBXBuildFile; fileRef = 09310D1A213BC5DE0020033A /* anim_ungroup.json */; }; - 09310D33213ED5FC0020033A /* anim_group.json in Resources */ = {isa = PBXBuildFile; fileRef = 09310D1B213BC5DE0020033A /* anim_group.json */; }; 0940932422E73DFB003846A3 /* ChatSendMessageActionSheetController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0940932322E73DFB003846A3 /* ChatSendMessageActionSheetController.swift */; }; 0940932622E73E12003846A3 /* ChatSendMessageActionSheetControllerNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0940932522E73E12003846A3 /* ChatSendMessageActionSheetControllerNode.swift */; }; - 0947350E2275D72100EA2312 /* anim_hide.json in Resources */ = {isa = PBXBuildFile; fileRef = 094735042275D71F00EA2312 /* anim_hide.json */; }; - 0947350F2275D72100EA2312 /* anim_unread.json in Resources */ = {isa = PBXBuildFile; fileRef = 094735052275D72000EA2312 /* anim_unread.json */; }; - 094735102275D72100EA2312 /* anim_read.json in Resources */ = {isa = PBXBuildFile; fileRef = 094735062275D72000EA2312 /* anim_read.json */; }; - 094735112275D72100EA2312 /* anim_archive.json in Resources */ = {isa = PBXBuildFile; fileRef = 094735072275D72000EA2312 /* anim_archive.json */; }; - 094735122275D72100EA2312 /* anim_mute.json in Resources */ = {isa = PBXBuildFile; fileRef = 094735082275D72000EA2312 /* anim_mute.json */; }; - 094735132275D72100EA2312 /* anim_delete.json in Resources */ = {isa = PBXBuildFile; fileRef = 094735092275D72000EA2312 /* anim_delete.json */; }; - 094735142275D72100EA2312 /* anim_unarchive.json in Resources */ = {isa = PBXBuildFile; fileRef = 0947350A2275D72000EA2312 /* anim_unarchive.json */; }; - 094735152275D72100EA2312 /* anim_unpin.json in Resources */ = {isa = PBXBuildFile; fileRef = 0947350B2275D72000EA2312 /* anim_unpin.json */; }; - 094735162275D72100EA2312 /* anim_unmute.json in Resources */ = {isa = PBXBuildFile; fileRef = 0947350C2275D72100EA2312 /* anim_unmute.json */; }; - 094735172275D72100EA2312 /* anim_pin.json in Resources */ = {isa = PBXBuildFile; fileRef = 0947350D2275D72100EA2312 /* anim_pin.json */; }; - 094735192277483C00EA2312 /* anim_infotip.json in Resources */ = {isa = PBXBuildFile; fileRef = 094735182277483B00EA2312 /* anim_infotip.json */; }; 09510B1322F96E5B0078CAB7 /* ChatScheduleTimeController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09510B1222F96E5B0078CAB7 /* ChatScheduleTimeController.swift */; }; 09510B1522F96E6C0078CAB7 /* ChatScheduleTimeControllerNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09510B1422F96E6C0078CAB7 /* ChatScheduleTimeControllerNode.swift */; }; 095214EF2318D4D3008CDD87 /* ThemeUpdateManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 095214EE2318D4D3008CDD87 /* ThemeUpdateManager.swift */; }; 0962E67921B67A9800245FD9 /* ChatMessageAnimatedStickerItemNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0962E67821B67A9800245FD9 /* ChatMessageAnimatedStickerItemNode.swift */; }; 09749BC521F0E024008FDDE9 /* StickersChatInputContextPanelItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09749BC421F0E024008FDDE9 /* StickersChatInputContextPanelItem.swift */; }; - 09874E4F21078FA100E190B8 /* Generic.html in Resources */ = {isa = PBXBuildFile; fileRef = 0979788321065F8C0077D77F /* Generic.html */; }; - 09874E5021078FA100E190B8 /* GenericUserScript.js in Resources */ = {isa = PBXBuildFile; fileRef = 0979788821065F8C0077D77F /* GenericUserScript.js */; }; - 09874E5121078FA100E190B8 /* Instagram.html in Resources */ = {isa = PBXBuildFile; fileRef = 0979788421065F8C0077D77F /* Instagram.html */; }; - 09874E5221078FA100E190B8 /* Twitch.html in Resources */ = {isa = PBXBuildFile; fileRef = 0979788521065F8C0077D77F /* Twitch.html */; }; - 09874E5321078FA100E190B8 /* TwitchUserScript.js in Resources */ = {isa = PBXBuildFile; fileRef = 0979788621065F8C0077D77F /* TwitchUserScript.js */; }; - 09874E5421078FA100E190B8 /* Vimeo.html in Resources */ = {isa = PBXBuildFile; fileRef = 0979788221065F8C0077D77F /* Vimeo.html */; }; - 09874E5521078FA100E190B8 /* VimeoUserScript.js in Resources */ = {isa = PBXBuildFile; fileRef = 0979788021065F8B0077D77F /* VimeoUserScript.js */; }; - 09874E5621078FA100E190B8 /* Youtube.html in Resources */ = {isa = PBXBuildFile; fileRef = 0979788721065F8C0077D77F /* Youtube.html */; }; - 09874E5721078FA100E190B8 /* YoutubeUserScript.js in Resources */ = {isa = PBXBuildFile; fileRef = 0979788121065F8B0077D77F /* YoutubeUserScript.js */; }; 099529B021D2123E00805E13 /* ChatMessageUnsupportedBubbleContentNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 099529AF21D2123E00805E13 /* ChatMessageUnsupportedBubbleContentNode.swift */; }; 099529B421D3E5D800805E13 /* CheckDiskSpace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 099529B321D3E5D800805E13 /* CheckDiskSpace.swift */; }; 09A218D9229EE1B600DE6898 /* HorizontalStickerGridItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09A218D7229EE1B500DE6898 /* HorizontalStickerGridItem.swift */; }; @@ -53,13 +29,10 @@ 09D304152173C0E900C00567 /* WatchManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09D304142173C0E900C00567 /* WatchManager.swift */; }; 09D96899221DE92600B1458A /* ID3ArtworkReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09D96898221DE92600B1458A /* ID3ArtworkReader.swift */; }; 09DD5D5021ECC3C400D7007A /* SuppressContactsWarning.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09DD5D4F21ECC3C400D7007A /* SuppressContactsWarning.swift */; }; - 09E2D9EF226F1AFA00EA0AA4 /* Emoji.mapping in Resources */ = {isa = PBXBuildFile; fileRef = 09E2D9ED226F1AF300EA0AA4 /* Emoji.mapping */; }; 09E2D9F1226F214000EA0AA4 /* EmojiResources.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09E2D9F0226F214000EA0AA4 /* EmojiResources.swift */; }; - 09E2DA132273367900EA0AA4 /* anim_archiveAvatar.json in Resources */ = {isa = PBXBuildFile; fileRef = 09E2DA122273367900EA0AA4 /* anim_archiveAvatar.json */; }; 09EC0DED22CB583C00E7185B /* TextLinkHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09EC0DEC22CB583C00E7185B /* TextLinkHandling.swift */; }; 09EDAD2A220DA6A40012A50B /* VolumeButtons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09EDAD29220DA6A40012A50B /* VolumeButtons.swift */; }; 09F2158D225CF5BC00AEDF6D /* Pasteboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09F2158C225CF5BC00AEDF6D /* Pasteboard.swift */; }; - 09FFBCD1227B7F9900C33B4B /* anim_archiveswipe.json in Resources */ = {isa = PBXBuildFile; fileRef = 09FFBCCF227B7F9000C33B4B /* anim_archiveswipe.json */; }; 09FFBCD72281BB2D00C33B4B /* ChatTextLinkEditController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09FFBCD62281BB2D00C33B4B /* ChatTextLinkEditController.swift */; }; D000CABC21F158AD0011B15D /* PrepareSecretThumbnailData.swift in Sources */ = {isa = PBXBuildFile; fileRef = D000CABB21F158AD0011B15D /* PrepareSecretThumbnailData.swift */; }; D0068FA821760FA300D1B315 /* StoreDownloadedMedia.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0068FA721760FA300D1B315 /* StoreDownloadedMedia.swift */; }; @@ -155,7 +128,6 @@ D04281FC200E61BC009DDE36 /* ChatRecentActionsInteraction.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04281FB200E61BC009DDE36 /* ChatRecentActionsInteraction.swift */; }; D04281FE200E639A009DDE36 /* ChatRecentActionsTitleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04281FD200E639A009DDE36 /* ChatRecentActionsTitleView.swift */; }; D0428200200E6A00009DDE36 /* ChatRecentActionsHistoryTransition.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04281FF200E6A00009DDE36 /* ChatRecentActionsHistoryTransition.swift */; }; - D0471B541EFD8ECA0074D609 /* currencies.json in Resources */ = {isa = PBXBuildFile; fileRef = D0471B531EFD8ECA0074D609 /* currencies.json */; }; D048B339203C532800038D05 /* ChatMediaInputPane.swift in Sources */ = {isa = PBXBuildFile; fileRef = D048B338203C532800038D05 /* ChatMediaInputPane.swift */; }; D04B4D131EEA0A6500711AF6 /* ChatMessageMapBubbleContentNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04B4D121EEA0A6500711AF6 /* ChatMessageMapBubbleContentNode.swift */; }; D04ECD721FFBF22B00DE9029 /* OpenUrl.swift in Sources */ = {isa = PBXBuildFile; fileRef = D04ECD711FFBF22B00DE9029 /* OpenUrl.swift */; }; @@ -211,8 +183,6 @@ D0943B001FDAE852001522CC /* ChatFeedNavigationInputPanelNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0943AFF1FDAE852001522CC /* ChatFeedNavigationInputPanelNode.swift */; }; D0943B051FDDFDA0001522CC /* OverlayInstantVideoNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0943B041FDDFDA0001522CC /* OverlayInstantVideoNode.swift */; }; D0943B071FDEC529001522CC /* InstantVideoRadialStatusNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0943B061FDEC528001522CC /* InstantVideoRadialStatusNode.swift */; }; - D0955FB521912B6000F89427 /* PresentationStrings.mapping in Resources */ = {isa = PBXBuildFile; fileRef = D0955FB32191278C00F89427 /* PresentationStrings.mapping */; }; - D095EF51230C7D2C00CB6167 /* BuiltinReactions in Resources */ = {isa = PBXBuildFile; fileRef = D095EF4F230C767D00CB6167 /* BuiltinReactions */; }; D099E220229405BB00561B75 /* Weak.swift in Sources */ = {isa = PBXBuildFile; fileRef = D099E21F229405BB00561B75 /* Weak.swift */; }; D09E637C1F0E7C28003444CD /* SharedMediaPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D09E637B1F0E7C28003444CD /* SharedMediaPlayer.swift */; }; D09E637F1F0E8C9F003444CD /* PeerMessagesMediaPlaylist.swift in Sources */ = {isa = PBXBuildFile; fileRef = D09E637E1F0E8C9F003444CD /* PeerMessagesMediaPlaylist.swift */; }; @@ -250,7 +220,6 @@ D0AEAE292080FD660013176E /* StickerPaneSearchGlobaltem.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0AEAE282080FD660013176E /* StickerPaneSearchGlobaltem.swift */; }; D0AF323A1FB1D8D60097362B /* ChatOverlayNavigationBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0AF32391FB1D8D60097362B /* ChatOverlayNavigationBar.swift */; }; D0B21B1F22156D92003F741D /* LegacyCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0B21B1E22156D92003F741D /* LegacyCache.swift */; }; - D0B4AF861EC111FA00D51FF6 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D0AB0BBA1D6719B5002C78E7 /* Images.xcassets */; }; D0B4AF881EC112EE00D51FF6 /* CallKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0B4AF871EC112ED00D51FF6 /* CallKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; D0B69C3920EBB397003632C7 /* ChatMessageInteractiveInstantVideoNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0B69C3820EBB397003632C7 /* ChatMessageInteractiveInstantVideoNode.swift */; }; D0B85C1C1FF6F76000E795B4 /* AuthorizationSequencePasswordRecoveryController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0B85C1B1FF6F76000E795B4 /* AuthorizationSequencePasswordRecoveryController.swift */; }; @@ -265,7 +234,6 @@ D0C0B59B1EE019E5000F4D2C /* ChatSearchNavigationContentNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C0B59A1EE019E5000F4D2C /* ChatSearchNavigationContentNode.swift */; }; D0C0B59F1EE082F5000F4D2C /* ChatSearchInputPanelNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C0B59E1EE082F5000F4D2C /* ChatSearchInputPanelNode.swift */; }; D0C0B5B11EE1C421000F4D2C /* ChatDateSelectionSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C0B5B01EE1C421000F4D2C /* ChatDateSelectionSheet.swift */; }; - D0C12A1D1F33A85600B3F66D /* ChatWallpaperBuiltin0.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D0C12A1B1F33964900B3F66D /* ChatWallpaperBuiltin0.jpg */; }; D0C12EB01F9A8D1300600BB2 /* ListMessageDateHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C12EAF1F9A8D1300600BB2 /* ListMessageDateHeader.swift */; }; D0C26D571FDF2388004ABF18 /* OpenChatMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C26D561FDF2388004ABF18 /* OpenChatMessage.swift */; }; D0C45E9F213FFAFD00988156 /* Lottie.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C45E9E213FFAFD00988156 /* Lottie.framework */; }; @@ -336,48 +304,6 @@ D0E8175720122DAD00B82BBB /* ChatRecentActionsSearchNavigationContentNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0E8175620122DAD00B82BBB /* ChatRecentActionsSearchNavigationContentNode.swift */; }; D0E8175920122FE100B82BBB /* ChatRecentActionsFilterController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0E8175820122FE100B82BBB /* ChatRecentActionsFilterController.swift */; }; D0E8175B201254FA00B82BBB /* ChatRecentActionsEmptyNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0E8175A201254FA00B82BBB /* ChatRecentActionsEmptyNode.swift */; }; - D0E9B9EA1F00853C00F079A4 /* PhoneCountries.txt in Resources */ = {isa = PBXBuildFile; fileRef = D0E9B9E91F00853C00F079A4 /* PhoneCountries.txt */; }; - D0E9BA911F056F4C00F079A4 /* stp_card_amex@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA691F056F4C00F079A4 /* stp_card_amex@2x.png */; }; - D0E9BA921F056F4C00F079A4 /* stp_card_amex@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA6A1F056F4C00F079A4 /* stp_card_amex@3x.png */; }; - D0E9BA931F056F4C00F079A4 /* stp_card_amex_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA6B1F056F4C00F079A4 /* stp_card_amex_template@2x.png */; }; - D0E9BA941F056F4C00F079A4 /* stp_card_amex_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA6C1F056F4C00F079A4 /* stp_card_amex_template@3x.png */; }; - D0E9BA951F056F4C00F079A4 /* stp_card_applepay@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA6D1F056F4C00F079A4 /* stp_card_applepay@2x.png */; }; - D0E9BA961F056F4C00F079A4 /* stp_card_applepay@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA6E1F056F4C00F079A4 /* stp_card_applepay@3x.png */; }; - D0E9BA971F056F4C00F079A4 /* stp_card_applepay_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA6F1F056F4C00F079A4 /* stp_card_applepay_template@2x.png */; }; - D0E9BA981F056F4C00F079A4 /* stp_card_applepay_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA701F056F4C00F079A4 /* stp_card_applepay_template@3x.png */; }; - D0E9BA991F056F4C00F079A4 /* stp_card_cvc@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA711F056F4C00F079A4 /* stp_card_cvc@2x.png */; }; - D0E9BA9A1F056F4C00F079A4 /* stp_card_cvc@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA721F056F4C00F079A4 /* stp_card_cvc@3x.png */; }; - D0E9BA9B1F056F4C00F079A4 /* stp_card_cvc_amex@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA731F056F4C00F079A4 /* stp_card_cvc_amex@2x.png */; }; - D0E9BA9C1F056F4C00F079A4 /* stp_card_cvc_amex@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA741F056F4C00F079A4 /* stp_card_cvc_amex@3x.png */; }; - D0E9BA9D1F056F4C00F079A4 /* stp_card_diners@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA751F056F4C00F079A4 /* stp_card_diners@2x.png */; }; - D0E9BA9E1F056F4C00F079A4 /* stp_card_diners@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA761F056F4C00F079A4 /* stp_card_diners@3x.png */; }; - D0E9BA9F1F056F4C00F079A4 /* stp_card_diners_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA771F056F4C00F079A4 /* stp_card_diners_template@2x.png */; }; - D0E9BAA01F056F4C00F079A4 /* stp_card_diners_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA781F056F4C00F079A4 /* stp_card_diners_template@3x.png */; }; - D0E9BAA11F056F4C00F079A4 /* stp_card_discover@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA791F056F4C00F079A4 /* stp_card_discover@2x.png */; }; - D0E9BAA21F056F4C00F079A4 /* stp_card_discover@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA7A1F056F4C00F079A4 /* stp_card_discover@3x.png */; }; - D0E9BAA31F056F4C00F079A4 /* stp_card_discover_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA7B1F056F4C00F079A4 /* stp_card_discover_template@2x.png */; }; - D0E9BAA41F056F4C00F079A4 /* stp_card_discover_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA7C1F056F4C00F079A4 /* stp_card_discover_template@3x.png */; }; - D0E9BAA51F056F4C00F079A4 /* stp_card_form_applepay@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA7D1F056F4C00F079A4 /* stp_card_form_applepay@2x.png */; }; - D0E9BAA61F056F4C00F079A4 /* stp_card_form_applepay@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA7E1F056F4C00F079A4 /* stp_card_form_applepay@3x.png */; }; - D0E9BAA71F056F4C00F079A4 /* stp_card_form_back@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA7F1F056F4C00F079A4 /* stp_card_form_back@2x.png */; }; - D0E9BAA81F056F4C00F079A4 /* stp_card_form_back@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA801F056F4C00F079A4 /* stp_card_form_back@3x.png */; }; - D0E9BAA91F056F4C00F079A4 /* stp_card_form_front@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA811F056F4C00F079A4 /* stp_card_form_front@2x.png */; }; - D0E9BAAA1F056F4C00F079A4 /* stp_card_form_front@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA821F056F4C00F079A4 /* stp_card_form_front@3x.png */; }; - D0E9BAAB1F056F4C00F079A4 /* stp_card_jcb@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA831F056F4C00F079A4 /* stp_card_jcb@2x.png */; }; - D0E9BAAC1F056F4C00F079A4 /* stp_card_jcb@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA841F056F4C00F079A4 /* stp_card_jcb@3x.png */; }; - D0E9BAAD1F056F4C00F079A4 /* stp_card_jcb_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA851F056F4C00F079A4 /* stp_card_jcb_template@2x.png */; }; - D0E9BAAE1F056F4C00F079A4 /* stp_card_jcb_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA861F056F4C00F079A4 /* stp_card_jcb_template@3x.png */; }; - D0E9BAAF1F056F4C00F079A4 /* stp_card_mastercard@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA871F056F4C00F079A4 /* stp_card_mastercard@2x.png */; }; - D0E9BAB01F056F4C00F079A4 /* stp_card_mastercard@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA881F056F4C00F079A4 /* stp_card_mastercard@3x.png */; }; - D0E9BAB11F056F4C00F079A4 /* stp_card_mastercard_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA891F056F4C00F079A4 /* stp_card_mastercard_template@2x.png */; }; - D0E9BAB21F056F4C00F079A4 /* stp_card_mastercard_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA8A1F056F4C00F079A4 /* stp_card_mastercard_template@3x.png */; }; - D0E9BAB31F056F4C00F079A4 /* stp_card_placeholder_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA8B1F056F4C00F079A4 /* stp_card_placeholder_template@2x.png */; }; - D0E9BAB41F056F4C00F079A4 /* stp_card_placeholder_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA8C1F056F4C00F079A4 /* stp_card_placeholder_template@3x.png */; }; - D0E9BAB51F056F4C00F079A4 /* stp_card_visa@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA8D1F056F4C00F079A4 /* stp_card_visa@2x.png */; }; - D0E9BAB61F056F4C00F079A4 /* stp_card_visa@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA8E1F056F4C00F079A4 /* stp_card_visa@3x.png */; }; - D0E9BAB71F056F4C00F079A4 /* stp_card_visa_template@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA8F1F056F4C00F079A4 /* stp_card_visa_template@2x.png */; }; - D0E9BAB81F056F4C00F079A4 /* stp_card_visa_template@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D0E9BA901F056F4C00F079A4 /* stp_card_visa_template@3x.png */; }; - D0EB42051F3143AB00838FE6 /* LegacyComponentsResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D0EB42041F3143AB00838FE6 /* LegacyComponentsResources.bundle */; }; D0EB5ADF1F798033004E89B6 /* PeerMediaCollectionEmptyNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0EB5ADE1F798033004E89B6 /* PeerMediaCollectionEmptyNode.swift */; }; D0EC55A3210231D600D1992C /* SearchPeerMembers.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0EC55A2210231D600D1992C /* SearchPeerMembers.swift */; }; D0EC6CC11EB9F58800EBF1C3 /* LegacyCamera.swift in Sources */ = {isa = PBXBuildFile; fileRef = D00E15251DDBD4E700ACF65C /* LegacyCamera.swift */; }; @@ -549,7 +475,6 @@ D0EC6E831EB9F58900EBF1C3 /* NotificationItemContainerNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C50E3D1E93D09200F62E39 /* NotificationItemContainerNode.swift */; }; D0EC6E841EB9F58900EBF1C3 /* NotificationItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C50E3B1E93CC2600F62E39 /* NotificationItem.swift */; }; D0EC6E851EB9F58900EBF1C3 /* ChatMessageNotificationItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C50E3F1E93D3B000F62E39 /* ChatMessageNotificationItem.swift */; }; - D0EC6E891EB9F58900EBF1C3 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0F69E831D6B8C850046BCD6 /* FrameworkBundle.swift */; }; D0EC6E8F1EB9F5B200EBF1C3 /* AsyncDisplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D08D45291D5E340300A7428A /* AsyncDisplayKit.framework */; }; D0EC6E901EB9F5B200EBF1C3 /* Display.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D08D452A1D5E340300A7428A /* Display.framework */; }; D0EC6E911EB9F5B200EBF1C3 /* Postbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D08D452B1D5E340300A7428A /* Postbox.framework */; }; @@ -562,9 +487,8 @@ D0EC6EA61EB9FC2400EBF1C3 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = D07551901DDA4FC70073E051 /* libc++.tbd */; }; D0EC6EBD1EBA100F00EBF1C3 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EC6EBC1EBA100F00EBF1C3 /* CoreAudio.framework */; }; D0EEE9A12165585F001292A6 /* DocumentPreviewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0EEE9A02165585F001292A6 /* DocumentPreviewController.swift */; }; + D0EFF2482319806700CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF2472319806700CF5164 /* AppBundle.framework */; }; D0F19F6420E5A15B00EEC860 /* ChatMediaInputPeerSpecificItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0F19F6320E5A15B00EEC860 /* ChatMediaInputPeerSpecificItem.swift */; }; - D0F9720F1FFE4BD5002595C8 /* notification.caf in Resources */ = {isa = PBXBuildFile; fileRef = D0C50E431E93FCD200F62E39 /* notification.caf */; }; - D0F972101FFE4BD5002595C8 /* MessageSent.caf in Resources */ = {isa = PBXBuildFile; fileRef = D073CE621DCBBE5D007511FD /* MessageSent.caf */; }; D0FA08C8204982DC00DD23FC /* ChatTextInputActionButtonsNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0FA08C7204982DC00DD23FC /* ChatTextInputActionButtonsNode.swift */; }; D0FA08CA2049BEAC00DD23FC /* ChatEmptyNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0FA08C92049BEAC00DD23FC /* ChatEmptyNode.swift */; }; D0FAB13E22EBC25300D8BED2 /* ChatMessageBubbleBackdrop.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0FAB13D22EBC25300D8BED2 /* ChatMessageBubbleBackdrop.swift */; }; @@ -576,39 +500,15 @@ /* Begin PBXFileReference section */ 090B48C72200BCA8005083FA /* WallpaperUploadManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WallpaperUploadManager.swift; sourceTree = ""; }; 090E63ED2196FE3A00E3C035 /* OpenAddContact.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenAddContact.swift; sourceTree = ""; }; - 090E778B22AA842200CD99F5 /* anim_success.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_success.json; sourceTree = ""; }; 0910B0EC21FA178C00F8F87D /* WallpaperPreviewMedia.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WallpaperPreviewMedia.swift; sourceTree = ""; }; 0921F60D228EE000001A13D7 /* ChatMessageActionUrlAuthController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatMessageActionUrlAuthController.swift; sourceTree = ""; }; - 092F368C2154AAE9001A9F49 /* SFCompactRounded-Semibold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SFCompactRounded-Semibold.otf"; sourceTree = ""; }; - 09310D1A213BC5DE0020033A /* anim_ungroup.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_ungroup.json; sourceTree = ""; }; - 09310D1B213BC5DE0020033A /* anim_group.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_group.json; sourceTree = ""; }; 0940932322E73DFB003846A3 /* ChatSendMessageActionSheetController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatSendMessageActionSheetController.swift; sourceTree = ""; }; 0940932522E73E12003846A3 /* ChatSendMessageActionSheetControllerNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatSendMessageActionSheetControllerNode.swift; sourceTree = ""; }; - 094735042275D71F00EA2312 /* anim_hide.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_hide.json; sourceTree = ""; }; - 094735052275D72000EA2312 /* anim_unread.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_unread.json; sourceTree = ""; }; - 094735062275D72000EA2312 /* anim_read.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_read.json; sourceTree = ""; }; - 094735072275D72000EA2312 /* anim_archive.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_archive.json; sourceTree = ""; }; - 094735082275D72000EA2312 /* anim_mute.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_mute.json; sourceTree = ""; }; - 094735092275D72000EA2312 /* anim_delete.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_delete.json; sourceTree = ""; }; - 0947350A2275D72000EA2312 /* anim_unarchive.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_unarchive.json; sourceTree = ""; }; - 0947350B2275D72000EA2312 /* anim_unpin.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_unpin.json; sourceTree = ""; }; - 0947350C2275D72100EA2312 /* anim_unmute.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_unmute.json; sourceTree = ""; }; - 0947350D2275D72100EA2312 /* anim_pin.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_pin.json; sourceTree = ""; }; - 094735182277483B00EA2312 /* anim_infotip.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_infotip.json; sourceTree = ""; }; 09510B1222F96E5B0078CAB7 /* ChatScheduleTimeController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatScheduleTimeController.swift; sourceTree = ""; }; 09510B1422F96E6C0078CAB7 /* ChatScheduleTimeControllerNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatScheduleTimeControllerNode.swift; sourceTree = ""; }; 095214EE2318D4D3008CDD87 /* ThemeUpdateManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeUpdateManager.swift; sourceTree = ""; }; 0962E67821B67A9800245FD9 /* ChatMessageAnimatedStickerItemNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatMessageAnimatedStickerItemNode.swift; sourceTree = ""; }; 09749BC421F0E024008FDDE9 /* StickersChatInputContextPanelItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StickersChatInputContextPanelItem.swift; sourceTree = ""; }; - 0979788021065F8B0077D77F /* VimeoUserScript.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = VimeoUserScript.js; sourceTree = ""; }; - 0979788121065F8B0077D77F /* YoutubeUserScript.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = YoutubeUserScript.js; sourceTree = ""; }; - 0979788221065F8C0077D77F /* Vimeo.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = Vimeo.html; sourceTree = ""; }; - 0979788321065F8C0077D77F /* Generic.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = Generic.html; sourceTree = ""; }; - 0979788421065F8C0077D77F /* Instagram.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = Instagram.html; sourceTree = ""; }; - 0979788521065F8C0077D77F /* Twitch.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = Twitch.html; sourceTree = ""; }; - 0979788621065F8C0077D77F /* TwitchUserScript.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = TwitchUserScript.js; sourceTree = ""; }; - 0979788721065F8C0077D77F /* Youtube.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = Youtube.html; sourceTree = ""; }; - 0979788821065F8C0077D77F /* GenericUserScript.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = GenericUserScript.js; sourceTree = ""; }; 099529AF21D2123E00805E13 /* ChatMessageUnsupportedBubbleContentNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatMessageUnsupportedBubbleContentNode.swift; sourceTree = ""; }; 099529B321D3E5D800805E13 /* CheckDiskSpace.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckDiskSpace.swift; sourceTree = ""; }; 09A218D7229EE1B500DE6898 /* HorizontalStickerGridItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HorizontalStickerGridItem.swift; sourceTree = ""; }; @@ -619,13 +519,10 @@ 09D304142173C0E900C00567 /* WatchManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchManager.swift; sourceTree = ""; }; 09D96898221DE92600B1458A /* ID3ArtworkReader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ID3ArtworkReader.swift; sourceTree = ""; }; 09DD5D4F21ECC3C400D7007A /* SuppressContactsWarning.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SuppressContactsWarning.swift; sourceTree = ""; }; - 09E2D9ED226F1AF300EA0AA4 /* Emoji.mapping */ = {isa = PBXFileReference; lastKnownFileType = file; name = Emoji.mapping; path = TelegramUI/Resources/Emoji.mapping; sourceTree = ""; }; 09E2D9F0226F214000EA0AA4 /* EmojiResources.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiResources.swift; sourceTree = ""; }; - 09E2DA122273367900EA0AA4 /* anim_archiveAvatar.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_archiveAvatar.json; sourceTree = ""; }; 09EC0DEC22CB583C00E7185B /* TextLinkHandling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextLinkHandling.swift; sourceTree = ""; }; 09EDAD29220DA6A40012A50B /* VolumeButtons.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VolumeButtons.swift; sourceTree = ""; }; 09F2158C225CF5BC00AEDF6D /* Pasteboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Pasteboard.swift; sourceTree = ""; }; - 09FFBCCF227B7F9000C33B4B /* anim_archiveswipe.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = anim_archiveswipe.json; sourceTree = ""; }; 09FFBCD62281BB2D00C33B4B /* ChatTextLinkEditController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatTextLinkEditController.swift; sourceTree = ""; }; D000CABB21F158AD0011B15D /* PrepareSecretThumbnailData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrepareSecretThumbnailData.swift; sourceTree = ""; }; D002A0D21E9BBE6700A81812 /* MultiplexedSoftwareVideoSourceManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MultiplexedSoftwareVideoSourceManager.swift; sourceTree = ""; }; @@ -767,7 +664,6 @@ D04281FF200E6A00009DDE36 /* ChatRecentActionsHistoryTransition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatRecentActionsHistoryTransition.swift; sourceTree = ""; }; D045549921B2F173007A6DD9 /* libturbojpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libturbojpeg.a; path = "third-party/libjpeg-turbo/libturbojpeg.a"; sourceTree = ""; }; D04662801E68BA64006FAFC4 /* TransformOutgoingMessageMedia.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransformOutgoingMessageMedia.swift; sourceTree = ""; }; - D0471B531EFD8ECA0074D609 /* currencies.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = currencies.json; path = TelegramUI/Resources/currencies.json; sourceTree = ""; }; D048B338203C532800038D05 /* ChatMediaInputPane.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatMediaInputPane.swift; sourceTree = ""; }; D049EAE11E447AD500A2CD3A /* StickersChatInputContextPanelNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StickersChatInputContextPanelNode.swift; sourceTree = ""; }; D049EAE51E44AD5600A2CD3A /* ChatMediaInputMetaSectionItemNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatMediaInputMetaSectionItemNode.swift; sourceTree = ""; }; @@ -812,7 +708,6 @@ D06E0F8D1F79ABFB003CF3DD /* ChatLoadingNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatLoadingNode.swift; sourceTree = ""; }; D06F1EA31F6C0A5D00FE8B74 /* ChatHistorySearchContainerNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatHistorySearchContainerNode.swift; sourceTree = ""; }; D072F38323155EAF0009E66F /* MessageReactionListUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = MessageReactionListUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D073CE621DCBBE5D007511FD /* MessageSent.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = MessageSent.caf; path = TelegramUI/Sounds/MessageSent.caf; sourceTree = ""; }; D073CE641DCBC26B007511FD /* ServiceSoundManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ServiceSoundManager.swift; sourceTree = ""; }; D073CE701DCBF23F007511FD /* DeclareEncodables.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeclareEncodables.swift; sourceTree = ""; }; D0750C7722B2A13300BE5F6E /* UniversalMediaPlayer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = UniversalMediaPlayer.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -868,8 +763,6 @@ D0943AFF1FDAE852001522CC /* ChatFeedNavigationInputPanelNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatFeedNavigationInputPanelNode.swift; sourceTree = ""; }; D0943B041FDDFDA0001522CC /* OverlayInstantVideoNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverlayInstantVideoNode.swift; sourceTree = ""; }; D0943B061FDEC528001522CC /* InstantVideoRadialStatusNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstantVideoRadialStatusNode.swift; sourceTree = ""; }; - D0955FB32191278C00F89427 /* PresentationStrings.mapping */ = {isa = PBXFileReference; lastKnownFileType = file; name = PresentationStrings.mapping; path = TelegramUI/Resources/PresentationStrings.mapping; sourceTree = ""; }; - D095EF4F230C767D00CB6167 /* BuiltinReactions */ = {isa = PBXFileReference; lastKnownFileType = folder; name = BuiltinReactions; path = TelegramUI/Resources/BuiltinReactions; sourceTree = ""; }; D099E21F229405BB00561B75 /* Weak.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Weak.swift; sourceTree = ""; }; D099EA1E1DE7450B001AF5A8 /* HorizontalListContextResultsChatInputContextPanelNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HorizontalListContextResultsChatInputContextPanelNode.swift; sourceTree = ""; }; D099EA201DE7451D001AF5A8 /* HorizontalListContextResultsChatInputPanelItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HorizontalListContextResultsChatInputPanelItem.swift; sourceTree = ""; }; @@ -901,7 +794,6 @@ D0AB0BB41D6718F1002C78E7 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; D0AB0BB61D67191C002C78E7 /* MtProtoKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MtProtoKit.framework; path = "../../../../Library/Developer/Xcode/DerivedData/Telegram-iOS-diblohvjozhgaifjcniwdlixlilx/Build/Products/Debug-iphoneos/MtProtoKit.framework"; sourceTree = ""; }; D0AB0BB71D67191C002C78E7 /* SSignalKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SSignalKit.framework; path = "../../../../Library/Developer/Xcode/DerivedData/Telegram-iOS-diblohvjozhgaifjcniwdlixlilx/Build/Products/Debug-iphoneos/SSignalKit.framework"; sourceTree = ""; }; - D0AB0BBA1D6719B5002C78E7 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; D0AB262821C307D7008F6685 /* ChatMessagePollBubbleContentNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatMessagePollBubbleContentNode.swift; sourceTree = ""; }; D0ACCB1B1EC5FF4B0079D8BF /* ChatMessageCallBubbleContentNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatMessageCallBubbleContentNode.swift; sourceTree = ""; }; D0AD02E91FFFEBEF00C1DCFF /* ChatMessageLiveLocationTextNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatMessageLiveLocationTextNode.swift; sourceTree = ""; }; @@ -939,7 +831,6 @@ D0C0B59A1EE019E5000F4D2C /* ChatSearchNavigationContentNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatSearchNavigationContentNode.swift; sourceTree = ""; }; D0C0B59E1EE082F5000F4D2C /* ChatSearchInputPanelNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatSearchInputPanelNode.swift; sourceTree = ""; }; D0C0B5B01EE1C421000F4D2C /* ChatDateSelectionSheet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatDateSelectionSheet.swift; sourceTree = ""; }; - D0C12A1B1F33964900B3F66D /* ChatWallpaperBuiltin0.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = ChatWallpaperBuiltin0.jpg; path = TelegramUI/Resources/ChatWallpaperBuiltin0.jpg; sourceTree = ""; }; D0C12EAF1F9A8D1300600BB2 /* ListMessageDateHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListMessageDateHeader.swift; sourceTree = ""; }; D0C26D561FDF2388004ABF18 /* OpenChatMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenChatMessage.swift; sourceTree = ""; }; D0C45E9E213FFAFD00988156 /* Lottie.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Lottie.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -950,7 +841,6 @@ D0C50E3B1E93CC2600F62E39 /* NotificationItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationItem.swift; sourceTree = ""; }; D0C50E3D1E93D09200F62E39 /* NotificationItemContainerNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationItemContainerNode.swift; sourceTree = ""; }; D0C50E3F1E93D3B000F62E39 /* ChatMessageNotificationItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatMessageNotificationItem.swift; sourceTree = ""; }; - D0C50E431E93FCD200F62E39 /* notification.caf */ = {isa = PBXFileReference; lastKnownFileType = file; name = notification.caf; path = TelegramUI/Sounds/notification.caf; sourceTree = ""; }; D0C932351E0988C60074F044 /* ChatButtonKeyboardInputNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatButtonKeyboardInputNode.swift; sourceTree = ""; }; D0C932371E09E0EA0074F044 /* ChatBotInfoItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatBotInfoItem.swift; sourceTree = ""; }; D0C9BFAC22FE316E00FAB518 /* ComposePollUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ComposePollUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1053,48 +943,6 @@ D0E8175620122DAD00B82BBB /* ChatRecentActionsSearchNavigationContentNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatRecentActionsSearchNavigationContentNode.swift; sourceTree = ""; }; D0E8175820122FE100B82BBB /* ChatRecentActionsFilterController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatRecentActionsFilterController.swift; sourceTree = ""; }; D0E8175A201254FA00B82BBB /* ChatRecentActionsEmptyNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatRecentActionsEmptyNode.swift; sourceTree = ""; }; - D0E9B9E91F00853C00F079A4 /* PhoneCountries.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = PhoneCountries.txt; path = TelegramUI/Resources/PhoneCountries.txt; sourceTree = ""; }; - D0E9BA691F056F4C00F079A4 /* stp_card_amex@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_amex@2x.png"; sourceTree = ""; }; - D0E9BA6A1F056F4C00F079A4 /* stp_card_amex@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_amex@3x.png"; sourceTree = ""; }; - D0E9BA6B1F056F4C00F079A4 /* stp_card_amex_template@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_amex_template@2x.png"; sourceTree = ""; }; - D0E9BA6C1F056F4C00F079A4 /* stp_card_amex_template@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_amex_template@3x.png"; sourceTree = ""; }; - D0E9BA6D1F056F4C00F079A4 /* stp_card_applepay@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_applepay@2x.png"; sourceTree = ""; }; - D0E9BA6E1F056F4C00F079A4 /* stp_card_applepay@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_applepay@3x.png"; sourceTree = ""; }; - D0E9BA6F1F056F4C00F079A4 /* stp_card_applepay_template@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_applepay_template@2x.png"; sourceTree = ""; }; - D0E9BA701F056F4C00F079A4 /* stp_card_applepay_template@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_applepay_template@3x.png"; sourceTree = ""; }; - D0E9BA711F056F4C00F079A4 /* stp_card_cvc@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_cvc@2x.png"; sourceTree = ""; }; - D0E9BA721F056F4C00F079A4 /* stp_card_cvc@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_cvc@3x.png"; sourceTree = ""; }; - D0E9BA731F056F4C00F079A4 /* stp_card_cvc_amex@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_cvc_amex@2x.png"; sourceTree = ""; }; - D0E9BA741F056F4C00F079A4 /* stp_card_cvc_amex@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_cvc_amex@3x.png"; sourceTree = ""; }; - D0E9BA751F056F4C00F079A4 /* stp_card_diners@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_diners@2x.png"; sourceTree = ""; }; - D0E9BA761F056F4C00F079A4 /* stp_card_diners@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_diners@3x.png"; sourceTree = ""; }; - D0E9BA771F056F4C00F079A4 /* stp_card_diners_template@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_diners_template@2x.png"; sourceTree = ""; }; - D0E9BA781F056F4C00F079A4 /* stp_card_diners_template@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_diners_template@3x.png"; sourceTree = ""; }; - D0E9BA791F056F4C00F079A4 /* stp_card_discover@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_discover@2x.png"; sourceTree = ""; }; - D0E9BA7A1F056F4C00F079A4 /* stp_card_discover@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_discover@3x.png"; sourceTree = ""; }; - D0E9BA7B1F056F4C00F079A4 /* stp_card_discover_template@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_discover_template@2x.png"; sourceTree = ""; }; - D0E9BA7C1F056F4C00F079A4 /* stp_card_discover_template@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_discover_template@3x.png"; sourceTree = ""; }; - D0E9BA7D1F056F4C00F079A4 /* stp_card_form_applepay@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_form_applepay@2x.png"; sourceTree = ""; }; - D0E9BA7E1F056F4C00F079A4 /* stp_card_form_applepay@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_form_applepay@3x.png"; sourceTree = ""; }; - D0E9BA7F1F056F4C00F079A4 /* stp_card_form_back@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_form_back@2x.png"; sourceTree = ""; }; - D0E9BA801F056F4C00F079A4 /* stp_card_form_back@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_form_back@3x.png"; sourceTree = ""; }; - D0E9BA811F056F4C00F079A4 /* stp_card_form_front@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_form_front@2x.png"; sourceTree = ""; }; - D0E9BA821F056F4C00F079A4 /* stp_card_form_front@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_form_front@3x.png"; sourceTree = ""; }; - D0E9BA831F056F4C00F079A4 /* stp_card_jcb@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_jcb@2x.png"; sourceTree = ""; }; - D0E9BA841F056F4C00F079A4 /* stp_card_jcb@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_jcb@3x.png"; sourceTree = ""; }; - D0E9BA851F056F4C00F079A4 /* stp_card_jcb_template@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_jcb_template@2x.png"; sourceTree = ""; }; - D0E9BA861F056F4C00F079A4 /* stp_card_jcb_template@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_jcb_template@3x.png"; sourceTree = ""; }; - D0E9BA871F056F4C00F079A4 /* stp_card_mastercard@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_mastercard@2x.png"; sourceTree = ""; }; - D0E9BA881F056F4C00F079A4 /* stp_card_mastercard@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_mastercard@3x.png"; sourceTree = ""; }; - D0E9BA891F056F4C00F079A4 /* stp_card_mastercard_template@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_mastercard_template@2x.png"; sourceTree = ""; }; - D0E9BA8A1F056F4C00F079A4 /* stp_card_mastercard_template@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_mastercard_template@3x.png"; sourceTree = ""; }; - D0E9BA8B1F056F4C00F079A4 /* stp_card_placeholder_template@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_placeholder_template@2x.png"; sourceTree = ""; }; - D0E9BA8C1F056F4C00F079A4 /* stp_card_placeholder_template@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_placeholder_template@3x.png"; sourceTree = ""; }; - D0E9BA8D1F056F4C00F079A4 /* stp_card_visa@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_visa@2x.png"; sourceTree = ""; }; - D0E9BA8E1F056F4C00F079A4 /* stp_card_visa@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_visa@3x.png"; sourceTree = ""; }; - D0E9BA8F1F056F4C00F079A4 /* stp_card_visa_template@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_visa_template@2x.png"; sourceTree = ""; }; - D0E9BA901F056F4C00F079A4 /* stp_card_visa_template@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "stp_card_visa_template@3x.png"; sourceTree = ""; }; - D0EB42041F3143AB00838FE6 /* LegacyComponentsResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = LegacyComponentsResources.bundle; path = ../LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle; sourceTree = ""; }; D0EB5ADE1F798033004E89B6 /* PeerMediaCollectionEmptyNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PeerMediaCollectionEmptyNode.swift; sourceTree = ""; }; D0EC55A2210231D600D1992C /* SearchPeerMembers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchPeerMembers.swift; sourceTree = ""; }; D0EC6B401EB8F7D700EBF1C3 /* VoipDynamic.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VoipDynamic.framework; path = "../../../../Library/Developer/Xcode/DerivedData/Telegram-iOS-diblohvjozhgaifjcniwdlixlilx/Build/Products/Debug-iphonesimulator/VoipDynamic.framework"; sourceTree = ""; }; @@ -1107,6 +955,7 @@ D0EE97191D88BCA0006C18E1 /* ChatInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatInfo.swift; sourceTree = ""; }; D0EEE9A02165585F001292A6 /* DocumentPreviewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentPreviewController.swift; sourceTree = ""; }; D0EF40DE1E73100D000DFCD4 /* ChatHistoryNavigationStack.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatHistoryNavigationStack.swift; sourceTree = ""; }; + D0EFF2472319806700CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0F02CCB1E96EF350065DEE2 /* ChatMediaInputStickerPane.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatMediaInputStickerPane.swift; sourceTree = ""; }; D0F02CCD1E96FACE0065DEE2 /* ChatMediaInputGifPane.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatMediaInputGifPane.swift; sourceTree = ""; }; D0F19F6320E5A15B00EEC860 /* ChatMediaInputPeerSpecificItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatMediaInputPeerSpecificItem.swift; sourceTree = ""; }; @@ -1116,7 +965,6 @@ D0F53BF61E79593500117362 /* AuthorizationSequenceSignUpController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthorizationSequenceSignUpController.swift; sourceTree = ""; }; D0F53BF81E79593F00117362 /* AuthorizationSequenceSignUpControllerNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthorizationSequenceSignUpControllerNode.swift; sourceTree = ""; }; D0F69CD61D6B87D30046BCD6 /* MediaManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MediaManager.swift; sourceTree = ""; }; - D0F69DB91D6B88190046BCD6 /* TelegramUI.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = TelegramUI.xcconfig; path = TelegramUI/Config/TelegramUI.xcconfig; sourceTree = ""; }; D0F69DC41D6B89E10046BCD6 /* RadialProgressNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadialProgressNode.swift; sourceTree = ""; }; D0F69E0E1D6B8ACF0046BCD6 /* ChatController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatController.swift; sourceTree = ""; }; D0F69E0F1D6B8ACF0046BCD6 /* ChatControllerInteraction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatControllerInteraction.swift; sourceTree = ""; }; @@ -1144,7 +992,6 @@ D0F69E2C1D6B8B030046BCD6 /* ChatUnreadItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatUnreadItem.swift; sourceTree = ""; }; D0F69E401D6B8B7E0046BCD6 /* ChatTextInputPanelNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatTextInputPanelNode.swift; sourceTree = ""; }; D0F69E451D6B8B950046BCD6 /* ChatHistoryNavigationButtonNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatHistoryNavigationButtonNode.swift; sourceTree = ""; }; - D0F69E831D6B8C850046BCD6 /* FrameworkBundle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D0F69E941D6B8C9B0046BCD6 /* ConvertToWebP.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConvertToWebP.swift; sourceTree = ""; }; D0F69EA61D6B9BBC0046BCD6 /* libwebp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libwebp.a; path = "third-party/libwebp/lib/libwebp.a"; sourceTree = ""; }; D0F69EA81D6B9BCB0046BCD6 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = "third-party/FFmpeg-iOS/lib/libavcodec.a"; sourceTree = ""; }; @@ -1169,6 +1016,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF2482319806700CF5164 /* AppBundle.framework in Frameworks */, 09B4A9BA231519CD005C2E08 /* VideoToolbox.framework in Frameworks */, D072F38423155EAF0009E66F /* MessageReactionListUI.framework in Frameworks */, D03E495D230868DF0049C28B /* PersistentStringHash.framework in Frameworks */, @@ -1350,56 +1198,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 092F368B2154AAD6001A9F49 /* Fonts */ = { - isa = PBXGroup; - children = ( - 092F368C2154AAE9001A9F49 /* SFCompactRounded-Semibold.otf */, - ); - name = Fonts; - path = TelegramUI/Resources/Fonts; - sourceTree = ""; - }; - 09310D13213BC5DE0020033A /* Animations */ = { - isa = PBXGroup; - children = ( - 090E778B22AA842200CD99F5 /* anim_success.json */, - 09FFBCCF227B7F9000C33B4B /* anim_archiveswipe.json */, - 094735182277483B00EA2312 /* anim_infotip.json */, - 094735072275D72000EA2312 /* anim_archive.json */, - 094735092275D72000EA2312 /* anim_delete.json */, - 094735042275D71F00EA2312 /* anim_hide.json */, - 094735082275D72000EA2312 /* anim_mute.json */, - 0947350D2275D72100EA2312 /* anim_pin.json */, - 094735062275D72000EA2312 /* anim_read.json */, - 0947350A2275D72000EA2312 /* anim_unarchive.json */, - 0947350C2275D72100EA2312 /* anim_unmute.json */, - 0947350B2275D72000EA2312 /* anim_unpin.json */, - 094735052275D72000EA2312 /* anim_unread.json */, - 09E2DA122273367900EA0AA4 /* anim_archiveAvatar.json */, - 09310D1A213BC5DE0020033A /* anim_ungroup.json */, - 09310D1B213BC5DE0020033A /* anim_group.json */, - ); - name = Animations; - path = TelegramUI/Resources/Animations; - sourceTree = ""; - }; - 0979787F21065EAA0077D77F /* Web Embed */ = { - isa = PBXGroup; - children = ( - 0979788321065F8C0077D77F /* Generic.html */, - 0979788821065F8C0077D77F /* GenericUserScript.js */, - 0979788421065F8C0077D77F /* Instagram.html */, - 0979788521065F8C0077D77F /* Twitch.html */, - 0979788621065F8C0077D77F /* TwitchUserScript.js */, - 0979788221065F8C0077D77F /* Vimeo.html */, - 0979788021065F8B0077D77F /* VimeoUserScript.js */, - 0979788721065F8C0077D77F /* Youtube.html */, - 0979788121065F8B0077D77F /* YoutubeUserScript.js */, - ); - name = "Web Embed"; - path = TelegramUI/Resources/WebEmbed; - sourceTree = ""; - }; 09D9689B221F74AA00B1458A /* Title Activity Indicator */ = { isa = PBXGroup; children = ( @@ -1644,23 +1442,6 @@ name = "Chat Recent Actions"; sourceTree = ""; }; - D0471B521EFD8EBC0074D609 /* Resources */ = { - isa = PBXGroup; - children = ( - D095EF4F230C767D00CB6167 /* BuiltinReactions */, - 09E2D9ED226F1AF300EA0AA4 /* Emoji.mapping */, - D0955FB32191278C00F89427 /* PresentationStrings.mapping */, - 09310D13213BC5DE0020033A /* Animations */, - 092F368B2154AAD6001A9F49 /* Fonts */, - D0C12A1B1F33964900B3F66D /* ChatWallpaperBuiltin0.jpg */, - D0E9BA681F056F4C00F079A4 /* Stripe */, - D0E9B9E91F00853C00F079A4 /* PhoneCountries.txt */, - D0471B531EFD8ECA0074D609 /* currencies.json */, - 0979787F21065EAA0077D77F /* Web Embed */, - ); - name = Resources; - sourceTree = ""; - }; D0477D191F617E4B00412B44 /* Video */ = { isa = PBXGroup; children = ( @@ -1726,15 +1507,6 @@ name = Root; sourceTree = ""; }; - D073CE611DCBBE09007511FD /* Sounds */ = { - isa = PBXGroup; - children = ( - D0C50E431E93FCD200F62E39 /* notification.caf */, - D073CE621DCBBE5D007511FD /* MessageSent.caf */, - ); - name = Sounds; - sourceTree = ""; - }; D07551891DDA4C7C0073E051 /* Legacy Components */ = { isa = PBXGroup; children = ( @@ -1774,6 +1546,7 @@ D08D45281D5E340200A7428A /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF2472319806700CF5164 /* AppBundle.framework */, 09B4A9B9231519CD005C2E08 /* VideoToolbox.framework */, D072F38323155EAF0009E66F /* MessageReactionListUI.framework */, D03E495C230868DF0049C28B /* PersistentStringHash.framework */, @@ -2225,54 +1998,6 @@ name = "Chat History Node"; sourceTree = ""; }; - D0E9BA681F056F4C00F079A4 /* Stripe */ = { - isa = PBXGroup; - children = ( - D0E9BA691F056F4C00F079A4 /* stp_card_amex@2x.png */, - D0E9BA6A1F056F4C00F079A4 /* stp_card_amex@3x.png */, - D0E9BA6B1F056F4C00F079A4 /* stp_card_amex_template@2x.png */, - D0E9BA6C1F056F4C00F079A4 /* stp_card_amex_template@3x.png */, - D0E9BA6D1F056F4C00F079A4 /* stp_card_applepay@2x.png */, - D0E9BA6E1F056F4C00F079A4 /* stp_card_applepay@3x.png */, - D0E9BA6F1F056F4C00F079A4 /* stp_card_applepay_template@2x.png */, - D0E9BA701F056F4C00F079A4 /* stp_card_applepay_template@3x.png */, - D0E9BA711F056F4C00F079A4 /* stp_card_cvc@2x.png */, - D0E9BA721F056F4C00F079A4 /* stp_card_cvc@3x.png */, - D0E9BA731F056F4C00F079A4 /* stp_card_cvc_amex@2x.png */, - D0E9BA741F056F4C00F079A4 /* stp_card_cvc_amex@3x.png */, - D0E9BA751F056F4C00F079A4 /* stp_card_diners@2x.png */, - D0E9BA761F056F4C00F079A4 /* stp_card_diners@3x.png */, - D0E9BA771F056F4C00F079A4 /* stp_card_diners_template@2x.png */, - D0E9BA781F056F4C00F079A4 /* stp_card_diners_template@3x.png */, - D0E9BA791F056F4C00F079A4 /* stp_card_discover@2x.png */, - D0E9BA7A1F056F4C00F079A4 /* stp_card_discover@3x.png */, - D0E9BA7B1F056F4C00F079A4 /* stp_card_discover_template@2x.png */, - D0E9BA7C1F056F4C00F079A4 /* stp_card_discover_template@3x.png */, - D0E9BA7D1F056F4C00F079A4 /* stp_card_form_applepay@2x.png */, - D0E9BA7E1F056F4C00F079A4 /* stp_card_form_applepay@3x.png */, - D0E9BA7F1F056F4C00F079A4 /* stp_card_form_back@2x.png */, - D0E9BA801F056F4C00F079A4 /* stp_card_form_back@3x.png */, - D0E9BA811F056F4C00F079A4 /* stp_card_form_front@2x.png */, - D0E9BA821F056F4C00F079A4 /* stp_card_form_front@3x.png */, - D0E9BA831F056F4C00F079A4 /* stp_card_jcb@2x.png */, - D0E9BA841F056F4C00F079A4 /* stp_card_jcb@3x.png */, - D0E9BA851F056F4C00F079A4 /* stp_card_jcb_template@2x.png */, - D0E9BA861F056F4C00F079A4 /* stp_card_jcb_template@3x.png */, - D0E9BA871F056F4C00F079A4 /* stp_card_mastercard@2x.png */, - D0E9BA881F056F4C00F079A4 /* stp_card_mastercard@3x.png */, - D0E9BA891F056F4C00F079A4 /* stp_card_mastercard_template@2x.png */, - D0E9BA8A1F056F4C00F079A4 /* stp_card_mastercard_template@3x.png */, - D0E9BA8B1F056F4C00F079A4 /* stp_card_placeholder_template@2x.png */, - D0E9BA8C1F056F4C00F079A4 /* stp_card_placeholder_template@3x.png */, - D0E9BA8D1F056F4C00F079A4 /* stp_card_visa@2x.png */, - D0E9BA8E1F056F4C00F079A4 /* stp_card_visa@3x.png */, - D0E9BA8F1F056F4C00F079A4 /* stp_card_visa_template@2x.png */, - D0E9BA901F056F4C00F079A4 /* stp_card_visa_template@3x.png */, - ); - name = Stripe; - path = TelegramUI/Resources/Stripe; - sourceTree = ""; - }; D0EEE99F2165583B001292A6 /* Document */ = { isa = PBXGroup; children = ( @@ -2521,7 +2246,6 @@ D0F69E7E1D6B8C500046BCD6 /* Supporting Files */ = { isa = PBXGroup; children = ( - D0F69E831D6B8C850046BCD6 /* FrameworkBundle.swift */, ); name = "Supporting Files"; sourceTree = ""; @@ -2566,11 +2290,6 @@ D0FC40751D5B8E7400261D9D = { isa = PBXGroup; children = ( - D0EB42041F3143AB00838FE6 /* LegacyComponentsResources.bundle */, - D0F69DB91D6B88190046BCD6 /* TelegramUI.xcconfig */, - D0AB0BBA1D6719B5002C78E7 /* Images.xcassets */, - D0471B521EFD8EBC0074D609 /* Resources */, - D073CE611DCBBE09007511FD /* Sounds */, D0FC40811D5B8E7400261D9D /* TelegramUI */, D0FC408C1D5B8E7500261D9D /* TelegramUITests */, D0FC40801D5B8E7400261D9D /* Products */, @@ -2709,81 +2428,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 09874E4F21078FA100E190B8 /* Generic.html in Resources */, - 09874E5021078FA100E190B8 /* GenericUserScript.js in Resources */, - 09874E5121078FA100E190B8 /* Instagram.html in Resources */, - 09874E5221078FA100E190B8 /* Twitch.html in Resources */, - 09874E5321078FA100E190B8 /* TwitchUserScript.js in Resources */, - 094735122275D72100EA2312 /* anim_mute.json in Resources */, - 09874E5421078FA100E190B8 /* Vimeo.html in Resources */, - 09874E5521078FA100E190B8 /* VimeoUserScript.js in Resources */, - 09874E5621078FA100E190B8 /* Youtube.html in Resources */, - 09874E5721078FA100E190B8 /* YoutubeUserScript.js in Resources */, - 094735172275D72100EA2312 /* anim_pin.json in Resources */, - 094735112275D72100EA2312 /* anim_archive.json in Resources */, - 090E778C22AA842300CD99F5 /* anim_success.json in Resources */, - D0EB42051F3143AB00838FE6 /* LegacyComponentsResources.bundle in Resources */, - D0E9BAA21F056F4C00F079A4 /* stp_card_discover@3x.png in Resources */, - D0E9BAB01F056F4C00F079A4 /* stp_card_mastercard@3x.png in Resources */, - 09310D32213ED5FC0020033A /* anim_ungroup.json in Resources */, - 09E2D9EF226F1AFA00EA0AA4 /* Emoji.mapping in Resources */, - D0955FB521912B6000F89427 /* PresentationStrings.mapping in Resources */, - 0947350F2275D72100EA2312 /* anim_unread.json in Resources */, - D0E9BAA31F056F4C00F079A4 /* stp_card_discover_template@2x.png in Resources */, - D0E9BAB51F056F4C00F079A4 /* stp_card_visa@2x.png in Resources */, - D0E9BA941F056F4C00F079A4 /* stp_card_amex_template@3x.png in Resources */, - D0E9BA961F056F4C00F079A4 /* stp_card_applepay@3x.png in Resources */, - D0F9720F1FFE4BD5002595C8 /* notification.caf in Resources */, - 09310D33213ED5FC0020033A /* anim_group.json in Resources */, - 09FFBCD1227B7F9900C33B4B /* anim_archiveswipe.json in Resources */, - 094735162275D72100EA2312 /* anim_unmute.json in Resources */, - 094735102275D72100EA2312 /* anim_read.json in Resources */, - D0E9BA9A1F056F4C00F079A4 /* stp_card_cvc@3x.png in Resources */, - D0E9BA921F056F4C00F079A4 /* stp_card_amex@3x.png in Resources */, - D0E9BA9F1F056F4C00F079A4 /* stp_card_diners_template@2x.png in Resources */, - D0E9BA9E1F056F4C00F079A4 /* stp_card_diners@3x.png in Resources */, - D0B4AF861EC111FA00D51FF6 /* Images.xcassets in Resources */, - D0E9BAAD1F056F4C00F079A4 /* stp_card_jcb_template@2x.png in Resources */, - D0F972101FFE4BD5002595C8 /* MessageSent.caf in Resources */, - D0E9BAB71F056F4C00F079A4 /* stp_card_visa_template@2x.png in Resources */, - D0E9BA951F056F4C00F079A4 /* stp_card_applepay@2x.png in Resources */, - D0E9BAA01F056F4C00F079A4 /* stp_card_diners_template@3x.png in Resources */, - 094735132275D72100EA2312 /* anim_delete.json in Resources */, - 094735192277483C00EA2312 /* anim_infotip.json in Resources */, - 094735142275D72100EA2312 /* anim_unarchive.json in Resources */, - D0E9BAAA1F056F4C00F079A4 /* stp_card_form_front@3x.png in Resources */, - D0E9BA971F056F4C00F079A4 /* stp_card_applepay_template@2x.png in Resources */, - D0E9BAB41F056F4C00F079A4 /* stp_card_placeholder_template@3x.png in Resources */, - D0E9BAA71F056F4C00F079A4 /* stp_card_form_back@2x.png in Resources */, - D0E9BAB11F056F4C00F079A4 /* stp_card_mastercard_template@2x.png in Resources */, - D0E9BA9D1F056F4C00F079A4 /* stp_card_diners@2x.png in Resources */, - D0E9BAAF1F056F4C00F079A4 /* stp_card_mastercard@2x.png in Resources */, - D0C12A1D1F33A85600B3F66D /* ChatWallpaperBuiltin0.jpg in Resources */, - D0E9BAAC1F056F4C00F079A4 /* stp_card_jcb@3x.png in Resources */, - D0E9BA911F056F4C00F079A4 /* stp_card_amex@2x.png in Resources */, - D095EF51230C7D2C00CB6167 /* BuiltinReactions in Resources */, - D0E9BA931F056F4C00F079A4 /* stp_card_amex_template@2x.png in Resources */, - D0E9BAA91F056F4C00F079A4 /* stp_card_form_front@2x.png in Resources */, - D0E9BAA41F056F4C00F079A4 /* stp_card_discover_template@3x.png in Resources */, - D0E9BAA81F056F4C00F079A4 /* stp_card_form_back@3x.png in Resources */, - D0E9BAA11F056F4C00F079A4 /* stp_card_discover@2x.png in Resources */, - D0E9B9EA1F00853C00F079A4 /* PhoneCountries.txt in Resources */, - 094735152275D72100EA2312 /* anim_unpin.json in Resources */, - D0E9BAB31F056F4C00F079A4 /* stp_card_placeholder_template@2x.png in Resources */, - D0E9BAAE1F056F4C00F079A4 /* stp_card_jcb_template@3x.png in Resources */, - D0E9BAAB1F056F4C00F079A4 /* stp_card_jcb@2x.png in Resources */, - 09E2DA132273367900EA0AA4 /* anim_archiveAvatar.json in Resources */, - D0E9BA9C1F056F4C00F079A4 /* stp_card_cvc_amex@3x.png in Resources */, - D0E9BA991F056F4C00F079A4 /* stp_card_cvc@2x.png in Resources */, - D0471B541EFD8ECA0074D609 /* currencies.json in Resources */, - 0947350E2275D72100EA2312 /* anim_hide.json in Resources */, - D0E9BAB21F056F4C00F079A4 /* stp_card_mastercard_template@3x.png in Resources */, - D0E9BA981F056F4C00F079A4 /* stp_card_applepay_template@3x.png in Resources */, - D0E9BAA51F056F4C00F079A4 /* stp_card_form_applepay@2x.png in Resources */, - D0E9BAB81F056F4C00F079A4 /* stp_card_visa_template@3x.png in Resources */, - D0E9BA9B1F056F4C00F079A4 /* stp_card_cvc_amex@2x.png in Resources */, - D0E9BAB61F056F4C00F079A4 /* stp_card_visa@3x.png in Resources */, - D0E9BAA61F056F4C00F079A4 /* stp_card_form_applepay@3x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2791,7 +2435,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 092F368D2154AAEA001A9F49 /* SFCompactRounded-Semibold.otf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3117,7 +2760,6 @@ D0EC6E851EB9F58900EBF1C3 /* ChatMessageNotificationItem.swift in Sources */, D04281FE200E639A009DDE36 /* ChatRecentActionsTitleView.swift in Sources */, D0ACCB1C1EC5FF4B0079D8BF /* ChatMessageCallBubbleContentNode.swift in Sources */, - D0EC6E891EB9F58900EBF1C3 /* FrameworkBundle.swift in Sources */, D0FA08C8204982DC00DD23FC /* ChatTextInputActionButtonsNode.swift in Sources */, D0BCC3D420404CC7008126C2 /* ChatMessageActionSheetController.swift in Sources */, ); @@ -3136,7 +2778,6 @@ /* Begin XCBuildConfiguration section */ D021D510219CB2240064BEBA /* DebugFork */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0F69DB91D6B88190046BCD6 /* TelegramUI.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -3183,7 +2824,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = ""; @@ -3199,7 +2840,6 @@ }; D021D511219CB2240064BEBA /* DebugFork */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0F69DB91D6B88190046BCD6 /* TelegramUI.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; DEVELOPMENT_TEAM = X834Q8SBVP; @@ -3263,7 +2903,6 @@ }; D0400EDB1D5B900A007931CE /* ReleaseAppStore */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0F69DB91D6B88190046BCD6 /* TelegramUI.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -3304,7 +2943,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_SWIFT_FLAGS = ""; SDKROOT = iphoneos; @@ -3319,7 +2958,6 @@ }; D0400EDD1D5B900A007931CE /* ReleaseAppStore */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0F69DB91D6B88190046BCD6 /* TelegramUI.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; COPY_PHASE_STRIP = YES; @@ -3336,7 +2974,6 @@ }; D079FD261F06BEF70038FADE /* DebugAppStore */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0F69DB91D6B88190046BCD6 /* TelegramUI.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -3383,7 +3020,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = ""; @@ -3399,7 +3036,6 @@ }; D079FD271F06BEF70038FADE /* DebugAppStore */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0F69DB91D6B88190046BCD6 /* TelegramUI.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; DEVELOPMENT_TEAM = X834Q8SBVP; @@ -3463,7 +3099,6 @@ }; D0924FEE1FE52C29003F693F /* ReleaseHockeyappInternal */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0F69DB91D6B88190046BCD6 /* TelegramUI.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -3504,7 +3139,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_SWIFT_FLAGS = ""; SDKROOT = iphoneos; @@ -3519,7 +3154,6 @@ }; D0924FEF1FE52C29003F693F /* ReleaseHockeyappInternal */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0F69DB91D6B88190046BCD6 /* TelegramUI.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; COPY_PHASE_STRIP = YES; @@ -3583,7 +3217,6 @@ }; D0ADF948212B3B0000310BBC /* DebugAppStoreLLC */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0F69DB91D6B88190046BCD6 /* TelegramUI.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -3630,7 +3263,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = ""; @@ -3646,7 +3279,6 @@ }; D0ADF949212B3B0000310BBC /* DebugAppStoreLLC */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0F69DB91D6B88190046BCD6 /* TelegramUI.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; DEVELOPMENT_TEAM = X834Q8SBVP; @@ -3710,7 +3342,6 @@ }; D0CE6F02213DC32300BCD44B /* ReleaseAppStoreLLC */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0F69DB91D6B88190046BCD6 /* TelegramUI.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -3751,7 +3382,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_SWIFT_FLAGS = ""; SDKROOT = iphoneos; @@ -3766,7 +3397,6 @@ }; D0CE6F03213DC32300BCD44B /* ReleaseAppStoreLLC */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0F69DB91D6B88190046BCD6 /* TelegramUI.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; COPY_PHASE_STRIP = YES; @@ -3971,7 +3601,6 @@ }; D0FC40911D5B8E7500261D9D /* DebugHockeyapp */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0F69DB91D6B88190046BCD6 /* TelegramUI.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -4018,7 +3647,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_SWIFT_FLAGS = ""; @@ -4034,7 +3663,6 @@ }; D0FC40921D5B8E7500261D9D /* ReleaseHockeyapp */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0F69DB91D6B88190046BCD6 /* TelegramUI.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -4075,7 +3703,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_SWIFT_FLAGS = ""; SDKROOT = iphoneos; @@ -4090,7 +3718,6 @@ }; D0FC40971D5B8E7500261D9D /* DebugHockeyapp */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0F69DB91D6B88190046BCD6 /* TelegramUI.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; DEVELOPMENT_TEAM = X834Q8SBVP; @@ -4106,7 +3733,6 @@ }; D0FC40981D5B8E7500261D9D /* ReleaseHockeyapp */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D0F69DB91D6B88190046BCD6 /* TelegramUI.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; COPY_PHASE_STRIP = YES; diff --git a/submodules/TelegramUniversalVideoContent/BUCK b/submodules/TelegramUniversalVideoContent/BUCK index 1af4dece2a..6269fbe9c4 100644 --- a/submodules/TelegramUniversalVideoContent/BUCK +++ b/submodules/TelegramUniversalVideoContent/BUCK @@ -17,6 +17,7 @@ static_library( "//submodules/PhotoResources:PhotoResources", "//submodules/LegacyComponents:LegacyComponents", "//submodules/RadialStatusNode:RadialStatusNode", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/TelegramUniversalVideoContent/Sources/FrameworkBundle.swift b/submodules/TelegramUniversalVideoContent/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/TelegramUniversalVideoContent/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/TelegramUniversalVideoContent/Sources/GenericEmbedImplementation.swift b/submodules/TelegramUniversalVideoContent/Sources/GenericEmbedImplementation.swift index e214d9b366..fa1ed35d83 100644 --- a/submodules/TelegramUniversalVideoContent/Sources/GenericEmbedImplementation.swift +++ b/submodules/TelegramUniversalVideoContent/Sources/GenericEmbedImplementation.swift @@ -2,6 +2,7 @@ import Foundation import WebKit import SwiftSignalKit import UniversalMediaPlayer +import AppBundle final class GenericEmbedImplementation: WebEmbedImplementation { private var evalImpl: ((String) -> Void)? @@ -17,7 +18,7 @@ final class GenericEmbedImplementation: WebEmbedImplementation { } func setup(_ webView: WKWebView, userContentController: WKUserContentController, evaluateJavaScript: @escaping (String) -> Void, updateStatus: @escaping (MediaPlayerStatus) -> Void, onPlaybackStarted: @escaping () -> Void) { - let bundle = Bundle(for: type(of: self)) + let bundle = getAppBundle() guard let userScriptPath = bundle.path(forResource: "GenericUserScript", ofType: "js") else { return } diff --git a/submodules/TelegramUniversalVideoContent/Sources/OverlayVideoDecoration.swift b/submodules/TelegramUniversalVideoContent/Sources/OverlayVideoDecoration.swift index d262909b31..4ec927ab21 100644 --- a/submodules/TelegramUniversalVideoContent/Sources/OverlayVideoDecoration.swift +++ b/submodules/TelegramUniversalVideoContent/Sources/OverlayVideoDecoration.swift @@ -7,6 +7,7 @@ import UniversalMediaPlayer import LegacyComponents import AccountContext import RadialStatusNode +import AppBundle private func setupArrowFrame(size: CGSize, edge: OverlayMediaItemMinimizationEdge, view: TGEmbedPIPPullArrowView) { let arrowX: CGFloat diff --git a/submodules/TelegramUniversalVideoContent/Sources/PictureInPictureVideoControlsNode.swift b/submodules/TelegramUniversalVideoContent/Sources/PictureInPictureVideoControlsNode.swift index 219afbb90b..96677f2472 100644 --- a/submodules/TelegramUniversalVideoContent/Sources/PictureInPictureVideoControlsNode.swift +++ b/submodules/TelegramUniversalVideoContent/Sources/PictureInPictureVideoControlsNode.swift @@ -5,6 +5,7 @@ import AsyncDisplayKit import SwiftSignalKit import UniversalMediaPlayer import LegacyComponents +import AppBundle private let leaveImage = UIImage(bundleImageName: "Media Gallery/PictureInPictureLeave")?.precomposed() private let pauseImage = UIImage(bundleImageName: "Media Gallery/PictureInPicturePause")?.precomposed() diff --git a/submodules/TelegramUniversalVideoContent/Sources/VimeoEmbedImplementation.swift b/submodules/TelegramUniversalVideoContent/Sources/VimeoEmbedImplementation.swift index 5b6a588b01..7b9621ddb0 100644 --- a/submodules/TelegramUniversalVideoContent/Sources/VimeoEmbedImplementation.swift +++ b/submodules/TelegramUniversalVideoContent/Sources/VimeoEmbedImplementation.swift @@ -2,6 +2,7 @@ import Foundation import WebKit import SwiftSignalKit import UniversalMediaPlayer +import AppBundle func extractVimeoVideoIdAndTimestamp(url: String) -> (String, Int)? { guard let url = URL(string: url), let host = url.host?.lowercased() else { @@ -100,7 +101,7 @@ final class VimeoEmbedImplementation: WebEmbedImplementation { } func setup(_ webView: WKWebView, userContentController: WKUserContentController, evaluateJavaScript: @escaping (String) -> Void, updateStatus: @escaping (MediaPlayerStatus) -> Void, onPlaybackStarted: @escaping () -> Void) { - let bundle = Bundle(for: type(of: self)) + let bundle = getAppBundle() guard let userScriptPath = bundle.path(forResource: "VimeoUserScript", ofType: "js") else { return } diff --git a/submodules/TelegramUniversalVideoContent/Sources/YoutubeEmbedImplementation.swift b/submodules/TelegramUniversalVideoContent/Sources/YoutubeEmbedImplementation.swift index 169bda0775..421bac9852 100644 --- a/submodules/TelegramUniversalVideoContent/Sources/YoutubeEmbedImplementation.swift +++ b/submodules/TelegramUniversalVideoContent/Sources/YoutubeEmbedImplementation.swift @@ -2,6 +2,7 @@ import Foundation import WebKit import SwiftSignalKit import UniversalMediaPlayer +import AppBundle func extractYoutubeVideoIdAndTimestamp(url: String) -> (String, Int)? { guard let url = URL(string: url), let host = url.host?.lowercased() else { @@ -116,7 +117,7 @@ final class YoutubeEmbedImplementation: WebEmbedImplementation { } func setup(_ webView: WKWebView, userContentController: WKUserContentController, evaluateJavaScript: @escaping (String) -> Void, updateStatus: @escaping (MediaPlayerStatus) -> Void, onPlaybackStarted: @escaping () -> Void) { - let bundle = Bundle(for: type(of: self)) + let bundle = getAppBundle() guard let userScriptPath = bundle.path(forResource: "YoutubeUserScript", ofType: "js") else { return } diff --git a/submodules/TelegramUniversalVideoContent/TelegramUniversalVideoContent.xcodeproj/project.pbxproj b/submodules/TelegramUniversalVideoContent/TelegramUniversalVideoContent.xcodeproj/project.pbxproj index e1ea8e76ff..f1a5fa68f7 100644 --- a/submodules/TelegramUniversalVideoContent/TelegramUniversalVideoContent.xcodeproj/project.pbxproj +++ b/submodules/TelegramUniversalVideoContent/TelegramUniversalVideoContent.xcodeproj/project.pbxproj @@ -459,17 +459,6 @@ sourceTree SOURCE_ROOT - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E29688CAF5900000000 isa @@ -614,7 +603,6 @@ 1DD70E29234A56D300000000 1DD70E294730C22C00000000 - 1DD70E291289FAA500000000 1DD70E29688CAF5900000000 1DD70E2968CBD43A00000000 1DD70E2949BD0C8700000000 @@ -673,13 +661,6 @@ fileRef 1DD70E294730C22C00000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F04688CAF5900000000 isa @@ -772,7 +753,6 @@ E7A30F04234A56D300000000 E7A30F044730C22C00000000 - E7A30F041289FAA500000000 E7A30F04688CAF5900000000 E7A30F0468CBD43A00000000 E7A30F0449BD0C8700000000 diff --git a/submodules/TelegramUniversalVideoContent/TelegramUniversalVideoContent_Xcode.xcodeproj/project.pbxproj b/submodules/TelegramUniversalVideoContent/TelegramUniversalVideoContent_Xcode.xcodeproj/project.pbxproj index 4c64113495..7b106f6ecf 100644 --- a/submodules/TelegramUniversalVideoContent/TelegramUniversalVideoContent_Xcode.xcodeproj/project.pbxproj +++ b/submodules/TelegramUniversalVideoContent/TelegramUniversalVideoContent_Xcode.xcodeproj/project.pbxproj @@ -32,10 +32,10 @@ D0C9C3CF2300BA4400FAB518 /* TelegramAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C3CE2300BA4400FAB518 /* TelegramAudio.framework */; }; D0C9C3D12300BA4F00FAB518 /* RadialStatusNode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C3D02300BA4F00FAB518 /* RadialStatusNode.framework */; }; D0C9C3D32300BA7000FAB518 /* PictureInPictureVideoControlsNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C3D22300BA6F00FAB518 /* PictureInPictureVideoControlsNode.swift */; }; - D0C9C3D52300BA8B00FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C3D42300BA8B00FAB518 /* FrameworkBundle.swift */; }; D0C9C4442300DC2000FAB518 /* ChatBubbleVideoDecoration.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C4422300DC2000FAB518 /* ChatBubbleVideoDecoration.swift */; }; D0C9C4452300DC2000FAB518 /* ChatBubbleInstantVideoDecoration.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C4432300DC2000FAB518 /* ChatBubbleInstantVideoDecoration.swift */; }; D0C9C5362301CCC600FAB518 /* PhotoResources.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C5352301CCC600FAB518 /* PhotoResources.framework */; }; + D0EFF24C231980C300CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF24B231980C300CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -67,10 +67,10 @@ D0C9C3CE2300BA4400FAB518 /* TelegramAudio.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TelegramAudio.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C3D02300BA4F00FAB518 /* RadialStatusNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RadialStatusNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C3D22300BA6F00FAB518 /* PictureInPictureVideoControlsNode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PictureInPictureVideoControlsNode.swift; sourceTree = ""; }; - D0C9C3D42300BA8B00FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; D0C9C4422300DC2000FAB518 /* ChatBubbleVideoDecoration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatBubbleVideoDecoration.swift; sourceTree = ""; }; D0C9C4432300DC2000FAB518 /* ChatBubbleInstantVideoDecoration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatBubbleInstantVideoDecoration.swift; sourceTree = ""; }; D0C9C5352301CCC600FAB518 /* PhotoResources.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PhotoResources.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D0EFF24B231980C300CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -78,6 +78,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF24C231980C300CF5164 /* AppBundle.framework in Frameworks */, D0C9C5362301CCC600FAB518 /* PhotoResources.framework in Frameworks */, D0C9C3D12300BA4F00FAB518 /* RadialStatusNode.framework in Frameworks */, D0C9C3CF2300BA4400FAB518 /* TelegramAudio.framework in Frameworks */, @@ -132,7 +133,6 @@ D0C9C3802300B40E00FAB518 /* SystemVideoContent.swift */, D0C9C37F2300B40E00FAB518 /* UniversalVideoContentManager.swift */, D0C9C3822300B40E00FAB518 /* WebEmbedVideoContent.swift */, - D0C9C3D42300BA8B00FAB518 /* FrameworkBundle.swift */, D0C9C3722300B0CF00FAB518 /* TelegramUniversalVideoContent.h */, ); path = Sources; @@ -141,6 +141,7 @@ D0C9C3882300B41900FAB518 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF24B231980C300CF5164 /* AppBundle.framework */, D0C9C5352301CCC600FAB518 /* PhotoResources.framework */, D0C9C3D02300BA4F00FAB518 /* RadialStatusNode.framework */, D0C9C3CE2300BA4400FAB518 /* TelegramAudio.framework */, @@ -248,7 +249,6 @@ D0C9C3A62300B4E300FAB518 /* VimeoEmbedImplementation.swift in Sources */, D0C9C3C92300B9EB00FAB518 /* OverlayVideoDecoration.swift in Sources */, D0C9C3D32300BA7000FAB518 /* PictureInPictureVideoControlsNode.swift in Sources */, - D0C9C3D52300BA8B00FAB518 /* FrameworkBundle.swift in Sources */, D0C9C3A42300B4E300FAB518 /* YoutubeEmbedImplementation.swift in Sources */, D0C9C3852300B40E00FAB518 /* SystemVideoContent.swift in Sources */, D0C9C3A52300B4E300FAB518 /* GenericEmbedImplementation.swift in Sources */, diff --git a/submodules/TextSelectionNode/TextSelectionNode.xcodeproj/project.pbxproj b/submodules/TextSelectionNode/TextSelectionNode.xcodeproj/project.pbxproj index 0bea68cd4e..62942bcd1b 100644 --- a/submodules/TextSelectionNode/TextSelectionNode.xcodeproj/project.pbxproj +++ b/submodules/TextSelectionNode/TextSelectionNode.xcodeproj/project.pbxproj @@ -91,6 +91,84 @@ explicitFileType compiled.mach-o.dylib + 1DD70E2936DE2CF900000000 + + isa + PBXFileReference + name + libMediaResources.a + path + libMediaResources.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E29DB6520C800000000 + + isa + PBXFileReference + name + libPostbox.dylib + path + libPostbox.dylib + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + compiled.mach-o.dylib + + 1DD70E29D65BA68200000000 + + isa + PBXFileReference + name + libSwiftSignalKit.dylib + path + libSwiftSignalKit.dylib + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + compiled.mach-o.dylib + + 1DD70E29119CDA0700000000 + + isa + PBXFileReference + name + libTelegramCore.dylib + path + libTelegramCore.dylib + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + compiled.mach-o.dylib + + 1DD70E2984A59C1D00000000 + + isa + PBXFileReference + name + libTelegramPresentationData.a + path + libTelegramPresentationData.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + + 1DD70E292395015100000000 + + isa + PBXFileReference + name + libTelegramUIPreferences.a + path + libTelegramUIPreferences.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + B401C97968022A5500000000 isa @@ -102,6 +180,12 @@ children 1DD70E29FF334B1F00000000 + 1DD70E2936DE2CF900000000 + 1DD70E29DB6520C800000000 + 1DD70E29D65BA68200000000 + 1DD70E29119CDA0700000000 + 1DD70E2984A59C1D00000000 + 1DD70E292395015100000000 1DD70E29F40A586F00000000 @@ -220,6 +304,48 @@ fileRef 1DD70E29FF334B1F00000000 + E7A30F04DB6520C800000000 + + isa + PBXBuildFile + fileRef + 1DD70E29DB6520C800000000 + + E7A30F04D65BA68200000000 + + isa + PBXBuildFile + fileRef + 1DD70E29D65BA68200000000 + + E7A30F04119CDA0700000000 + + isa + PBXBuildFile + fileRef + 1DD70E29119CDA0700000000 + + E7A30F0436DE2CF900000000 + + isa + PBXBuildFile + fileRef + 1DD70E2936DE2CF900000000 + + E7A30F042395015100000000 + + isa + PBXBuildFile + fileRef + 1DD70E292395015100000000 + + E7A30F0484A59C1D00000000 + + isa + PBXBuildFile + fileRef + 1DD70E2984A59C1D00000000 + FAF5FAC90000000000000000 isa @@ -227,6 +353,12 @@ files E7A30F04FF334B1F00000000 + E7A30F04DB6520C800000000 + E7A30F04D65BA68200000000 + E7A30F04119CDA0700000000 + E7A30F0436DE2CF900000000 + E7A30F042395015100000000 + E7A30F0484A59C1D00000000 name Fake Swift Dependencies (Copy Files Phase) diff --git a/submodules/UndoUI/BUCK b/submodules/UndoUI/BUCK index c5b55d448b..788183a009 100644 --- a/submodules/UndoUI/BUCK +++ b/submodules/UndoUI/BUCK @@ -16,6 +16,7 @@ static_library( "//submodules/AccountContext:AccountContext", "//submodules/RadialStatusNode:RadialStatusNode", "//submodules/AnimationUI:AnimationUI", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/UndoUI/Sources/FrameworkBundle.swift b/submodules/UndoUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/UndoUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift b/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift index 392331bb42..748baee52e 100644 --- a/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift +++ b/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift @@ -7,6 +7,7 @@ import TelegramPresentationData import AnimationUI import TextFormat import RadialStatusNode +import AppBundle final class UndoOverlayControllerNode: ViewControllerTracingNode { private let elevatedLayout: Bool diff --git a/submodules/UndoUI/UndoUI.xcodeproj/project.pbxproj b/submodules/UndoUI/UndoUI.xcodeproj/project.pbxproj index 1f71d151df..5ac12603b5 100644 --- a/submodules/UndoUI/UndoUI.xcodeproj/project.pbxproj +++ b/submodules/UndoUI/UndoUI.xcodeproj/project.pbxproj @@ -423,17 +423,6 @@ explicitFileType text.script.python - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E29B729780D00000000 isa @@ -466,7 +455,6 @@ ]]> children - 1DD70E291289FAA500000000 1DD70E29B729780D00000000 1DD70E29E5CC04AF00000000 @@ -501,13 +489,6 @@ B401C9799749269800000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F04B729780D00000000 isa @@ -528,7 +509,6 @@ PBXSourcesBuildPhase files - E7A30F041289FAA500000000 E7A30F04B729780D00000000 E7A30F04E5CC04AF00000000 diff --git a/submodules/UndoUI/UndoUI_Xcode.xcodeproj/project.pbxproj b/submodules/UndoUI/UndoUI_Xcode.xcodeproj/project.pbxproj index 00ed22fbec..ceddbc9e6a 100644 --- a/submodules/UndoUI/UndoUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/UndoUI/UndoUI_Xcode.xcodeproj/project.pbxproj @@ -21,7 +21,7 @@ D0C9C07722FE3B5300FAB518 /* TextFormat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C07622FE3B5300FAB518 /* TextFormat.framework */; }; D0C9C07922FE3B5700FAB518 /* RadialStatusNode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C07822FE3B5700FAB518 /* RadialStatusNode.framework */; }; D0C9C07B22FE3B5D00FAB518 /* AsyncDisplayKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C9C07A22FE3B5D00FAB518 /* AsyncDisplayKit.framework */; }; - D0C9C07F22FE3BA400FAB518 /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C9C07E22FE3BA400FAB518 /* FrameworkBundle.swift */; }; + D0EFF25E2319817900CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF25D2319817900CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -41,7 +41,7 @@ D0C9C07622FE3B5300FAB518 /* TextFormat.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TextFormat.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C07822FE3B5700FAB518 /* RadialStatusNode.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RadialStatusNode.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0C9C07A22FE3B5D00FAB518 /* AsyncDisplayKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AsyncDisplayKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D0C9C07E22FE3BA400FAB518 /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; + D0EFF25D2319817900CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -49,6 +49,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF25E2319817900CF5164 /* AppBundle.framework in Frameworks */, D0C9C07B22FE3B5D00FAB518 /* AsyncDisplayKit.framework in Frameworks */, D0C9C07922FE3B5700FAB518 /* RadialStatusNode.framework in Frameworks */, D0C9C07722FE3B5300FAB518 /* TextFormat.framework in Frameworks */, @@ -89,7 +90,6 @@ children = ( D0C9C06222FE3B0500FAB518 /* UndoOverlayController.swift */, D0C9C06122FE3B0500FAB518 /* UndoOverlayControllerNode.swift */, - D0C9C07E22FE3BA400FAB518 /* FrameworkBundle.swift */, D0C9C05522FE3AAA00FAB518 /* UndoUI.h */, ); path = Sources; @@ -98,6 +98,7 @@ D0C9C06522FE3B2700FAB518 /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF25D2319817900CF5164 /* AppBundle.framework */, D0C9C07A22FE3B5D00FAB518 /* AsyncDisplayKit.framework */, D0C9C07822FE3B5700FAB518 /* RadialStatusNode.framework */, D0C9C07622FE3B5300FAB518 /* TextFormat.framework */, @@ -195,7 +196,6 @@ files = ( D0C9C06422FE3B0500FAB518 /* UndoOverlayController.swift in Sources */, D0C9C06322FE3B0500FAB518 /* UndoOverlayControllerNode.swift in Sources */, - D0C9C07F22FE3BA400FAB518 /* FrameworkBundle.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/submodules/WallpaperResources/BUCK b/submodules/WallpaperResources/BUCK index 853d7eb8d0..6d1177da31 100644 --- a/submodules/WallpaperResources/BUCK +++ b/submodules/WallpaperResources/BUCK @@ -16,6 +16,7 @@ static_library( "//submodules/MediaResources:MediaResources", "//submodules/PhotoResources:PhotoResources", "//submodules/PersistentStringHash:PersistentStringHash", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/WallpaperResources/Sources/FrameworkBundle.swift b/submodules/WallpaperResources/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/WallpaperResources/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/WallpaperResources/Sources/WallpaperResources.swift b/submodules/WallpaperResources/Sources/WallpaperResources.swift index 02bcd1d806..b6bae94774 100644 --- a/submodules/WallpaperResources/Sources/WallpaperResources.swift +++ b/submodules/WallpaperResources/Sources/WallpaperResources.swift @@ -11,6 +11,7 @@ import PhotoResources import LocalMediaResources import TelegramPresentationData import TelegramUIPreferences +import AppBundle public func wallpaperDatas(account: Account, accountManager: AccountManager, fileReference: FileMediaReference? = nil, representations: [ImageRepresentationWithReference], alwaysShowThumbnailFirst: Bool = false, thumbnail: Bool = false, onlyFullSize: Bool = false, autoFetchFullSize: Bool = false, synchronousLoad: Bool = false) -> Signal<(Data?, Data?, Bool), NoError> { if let smallestRepresentation = smallestImageRepresentation(representations.map({ $0.representation })), let largestRepresentation = largestImageRepresentation(representations.map({ $0.representation })), let smallestIndex = representations.firstIndex(where: { $0.representation == smallestRepresentation }), let largestIndex = representations.firstIndex(where: { $0.representation == largestRepresentation }) { @@ -487,7 +488,7 @@ public func solidColor(_ color: UIColor) -> Signal<(TransformImageArguments) -> private func builtinWallpaperData() -> Signal { return Signal { subscriber in - if let filePath = frameworkBundle.path(forResource: "ChatWallpaperBuiltin0", ofType: "jpg"), let image = UIImage(contentsOfFile: filePath) { + if let filePath = getAppBundle().path(forResource: "ChatWallpaperBuiltin0", ofType: "jpg"), let image = UIImage(contentsOfFile: filePath) { subscriber.putNext(image) } subscriber.putCompletion() @@ -647,7 +648,7 @@ public func drawThemeImage(context c: CGContext, theme: PresentationTheme, wallp switch theme.chat.defaultWallpaper { case .builtin: - if let filePath = frameworkBundle.path(forResource: "ChatWallpaperBuiltin0", ofType: "jpg"), let image = UIImage(contentsOfFile: filePath), let cgImage = image.cgImage { + if let filePath = getAppBundle().path(forResource: "ChatWallpaperBuiltin0", ofType: "jpg"), let image = UIImage(contentsOfFile: filePath), let cgImage = image.cgImage { let size = image.size.aspectFilled(drawingRect.size) c.draw(cgImage, in: CGRect(origin: CGPoint(x: (drawingRect.size.width - size.width) / 2.0, y: (drawingRect.size.height - size.height) / 2.0), size: size)) } diff --git a/submodules/WallpaperResources/WallpaperResources.xcodeproj/project.pbxproj b/submodules/WallpaperResources/WallpaperResources.xcodeproj/project.pbxproj index 0e99adcde6..bb31ae4ad0 100644 --- a/submodules/WallpaperResources/WallpaperResources.xcodeproj/project.pbxproj +++ b/submodules/WallpaperResources/WallpaperResources.xcodeproj/project.pbxproj @@ -195,6 +195,19 @@ explicitFileType archive.ar + 1DD70E29B5051C0E00000000 + + isa + PBXFileReference + name + libPersistentStringHash.a + path + libPersistentStringHash.a + sourceTree + BUILT_PRODUCTS_DIR + explicitFileType + archive.ar + 1DD70E29490601EB00000000 isa @@ -396,6 +409,7 @@ 1DD70E2968BAC05A00000000 1DD70E29CE34063500000000 1DD70E2936DE2CF900000000 + 1DD70E29B5051C0E00000000 1DD70E29490601EB00000000 1DD70E290F1A3C6400000000 1DD70E29DB6520C800000000 @@ -451,14 +465,14 @@ explicitFileType text.script.python - 1DD70E291289FAA500000000 + 1DD70E29F40E096500000000 isa PBXFileReference name - FrameworkBundle.swift + WallpaperCache.swift path - Sources/FrameworkBundle.swift + Sources/WallpaperCache.swift sourceTree SOURCE_ROOT @@ -483,7 +497,7 @@ ]]> children - 1DD70E291289FAA500000000 + 1DD70E29F40E096500000000 1DD70E29FC18C2C800000000 @@ -517,12 +531,12 @@ B401C979869F2E6300000000 - E7A30F041289FAA500000000 + E7A30F04F40E096500000000 isa PBXBuildFile fileRef - 1DD70E291289FAA500000000 + 1DD70E29F40E096500000000 E7A30F04FC18C2C800000000 @@ -537,7 +551,7 @@ PBXSourcesBuildPhase files - E7A30F041289FAA500000000 + E7A30F04F40E096500000000 E7A30F04FC18C2C800000000 @@ -597,6 +611,13 @@ fileRef 1DD70E2936DE2CF900000000 + E7A30F04B5051C0E00000000 + + isa + PBXBuildFile + fileRef + 1DD70E29B5051C0E00000000 + E7A30F045915423000000000 isa @@ -716,6 +737,7 @@ E7A30F04119CDA0700000000 E7A30F0468BAC05A00000000 E7A30F0436DE2CF900000000 + E7A30F04B5051C0E00000000 E7A30F045915423000000000 E7A30F04F33FDAC300000000 E7A30F0451398CF200000000 diff --git a/submodules/WallpaperResources/WallpaperResources_Xcode.xcodeproj/project.pbxproj b/submodules/WallpaperResources/WallpaperResources_Xcode.xcodeproj/project.pbxproj index b9bf77669f..cb7f5cddba 100644 --- a/submodules/WallpaperResources/WallpaperResources_Xcode.xcodeproj/project.pbxproj +++ b/submodules/WallpaperResources/WallpaperResources_Xcode.xcodeproj/project.pbxproj @@ -21,7 +21,7 @@ D03E486823076BF60049C28B /* TinyThumbnail.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E486723076BF60049C28B /* TinyThumbnail.framework */; }; D03E486A23076BFC0049C28B /* PhotoResources.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E486923076BFC0049C28B /* PhotoResources.framework */; }; D03E486C23076C020049C28B /* LocalMediaResources.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E486B23076C020049C28B /* LocalMediaResources.framework */; }; - D03E487223076CF10049C28B /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03E487123076CF10049C28B /* FrameworkBundle.swift */; }; + D0EFF23E23197F9F00CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF23D23197F9F00CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -41,7 +41,7 @@ D03E486723076BF60049C28B /* TinyThumbnail.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TinyThumbnail.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E486923076BFC0049C28B /* PhotoResources.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = PhotoResources.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D03E486B23076C020049C28B /* LocalMediaResources.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LocalMediaResources.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D03E487123076CF10049C28B /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; + D0EFF23D23197F9F00CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -49,6 +49,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF23E23197F9F00CF5164 /* AppBundle.framework in Frameworks */, D03E486C23076C020049C28B /* LocalMediaResources.framework in Frameworks */, D03E486A23076BFC0049C28B /* PhotoResources.framework in Frameworks */, D03E486823076BF60049C28B /* TinyThumbnail.framework in Frameworks */, @@ -88,7 +89,6 @@ isa = PBXGroup; children = ( D03E485423076BB70049C28B /* WallpaperResources.swift */, - D03E487123076CF10049C28B /* FrameworkBundle.swift */, D03E484823076B4A0049C28B /* WallpaperResources.h */, 095214EC2317EF76008CDD87 /* WallpaperCache.swift */, ); @@ -98,6 +98,7 @@ D03E485623076BC80049C28B /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF23D23197F9F00CF5164 /* AppBundle.framework */, D03E486B23076C020049C28B /* LocalMediaResources.framework */, D03E486923076BFC0049C28B /* PhotoResources.framework */, D03E486723076BF60049C28B /* TinyThumbnail.framework */, @@ -193,7 +194,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - D03E487223076CF10049C28B /* FrameworkBundle.swift in Sources */, 095214ED2317EF76008CDD87 /* WallpaperCache.swift in Sources */, D03E485523076BB70049C28B /* WallpaperResources.swift in Sources */, ); diff --git a/submodules/WebSearchUI/BUCK b/submodules/WebSearchUI/BUCK index 7a0a4582ad..b53c2f6d56 100644 --- a/submodules/WebSearchUI/BUCK +++ b/submodules/WebSearchUI/BUCK @@ -24,6 +24,7 @@ static_library( "//submodules/SearchBarNode:SearchBarNode", "//submodules/ItemListUI:ItemListUI", "//submodules/LegacyMediaPickerUI:LegacyMediaPickerUI", + "//submodules/AppBundle:AppBundle", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/submodules/WebSearchUI/Sources/FrameworkBundle.swift b/submodules/WebSearchUI/Sources/FrameworkBundle.swift deleted file mode 100644 index 8ca13d7d92..0000000000 --- a/submodules/WebSearchUI/Sources/FrameworkBundle.swift +++ /dev/null @@ -1,13 +0,0 @@ -import Foundation -import UIKit - -private class FrameworkBundleClass: NSObject { -} - -let frameworkBundle: Bundle = Bundle(for: FrameworkBundleClass.self) - -extension UIImage { - convenience init?(bundleImageName: String) { - self.init(named: bundleImageName, in: frameworkBundle, compatibleWith: nil) - } -} diff --git a/submodules/WebSearchUI/Sources/WebSearchControllerNode.swift b/submodules/WebSearchUI/Sources/WebSearchControllerNode.swift index c10344cfd0..a47c63ea0a 100644 --- a/submodules/WebSearchUI/Sources/WebSearchControllerNode.swift +++ b/submodules/WebSearchUI/Sources/WebSearchControllerNode.swift @@ -12,6 +12,7 @@ import MergeLists import AccountContext import GalleryUI import ChatListSearchItemHeader +import AppBundle private struct WebSearchContextResultStableId: Hashable { let result: ChatContextResult diff --git a/submodules/WebSearchUI/WebSearchUI.xcodeproj/project.pbxproj b/submodules/WebSearchUI/WebSearchUI.xcodeproj/project.pbxproj index 7359d13faf..dc58d668cb 100644 --- a/submodules/WebSearchUI/WebSearchUI.xcodeproj/project.pbxproj +++ b/submodules/WebSearchUI/WebSearchUI.xcodeproj/project.pbxproj @@ -885,17 +885,6 @@ explicitFileType text.script.python - 1DD70E291289FAA500000000 - - isa - PBXFileReference - name - FrameworkBundle.swift - path - Sources/FrameworkBundle.swift - sourceTree - SOURCE_ROOT - 1DD70E29EB1ECA2500000000 isa @@ -1049,7 +1038,6 @@ ]]> children - 1DD70E291289FAA500000000 1DD70E29EB1ECA2500000000 1DD70E2999E4D30400000000 1DD70E296E94698E00000000 @@ -1095,13 +1083,6 @@ B401C979F5B6E99000000000 - E7A30F041289FAA500000000 - - isa - PBXBuildFile - fileRef - 1DD70E291289FAA500000000 - E7A30F04EB1ECA2500000000 isa @@ -1199,7 +1180,6 @@ PBXSourcesBuildPhase files - E7A30F041289FAA500000000 E7A30F04EB1ECA2500000000 E7A30F0499E4D30400000000 E7A30F046E94698E00000000 diff --git a/submodules/WebSearchUI/WebSearchUI_Xcode.xcodeproj/project.pbxproj b/submodules/WebSearchUI/WebSearchUI_Xcode.xcodeproj/project.pbxproj index 8deb66fd50..c739eba93d 100644 --- a/submodules/WebSearchUI/WebSearchUI_Xcode.xcodeproj/project.pbxproj +++ b/submodules/WebSearchUI/WebSearchUI_Xcode.xcodeproj/project.pbxproj @@ -42,7 +42,7 @@ D03E3F5D2304C3E20049C28B /* LegacyWebSearchEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03E3F5A2304C3E20049C28B /* LegacyWebSearchEditor.swift */; }; D03E3F5E2304C3E20049C28B /* LegacyWebSearchGallery.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03E3F5B2304C3E20049C28B /* LegacyWebSearchGallery.swift */; }; D03E3FA22304C5AA0049C28B /* LegacyMediaPickerUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D03E3FA12304C5AA0049C28B /* LegacyMediaPickerUI.framework */; }; - D03E3FA42304C5D00049C28B /* FrameworkBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D03E3FA32304C5D00049C28B /* FrameworkBundle.swift */; }; + D0EFF270231982BB00CF5164 /* AppBundle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0EFF26F231982BB00CF5164 /* AppBundle.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -83,7 +83,7 @@ D03E3F5A2304C3E20049C28B /* LegacyWebSearchEditor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LegacyWebSearchEditor.swift; sourceTree = ""; }; D03E3F5B2304C3E20049C28B /* LegacyWebSearchGallery.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LegacyWebSearchGallery.swift; sourceTree = ""; }; D03E3FA12304C5AA0049C28B /* LegacyMediaPickerUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LegacyMediaPickerUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D03E3FA32304C5D00049C28B /* FrameworkBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FrameworkBundle.swift; sourceTree = ""; }; + D0EFF26F231982BB00CF5164 /* AppBundle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppBundle.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -91,6 +91,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0EFF270231982BB00CF5164 /* AppBundle.framework in Frameworks */, D03E3FA22304C5AA0049C28B /* LegacyMediaPickerUI.framework in Frameworks */, D03E3F562304C37F0049C28B /* ItemListUI.framework in Frameworks */, D03E3F542304C3730049C28B /* SearchBarNode.framework in Frameworks */, @@ -152,7 +153,6 @@ D03E3F1B2304C2DF0049C28B /* WebSearchNavigationContentNode.swift */, D03E3F1F2304C2DF0049C28B /* WebSearchRecentQueries.swift */, D03E3F1C2304C2DF0049C28B /* WebSearchRecentQueryItem.swift */, - D03E3FA32304C5D00049C28B /* FrameworkBundle.swift */, D03E3F0E2304C2530049C28B /* WebSearchUI.h */, ); path = Sources; @@ -161,6 +161,7 @@ D03E3F2E2304C2ED0049C28B /* Frameworks */ = { isa = PBXGroup; children = ( + D0EFF26F231982BB00CF5164 /* AppBundle.framework */, D03E3FA12304C5AA0049C28B /* LegacyMediaPickerUI.framework */, D03E3F552304C37F0049C28B /* ItemListUI.framework */, D03E3F532304C3730049C28B /* SearchBarNode.framework */, @@ -278,7 +279,6 @@ D03E3F272304C2E00049C28B /* WebSearchGalleryFooterContentNode.swift in Sources */, D03E3F2B2304C2E00049C28B /* WebSearchControllerNode.swift in Sources */, D03E3F5D2304C3E20049C28B /* LegacyWebSearchEditor.swift in Sources */, - D03E3FA42304C5D00049C28B /* FrameworkBundle.swift in Sources */, D03E3F262304C2E00049C28B /* WebSearchRecentQueryItem.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/submodules/libtgvoip/BUCK b/submodules/libtgvoip/BUCK index e9accaf3fc..6435a94a45 100644 --- a/submodules/libtgvoip/BUCK +++ b/submodules/libtgvoip/BUCK @@ -32,16 +32,25 @@ static_library( ]), exported_headers = glob([ "OngoingCallThreadLocalContext.h" - ]), - - compiler_flags = [ - "-DTGVOIP_USE_CUSTOM_CRYPTO", - "-DWEBRTC_APM_DEBUG_DUMP=0", - "-DWEBRTC_POSIX", - "-DTGVOIP_HAVE_TGLOG", - "-DWEBRTC_NS_FLOAT", - "-DWEBRTC_IOS", - "-DWEBRTC_HAS_NEON", + ], exclude = ["libtgvoip.h"]), + platform_compiler_flags = [ + ('arm.*', [ + '-DTGVOIP_USE_CUSTOM_CRYPTO', + '-DWEBRTC_APM_DEBUG_DUMP=0', + '-DWEBRTC_POSIX', + '-DTGVOIP_HAVE_TGLOG', + '-DWEBRTC_NS_FLOAT', + '-DWEBRTC_IOS', + '-DWEBRTC_HAS_NEON', + ]), + ('.*', [ + '-DTGVOIP_USE_CUSTOM_CRYPTO', + '-DWEBRTC_APM_DEBUG_DUMP=0', + '-DWEBRTC_POSIX', + '-DTGVOIP_HAVE_TGLOG', + '-DWEBRTC_NS_FLOAT', + '-DWEBRTC_IOS', + ]), ], deps = [ "//submodules/MtProtoKit:MtProtoKit#shared", diff --git a/submodules/libtgvoip/libtgvoip.h b/submodules/libtgvoip/libtgvoip.h new file mode 100644 index 0000000000..b5feb06ea7 --- /dev/null +++ b/submodules/libtgvoip/libtgvoip.h @@ -0,0 +1,6 @@ +#ifndef libtgvoip_h +#define libtgvoip_h + +#import + +#endif /* libtgvoip_h */ diff --git a/submodules/libtgvoip/libtgvoip_Xcode.xcodeproj/project.pbxproj b/submodules/libtgvoip/libtgvoip_Xcode.xcodeproj/project.pbxproj index 7ca561abc8..82eb8a44bc 100644 --- a/submodules/libtgvoip/libtgvoip_Xcode.xcodeproj/project.pbxproj +++ b/submodules/libtgvoip/libtgvoip_Xcode.xcodeproj/project.pbxproj @@ -327,6 +327,7 @@ 69F791582222AC2800FE53C4 /* SampleBufferDisplayLayerRenderer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 69F791562222AC2800FE53C4 /* SampleBufferDisplayLayerRenderer.mm */; }; 69F791592222AC2800FE53C4 /* SampleBufferDisplayLayerRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 69F791572222AC2800FE53C4 /* SampleBufferDisplayLayerRenderer.h */; }; 69FB0B2D20F6860E00827817 /* MessageThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 69FB0B2420F6860D00827817 /* MessageThread.cpp */; }; + D01748C9231978B700AF3D3A /* libtgvoip.h in Headers */ = {isa = PBXBuildFile; fileRef = D01748C8231978B700AF3D3A /* libtgvoip.h */; settings = {ATTRIBUTES = (Public, ); }; }; D03292E22314249D00338D35 /* OngoingCallThreadLocalContext.h in Headers */ = {isa = PBXBuildFile; fileRef = D03292E02314249C00338D35 /* OngoingCallThreadLocalContext.h */; settings = {ATTRIBUTES = (Public, ); }; }; D03292E32314249D00338D35 /* OngoingCallThreadLocalContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = D03292E12314249D00338D35 /* OngoingCallThreadLocalContext.mm */; }; /* End PBXBuildFile section */ @@ -1054,6 +1055,7 @@ 69FB0B2420F6860D00827817 /* MessageThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MessageThread.cpp; sourceTree = ""; }; 69FB0B2C20F6860D00827817 /* MessageThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageThread.h; sourceTree = ""; }; D00ACA4D20222F5D0045D427 /* SetupLogging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SetupLogging.h; sourceTree = ""; }; + D01748C8231978B700AF3D3A /* libtgvoip.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = libtgvoip.h; sourceTree = ""; }; D03292E02314249C00338D35 /* OngoingCallThreadLocalContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OngoingCallThreadLocalContext.h; sourceTree = ""; }; D03292E12314249D00338D35 /* OngoingCallThreadLocalContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OngoingCallThreadLocalContext.mm; sourceTree = ""; }; /* End PBXFileReference section */ @@ -1124,6 +1126,7 @@ 692AB8CA1E6759DD00706ACC /* VoIPServerConfig.h */, 69DD8CFC218CD400001E8140 /* video */, 69A6DCFE1E95EC7700000E69 /* webrtc_dsp */, + D01748C8231978B700AF3D3A /* libtgvoip.h */, ); name = libtgvoip; sourceTree = ""; @@ -2376,6 +2379,7 @@ 69F791552221F16C00FE53C4 /* VideoToolboxEncoderSource.h in Headers */, 69F7914C2220A41000FE53C4 /* TGVVideoSource.h in Headers */, 692AB9051E6759DD00706ACC /* VoIPServerConfig.h in Headers */, + D01748C9231978B700AF3D3A /* libtgvoip.h in Headers */, 692AB9031E6759DD00706ACC /* VoIPController.h in Headers */, 69F791592222AC2800FE53C4 /* SampleBufferDisplayLayerRenderer.h in Headers */, 69F791502220A76500FE53C4 /* TGVVideoRenderer.h in Headers */,