felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-20 08:32:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/4744_remove_black_theme' into 'develop'

Browse Source 
MESSENGER-4744 Removed black theme and map already set black theme to dark

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!141
This commit is contained in:
Frank Rotermund
2023-06-14 06:28:28 +00:00
parent 6709839148 b5f628c650
commit 33b943d31f
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Settings/SettingsViewController.m
+16 -4
View File
@@ -2487,9 +2487,15 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
theme = @"auto";
}
// bwi: 4744 (map previous set black theme to dark)
if([theme isEqualToString:@"black"]) {
theme = @"dark";
}
theme = [NSString stringWithFormat:@"settings_ui_theme_%@", theme];
NSString *i18nTheme = NSLocalizedStringFromTable(theme, @"Vector", nil);
cell.textLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
cell.textLabel.text = [VectorL10n settingsUiTheme];
@@ -4367,7 +4373,7 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
{
__weak typeof(self) weakSelf = self;
__block UIAlertAction *autoAction, *lightAction, *darkAction, *blackAction;
__block UIAlertAction *autoAction, *lightAction, *darkAction/* bwi: 4744 , *blackAction*/;
NSString *themePickerMessage;
void (^actionBlock)(UIAlertAction *action) = ^(UIAlertAction * action) {
@@ -4389,11 +4395,13 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
{
newTheme = @"dark";
}
/* bwi: 4744
else if (action == blackAction)
{
newTheme = @"black";
}
*/
NSString *theme = RiotSettings.shared.userInterfaceTheme;
if (newTheme && ![newTheme isEqualToString:theme])
{
@@ -4437,9 +4445,11 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
darkAction = [UIAlertAction actionWithTitle:[VectorL10n settingsUiThemeDark]
style:UIAlertActionStyleDefault
handler:actionBlock];
/* bwi: 4744
blackAction = [UIAlertAction actionWithTitle:[VectorL10n settingsUiThemeBlack]
style:UIAlertActionStyleDefault
handler:actionBlock];
*/
UIAlertController *themePicker = [UIAlertController alertControllerWithTitle:[VectorL10n settingsUiThemePickerTitle]
@@ -4452,8 +4462,10 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
}
[themePicker addAction:lightAction];
[themePicker addAction:darkAction];
/* bwi: 4744
[themePicker addAction:blackAction];
*/
// Cancel button
[themePicker addAction:[UIAlertAction actionWithTitle:[VectorL10n cancel]
style:UIAlertActionStyleCancel