[from now] 2012/10/14 06:52:22

diff --git a/skooma.xcodeproj/project.pbxproj b/skooma.xcodeproj/project.pbxproj
index b423e2f..0bf97d0 100644
--- a/skooma.xcodeproj/project.pbxproj
+++ b/skooma.xcodeproj/project.pbxproj
@@ -8,7 +8,6 @@

 /* Begin PBXBuildFile section */
 		4221382715F24D990088B119 /* CCThreadCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4221382615F24D990088B119 /* CCThreadCell.m */; };
-		4228EB4315E40E6F00816559 /* azuki.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4228EB4215E40E6F00816559 /* azuki.ttf */; };
 		4228EB6F15E5304100816559 /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 4228EB6615E5304100816559 /* Reachability.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		426516EB15E3F71C00B36104 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 426516EA15E3F71C00B36104 /* UIKit.framework */; };
 		426516ED15E3F71C00B36104 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 426516EC15E3F71C00B36104 /* Foundation.framework */; };
@@ -23,15 +22,18 @@
 		42B6C7D915F2248700C80CC4 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 42B6C7D815F2248700C80CC4 /* SystemConfiguration.framework */; };
 		42B6C7E215F2297100C80CC4 /* CCThreadViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42B6C7E115F2297100C80CC4 /* CCThreadViewController.m */; };
 		42B6C7E515F22A3400C80CC4 /* CCThread.m in Sources */ = {isa = PBXBuildFile; fileRef = 42B6C7E415F22A3400C80CC4 /* CCThread.m */; };
+		42F022B9161844A200B67C2A /* azuki.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 42F022B5161844A200B67C2A /* azuki.ttf */; };
+		42F022BA161844A200B67C2A /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 42F022B7161844A200B67C2A /* Default-568h@2x.png */; };
+		42F022E916184EE800B67C2A /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 42F022E716184EE800B67C2A /* Default.png */; };
+		42F022EA16184EE800B67C2A /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 42F022E816184EE800B67C2A /* Default@2x.png */; };
 /* End PBXBuildFile section */

 /* Begin PBXFileReference section */
 		4221382515F24D990088B119 /* CCThreadCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCThreadCell.h; sourceTree = "<group>"; };
 		4221382615F24D990088B119 /* CCThreadCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCThreadCell.m; sourceTree = "<group>"; };
-		4228EB4215E40E6F00816559 /* azuki.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = azuki.ttf; sourceTree = "<group>"; };
 		4228EB6515E5304100816559 /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; };
 		4228EB6615E5304100816559 /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; };
-		426516E615E3F71C00B36104 /* skooma.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = skooma.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		426516E615E3F71C00B36104 /* Skooma.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Skooma.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		426516EA15E3F71C00B36104 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		426516EC15E3F71C00B36104 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		426516EE15E3F71C00B36104 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -54,6 +56,10 @@
 		42B6C7E115F2297100C80CC4 /* CCThreadViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCThreadViewController.m; sourceTree = "<group>"; };
 		42B6C7E315F22A3400C80CC4 /* CCThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCThread.h; sourceTree = "<group>"; };
 		42B6C7E415F22A3400C80CC4 /* CCThread.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCThread.m; sourceTree = "<group>"; };
+		42F022B5161844A200B67C2A /* azuki.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = azuki.ttf; sourceTree = "<group>"; };
+		42F022B7161844A200B67C2A /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
+		42F022E716184EE800B67C2A /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
+		42F022E816184EE800B67C2A /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -103,7 +109,7 @@
 		426516E715E3F71C00B36104 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				426516E615E3F71C00B36104 /* skooma.app */,
+				426516E615E3F71C00B36104 /* Skooma.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -122,9 +128,9 @@
 		426516F015E3F71C00B36104 /* skooma */ = {
 			isa = PBXGroup;
 			children = (
-				427E9C041600EDC200EDB3FB /* RegexKitLite */,
-				4228EB6415E5304100816559 /* Reachability */,
 				4265170515E3FC7100B36104 /* Resources */,
+				4228EB6415E5304100816559 /* Reachability */,
+				427E9C041600EDC200EDB3FB /* RegexKitLite */,
 				4221382C15F24FF00088B119 /* Custom */,
 				426516F915E3F71C00B36104 /* CCAppDelegate.h */,
 				426516FA15E3F71C00B36104 /* CCAppDelegate.m */,
@@ -155,7 +161,9 @@
 		4265170515E3FC7100B36104 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				4228EB4215E40E6F00816559 /* azuki.ttf */,
+				42F022B4161844A200B67C2A /* Fonts */,
+				42F022B6161844A200B67C2A /* Images */,
+				42F022B8161844A200B67C2A /* Sounds */,
 			);
 			path = Resources;
 			sourceTree = "<group>";
@@ -169,6 +177,31 @@
 			path = RegexKitLite;
 			sourceTree = "<group>";
 		};
