diff --git a/clients/ios/Classes/FontSettingsViewController.m b/clients/ios/Classes/FontSettingsViewController.m index 3759af28e0..1c16667190 100644 --- a/clients/ios/Classes/FontSettingsViewController.m +++ b/clients/ios/Classes/FontSettingsViewController.m @@ -108,14 +108,14 @@ - (void)viewWillAppear:(BOOL)animated { [self.autoscrollSegment setSelectedSegmentIndex:0]; } -// if ([userPreferences objectForKey:@"scroll_stories_horizontally"]){ -// BOOL scrollHorizontally = [userPreferences boolForKey:@"scroll_stories_horizontally"]; -// if (scrollHorizontally) { -// [self.scrollOrientationSegment setSelectedSegmentIndex:0]; -// } else { -// [self.scrollOrientationSegment setSelectedSegmentIndex:1]; -// } -// } + if ([userPreferences objectForKey:@"scroll_stories_horizontally"]){ + BOOL scrollHorizontally = [userPreferences boolForKey:@"scroll_stories_horizontally"]; + if (scrollHorizontally) { + [self.scrollOrientationSegment setSelectedSegmentIndex:0]; + } else { + [self.scrollOrientationSegment setSelectedSegmentIndex:1]; + } + } NSString *theme = [ThemeManager themeManager].theme; if ([theme isEqualToString:@"sepia"]) { @@ -233,12 +233,12 @@ - (IBAction)changeAutoscroll:(id)sender { [self.appDelegate.storyPagesViewController changedAutoscroll]; } -//- (IBAction)changeScrollOrientation:(id)sender { -// NSUserDefaults *userPreferences = [NSUserDefaults standardUserDefaults]; -// [userPreferences setBool:[sender selectedSegmentIndex] == 0 forKey:@"scroll_stories_horizontally"]; -// [userPreferences synchronize]; -// [self.appDelegate.storyPagesViewController changedScrollOrientation]; -//} +- (IBAction)changeScrollOrientation:(id)sender { + NSUserDefaults *userPreferences = [NSUserDefaults standardUserDefaults]; + [userPreferences setBool:[sender selectedSegmentIndex] == 0 forKey:@"scroll_stories_horizontally"]; + [userPreferences synchronize]; + [self.appDelegate.storyPagesViewController changedScrollOrientation]; +} - (IBAction)changeTheme:(id)sender { NSUserDefaults *userPreferences = [NSUserDefaults standardUserDefaults]; @@ -269,9 +269,9 @@ - (IBAction)changeTheme:(id)sender { - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) { - return 12; + return 13; } else { - return 11; + return 12; } } @@ -290,8 +290,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N } else if (indexPath.row == 10 - iPadOffset) { return [self makeAutoscrollTableCell]; } else if (indexPath.row == 11 - iPadOffset) { -// return [self makeScrollOrientationTableCell]; -// } else if (indexPath.row == 12 - iPadOffset) { + return [self makeScrollOrientationTableCell]; + } else if (indexPath.row == 12 - iPadOffset) { return [self makeThemeTableCell]; } @@ -545,27 +545,27 @@ - (UITableViewCell *)makeAutoscrollTableCell { return cell; } -//- (UITableViewCell *)makeScrollOrientationTableCell { -// UITableViewCell *cell = [[UITableViewCell alloc] init]; -// cell.frame = CGRectMake(0, 0, 240, kMenuOptionHeight); -// cell.selectionStyle = UITableViewCellSelectionStyleNone; -// cell.separatorInset = UIEdgeInsetsZero; -// cell.backgroundColor = UIColorFromRGB(0xffffff); -// -// self.scrollOrientationSegment.frame = CGRectMake(8, 7, cell.frame.size.width - 8*2, kMenuOptionHeight - 7*2); -// [self.scrollOrientationSegment setTitle:[@"⏩ Horizontal" uppercaseString] forSegmentAtIndex:0]; -// [self.scrollOrientationSegment setTitle:[@"⏬ Vertical" uppercaseString] forSegmentAtIndex:1]; -// self.scrollOrientationSegment.backgroundColor = UIColorFromRGB(0xeeeeee); -// [self.scrollOrientationSegment setTitleTextAttributes:@{NSFontAttributeName:[UIFont fontWithName:@"Helvetica-Bold" size:11.0f]} forState:UIControlStateNormal]; -// [self.scrollOrientationSegment setContentOffset:CGSizeMake(0, 1) forSegmentAtIndex:0]; -// [self.scrollOrientationSegment setContentOffset:CGSizeMake(0, 1) forSegmentAtIndex:1]; -// -// [[ThemeManager themeManager] updateSegmentedControl:self.scrollOrientationSegment]; -// -// [cell.contentView addSubview:self.scrollOrientationSegment]; -// -// return cell; -//} +- (UITableViewCell *)makeScrollOrientationTableCell { + UITableViewCell *cell = [[UITableViewCell alloc] init]; + cell.frame = CGRectMake(0, 0, 240, kMenuOptionHeight); + cell.selectionStyle = UITableViewCellSelectionStyleNone; + cell.separatorInset = UIEdgeInsetsZero; + cell.backgroundColor = UIColorFromRGB(0xffffff); + + self.scrollOrientationSegment.frame = CGRectMake(8, 7, cell.frame.size.width - 8*2, kMenuOptionHeight - 7*2); + [self.scrollOrientationSegment setTitle:[@"⏩ Horizontal" uppercaseString] forSegmentAtIndex:0]; + [self.scrollOrientationSegment setTitle:[@"⏬ Vertical" uppercaseString] forSegmentAtIndex:1]; + self.scrollOrientationSegment.backgroundColor = UIColorFromRGB(0xeeeeee); + [self.scrollOrientationSegment setTitleTextAttributes:@{NSFontAttributeName:[UIFont fontWithName:@"Helvetica-Bold" size:11.0f]} forState:UIControlStateNormal]; + [self.scrollOrientationSegment setContentOffset:CGSizeMake(0, 1) forSegmentAtIndex:0]; + [self.scrollOrientationSegment setContentOffset:CGSizeMake(0, 1) forSegmentAtIndex:1]; + + [[ThemeManager themeManager] updateSegmentedControl:self.scrollOrientationSegment]; + + [cell.contentView addSubview:self.scrollOrientationSegment]; + + return cell; +} - (UITableViewCell *)makeThemeTableCell { UITableViewCell *cell = [[UITableViewCell alloc] init]; diff --git a/clients/ios/Resources/Settings.bundle/Root.plist b/clients/ios/Resources/Settings.bundle/Root.plist index 3e2051846f..d9a9c6e271 100644 --- a/clients/ios/Resources/Settings.bundle/Root.plist +++ b/clients/ios/Resources/Settings.bundle/Root.plist @@ -702,6 +702,16 @@ Type PSGroupSpecifier + + Type + PSToggleSwitchSpecifier + Title + Scroll horizontally + Key + scroll_stories_horizontally + DefaultValue + + Type PSToggleSwitchSpecifier diff --git a/clients/ios/Resources/Settings.bundle/Root~ipad.plist b/clients/ios/Resources/Settings.bundle/Root~ipad.plist index 7afd82878d..2a33fd698c 100644 --- a/clients/ios/Resources/Settings.bundle/Root~ipad.plist +++ b/clients/ios/Resources/Settings.bundle/Root~ipad.plist @@ -724,6 +724,16 @@ Type PSGroupSpecifier + + Type + PSToggleSwitchSpecifier + Title + Scroll horizontally + Key + scroll_stories_horizontally + DefaultValue + + Type PSToggleSwitchSpecifier