Skip to content
Permalink
Browse files
2.1.0: Xcode 9 GM
  • Loading branch information
@tnantoka
tnantoka committed Sep 14, 2017
1 parent b34dd20 commit 53a97e5
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 22 deletions.
30 Edhita.xcodeproj/project.pbxproj
View file
@@ -244,17 +244,17 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 0900;
ORGANIZATIONNAME = tnantoka;
TargetAttributes = {
9B6E1E8C19E2EB2100C72D13 = {
CreatedOnToolsVersion = 6.0.1;
DevelopmentTeam = H4Z42X3L6X;
LastSwiftMigration = 0800;
LastSwiftMigration = 0900;
};
9B6E1EA319E2EB2100C72D13 = {
CreatedOnToolsVersion = 6.0.1;
LastSwiftMigration = 0800;
LastSwiftMigration = 0900;
TestTargetID = 9B6E1E8C19E2EB2100C72D13;
};
};
@@ -426,14 +426,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -474,14 +480,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -519,7 +531,8 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Edhita/Edhita-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
@@ -535,7 +548,8 @@
PRODUCT_BUNDLE_IDENTIFIER = "com.bornneet.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Edhita/Edhita-Bridging-Header.h";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
};
name = Release;
};
@@ -555,7 +569,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.bornneet.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Edhita.app/Edhita";
};
name = Debug;
@@ -572,7 +587,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.bornneet.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Edhita.app/Edhita";
};
name = Release;
2 Edhita/AppDelegate.swift
View file
@@ -99,7 +99,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDele
UINavigationBar.appearance().barTintColor = UIColor.coolGray()
UINavigationBar.appearance().tintColor = UIColor.white
UINavigationBar.appearance().titleTextAttributes = [
NSForegroundColorAttributeName: UINavigationBar.appearance().tintColor
NSAttributedStringKey.foregroundColor: UINavigationBar.appearance().tintColor
]

UIToolbar.appearance().barTintColor = UINavigationBar.appearance().barTintColor
14 Edhita/Controllers/EditorViewController.swift
View file
@@ -107,7 +107,7 @@ class EditorViewController: UIViewController, EDHFinderListViewControllerDelegat

// MARK: - Actions
func fullscreenItemDidTap(_ sender: AnyObject) {
@objc func fullscreenItemDidTap(_ sender: AnyObject) {
if self.splitViewController?.preferredDisplayMode == UISplitViewControllerDisplayMode.automatic {
if self.splitViewController?.displayMode == UISplitViewControllerDisplayMode.allVisible {
self.splitViewController?.preferredDisplayMode = UISplitViewControllerDisplayMode.primaryHidden
@@ -120,11 +120,11 @@ class EditorViewController: UIViewController, EDHFinderListViewControllerDelegat
self.updateFullscreenItem()
}

func reloadItemDidTap(_ sender: AnyObject) {
@objc func reloadItemDidTap(_ sender: AnyObject) {
self.editorView.reload()
}

func shareItemDidTap(_ sender: AnyObject) {
@objc func shareItemDidTap(_ sender: AnyObject) {
let alertController = UIAlertController(
title: NSLocalizedString("Share", comment: ""),
message: "",
@@ -183,14 +183,14 @@ class EditorViewController: UIViewController, EDHFinderListViewControllerDelegat
self.present(alertController, animated: true, completion: nil)
}

func settingsItemDidTap(_ sender: AnyObject) {
@objc func settingsItemDidTap(_ sender: AnyObject) {
let formController = SettingsViewController()
let navController = UINavigationController(rootViewController: formController)
navController.modalPresentationStyle = .formSheet
self.present(navController, animated: true, completion: nil)
}

func modeControlDidChange(_ sender: AnyObject) {
@objc func modeControlDidChange(_ sender: AnyObject) {
switch self.modeControl.selectedSegmentIndex {
case 0:
self.editorView.mode = .edit
@@ -244,11 +244,11 @@ class EditorViewController: UIViewController, EDHFinderListViewControllerDelegat

// MARK: - Keyboard notification
func handleKeyboardWillShowNotification(_ notification: Notification) {
@objc func handleKeyboardWillShowNotification(_ notification: Notification) {
keyboardWillChangeFrameWithNotification(notification, showsKeyboard: true)
}

func handleKeyboardWillHideNotification(_ notification: Notification) {
@objc func handleKeyboardWillHideNotification(_ notification: Notification) {
keyboardWillChangeFrameWithNotification(notification, showsKeyboard: false)
}

6 Edhita/Controllers/SettingsViewController.swift
View file
@@ -36,20 +36,20 @@ class SettingsViewController: FXFormViewController {

// MARK: - Actions
func fontDidTap(_ sender: AnyObject) {
@objc func fontDidTap(_ sender: AnyObject) {
let fontController = EDHFontSelector.shared().settingsViewController()
self.navigationController?.pushViewController(fontController!, animated: true)
}

func acknowledgementsDidTap(_ sender: AnyObject) {
@objc func acknowledgementsDidTap(_ sender: AnyObject) {
let acknowledgementsController = VTAcknowledgementsViewController(
acknowledgementsPlistPath: Bundle.main.path(forResource: "Pods-acknowledgements", ofType: "plist")
)
//let acknowledgementsController = VTAcknowledgementsViewController() // Doesn't work
self.navigationController?.pushViewController(acknowledgementsController!, animated: true)
}

func doneItemDidTap(_ sender: AnyObject) {
@objc func doneItemDidTap(_ sender: AnyObject) {
self.close()
}

6 Edhita/Images.xcassets/AppIcon.appiconset/Contents.json
View file
@@ -89,6 +89,12 @@
"idiom" : "ipad",
"filename" : "icon167.png",
"scale" : "2x"
},
{
"size" : "1024x1024",
"idiom" : "ios-marketing",
"filename" : "icon1024.png",
"scale" : "1x"
}
],
"info" : {
BIN +25.3 KB Edhita/Images.xcassets/AppIcon.appiconset/icon1024.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 Edhita/Info.plist
View file
@@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.0.9</string>
<string>2.1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>10</string>
<string>12</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
4 Edhita/Models/SettingsForm.swift
View file
@@ -31,14 +31,14 @@ open class SettingsForm: NSObject, FXForm {
self.accessoryView = UserDefaults.standard.bool(forKey: Defaults.accessoryViewKey)
}

var accessoryView: Bool = true {
@objc var accessoryView: Bool = true {
didSet {
UserDefaults.standard.set(self.accessoryView, forKey: Defaults.accessoryViewKey)
UserDefaults.standard.synchronize()
}
}

@nonobjc open func extraFields() -> [Any]! {
public func extraFields() -> [Any]! {
return [
[
FXFormFieldHeader: "",

0 comments on commit 53a97e5

Please sign in to comment.