- CustomLabel 오류 주석 처리

Crashlytics.framework/Headers/CLSStackFrame.h

@@ -26,6 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (instancetype)stackFrameWithSymbol:(NSString *)symbol;
 
 @property (nonatomic, copy, nullable) NSString *symbol;
+@property (nonatomic, copy, nullable) NSString *rawSymbol;
 @property (nonatomic, copy, nullable) NSString *library;
 @property (nonatomic, copy, nullable) NSString *fileName;
 @property (nonatomic, assign) uint32_t lineNumber;

Crashlytics.framework/Headers/Crashlytics.h

@@ -18,7 +18,10 @@ NS_ASSUME_NONNULL_BEGIN
 @protocol CrashlyticsDelegate;
 
 /**
- *  Crashlytics. Handles configuration and initialization of Crashlytics.
+ * Crashlytics. Handles configuration and initialization of Crashlytics.
+ *
+ * Note: The Crashlytics class cannot be subclassed. If this is causing you pain for
+ * testing, we suggest using either a wrapper class or a protocol extension.
  */
 @interface Crashlytics : NSObject
 

Fabric.framework/Headers/FABAttributes.h

@@ -21,22 +21,11 @@
 
 #define FAB_UNAVAILABLE(x) __attribute__((unavailable(x)))
 
-#if __has_feature(nullability)
-    #define fab_nullable           nullable
-    #define fab_nonnull            nonnull
-    #define fab_null_unspecified   null_unspecified
-    #define fab_null_resettable    null_resettable
-    #define __fab_nullable         __nullable
-    #define __fab_nonnull          __nonnull
-    #define __fab_null_unspecified __null_unspecified
-#else
-    #define fab_nullable
-    #define fab_nonnull
-    #define fab_null_unspecified
-    #define fab_null_resettable
-    #define __fab_nullable
-    #define __fab_nonnull
-    #define __fab_null_unspecified
+#if !__has_feature(nullability)
+    #define nonnull
+    #define nullable
+    #define _Nullable
+    #define _Nonnull
 #endif
 
 #ifndef NS_ASSUME_NONNULL_BEGIN
@@ -51,9 +40,11 @@
 /**
  * The following macros are defined here to provide
  * backwards compatability. If you are still using
- * them you should migrate to the new versions that
- * are defined above.
+ * them you should migrate to the native nullability
+ * macros.
  */
+#define fab_nullable      nullable
+#define fab_nonnull       nonnull
 #define FAB_NONNULL       __fab_nonnull
 #define FAB_NULLABLE      __fab_nullable
 #define FAB_START_NONNULL NS_ASSUME_NONNULL_BEGIN

Fabric.framework/Headers/Fabric.h

@@ -71,6 +71,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (id)init FAB_UNAVAILABLE("Use +sharedSDK to retrieve the shared Fabric instance.");
 
+/**
+ *  Unavailable. Use `+sharedSDK` to retrieve the shared Fabric instance.
+ */
++ (instancetype)new FAB_UNAVAILABLE("Use +sharedSDK to retrieve the shared Fabric instance.");
+
 @end
 
 NS_ASSUME_NONNULL_END

OneCable.xcodeproj/project.pbxproj

@@ -1067,8 +1067,8 @@
 				93ADEA80A8C04811E0886259 /* [CP] Embed Pods Frameworks */,
 				27BC1E0D72C144B1471B5B4D /* [CP] Copy Pods Resources */,
 				A1A790F41C64B3B700C9382F /* ShellScript */,
-				A16A1CBC1C7162C700F92BC1 /* ShellScript */,
 				A57656171E518255002D0AE2 /* Embed Frameworks */,
+				A57656181E518A1D002D0AE2 /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -1231,33 +1231,33 @@
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-OneCable/Pods-OneCable-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		A16A1CBC1C7162C700F92BC1 /* ShellScript */ = {
+		A1A790F41C64B3B700C9382F /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"$(SRCROOT)/Carthage/Build/iOS/ReactiveObjC.framework",
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "./Fabric.framework/run 3298aa97e58ddd12458d6809dda1866a815ab67c 00506d1367168c2c81e5b4cc436c43c67eacb112644c6f97513920cae7297bcb";
+			shellScript = "/usr/local/bin/carthage copy-frameworks";
+			showEnvVarsInLog = 0;
 		};
