From 4d0204b49f670e5834322b020f328337c1973371 Mon Sep 17 00:00:00 2001 From: Chris Li Date: Wed, 28 Dec 2016 16:23:46 -0500 Subject: [PATCH] commit --- .../Search/SearchBaseController.swift | 2 +- .../Search/SearchBooksController.swift | 2 +- .../Search/SearchResultController.swift | 2 +- Kiwix-iOS/Info.plist | 2 +- Kiwix-iOSWidgets/Bookmarks/Info.plist | 2 +- Kiwix.xcodeproj/project.pbxproj | 28 ------------------- 6 files changed, 5 insertions(+), 33 deletions(-) diff --git a/Kiwix-iOS/Controller/Search/SearchBaseController.swift b/Kiwix-iOS/Controller/Search/SearchBaseController.swift index 3790dbbe..11395a21 100644 --- a/Kiwix-iOS/Controller/Search/SearchBaseController.swift +++ b/Kiwix-iOS/Controller/Search/SearchBaseController.swift @@ -10,7 +10,7 @@ import UIKit import DZNEmptyDataSet -class SearchBaseTableController: CoreDataTableBaseController, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate { +class SearchBaseTableController: CoreDataTableBaseController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) diff --git a/Kiwix-iOS/Controller/Search/SearchBooksController.swift b/Kiwix-iOS/Controller/Search/SearchBooksController.swift index 5b3d123a..73805f3b 100644 --- a/Kiwix-iOS/Controller/Search/SearchBooksController.swift +++ b/Kiwix-iOS/Controller/Search/SearchBooksController.swift @@ -10,7 +10,7 @@ import UIKit import CoreData import DZNEmptyDataSet -class SearchBooksController: SearchBaseTableController, UITableViewDelegate, UITableViewDataSource, TableCellDelegate { +class SearchBooksController: SearchBaseTableController, UITableViewDelegate, UITableViewDataSource, TableCellDelegate, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate { @IBOutlet weak var recentSearchContainer: DropShadowView! @IBOutlet weak var recentSearchBarHeight: NSLayoutConstraint! diff --git a/Kiwix-iOS/Controller/Search/SearchResultController.swift b/Kiwix-iOS/Controller/Search/SearchResultController.swift index c6d8c9d6..9fa4bea3 100644 --- a/Kiwix-iOS/Controller/Search/SearchResultController.swift +++ b/Kiwix-iOS/Controller/Search/SearchResultController.swift @@ -10,7 +10,7 @@ import UIKit import ProcedureKit import DZNEmptyDataSet -class SearchResultController: SearchBaseTableController, UITableViewDataSource, UITableViewDelegate { +class SearchResultController: SearchBaseTableController, UITableViewDataSource, UITableViewDelegate, DZNEmptyDataSetSource, DZNEmptyDataSetDelegate { private var searchResults = [SearchResult]() private var shouldShowNoResults = false diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist index 612a2262..9204336d 100644 --- a/Kiwix-iOS/Info.plist +++ b/Kiwix-iOS/Info.plist @@ -49,7 +49,7 @@ CFBundleVersion - 1.8.3845 + 1.8.3848 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/Kiwix-iOSWidgets/Bookmarks/Info.plist b/Kiwix-iOSWidgets/Bookmarks/Info.plist index 2501a718..f817d564 100644 --- a/Kiwix-iOSWidgets/Bookmarks/Info.plist +++ b/Kiwix-iOSWidgets/Bookmarks/Info.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 1.8.3863 + 1.8.3866 NSExtension NSExtensionMainStoryboard diff --git a/Kiwix.xcodeproj/project.pbxproj b/Kiwix.xcodeproj/project.pbxproj index b90dadc7..1aa0aeb8 100644 --- a/Kiwix.xcodeproj/project.pbxproj +++ b/Kiwix.xcodeproj/project.pbxproj @@ -822,7 +822,6 @@ isa = PBXNativeTarget; buildConfigurationList = 9779C31F1D4575AE0064CC8E /* Build configuration list for PBXNativeTarget "Bookmarks" */; buildPhases = ( - 97FDACC31D859C3500DEDACB /* ShellScript */, 9779C30F1D4575AD0064CC8E /* Sources */, 9779C3101D4575AD0064CC8E /* Frameworks */, 9779C3111D4575AD0064CC8E /* Resources */, @@ -841,7 +840,6 @@ buildConfigurationList = 97A2ABB31C1B810000052E74 /* Build configuration list for PBXNativeTarget "Kiwix-iOS" */; buildPhases = ( CDD21917A84F651D4CEFF569 /* [CP] Check Pods Manifest.lock */, - 97A4D7E21CF8C318006C731E /* ShellScript */, 97A2AB841C1B80FF00052E74 /* Sources */, 97A2AB851C1B80FF00052E74 /* Frameworks */, 97A2AB861C1B80FF00052E74 /* Resources */, @@ -1046,32 +1044,6 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Kiwix-iOS/Pods-Kiwix-iOS-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 97A4D7E21CF8C318006C731E /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 12; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "#!/bin/bash\nbuildNumString=$(/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" \"$INFOPLIST_FILE\")\nversionNumber=$(/usr/libexec/PlistBuddy -c \"Print CFBundleShortVersionString\" \"$INFOPLIST_FILE\")\nIFS='.'; arr=($buildNumString)\nlastIndex=$((${#arr[@]} - 1))\nbuildNumber=$((${arr[lastIndex]} + 1))\nbuildNumString=\"${arr[0]}.${arr[1]}.$buildNumber\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $buildNumString\" \"$INFOPLIST_FILE\""; - }; - 97FDACC31D859C3500DEDACB /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "#!/bin/bash\nbuildNumString=$(/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" \"$INFOPLIST_FILE\")\nversionNumber=$(/usr/libexec/PlistBuddy -c \"Print CFBundleShortVersionString\" \"$INFOPLIST_FILE\")\nIFS='.'; arr=($buildNumString)\nlastIndex=$((${#arr[@]} - 1))\nbuildNumber=$((${arr[lastIndex]} + 1))\nbuildNumString=\"${arr[0]}.${arr[1]}.$buildNumber\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $buildNumString\" \"$INFOPLIST_FILE\""; - }; CDD21917A84F651D4CEFF569 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647;