Merge branch 'refs/heads/development'

Conflicts: Demo/NBUCoreDemo/ConfigurationPickerViewController.xib Demo/NBUCoreDemo/LogTestsViewController.xib Demo/NBUCoreDemo/MainController.xib Source/Dashboard/NBUDashboard.xib
ca-archived · Sep 18, 2013 · b5c3736 · b5c3736
2 parents dae5f61 + 1a8c1ed
commit b5c3736
Show file tree

Hide file tree

Showing 14 changed files with 167 additions and 9,224 deletions.
diff --git a/Demo/NBUCoreDemo.xcodeproj/project.pbxproj b/Demo/NBUCoreDemo.xcodeproj/project.pbxproj
@@ -208,6 +208,11 @@
 			attributes = {
 				LastUpgradeCheck = 0460;
 				ORGANIZATIONNAME = "CyberAgent Inc.";
+				TargetAttributes = {
+					E5E5DFDD1730EA18004985B1 = {
+						DevelopmentTeam = G7FH63PE76;
+					};
+				};
 			};
 			buildConfigurationList = E5E5DFD91730EA18004985B1 /* Build configuration list for PBXProject "NBUCoreDemo" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -389,7 +394,8 @@
 			baseConfigurationReference = 0812F44A168849ABB2B939D2 /* Pods.xcconfig */;
 			buildSettings = {
 				BUNDLEID = "jp.co.cyberagent.nbu.${PRODUCT_NAME:rfc1034identifier}-dev";
-				DISPLAYNAME = "NBUCore-dev";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				DISPLAYNAME = NBUCoreDev;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "NBUCoreDemo/NBUCoreDemo-Prefix.pch";
 				INFOPLIST_FILE = "NBUCoreDemo/NBUCoreDemo-Info.plist";
@@ -405,6 +411,7 @@
 			baseConfigurationReference = 0812F44A168849ABB2B939D2 /* Pods.xcconfig */;
 			buildSettings = {
 				BUNDLEID = "jp.co.cyberagent.nbu.${PRODUCT_NAME:rfc1034identifier}-ota";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				DISPLAYNAME = NBUCore;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "NBUCoreDemo/NBUCoreDemo-Prefix.pch";

diff --git a/Demo/NBUCoreDemo/ConfigurationPickerViewController.xib b/Demo/NBUCoreDemo/ConfigurationPickerViewController.xib
diff --git a/Demo/NBUCoreDemo/LogTestsViewController.m b/Demo/NBUCoreDemo/LogTestsViewController.m
@@ -27,7 +27,7 @@ void testCLogs()
     NBULogCVerbose(@"Verbose message from a C function");
     NBULogCInfo(@"Info message from a C function");
     NBULogCWarn(@"Warning message from a C function");
-    NBULogCError(@"Verbose message from a C function");
+    NBULogCError(@"Error message from a C function");
 }
 
 @implementation LogTestsViewController
@@ -40,6 +40,13 @@ - (void)viewDidLoad
 
     [NBULog setAppLogLevel:LOG_LEVEL_VERBOSE];
 
+    if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"7.0"))
+    {
+        CGRect bounds = self.view.bounds;
+        bounds.origin.y = -20.0;
+        self.view.bounds = bounds;
+    }
+
     // Configure text view
     UIApplication * application = [UIApplication sharedApplication];
     _textView.text = [NSString stringWithFormat:@"%@: %@\n%@: %@\n%@: %@\n%@: %@\n%@: %@",

diff --git a/Demo/NBUCoreDemo/LogTestsViewController.xib b/Demo/NBUCoreDemo/LogTestsViewController.xib
diff --git a/Demo/NBUCoreDemo/MainController.xib b/Demo/NBUCoreDemo/MainController.xib
diff --git a/Demo/NBUCoreDemo/NBUCoreDemo-Info.plist b/Demo/NBUCoreDemo/NBUCoreDemo-Info.plist
@@ -32,7 +32,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.9.2</string>
+	<string>1.9.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Demo/Podfile b/Demo/Podfile
@@ -4,5 +4,5 @@ platform :ios
 pod 'NBUCore',      :path => '../'
 
 # For client projects use:
-# pod 'NBUCore',    '~> 1.9.2'
+# pod 'NBUCore',    '~> 1.9.5'
 
diff --git a/NBUCore.podspec b/NBUCore.podspec
@@ -2,7 +2,7 @@
 
 Pod::Spec.new do |s|
     s.name          = "NBUCore"
-    s.version       = "1.9.2"
+    s.version       = "1.9.5"
     s.summary       = "Convenience extensions and utilities for iOS projects."
     s.homepage      = "http://cyberagent.github.io/iOS-NBUCore/"
     s.license       = { :type => 'Apache License, Version 2.0', :file => 'LICENSE' }

diff --git a/README.jp.md b/README.jp.md
@@ -2,7 +2,7 @@ NBUCore
 =======
 
 [![Platform: iOS](http://cocoapod-badges.herokuapp.com/p/NBUCore/badge.svg)](http://cocoadocs.org/docsets/NBUCore/)
-[![Version: 1.9.2](http://cocoapod-badges.herokuapp.com/v/NBUCore/badge.png)](http://cocoadocs.org/docsets/NBUCore/)
+[![Version: 1.9.5](http://cocoapod-badges.herokuapp.com/v/NBUCore/badge.png)](http://cocoadocs.org/docsets/NBUCore/)
 [![Build Status](https://travis-ci.org/CyberAgent/iOS-NBUCore.png?branch=master)](https://travis-ci.org/CyberAgent/iOS-NBUCore)
 
 個々に使用の選択が可能なコンポーネント。 [English](README.md)

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@ NBUCore
 =======
 
 [![Platform: iOS](http://cocoapod-badges.herokuapp.com/p/NBUCore/badge.svg)](http://cocoadocs.org/docsets/NBUCore/)
-[![Version: 1.9.2](http://cocoapod-badges.herokuapp.com/v/NBUCore/badge.png)](http://cocoadocs.org/docsets/NBUCore/)
+[![Version: 1.9.5](http://cocoapod-badges.herokuapp.com/v/NBUCore/badge.png)](http://cocoadocs.org/docsets/NBUCore/)
 [![Build Status](https://travis-ci.org/CyberAgent/iOS-NBUCore.png?branch=master)](https://travis-ci.org/CyberAgent/iOS-NBUCore)
 
 Convenience extensions, macros and on-device console for iOS projects. [[日本語](README.jp.md)]

diff --git a/Source/Additions/NSBundle+NBUAdditions.m b/Source/Additions/NSBundle+NBUAdditions.m
@@ -82,7 +82,7 @@ + (NSArray *)loadNibNamed:(NSString *)name
     if ([mainBundle pathForResource:name
                              ofType:@"nib"])
     {
-        NBULogVerbose(@"Loaded Nib named: '%@' from mainBundle", name);
+        NBULogVerbose(@"Loading Nib named: '%@' from mainBundle...", name);
         return [mainBundle loadNibNamed:name
                                   owner:owner
                                 options:options];
@@ -97,7 +97,7 @@ + (NSArray *)loadNibNamed:(NSString *)name
         if ([bundle pathForResource:name
                              ofType:@"nib"])
         {
-            NBULogVerbose(@"Loaded Nib named: '%@' from bundle: '%@' ", name, bundle.bundleIdentifier);
+            NBULogVerbose(@"Loading Nib named: '%@' from bundle: '%@'...", name, bundle.bundleIdentifier);
             return [bundle loadNibNamed:name
                                   owner:owner
                                 options:options];

diff --git a/Source/Dashboard/NBUDashboard.m b/Source/Dashboard/NBUDashboard.m
@@ -23,6 +23,7 @@
 #import "NBUDashboard.h"
 #import "NBUDashboardLogger.h"
 #import "NBUCore.h"
+#import "NBUUtil.h"
 #import <QuartzCore/QuartzCore.h>
 
 #define kMinimumHeight 20.0
@@ -57,6 +58,10 @@ - (id)initWithFrame:(CGRect)frame
     {
         self.windowLevel = UIWindowLevelStatusBar + 1;
         _screenSize = [UIScreen mainScreen].bounds.size;
+        if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"7.0"))
+        {
+            self.tintColor = [UIColor lightGrayColor];
+        }
 
         // Load other views and objects
         [NSBundle loadNibNamed:@"NBUDashboard"

diff --git a/Source/Dashboard/NBUDashboard.xib b/Source/Dashboard/NBUDashboard.xib
@@ -3,12 +3,12 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1072</int>
 		<string key="IBDocument.SystemVersion">12E55</string>
-		<string key="IBDocument.InterfaceBuilderVersion">4504</string>
+		<string key="IBDocument.InterfaceBuilderVersion">4488.2</string>
 		<string key="IBDocument.AppKitVersion">1187.39</string>
 		<string key="IBDocument.HIToolboxVersion">626.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">3734.1</string>
+			<string key="NS.object.0">3715.3</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>IBProxyObject</string>
@@ -93,6 +93,7 @@
 							<bool key="IBUIClipsSubviews">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 							<bool key="IBUIAlwaysBounceVertical">YES</bool>
+							<reference key="IBUISectionIndexTrackingBackgroundColor" ref="377810682"/>
 							<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
 							<bool key="IBUIAllowsMultipleSelection">YES</bool>
 							<bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
@@ -340,91 +341,7 @@
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">DDAbstractLogger</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/DDAbstractLogger.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NBUDashboard</string>
-					<string key="superclassName">UIWindow</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">toggle:</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">toggle:</string>
-						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">toggle:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="logger">NBUDashboardLogger</string>
-						<string key="toggleButton">UIButton</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="logger">
-							<string key="name">logger</string>
-							<string key="candidateClassName">NBUDashboardLogger</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="toggleButton">
-							<string key="name">toggleButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NBUDashboard.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">NBUDashboardLogger</string>
-					<string key="superclassName">DDAbstractLogger</string>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="searchBar">UISearchBar</string>
-						<string key="tableView">UITableView</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="searchBar">
-							<string key="name">searchBar</string>
-							<string key="candidateClassName">UISearchBar</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="tableView">
-							<string key="name">tableView</string>
-							<string key="candidateClassName">UITableView</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NBUDashboardLogger.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIViewController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">navigationItem</string>
-						<string key="NS.object.0">UINavigationItem</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">navigationItem</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">navigationItem</string>
-							<string key="candidateClassName">UINavigationItem</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/UIViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
@@ -438,6 +355,6 @@
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">3734.1</string>
+		<string key="IBCocoaTouchPluginVersion">3715.3</string>
 	</data>
 </archive>
diff --git a/Source/Dashboard/NBUDashboardLogger.m b/Source/Dashboard/NBUDashboardLogger.m
@@ -334,6 +334,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
     {
         cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault
                                       reuseIdentifier:@"logMessage"];
+        cell.backgroundColor = [UIColor clearColor];
         cell.selectionStyle = UITableViewCellSelectionStyleNone;
         label = [UILabel new];
         label.backgroundColor = [UIColor clearColor];