diff --git a/Localization/StringsConvertor/input/Base.lproj/app.json b/Localization/StringsConvertor/input/Base.lproj/app.json index 963b4aed1..073108aad 100644 --- a/Localization/StringsConvertor/input/Base.lproj/app.json +++ b/Localization/StringsConvertor/input/Base.lproj/app.json @@ -251,8 +251,7 @@ } }, "server_picker": { - "title": "Mastodon is made of users in different servers.", - "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", + "title": "Pick server", "button": { "category": { "all": "All", diff --git a/Localization/app.json b/Localization/app.json index 998fe00cb..744435f3a 100644 --- a/Localization/app.json +++ b/Localization/app.json @@ -265,8 +265,7 @@ } }, "server_picker": { - "title": "Mastodon is made of users in different servers.", - "subtitle": "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.", + "title": "Pick Server", "button": { "category": { "all": "All", diff --git a/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift b/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift index 7f88cc2f9..728290832 100644 --- a/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift +++ b/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift @@ -204,6 +204,8 @@ extension MastodonPickServerViewController { .store(in: &disposeBag) onboardingNextView.nextButton.addTarget(self, action: #selector(MastodonPickServerViewController.nextButtonDidPressed(_:)), for: .touchUpInside) + + title = L10n.Scene.ServerPicker.title } override func viewWillAppear(_ animated: Bool) { diff --git a/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel+Diffable.swift b/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel+Diffable.swift index 5db98c218..4bc31d1d6 100644 --- a/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel+Diffable.swift +++ b/Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel+Diffable.swift @@ -38,7 +38,6 @@ extension MastodonPickServerViewModel { var snapshot = NSDiffableDataSourceSnapshot() snapshot.appendSections([.header, .servers]) - snapshot.appendItems([.header], toSection: .header) diffableDataSource?.apply(snapshot, animatingDifferences: false, completion: nil) loadIndexedServerStateMachine.enter(LoadIndexedServerState.Loading.self) @@ -61,7 +60,6 @@ extension MastodonPickServerViewModel { var snapshot = NSDiffableDataSourceSnapshot() snapshot.appendSections([.header, .servers]) - snapshot.appendItems([.header], toSection: .header) // TODO: handle filter var serverItems: [PickServerItem] = [] diff --git a/Mastodon/Scene/Onboarding/Register/MastodonRegisterView.swift b/Mastodon/Scene/Onboarding/Register/MastodonRegisterView.swift index e5ca2798a..632194d6b 100644 --- a/Mastodon/Scene/Onboarding/Register/MastodonRegisterView.swift +++ b/Mastodon/Scene/Onboarding/Register/MastodonRegisterView.swift @@ -21,15 +21,6 @@ struct MastodonRegisterView: View { ScrollView(.vertical) { let margin: CGFloat = 16 - // header - HStack { - Text(L10n.Scene.Register.title(viewModel.domain)) - .font(Font(MastodonPickServerViewController.largeTitleFont as CTFont)) - .foregroundColor(Color(Asset.Colors.Label.primary.color)) - Spacer() - } - .padding(.horizontal, margin) - // Avatar selector Menu { // Photo Library diff --git a/Mastodon/Scene/Onboarding/Share/OnboardingHeadlineTableViewCell.swift b/Mastodon/Scene/Onboarding/Share/OnboardingHeadlineTableViewCell.swift index 01070fbe9..ec9cd97e2 100644 --- a/Mastodon/Scene/Onboarding/Share/OnboardingHeadlineTableViewCell.swift +++ b/Mastodon/Scene/Onboarding/Share/OnboardingHeadlineTableViewCell.swift @@ -11,21 +11,10 @@ import MastodonLocalization final class OnboardingHeadlineTableViewCell: UITableViewCell { - let titleLabel: UILabel = { - let label = UILabel() - label.font = MastodonPickServerViewController.largeTitleFont - label.textColor = MastodonPickServerViewController.largeTitleTextColor - label.text = L10n.Scene.ServerPicker.title - label.adjustsFontForContentSizeCategory = true - label.numberOfLines = 0 - return label - }() - let subTitleLabel: UILabel = { let label = UILabel() label.font = MastodonPickServerViewController.subTitleFont - label.textColor = MastodonPickServerViewController.subTitleTextColor - label.text = L10n.Scene.ServerPicker.subtitle + label.textColor = Asset.Colors.Label.primary.color label.adjustsFontForContentSizeCategory = true label.numberOfLines = 0 return label @@ -57,10 +46,9 @@ extension OnboardingHeadlineTableViewCell { container.topAnchor.constraint(equalTo: contentView.topAnchor), container.leadingAnchor.constraint(equalTo: contentView.readableContentGuide.leadingAnchor), container.trailingAnchor.constraint(equalTo: contentView.readableContentGuide.trailingAnchor), - contentView.bottomAnchor.constraint(equalTo: container.bottomAnchor, constant: 11), + contentView.bottomAnchor.constraint(equalTo: container.bottomAnchor), ]) - container.addArrangedSubview(titleLabel) container.addArrangedSubview(subTitleLabel) } diff --git a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift index 8348ecb35..c0ad70bb6 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift +++ b/MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift @@ -1186,10 +1186,8 @@ public enum L10n { } } public enum ServerPicker { - /// Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers. - public static let subtitle = L10n.tr("Localizable", "Scene.ServerPicker.Subtitle", fallback: "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers.") - /// Mastodon is made of users in different servers. - public static let title = L10n.tr("Localizable", "Scene.ServerPicker.Title", fallback: "Mastodon is made of users in different servers.") + /// Pick server + public static let title = L10n.tr("Localizable", "Scene.ServerPicker.Title", fallback: "Pick server") public enum Button { /// See Less public static let seeLess = L10n.tr("Localizable", "Scene.ServerPicker.Button.SeeLess", fallback: "See Less") diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings index 4ca8319d1..8791aeee4 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings @@ -435,8 +435,7 @@ uploaded to Mastodon."; "Scene.ServerPicker.Label.Category" = "CATEGORY"; "Scene.ServerPicker.Label.Language" = "LANGUAGE"; "Scene.ServerPicker.Label.Users" = "USERS"; -"Scene.ServerPicker.Subtitle" = "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers."; -"Scene.ServerPicker.Title" = "Mastodon is made of users in different servers."; +"Scene.ServerPicker.Title" = "Pick server"; "Scene.ServerRules.Button.Confirm" = "I Agree"; "Scene.ServerRules.PrivacyPolicy" = "privacy policy"; "Scene.ServerRules.Prompt" = "By continuing, you’re subject to the terms of service and privacy policy for %@."; diff --git a/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings b/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings index 3ba305a4b..5a07ceaea 100644 --- a/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings +++ b/MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings @@ -426,8 +426,7 @@ uploaded to Mastodon."; "Scene.ServerPicker.Label.Category" = "CATEGORY"; "Scene.ServerPicker.Label.Language" = "LANGUAGE"; "Scene.ServerPicker.Label.Users" = "USERS"; -"Scene.ServerPicker.Subtitle" = "Pick a server based on your region, interests, or a general purpose one. You can still chat with anyone on Mastodon, regardless of your servers."; -"Scene.ServerPicker.Title" = "Mastodon is made of users in different servers."; +"Scene.ServerPicker.Title" = "Pick server"; "Scene.ServerRules.Button.Confirm" = "I Agree"; "Scene.ServerRules.PrivacyPolicy" = "privacy policy"; "Scene.ServerRules.Prompt" = "By continuing, you’re subject to the terms of service and privacy policy for %@.";