Skip to content

Commit

Permalink
Merge branch 'dejal' into wkwebkit
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dejal
Dejal committed Mar 28, 2020
2 parents c3556b0 + eefde0d commit fcd684b
Show file tree
Hide file tree
Showing 5 changed files with 82 additions and 81 deletions.
2 changes: 1 addition & 1 deletion clients/ios/Classes/FeedDetailViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2242,7 +2242,7 @@ - (IBAction)doOpenSettingsMenu:(id)sender {
[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];
}];
}
Expand Down
3 changes: 2 additions & 1 deletion clients/ios/Classes/StoryPageControl.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,8 @@ - (void)restorePage {
if (pageIndex >= 0) {
[self changePage:pageIndex animated:NO];
} else if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
[self doNextUnreadStory:nil];
// If the story can't be found, don't show anything; uncomment this to instead show the first unread story:
// [self doNextUnreadStory:nil];
} else {
[appDelegate hideStoryDetailView];
}
Expand Down
20 changes: 10 additions & 10 deletions clients/ios/NewsBlur.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3640,7 +3640,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;
Expand Down Expand Up @@ -3690,7 +3690,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;
Expand Down Expand Up @@ -3736,7 +3736,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;
Expand Down Expand Up @@ -3785,7 +3785,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;
Expand Down Expand Up @@ -3817,7 +3817,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)",
Expand All @@ -3837,7 +3837,7 @@
"\"$(SRCROOT)\"",
"\"$(SRCROOT)/Other Sources\"",
);
MARKETING_VERSION = 10.0;
MARKETING_VERSION = 10.0.1;
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_LDFLAGS = (
"-lsqlite3.0",
Expand Down Expand Up @@ -3866,7 +3866,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)",
Expand All @@ -3885,7 +3885,7 @@
"\"$(SRCROOT)\"",
"\"$(SRCROOT)/Other Sources\"",
);
MARKETING_VERSION = 10.0;
MARKETING_VERSION = 10.0.1;
OTHER_LDFLAGS = (
"-lsqlite3.0",
"-ObjC",
Expand Down Expand Up @@ -4013,7 +4013,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;
Expand Down Expand Up @@ -4053,7 +4053,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;
Expand Down
70 changes: 35 additions & 35 deletions clients/ios/Resources/Settings.bundle/Root.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,21 +142,21 @@
<key>Key</key>
<string>show_global_shared_stories</string>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>Mark stories read on scroll</string>
<key>DefaultValue</key>
<string>YES</string>
<key>Key</key>
<string>default_scroll_read_filter</string>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>Override scroll read per feed/folder</string>
<string>Mark stories read on scroll</string>
<key>DefaultValue</key>
<string>YES</string>
<key>Key</key>
<string>default_scroll_read_filter</string>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>Show override mark read on scroll</string>
<key>DefaultValue</key>
<string>YES</string>
<key>Key</key>
Expand Down Expand Up @@ -682,15 +682,15 @@
<key>Titles</key>
<array>
<string>Train intelligence</string>
<string>Notifications</string>
<string>Notifications</string>
<string>Statistics</string>
</array>
<key>DefaultValue</key>
<string>notifications</string>
<key>Values</key>
<array>
<string>trainer</string>
<string>notifications</string>
<string>notifications</string>
<string>statistics</string>
</array>
<key>Key</key>
Expand Down Expand Up @@ -862,28 +862,28 @@
<key>Key</key>
<string>custom_domain</string>
</dict>
<dict>
<key>Title</key>
<string>Import and Export</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>Type</key>
<string>IASKButtonSpecifier</string>
<key>Title</key>
<string>Import Preferences...</string>
<key>Key</key>
<string>import_prefs</string>
</dict>
<dict>
<key>Type</key>
<string>IASKButtonSpecifier</string>
<key>Title</key>
<string>Export Preferences...</string>
<key>Key</key>
<string>export_prefs</string>
</dict>
<dict>
<key>Title</key>
<string>Import and Export</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>Type</key>
<string>IASKButtonSpecifier</string>
<key>Title</key>
<string>Import Preferences...</string>
<key>Key</key>
<string>import_prefs</string>
</dict>
<dict>
<key>Type</key>
<string>IASKButtonSpecifier</string>
<key>Title</key>
<string>Export Preferences...</string>
<key>Key</key>
<string>export_prefs</string>
</dict>
<dict>
<key>Title</key>
<string>About NewsBlur</string>
Expand Down
68 changes: 34 additions & 34 deletions clients/ios/Resources/Settings.bundle/Root~ipad.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,16 +152,16 @@
<key>Key</key>
<string>default_scroll_read_filter</string>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>Override scroll read per feed/folder</string>
<key>DefaultValue</key>
<string>YES</string>
<key>Key</key>
<string>override_scroll_read_filter</string>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>Show override mark read on scroll</string>
<key>DefaultValue</key>
<string>YES</string>
<key>Key</key>
<string>override_scroll_read_filter</string>
</dict>
<dict>
<key>Type</key>
<string>PSMultiValueSpecifier</string>
Expand Down Expand Up @@ -703,14 +703,14 @@
<array>
<string>Train intelligence</string>
<string>Notifications</string>
<string>Statistics</string>
<string>Statistics</string>
</array>
<key>DefaultValue</key>
<string>notifications</string>
<key>Values</key>
<array>
<string>trainer</string>
<string>notifications</string>
<string>notifications</string>
<string>statistics</string>
</array>
<key>Key</key>
Expand Down Expand Up @@ -872,28 +872,28 @@
<key>Key</key>
<string>custom_domain</string>
</dict>
<dict>
<key>Title</key>
<string>Import and Export</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>Type</key>
<string>IASKButtonSpecifier</string>
<key>Title</key>
<string>Import Preferences...</string>
<key>Key</key>
<string>import_prefs</string>
</dict>
<dict>
<key>Type</key>
<string>IASKButtonSpecifier</string>
<key>Title</key>
<string>Export Preferences...</string>
<key>Key</key>
<string>export_prefs</string>
</dict>
<dict>
<key>Title</key>
<string>Import and Export</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>Type</key>
<string>IASKButtonSpecifier</string>
<key>Title</key>
<string>Import Preferences...</string>
<key>Key</key>
<string>import_prefs</string>
</dict>
<dict>
<key>Type</key>
<string>IASKButtonSpecifier</string>
<key>Title</key>
<string>Export Preferences...</string>
<key>Key</key>
<string>export_prefs</string>
</dict>
<dict>
<key>Title</key>
<string>About NewsBlur</string>
Expand Down

0 comments on commit fcd684b

Please sign in to comment.