diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/100.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/100.png index 609de85839..a5a8d33180 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/100.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/100.png differ diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/1024.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/1024.png index 5a99f29882..9a44d45b1f 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/1024.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/114.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/114.png index af6ba9ba8a..c63d7db7bf 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/114.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/114.png differ diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/120.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/120.png index 89ab6d2b51..19d252ece4 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/120.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/120.png differ diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/144.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/144.png index 634ad44f6d..2a404235c1 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/144.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/144.png differ diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/152.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/152.png index eee0c00595..abace2cf20 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/152.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/152.png differ diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/167.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/167.png index 2a588530f6..de0800763b 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/167.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/167.png differ diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/180.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/180.png index 631dd3a142..2986fb4596 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/180.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/180.png differ diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/20.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/20.png index 81916a23d5..c3ffaf0cff 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/20.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/20.png differ diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/29.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/29.png index 2fd2eb9930..97841ae590 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/29.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/29.png differ diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/40.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/40.png index 73a354241b..b869a30c72 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/40.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/40.png differ diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/50.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/50.png index e8a760edac..b07defaf7e 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/50.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/50.png differ diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/57.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/57.png index 1baa58018d..8c846b78c3 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/57.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/57.png differ diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/58.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/58.png index 1993b49d31..36d77c55f5 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/58.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/58.png differ diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/60.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/60.png index 278af34d4b..7f222ada5b 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/60.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/60.png differ diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/72.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/72.png index 883846a613..ef0ad478c7 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/72.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/72.png differ diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/76.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/76.png index 58cc0ae026..8445be22ba 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/76.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/76.png differ diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/80.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/80.png index ea23962c1a..192847dd32 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/80.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/80.png differ diff --git a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/87.png b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/87.png index 1a103f2a59..b6971e1c42 100644 Binary files a/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/87.png and b/apps/ios/Shared/Assets.xcassets/AppIcon.appiconset/87.png differ diff --git a/apps/ios/Shared/Assets.xcassets/decentralized.imageset/Contents.json b/apps/ios/Shared/Assets.xcassets/decentralized.imageset/Contents.json new file mode 100644 index 0000000000..dffaae608e --- /dev/null +++ b/apps/ios/Shared/Assets.xcassets/decentralized.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "decentralized.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "decentralized@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "decentralized@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/apps/ios/Shared/Assets.xcassets/decentralized.imageset/decentralized.png b/apps/ios/Shared/Assets.xcassets/decentralized.imageset/decentralized.png new file mode 100644 index 0000000000..7af91b5df0 Binary files /dev/null and b/apps/ios/Shared/Assets.xcassets/decentralized.imageset/decentralized.png differ diff --git a/apps/ios/Shared/Assets.xcassets/decentralized.imageset/decentralized@2x.png b/apps/ios/Shared/Assets.xcassets/decentralized.imageset/decentralized@2x.png new file mode 100644 index 0000000000..77eae51378 Binary files /dev/null and b/apps/ios/Shared/Assets.xcassets/decentralized.imageset/decentralized@2x.png differ diff --git a/apps/ios/Shared/Assets.xcassets/decentralized.imageset/decentralized@3x.png b/apps/ios/Shared/Assets.xcassets/decentralized.imageset/decentralized@3x.png new file mode 100644 index 0000000000..3041910318 Binary files /dev/null and b/apps/ios/Shared/Assets.xcassets/decentralized.imageset/decentralized@3x.png differ diff --git a/apps/ios/Shared/Assets.xcassets/icon-light.imageset/120.png b/apps/ios/Shared/Assets.xcassets/icon-light.imageset/120.png deleted file mode 100644 index 89ab6d2b51..0000000000 Binary files a/apps/ios/Shared/Assets.xcassets/icon-light.imageset/120.png and /dev/null differ diff --git a/apps/ios/Shared/Assets.xcassets/icon-light.imageset/180.png b/apps/ios/Shared/Assets.xcassets/icon-light.imageset/180.png deleted file mode 100644 index 631dd3a142..0000000000 Binary files a/apps/ios/Shared/Assets.xcassets/icon-light.imageset/180.png and /dev/null differ diff --git a/apps/ios/Shared/Assets.xcassets/icon-light.imageset/60.png b/apps/ios/Shared/Assets.xcassets/icon-light.imageset/60.png deleted file mode 100644 index 278af34d4b..0000000000 Binary files a/apps/ios/Shared/Assets.xcassets/icon-light.imageset/60.png and /dev/null differ diff --git a/apps/ios/Shared/Assets.xcassets/icon-light.imageset/Contents.json b/apps/ios/Shared/Assets.xcassets/icon-light.imageset/Contents.json index becba3f657..6b60b13fe1 100644 --- a/apps/ios/Shared/Assets.xcassets/icon-light.imageset/Contents.json +++ b/apps/ios/Shared/Assets.xcassets/icon-light.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "60.png", + "filename" : "icon-light.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "120.png", + "filename" : "icon-light@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "180.png", + "filename" : "icon-light@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/apps/ios/Shared/Assets.xcassets/icon-light.imageset/icon-light.png b/apps/ios/Shared/Assets.xcassets/icon-light.imageset/icon-light.png new file mode 100644 index 0000000000..535514b25d Binary files /dev/null and b/apps/ios/Shared/Assets.xcassets/icon-light.imageset/icon-light.png differ diff --git a/apps/ios/Shared/Assets.xcassets/icon-light.imageset/icon-light@2x.png b/apps/ios/Shared/Assets.xcassets/icon-light.imageset/icon-light@2x.png new file mode 100644 index 0000000000..01c7308d14 Binary files /dev/null and b/apps/ios/Shared/Assets.xcassets/icon-light.imageset/icon-light@2x.png differ diff --git a/apps/ios/Shared/Assets.xcassets/icon-light.imageset/icon-light@3x.png b/apps/ios/Shared/Assets.xcassets/icon-light.imageset/icon-light@3x.png new file mode 100644 index 0000000000..c372e25b76 Binary files /dev/null and b/apps/ios/Shared/Assets.xcassets/icon-light.imageset/icon-light@3x.png differ diff --git a/apps/ios/Shared/Assets.xcassets/logo.imageset/logo.png b/apps/ios/Shared/Assets.xcassets/logo.imageset/logo.png index 01a678f633..bbc8118b6c 100644 Binary files a/apps/ios/Shared/Assets.xcassets/logo.imageset/logo.png and b/apps/ios/Shared/Assets.xcassets/logo.imageset/logo.png differ diff --git a/apps/ios/Shared/Assets.xcassets/logo.imageset/logo@2x.png b/apps/ios/Shared/Assets.xcassets/logo.imageset/logo@2x.png index 44efc1e93e..6cea4d4b54 100644 Binary files a/apps/ios/Shared/Assets.xcassets/logo.imageset/logo@2x.png and b/apps/ios/Shared/Assets.xcassets/logo.imageset/logo@2x.png differ diff --git a/apps/ios/Shared/Assets.xcassets/logo.imageset/logo@3x.png b/apps/ios/Shared/Assets.xcassets/logo.imageset/logo@3x.png index 45ab085f57..6edecb0dd9 100644 Binary files a/apps/ios/Shared/Assets.xcassets/logo.imageset/logo@3x.png and b/apps/ios/Shared/Assets.xcassets/logo.imageset/logo@3x.png differ diff --git a/apps/ios/Shared/Assets.xcassets/privacy.imageset/Contents.json b/apps/ios/Shared/Assets.xcassets/privacy.imageset/Contents.json new file mode 100644 index 0000000000..94a4c74796 --- /dev/null +++ b/apps/ios/Shared/Assets.xcassets/privacy.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "privacy.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "privacy@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "privacy@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/apps/ios/Shared/Assets.xcassets/privacy.imageset/privacy.png b/apps/ios/Shared/Assets.xcassets/privacy.imageset/privacy.png new file mode 100644 index 0000000000..da3609cbc9 Binary files /dev/null and b/apps/ios/Shared/Assets.xcassets/privacy.imageset/privacy.png differ diff --git a/apps/ios/Shared/Assets.xcassets/privacy.imageset/privacy@2x.png b/apps/ios/Shared/Assets.xcassets/privacy.imageset/privacy@2x.png new file mode 100644 index 0000000000..d390f8c43a Binary files /dev/null and b/apps/ios/Shared/Assets.xcassets/privacy.imageset/privacy@2x.png differ diff --git a/apps/ios/Shared/Assets.xcassets/privacy.imageset/privacy@3x.png b/apps/ios/Shared/Assets.xcassets/privacy.imageset/privacy@3x.png new file mode 100644 index 0000000000..87d4d4693f Binary files /dev/null and b/apps/ios/Shared/Assets.xcassets/privacy.imageset/privacy@3x.png differ diff --git a/apps/ios/Shared/Assets.xcassets/shield.imageset/Contents.json b/apps/ios/Shared/Assets.xcassets/shield.imageset/Contents.json new file mode 100644 index 0000000000..a7e1274837 --- /dev/null +++ b/apps/ios/Shared/Assets.xcassets/shield.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "shield.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "shield@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "shield@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/apps/ios/Shared/Assets.xcassets/shield.imageset/shield.png b/apps/ios/Shared/Assets.xcassets/shield.imageset/shield.png new file mode 100644 index 0000000000..65684f7c7d Binary files /dev/null and b/apps/ios/Shared/Assets.xcassets/shield.imageset/shield.png differ diff --git a/apps/ios/Shared/Assets.xcassets/shield.imageset/shield@2x.png b/apps/ios/Shared/Assets.xcassets/shield.imageset/shield@2x.png new file mode 100644 index 0000000000..dd2ffcb5e2 Binary files /dev/null and b/apps/ios/Shared/Assets.xcassets/shield.imageset/shield@2x.png differ diff --git a/apps/ios/Shared/Assets.xcassets/shield.imageset/shield@3x.png b/apps/ios/Shared/Assets.xcassets/shield.imageset/shield@3x.png new file mode 100644 index 0000000000..82ebfee462 Binary files /dev/null and b/apps/ios/Shared/Assets.xcassets/shield.imageset/shield@3x.png differ diff --git a/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift b/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift index afd0054583..cdd5f0ce94 100644 --- a/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift +++ b/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift @@ -22,16 +22,19 @@ struct SimpleXInfo: View { .aspectRatio(contentMode: .fit) .frame(width: g.size.width * 0.7) .padding(.bottom, 8) + .frame(maxWidth: .infinity) VStack(alignment: .leading) { Text("The next generation of private messaging") .font(.title) - .padding(.bottom) - infoRow("🎭", "Privacy redefined", + .padding(.bottom, 24) + .frame(maxWidth: .infinity) + .multilineTextAlignment(.center) + infoRow("privacy", "Privacy redefined", "The 1st platform without any user identifiers – private by design.") - infoRow("📭", "Immune to spam and abuse", + infoRow("shield", "Immune to spam and abuse", "People can connect to you only via the links you share.") - infoRow("🤝", "Decentralized", + infoRow("decentralized", "Decentralized", "Open-source protocol and code – anybody can run the servers.") } @@ -57,11 +60,14 @@ struct SimpleXInfo: View { .padding() } - private func infoRow(_ emoji: String, _ title: LocalizedStringKey, _ text: LocalizedStringKey) -> some View { + private func infoRow(_ image: String, _ title: LocalizedStringKey, _ text: LocalizedStringKey) -> some View { HStack(alignment: .top) { - Text(emoji) - .font(mediumEmojiFont) - .frame(width: 40) + Image(image) + .resizable() + .scaledToFit() + .frame(width: 36, height: 40) + .padding(.top, 4) + .padding(.trailing, 6) VStack(alignment: .leading) { Text(title).font(.headline) Text(text)