mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-17 15:09:31 +02:00
Merge commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1' into feature/foss_update_1_11_19 * commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1': finish version++ version++ comments update submodule remove obsolete tests removed unused code update submodule fix Libolm removal update license macro update license Prepare for new sprint # Conflicts: # Config/AppVersion.xcconfig # IDETemplateMacros.plist # LICENSE # README.md # Riot/Categories/MXSession+Riot.m # Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift # Riot/Managers/KeyValueStorage/Extensions/Keychain.swift # Riot/Managers/KeyValueStorage/KeyValueStore.swift # Riot/Managers/KeyValueStorage/KeychainStore.swift # Riot/Managers/KeyValueStorage/MemoryStore.swift # Riot/Managers/PushNotification/PushNotificationService.m # Riot/Managers/Settings/RiotSettings.swift # Riot/Managers/Settings/Shared/RiotSharedSettings.swift # Riot/Modules/Analytics/AnalyticsUIElement.swift # Riot/Modules/Application/AppCoordinator.swift # Riot/Modules/Application/LegacyAppDelegate.h # Riot/Modules/Application/LegacyAppDelegate.m # Riot/Modules/Authentication/Legacy/AuthenticationViewController.h # Riot/Modules/Authentication/Legacy/AuthenticationViewController.m # Riot/Modules/Authentication/Legacy/Views/AuthInputsView.h # Riot/Modules/Authentication/Legacy/Views/AuthInputsView.m # Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m # Riot/Modules/Common/Recents/RecentsViewController.m # Riot/Modules/Common/WebViewController/WebViewViewController.m # Riot/Modules/Contacts/Details/ContactDetailsViewController.m # Riot/Modules/Contacts/Views/ContactTableViewCell.m # Riot/Modules/Favorites/FavouritesViewController.h # Riot/Modules/Favorites/FavouritesViewController.m # Riot/Modules/GlobalSearch/UnifiedSearchViewController.m # Riot/Modules/People/PeopleViewController.h # Riot/Modules/People/PeopleViewController.m # Riot/Modules/Room/ContextualMenu/ReactionsMenu/ReactionsMenuViewModel.swift # Riot/Modules/Room/DataSources/RoomDataSource.m # Riot/Modules/Room/Files/RoomFilesViewController.m # Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m # Riot/Modules/Room/Members/RoomParticipantsViewController.m # Riot/Modules/Room/RoomViewController.m # Riot/Modules/Room/Settings/RoomSettingsViewController.m # Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCell.swift # Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCellContentView.swift # Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroViewData.swift # Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h # Riot/Modules/Rooms/RoomsViewController.h # Riot/Modules/Rooms/ShowDirectory/Cells/Network/DirectoryNetworkTableHeaderFooterView.swift # Riot/Modules/Rooms/ShowDirectory/Cells/Room/DirectoryRoomTableViewCell.swift # Riot/Modules/Rooms/ShowDirectory/PublicRoomsDirectoryViewModel.swift # Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyCoordinator.swift # Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyViewController.swift # Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseCoordinator.swift # Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseViewController.swift # Riot/Modules/Secrets/Recover/SecretsRecoveryCoordinator.swift # Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift # Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModel.swift # Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModelType.swift # Riot/Modules/SetPinCode/PinCodePreferences.swift # Riot/Modules/SetPinCode/SetupBiometrics/BiometricsAuthenticationPresenter.swift # Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m # Riot/Modules/Settings/Security/SecurityViewController.m # Riot/Modules/Settings/SettingsViewController.m # Riot/Modules/SplitView/SplitViewCoordinator.swift # Riot/Modules/SplitView/SplitViewCoordinatorType.swift # Riot/Modules/StartChat/StartChatViewController.m # Riot/Modules/TabBar/MasterTabBarController.h # Riot/Modules/TabBar/MasterTabBarController.m # Riot/Utils/EventFormatter.m # Riot/Utils/HTMLFormatter.swift # Riot/Utils/Tools.m # RiotNSE/NotificationService.swift
163 lines
4.6 KiB
Objective-C
163 lines
4.6 KiB
Objective-C
/*
|
|
Copyright 2019-2024 New Vector Ltd.
|
|
Copyright 2017 Vector Creations Ltd
|
|
Copyright 2016 OpenMarket Ltd
|
|
|
|
SPDX-License-Identifier: AGPL-3.0-only
|
|
Please see LICENSE in the repository root for full details.
|
|
*/
|
|
|
|
#import "ThemeService.h"
|
|
|
|
#import "GeneratedInterface-Swift.h"
|
|
|
|
NSString *const kThemeServiceDidChangeThemeNotification = @"kThemeServiceDidChangeThemeNotification";
|
|
|
|
@implementation ThemeService
|
|
@synthesize themeId = _themeId;
|
|
|
|
+ (ThemeService *)shared
|
|
{
|
|
static ThemeService *sharedOnceInstance;
|
|
|
|
static dispatch_once_t onceToken;
|
|
dispatch_once(&onceToken, ^{
|
|
sharedOnceInstance = [ThemeService new];
|
|
});
|
|
|
|
return sharedOnceInstance;
|
|
}
|
|
|
|
- (void)setThemeId:(NSString *)theThemeId
|
|
{
|
|
_themeId = theThemeId;
|
|
[self reEvaluateTheme];
|
|
}
|
|
|
|
- (void)setTheme:(id<Theme> _Nonnull)theme
|
|
{
|
|
// update only if really changed
|
|
if (![_theme.identifier isEqualToString:theme.identifier])
|
|
{
|
|
_theme = theme;
|
|
|
|
[self updateAppearance];
|
|
|
|
[[NSNotificationCenter defaultCenter] postNotificationName:kThemeServiceDidChangeThemeNotification object:self];
|
|
}
|
|
}
|
|
|
|
- (id<Theme>)themeWithThemeId:(NSString*)themeId
|
|
{
|
|
id<Theme> theme;
|
|
|
|
if (themeId == nil || [themeId isEqualToString:@"auto"])
|
|
{
|
|
if (@available(iOS 13, *))
|
|
{
|
|
// Translate "auto" into a theme with UITraitCollection
|
|
themeId = ([UITraitCollection currentTraitCollection].userInterfaceStyle == UIUserInterfaceStyleDark) ? @"dark" : @"light";
|
|
}
|
|
else
|
|
{
|
|
// Translate "auto" into a theme
|
|
themeId = UIAccessibilityIsInvertColorsEnabled() ? @"dark" : @"light";
|
|
}
|
|
}
|
|
|
|
if ([themeId isEqualToString:@"dark"])
|
|
{
|
|
theme = [DarkTheme new];
|
|
}
|
|
else if ([themeId isEqualToString:@"black"])
|
|
{
|
|
theme = [DarkTheme new]; // bwi: 4744 (map previous set black theme to dark)
|
|
}
|
|
else
|
|
{
|
|
// Use light theme by default
|
|
theme = [DefaultTheme new];
|
|
}
|
|
|
|
return theme;
|
|
}
|
|
|
|
- (BOOL)isCurrentThemeDark
|
|
{
|
|
if ([self.theme.identifier isEqualToString:@"dark"] || [self.theme.identifier isEqualToString:@"black"])
|
|
{
|
|
return YES;
|
|
}
|
|
|
|
return NO;
|
|
}
|
|
|
|
#pragma mark - Private methods
|
|
|
|
- (instancetype)init
|
|
{
|
|
self = [super init];
|
|
if (self)
|
|
{
|
|
// Riot Colors not yet themeable
|
|
_riotColorCuriousBlue = [[UIColor alloc] initWithRgb:0x2A9EDB];
|
|
|
|
if (@available(iOS 13, *))
|
|
{
|
|
// Observe application did become active for iOS appearance setting changes
|
|
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidBecomeActive) name:UIApplicationDidBecomeActiveNotification object:nil];
|
|
}
|
|
else
|
|
{
|
|
// Observe "Invert Colours" settings changes (available since iOS 11)
|
|
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(accessibilityInvertColorsStatusDidChange) name:UIAccessibilityInvertColorsStatusDidChangeNotification object:nil];
|
|
}
|
|
|
|
[self reEvaluateTheme];
|
|
}
|
|
return self;
|
|
}
|
|
|
|
- (void)reEvaluateTheme
|
|
{
|
|
self.theme = [self themeWithThemeId:self.themeId];
|
|
}
|
|
|
|
- (void)accessibilityInvertColorsStatusDidChange
|
|
{
|
|
[self reEvaluateTheme];
|
|
}
|
|
|
|
- (void)applicationDidBecomeActive
|
|
{
|
|
[self reEvaluateTheme];
|
|
}
|
|
|
|
- (void)updateAppearance
|
|
{
|
|
[UIScrollView appearance].indicatorStyle = self.theme.scrollBarStyle;
|
|
|
|
// Remove the extra height added to section headers in iOS 15
|
|
if (@available(iOS 15.0, *))
|
|
{
|
|
UITableView.appearance.sectionHeaderTopPadding = 0;
|
|
}
|
|
|
|
// Define the navigation bar text color
|
|
[[UINavigationBar appearance] setTintColor:self.theme.tintColor];
|
|
|
|
// Define the UISearchBar cancel button color
|
|
[[UIBarButtonItem appearanceWhenContainedInInstancesOfClasses:@[[UISearchBar class]]] setTitleTextAttributes:@{ NSForegroundColorAttributeName : self.theme.tintColor } forState: UIControlStateNormal];
|
|
|
|
[[UIStackView appearanceWhenContainedInInstancesOfClasses:@[[UINavigationBar class]]] setSpacing:-7];
|
|
[[UIStackView appearanceWhenContainedInInstancesOfClasses:@[[UINavigationBar class]]] setDistribution:UIStackViewDistributionEqualCentering];
|
|
|
|
[[UIView appearanceWhenContainedInInstancesOfClasses:@[[UIAlertController class]]] setTintColor: self.theme.tintColor];
|
|
|
|
// bwi
|
|
UISwitch.appearance.thumbTintColor = self.theme.backgroundColor;
|
|
UISwitch.appearance.onTintColor = self.theme.tintColor;
|
|
}
|
|
|
|
@end
|