diff --git a/apps/ios/Shared/Views/Onboarding/MakeConnection.swift b/apps/ios/Shared/Views/Onboarding/MakeConnection.swift index 2d0b7b88e4..4b077a1729 100644 --- a/apps/ios/Shared/Views/Onboarding/MakeConnection.swift +++ b/apps/ios/Shared/Views/Onboarding/MakeConnection.swift @@ -114,24 +114,23 @@ struct MakeConnection: View { } private func actionRow(icon: String, title: LocalizedStringKey, text: LocalizedStringKey, action: @escaping () -> Void) -> some View { - HStack(alignment: .top, spacing: 20) { - Button(action: action, label: { + Button(action: action, label: { + HStack(alignment: .top, spacing: 20) { Image(systemName: icon) .resizable() .scaledToFit() .frame(width: 30, height: 30) - .padding(.leading, 6) + .padding(.leading, 4) .padding(.top, 6) - }) - VStack(alignment: .leading) { - Button(action: action, label: { - Text(title) - .font(.headline) - .multilineTextAlignment(.leading) - }) - Text(text) + VStack(alignment: .leading) { + Group { + Text(title).font(.headline) + Text(text).foregroundColor(.primary) + } + .multilineTextAlignment(.leading) + } } - } + }) .padding(.bottom) } } diff --git a/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift b/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift index 2468b7290a..e234e48cce 100644 --- a/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift +++ b/apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift @@ -20,17 +20,22 @@ struct SimpleXInfo: View { .resizable() .aspectRatio(contentMode: .fit) .frame(width: g.size.width * 0.7) - .padding(.bottom) - Text("The next generation of private messaging") - .font(.title) - .padding(.bottom) + .padding(.bottom, 8) - infoRow("🎭", "Privacy redefined", - "The 1st platform without any user identifiers – private by design.") - infoRow("📭", "Immune to spam and abuse", - "People can connect to you only via the links you share.") - infoRow("🤝", "Decentralized", - "Open-source protocol and code – anybody can run the servers.") + ScrollView { + VStack(alignment: .leading) { + Text("The next generation of private messaging") + .font(.title) + .padding(.bottom) + infoRow("🎭", "Privacy redefined", + "The 1st platform without any user identifiers – private by design.") + infoRow("📭", "Immune to spam and abuse", + "People can connect to you only via the links you share.") + infoRow("🤝", "Decentralized", + "Open-source protocol and code – anybody can run the servers.") + } + } + .padding(.bottom) Spacer() @@ -65,7 +70,7 @@ struct SimpleXInfo: View { Text(text) } } - .padding(.bottom) + .padding(.bottom, 8) } } @@ -92,6 +97,7 @@ struct OnboardingActionButton: View { } } .frame(maxWidth: .infinity) + .padding(.bottom) } }