Merge branch 'feature-new-logo' into release

# Conflicts:
#	Leanote/Leanote-Info.plist
#	Leanote/Settings.bundle/Root.plist

Leanote.xcodeproj/project.pbxproj

@@ -2002,7 +2002,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Leanote/view/activity/WeixinActivity/Resources",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.leanote.app.ios.debug.Leanote;
+				PRODUCT_BUNDLE_IDENTIFIER = com.leanote.app.ios.debug.a.Leanote;
 				PRODUCT_NAME = Leanote;
 				PROVISIONING_PROFILE = "";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -2041,7 +2041,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Leanote/view/activity/WeixinActivity/Resources",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.leanote.app.ios.debug.Leanote;
+				PRODUCT_BUNDLE_IDENTIFIER = com.leanote.app.ios.debug.a.Leanote;
 				PRODUCT_NAME = Leanote;
 				PROVISIONING_PROFILE = "";
 				TARGETED_DEVICE_FAMILY = "1,2";

Leanote/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,85 +1,86 @@
 {
   "images" : [
     {
+      "idiom" : "iphone",
       "size" : "29x29",
-      "idiom" : "iphone",
+      "scale" : "2x",
-      "filename" : "Icon-Small@2x.png",
+      "filename" : "Icon-Small@2x.png"
-      "scale" : "2x"
     },
     {
+      "idiom" : "iphone",
       "size" : "29x29",
-      "idiom" : "iphone",
+      "scale" : "3x",
-      "filename" : "Icon-Small@3x.png",
+      "filename" : "Icon-Small@3x.png"
-      "scale" : "3x"
     },
     {
+      "idiom" : "iphone",
       "size" : "40x40",
-      "idiom" : "iphone",
+      "scale" : "2x",
-      "filename" : "Icon-40@2x.png",
+      "filename" : "Icon-40@2x.png"
-      "scale" : "2x"
     },
     {
+      "idiom" : "iphone",
       "size" : "40x40",
-      "idiom" : "iphone",
+      "scale" : "3x",
-      "filename" : "Icon-40@3x.png",
+      "filename" : "Icon-40@3x.png"
-      "scale" : "3x"
     },
     {
+      "idiom" : "iphone",
       "size" : "60x60",
-      "idiom" : "iphone",
+      "scale" : "2x",
-      "filename" : "Icon-60@2x.png",
+      "filename" : "Icon-60@2x.png"
-      "scale" : "2x"
     },
     {
+      "idiom" : "iphone",
       "size" : "60x60",
-      "idiom" : "iphone",
+      "scale" : "3x",
-      "filename" : "Icon-60@3x.png",
+      "filename" : "Icon-60@3x.png"
-      "scale" : "3x"
     },
     {
+      "idiom" : "ipad",
       "size" : "29x29",
-      "idiom" : "ipad",
+      "scale" : "1x",
-      "filename" : "Icon-Small.png",
+      "filename" : "Icon-Small.png"
-      "scale" : "1x"
     },
     {
+      "idiom" : "ipad",
       "size" : "29x29",
-      "idiom" : "ipad",
+      "scale" : "2x",
-      "filename" : "Icon-Small@2x.png",
+      "filename" : "Icon-Small@2x.png"
-      "scale" : "2x"
     },
     {
+      "idiom" : "ipad",
       "size" : "40x40",
-      "idiom" : "ipad",
+      "scale" : "1x",
-      "filename" : "Icon-40.png",
+      "filename" : "Icon-40.png"
-      "scale" : "1x"
     },
     {
+      "idiom" : "ipad",
       "size" : "40x40",
-      "idiom" : "ipad",
+      "scale" : "2x",
-      "filename" : "Icon-40@2x.png",
+      "filename" : "Icon-40@2x.png"
-      "scale" : "2x"
     },
     {
-      "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "Icon-76.png",
+      "size" : "76x76",
-      "scale" : "1x"
+      "scale" : "1x",
+      "filename" : "Icon-76.png"
     },
     {
-      "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "Icon-76@2x.png",
+      "size" : "76x76",
-      "scale" : "2x"
+      "scale" : "2x",
+      "filename" : "Icon-76@2x.png"
     },
     {
       "idiom" : "ipad",
       "size" : "83.5x83.5",
-      "scale" : "2x"
+      "scale" : "2x",
+      "filename" : "Icon-83.5@2x.png"
     }
   ],
   "info" : {
     "version" : 1,
-    "author" : "xcode"
+    "author" : "makeappicon"
   }
 }

