diff --git a/Kiwix.xcodeproj/project.pbxproj b/Kiwix.xcodeproj/project.pbxproj index 0d17d209..c26486bb 100644 --- a/Kiwix.xcodeproj/project.pbxproj +++ b/Kiwix.xcodeproj/project.pbxproj @@ -77,11 +77,7 @@ 977AE7F91DD8F22400F1E581 /* SearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 971A102A1D022AD5007FC62C /* SearchBar.swift */; }; 977B121C1E3A5E8D00981890 /* LibraryCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = 977B121B1E3A5E8D00981890 /* LibraryCells.swift */; }; 977B954D1DD4C40400F6F62B /* ScanLocalBook.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D6811E1D6F70AC00E5FA99 /* ScanLocalBook.swift */; }; - 978C9DC01E4245B60078BFF7 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 978C9DBF1E4245B60078BFF7 /* UserNotifications.framework */; }; - 978C9DC21E4245B60078BFF7 /* UserNotificationsUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 978C9DC11E4245B60078BFF7 /* UserNotificationsUI.framework */; }; 978C9DCC1E4245B60078BFF7 /* ArticlePreview.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 978C9DBE1E4245B60078BFF7 /* ArticlePreview.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - 978C9DD61E4245FD0078BFF7 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 978C9DD21E4245FD0078BFF7 /* MainInterface.storyboard */; }; - 978C9DD81E4245FD0078BFF7 /* NotificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 978C9DD51E4245FD0078BFF7 /* NotificationViewController.swift */; }; 97A08C151DD263B90070D0E4 /* Book.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D681341D6F711A00E5FA99 /* Book.swift */; }; 97A127C91D777CF100FB204D /* RecentSearchController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97A127C51D777CF100FB204D /* RecentSearchController.swift */; }; 97A127CC1D777CF100FB204D /* SearchResultController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97A127C81D777CF100FB204D /* SearchResultController.swift */; }; @@ -105,7 +101,6 @@ 97C4A2E31E3926E50004CEB2 /* LibraryTabController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97C4A2E21E3926E50004CEB2 /* LibraryTabController.swift */; }; 97C601DC1D7F15C400362D4F /* Bookmark.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C601DB1D7F15C400362D4F /* Bookmark.storyboard */; }; 97C601DE1D7F342100362D4F /* HTMLHeading.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97C601DD1D7F342100362D4F /* HTMLHeading.swift */; }; - 97D048AC1E32B7BE0028F9FD /* liblzma.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9764F5921D830EF200E0B1C4 /* liblzma.tbd */; }; 97D0E9931DDA487E0029530E /* SearchBaseController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D0E9921DDA487E0029530E /* SearchBaseController.swift */; }; 97D681311D6F70EC00E5FA99 /* 1.5.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = 97D6812F1D6F70EC00E5FA99 /* 1.5.xcmappingmodel */; }; 97D681321D6F70EC00E5FA99 /* MigrationPolicy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97D681301D6F70EC00E5FA99 /* MigrationPolicy.swift */; }; @@ -130,13 +125,6 @@ remoteGlobalIDString = 9779C3121D4575AD0064CC8E; remoteInfo = Bookmarks; }; - 978C9DCA1E4245B60078BFF7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 97A2AB801C1B80FF00052E74 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 978C9DBD1E4245B60078BFF7; - remoteInfo = ArticlePreview; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -146,7 +134,6 @@ dstPath = ""; dstSubfolderSpec = 13; files = ( - 978C9DCC1E4245B60078BFF7 /* ArticlePreview.appex in Embed App Extensions */, 9779C31E1D4575AE0064CC8E /* Bookmarks.appex in Embed App Extensions */, ); name = "Embed App Extensions"; @@ -230,7 +217,6 @@ 977A458B1E14EA140089C596 /* Cloud.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Cloud.swift; sourceTree = ""; }; 977B121B1E3A5E8D00981890 /* LibraryCells.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LibraryCells.swift; sourceTree = ""; }; 9788419C1DA2FF2A00D22D3C /* MainInterface.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainInterface.storyboard; sourceTree = ""; }; - 978C9DBE1E4245B60078BFF7 /* ArticlePreview.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = ArticlePreview.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 978C9DBF1E4245B60078BFF7 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; }; 978C9DC11E4245B60078BFF7 /* UserNotificationsUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotificationsUI.framework; path = System/Library/Frameworks/UserNotificationsUI.framework; sourceTree = SDKROOT; }; 978C9DD31E4245FD0078BFF7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = ""; }; @@ -297,20 +283,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 97D048AC1E32B7BE0028F9FD /* liblzma.tbd in Frameworks */, 9779C3141D4575AD0064CC8E /* NotificationCenter.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 978C9DBB1E4245B60078BFF7 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 978C9DC21E4245B60078BFF7 /* UserNotificationsUI.framework in Frameworks */, - 978C9DC01E4245B60078BFF7 /* UserNotifications.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 97A2AB851C1B80FF00052E74 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -542,13 +518,6 @@ name = reader; sourceTree = ""; }; - 975334CD1CEB6A78007ED50B /* Others */ = { - isa = PBXGroup; - children = ( - ); - name = Others; - sourceTree = ""; - }; 9771DC4B1C37278E009ECFF0 /* Setting */ = { isa = PBXGroup; children = ( @@ -666,7 +635,6 @@ 973BCD1F1CEB412E00F10B44 /* Shared */, 973BCCE41CEB3EDE00F10B44 /* iOS */, 97E609F21D103DED00EBCB9D /* iOSWidgets */, - 975334CD1CEB6A78007ED50B /* Others */, 931D277C156AE671D3F9EADA /* Frameworks */, F544A4E4357A6D33CF234C6B /* Pods */, 9C1D0054BEA442431151A95D /* Products */, @@ -754,7 +722,6 @@ 9C1D0054BEA442431151A95D /* Products */ = { isa = PBXGroup; children = ( - 978C9DBE1E4245B60078BFF7 /* ArticlePreview.appex */, ); name = Products; sourceTree = ""; @@ -790,23 +757,6 @@ productReference = 9779C3131D4575AD0064CC8E /* Bookmarks.appex */; productType = "com.apple.product-type.app-extension"; }; - 978C9DBD1E4245B60078BFF7 /* ArticlePreview */ = { - isa = PBXNativeTarget; - buildConfigurationList = 978C9DCD1E4245B60078BFF7 /* Build configuration list for PBXNativeTarget "ArticlePreview" */; - buildPhases = ( - 978C9DBA1E4245B60078BFF7 /* Sources */, - 978C9DBB1E4245B60078BFF7 /* Frameworks */, - 978C9DBC1E4245B60078BFF7 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = ArticlePreview; - productName = ArticlePreview; - productReference = 978C9DBE1E4245B60078BFF7 /* ArticlePreview.appex */; - productType = "com.apple.product-type.app-extension"; - }; 97A2AB871C1B80FF00052E74 /* Kiwix-iOS */ = { isa = PBXNativeTarget; buildConfigurationList = 97A2ABB31C1B810000052E74 /* Build configuration list for PBXNativeTarget "Kiwix-iOS" */; @@ -823,7 +773,6 @@ ); dependencies = ( 9779C31D1D4575AE0064CC8E /* PBXTargetDependency */, - 978C9DCB1E4245B60078BFF7 /* PBXTargetDependency */, ); name = "Kiwix-iOS"; productName = Kiwix; @@ -850,11 +799,6 @@ }; }; }; - 978C9DBD1E4245B60078BFF7 = { - CreatedOnToolsVersion = 8.3; - DevelopmentTeam = L7HWM3SP3L; - ProvisioningStyle = Automatic; - }; 97A2AB871C1B80FF00052E74 = { CreatedOnToolsVersion = 7.2; DevelopmentTeam = L7HWM3SP3L; @@ -894,7 +838,6 @@ targets = ( 97A2AB871C1B80FF00052E74 /* Kiwix-iOS */, 9779C3121D4575AD0064CC8E /* Bookmarks */, - 978C9DBD1E4245B60078BFF7 /* ArticlePreview */, ); }; /* End PBXProject section */ @@ -908,14 +851,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 978C9DBC1E4245B60078BFF7 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 978C9DD61E4245FD0078BFF7 /* MainInterface.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 97A2AB861C1B80FF00052E74 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -997,14 +932,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 978C9DBA1E4245B60078BFF7 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 978C9DD81E4245FD0078BFF7 /* NotificationViewController.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 97A2AB841C1B80FF00052E74 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1094,11 +1021,6 @@ target = 9779C3121D4575AD0064CC8E /* Bookmarks */; targetProxy = 9779C31C1D4575AE0064CC8E /* PBXContainerItemProxy */; }; - 978C9DCB1E4245B60078BFF7 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 978C9DBD1E4245B60078BFF7 /* ArticlePreview */; - targetProxy = 978C9DCA1E4245B60078BFF7 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -1147,45 +1069,6 @@ }; name = Release; }; - 978C9DCE1E4245B60078BFF7 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = L7HWM3SP3L; - INFOPLIST_FILE = "$(SRCROOT)/iOSExtension/ArticlePreview/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = self.Kiwix.ArticlePreview; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_VERSION = 3.0; - }; - name = Debug; - }; - 978C9DCF1E4245B60078BFF7 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = L7HWM3SP3L; - INFOPLIST_FILE = "$(SRCROOT)/iOSExtension/ArticlePreview/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = self.Kiwix.ArticlePreview; - PRODUCT_NAME = "$(TARGET_NAME)"; - SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; - }; - name = Release; - }; 97A2ABB11C1B810000052E74 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1362,14 +1245,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 978C9DCD1E4245B60078BFF7 /* Build configuration list for PBXNativeTarget "ArticlePreview" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 978C9DCE1E4245B60078BFF7 /* Debug */, - 978C9DCF1E4245B60078BFF7 /* Release */, - ); - defaultConfigurationIsVisible = 0; - }; 97A2AB831C1B80FF00052E74 /* Build configuration list for PBXProject "Kiwix" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/iOSExtension/ArticlePreview/Base.lproj/MainInterface.storyboard b/iOSExtension/ArticlePreview/Base.lproj/MainInterface.storyboard deleted file mode 100644 index 4a583e33..00000000 --- a/iOSExtension/ArticlePreview/Base.lproj/MainInterface.storyboard +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iOSExtension/ArticlePreview/Info.plist b/iOSExtension/ArticlePreview/Info.plist deleted file mode 100644 index 507164a2..00000000 --- a/iOSExtension/ArticlePreview/Info.plist +++ /dev/null @@ -1,38 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleDisplayName - ArticlePreview - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - XPC! - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - NSExtension - - NSExtensionAttributes - - UNNotificationExtensionCategory - myNotificationCategory - UNNotificationExtensionInitialContentSizeRatio - 1 - - NSExtensionMainStoryboard - MainInterface - NSExtensionPointIdentifier - com.apple.usernotifications.content-extension - - - diff --git a/iOSExtension/ArticlePreview/NotificationViewController.swift b/iOSExtension/ArticlePreview/NotificationViewController.swift deleted file mode 100644 index d30625af..00000000 --- a/iOSExtension/ArticlePreview/NotificationViewController.swift +++ /dev/null @@ -1,26 +0,0 @@ -// -// NotificationViewController.swift -// ArticlePreview -// -// Created by Chris Li on 2/1/17. -// Copyright © 2017 Chris Li. All rights reserved. -// - -import UIKit -import UserNotifications -import UserNotificationsUI - -class NotificationViewController: UIViewController, UNNotificationContentExtension { - - @IBOutlet var label: UILabel? - - override func viewDidLoad() { - super.viewDidLoad() - // Do any required interface initialization here. - } - - func didReceive(_ notification: UNNotification) { - self.label?.text = notification.request.content.body - } - -}