Clean up ahead of PR.

pull/1/head
Matthew Chen 7 years ago
parent 48975eaac8
commit b90e406a57

@ -198,7 +198,8 @@ NS_ASSUME_NONNULL_BEGIN
#ifdef THEME_ENABLED #ifdef THEME_ENABLED
OWSTableSection *themeSection = [OWSTableSection new]; OWSTableSection *themeSection = [OWSTableSection new];
themeSection.headerTitle = NSLocalizedString(@"THEME_SECTION", nil); themeSection.headerTitle = NSLocalizedString(@"THEME_SECTION", nil);
[themeSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_ADVANCED_THEME", @"") [themeSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_ADVANCED_DARK_THEME",
@"Label for setting that enables dark theme.")
isOn:[Theme isDarkThemeEnabled] isOn:[Theme isDarkThemeEnabled]
target:weakSelf target:weakSelf
selector:@selector(didToggleThemeSwitch:)]]; selector:@selector(didToggleThemeSwitch:)]];
@ -289,6 +290,8 @@ NS_ASSUME_NONNULL_BEGIN
{ {
[Theme setIsDarkThemeEnabled:sender.isOn]; [Theme setIsDarkThemeEnabled:sender.isOn];
[self updateTableContents];
// TODO: Notify and refresh. // TODO: Notify and refresh.
} }
#endif #endif

@ -805,13 +805,12 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
{ {
UITableViewCell *cell = [self.tableView dequeueReusableCellWithIdentifier:kArchivedConversationsReuseIdentifier]; UITableViewCell *cell = [self.tableView dequeueReusableCellWithIdentifier:kArchivedConversationsReuseIdentifier];
OWSAssert(cell); OWSAssert(cell);
[OWSTableItem configureCell:cell];
for (UIView *subview in cell.contentView.subviews) { for (UIView *subview in cell.contentView.subviews) {
[subview removeFromSuperview]; [subview removeFromSuperview];
} }
cell.backgroundColor = Theme.backgroundColor;
UIImage *disclosureImage = [UIImage imageNamed:(CurrentAppContext().isRTL ? @"NavBarBack" : @"NavBarBackRTL")]; UIImage *disclosureImage = [UIImage imageNamed:(CurrentAppContext().isRTL ? @"NavBarBack" : @"NavBarBackRTL")];
OWSAssert(disclosureImage); OWSAssert(disclosureImage);
UIImageView *disclosureImageView = [UIImageView new]; UIImageView *disclosureImageView = [UIImageView new];

@ -1889,15 +1889,15 @@
/* Table header for the 'censorship circumvention' section. */ /* Table header for the 'censorship circumvention' section. */
"SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_HEADER" = "Censorship Circumvention"; "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_HEADER" = "Censorship Circumvention";
/* Label for setting that enables dark theme. */
"SETTINGS_ADVANCED_DARK_THEME" = "Dark Theme";
/* No comment provided by engineer. */ /* No comment provided by engineer. */
"SETTINGS_ADVANCED_DEBUGLOG" = "Enable Debug Log"; "SETTINGS_ADVANCED_DEBUGLOG" = "Enable Debug Log";
/* No comment provided by engineer. */ /* No comment provided by engineer. */
"SETTINGS_ADVANCED_SUBMIT_DEBUGLOG" = "Submit Debug Log"; "SETTINGS_ADVANCED_SUBMIT_DEBUGLOG" = "Submit Debug Log";
/* No comment provided by engineer. */
"SETTINGS_ADVANCED_THEME" = "Theme";
/* No comment provided by engineer. */ /* No comment provided by engineer. */
"SETTINGS_ADVANCED_TITLE" = "Advanced"; "SETTINGS_ADVANCED_TITLE" = "Advanced";

Loading…
Cancel
Save