From dfa0eb944ac908802d515763d600a83ac2589aee Mon Sep 17 00:00:00 2001 From: David Sinclair Date: Fri, 27 Mar 2020 20:42:33 -0700 Subject: [PATCH] #1270 (replacing UIWebView with WKWebView) - Tweaks for Xcoce 11.4. - Web view fixes. --- clients/ios/Classes/EventWindow.m | 2 + .../Classes/GoogleReaderViewController.xib | 1692 ----------------- .../ios/NewsBlur.xcodeproj/project.pbxproj | 12 +- .../xcshareddata/xcschemes/NewsBlur.xcscheme | 2 +- .../xcschemes/Share Extension.xcscheme | 2 +- ...ry Notification Service Extension.xcscheme | 2 +- .../xcschemes/Widget Extension.xcscheme | 2 +- clients/ios/NewsBlur_Prefix.pch | 2 +- .../StoryDetailViewController~ipad.xib | 40 +- 9 files changed, 30 insertions(+), 1726 deletions(-) delete mode 100644 clients/ios/Classes/GoogleReaderViewController.xib diff --git a/clients/ios/Classes/EventWindow.m b/clients/ios/Classes/EventWindow.m index 8ebaf0659..c40ea368c 100644 --- a/clients/ios/Classes/EventWindow.m +++ b/clients/ios/Classes/EventWindow.m @@ -77,6 +77,8 @@ [contextualMenuTimer invalidate]; contextualMenuTimer = nil; break; + default: + break; } } else { // Multiple fingers are touching the screen unmoved = NO; diff --git a/clients/ios/Classes/GoogleReaderViewController.xib b/clients/ios/Classes/GoogleReaderViewController.xib deleted file mode 100644 index a35285365..000000000 --- a/clients/ios/Classes/GoogleReaderViewController.xib +++ /dev/null @@ -1,1692 +0,0 @@ - - - - 1296 - 11E53 - 2182 - 1138.47 - 569.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1181 - - - IBUIWebView - IBUIBarButtonItem - IBUIToolbar - IBUIView - IBProxyObject - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBIPadFramework - - - IBFirstResponder - IBIPadFramework - - - - 292 - - - - 274 - {{0, 44}, {540, 576}} - - - _NS:9 - - 1 - MSAxIDEAA - - IBIPadFramework - 1 - YES - - - - 266 - {540, 44} - - - - _NS:9 - NO - NO - IBIPadFramework - - - IBIPadFramework - - 5 - - - IBIPadFramework - 1 - - 1 - - - - - {540, 620} - - - - - 3 - MQA - - 2 - - - NO - - IBUIModalFormSheetSimulatedSizeMetrics - - YES - - - - - - {540, 620} - {540, 620} - - - IBIPadFramework - Form Sheet - - IBIPadFramework - - - - - - - view - - - - 3 - - - - webView - - - - 5 - - - - tapCancelButton: - - - - 9 - - - - - - 0 - - - - - - -1 - - - File's Owner - - - -2 - - - - - 2 - - - - - - - - - 4 - - - - - 6 - - - - - - - - - 7 - - - - - 8 - - - - - - - GoogleReaderViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - 9 - - - - - ActivityModule - UIView - - IBProjectSource - ./Classes/ActivityModule.h - - - - AddSiteViewController - UIViewController - - id - id - id - id - id - id - - - - addFolder - id - - - addSite - id - - - checkSiteAddress - id - - - doAddButton - id - - - doCancelButton - id - - - selectAddTypeSignup - id - - - - UIActivityIndicatorView - UIBarButtonItem - UITextField - UISegmentedControl - UILabel - NewsBlurAppDelegate - UIBarButtonItem - UILabel - UIPickerView - UITextField - UINavigationBar - UIActivityIndicatorView - UITextField - UIScrollView - UITableView - - - - activityIndicator - UIActivityIndicatorView - - - addButton - UIBarButtonItem - - - addFolderInput - UITextField - - - addTypeControl - UISegmentedControl - - - addingLabel - UILabel - - - appDelegate - NewsBlurAppDelegate - - - cancelButton - UIBarButtonItem - - - errorLabel - UILabel - - - folderPicker - UIPickerView - - - inFolderInput - UITextField - - - navBar - UINavigationBar - - - siteActivityIndicator - UIActivityIndicatorView - - - siteAddressInput - UITextField - - - siteScrollView - UIScrollView - - - siteTable - UITableView - - - - IBProjectSource - ./Classes/AddSiteViewController.h - - - - BaseViewController - UIViewController - - IBProjectSource - ./Classes/BaseViewController.h - - - - DashboardViewController - UIViewController - - id - id - - - - doLogout: - id - - - tapSegmentedButton: - id - - - - ActivityModule - NewsBlurAppDelegate - UIWebView - InteractionsModule - UISegmentedControl - UIToolbar - UIToolbar - - - - activitiesModule - ActivityModule - - - appDelegate - NewsBlurAppDelegate - - - feedbackWebView - UIWebView - - - interactionsModule - InteractionsModule - - - segmentedButton - UISegmentedControl - - - toolbar - UIToolbar - - - topToolbar - UIToolbar - - - - IBProjectSource - ./Classes/DashboardViewController.h - - - - FeedDetailViewController - BaseViewController - - id - id - id - - - - doOpenMarkReadActionSheet: - id - - - doOpenSettingsActionSheet - id - - - selectIntelligence - id - - - - NewsBlurAppDelegate - UIBarButtonItem - UISlider - UIToolbar - UISegmentedControl - UIBarButtonItem - UITableView - - - - appDelegate - NewsBlurAppDelegate - - - feedMarkReadButton - UIBarButtonItem - - - feedScoreSlider - UISlider - - - feedViewToolbar - UIToolbar - - - intelligenceControl - UISegmentedControl - - - settingsButton - UIBarButtonItem - - - storyTitlesTable - UITableView - - - - IBProjectSource - ./Classes/FeedDetailViewController.h - - - - FeedsMenuViewController - UIViewController - - NewsBlurAppDelegate - UITableView - - - - appDelegate - NewsBlurAppDelegate - - - menuTableView - UITableView - - - - IBProjectSource - ./Classes/FeedsMenuViewController.h - - - - FindSitesViewController - UIViewController - - NewsBlurAppDelegate - UISearchBar - UITableView - - - - appDelegate - NewsBlurAppDelegate - - - sitesSearchBar - UISearchBar - - - sitesTable - UITableView - - - - IBProjectSource - ./Classes/FindSitesViewController.h - - - - FirstTimeUserAddFriendsViewController - UIViewController - - id - id - id - id - - - - tapCategoryButton: - id - - - tapGoogleReaderButton - id - - - tapNewsBlurButton: - id - - - tapNextButton - id - - - - UIView - UIView - UIView - NewsBlurAppDelegate - UIButton - UIImageView - UIBarButtonItem - UIBarButtonItem - UIToolbar - UIButton - UIView - - - - addFriendsView - UIView - - - addNewsBlurView - UIView - - - addSitesView - UIView - - - appDelegate - NewsBlurAppDelegate - - - googleReaderButton - UIButton - - - logo - UIImageView - - - nextButton - UIBarButtonItem - - - previousButton - UIBarButtonItem - - - toolbar - UIToolbar - - - toolbarTitle - UIButton - - - welcomeView - UIView - - - - IBProjectSource - ./Classes/FirstTimeUserAddFriendsViewController.h - - - - FirstTimeUserAddNewsBlurViewController - UIViewController - - id - id - id - id - - - - tapCategoryButton: - id - - - tapGoogleReaderButton - id - - - tapNewsBlurButton: - id - - - tapNextButton - id - - - - UIView - UIView - UIView - NewsBlurAppDelegate - UIButton - UIImageView - UIBarButtonItem - UIBarButtonItem - UIToolbar - UIButton - UIView - - - - addFriendsView - UIView - - - addNewsBlurView - UIView - - - addSitesView - UIView - - - appDelegate - NewsBlurAppDelegate - - - googleReaderButton - UIButton - - - logo - UIImageView - - - nextButton - UIBarButtonItem - - - previousButton - UIBarButtonItem - - - toolbar - UIToolbar - - - toolbarTitle - UIButton - - - welcomeView - UIView - - - - IBProjectSource - ./Classes/FirstTimeUserAddNewsBlurViewController.h - - - - FirstTimeUserAddSitesViewController - UIViewController - - id - id - id - id - - - - tapCategoryButton: - id - - - tapGoogleReaderButton - id - - - tapNewsBlurButton: - id - - - tapNextButton - id - - - - UIView - UIView - UIView - NewsBlurAppDelegate - UIButton - UIImageView - UIBarButtonItem - UIBarButtonItem - UIToolbar - UIButton - UIView - - - - addFriendsView - UIView - - - addNewsBlurView - UIView - - - addSitesView - UIView - - - appDelegate - NewsBlurAppDelegate - - - googleReaderButton - UIButton - - - logo - UIImageView - - - nextButton - UIBarButtonItem - - - previousButton - UIBarButtonItem - - - toolbar - UIToolbar - - - toolbarTitle - UIButton - - - welcomeView - UIView - - - - IBProjectSource - ./Classes/FirstTimeUserAddSitesViewController.h - - - - FirstTimeUserViewController - UIViewController - - tapNextButton - id - - - tapNextButton - - tapNextButton - id - - - - NewsBlurAppDelegate - UIImageView - UIBarButtonItem - - - - appDelegate - NewsBlurAppDelegate - - - logo - UIImageView - - - nextButton - UIBarButtonItem - - - - IBProjectSource - ./Classes/FirstTimeUserViewController.h - - - - FontSettingsViewController - UIViewController - - id - id - - - - changeFontSize: - id - - - changeFontStyle: - id - - - - NewsBlurAppDelegate - UISegmentedControl - UISegmentedControl - UILabel - UILabel - - - - appDelegate - NewsBlurAppDelegate - - - fontSizeSegment - UISegmentedControl - - - fontStyleSegment - UISegmentedControl - - - largeFontSizeLabel - UILabel - - - smallFontSizeLabel - UILabel - - - - IBProjectSource - ./Classes/FontSettingsViewController.h - - - - FriendsListViewController - UIViewController - - NewsBlurAppDelegate - UISearchBar - UITableView - - - - appDelegate - NewsBlurAppDelegate - - - friendSearchBar - UISearchBar - - - friendsTable - UITableView - - - - IBProjectSource - ./Classes/FriendsListViewController.h - - - - GoogleReaderViewController - UIViewController - - tapCancelButton: - id - - - tapCancelButton: - - tapCancelButton: - id - - - - NewsBlurAppDelegate - UIWebView - - - - appDelegate - NewsBlurAppDelegate - - - webView - UIWebView - - - - IBProjectSource - ./Classes/GoogleReaderViewController.h - - - - InteractionsModule - UIView - - IBProjectSource - ./Classes/InteractionsModule.h - - - - LoginViewController - UIViewController - - id - id - id - id - id - - - - selectLogin - id - - - selectLoginSignup - id - - - selectSignUp - id - - - tapLoginButton - id - - - tapSignUpButton - id - - - - NewsBlurAppDelegate - UITextField - UILabel - UILabel - UIView - UISegmentedControl - UITextField - UILabel - UILabel - UIButton - UIButton - UITextField - UITextField - UIView - UITextField - UILabel - UILabel - - - - appDelegate - NewsBlurAppDelegate - - - emailInput - UITextField - - - emailLabel - UILabel - - - errorLabel - UILabel - - - logInView - UIView - - - loginControl - UISegmentedControl - - - passwordInput - UITextField - - - passwordLabel - UILabel - - - passwordOptionalLabel - UILabel - - - selectLoginButton - UIButton - - - selectSignUpButton - UIButton - - - signUpPasswordInput - UITextField - - - signUpUsernameInput - UITextField - - - signUpView - UIView - - - usernameInput - UITextField - - - usernameLabel - UILabel - - - usernameOrEmailLabel - UILabel - - - - IBProjectSource - ./Classes/LoginViewController.h - - - - MoveSiteViewController - UIViewController - - id - id - id - id - - - - doCancelButton - id - - - doMoveButton - id - - - moveFolder - id - - - moveSite - id - - - - UIActivityIndicatorView - NewsBlurAppDelegate - UIBarButtonItem - UILabel - UIPickerView - UITextField - UIBarButtonItem - UILabel - UINavigationBar - UILabel - UITextField - - - - activityIndicator - UIActivityIndicatorView - - - appDelegate - NewsBlurAppDelegate - - - cancelButton - UIBarButtonItem - - - errorLabel - UILabel - - - folderPicker - UIPickerView - - - fromFolderInput - UITextField - - - moveButton - UIBarButtonItem - - - movingLabel - UILabel - - - navBar - UINavigationBar - - - titleLabel - UILabel - - - toFolderInput - UITextField - - - - IBProjectSource - ./Classes/MoveSiteViewController.h - - - - NBContainerViewController - UIViewController - - appDelegate - NewsBlurAppDelegate - - - appDelegate - - appDelegate - NewsBlurAppDelegate - - - - IBProjectSource - ./Classes/NBContainerViewController.h - - - - NewsBlurAppDelegate - BaseViewController - - AddSiteViewController - DashboardViewController - FeedDashboardViewController - FeedDetailViewController - FeedsMenuViewController - NewsBlurViewController - FindSitesViewController - FirstTimeUserAddFriendsViewController - FirstTimeUserAddNewsBlurViewController - FirstTimeUserAddSitesViewController - FirstTimeUserViewController - FontSettingsViewController - FriendsListViewController - UINavigationController - GoogleReaderViewController - LoginViewController - NBContainerViewController - MoveSiteViewController - UINavigationController - OriginalStoryViewController - ShareViewController - StoryDetailViewController - UserProfileViewController - UIWindow - - - - addSiteViewController - AddSiteViewController - - - dashboardViewController - DashboardViewController - - - feedDashboardViewController - FeedDashboardViewController - - - feedDetailViewController - FeedDetailViewController - - - feedsMenuViewController - FeedsMenuViewController - - - feedsViewController - NewsBlurViewController - - - findSitesViewController - FindSitesViewController - - - firstTimeUserAddFriendsViewController - FirstTimeUserAddFriendsViewController - - - firstTimeUserAddNewsBlurViewController - FirstTimeUserAddNewsBlurViewController - - - firstTimeUserAddSitesViewController - FirstTimeUserAddSitesViewController - - - firstTimeUserViewController - FirstTimeUserViewController - - - fontSettingsViewController - FontSettingsViewController - - - friendsListViewController - FriendsListViewController - - - ftuxNavigationController - UINavigationController - - - googleReaderViewController - GoogleReaderViewController - - - loginViewController - LoginViewController - - - masterContainerViewController - NBContainerViewController - - - moveSiteViewController - MoveSiteViewController - - - navigationController - UINavigationController - - - originalStoryViewController - OriginalStoryViewController - - - shareViewController - ShareViewController - - - storyDetailViewController - StoryDetailViewController - - - userProfileViewController - UserProfileViewController - - - window - UIWindow - - - - IBProjectSource - ./Classes/NewsBlurAppDelegate.h - - - - NewsBlurViewController - BaseViewController - - UIButton - UIButton - UIButton - id - id - - - - sectionTapped: - UIButton - - - sectionUntapped: - UIButton - - - sectionUntappedOutside: - UIButton - - - selectIntelligence - id - - - tapAddSite: - id - - - - NewsBlurAppDelegate - UISlider - UITableView - UIToolbar - UIBarButtonItem - UIView - UISegmentedControl - - - - appDelegate - NewsBlurAppDelegate - - - feedScoreSlider - UISlider - - - feedTitlesTable - UITableView - - - feedViewToolbar - UIToolbar - - - homeButton - UIBarButtonItem - - - innerView - UIView - - - intelligenceControl - UISegmentedControl - - - - IBProjectSource - ./Classes/NewsBlurViewController.h - - - - OriginalStoryViewController - BaseViewController - - id - id - id - - - - doCloseOriginalStoryViewController - id - - - doOpenActionSheet - id - - - loadAddress: - id - - - - NewsBlurAppDelegate - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UILabel - UITextField - UIBarButtonItem - UIToolbar - UIWebView - - - - appDelegate - NewsBlurAppDelegate - - - back - UIBarButtonItem - - - closeButton - UIBarButtonItem - - - forward - UIBarButtonItem - - - pageAction - UIBarButtonItem - - - pageTitle - UILabel - - - pageUrl - UITextField - - - refresh - UIBarButtonItem - - - toolbar - UIToolbar - - - webView - UIWebView - - - - IBProjectSource - ./Classes/OriginalStoryViewController.h - - - - ShareViewController - UIViewController - - id - id - id - id - - - - doCancelButton: - id - - - doReplyToComment: - id - - - doShareThisStory: - id - - - doToggleButton: - id - - - - NewsBlurAppDelegate - UITextView - UIButton - UIBarButtonItem - UIBarButtonItem - UIButton - - - - appDelegate - NewsBlurAppDelegate - - - commentField - UITextView - - - facebookButton - UIButton - - - submitButton - UIBarButtonItem - - - toolbarTitle - UIBarButtonItem - - - twitterButton - UIButton - - - - IBProjectSource - ./Classes/ShareViewController.h - - - - StoryDetailViewController - UIViewController - - id - id - id - id - id - id - - - - doNextStory - id - - - doNextUnreadStory - id - - - doPreviousStory - id - - - showOriginalSubview: - id - - - tapProgressBar: - id - - - toggleFontSize: - id - - - - UIBarButtonItem - NewsBlurAppDelegate - UIToolbar - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIBarButtonItem - UIView - UIBarButtonItem - UIView - UILabel - UIBarButtonItem - UIProgressView - UIView - UIToolbar - UIWebView - - - - activity - UIBarButtonItem - - - appDelegate - NewsBlurAppDelegate - - - bottomPlaceholderToolbar - UIToolbar - - - buttonAction - UIBarButtonItem - - - buttonNext - UIBarButtonItem - - - buttonNextStory - UIBarButtonItem - - - buttonPrevious - UIBarButtonItem - - - feedTitleGradient - UIView - - - fontSettingsButton - UIBarButtonItem - - - innerView - UIView - - - noStorySelectedLabel - UILabel - - - originalStoryButton - UIBarButtonItem - - - progressView - UIProgressView - - - progressViewContainer - UIView - - - toolbar - UIToolbar - - - webView - UIWebView - - - - IBProjectSource - ./Classes/StoryDetailViewController.h - - - - UserProfileViewController - UIViewController - - IBProjectSource - ./Classes/UserProfileViewController.h - - - - - 0 - IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - YES - 3 - 1181 - - diff --git a/clients/ios/NewsBlur.xcodeproj/project.pbxproj b/clients/ios/NewsBlur.xcodeproj/project.pbxproj index 780443668..f9e77a7cd 100755 --- a/clients/ios/NewsBlur.xcodeproj/project.pbxproj +++ b/clients/ios/NewsBlur.xcodeproj/project.pbxproj @@ -238,7 +238,6 @@ 43C3D40A15D468BA0066D36D /* all.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D40915D468BA0066D36D /* all.png */; }; 43C3D40C15D469010066D36D /* unread_yellow.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D40B15D469010066D36D /* unread_yellow.png */; }; 43C3D41215D46D330066D36D /* all@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43C3D41115D46D330066D36D /* all@2x.png */; }; - 43C95C49158BEC450086C69B /* GoogleReaderViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43C95C47158BEC440086C69B /* GoogleReaderViewController.xib */; }; 43CE0F5F15DADB7F00608ED8 /* SiteCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 43CE0F5E15DADB7F00608ED8 /* SiteCell.m */; }; 43D818A315B940C200733444 /* DataUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 43D818A215B940C200733444 /* DataUtilities.m */; }; 43E8381E15BC73EB000553BE /* FirstTimeUserAddFriendsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 43E8381615BC73EA000553BE /* FirstTimeUserAddFriendsViewController.m */; }; @@ -315,7 +314,6 @@ FF22FE7316E554FD0046165A /* barbutton_sendto@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF22FE7116E554FD0046165A /* barbutton_sendto@2x.png */; }; FF22FE7616E557D80046165A /* toolbar_tall_background.png in Resources */ = {isa = PBXBuildFile; fileRef = FF22FE7416E557D80046165A /* toolbar_tall_background.png */; }; FF22FE7716E557D80046165A /* toolbar_tall_background@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FF22FE7516E557D80046165A /* toolbar_tall_background@2x.png */; }; - FF26125418C00FEC0055FF4D /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF26125318C00FEC0055FF4D /* AddressBook.framework */; }; FF265F12187B6D4F0080C332 /* fitvid.js in Resources */ = {isa = PBXBuildFile; fileRef = FF265F10187B6B230080C332 /* fitvid.js */; }; FF2924E51E932D2900FCFA63 /* PINCache.m in Sources */ = {isa = PBXBuildFile; fileRef = FF2924DF1E932D2900FCFA63 /* PINCache.m */; }; FF2924E61E932D2900FCFA63 /* PINDiskCache.m in Sources */ = {isa = PBXBuildFile; fileRef = FF2924E21E932D2900FCFA63 /* PINDiskCache.m */; }; @@ -333,7 +331,6 @@ FF2D8B351487250C00057B80 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF2D8B341487250C00057B80 /* MessageUI.framework */; }; FF2D8C6C1487F05100057B80 /* Twitter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF2D8C6B1487F05100057B80 /* Twitter.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; FF2D8CE514893BC000057B80 /* MoveSiteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FF2D8CE314893BBF00057B80 /* MoveSiteViewController.m */; }; - FF308A7B18C01014009F986A /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF308A7A18C01014009F986A /* AssetsLibrary.framework */; }; FF308A7D18C01025009F986A /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF308A7C18C01025009F986A /* CoreMotion.framework */; }; FF308A7F18C01037009F986A /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF308A7E18C01037009F986A /* CoreLocation.framework */; }; FF308A8118C01043009F986A /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FF308A8018C01043009F986A /* MediaPlayer.framework */; }; @@ -938,7 +935,6 @@ 43C3D40915D468BA0066D36D /* all.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = all.png; sourceTree = ""; }; 43C3D40B15D469010066D36D /* unread_yellow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = unread_yellow.png; sourceTree = ""; }; 43C3D41115D46D330066D36D /* all@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "all@2x.png"; sourceTree = ""; }; - 43C95C47158BEC440086C69B /* GoogleReaderViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = GoogleReaderViewController.xib; path = Classes/GoogleReaderViewController.xib; sourceTree = ""; }; 43CE0F5D15DADB7E00608ED8 /* SiteCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SiteCell.h; sourceTree = ""; }; 43CE0F5E15DADB7F00608ED8 /* SiteCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SiteCell.m; sourceTree = ""; }; 43D0451F1565BC150085F811 /* MainWindow~ipad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainWindow~ipad.xib"; path = "Resources-iPad/MainWindow~ipad.xib"; sourceTree = ""; }; @@ -1502,8 +1498,6 @@ FF308A7F18C01037009F986A /* CoreLocation.framework in Frameworks */, FF83FF011FB51628008DAC0F /* StoreKit.framework in Frameworks */, FF308A7D18C01025009F986A /* CoreMotion.framework in Frameworks */, - FF308A7B18C01014009F986A /* AssetsLibrary.framework in Frameworks */, - FF26125418C00FEC0055FF4D /* AddressBook.framework in Frameworks */, FF468E3817FCFB970080325C /* AVFoundation.framework in Frameworks */, 78095E45128EF37E00230C8E /* SystemConfiguration.framework in Frameworks */, FF4EE9A4175EC9CF005891B5 /* libsqlite3.dylib in Frameworks */, @@ -2300,7 +2294,6 @@ isa = PBXGroup; children = ( 433323B5158901A40025064D /* Images */, - 43C95C47158BEC440086C69B /* GoogleReaderViewController.xib */, 43D045241565BC150085F811 /* LoginViewController~ipad.xib */, FF1660C916D6E9B400AF8541 /* DashboardViewController~ipad.xib */, 43D0451F1565BC150085F811 /* MainWindow~ipad.xib */, @@ -2831,7 +2824,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1120; - LastUpgradeCheck = 1130; + LastUpgradeCheck = 1140; ORGANIZATIONNAME = NewsBlur; TargetAttributes = { 1749390F1C251BFE003D98AA = { @@ -2996,7 +2989,6 @@ FF9DC9EB1C860944006097E1 /* bar_separator_dark.png in Resources */, 433323CE158968ED0025064D /* FirstTimeUserViewController.xib in Resources */, FFB7050D1925921F0052101C /* line_spacing_xl.png in Resources */, - 43C95C49158BEC450086C69B /* GoogleReaderViewController.xib in Resources */, 43763AD2158F90B100B3DBE2 /* FontSettingsViewController.xib in Resources */, 439DAB211590DA350019B0EB /* FeedsMenuViewController.xib in Resources */, 010EDEFC1B238722003B79DE /* 1Password.xcassets in Resources */, @@ -3946,7 +3938,6 @@ STRIP_INSTALLED_PRODUCT = NO; SWIFT_OBJC_BRIDGING_HEADER = "Other Sources/BridgingHeader.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - VALID_ARCHS = "armv7s armv7 arm64"; }; name = Debug; }; @@ -3994,7 +3985,6 @@ STRIP_INSTALLED_PRODUCT = NO; SWIFT_OBJC_BRIDGING_HEADER = "Other Sources/BridgingHeader.h"; SWIFT_OPTIMIZATION_LEVEL = "-O"; - VALID_ARCHS = "armv7s armv7 arm64"; }; name = Release; }; diff --git a/clients/ios/NewsBlur.xcodeproj/xcshareddata/xcschemes/NewsBlur.xcscheme b/clients/ios/NewsBlur.xcodeproj/xcshareddata/xcschemes/NewsBlur.xcscheme index 19b8c2c57..49dd63ead 100644 --- a/clients/ios/NewsBlur.xcodeproj/xcshareddata/xcschemes/NewsBlur.xcscheme +++ b/clients/ios/NewsBlur.xcodeproj/xcshareddata/xcschemes/NewsBlur.xcscheme @@ -1,6 +1,6 @@ - #import + #import //#define DEBUG 1 //#define PROD_DEBUG 1 diff --git a/clients/ios/Resources-iPad/Classes/StoryDetailViewController~ipad.xib b/clients/ios/Resources-iPad/Classes/StoryDetailViewController~ipad.xib index 51e6e3758..25dc8894e 100644 --- a/clients/ios/Resources-iPad/Classes/StoryDetailViewController~ipad.xib +++ b/clients/ios/Resources-iPad/Classes/StoryDetailViewController~ipad.xib @@ -1,8 +1,10 @@ - - + + + - + + @@ -10,7 +12,7 @@ - + @@ -18,35 +20,36 @@ - + - + - - + - - + + + + + + + @@ -54,9 +57,10 @@ + - +