Leanote/Leanote-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3</string>
+	<string>2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -38,7 +38,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1372</string>
+	<string>1398</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

Leanote/Settings.bundle/Root.plist

@@ -18,7 +18,7 @@
 			<key>AutocorrectionType</key>
 			<string>No</string>
 			<key>DefaultValue</key>
-			<string>1.3 (1372)</string>
+			<string>2.0 (1398)</string>
 			<key>IsSecure</key>
 			<false/>
 			<key>Key</key>

Leanote/controller/auth/LoginViewController.m

@@ -145,14 +145,30 @@ static NSInteger const LoginVerificationCodeNumberOfLines       = 2;
 	
 }
 
+- (NSString*)getPreferredLanguage
+{
+	NSUserDefaults* defs = [NSUserDefaults standardUserDefaults];
+	NSArray* languages = [defs objectForKey:@"AppleLanguages"];
+	NSString* preferredLang = [languages objectAtIndex:0];
+	NSLog(@"Preferred Language:%@", preferredLang);
+	return preferredLang;
+}
+
 // 都是用代码来实现的啊
 - (void)addControls
 {
 	NSAssert(self.view, @"The view should be loaded by now");
 	NSAssert(self.mainView, @"Please, initialize the mainView first");
 	
+	// 中英文出现不同的logo
+	NSString *lang = [self getPreferredLanguage];
+	NSString *leanoteLogo = @"leanote-icon-circle";
+	if ([lang isEqualToString:@"zh-Hans"]) {
+		leanoteLogo = @"leanote-icon-circle-zh";
+	}
+	
 	// Add Icon
-	UIImageView *icon = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"leanote-icon-circle"]]; // icon-wp
+	UIImageView *icon = [[UIImageView alloc] initWithImage:[UIImage imageNamed:leanoteLogo]]; // icon-wp
 	icon.autoresizingMask = UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleLeftMargin;
 	
 	// Add Info button

Leanote/controller/me/MeController.m

@@ -302,7 +302,7 @@ NSArray *users;
 			cell.imageView.image = [UIImage imageNamed:@"leanote-icon-blue"];
 //			cell.imageView.tintColor = [UIColor redColor];
 			
-			[cell.textLabel setText:@"Lea++"];
+			[cell.textLabel setText:NSLocalizedString(@"Leanote Explore", @"")];
 			[cell.detailTextLabel setText:@""];
 //		}
 	}

Leanote/en.lproj/MainStoryboard_iPad.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8152.3" systemVersion="14E46" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="5">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="14E46" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="5">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8124.4"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <scenes>
         <!--Navigation Controller-->

Leanote/resources/AppImages.xcassets/leanote-icon-circle-zh.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "leanote-icon-circle.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "leanote-icon-circle@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Leanote/resources/AppImages.xcassets/leanote-launch.imageset/Contents.json

