돌이킬 수 없다 13

presto95 · Mar 13, 2019 · 6d89a5f · 6d89a5f
1 parent b0eaba2
commit 6d89a5f
Show file tree

Hide file tree

Showing 45 changed files with 344 additions and 202 deletions.
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -1,5 +1,4 @@
 disabled_rules:
-  - line_length
   - trailing_whitespace
   - leading_whitespace
   - force_try

diff --git a/RespectU.xcodeproj/project.pbxproj b/RespectU.xcodeproj/project.pbxproj
@@ -501,6 +501,32 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		1914B521223889F200BA057E /* XIBs */ = {
+			isa = PBXGroup;
+			children = (
+				0A55900F26C3996946BE4F93D6DA3621 /* AchievementCell.xib */,
+				8345DDA3C2BB8226C719046C36C1C125 /* GuideFirstCell.xib */,
+				27B3098AC1D795D61653C34864ED20F9 /* GuideSecondCell.xib */,
+				87BC688E45E35568921856EA90F48939 /* GuideThirdCell.xib */,
+				274D0B448B5CE4F3F072A2E8F1A08173 /* MissionCell.xib */,
+				DF44E865CAECD23B67EC669F4F499627 /* RankingCell.xib */,
+				8872346BBBB0B7BAFD7D7D14AB637E94 /* RecordCell.xib */,
+				9CCC3BF2DFAE7E90D1AB5AE1DDA0283F /* RecordView.xib */,
+				447A6CDF1125075CFA6FF3AA94D38056 /* SearchByLevelView.xib */,
+				BB408736A795C68EBA417CAF1C9391F9 /* SearchByNoteView.xib */,
+				D550E00BAB0ADC8AEF6EFE91AD2134E9 /* SearchByRatingView.xib */,
+				D538492B9D665E6049971A842544B8F0 /* SearchRecordDetailCell.xib */,
+				58F94B11D0652E774E5A75E6FC9875E3 /* SkillLevelCell.xib */,
+				0D06706BBF1BDD733B678B932EBBB7D5 /* SkillLevelDetailView.xib */,
+				E566F2224770BCDA7139D3E7C9B1AC34 /* SongCell.xib */,
+				EC0C1D43DE39EACC238837AEAB67663B /* SummaryCell.xib */,
+				C6F278314CCBAFC8DD80108CFDC5B48D /* SummaryCollectionCell.xib */,
+				3329CE7FE589A94E7D6F4B0D771A64AE /* Top50Cell.xib */,
+				E4592DA185138E2C675A2E63C84920D1 /* TrophyCell.xib */,
+			);
+			path = XIBs;
+			sourceTree = "<group>";
+		};
 		20CD4E18015C56EA046398F6514DA8D4 /* Top50 */ = {
 			isa = PBXGroup;
 			children = (
@@ -813,45 +839,27 @@
 		DF613463216FC79F328D85241366F912 /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				1914B521223889F200BA057E /* XIBs */,
 				623DBE7ABE62C6ED2C6A96D8B561D1BC /* AchievementCell.swift */,
-				0A55900F26C3996946BE4F93D6DA3621 /* AchievementCell.xib */,
 				48EB4DE7C46CAC769FAD64B4062EA5AC /* GuideFirstCell.swift */,
-				8345DDA3C2BB8226C719046C36C1C125 /* GuideFirstCell.xib */,
 				88C214B5C6340C681D687A5837D49CB2 /* GuideSecondCell.swift */,
-				27B3098AC1D795D61653C34864ED20F9 /* GuideSecondCell.xib */,
 				C2C849886AF9CEC2084D57D6610826D0 /* GuideThirdCell.swift */,
-				87BC688E45E35568921856EA90F48939 /* GuideThirdCell.xib */,
 				5E6BC6E8EAEFF1FB31DF48435303F350 /* MissionCell.swift */,
-				274D0B448B5CE4F3F072A2E8F1A08173 /* MissionCell.xib */,
 				B6DC6B20F4435BC55F0363155B189EA9 /* RankingCell.swift */,
-				DF44E865CAECD23B67EC669F4F499627 /* RankingCell.xib */,
 				2991773C4B90001F83182265FA5298FA /* RecordCell.swift */,
-				8872346BBBB0B7BAFD7D7D14AB637E94 /* RecordCell.xib */,
 				6D899C6158365DC40A43EFA3FBD53860 /* RecordView.swift */,
-				9CCC3BF2DFAE7E90D1AB5AE1DDA0283F /* RecordView.xib */,
 				16CA587AC64BBF7D9615B18AE922CCA5 /* SearchByLevelView.swift */,
-				447A6CDF1125075CFA6FF3AA94D38056 /* SearchByLevelView.xib */,
 				D8DA77CE4436FD7F1B3A85A2993A6875 /* SearchByNoteView.swift */,
-				BB408736A795C68EBA417CAF1C9391F9 /* SearchByNoteView.xib */,
 				DF1CBDA6DFA6F7DC1C8CFDE819CB27EC /* SearchByRatingView.swift */,
-				D550E00BAB0ADC8AEF6EFE91AD2134E9 /* SearchByRatingView.xib */,
 				5C7E6B6B900C98599DF992D190397ED8 /* SearchRecordDetailCell.swift */,
-				D538492B9D665E6049971A842544B8F0 /* SearchRecordDetailCell.xib */,
 				C48AF305EFDF8EDEE8CE8D136BC9FEEB /* SignInTextField.swift */,
 				2AC69B55FC64D7C31A86A33852EAB0AC /* SkillLevelCell.swift */,
-				58F94B11D0652E774E5A75E6FC9875E3 /* SkillLevelCell.xib */,
 				F0CC6B551EBD0EC656F35FD74247ED8D /* SkillLevelDetailView.swift */,
-				0D06706BBF1BDD733B678B932EBBB7D5 /* SkillLevelDetailView.xib */,
 				59AC73FB70CC51A8AFAC0050C039CF14 /* SongCell.swift */,
-				E566F2224770BCDA7139D3E7C9B1AC34 /* SongCell.xib */,
 				D8D3AEF54E1F8CB4F0C230AE0F4A274D /* SummaryCell.swift */,
-				EC0C1D43DE39EACC238837AEAB67663B /* SummaryCell.xib */,
 				7141F43FD5DD9A34D35E2692CB721D4A /* SummaryCollectionCell.swift */,
-				C6F278314CCBAFC8DD80108CFDC5B48D /* SummaryCollectionCell.xib */,
 				4A4C312CB6DC58847B1ACBECB8F95A8F /* Top50Cell.swift */,
-				3329CE7FE589A94E7D6F4B0D771A64AE /* Top50Cell.xib */,
 				7C8E87A2B03543FCDFA459E10DCEBCDF /* TrophyCell.swift */,
-				E4592DA185138E2C675A2E63C84920D1 /* TrophyCell.xib */,
 			);
 			path = Views;
 			sourceTree = "<group>";

diff --git a/RespectU/Sources/AppDelegate.swift b/RespectU/Sources/AppDelegate.swift
@@ -41,15 +41,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     let id = KeychainWrapper.standard.string(forKey: "id") ?? ""
     if !id.isEmpty {
       if TipInfo.fetch().count != 0 {
-        let controller = UIViewController.instantiate(storyboard: "Performance", identifier: "PerformanceNavigationController")
+        let controller = StoryboardScene.Performance.performanceNavigationController.instantiate()
         window?.rootViewController = controller
       } else {
-        UserDefaults.standard.set(450, forKey: "bpm")
-        let controller = UIViewController.instantiate(storyboard: "Init", identifier: InitViewController.name)
+        Persistence.bpm = 450
+        let controller = StoryboardScene.Init.initViewController.instantiate()
         window?.rootViewController = controller
       }
     } else {
-      let controller = UIViewController.instantiate(storyboard: "SignIn", identifier: "SignNavigationController")
+      let controller = StoryboardScene.SignIn.signNavigationController.instantiate()
       window?.rootViewController = controller
     }
     window?.makeKeyAndVisible()
@@ -60,19 +60,21 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
       UserDefaults.standard.set(favoriteButton.lowercased(), forKey: "favoriteButton")
     }
     // 전역 프로퍼티 설정
