diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueIcon@2x-1.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueIcon@2x-1.png deleted file mode 100644 index dd360d8f50..0000000000 Binary files a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueIcon@2x-1.png and /dev/null differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueIcon@2x.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueIcon@2x.png deleted file mode 100644 index 7879f15b47..0000000000 Binary files a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueIcon@2x.png and /dev/null differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueIcon@3x.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueIcon@3x.png deleted file mode 100644 index a367fff3af..0000000000 Binary files a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueIcon@3x.png and /dev/null differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueIconIpad.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueIconIpad.png deleted file mode 100644 index 5eaf0bab23..0000000000 Binary files a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueIconIpad.png and /dev/null differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueIconIpad@2x.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueIconIpad@2x.png deleted file mode 100644 index 6d9e7ab98c..0000000000 Binary files a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueIconIpad@2x.png and /dev/null differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueIconLargeIpad@2x.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueIconLargeIpad@2x.png deleted file mode 100644 index 9bf363744d..0000000000 Binary files a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueIconLargeIpad@2x.png and /dev/null differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueNotificationIcon.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueNotificationIcon.png deleted file mode 100644 index dc5916282e..0000000000 Binary files a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueNotificationIcon.png and /dev/null differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueNotificationIcon@2x-1.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueNotificationIcon@2x-1.png deleted file mode 100644 index 0898af42d9..0000000000 Binary files a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueNotificationIcon@2x-1.png and /dev/null differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueNotificationIcon@2x.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueNotificationIcon@2x.png deleted file mode 100644 index 0898af42d9..0000000000 Binary files a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueNotificationIcon@2x.png and /dev/null differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueNotificationIcon@3x.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueNotificationIcon@3x.png deleted file mode 100644 index f7725e9914..0000000000 Binary files a/Wallet/Icons.xcassets/AppIconWallet.appiconset/BlueNotificationIcon@3x.png and /dev/null differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/Contents.json b/Wallet/Icons.xcassets/AppIconWallet.appiconset/Contents.json index 00dd28927f..715b2042d5 100644 --- a/Wallet/Icons.xcassets/AppIconWallet.appiconset/Contents.json +++ b/Wallet/Icons.xcassets/AppIconWallet.appiconset/Contents.json @@ -3,109 +3,109 @@ { "size" : "20x20", "idiom" : "iphone", - "filename" : "BlueNotificationIcon@2x.png", + "filename" : "GramIcon@40x40.png", "scale" : "2x" }, { "size" : "20x20", "idiom" : "iphone", - "filename" : "BlueNotificationIcon@3x.png", + "filename" : "GramIcon@60x60.png", "scale" : "3x" }, { "size" : "29x29", "idiom" : "iphone", - "filename" : "Simple@58x58.png", + "filename" : "GramIcon@58x58.png", "scale" : "2x" }, { "size" : "29x29", "idiom" : "iphone", - "filename" : "Simple@87x87.png", + "filename" : "GramIcon@87x87.png", "scale" : "3x" }, { "size" : "40x40", "idiom" : "iphone", - "filename" : "Simple@80x80.png", + "filename" : "GramIcon@80x80.png", "scale" : "2x" }, { "size" : "40x40", "idiom" : "iphone", - "filename" : "BlueIcon@2x-1.png", + "filename" : "GramIcon@120x120.png", "scale" : "3x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "BlueIcon@2x.png", + "filename" : "GramIcon@120x120-1.png", "scale" : "2x" }, { "size" : "60x60", "idiom" : "iphone", - "filename" : "BlueIcon@3x.png", + "filename" : "GramIcon@180x180.png", "scale" : "3x" }, { "size" : "20x20", "idiom" : "ipad", - "filename" : "BlueNotificationIcon.png", + "filename" : "GramIcon@20x20.png", "scale" : "1x" }, { "size" : "20x20", "idiom" : "ipad", - "filename" : "BlueNotificationIcon@2x-1.png", + "filename" : "GramIcon@40x40-1.png", "scale" : "2x" }, { "size" : "29x29", "idiom" : "ipad", - "filename" : "Simple@29x29.png", + "filename" : "GramIcon@29x29.png", "scale" : "1x" }, { "size" : "29x29", "idiom" : "ipad", - "filename" : "Simple@58x58-1.png", + "filename" : "GramIcon@58x58-1.png", "scale" : "2x" }, { "size" : "40x40", "idiom" : "ipad", - "filename" : "Simple@40x40-1.png", + "filename" : "GramIcon@40x40-2.png", "scale" : "1x" }, { "size" : "40x40", "idiom" : "ipad", - "filename" : "Simple@80x80-1.png", + "filename" : "GramIcon@80x80-1.png", "scale" : "2x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "BlueIconIpad.png", + "filename" : "GramIcon@76x76.png", "scale" : "1x" }, { "size" : "76x76", "idiom" : "ipad", - "filename" : "BlueIconIpad@2x.png", + "filename" : "GramIcon@152x152.png", "scale" : "2x" }, { "size" : "83.5x83.5", "idiom" : "ipad", - "filename" : "BlueIconLargeIpad@2x.png", + "filename" : "GramIcon@167x167.png", "scale" : "2x" }, { "size" : "1024x1024", "idiom" : "ios-marketing", - "filename" : "Simple-iTunesArtwork.png", + "filename" : "GramIcon-iTunesArtwork.png", "scale" : "1x" } ], diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon-iTunesArtwork.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon-iTunesArtwork.png new file mode 100644 index 0000000000..63c9ad546c Binary files /dev/null and b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon-iTunesArtwork.png differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@120x120-1.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@120x120-1.png new file mode 100644 index 0000000000..5c5cd95f0e Binary files /dev/null and b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@120x120-1.png differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@120x120.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@120x120.png new file mode 100644 index 0000000000..5c5cd95f0e Binary files /dev/null and b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@120x120.png differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@152x152.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@152x152.png new file mode 100644 index 0000000000..8a355791d4 Binary files /dev/null and b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@152x152.png differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@167x167.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@167x167.png new file mode 100644 index 0000000000..98c9aefcc1 Binary files /dev/null and b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@167x167.png differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@180x180.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@180x180.png new file mode 100644 index 0000000000..3fc11b92cc Binary files /dev/null and b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@180x180.png differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@20x20.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@20x20.png new file mode 100644 index 0000000000..5641c1bc40 Binary files /dev/null and b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@20x20.png differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@29x29.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@29x29.png new file mode 100644 index 0000000000..57b51702ee Binary files /dev/null and b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@29x29.png differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@40x40-1.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@40x40-1.png new file mode 100644 index 0000000000..dcf8f0a19c Binary files /dev/null and b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@40x40-1.png differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@40x40-2.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@40x40-2.png new file mode 100644 index 0000000000..dcf8f0a19c Binary files /dev/null and b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@40x40-2.png differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@40x40.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@40x40.png new file mode 100644 index 0000000000..dcf8f0a19c Binary files /dev/null and b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@40x40.png differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@58x58-1.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@58x58-1.png new file mode 100644 index 0000000000..61dd01a9d2 Binary files /dev/null and b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@58x58-1.png differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@58x58.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@58x58.png new file mode 100644 index 0000000000..61dd01a9d2 Binary files /dev/null and b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@58x58.png differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@60x60.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@60x60.png new file mode 100644 index 0000000000..abed03bbea Binary files /dev/null and b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@60x60.png differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@76x76.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@76x76.png new file mode 100644 index 0000000000..c71a505b2a Binary files /dev/null and b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@76x76.png differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@80x80-1.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@80x80-1.png new file mode 100644 index 0000000000..ea591cd596 Binary files /dev/null and b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@80x80-1.png differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@80x80.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@80x80.png new file mode 100644 index 0000000000..ea591cd596 Binary files /dev/null and b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@80x80.png differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@87x87.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@87x87.png new file mode 100644 index 0000000000..d3c9536133 Binary files /dev/null and b/Wallet/Icons.xcassets/AppIconWallet.appiconset/GramIcon@87x87.png differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple-iTunesArtwork.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple-iTunesArtwork.png deleted file mode 100644 index f00a2857f0..0000000000 Binary files a/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple-iTunesArtwork.png and /dev/null differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@29x29.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@29x29.png deleted file mode 100644 index 90d7b67bc0..0000000000 Binary files a/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@29x29.png and /dev/null differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@40x40-1.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@40x40-1.png deleted file mode 100644 index a79cb5dcdc..0000000000 Binary files a/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@40x40-1.png and /dev/null differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@58x58-1.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@58x58-1.png deleted file mode 100644 index aa6a4a442e..0000000000 Binary files a/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@58x58-1.png and /dev/null differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@58x58.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@58x58.png deleted file mode 100644 index aa6a4a442e..0000000000 Binary files a/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@58x58.png and /dev/null differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@80x80-1.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@80x80-1.png deleted file mode 100644 index 385bc474b2..0000000000 Binary files a/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@80x80-1.png and /dev/null differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@80x80.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@80x80.png deleted file mode 100644 index 385bc474b2..0000000000 Binary files a/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@80x80.png and /dev/null differ diff --git a/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@87x87.png b/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@87x87.png deleted file mode 100644 index c0a9ce9319..0000000000 Binary files a/Wallet/Icons.xcassets/AppIconWallet.appiconset/Simple@87x87.png and /dev/null differ diff --git a/extract_wallet_source.py b/extract_wallet_source.py index 7af4b94a34..2c17d1f782 100644 --- a/extract_wallet_source.py +++ b/extract_wallet_source.py @@ -56,6 +56,7 @@ shutil.copytree('Config', destination + '/' + 'Config') copy_files = [ '.buckconfig', + '.gitignore', 'Utils.makefile', 'Wallet.makefile', 'check_env.sh', diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesSettings.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesSettings.swift index 2471a8b8cd..59f6b50ddb 100644 --- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesSettings.swift +++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesSettings.swift @@ -16,7 +16,7 @@ public struct PresentationResourcesSettings { public static let appearance = UIImage(bundleImageName: "Settings/MenuIcons/Appearance")?.precomposed() public static let language = UIImage(bundleImageName: "Settings/MenuIcons/Language")?.precomposed() - public static let wallet = UIImage(bundleImageName: "Settings/MenuIcons/Wallet")?.precomposed() + public static let wallet = generateTintedImage(image: UIImage(bundleImageName: "Settings/MenuIcons/Wallet"), color: UIColor(rgb: 0x1b1b1c)) public static let passport = UIImage(bundleImageName: "Settings/MenuIcons/Passport")?.precomposed() public static let watch = UIImage(bundleImageName: "Settings/MenuIcons/Watch")?.precomposed() diff --git a/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/Contents.json index ae5e1ab008..aead815160 100644 --- a/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/Contents.json +++ b/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/Contents.json @@ -2,17 +2,7 @@ "images" : [ { "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "ic_ton@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "ic_ton@3x.png", - "scale" : "3x" + "filename" : "gramicon.pdf" } ], "info" : { diff --git a/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/gramicon.pdf b/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/gramicon.pdf new file mode 100644 index 0000000000..f9df7f6f1d Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/gramicon.pdf differ diff --git a/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/ic_ton@2x.png b/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/ic_ton@2x.png deleted file mode 100644 index df06a12920..0000000000 Binary files a/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/ic_ton@2x.png and /dev/null differ diff --git a/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/ic_ton@3x.png b/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/ic_ton@3x.png deleted file mode 100644 index c993fd5431..0000000000 Binary files a/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/ic_ton@3x.png and /dev/null differ