+		42F022B4161844A200B67C2A /* Fonts */ = {
+			isa = PBXGroup;
+			children = (
+				42F022B5161844A200B67C2A /* azuki.ttf */,
+			);
+			path = Fonts;
+			sourceTree = "<group>";
+		};
+		42F022B6161844A200B67C2A /* Images */ = {
+			isa = PBXGroup;
+			children = (
+				42F022E716184EE800B67C2A /* Default.png */,
+				42F022E816184EE800B67C2A /* Default@2x.png */,
+				42F022B7161844A200B67C2A /* Default-568h@2x.png */,
+			);
+			path = Images;
+			sourceTree = "<group>";
+		};
+		42F022B8161844A200B67C2A /* Sounds */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Sounds;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */

 /* Begin PBXNativeTarget section */
@@ -186,7 +219,7 @@
 			);
 			name = skooma;
 			productName = skooma;
-			productReference = 426516E615E3F71C00B36104 /* skooma.app */;
+			productReference = 426516E615E3F71C00B36104 /* Skooma.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -221,7 +254,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				426516F515E3F71C00B36104 /* InfoPlist.strings in Resources */,
-				4228EB4315E40E6F00816559 /* azuki.ttf in Resources */,
+				42F022B9161844A200B67C2A /* azuki.ttf in Resources */,
+				42F022BA161844A200B67C2A /* Default-568h@2x.png in Resources */,
+				42F022E916184EE800B67C2A /* Default.png in Resources */,
+				42F022EA16184EE800B67C2A /* Default@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -263,10 +299,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = (
-					"$(ARCHS_STANDARD_32_BIT)",
-					armv6,
-				);
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -284,7 +317,8 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				OTHER_LDFLAGS = "-licucore";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -294,10 +328,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = (
-					"$(ARCHS_STANDARD_32_BIT)",
-					armv6,
-				);
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -308,8 +339,9 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
+				OTHER_LDFLAGS = "-licucore";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
@@ -322,7 +354,8 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "skooma/skooma-Prefix.pch";
 				INFOPLIST_FILE = "skooma/skooma-Info.plist";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = Skooma;
+				TARGETED_DEVICE_FAMILY = 1;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -333,7 +366,8 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "skooma/skooma-Prefix.pch";
 				INFOPLIST_FILE = "skooma/skooma-Info.plist";
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = Skooma;
+				TARGETED_DEVICE_FAMILY = 1;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
diff --git a/skooma/CCSwipableCell.h b/skooma/CCSwipableCell.h
index 3ab507c..cc6146b 100644
--- a/skooma/CCSwipableCell.h
+++ b/skooma/CCSwipableCell.h
@@ -4,6 +4,7 @@
 //
 //  Created by cc on 2012/09/02.
 //
+//  https://github.com/lukeredpath/LRSlidingTableViewCell
 //

 #import <UIKit/UIKit.h>
@@ -19,7 +20,6 @@ typedef enum {

 @protocol CCSwipableCellDelegate <NSObject>
 - (void)cellDidReceiveSwipe:(CCSwipableCell *)cell;
-
 @end

diff --git a/skooma/CCSwipableCell.m b/skooma/CCSwipableCell.m
index dc981c9..8cd1755 100644
--- a/skooma/CCSwipableCell.m
+++ b/skooma/CCSwipableCell.m
@@ -118,15 +118,18 @@ void LR_offsetView(UIView *view, CGFloat offsetX, CGFloat offsetY)
             break;
     }

-    [UIView animateWithDuration:0.1 delay:0
+    [UIView animateWithDuration:0.1
+                          delay:0
                         options:UIViewAnimationOptionCurveEaseOut|UIViewAnimationOptionAllowUserInteraction
                      animations:^{ LR_offsetView(self.contentView, offsetX, 0); }
                      completion:^(BOOL f) {
-                         [UIView animateWithDuration:0.1 delay:0
+                         [UIView animateWithDuration:0.1
+                                               delay:0
                                              options:UIViewAnimationCurveLinear
                                           animations:^{ LR_offsetView(self.contentView, bounceDistance, 0); }
                                           completion:^(BOOL f) {
-                                              [UIView animateWithDuration:0.1 delay:0
+                                              [UIView animateWithDuration:0.1
+                                                                    delay:0
                                                                   options:UIViewAnimationCurveLinear
                                                                animations:^{ LR_offsetView(self.contentView, -bounceDistance, 0); }
                                                                completion:NULL];
diff --git a/skooma/CCThread.m b/skooma/CCThread.m
index 42814ff..6b1a4de 100644
--- a/skooma/CCThread.m
+++ b/skooma/CCThread.m
@@ -93,17 +93,17 @@

     x = BODY_X;

-    s = [self.title sizeWithFont:FONT_TITLE forWidth:BOUND_W lineBreakMode:UILineBreakModeTailTruncation];
+    s = [self.title sizeWithFont:FONT_TITLE forWidth:BOUND_W lineBreakMode:NSLineBreakByTruncatingTail];
     self.titleRect = CGRectMake(x, y, s.width, s.height);

     x += s.width + MARGIN_W;

-    s = [self.name sizeWithFont:FONT_TITLE forWidth:BOUND_W lineBreakMode:UILineBreakModeTailTruncation];
+    s = [self.name sizeWithFont:FONT_TITLE forWidth:BOUND_W lineBreakMode:NSLineBreakByTruncatingTail];
     self.nameRect = CGRectMake(x, y, s.width, s.height);

     x += s.width + MARGIN_W;

-    s = [self.mail sizeWithFont:FONT_TITLE forWidth:BOUND_W lineBreakMode:UILineBreakModeTailTruncation];
+    s = [self.mail sizeWithFont:FONT_TITLE forWidth:BOUND_W lineBreakMode:NSLineBreakByTruncatingTail];
     self.mailRect = CGRectMake(x, y, s.width, s.height);

     x = BODY_X;
diff --git a/skooma/CCThreadCell.m b/skooma/CCThreadCell.m
index db2b13d..e1e5389 100644
--- a/skooma/CCThreadCell.m
+++ b/skooma/CCThreadCell.m
@@ -185,7 +185,7 @@
 //    [color.black set];
 //    [[NSString stringWithFormat:@"%d レス", _thread.resCount] drawInRect:CGRectMake(0, 0, 320, 60) withFont:font lineBreakMode:UILineBreakModeClip alignment:UITextAlignmentLeft];
     [color.black set];
-    [self.thread.text drawInRect:CGRectMake(0, 0, 320, 60) withFont:font lineBreakMode:UILineBreakModeClip alignment:UITextAlignmentLeft];
+    [self.thread.text drawInRect:CGRectMake(0, 0, 320, 60) withFont:font lineBreakMode:NSLineBreakByClipping alignment:NSTextAlignmentLeft];

 //    [color.title set];
 //    [_thread.title drawInRect:_thread.titleRect withFont:boldFont];
diff --git a/skooma/RegexKitLite/RegexKitLite.m b/skooma/RegexKitLite/RegexKitLite.m
index dababa6..20f6e21 100644
--- a/skooma/RegexKitLite/RegexKitLite.m
+++ b/skooma/RegexKitLite/RegexKitLite.m
@@ -1196,7 +1196,7 @@ static void rkl_handleDelayedAssert(id self, SEL _cmd, id exception) {
     else {
       id functionString = [exception objectForKey:@"function"], fileString = [exception objectForKey:@"file"], descriptionString = [exception objectForKey:@"description"], lineNumber = [exception objectForKey:@"line"];
       RKLCHardAbortAssert((functionString != NULL) && (fileString != NULL) && (descriptionString != NULL) && (lineNumber != NULL));
-      [[NSAssertionHandler currentHandler] handleFailureInFunction:functionString file:fileString lineNumber:(NSInteger)[lineNumber longValue] description:descriptionString];
+      [[NSAssertionHandler currentHandler] handleFailureInFunction:functionString file:fileString lineNumber:(NSInteger)[lineNumber longValue] description:@"%@", descriptionString];
     }
   }
 }
diff --git a/skooma/Resources/Fonts/azuki.ttf b/skooma/Resources/Fonts/azuki.ttf
new file mode 100755
index 0000000..6abde50
Binary files /dev/null and b/skooma/Resources/Fonts/azuki.ttf differ
diff --git a/skooma/Resources/Images/Default-568h@2x.png b/skooma/Resources/Images/Default-568h@2x.png
new file mode 100644
index 0000000..0891b7a
Binary files /dev/null and b/skooma/Resources/Images/Default-568h@2x.png differ
diff --git a/skooma/Resources/Images/Default.png b/skooma/Resources/Images/Default.png
new file mode 100644
index 0000000..4c8ca6f
Binary files /dev/null and b/skooma/Resources/Images/Default.png differ
diff --git a/skooma/Resources/Images/Default@2x.png b/skooma/Resources/Images/Default@2x.png
new file mode 100644
index 0000000..35b84cf
Binary files /dev/null and b/skooma/Resources/Images/Default@2x.png differ
diff --git a/skooma/Resources/azuki.ttf b/skooma/Resources/azuki.ttf
deleted file mode 100755
index 6abde50..0000000
Binary files a/skooma/Resources/azuki.ttf and /dev/null differ
diff --git a/skooma/skooma-Prefix.pch b/skooma/skooma-Prefix.pch
index ab93031..061782a 100644
--- a/skooma/skooma-Prefix.pch
+++ b/skooma/skooma-Prefix.pch
@@ -18,13 +18,14 @@
 #if !defined(NS_BLOCK_ASSERTIONS)

 #if !defined(NSLog)
-#define NSLog( args... ) NSLog( args, 0 )
+#define NSLog( m, args... ) NSLog( m, ##args )
 #endif

 #else

 #if !defined(NSLog)
-#define NSLog( args... )
+#define NSLog( m, args... )
+#endif
+
 #endif

-#endif
\ No newline at end of file