From 9b03e95d4cbe812d74545a19bdcbb3da79d4c8dd Mon Sep 17 00:00:00 2001 From: Allen Snook Date: Tue, 21 Oct 2014 10:26:46 -0700 Subject: [PATCH 1/2] Explicitly setting the SettingsVC tableView rowHeight to avoid the rowHeight changing unexpectedly during transition to the AboutVC --- WordPress/Classes/ViewRelated/Settings/SettingsViewController.m | 1 + 1 file changed, 1 insertion(+) diff --git a/WordPress/Classes/ViewRelated/Settings/SettingsViewController.m b/WordPress/Classes/ViewRelated/Settings/SettingsViewController.m index d671e7e46ce6..0709997a75b3 100644 --- a/WordPress/Classes/ViewRelated/Settings/SettingsViewController.m +++ b/WordPress/Classes/ViewRelated/Settings/SettingsViewController.m @@ -68,6 +68,7 @@ - (void)viewDidLoad { [super viewDidLoad]; + [self.tableView setRowHeight:50.f]; self.title = NSLocalizedString(@"Settings", @"App Settings"); self.doneButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", @"") style:[WPStyleGuide barButtonStyleForBordered] target:self action:@selector(dismiss)]; self.navigationItem.rightBarButtonItem = self.doneButton; From c93c06bf56c85f351aae4e35ab53b1b7ca455913 Mon Sep 17 00:00:00 2001 From: Allen Snook Date: Tue, 21 Oct 2014 16:54:22 -0700 Subject: [PATCH 2/2] Changed to add setEstimatedRowHeight with setRowHeight set to automatic. Also added fix for ActivityLogVC and SupportVC --- .../Classes/ViewRelated/Settings/ActivityLogViewController.m | 3 +++ .../Classes/ViewRelated/Settings/SettingsViewController.m | 4 +++- .../Classes/ViewRelated/Settings/SupportViewController.m | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/WordPress/Classes/ViewRelated/Settings/ActivityLogViewController.m b/WordPress/Classes/ViewRelated/Settings/ActivityLogViewController.m index d5f26f84507c..edf687178796 100644 --- a/WordPress/Classes/ViewRelated/Settings/ActivityLogViewController.m +++ b/WordPress/Classes/ViewRelated/Settings/ActivityLogViewController.m @@ -40,6 +40,9 @@ - (id)init - (void)viewDidLoad { [super viewDidLoad]; + + [self.tableView setEstimatedRowHeight:50.f]; + [self.tableView setRowHeight:UITableViewAutomaticDimension]; [WPStyleGuide configureColorsForView:self.view andTableView:self.tableView]; [self loadLogFiles]; diff --git a/WordPress/Classes/ViewRelated/Settings/SettingsViewController.m b/WordPress/Classes/ViewRelated/Settings/SettingsViewController.m index 0709997a75b3..b9eccf6b9b78 100644 --- a/WordPress/Classes/ViewRelated/Settings/SettingsViewController.m +++ b/WordPress/Classes/ViewRelated/Settings/SettingsViewController.m @@ -68,7 +68,9 @@ - (void)viewDidLoad { [super viewDidLoad]; - [self.tableView setRowHeight:50.f]; + [self.tableView setEstimatedRowHeight:50.f]; + [self.tableView setRowHeight:UITableViewAutomaticDimension]; + self.title = NSLocalizedString(@"Settings", @"App Settings"); self.doneButton = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", @"") style:[WPStyleGuide barButtonStyleForBordered] target:self action:@selector(dismiss)]; self.navigationItem.rightBarButtonItem = self.doneButton; diff --git a/WordPress/Classes/ViewRelated/Settings/SupportViewController.m b/WordPress/Classes/ViewRelated/Settings/SupportViewController.m index a2c187cb84a5..77f32e5061a0 100644 --- a/WordPress/Classes/ViewRelated/Settings/SupportViewController.m +++ b/WordPress/Classes/ViewRelated/Settings/SupportViewController.m @@ -138,6 +138,9 @@ - (id)init - (void)viewDidLoad { [super viewDidLoad]; + + [self.tableView setEstimatedRowHeight:50.f]; + [self.tableView setRowHeight:UITableViewAutomaticDimension]; NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; self.feedbackEnabled = [defaults boolForKey:UserDefaultsFeedbackEnabled];