Skip to content

Commit 48f2faa

Browse files
author
man.li
committed
rename
1 parent 0816190 commit 48f2faa

38 files changed

+626
-324
lines changed

‎Example_Objc.xcodeproj/project.pbxproj‎

Lines changed: 116 additions & 116 deletions
Large diffs are not rendered by default.

Sources/App/AboutViewController.swift renamed to Sources/App/_AboutViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import Foundation
1010
import UIKit
1111

12-
class AboutViewController: UITableViewController {
12+
class _AboutViewController: UITableViewController {
1313

1414

1515
//MARK: - init

Sources/App/AppInfo.swift renamed to Sources/App/_AppInfo.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import UIKit
1010

11-
struct AppInfo {
11+
struct _AppInfo {
1212

1313
static var versionNumber: String? {
1414
return Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String

Sources/App/AppInfoViewController.swift renamed to Sources/App/_AppInfoViewController.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import UIKit
1010

11-
class AppInfoViewController: UITableViewController {
11+
class _AppInfoViewController: UITableViewController {
1212

1313
@IBOutlet weak var labelVersionNumber: UILabel!
1414
@IBOutlet weak var labelBuildNumber: UILabel!
@@ -34,13 +34,13 @@ class AppInfoViewController: UITableViewController {
3434

3535
labelCrashCount.frame.size = CGSize(width: 30, height: 20)
3636

37-
labelVersionNumber.text = AppInfo.versionNumber
38-
labelBuildNumber.text = AppInfo.buildNumber
39-
labelBundleName.text = AppInfo.bundleName
37+
labelVersionNumber.text = _AppInfo.versionNumber
38+
labelBuildNumber.text = _AppInfo.buildNumber
39+
labelBundleName.text = _AppInfo.bundleName
4040

41-
labelScreenResolution.text = Device.screenResolution
42-
labelScreenSize.text = "\(Device.screenSize)"
43-
labelDeviceModel.text = "\(Device.deviceModel)"
41+
labelScreenResolution.text = _Device.screenResolution
42+
labelScreenSize.text = "\(_Device.screenSize)"
43+
labelDeviceModel.text = "\(_Device.deviceModel)"
4444

4545
labelBundleID.text = Bundle.main.bundleIdentifier
4646
labelignoredURLs.text = String(CocoaDebugSettings.shared.ignoredURLs?.count ?? 0)
@@ -89,7 +89,7 @@ class AppInfoViewController: UITableViewController {
8989
}
9090

9191
//MARK: - UITableViewDelegate
92-
extension AppInfoViewController {
92+
extension _AppInfoViewController {
9393

9494
override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat
9595
{
@@ -127,7 +127,7 @@ extension AppInfoViewController {
127127
tableView.deselectRow(at: indexPath, animated: true)
128128

129129
if indexPath.section == 1 && indexPath.row == 2 {
130-
UIPasteboard.general.string = AppInfo.bundleName
130+
UIPasteboard.general.string = _AppInfo.bundleName
131131

132132
let alert = UIAlertController.init(title: "copied bundle name to clipboard", message: nil, preferredStyle: .alert)
133133
let action = UIAlertAction.init(title: "OK", style: .cancel, handler: nil)

Sources/App/CrashCell.swift renamed to Sources/App/_CrashCell.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import UIKit
1010

11-
class CrashCell: UITableViewCell {
11+
class _CrashCell: UITableViewCell {
1212

1313
@IBOutlet weak var textview: UITextView!
1414

@@ -17,7 +17,7 @@ class CrashCell: UITableViewCell {
1717
textview.isUserInteractionEnabled = false
1818
}
1919

20-
var crash: CrashModel? {
20+
var crash: _CrashModel? {
2121
didSet {
2222
guard let crash = crash else {return}
2323

@@ -31,7 +31,7 @@ class CrashCell: UITableViewCell {
3131
value: UIColor.white, range: NSMakeRange(0, content.count))
3232

3333
let range = NSMakeRange(0, formatDate.count)
34-
attstr.addAttribute(.foregroundColor, value: Color.mainGreen, range: range)
34+
attstr.addAttribute(.foregroundColor, value: _Color.mainGreen, range: range)
3535
attstr.addAttribute(.font, value: UIFont.boldSystemFont(ofSize: 12), range: range)
3636

3737
textview.attributedText = attstr

Sources/App/CrashDetailViewController.swift renamed to Sources/App/_CrashDetailViewController.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88

99
import UIKit
1010

11-
class CrashDetailViewController: UITableViewController {
11+
class _CrashDetailViewController: UITableViewController {
1212

1313
@IBOutlet weak var textviewName: UITextView!
1414
@IBOutlet weak var textviewReason: UITextView!
1515
@IBOutlet weak var textviewStackTraces: UITextView!
16-
var crash: CrashModel?
16+
var crash: _CrashModel?
1717

18-
static func instanceFromStoryBoard() -> CrashDetailViewController {
19-
let storyboard = UIStoryboard(name: "App", bundle: Bundle(for: CocoaDebug.self))
20-
return storyboard.instantiateViewController(withIdentifier: "CrashDetailViewController") as! CrashDetailViewController
18+
static func instanceFromStoryBoard() -> _CrashDetailViewController {
19+
let storyboard = UIStoryboard(name: "_App", bundle: Bundle(for: CocoaDebug.self))
20+
return storyboard.instantiateViewController(withIdentifier: "_CrashDetailViewController") as! _CrashDetailViewController
2121
}
2222

2323
//MARK - init
@@ -39,7 +39,7 @@ class CrashDetailViewController: UITableViewController {
3939
}
4040

4141
//MARK: - UITableViewDelegate
42-
extension CrashDetailViewController {
42+
extension _CrashDetailViewController {
4343

4444
override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
4545
return UITableView.automaticDimension

Sources/App/CrashListViewController.swift renamed to Sources/App/_CrashListViewController.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,28 @@
88

99
import UIKit
1010

11-
class CrashListViewController: UITableViewController {
11+
class _CrashListViewController: UITableViewController {
1212

13-
lazy var models: [CrashModel] = [CrashModel]()
13+
lazy var models: [_CrashModel] = [_CrashModel]()
1414

1515
//MARK: - init
1616
override func viewDidLoad() {
1717
super.viewDidLoad()
1818

19-
navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .trash, target: self, action:#selector(CrashListViewController.deleteCrashes))
19+
navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .trash, target: self, action:#selector(_CrashListViewController.deleteCrashes))
2020

2121
tableView.delegate = self
2222
tableView.dataSource = self
2323
tableView.tableFooterView = UIView()
2424

25-
models = CrashStoreManager.shared.crashArray
25+
models = _CrashStoreManager.shared.crashArray
2626
tableView.reloadData()
2727
}
2828

2929
//MARK: - target action
3030
@objc func deleteCrashes() {
3131
models = []
32-
CrashStoreManager.shared.resetCrashs()
32+
_CrashStoreManager.shared.resetCrashs()
3333

3434
dispatch_main_async_safe { [weak self] in
3535
self?.tableView.reloadData()
@@ -38,7 +38,7 @@ class CrashListViewController: UITableViewController {
3838
}
3939

4040
//MARK: - UITableViewDataSource
41-
extension CrashListViewController {
41+
extension _CrashListViewController {
4242

4343
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
4444
return models.count
@@ -52,19 +52,19 @@ extension CrashListViewController {
5252
}
5353

5454
let cell = tableView.dequeueReusableCell(withIdentifier: "CrashCell", for: indexPath)
55-
as! CrashCell
55+
as! _CrashCell
5656
cell.crash = models[indexPath.row]
5757
return cell
5858
}
5959
}
6060

6161
//MARK: - UITableViewDelegate
62-
extension CrashListViewController {
62+
extension _CrashListViewController {
6363

6464
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
6565
tableView.deselectRow(at: indexPath, animated: true)
6666

67-
let vc = CrashDetailViewController.instanceFromStoryBoard()
67+
let vc = _CrashDetailViewController.instanceFromStoryBoard()
6868
vc.crash = models[indexPath.row]
6969

7070
self.navigationController?.pushViewController(vc, animated: true)
@@ -75,7 +75,7 @@ extension CrashListViewController {
7575

7676
let delete = UIContextualAction(style: .destructive, title: "Delete") { [weak self] (action, sourceView, completionHandler) in
7777
guard let models = self?.models else {return}
78-
CrashStoreManager.shared.removeCrash(models[indexPath.row])
78+
_CrashStoreManager.shared.removeCrash(models[indexPath.row])
7979
self?.models.remove(at: indexPath.row)
8080
self?.dispatch_main_async_safe { [weak self] in
8181
self?.tableView.deleteRows(at: [indexPath], with: .automatic)
@@ -98,7 +98,7 @@ extension CrashListViewController {
9898
}
9999
override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {
100100
if (editingStyle == .delete) {
101-
CrashStoreManager.shared.removeCrash(models[indexPath.row])
101+
_CrashStoreManager.shared.removeCrash(models[indexPath.row])
102102
self.models.remove(at: indexPath.row)
103103
self.dispatch_main_async_safe { [weak self] in
104104
self?.tableView.deleteRows(at: [indexPath], with: .automatic)

Sources/App/CrashLogger.swift renamed to Sources/App/_CrashLogger.swift

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,52 +10,52 @@ import UIKit
1010
import Darwin
1111

1212
func exceptionHandler(exception: NSException) {
13-
if CrashLogger.shared.crashed {
13+
if _CrashLogger.shared.crashed {
1414
return
1515
}
16-
CrashLogger.shared.crashed = true
17-
CrashLogger.addCrash(name: exception.name.rawValue, reason: exception.reason)
16+
_CrashLogger.shared.crashed = true
17+
_CrashLogger.addCrash(name: exception.name.rawValue, reason: exception.reason)
1818
}
1919

2020
func handleSignal(signal: Int32) {
21-
if CrashLogger.shared.crashed {
21+
if _CrashLogger.shared.crashed {
2222
return
2323
}
24-
CrashLogger.shared.crashed = true
24+
_CrashLogger.shared.crashed = true
2525
switch signal {
2626
case SIGILL:
27-
CrashLogger.addCrash(name: "SIGILL", reason: nil)
27+
_CrashLogger.addCrash(name: "SIGILL", reason: nil)
2828
case SIGABRT:
29-
CrashLogger.addCrash(name: "SIGABRT", reason: nil)
29+
_CrashLogger.addCrash(name: "SIGABRT", reason: nil)
3030
case SIGFPE:
31-
CrashLogger.addCrash(name: "SIGFPE", reason: nil)
31+
_CrashLogger.addCrash(name: "SIGFPE", reason: nil)
3232
case SIGBUS:
33-
CrashLogger.addCrash(name: "SIGBUS", reason: nil)
33+
_CrashLogger.addCrash(name: "SIGBUS", reason: nil)
3434
case SIGSEGV:
35-
CrashLogger.addCrash(name: "SIGSEGV", reason: nil)
35+
_CrashLogger.addCrash(name: "SIGSEGV", reason: nil)
3636
case SIGSYS:
37-
CrashLogger.addCrash(name: "SIGSYS", reason: nil)
37+
_CrashLogger.addCrash(name: "SIGSYS", reason: nil)
3838
case SIGPIPE:
39-
CrashLogger.addCrash(name: "SIGPIPE", reason: nil)
39+
_CrashLogger.addCrash(name: "SIGPIPE", reason: nil)
4040
case SIGTRAP:
41-
CrashLogger.addCrash(name: "SIGTRAP", reason: nil)
41+
_CrashLogger.addCrash(name: "SIGTRAP", reason: nil)
4242
default: break
4343
}
4444
}
4545

46-
class CrashLogger {
46+
class _CrashLogger {
4747

48-
static let shared = CrashLogger()
48+
static let shared = _CrashLogger()
4949
private init() {}
5050

5151
var crashed = false
5252
var enable: Bool = false {
5353
didSet {
5454
if enable {
55-
CrashLogger.register()
55+
_CrashLogger.register()
5656
}
5757
else {
58-
CrashLogger.unregister()
58+
_CrashLogger.unregister()
5959
}
6060
}
6161
}
@@ -85,7 +85,7 @@ class CrashLogger {
8585
}
8686

8787
static func addCrash(name: String, reason: String?) {
88-
let newCrash = CrashModel(name: name, reason: reason)
89-
CrashStoreManager.shared.addCrash(newCrash)
88+
let newCrash = _CrashModel(name: name, reason: reason)
89+
_CrashStoreManager.shared.addCrash(newCrash)
9090
}
9191
}

Sources/App/CrashModel.swift renamed to Sources/App/_CrashModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import UIKit
1010

11-
class CrashModel: NSObject, NSCoding {
11+
class _CrashModel: NSObject, NSCoding {
1212

1313
let id: String
1414
var date: Date

Sources/App/CrashStoreManager.swift renamed to Sources/App/_CrashStoreManager.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88

99
import Foundation
1010

11-
class CrashStoreManager {
11+
class _CrashStoreManager {
1212

13-
lazy var crashArray: [CrashModel] = [CrashModel]()
13+
lazy var crashArray: [_CrashModel] = [_CrashModel]()
1414

15-
static let shared = CrashStoreManager()
15+
static let shared = _CrashStoreManager()
1616
private init() {
1717
crashArray = self.getCrashs()
1818
}
1919

2020
//MARK: - public
21-
func addCrash(_ crash: CrashModel) {
21+
func addCrash(_ crash: _CrashModel) {
2222
if self.crashArray.count >= CocoaDebugSettings.shared.logMaxCount {
2323
if self.crashArray.count > 0 {
2424
self.crashArray.remove(at: 0)
@@ -28,7 +28,7 @@ class CrashStoreManager {
2828
archiveCrashs(self.crashArray)
2929
}
3030

31-
func removeCrash(_ model: CrashModel) {
31+
func removeCrash(_ model: _CrashModel) {
3232
if let index = self.crashArray.firstIndex(where: { (crash) -> Bool in
3333
return crash.id == model.id
3434
}) {
@@ -45,19 +45,19 @@ class CrashStoreManager {
4545
}
4646

4747
//MARK: - private
48-
private func archiveCrashs(_ crashs: [CrashModel]) {
48+
private func archiveCrashs(_ crashs: [_CrashModel]) {
4949
let dataArchive = NSKeyedArchiver.archivedData(withRootObject: crashs)
5050
UserDefaults.standard.set(dataArchive, forKey: "crashArchive_CocoaDebug")
5151
UserDefaults.standard.set(crashs.count, forKey: "crashCount_CocoaDebug")
5252
UserDefaults.standard.synchronize()
5353
}
5454

55-
private func getCrashs() -> [CrashModel] {
55+
private func getCrashs() -> [_CrashModel] {
5656
guard let data = UserDefaults.standard.object(forKey: "crashArchive_CocoaDebug") as? Data else {return []}
5757
do {
5858
if #available(iOS 9.0, *) {
5959
let dataArchive = try NSKeyedUnarchiver.unarchiveTopLevelObjectWithData(data)
60-
return dataArchive as! [CrashModel]
60+
return dataArchive as! [_CrashModel]
6161
} else {
6262
// Fallback on earlier versions
6363
return []

0 commit comments

Comments
 (0)