From bd8417843b4a6633141142d95a39e090015b8a00 Mon Sep 17 00:00:00 2001 From: masakih Date: Wed, 4 Jan 2017 15:57:06 +0900 Subject: [PATCH] =?utf8?q?HMTimerCountFormatter=E3=82=92Swift=E3=81=AB?= =?utf8?q?=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 +++---- .../HMAncherageRepairTimerViewController.xib | 9 +++--- KCD/Base.lproj/HMDocksViewController.xib | 29 +++++++++--------- KCD/Base.lproj/HMFleetMinimumViewController.xib | 10 ++++--- KCD/Base.lproj/HMFleetViewController.xib | 2 +- KCD/Base.lproj/HMRepairListViewController.xib | 11 +++---- KCD/HMTimerCountFormatter.h | 13 -------- KCD/HMTimerCountFormatter.m | 35 ---------------------- KCD/HMTimerCountFormatter.swift | 31 +++++++++++++++++++ 9 files changed, 68 insertions(+), 82 deletions(-) delete mode 100644 KCD/HMTimerCountFormatter.h delete mode 100644 KCD/HMTimerCountFormatter.m create mode 100644 KCD/HMTimerCountFormatter.swift diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj index b9705386..35bc1673 100644 --- a/KCD.xcodeproj/project.pbxproj +++ b/KCD.xcodeproj/project.pbxproj @@ -34,7 +34,6 @@ F426802E194D0FFD00B2C27F /* HMMemberShip3Command.m in Sources */ = {isa = PBXBuildFile; fileRef = F426802D194D0FFD00B2C27F /* HMMemberShip3Command.m */; }; F4268031194D1B1A00B2C27F /* HMChangeHenseiCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4268030194D1B1A00B2C27F /* HMChangeHenseiCommand.m */; }; F4268034195332A000B2C27F /* HMPowerUpCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4268033195332A000B2C27F /* HMPowerUpCommand.m */; }; - F42680371957000200B2C27F /* HMTimerCountFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = F42680361957000200B2C27F /* HMTimerCountFormatter.m */; }; F42CBB231D1F967F004C2AE2 /* HMHistoryMarkTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = F42CBB221D1F967F004C2AE2 /* HMHistoryMarkTransformer.m */; }; F431E9761DF3AC1C00FB56AE /* HMSetActionCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F431E9751DF3AC1C00FB56AE /* HMSetActionCommand.m */; }; F431E9791DF3CD1B00FB56AE /* HMActinKindTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = F431E9781DF3CD1B00FB56AE /* HMActinKindTransformer.m */; }; @@ -145,6 +144,7 @@ F4AA0607192E3B6200844688 /* HMMapStartCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4AA0606192E3B6200844688 /* HMMapStartCommand.m */; }; F4AA060D1930E69200844688 /* HMMidnightBattleCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4AA060C1930E69200844688 /* HMMidnightBattleCommand.m */; }; F4AA06101931869E00844688 /* HMBattleResultCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = F4AA060F1931869E00844688 /* HMBattleResultCommand.m */; }; + F4AA59141E1C951F001667AF /* HMTimerCountFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4AA59131E1C951F001667AF /* HMTimerCountFormatter.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 */; }; @@ -366,8 +366,6 @@ F4268030194D1B1A00B2C27F /* HMChangeHenseiCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMChangeHenseiCommand.m; sourceTree = ""; }; F4268032195332A000B2C27F /* HMPowerUpCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMPowerUpCommand.h; sourceTree = ""; }; F4268033195332A000B2C27F /* HMPowerUpCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMPowerUpCommand.m; sourceTree = ""; }; - F42680351957000200B2C27F /* HMTimerCountFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMTimerCountFormatter.h; sourceTree = ""; }; - F42680361957000200B2C27F /* HMTimerCountFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMTimerCountFormatter.m; sourceTree = ""; }; F42CBB201D1ED41D004C2AE2 /* LocalData 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "LocalData 3.xcdatamodel"; sourceTree = ""; }; F42CBB211D1F967F004C2AE2 /* HMHistoryMarkTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMHistoryMarkTransformer.h; sourceTree = ""; }; F42CBB221D1F967F004C2AE2 /* HMHistoryMarkTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMHistoryMarkTransformer.m; sourceTree = ""; }; @@ -565,6 +563,7 @@ F4AA060C1930E69200844688 /* HMMidnightBattleCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMMidnightBattleCommand.m; sourceTree = ""; }; F4AA060E1931869E00844688 /* HMBattleResultCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HMBattleResultCommand.h; sourceTree = ""; }; F4AA060F1931869E00844688 /* HMBattleResultCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HMBattleResultCommand.m; sourceTree = ""; }; + F4AA59131E1C951F001667AF /* HMTimerCountFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HMTimerCountFormatter.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 = ""; }; @@ -1274,8 +1273,7 @@ children = ( F4131EE71911445F004F7F9A /* HMSlotItemEquipTypeTransformer.h */, F4131EE81911445F004F7F9A /* HMSlotItemEquipTypeTransformer.m */, - F42680351957000200B2C27F /* HMTimerCountFormatter.h */, - F42680361957000200B2C27F /* HMTimerCountFormatter.m */, + F4AA59131E1C951F001667AF /* HMTimerCountFormatter.swift */, F4A3AD8319B0CAB700FDBF80 /* HMPlanToShowsBoldFontTransformer.h */, F4A3AD8419B0CAB700FDBF80 /* HMPlanToShowsBoldFontTransformer.m */, F4B37EEE19FADFC9002F371A /* HMIgnoreZeroTransformer.h */, @@ -1846,6 +1844,7 @@ F495462B1B14CBA600E0D8D0 /* HMBookmarkManager.m in Sources */, F43F3D521A39CC7500D6DAF7 /* HMKCMasterSlotItemObject.m in Sources */, F4A9E25A1C2700CF0006E4BC /* HMRealPowerUpCommand.m in Sources */, + F4AA59141E1C951F001667AF /* HMTimerCountFormatter.swift in Sources */, F448F9921B6FBF80004901AD /* HMResourceHistoryManager.m in Sources */, F4513EEE18B8E2F600073552 /* HMMemberMaterialCommand.m in Sources */, F4FCFD44191F4C1D000640A1 /* HMKenzoMarkCommand.m in Sources */, @@ -1949,7 +1948,6 @@ F44AB20619E053CB00F217AF /* HMKCDeck+Extension.m in Sources */, F4D05BDF1E0F8B6900688D66 /* HMPowerUpSupportViewController.swift in Sources */, F4F6E82A1B3045970008B66E /* CanonicalRequest.m in Sources */, - F42680371957000200B2C27F /* HMTimerCountFormatter.m in Sources */, F4E5FF021E150A850026868C /* HMAncherageRepairTimerViewController.swift in Sources */, F4B414F218B1013C00468DAF /* HMMasterSlotItemCommand.m in Sources */, F45FBB6F1E0FDB33000E72B9 /* HMStrengthenListViewController.swift in Sources */, diff --git a/KCD/Base.lproj/HMAncherageRepairTimerViewController.xib b/KCD/Base.lproj/HMAncherageRepairTimerViewController.xib index 27478362..7ec5ac3a 100644 --- a/KCD/Base.lproj/HMAncherageRepairTimerViewController.xib +++ b/KCD/Base.lproj/HMAncherageRepairTimerViewController.xib @@ -1,8 +1,9 @@ - - + + - + + @@ -30,7 +31,7 @@ - + diff --git a/KCD/Base.lproj/HMDocksViewController.xib b/KCD/Base.lproj/HMDocksViewController.xib index 13543f65..e00cadbe 100644 --- a/KCD/Base.lproj/HMDocksViewController.xib +++ b/KCD/Base.lproj/HMDocksViewController.xib @@ -1,8 +1,9 @@ - - + + - + + @@ -51,7 +52,7 @@ - + @@ -81,7 +82,7 @@ - + @@ -112,7 +113,7 @@ - + @@ -174,7 +175,7 @@ - + @@ -220,7 +221,7 @@ - + @@ -250,7 +251,7 @@ - + @@ -296,7 +297,7 @@ - + @@ -342,7 +343,7 @@ - + @@ -388,7 +389,7 @@ - + @@ -418,7 +419,7 @@ - + @@ -448,7 +449,7 @@ - + diff --git a/KCD/Base.lproj/HMFleetMinimumViewController.xib b/KCD/Base.lproj/HMFleetMinimumViewController.xib index a3442eb7..eb75dd5b 100644 --- a/KCD/Base.lproj/HMFleetMinimumViewController.xib +++ b/KCD/Base.lproj/HMFleetMinimumViewController.xib @@ -1,7 +1,9 @@ - - + + - + + + @@ -147,7 +149,7 @@ - + diff --git a/KCD/Base.lproj/HMFleetViewController.xib b/KCD/Base.lproj/HMFleetViewController.xib index 30fb3128..3d9bf057 100644 --- a/KCD/Base.lproj/HMFleetViewController.xib +++ b/KCD/Base.lproj/HMFleetViewController.xib @@ -122,7 +122,7 @@ - + diff --git a/KCD/Base.lproj/HMRepairListViewController.xib b/KCD/Base.lproj/HMRepairListViewController.xib index 916c2461..cf9c9c35 100644 --- a/KCD/Base.lproj/HMRepairListViewController.xib +++ b/KCD/Base.lproj/HMRepairListViewController.xib @@ -1,7 +1,9 @@ - - + + - + + + @@ -112,7 +114,7 @@ - + @@ -174,7 +176,6 @@ -