Skip to content

Поправил tintColor для всех алертов #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 1, 2025
Merged

Поправил tintColor для всех алертов #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SwiftUI-WorkoutApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@
CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
DEVELOPMENT_TEAM = CR68PP2Z3F;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -923,7 +923,7 @@
CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_ASSET_PATHS = "SwiftUI-WorkoutApp/Preview\\ Content/PreviewContent.swift SwiftUI-WorkoutApp/Preview\\ Content";
DEVELOPMENT_TEAM = CR68PP2Z3F;
ENABLE_PREVIEWS = YES;
Expand Down
10 changes: 3 additions & 7 deletions SwiftUI-WorkoutApp/Libraries/SWAlert/Sources/SWAlert/SWAlert.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,19 @@ public final class SWAlert {

/// Показывает системный алерт с заданными параметрами
/// - Parameters:
/// - title: Заголовок. Если передать `nil`, то сообщение выделится жирным. Если передать текст или пустую строку, будет без
/// заголовка, и сообщение будет со стандартным шрифтом
/// - title: Заголовок. Если передать `nil`, то сообщение выделится жирным. Если передать текст или пустую строку,
/// будет без заголовка, и сообщение будет со стандартным шрифтом
/// - message: Текст сообщения
/// - closeButtonTitle: Заголовок кнопки для закрытия алерта
/// - closeButtonStyle: Стиль кнопки для закрытия алерта
/// - closeButtonTintColor: Цвет кнопки для закрытия алерта. Если не настроить явно, то при появлении будет системный (синий) цвет, а
/// при нажатии он изменится на `AccentColor` в проекте
public func presentDefaultUIKit(
title: String? = "",
message: String,
closeButtonTitle: String = "Ok",
closeButtonStyle: UIAlertAction.Style = .default,
closeButtonTintColor: UIColor? = .systemGreen
closeButtonStyle: UIAlertAction.Style = .default
) {
guard currentAlert == nil, let topMostViewController else { return }
let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
alert.view.tintColor = closeButtonTintColor
alert.addAction(
.init(
title: closeButtonTitle,
Expand Down
9 changes: 9 additions & 0 deletions SwiftUI-WorkoutApp/SwiftUI_WorkoutAppApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,20 @@ private extension SwiftUI_WorkoutAppApp {
}
UITabBar.appearance().scrollEdgeAppearance = tabBarAppearance
UINavigationBar.appearance().scrollEdgeAppearance = navBarAppearance
fixAlertAccentColor()
if !DeviceOSVersionChecker.iOS16Available {
UITextView.appearance().backgroundColor = .clear
}
}

/// Исправляет баг с accentColor у алертов, [обсуждение](https://developer.apple.com/forums/thread/673147)
///
/// Без этой настройки у всех алертов при первом появлении стандартный tintColor (синий),
/// а при нажатии он меняется на `AccentColor` в проекте
func fixAlertAccentColor() {
UIView.appearance().tintColor = .accent
}

func prepareForUITestIfNeeded() {
if ProcessInfo.processInfo.arguments.contains("UITest") {
UserDefaults.standard.removePersistentDomain(forName: Bundle.main.bundleIdentifier!)
Expand Down