-		A1A790F41C64B3B700C9382F /* ShellScript */ = {
+		A57656181E518A1D002D0AE2 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"$(SRCROOT)/Carthage/Build/iOS/ReactiveObjC.framework",
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/usr/local/bin/carthage copy-frameworks";
-			showEnvVarsInLog = 0;
+			shellScript = "./Fabric.framework/run 880f3dee7e6be7a796fab928aafeee250c7867e2 cd7015c4f4a84ac451c1239e79ac4d79f8789bf567e4a50643d45f604248b1e7";
 		};
 		D18445E3F4B77D67EB5C9CBE /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -1608,7 +1608,7 @@
 					"DEBUG_MODE=1",
 				);
 				INFOPLIST_FILE = OneCable/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ntels.adthomeservice;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1638,7 +1638,7 @@
 					"RELEASE_MODE=1",
 				);
 				INFOPLIST_FILE = OneCable/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ntels.adthomeservice;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1731,7 +1731,7 @@
 					"ADHOC_MODE=1",
 				);
 				INFOPLIST_FILE = OneCable/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ntels.adthomeservice;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1812,7 +1812,7 @@
 					"PRODUCT_MODE=1",
 				);
 				INFOPLIST_FILE = OneCable/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.ntels.adthomeservice;
 				PRODUCT_NAME = "$(TARGET_NAME)";

OneCable.xcworkspace/contents.xcworkspacedata

@@ -7,7 +7,4 @@
    <FileRef
       location = "group:Pods/Pods.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:OneCable.xcodeproj">
-   </FileRef>
 </Workspace>

OneCable/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -32,6 +42,16 @@
       "filename" : "launcher_180.png",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "idiom" : "ipad",
       "size" : "29x29",

OneCable/Classes/AppDelegate.m

@@ -71,13 +71,7 @@
     [DDLog addLogger:[DDASLLogger sharedInstance]];
     [DDLog addLogger:[DDTTYLogger sharedInstance]];
     
-//    [[DDTTYLogger sharedInstance] setColorsEnabled:YES];
-    
-    [DDLog addLogger:[DDTTYLogger sharedInstance]]; // Console
-    [DDLog addLogger:[DDASLLogger sharedInstance]]; // Device Console
-    DDFileLogger* fileLogger = [[DDFileLogger alloc] init]; // File
-    [DDLog addLogger:fileLogger];
-    
+    [[DDTTYLogger sharedInstance] setColorsEnabled:YES];
 }
 
 

OneCable/Classes/CustomUI/CustomLabel.m

@@ -115,13 +115,15 @@
 - (UIFont *)getFont {
     UIFont *font = self.font;
     CGFloat fontSize = self.font.pointSize;
-    
-    if ([self.font.fontName isEqualToString:[[UIFont systemFontOfSize:fontSize] fontName]]) {
-        
-        NSString *fontName = [[UIFont systemFontOfSize:fontSize] fontName];
-        fontName = [fontName substringToIndex:[fontName rangeOfString:@"-"].location];
-        font = [UIFont fontWithName:[NSString stringWithFormat:@"%@-Regular", fontName] size:fontSize];
-    }
+    // TODO: 이부분에서 폰트명에 따라서 처리해야 함
+//    if ([self.font.fontName isEqualToString:[[UIFont systemFontOfSize:fontSize] fontName]])
+//    {
+//        
+//        NSString *fontName = [[UIFont systemFontOfSize:fontSize] fontName];
+//        NSLog(@"Font Name : %@", fontName);
+//        fontName = [fontName substringToIndex:[fontName rangeOfString:@"-"].location];
+//        font = [UIFont fontWithName:[NSString stringWithFormat:@"%@-Regular", fontName] size:fontSize];
+//    }
     
     _isBold = [[self.font.fontName lowercaseString] rangeOfString:@"bold"].location != NSNotFound;
     

OneCable/Classes/ViewControllers/MainScreens/IntroViewController.h

@@ -20,4 +20,4 @@
 #pragma mark - Instance Methods
 
 
-@end
+@end

OneCable/Classes/ViewControllers/MainScreens/IntroViewController.m

@@ -55,7 +55,7 @@
         splashImage = [UIImage imageNamed:@"Brand Assets-700-568h"];
     }
     
-    [_imgvSplash setImage:splashImage];
+//    [_imgvSplash setImage:splashImage];
 }
 
 - (void)prepareViewDidLoad {
@@ -154,4 +154,4 @@
     // Dispose of any resources that can be recreated.
 }
 
-@end
+@end

OneCable/Info.plist

@@ -25,7 +25,7 @@
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>
-		<string>3298aa97e58ddd12458d6809dda1866a815ab67c</string>
+		<string>880f3dee7e6be7a796fab928aafeee250c7867e2</string>
 		<key>Kits</key>
 		<array>
 			<dict>