ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-11-07 01:10:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '250e8bd31980102128b1568f5bbdebe09d5480a9'

Browse Source
This commit is contained in:
Peter 2019-06-06 00:18:24 +01:00
commit e3d3922fbc
16 changed files with 67 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Telegram-iOS.xcodeproj/project.pbxproj
View File

@ -7,6 +7,10 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
090E777422A6945900CD99F5 /* BlackClassicIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 090E777022A6945800CD99F5 /* BlackClassicIcon@2x.png */; };
090E777522A6945900CD99F5 /* BlueClassicIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 090E777122A6945800CD99F5 /* BlueClassicIcon@3x.png */; };
090E777622A6945900CD99F5 /* BlackClassicIcon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 090E777222A6945800CD99F5 /* BlackClassicIcon@3x.png */; };
090E777722A6945900CD99F5 /* BlueClassicIcon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 090E777322A6945800CD99F5 /* BlueClassicIcon@2x.png */; };
092F368521542D6C001A9F49 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 092F368321542D6C001A9F49 /* Localizable.strings */; }; 092F368521542D6C001A9F49 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 092F368321542D6C001A9F49 /* Localizable.strings */; };
0956AF2C217B4642008106D0 /* WatchCommunicationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0956AF2B217B4642008106D0 /* WatchCommunicationManager.swift */; }; 0956AF2C217B4642008106D0 /* WatchCommunicationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0956AF2B217B4642008106D0 /* WatchCommunicationManager.swift */; };
0956AF2F217B8109008106D0 /* TGNeoUnsupportedMessageViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 0956AF2E217B8109008106D0 /* TGNeoUnsupportedMessageViewModel.m */; }; 0956AF2F217B8109008106D0 /* TGNeoUnsupportedMessageViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 0956AF2E217B8109008106D0 /* TGNeoUnsupportedMessageViewModel.m */; };
@ -564,6 +568,10 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
090E777022A6945800CD99F5 /* BlackClassicIcon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "BlackClassicIcon@2x.png"; sourceTree = "<group>"; };
090E777122A6945800CD99F5 /* BlueClassicIcon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "BlueClassicIcon@3x.png"; sourceTree = "<group>"; };
090E777222A6945800CD99F5 /* BlackClassicIcon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "BlackClassicIcon@3x.png"; sourceTree = "<group>"; };
090E777322A6945800CD99F5 /* BlueClassicIcon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "BlueClassicIcon@2x.png"; sourceTree = "<group>"; };
092F368421542D6C001A9F49 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = Share/en.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; }; 092F368421542D6C001A9F49 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = Share/en.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
0956AF2B217B4642008106D0 /* WatchCommunicationManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WatchCommunicationManager.swift; sourceTree = "<group>"; }; 0956AF2B217B4642008106D0 /* WatchCommunicationManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WatchCommunicationManager.swift; sourceTree = "<group>"; };
0956AF2D217B8109008106D0 /* TGNeoUnsupportedMessageViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TGNeoUnsupportedMessageViewModel.h; sourceTree = "<group>"; }; 0956AF2D217B8109008106D0 /* TGNeoUnsupportedMessageViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TGNeoUnsupportedMessageViewModel.h; sourceTree = "<group>"; };
@ -1331,6 +1339,10 @@
09A218E122A14E5600DE6898 /* App Icons */ = { 09A218E122A14E5600DE6898 /* App Icons */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
090E777022A6945800CD99F5 /* BlackClassicIcon@2x.png */,
090E777222A6945800CD99F5 /* BlackClassicIcon@3x.png */,
090E777322A6945800CD99F5 /* BlueClassicIcon@2x.png */,
090E777122A6945800CD99F5 /* BlueClassicIcon@3x.png */,
09A218EA22A1570900DE6898 /* BlackFilledIcon@2x.png */, 09A218EA22A1570900DE6898 /* BlackFilledIcon@2x.png */,
09A218EB22A1570900DE6898 /* BlackFilledIcon@3x.png */, 09A218EB22A1570900DE6898 /* BlackFilledIcon@3x.png */,
09A218EC22A1570900DE6898 /* BlueFilledIcon@2x.png */, 09A218EC22A1570900DE6898 /* BlueFilledIcon@2x.png */,
@ -2901,6 +2913,7 @@
D04DCC211F71C80000B021D7 /* 0.m4a in Resources */, D04DCC211F71C80000B021D7 /* 0.m4a in Resources */,
D04DCC261F71C80000B021D7 /* 103.m4a in Resources */, D04DCC261F71C80000B021D7 /* 103.m4a in Resources */,
09A218F222A1570A00DE6898 /* BlueFilledIcon@2x.png in Resources */, 09A218F222A1570A00DE6898 /* BlueFilledIcon@2x.png in Resources */,
090E777722A6945900CD99F5 /* BlueClassicIcon@2x.png in Resources */,
D0CE6F69213EDA4400BCD44B /* AppIntentVocabulary.plist in Resources */, D0CE6F69213EDA4400BCD44B /* AppIntentVocabulary.plist in Resources */,
D0338736223A9A9A007A2CE4 /* Config-Hockeyapp-Internal.xcconfig in Resources */, D0338736223A9A9A007A2CE4 /* Config-Hockeyapp-Internal.xcconfig in Resources */,
D08DB0C0213F4D1D00F2ADBF /* telegram_sphere@2x.png in Resources */, D08DB0C0213F4D1D00F2ADBF /* telegram_sphere@2x.png in Resources */,
@ -2951,6 +2964,7 @@
D0CE6F59213EDA4400BCD44B /* InfoPlist.strings in Resources */, D0CE6F59213EDA4400BCD44B /* InfoPlist.strings in Resources */,
D08DB0B9213F4D1D00F2ADBF /* powerful_star@2x.png in Resources */, D08DB0B9213F4D1D00F2ADBF /* powerful_star@2x.png in Resources */,
D04DCC271F71C80000B021D7 /* 104.m4a in Resources */, D04DCC271F71C80000B021D7 /* 104.m4a in Resources */,
090E777522A6945900CD99F5 /* BlueClassicIcon@3x.png in Resources */,
09A218F122A1570A00DE6898 /* BlackFilledIcon@3x.png in Resources */, 09A218F122A1570A00DE6898 /* BlackFilledIcon@3x.png in Resources */,
D04DCC2A1F71C80000B021D7 /* 107.m4a in Resources */, D04DCC2A1F71C80000B021D7 /* 107.m4a in Resources */,
D08DB0BA213F4D1D00F2ADBF /* private_door@2x.png in Resources */, D08DB0BA213F4D1D00F2ADBF /* private_door@2x.png in Resources */,
@ -2985,8 +2999,10 @@
D04DCC251F71C80000B021D7 /* 102.m4a in Resources */, D04DCC251F71C80000B021D7 /* 102.m4a in Resources */,
D021D4D9219CAEDD0064BEBA /* Config-Fork.xcconfig in Resources */, D021D4D9219CAEDD0064BEBA /* Config-Fork.xcconfig in Resources */,
D08DB0AD213F4D1D00F2ADBF /* ic_cam@2x.png in Resources */, D08DB0AD213F4D1D00F2ADBF /* ic_cam@2x.png in Resources */,
090E777622A6945900CD99F5 /* BlackClassicIcon@3x.png in Resources */,
D08DB0BF213F4D1D00F2ADBF /* telegram_plane1@2x.png in Resources */, D08DB0BF213F4D1D00F2ADBF /* telegram_plane1@2x.png in Resources */,
D0E8B8B02044496C00605593 /* voip_ringback.caf in Resources */, D0E8B8B02044496C00605593 /* voip_ringback.caf in Resources */,
090E777422A6945900CD99F5 /* BlackClassicIcon@2x.png in Resources */,
D00ED75A1FE94630001F38BD /* AppIntentVocabulary.plist in Resources */, D00ED75A1FE94630001F38BD /* AppIntentVocabulary.plist in Resources */,
D04DCC221F71C80000B021D7 /* 1.m4a in Resources */, D04DCC221F71C80000B021D7 /* 1.m4a in Resources */,
D0E8C2E02285EA6A009F26E8 /* BlackIcon@3x.png in Resources */, D0E8C2E02285EA6A009F26E8 /* BlackIcon@3x.png in Resources */,

2
Telegram-iOS/AppDelegate.swift
View File

@ -559,6 +559,8 @@ final class SharedApplicationContext {
if #available(iOS 10.3, *) { if #available(iOS 10.3, *) {
return [PresentationAppIcon(name: "Blue", imageName: "BlueIcon", isDefault: false), return [PresentationAppIcon(name: "Blue", imageName: "BlueIcon", isDefault: false),
PresentationAppIcon(name: "Black", imageName: "BlackIcon", isDefault: false), PresentationAppIcon(name: "Black", imageName: "BlackIcon", isDefault: false),
PresentationAppIcon(name: "BlueClassic", imageName: "BlueClassicIcon", isDefault: false),
PresentationAppIcon(name: "BlackClassic", imageName: "BlackClassicIcon", isDefault: false),
PresentationAppIcon(name: "BlueFilled", imageName: "BlueFilledIcon", isDefault: false), PresentationAppIcon(name: "BlueFilled", imageName: "BlueFilledIcon", isDefault: false),
PresentationAppIcon(name: "BlackFilled", imageName: "BlackFilledIcon", isDefault: false)] PresentationAppIcon(name: "BlackFilled", imageName: "BlackFilledIcon", isDefault: false)]
} else { } else {

BIN
Telegram-iOS/BlackClassicIcon@2x.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.0 KiB

BIN
Telegram-iOS/BlackClassicIcon@3x.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
Telegram-iOS/BlackFilledIcon@2x.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

BIN
Telegram-iOS/BlackFilledIcon@3x.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
Telegram-iOS/BlackIcon@2x.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

BIN
Telegram-iOS/BlackIcon@3x.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
Telegram-iOS/BlueClassicIcon@2x.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.4 KiB

BIN
Telegram-iOS/BlueClassicIcon@3x.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
Telegram-iOS/BlueFilledIcon@2x.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
Telegram-iOS/BlueFilledIcon@3x.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
Telegram-iOS/BlueIcon@2x.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
Telegram-iOS/BlueIcon@3x.png Normal file → Executable file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 14 KiB

36
Telegram-iOS/Info.plist
View File

@ -23,15 +23,6 @@
<key>UIPrerenderedIcon</key> <key>UIPrerenderedIcon</key>
<true/> <true/>
</dict> </dict>
<key>BlackFilled</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>BlackFilledIcon</string>
</array>
<key>UIPrerenderedIcon</key>
<true/>
</dict>
<key>Blue</key> <key>Blue</key>
<dict> <dict>
<key>CFBundleIconFiles</key> <key>CFBundleIconFiles</key>
@ -41,6 +32,33 @@
<key>UIPrerenderedIcon</key> <key>UIPrerenderedIcon</key>
<true/> <true/>
</dict> </dict>
<key>BlueClassic</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>BlueClassicIcon</string>
</array>
<key>UIPrerenderedIcon</key>
<true/>
</dict>
<key>BlackClassic</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>BlackClassicIcon</string>
</array>
<key>UIPrerenderedIcon</key>
<true/>
</dict>
<key>BlackFilled</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>BlackFilledIcon</string>
</array>
<key>UIPrerenderedIcon</key>
<true/>
</dict>
<key>BlueFilled</key> <key>BlueFilled</key>
<dict> <dict>
<key>CFBundleIconFiles</key> <key>CFBundleIconFiles</key>

6
Telegram-iOS/en.lproj/Localizable.strings
View File

@ -4337,12 +4337,14 @@ Any member of this group will be able to see messages in the channel.";
"Appearance.AppIcon" = "App Icon"; "Appearance.AppIcon" = "App Icon";
"Appearance.AppIconDefault" = "Default"; "Appearance.AppIconDefault" = "Default";
"Appearance.AppIconDefaultX" = "Default X"; "Appearance.AppIconDefaultX" = "Default X";
"Appearance.AppIconClassic" = "Classic";
"Appearance.AppIconClassicX" = "Classic X";
"Appearance.AppIconFilled" = "Filled"; "Appearance.AppIconFilled" = "Filled";
"Appearance.AppIconFilledX" = "Filled X"; "Appearance.AppIconFilledX" = "Filled X";
"Appearance.ThemeCarouselClassic" = "Classic"; "Appearance.ThemeCarouselClassic" = "Classic";
"Appearance.ThemeCarouselDay" = "Filled"; "Appearance.ThemeCarouselDay" = "Day";
"Appearance.ThemeCarouselNightBlue" = "Dark"; "Appearance.ThemeCarouselNightBlue" = "Night Blue";
"Appearance.ThemeCarouselNight" = "Monochrome"; "Appearance.ThemeCarouselNight" = "Monochrome";
"Notification.Exceptions.DeleteAll" = "Delete All"; "Notification.Exceptions.DeleteAll" = "Delete All";