mirror of
https://github.com/kiwix/kiwix-apple.git
synced 2025-09-21 18:44:34 -04:00
UIApplication Build Type Identifier
This commit is contained in:
parent
288fb65a7e
commit
1ad927d7ea
@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
}
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -36,7 +36,7 @@
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>1518</string>
|
||||
<string>1523</string>
|
||||
<key>ITSAppUsesNonExemptEncryption</key>
|
||||
<false/>
|
||||
<key>LSRequiresIPhoneOS</key>
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -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)))"
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user