diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings index eb4823446..02048f8ae 100644 --- a/Riot/Assets/en.lproj/Vector.strings +++ b/Riot/Assets/en.lproj/Vector.strings @@ -2448,7 +2448,7 @@ To enable access, tap Settings> Location and select Always"; "user_other_session_verified_additional_info" = "This session is ready for secure messaging."; "user_session_push_notifications" = "Push notifications"; "user_session_push_notifications_message" = "When turned on, this session will receive push notifications."; -"user_session_got_it" = "GOT IT"; +"user_session_got_it" = "Got it"; "user_session_verified_session_title" = "Verified sessions"; "user_session_verified_session_description" = "Verified sessions are anywhere you are using Element after entering your passphrase or confirming your identity with another verified session.\n\nThis means that you have all the keys needed to unlock your encrypted messages and confirm to other users that you trust this session."; "user_session_unverified_session_title" = "Unverified session"; diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift index 261b233dc..55dd3d21b 100644 --- a/Riot/Generated/Strings.swift +++ b/Riot/Generated/Strings.swift @@ -8787,7 +8787,7 @@ public class VectorL10n: NSObject { public static var userSessionDetailsTitle: String { return VectorL10n.tr("Vector", "user_session_details_title") } - /// GOT IT + /// Got it public static var userSessionGotIt: String { return VectorL10n.tr("Vector", "user_session_got_it") } diff --git a/RiotSwiftUI/Modules/Common/InfoSheet/Coordinator/InfoSheetCoordinator.swift b/RiotSwiftUI/Modules/Common/InfoSheet/Coordinator/InfoSheetCoordinator.swift index 4edfec7f2..6e5ade644 100644 --- a/RiotSwiftUI/Modules/Common/InfoSheet/Coordinator/InfoSheetCoordinator.swift +++ b/RiotSwiftUI/Modules/Common/InfoSheet/Coordinator/InfoSheetCoordinator.swift @@ -39,7 +39,7 @@ final class InfoSheetCoordinator: Coordinator, Presentable { let view = InfoSheet(viewModel: viewModel.context) infoSheetViewModel = viewModel let controller = VectorHostingController(rootView: view) - controller.bottomSheetPreferences = .init() + controller.bottomSheetPreferences = .init(cornerRadius: 24) infoSheetHostingController = controller } diff --git a/RiotSwiftUI/Modules/Common/InfoSheet/View/InfoSheet.swift b/RiotSwiftUI/Modules/Common/InfoSheet/View/InfoSheet.swift index 085f8d56d..e8e284d4f 100644 --- a/RiotSwiftUI/Modules/Common/InfoSheet/View/InfoSheet.swift +++ b/RiotSwiftUI/Modules/Common/InfoSheet/View/InfoSheet.swift @@ -30,18 +30,26 @@ struct InfoSheet: View { } var body: some View { - VStack(alignment: .leading, spacing: 24) { - VStack(alignment: .leading, spacing: 16) { + let padding: CGFloat = 16 + VStack(spacing: 24) { + VStack(spacing: 18) { Text(viewModel.viewState.title) .font(theme.fonts.headline) .foregroundColor(theme.colors.primaryContent) .accessibilityIdentifier(viewModel.viewState.title) + .padding([.leading, .trailing], padding) + + Rectangle() + .foregroundColor(theme.colors.system) + .frame(height: 1) Text(viewModel.viewState.description) - .font(theme.fonts.footnote) + .font(theme.fonts.body) .foregroundColor(theme.colors.primaryContent) .accessibilityIdentifier(viewModel.viewState.description) + .padding([.leading, .trailing], padding) } + .layoutPriority(1) Button { viewModel.viewState.action.action() @@ -51,17 +59,19 @@ struct InfoSheet: View { Text(viewModel.viewState.action.text) .font(theme.fonts.bodySB) .foregroundColor(theme.colors.background) - .frame(height: 48) + .frame(height: 46) .frame(maxWidth: .infinity) .accessibilityIdentifier(viewModel.viewState.action.text) } .background(theme.colors.accent) .cornerRadius(8) + .padding([.leading, .trailing], padding) + .frame(maxHeight: .infinity, alignment: .bottom) } - .padding(24) + .padding(.bottom, padding) + .padding(.top, 32) .frame(maxWidth: .infinity, maxHeight: .infinity) - .background(theme.colors.background) - .ignoresSafeArea(edges: .bottom) + .background(theme.colors.background.ignoresSafeArea(edges: .bottom)) } }