From bdbcd128fa0d08b2dc8ee80db74cd9c66a62fdbe Mon Sep 17 00:00:00 2001 From: Nathan Mattes Date: Sat, 12 Nov 2022 23:39:58 +0100 Subject: [PATCH] Set some backgroundcolor (#540) --- .../Scene/Onboarding/Login/MastodonLoginView.swift | 8 ++++---- .../Onboarding/Login/MastodonLoginViewController.swift | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Mastodon/Scene/Onboarding/Login/MastodonLoginView.swift b/Mastodon/Scene/Onboarding/Login/MastodonLoginView.swift index cb506a739..98d4f7b36 100644 --- a/Mastodon/Scene/Onboarding/Login/MastodonLoginView.swift +++ b/Mastodon/Scene/Onboarding/Login/MastodonLoginView.swift @@ -43,14 +43,14 @@ class MastodonLoginView: UIView { searchTextField.translatesAutoresizingMaskIntoConstraints = false searchTextField.backgroundColor = Asset.Scene.Onboarding.textFieldBackground.color searchTextField.layer.cornerRadius = 10 //TODO: Change mask for - searchTextField.placeholder = "Search for your server" + searchTextField.placeholder = "Search for your server" //TODO: @zeitschlag Localization searchTextField.leftView = UIImageView(image: UIImage(systemName: "magnifyingglass")) searchTextField.leftViewMode = .always tableView = UITableView() tableView.translatesAutoresizingMaskIntoConstraints = false - //TODO: @zeitchlag Cell - + tableView.backgroundColor = Asset.Scene.Onboarding.background.color + navigationActionView = NavigationActionView() navigationActionView.translatesAutoresizingMaskIntoConstraints = false @@ -60,7 +60,7 @@ class MastodonLoginView: UIView { addSubview(searchTextField) addSubview(tableView) addSubview(navigationActionView) - backgroundColor = .systemBackground + backgroundColor = Asset.Scene.Onboarding.background.color setupConstraints() } diff --git a/Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift b/Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift index 0c67c8705..0c4e9558b 100644 --- a/Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift +++ b/Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift @@ -8,6 +8,7 @@ import UIKit import MastodonSDK import MastodonCore +import MastodonAsset protocol MastodonLoginViewControllerDelegate: AnyObject { func backButtonPressed(_ viewController: MastodonLoginViewController) @@ -73,6 +74,15 @@ class MastodonLoginViewController: UIViewController { cell.contentConfiguration = configuration cell.accessoryType = .disclosureIndicator + if #available(iOS 16.0, *) { + var backgroundConfiguration = cell.defaultBackgroundConfiguration() + backgroundConfiguration.backgroundColor = Asset.Scene.Onboarding.textFieldBackground.color + + cell.backgroundConfiguration = backgroundConfiguration + } else { + cell.backgroundColor = .systemBackground + } + return cell }