From 1ad927d7ea124b462079c27b577268bd9716fd8e Mon Sep 17 00:00:00 2001 From: Chris Li Date: Wed, 6 Jul 2016 15:57:15 -0400 Subject: [PATCH] UIApplication Build Type Identifier --- Kiwix-iOS/Controller/SearchController.swift | 4 +-- Kiwix-iOS/Controller/SearchResultTBVC.swift | 6 +++- Kiwix-iOS/Controller/SettingTBVC.swift | 31 ++++++++++++--------- Kiwix-iOS/Info.plist | 2 +- Kiwix-iOS/iOSExtensions.swift | 6 ++-- Kiwix/ZimMultiReader.swift | 4 +++ 6 files changed, 33 insertions(+), 20 deletions(-) diff --git a/Kiwix-iOS/Controller/SearchController.swift b/Kiwix-iOS/Controller/SearchController.swift index 9fa49b39..e99eed45 100644 --- a/Kiwix-iOS/Controller/SearchController.swift +++ b/Kiwix-iOS/Controller/SearchController.swift @@ -63,12 +63,12 @@ class SearchController: UIViewController, UISearchBarDelegate, UIGestureRecogniz if delayed { let previousSearchText = searchText dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64(275 * USEC_PER_SEC)), dispatch_get_main_queue()) { - print("\(previousSearchText), \(self.searchText)") + //print("\(previousSearchText), \(self.searchText)") guard previousSearchText == self.searchText else {return} self.searchResultTBVC?.startSearch(self.searchText) } } else { - searchResultTBVC?.startSearch(self.searchText) + searchResultTBVC?.startSearch(searchText) } } diff --git a/Kiwix-iOS/Controller/SearchResultTBVC.swift b/Kiwix-iOS/Controller/SearchResultTBVC.swift index 7ba55a78..2002f14c 100644 --- a/Kiwix-iOS/Controller/SearchResultTBVC.swift +++ b/Kiwix-iOS/Controller/SearchResultTBVC.swift @@ -92,7 +92,11 @@ class SearchResultTBVC: UIViewController, UITableViewDataSource, UITableViewDele func configureArticleCell(cell: ArticleCell, result: SearchResult) { guard let book = Book.fetch(result.bookID, context: UIApplication.appDelegate.managedObjectContext) else {return} - cell.titleLabel.text = result.title + "(\(result.distance), \(result.probability ?? -1), \(String(format: "%.4f", result.score)))" + if UIApplication.buildStatus == .Alpha { + cell.titleLabel.text = result.title + result.rankInfo + } else { + cell.titleLabel.text = result.title + } cell.hasPicIndicator.backgroundColor = book.hasPic ? UIColor.havePicTintColor : UIColor.lightGrayColor() cell.favIcon.image = book.favIcon != nil ? UIImage(data: book.favIcon!) : nil } diff --git a/Kiwix-iOS/Controller/SettingTBVC.swift b/Kiwix-iOS/Controller/SettingTBVC.swift index d06bb345..f33ee0a9 100644 --- a/Kiwix-iOS/Controller/SettingTBVC.swift +++ b/Kiwix-iOS/Controller/SettingTBVC.swift @@ -9,14 +9,10 @@ import UIKit class SettingTBVC: UITableViewController { - - let alpha = true - - let sectionHeader = [LocalizedStrings.library, LocalizedStrings.reading,LocalizedStrings.misc, "Search"] - let cellTextlabels = [[LocalizedStrings.libraryAutoRefresh, LocalizedStrings.libraryUseCellularData, LocalizedStrings.libraryBackup], + private(set) var sectionHeader = [LocalizedStrings.library, LocalizedStrings.reading,LocalizedStrings.misc] + private(set) var cellTextlabels = [[LocalizedStrings.libraryAutoRefresh, LocalizedStrings.libraryUseCellularData, LocalizedStrings.libraryBackup], [LocalizedStrings.fontSize, LocalizedStrings.adjustLayout], - [LocalizedStrings.rateKiwix, LocalizedStrings.about], - ["Boost Factor 🚀"]] + [LocalizedStrings.rateKiwix, LocalizedStrings.about]] let dateComponentsFormatter: NSDateComponentsFormatter = { let formatter = NSDateComponentsFormatter() @@ -29,6 +25,11 @@ class SettingTBVC: UITableViewController { title = LocalizedStrings.settings clearsSelectionOnViewWillAppear = true showRateKiwixIfNeeded() + + if UIApplication.buildStatus == .Alpha { + sectionHeader.append("Search") + cellTextlabels.append(["Boost Factor 🚀"]) + } } override func viewWillAppear(animated: Bool) { @@ -79,12 +80,16 @@ class SettingTBVC: UITableViewController { } override func tableView(tableView: UITableView, titleForFooterInSection section: Int) -> String? { - if section == tableView.numberOfSections - 1 { - let versionString = String(format: LocalizedStrings.versionString, NSBundle.appShortVersion) + (alpha ? " Alpha" : "") - let buildNumString = "Build " + NSBundle.buildVersion - return [versionString, buildNumString].joinWithSeparator("\n") - } else { - return nil + guard section == tableView.numberOfSections - 1 else {return nil} + var footnote = String(format: LocalizedStrings.versionString, NSBundle.appShortVersion) + switch UIApplication.buildStatus { + case .Alpha, .Beta: + footnote += (UIApplication.buildStatus == .Alpha ? " Alpha" : " Beta") + footnote += "\n" + footnote += "Build " + NSBundle.buildVersion + return footnote + case .Release: + return footnote } } diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist index 0523584d..99662ac3 100644 --- a/Kiwix-iOS/Info.plist +++ b/Kiwix-iOS/Info.plist @@ -36,7 +36,7 @@ CFBundleSignature ???? CFBundleVersion - 1518 + 1523 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/Kiwix-iOS/iOSExtensions.swift b/Kiwix-iOS/iOSExtensions.swift index 2926480e..58b46d7c 100644 --- a/Kiwix-iOS/iOSExtensions.swift +++ b/Kiwix-iOS/iOSExtensions.swift @@ -35,14 +35,14 @@ extension NSManagedObjectContext { // MARK: - UI -enum BuildType { +enum BuildStatus { case Alpha, Beta, Release } extension UIApplication { - var buildType: BuildType { + class var buildStatus: BuildStatus { get { - return .Alpha + return .Beta } } } diff --git a/Kiwix/ZimMultiReader.swift b/Kiwix/ZimMultiReader.swift index ac9f93da..30eeffb1 100644 --- a/Kiwix/ZimMultiReader.swift +++ b/Kiwix/ZimMultiReader.swift @@ -209,4 +209,8 @@ class SearchResult: CustomStringConvertible { parts.append("dist: \(distance)") return parts.joinWithSeparator(", ") } + + var rankInfo: String { + return "(\(distance), \(probability ?? -1), \(String(format: "%.4f", score)))" + } }