From b9eaeb8e3d397ce818db3297396a539bf0dd3b9e Mon Sep 17 00:00:00 2001 From: masakih Date: Thu, 5 Jan 2017 08:53:26 +0900 Subject: [PATCH] =?utf8?q?HMQuestProgressTransformer=E3=82=92Swift?= =?utf8?q?=E3=81=AB=E5=A4=89=E6=8F=9B=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KCD.xcodeproj/project.pbxproj | 10 +++---- KCD/HMQuestProgressTransformer.h | 13 --------- KCD/HMQuestProgressTransformer.m | 54 ------------------------------------ KCD/HMQuestProgressTransformer.swift | 28 +++++++++++++++++++ KCD/KCD-Bridging-Header.h | 1 - 5 files changed, 32 insertions(+), 74 deletions(-) delete mode 100644 KCD/HMQuestProgressTransformer.h delete mode 100644 KCD/HMQuestProgressTransformer.m create mode 100644 KCD/HMQuestProgressTransformer.swift diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj index c02b0cb0..93f761af 100644 --- a/KCD.xcodeproj/project.pbxproj +++ b/KCD.xcodeproj/project.pbxproj @@ -77,7 +77,6 @@ F4649FC91DBC51EF0097AEBF /* HMScreenshotListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4649FCB1DBC51EF0097AEBF /* HMScreenshotListViewController.xib */; }; F4649FCE1DBC52600097AEBF /* HMScreenshotDetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4649FD01DBC52600097AEBF /* HMScreenshotDetailViewController.xib */; }; F4649FD31DBC52A50097AEBF /* HMScreenshotEditorViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F4649FD51DBC52A50097AEBF /* HMScreenshotEditorViewController.xib */; }; - F4666C5E1B242124001840DB /* HMQuestProgressTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = F4666C5D1B242124001840DB /* HMQuestProgressTransformer.m */; }; F4666C641B25CA3E001840DB /* HMKCQuest+Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F4666C631B25CA3E001840DB /* HMKCQuest+Extensions.m */; }; F4666C6B1B29E974001840DB /* EquipmentStrengthen.plist in Resources */ = {isa = PBXBuildFile; fileRef = F4666C6A1B29E974001840DB /* EquipmentStrengthen.plist */; }; F46F103618A7CE310063E503 /* HMJSONViewCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F46F103518A7CE310063E503 /* HMJSONViewCommand.m */; }; @@ -152,6 +151,7 @@ F4AA59301E1D1FAB001667AF /* HMLengTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AA592F1E1D1FAB001667AF /* HMLengTransformer.swift */; }; F4AA59321E1D211C001667AF /* HMSlotitemNameTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AA59311E1D211C001667AF /* HMSlotitemNameTransformer.swift */; }; F4AA59341E1D2512001667AF /* HMSlotItemShortNameTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AA59331E1D2512001667AF /* HMSlotItemShortNameTransformer.swift */; }; + F4AA59361E1D36C5001667AF /* HMQuestProgressTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AA59351E1D36C5001667AF /* HMQuestProgressTransformer.swift */; }; F4AC136D1E0802C000851147 /* HMPreferencePanelController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AC136C1E0802C000851147 /* HMPreferencePanelController.swift */; }; F4AC136F1E0963DB00851147 /* HMProgressPanel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AC136E1E0963DB00851147 /* HMProgressPanel.swift */; }; F4AC13711E096A7B00851147 /* HMHistoryWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AC13701E096A7B00851147 /* HMHistoryWindowController.swift */; }; @@ -450,8 +450,6 @@ F4649FD91DBC54270097AEBF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/HMScreenshotListViewController.xib; sourceTree = ""; }; F4649FDA1DBC54320097AEBF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/HMScreenshotDetailViewController.xib; sourceTree = ""; }; F4649FDB1DBC543A0097AEBF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/HMScreenshotEditorViewController.xib; sourceTree = ""; }; - F4666C5C1B242124001840DB /* HMQuestProgressTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMQuestProgressTransformer.h; sourceTree = ""; }; - F4666C5D1B242124001840DB /* HMQuestProgressTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMQuestProgressTransformer.m; sourceTree = ""; }; F4666C621B25CA3E001840DB /* HMKCQuest+Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "HMKCQuest+Extensions.h"; sourceTree = ""; }; F4666C631B25CA3E001840DB /* HMKCQuest+Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HMKCQuest+Extensions.m"; sourceTree = ""; }; F4666C6A1B29E974001840DB /* EquipmentStrengthen.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = EquipmentStrengthen.plist; sourceTree = ""; }; @@ -573,6 +571,7 @@ F4AA592F1E1D1FAB001667AF /* HMLengTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMLengTransformer.swift; sourceTree = ""; }; F4AA59311E1D211C001667AF /* HMSlotitemNameTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMSlotitemNameTransformer.swift; sourceTree = ""; }; F4AA59331E1D2512001667AF /* HMSlotItemShortNameTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMSlotItemShortNameTransformer.swift; sourceTree = ""; }; + F4AA59351E1D36C5001667AF /* HMQuestProgressTransformer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMQuestProgressTransformer.swift; sourceTree = ""; }; F4AC136C1E0802C000851147 /* HMPreferencePanelController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMPreferencePanelController.swift; sourceTree = ""; }; F4AC136E1E0963DB00851147 /* HMProgressPanel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMProgressPanel.swift; sourceTree = ""; }; F4AC13701E096A7B00851147 /* HMHistoryWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMHistoryWindowController.swift; sourceTree = ""; }; @@ -1281,8 +1280,7 @@ F4AA592F1E1D1FAB001667AF /* HMLengTransformer.swift */, F4AA59311E1D211C001667AF /* HMSlotitemNameTransformer.swift */, F4AA59331E1D2512001667AF /* HMSlotItemShortNameTransformer.swift */, - F4666C5C1B242124001840DB /* HMQuestProgressTransformer.h */, - F4666C5D1B242124001840DB /* HMQuestProgressTransformer.m */, + F4AA59351E1D36C5001667AF /* HMQuestProgressTransformer.swift */, F47178451B6DE9F400F5E59D /* HMMapAreaTransformaer.h */, F47178461B6DE9F400F5E59D /* HMMapAreaTransformaer.m */, F4C86B901C1C445C00F260FE /* HMUpgradeShipExcludeColorTransformer.h */, @@ -1865,7 +1863,6 @@ F42185041DF43D0700256590 /* HMAirbasePlaneStateTransformer.m in Sources */, F46F45BF1CFF0BEE00EB7F4D /* HMSlotDepriveCommand.m in Sources */, F46F45C21CFF0CFF00EB7F4D /* HMSlotDepriveUnsetCommand.m in Sources */, - F4666C5E1B242124001840DB /* HMQuestProgressTransformer.m in Sources */, F4D05BCC1E0D274100688D66 /* HMBookmarkEditorViewController.swift in Sources */, F494DC6D18CC054800AE97E4 /* HMNyukyoDockStatus.m in Sources */, F4666C641B25CA3E001840DB /* HMKCQuest+Extensions.m in Sources */, @@ -1960,6 +1957,7 @@ F4F9F8721C6A306A00D0EE76 /* HMKCBattle.m in Sources */, F4D2CBC818B0555A000EBC59 /* HMKCManagedObject.m in Sources */, F4D2CBC218AD0E1A000EBC59 /* HMMasterSTypeCommand.m in Sources */, + F4AA59361E1D36C5001667AF /* HMQuestProgressTransformer.swift in Sources */, F4F9F8891C6B642B00D0EE76 /* HMKCMasterMapArea+CoreDataProperties.m in Sources */, F43BA4A4197BE6C200CFF788 /* HMRealDestroyShipCommand.m in Sources */, F4F9F8711C6A306A00D0EE76 /* HMKCBattle+CoreDataProperties.m in Sources */, diff --git a/KCD/HMQuestProgressTransformer.h b/KCD/HMQuestProgressTransformer.h deleted file mode 100644 index 868cb21d..00000000 --- a/KCD/HMQuestProgressTransformer.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// HMQuestProgressTransformar.h -// KCD -// -// Created by Hori,Masaki on 2015/06/07. -// Copyright (c) 2015年 Hori,Masaki. All rights reserved. -// - -#import - -@interface HMQuestProgressTransformer : NSValueTransformer - -@end diff --git a/KCD/HMQuestProgressTransformer.m b/KCD/HMQuestProgressTransformer.m deleted file mode 100644 index ce7e0f39..00000000 --- a/KCD/HMQuestProgressTransformer.m +++ /dev/null @@ -1,54 +0,0 @@ -// -// HMQuestProgressTransformar.m -// KCD -// -// Created by Hori,Masaki on 2015/06/07. -// Copyright (c) 2015年 Hori,Masaki. All rights reserved. -// - -#import "HMQuestProgressTransformer.h" - -@implementation HMQuestProgressTransformer -//+ (void)load -//{ -// static dispatch_once_t onceToken; -// dispatch_once(&onceToken, ^{ -// [NSValueTransformer setValueTransformer:[self new] forName:@"HMQuestProgressTransformer"]; -// }); -//} -+ (Class)transformedValueClass -{ - return [NSString class]; -} -+ (BOOL)allowsReverseTransformation -{ - return NO; -} - -- (id)transformedValue:(id)value -{ - if(![value isKindOfClass:[NSNumber class]]) return nil; - - NSString *result = nil; - NSInteger flag = [value integerValue]; - switch (flag) { - case 3: - result = @"100%"; - break; - case 5: - case 6: - result = @"50%"; - break; - case 9: - case 10: - result = @"80%"; - break; - default: - result = @""; - break; - - } - - return result; -} -@end diff --git a/KCD/HMQuestProgressTransformer.swift b/KCD/HMQuestProgressTransformer.swift new file mode 100644 index 00000000..bb86c7a6 --- /dev/null +++ b/KCD/HMQuestProgressTransformer.swift @@ -0,0 +1,28 @@ +// +// HMQuestProgressTransformer.swift +// KCD +// +// Created by Hori,Masaki on 2017/01/04. +// Copyright © 2017年 Hori,Masaki. All rights reserved. +// + +import Cocoa + +class HMQuestProgressTransformer: ValueTransformer { + override class func transformedValueClass() -> Swift.AnyClass { + return String.self as! AnyClass + } + override func transformedValue(_ value: Any?) -> Any? { + guard let v = value as? Int else { return nil } + switch v { + case 3: + return "100%" + case 5, 6: + return "50%" + case 9, 10: + return "80%" + default: + return "" + } + } +} diff --git a/KCD/KCD-Bridging-Header.h b/KCD/KCD-Bridging-Header.h index adc1ff85..3fceab42 100644 --- a/KCD/KCD-Bridging-Header.h +++ b/KCD/KCD-Bridging-Header.h @@ -6,7 +6,6 @@ #import "HMUserDefaults.h" // ValueTransformer -#import "HMQuestProgressTransformer.h" #import "HMMapAreaTransformaer.h" #import "HMUpgradeShipExcludeColorTransformer.h" #import "HMMillisecondTransformer.h" -- 2.11.0