zelo72/mastodon-ios
2
2
Fork 1
mirror of https://github.com/mastodon/mastodon-ios synced 2025-04-11 22:58:02 +02:00
Code Issues 20 Releases Wiki Activity

Get rid of title (#690)

Browse Source
This commit is contained in:
Nathan Mattes 2022-12-13 23:37:30 +01:00
parent d3ebd51d44
commit 4f304f39fc
9 changed files with 10 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Localization/StringsConvertor/input/Base.lproj/app.json
View File

@ -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",

3
Localization/app.json
View File

@ -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",

2
Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewController.swift
View File

@ -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) {

2
Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel+Diffable.swift
View File

@ -38,7 +38,6 @@ extension MastodonPickServerViewModel {
var snapshot = NSDiffableDataSourceSnapshot<PickServerSection, PickServerItem>()
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<PickServerSection, PickServerItem>()
snapshot.appendSections([.header, .servers])
snapshot.appendItems([.header], toSection: .header)
// TODO: handle filter
var serverItems: [PickServerItem] = []

9
Mastodon/Scene/Onboarding/Register/MastodonRegisterView.swift
View File

@ -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

16
Mastodon/Scene/Onboarding/Share/OnboardingHeadlineTableViewCell.swift
View File

@ -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)
}

6
MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift
View File

@ -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")

3
MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings
View File

@ -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 %@.";

3
MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings
View File

@ -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 %@.";