From 48c6aa6dea8b4bca818abab7a1b45ebf800429f7 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Tue, 24 Mar 2020 14:21:39 -0400 Subject: [PATCH] Renaming mark story on scroll preferences. iOS v10.0.1. --- .../ios/Classes/FeedDetailViewController.m | 2 +- .../ios/NewsBlur.xcodeproj/project.pbxproj | 20 +++--- .../ios/Resources/Settings.bundle/Root.plist | 70 +++++++++---------- .../Resources/Settings.bundle/Root~ipad.plist | 68 +++++++++--------- 4 files changed, 80 insertions(+), 80 deletions(-) diff --git a/clients/ios/Classes/FeedDetailViewController.m b/clients/ios/Classes/FeedDetailViewController.m index 8c30a3d10..adc0ace88 100644 --- a/clients/ios/Classes/FeedDetailViewController.m +++ b/clients/ios/Classes/FeedDetailViewController.m @@ -2242,7 +2242,7 @@ didEndSwipingSwipingWithState:(MCSwipeTableViewCellState)state [self reloadStories]; }]; - [viewController addSegmentedControlWithTitles:@[@"Mark read", @"Leave unread"] selectIndex:self.isMarkReadOnScroll ? 0 : 1 selectionShouldDismiss:YES handler:^(NSUInteger selectedIndex) { + [viewController addSegmentedControlWithTitles:@[@"Read on scroll", @"Leave unread"] selectIndex:self.isMarkReadOnScroll ? 0 : 1 selectionShouldDismiss:YES handler:^(NSUInteger selectedIndex) { [userPreferences setBool:selectedIndex == 0 forKey:appDelegate.storiesCollection.scrollReadFilterKey]; }]; } diff --git a/clients/ios/NewsBlur.xcodeproj/project.pbxproj b/clients/ios/NewsBlur.xcodeproj/project.pbxproj index 2b2150a69..917a132d3 100755 --- a/clients/ios/NewsBlur.xcodeproj/project.pbxproj +++ b/clients/ios/NewsBlur.xcodeproj/project.pbxproj @@ -3646,7 +3646,7 @@ CODE_SIGN_ENTITLEMENTS = "Share Extension/Share Extension.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 110; + CURRENT_PROJECT_VERSION = 111; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = HR7P97SD72; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -3696,7 +3696,7 @@ CODE_SIGN_ENTITLEMENTS = "Share Extension/Share Extension.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 110; + CURRENT_PROJECT_VERSION = 111; DEVELOPMENT_TEAM = HR7P97SD72; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -3742,7 +3742,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 110; + CURRENT_PROJECT_VERSION = 111; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = HR7P97SD72; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -3791,7 +3791,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 110; + CURRENT_PROJECT_VERSION = 111; DEVELOPMENT_TEAM = HR7P97SD72; ENABLE_NS_ASSERTIONS = NO; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -3823,7 +3823,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 110; + CURRENT_PROJECT_VERSION = 111; DEVELOPMENT_TEAM = HR7P97SD72; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -3844,7 +3844,7 @@ "\"$(SRCROOT)\"", "\"$(SRCROOT)/Other Sources\"", ); - MARKETING_VERSION = 10.0; + MARKETING_VERSION = 10.0.1; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; OTHER_LDFLAGS = ( "-lsqlite3.0", @@ -3873,7 +3873,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 110; + CURRENT_PROJECT_VERSION = 111; DEVELOPMENT_TEAM = HR7P97SD72; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -3893,7 +3893,7 @@ "\"$(SRCROOT)\"", "\"$(SRCROOT)/Other Sources\"", ); - MARKETING_VERSION = 10.0; + MARKETING_VERSION = 10.0.1; OTHER_LDFLAGS = ( "-lsqlite3.0", "-ObjC", @@ -4021,7 +4021,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 110; + CURRENT_PROJECT_VERSION = 111; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = HR7P97SD72; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -4061,7 +4061,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 110; + CURRENT_PROJECT_VERSION = 111; DEVELOPMENT_TEAM = HR7P97SD72; ENABLE_NS_ASSERTIONS = NO; GCC_C_LANGUAGE_STANDARD = gnu99; diff --git a/clients/ios/Resources/Settings.bundle/Root.plist b/clients/ios/Resources/Settings.bundle/Root.plist index 65fc94510..f2d641535 100644 --- a/clients/ios/Resources/Settings.bundle/Root.plist +++ b/clients/ios/Resources/Settings.bundle/Root.plist @@ -142,21 +142,21 @@ Key show_global_shared_stories - - Type - PSToggleSwitchSpecifier - Title - Mark stories read on scroll - DefaultValue - YES - Key - default_scroll_read_filter - Type PSToggleSwitchSpecifier Title - Override scroll read per feed/folder + Mark stories read on scroll + DefaultValue + YES + Key + default_scroll_read_filter + + + Type + PSToggleSwitchSpecifier + Title + Show override mark read on scroll DefaultValue YES Key @@ -682,7 +682,7 @@ Titles Train intelligence - Notifications + Notifications Statistics DefaultValue @@ -690,7 +690,7 @@ Values trainer - notifications + notifications statistics Key @@ -862,28 +862,28 @@ Key custom_domain - - Title - Import and Export - Type - PSGroupSpecifier - - - Type - IASKButtonSpecifier - Title - Import Preferences... - Key - import_prefs - - - Type - IASKButtonSpecifier - Title - Export Preferences... - Key - export_prefs - + + Title + Import and Export + Type + PSGroupSpecifier + + + Type + IASKButtonSpecifier + Title + Import Preferences... + Key + import_prefs + + + Type + IASKButtonSpecifier + Title + Export Preferences... + Key + export_prefs + Title About NewsBlur diff --git a/clients/ios/Resources/Settings.bundle/Root~ipad.plist b/clients/ios/Resources/Settings.bundle/Root~ipad.plist index 30fbc5e3f..aea1ce12a 100644 --- a/clients/ios/Resources/Settings.bundle/Root~ipad.plist +++ b/clients/ios/Resources/Settings.bundle/Root~ipad.plist @@ -152,16 +152,16 @@ Key default_scroll_read_filter - - Type - PSToggleSwitchSpecifier - Title - Override scroll read per feed/folder - DefaultValue - YES - Key - override_scroll_read_filter - + + Type + PSToggleSwitchSpecifier + Title + Show override mark read on scroll + DefaultValue + YES + Key + override_scroll_read_filter + Type PSMultiValueSpecifier @@ -703,14 +703,14 @@ Train intelligence Notifications - Statistics + Statistics DefaultValue notifications Values trainer - notifications + notifications statistics Key @@ -872,28 +872,28 @@ Key custom_domain - - Title - Import and Export - Type - PSGroupSpecifier - - - Type - IASKButtonSpecifier - Title - Import Preferences... - Key - import_prefs - - - Type - IASKButtonSpecifier - Title - Export Preferences... - Key - export_prefs - + + Title + Import and Export + Type + PSGroupSpecifier + + + Type + IASKButtonSpecifier + Title + Import Preferences... + Key + import_prefs + + + Type + IASKButtonSpecifier + Title + Export Preferences... + Key + export_prefs + Title About NewsBlur