Skip to content

Commit

Permalink
Review remarks
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanhofman committed Mar 31, 2021
1 parent 67c2fe2 commit 910cb4c
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
8 changes: 5 additions & 3 deletions Nio/Generated/Strings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,10 @@ internal enum L10n {
internal static let data = L10n.tr("Localizable", "settings-identity-server.data")
/// Data & Privacy
internal static let dataPrivacy = L10n.tr("Localizable", "settings-identity-server.data-privacy")
/// By using the identity server, your email address and phone number will be sent to the identity server and will be linked to your Matrix ID (@example.nio.chat).
internal static let dataText = L10n.tr("Localizable", "settings-identity-server.data-text")
/// By using the identity server, your email address and phone number will be sent to the identity server and will be linked to your Matrix ID (%@).
internal static func dataText(_ p1: Any) -> String {
return L10n.tr("Localizable", "settings-identity-server.data-text", String(describing: p1))
}
/// Learn More
internal static let learnMore = L10n.tr("Localizable", "settings-identity-server.learn-more")
/// Match
Expand All @@ -322,7 +324,7 @@ internal enum L10n {
internal static let matchText = L10n.tr("Localizable", "settings-identity-server.match-text")
/// (Optional) Contact Sync
internal static let optionalContactSync = L10n.tr("Localizable", "settings-identity-server.optional-contact-sync")
/// When activating contact syncronization, Nio will periodically send the email addresses and phone numbers of all your contacts to the identity server to see if that contact has a linked Matrix ID. This contact information is never stored or shared by Nio.
/// When activating contact syncronization, Nio will periodically send the email addresses and phone numbers of all your contacts to the identity server to see if that contact has a linked Matrix ID. This contact information is never stored or shared with other parties by Nio.
internal static let optionalContactSyncText = L10n.tr("Localizable", "settings-identity-server.optional-contact-sync-text")
/// Please go to Settings and turn on the permissions.
internal static let permissionAlertBody = L10n.tr("Localizable", "settings-identity-server.permission-alert-body")
Expand Down
4 changes: 2 additions & 2 deletions Nio/NewConversation/NewConversationView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ struct NewConversationView: View {
let store: AccountStore?

@State private var users = [""]
@State private var usersVerified: [UserStatus] = [UserStatus.unkown]
@State private var usersVerified: [UserStatus] = [UserStatus.unknown]
@State private var numCalls: Int = 0

@State private var isRetrieving = false
Expand Down Expand Up @@ -233,7 +233,7 @@ struct NewConversationView: View {

private func addUser() {
withAnimation {
usersVerified.append(UserStatus.unkown)
usersVerified.append(UserStatus.unknown)
users.append("")
}
}
Expand Down
6 changes: 5 additions & 1 deletion Nio/Settings/IdentityServerSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -61,22 +61,26 @@ struct InformationDetailView: View {
.font(.headline)
.foregroundColor(.primary)
.accessibility(addTraits: .isHeader)
.textCase(.none)

Text(subTitle)
.foregroundColor(.secondary)
.fixedSize(horizontal: false, vertical: true)
.textCase(.none)
}
}
.padding(.top)
}
}

struct InformationContainerView: View {
@EnvironmentObject private var store: AccountStore

var body: some View {
VStack(alignment: .leading) {
InformationDetailView(
title: L10n.SettingsIdentityServer.data,
subTitle: L10n.SettingsIdentityServer.dataText,
subTitle: L10n.SettingsIdentityServer.dataText(store.session?.myUserId ?? "@username:server.org"),
imageName: "arrow.up.doc"
)

Expand Down
4 changes: 2 additions & 2 deletions Nio/Supporting Files/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@
"settings-identity-server.learn-more" = "Learn More";
"settings-identity-server.data-privacy" = "Data & Privacy";
"settings-identity-server.data" = "Data";
"settings-identity-server.data-text" = "By using the identity server, your email address and phone number will be sent to the identity server and will be linked to your Matrix ID (@example.nio.chat).";
"settings-identity-server.data-text" = "By using the identity server, your email address and phone number will be sent to the identity server and will be linked to your Matrix ID (%@).";
"settings-identity-server.match" = "Match";
"settings-identity-server.match-text" = "Any user can retrieve your Matrix ID by entering your email address or phone number, but cannot find your email address or phone number by entering your Matrix ID.";
"settings-identity-server.closed-federation" = "Closed Federation";
"settings-identity-server.closed-federation-text" = "At the moment, the identity servers are in a closed federation configuration. This means that there are only two identity servers (matrix.org, vector.im) and all data uploaded to one is copied to the other.";
"settings-identity-server.optional-contact-sync" = "(Optional) Contact Sync";
"settings-identity-server.optional-contact-sync-text" = "When activating contact syncronization, Nio will periodically send the email addresses and phone numbers of all your contacts to the identity server to see if that contact has a linked Matrix ID. This contact information is never stored or shared by Nio.";
"settings-identity-server.optional-contact-sync-text" = "When activating contact syncronization, Nio will periodically send the email addresses and phone numbers of all your contacts to the identity server to see if that contact has a linked Matrix ID. This contact information is never stored or shared with other parties by Nio.";
"new-conversation.title-chat" = "New Chat";
"new-conversation.title-room" = "New Room";
"new-conversation.username-placeholder" = "Matrix ID";
Expand Down

0 comments on commit 910cb4c

Please sign in to comment.