zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity

chore: resolve conflicts

This commit is contained in:
jk234ert 2021-02-25 14:41:41 +08:00
parent 50035c1359
commit 7329a62582
5 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mastodon/Scene/PickServer/PickServerViewController.swift
View File

@ -36,7 +36,7 @@ final class PickServerViewController: UIViewController, NeedsDependency {
let nextStepButton: PrimaryActionButton = { let nextStepButton: PrimaryActionButton = {
let button = PrimaryActionButton(type: .system) let button = PrimaryActionButton(type: .system)
button.setTitle(L10n.Button.signUp, for: .normal) button.setTitle(L10n.Common.Controls.Actions.signUp, for: .normal)
button.translatesAutoresizingMaskIntoConstraints = false button.translatesAutoresizingMaskIntoConstraints = false
return button return button
}() }()

2
Mastodon/Scene/PickServer/TableViewCell/PickServerCell.swift
View File

@ -324,7 +324,7 @@ extension PickServerCell {
descriptionLabel.text = serverInfo.description descriptionLabel.text = serverInfo.description
let processor = RoundCornerImageProcessor(cornerRadius: 3) let processor = RoundCornerImageProcessor(cornerRadius: 3)
thumbImageView.kf.indicatorType = .activity thumbImageView.kf.indicatorType = .activity
thumbImageView.kf.setImage(with: URL(string: serverInfo.proxiedThumbnail ?? "")!, placeholder: UIImage.placeholder(color: .yellow), options: [ thumbImageView.kf.setImage(with: URL(string: serverInfo.proxiedThumbnail ?? "")!, placeholder: UIImage.placeholder(color: Asset.Colors.lightBackground.color), options: [
.processor(processor), .processor(processor),
.scaleFactor(UIScreen.main.scale), .scaleFactor(UIScreen.main.scale),
.transition(.fade(1)) .transition(.fade(1))

2
Mastodon/Scene/PickServer/TableViewCell/PickServerTitleCell.swift
View File

@ -12,7 +12,7 @@ final class PickServerTitleCell: UITableViewCell {
let titleLabel: UILabel = { let titleLabel: UILabel = {
let label = UILabel() let label = UILabel()
label.font = UIFontMetrics(forTextStyle: .largeTitle).scaledFont(for: UIFont.boldSystemFont(ofSize: 34)) label.font = UIFontMetrics(forTextStyle: .largeTitle).scaledFont(for: UIFont.boldSystemFont(ofSize: 34))
label.textColor = Asset.Colors.Label.black.color label.textColor = Asset.Colors.Label.primary.color
label.text = L10n.Scene.ServerPicker.title label.text = L10n.Scene.ServerPicker.title
label.adjustsFontForContentSizeCategory = true label.adjustsFontForContentSizeCategory = true
label.translatesAutoresizingMaskIntoConstraints = false label.translatesAutoresizingMaskIntoConstraints = false

2
Mastodon/Scene/PickServer/View/PickServerCategoryView.swift
View File

@ -92,7 +92,7 @@ extension PickServerCategoryView {
bgView.backgroundColor = Asset.Colors.lightWhite.color bgView.backgroundColor = Asset.Colors.lightWhite.color
bgView.applyShadow(color: Asset.Colors.lightBrandBlue.color, alpha: 0, x: 0, y: 0, blur: 0.0) bgView.applyShadow(color: Asset.Colors.lightBrandBlue.color, alpha: 0, x: 0, y: 0, blur: 0.0)
if case .All = category { if case .All = category {
titleLabel.textColor = Asset.Colors.lightBackground.color titleLabel.textColor = Asset.Colors.lightBrandBlue.color
} }
} }
} }

25
Mastodon/Scene/Welcome/WelcomeViewController.swift
View File

@ -13,10 +13,6 @@ final class WelcomeViewController: UIViewController, NeedsDependency {
weak var context: AppContext! { willSet { precondition(!isViewLoaded) } } weak var context: AppContext! { willSet { precondition(!isViewLoaded) } }
weak var coordinator: SceneCoordinator! { willSet { precondition(!isViewLoaded) } } weak var coordinator: SceneCoordinator! { willSet { precondition(!isViewLoaded) } }
#if DEBUG
let authenticationViewController = AuthenticationViewController()
#endif
let logoImageView: UIImageView = { let logoImageView: UIImageView = {
let imageView = UIImageView(image: Asset.welcomeLogo.image) let imageView = UIImageView(image: Asset.welcomeLogo.image)
imageView.translatesAutoresizingMaskIntoConstraints = false imageView.translatesAutoresizingMaskIntoConstraints = false
@ -103,27 +99,6 @@ extension WelcomeViewController {
} }
extension WelcomeViewController {
@objc private func signInButtonPressed(_ sender: UIButton) {
os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function)
#if DEBUG
authenticationViewController.context = context
authenticationViewController.coordinator = coordinator
authenticationViewController.viewModel = AuthenticationViewModel(context: context, coordinator: coordinator, isAuthenticationExist: true)
authenticationViewController.viewModel.domain.value = "pawoo.net"
let _ = authenticationViewController.view // trigger view load
authenticationViewController.signInButton.sendActions(for: .touchUpInside)
#endif
}
@objc private func signUpButtonPressed(_ sender: UIButton) {
os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function)
}
}
extension WelcomeViewController { extension WelcomeViewController {
@objc @objc
private func signUpButtonDidClicked(_ sender: UIButton) { private func signUpButtonDidClicked(_ sender: UIButton) {