-    let navigationBar = UINavigationBar.appearance()
-    navigationBar.setBackgroundImage(.init(), for: .default)
-    navigationBar.shadowImage = .init()
-    navigationBar.backgroundColor = .clear
-    navigationBar.isTranslucent = true
-    let tableView = UITableView.appearance()
-    tableView.backgroundColor = .white
-    tableView.separatorColor = .lightGray
-    tableView.separatorInset = .init(top: 0, left: 16, bottom: 0, right: 16)
-    tableView.layer.borderColor = UIColor.main.cgColor
-    tableView.layer.borderWidth = 3
-    tableView.layer.cornerRadius = 10
-    tableView.tableFooterView = .init()
+    UINavigationBar.appearance().do {
+      $0.setBackgroundImage(.init(), for: .default)
+      $0.shadowImage = .init()
+      $0.backgroundColor = .clear
+      $0.isTranslucent = true
+    }
+    UITableView.appearance().do {
+      $0.backgroundColor = .white
+      $0.separatorColor = .lightGray
+      $0.separatorInset = .init(top: 0, left: 16, bottom: 0, right: 16)
+      $0.layer.borderColor = UIColor.main.cgColor
+      $0.layer.borderWidth = 3
+      $0.layer.cornerRadius = 10
+      $0.tableFooterView = .init()
+    }
     return true
   }
 }
diff --git a/RespectU/Sources/Common/Button.swift b/RespectU/Sources/Common/Button.swift
@@ -26,11 +26,6 @@ enum Button: String {
 
   /// Only in mission - TECHNIKA mode.
   case tb
-}
-
-// MARK: - Extension
-
-extension Button {
 
   /// Expands the raw value of each case.
   ///
@@ -45,4 +40,6 @@ extension Button {
     default: return nil
     }
   }
+
+  static let all: [Button] = [.button4, .button5, .button6, .button8]
 }
diff --git a/RespectU/Sources/Common/Difficulty.swift b/RespectU/Sources/Common/Difficulty.swift
@@ -26,4 +26,6 @@ enum Difficulty: String {
 
   /// Only in mission - REDESIGN.
   case redesign
+
+  static let all: [Difficulty] = [.normal, .hard, .maximum]
 }