@@ -2,11 +2,12 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "leanote-lauch-screen.png",
+      "filename" : "leanote-launch.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
+      "filename" : "leanote-launch-2x.png",
       "scale" : "2x"
     },
     {

Leanote/resources/ui/Launch Screen.storyboard

@@ -3,7 +3,6 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -18,70 +17,15 @@
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="leanote-lauch-screen" translatesAutoresizingMaskIntoConstraints="NO" id="flk-nN-QC3">
+                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="leanote-launch" translatesAutoresizingMaskIntoConstraints="NO" id="eaq-YU-fci">
-                                <rect key="frame" x="265" y="260" width="71" height="79"/>
+                                <rect key="frame" x="157.5" y="218" width="285" height="164"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="312" id="Jor-90-EtI">
-                                        <variation key="heightClass=regular-widthClass=compact" constant="182"/>
-                                    </constraint>
-                                    <constraint firstAttribute="width" constant="285" id="MEa-f1-P0i">
-                                        <variation key="heightClass=regular-widthClass=compact" constant="167"/>
-                                    </constraint>
-                                </constraints>
-                                <variation key="default">
-                                    <mask key="constraints">
-                                        <exclude reference="Jor-90-EtI"/>
-                                        <exclude reference="MEa-f1-P0i"/>
-                                    </mask>
-                                </variation>
-                                <variation key="heightClass=compact" ambiguous="YES" misplaced="YES">
-                                    <rect key="frame" x="242" y="141" width="117" height="117"/>
-                                </variation>
-                                <variation key="widthClass=compact" misplaced="YES">
-                                    <rect key="frame" x="150" y="242" width="100" height="116"/>
-                                </variation>
-                                <variation key="widthClass=regular" ambiguous="YES" misplaced="YES">
-                                    <rect key="frame" x="342" y="241" width="117" height="117"/>
-                                </variation>
-                                <variation key="heightClass=compact-widthClass=compact" misplaced="YES">
-                                    <rect key="frame" x="142" y="141" width="117" height="117"/>
-                                </variation>
-                                <variation key="heightClass=compact-widthClass=regular" ambiguous="YES" misplaced="YES">
-                                    <rect key="frame" x="342" y="141" width="117" height="117"/>
-                                </variation>
-                                <variation key="heightClass=regular-widthClass=compact" misplaced="YES">
-                                    <rect key="frame" x="122" y="230" width="157" height="183"/>
-                                    <mask key="constraints">
-                                        <include reference="Jor-90-EtI"/>
-                                        <include reference="MEa-f1-P0i"/>
-                                    </mask>
-                                </variation>
-                                <variation key="heightClass=regular-widthClass=regular" misplaced="YES">
-                                    <rect key="frame" x="347" y="339" width="107" height="122"/>
-                                </variation>
                             </imageView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstAttribute="centerY" secondItem="flk-nN-QC3" secondAttribute="centerY" multiplier="4:3" id="Vvw-Y8-c7d"/>
+                            <constraint firstItem="eaq-YU-fci" firstAttribute="centerX" secondItem="cez-yo-1vp" secondAttribute="centerX" id="avC-4G-QjY"/>
-                            <constraint firstItem="flk-nN-QC3" firstAttribute="centerX" secondItem="cez-yo-1vp" secondAttribute="centerX" id="hfI-z4-tC9"/>
+                            <constraint firstItem="eaq-YU-fci" firstAttribute="centerY" secondItem="cez-yo-1vp" secondAttribute="centerY" id="d3U-48-0UG"/>
-                            <constraint firstItem="flk-nN-QC3" firstAttribute="centerY" secondItem="cez-yo-1vp" secondAttribute="centerY" id="kO7-mP-1tR">
-                                <variation key="heightClass=regular-widthClass=compact" constant="-80"/>
-                            </constraint>
-                            <constraint firstAttribute="centerX" secondItem="flk-nN-QC3" secondAttribute="centerX" id="rF1-hU-dyH"/>
                         </constraints>
-                        <variation key="default">
-                            <mask key="constraints">
-                                <exclude reference="Vvw-Y8-c7d"/>
-                                <exclude reference="rF1-hU-dyH"/>
-                            </mask>
-                        </variation>
-                        <variation key="heightClass=regular-widthClass=compact">
-                            <mask key="constraints">
-                                <exclude reference="Vvw-Y8-c7d"/>
-                                <exclude reference="rF1-hU-dyH"/>
-                            </mask>
-                        </variation>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="W1g-bP-vF7" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -90,6 +34,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="leanote-lauch-screen" width="285" height="312"/>
+        <image name="leanote-launch" width="200" height="115"/>
     </resources>
 </document>

Leanote/zh-Hans.lproj/InfoPlist.strings

@@ -1,3 +1,3 @@
 /* Localized versions of Info.plist keys */
 
-"CFBundleDisplayName" = "Leanote";
+"CFBundleDisplayName" = "蚂蚁笔记";

Leanote/zh-Hans.lproj/Localizable.strings

@@ -98,7 +98,8 @@
 "Markdown" = "Markdown";
 "Account" = "帐户";
 "Settings" = "设置";
-"Blog & Lea++" = "博客 & Lea++";
+"Blog & Lea++" = "博客 & 蚂蚁笔记 探索";
+"Leanote Explore" = "蚂蚁笔记-探索";
 "Remove account successful" = "删除用户成功";
 "The account's data will be removed, are you sure?" = "该用户所有数据将被清除, 确定删除?";
 "Toggle account successful" = "切换用户成功";

Podfile.lock

@@ -63,4 +63,4 @@ SPEC CHECKSUMS:
   WordPress-iOS-Shared: af84c229bd1cb0206f6015fd8fec9e262a88c780
   WordPressCom-Analytics-iOS: 73de8c9a0f1a43bac03fd2fcd881389be73ee820
 
-COCOAPODS: 0.39.0
+COCOAPODS: 0.38.2