diff --git a/clients/ios/Classes/NewsBlurAppDelegate.m b/clients/ios/Classes/NewsBlurAppDelegate.m index 6f839b080..7fecf5fa1 100644 --- a/clients/ios/Classes/NewsBlurAppDelegate.m +++ b/clients/ios/Classes/NewsBlurAppDelegate.m @@ -438,12 +438,18 @@ preferencesViewController.showDoneButton = YES; preferencesViewController.showCreditsFooter = NO; preferencesViewController.title = @"Preferences"; - BOOL enabled = [[NSUserDefaults standardUserDefaults] boolForKey:@"offline_allowed"]; - preferencesViewController.hiddenKeys = enabled ? nil : - [NSSet setWithObjects:@"offline_image_download", - @"offline_download_connection", - @"offline_store_limit", - nil]; + NSMutableSet *hiddenSet = [NSMutableSet set]; + BOOL offline_enabled = [[NSUserDefaults standardUserDefaults] boolForKey:@"offline_allowed"]; + if (offline_enabled) { + [hiddenSet addObjectsFromArray:@[@"offline_image_download", + @"offline_download_connection", + @"offline_store_limit"]]; + } + BOOL system_font_enabled = [[NSUserDefaults standardUserDefaults] boolForKey:@"use_system_font_size"]; + if (system_font_enabled) { + [hiddenSet addObjectsFromArray:@[@"feed_list_font_size"]]; + } + preferencesViewController.hiddenKeys = hiddenSet; [[NSUserDefaults standardUserDefaults] setObject:@"Delete offline stories..." forKey:@"offline_cache_empty_stories"]; diff --git a/clients/ios/Classes/NewsBlurViewController.m b/clients/ios/Classes/NewsBlurViewController.m index 267e5d135..93c585905 100644 --- a/clients/ios/Classes/NewsBlurViewController.m +++ b/clients/ios/Classes/NewsBlurViewController.m @@ -881,7 +881,12 @@ static UIFont *userLabelFont; [NSSet setWithObjects:@"instapaper_username", @"instapaper_password", nil] animated:YES]; - } + } else if ([notification.object isEqual:@"use_system_font_size"]) { + BOOL enabled = (BOOL)[[notification.userInfo objectForKey:@"use_system_font_size"] intValue]; + [appDelegate.preferencesViewController setHiddenKeys:!enabled ? nil : + [NSSet setWithObjects:@"feed_list_font_size", + nil] animated:YES]; + } } - (void)settingsViewController:(IASKAppSettingsViewController*)sender buttonTappedForSpecifier:(IASKSpecifier*)specifier { diff --git a/clients/ios/Resources/Settings.bundle/Root.plist b/clients/ios/Resources/Settings.bundle/Root.plist index feca01c48..b55ddf308 100644 --- a/clients/ios/Resources/Settings.bundle/Root.plist +++ b/clients/ios/Resources/Settings.bundle/Root.plist @@ -84,7 +84,7 @@ Key use_system_font_size DefaultValue - + Type