diff --git a/Leanote.xcodeproj/project.pbxproj b/Leanote.xcodeproj/project.pbxproj index 9bbf837..ae11f2d 100755 --- a/Leanote.xcodeproj/project.pbxproj +++ b/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"; diff --git a/Leanote/Images.xcassets/AppIcon.appiconset/Contents.json b/Leanote/Images.xcassets/AppIcon.appiconset/Contents.json index a7fe4fc..8d83298 100644 --- a/Leanote/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/Leanote/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,85 +1,86 @@ { "images" : [ { + "idiom" : "iphone", "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-Small@2x.png", - "scale" : "2x" + "scale" : "2x", + "filename" : "Icon-Small@2x.png" }, { + "idiom" : "iphone", "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-Small@3x.png", - "scale" : "3x" + "scale" : "3x", + "filename" : "Icon-Small@3x.png" }, { + "idiom" : "iphone", "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-40@2x.png", - "scale" : "2x" + "scale" : "2x", + "filename" : "Icon-40@2x.png" }, { + "idiom" : "iphone", "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-40@3x.png", - "scale" : "3x" + "scale" : "3x", + "filename" : "Icon-40@3x.png" }, { + "idiom" : "iphone", "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-60@2x.png", - "scale" : "2x" + "scale" : "2x", + "filename" : "Icon-60@2x.png" }, { + "idiom" : "iphone", "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-60@3x.png", - "scale" : "3x" + "scale" : "3x", + "filename" : "Icon-60@3x.png" }, { + "idiom" : "ipad", "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-Small.png", - "scale" : "1x" + "scale" : "1x", + "filename" : "Icon-Small.png" }, { + "idiom" : "ipad", "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-Small@2x.png", - "scale" : "2x" + "scale" : "2x", + "filename" : "Icon-Small@2x.png" }, { + "idiom" : "ipad", "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-40.png", - "scale" : "1x" + "scale" : "1x", + "filename" : "Icon-40.png" }, { + "idiom" : "ipad", "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-40@2x.png", - "scale" : "2x" + "scale" : "2x", + "filename" : "Icon-40@2x.png" }, { - "size" : "76x76", "idiom" : "ipad", - "filename" : "Icon-76.png", - "scale" : "1x" + "size" : "76x76", + "scale" : "1x", + "filename" : "Icon-76.png" }, { - "size" : "76x76", "idiom" : "ipad", - "filename" : "Icon-76@2x.png", - "scale" : "2x" + "size" : "76x76", + "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" } } \ No newline at end of file diff --git a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-40.png b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-40.png index ef3b677..922464e 100644 Binary files a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-40.png and b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-40.png differ diff --git a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png index 61fee52..b2aefbd 100644 Binary files a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png and b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png differ diff --git a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png index 2aadf5b..41de23a 100644 Binary files a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png and b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png differ diff --git a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png index 2aadf5b..41de23a 100644 Binary files a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png and b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png differ diff --git a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png index a2e8190..ee79abd 100644 Binary files a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png and b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png differ diff --git a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-76.png b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-76.png index 28f6e17..88f1df9 100644 Binary files a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-76.png and b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-76.png differ diff --git a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png index b467011..4d18fb9 100644 Binary files a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png and b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png differ diff --git a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png new file mode 100644 index 0000000..4bb04c4 Binary files /dev/null and b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png differ diff --git a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-Small.png b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-Small.png index 5b64514..8cfd9ea 100644 Binary files a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-Small.png and b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-Small.png differ diff --git a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png index 59ec28a..1aa57cc 100644 Binary files a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png and b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png differ diff --git a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png index fa730ae..3beb73b 100644 Binary files a/Leanote/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png and b/Leanote/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png differ diff --git a/Leanote/Images.xcassets/AppIcon.appiconset/leanote-appicon.psd b/Leanote/Images.xcassets/AppIcon.appiconset/leanote-appicon.psd deleted file mode 100644 index 8e7737c..0000000 Binary files a/Leanote/Images.xcassets/AppIcon.appiconset/leanote-appicon.psd and /dev/null differ diff --git a/Leanote/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png b/Leanote/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png index c0fac0e..824fe5f 100644 Binary files a/Leanote/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png and b/Leanote/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png differ diff --git a/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape@2x~ipad-1.png b/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape@2x~ipad-1.png index 63e5770..683faad 100644 Binary files a/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape@2x~ipad-1.png and b/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape@2x~ipad-1.png differ diff --git a/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape@2x~ipad-1.psd b/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape@2x~ipad-1.psd new file mode 100644 index 0000000..4085b43 Binary files /dev/null and b/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape@2x~ipad-1.psd differ diff --git a/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape@2x~ipad.png b/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape@2x~ipad.png old mode 100755 new mode 100644 index 63e5770..d43b055 Binary files a/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape@2x~ipad.png and b/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape@2x~ipad.png differ diff --git a/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape@2x~ipad.psd b/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape@2x~ipad.psd new file mode 100755 index 0000000..bed6ebc Binary files /dev/null and b/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape@2x~ipad.psd differ diff --git a/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape~ipad-1.png b/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape~ipad-1.png index 6027fcd..525c40f 100644 Binary files a/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape~ipad-1.png and b/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape~ipad-1.png differ diff --git a/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape~ipad.png b/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape~ipad.png old mode 100755 new mode 100644 index 6027fcd..1c20d08 Binary files a/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape~ipad.png and b/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape~ipad.png differ diff --git a/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape~ipad.psd b/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape~ipad.psd new file mode 100755 index 0000000..3c927e0 Binary files /dev/null and b/Leanote/Images.xcassets/LaunchImage.launchimage/Landscape~ipad.psd differ diff --git a/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad-1.png b/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad-1.png index 76bc361..88ce2f7 100644 Binary files a/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad-1.png and b/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad-1.png differ diff --git a/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad.png b/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad.png index 76bc361..a6531d0 100755 Binary files a/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad.png and b/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad.png differ diff --git a/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad@2x-1.png b/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad@2x-1.png index 29c1e32..0c126b9 100644 Binary files a/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad@2x-1.png and b/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad@2x-1.png differ diff --git a/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad@2x-1.psd b/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad@2x-1.psd new file mode 100644 index 0000000..3e35c08 Binary files /dev/null and b/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad@2x-1.psd differ diff --git a/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad@2x.png b/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad@2x.png old mode 100755 new mode 100644 index 29c1e32..9e08315 Binary files a/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad@2x.png and b/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad@2x.png differ diff --git a/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad@2x.psd b/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad@2x.psd new file mode 100755 index 0000000..a5f56d7 Binary files /dev/null and b/Leanote/Images.xcassets/LaunchImage.launchimage/Portrait~ipad@2x.psd differ diff --git a/Leanote/Images.xcassets/LaunchImage.launchimage/start-retina.png b/Leanote/Images.xcassets/LaunchImage.launchimage/start-retina.png index 02c0eab..80e0460 100644 Binary files a/Leanote/Images.xcassets/LaunchImage.launchimage/start-retina.png and b/Leanote/Images.xcassets/LaunchImage.launchimage/start-retina.png differ diff --git a/Leanote/Leanote-Info.plist b/Leanote/Leanote-Info.plist index bae4cc7..159d1ef 100755 --- a/Leanote/Leanote-Info.plist +++ b/Leanote/Leanote-Info.plist @@ -21,7 +21,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.3 + 2.0 CFBundleSignature ???? CFBundleURLTypes @@ -38,7 +38,7 @@ CFBundleVersion - 1372 + 1398 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/Leanote/Settings.bundle/Root.plist b/Leanote/Settings.bundle/Root.plist index 0bc0baf..67d6d07 100755 --- a/Leanote/Settings.bundle/Root.plist +++ b/Leanote/Settings.bundle/Root.plist @@ -18,7 +18,7 @@ AutocorrectionType No DefaultValue - 1.3 (1372) + 2.0 (1398) IsSecure Key diff --git a/Leanote/controller/auth/LoginViewController.m b/Leanote/controller/auth/LoginViewController.m index 9860789..0ee7ab8 100755 --- a/Leanote/controller/auth/LoginViewController.m +++ b/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 diff --git a/Leanote/controller/me/MeController.m b/Leanote/controller/me/MeController.m index a363df9..c621f96 100755 --- a/Leanote/controller/me/MeController.m +++ b/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:@""]; // } } diff --git a/Leanote/en.lproj/MainStoryboard_iPad.storyboard b/Leanote/en.lproj/MainStoryboard_iPad.storyboard index 1cd41cf..11e1f33 100755 --- a/Leanote/en.lproj/MainStoryboard_iPad.storyboard +++ b/Leanote/en.lproj/MainStoryboard_iPad.storyboard @@ -1,8 +1,8 @@ - + - + diff --git a/Leanote/resources/AppImages.xcassets/leanote-icon-blue.imageset/leanote-icon-blue.png b/Leanote/resources/AppImages.xcassets/leanote-icon-blue.imageset/leanote-icon-blue.png index a6c228d..6784192 100644 Binary files a/Leanote/resources/AppImages.xcassets/leanote-icon-blue.imageset/leanote-icon-blue.png and b/Leanote/resources/AppImages.xcassets/leanote-icon-blue.imageset/leanote-icon-blue.png differ diff --git a/Leanote/resources/AppImages.xcassets/leanote-icon-blue.imageset/leanote-icon-blue@2x.png b/Leanote/resources/AppImages.xcassets/leanote-icon-blue.imageset/leanote-icon-blue@2x.png index 1e379f5..e2b79a0 100644 Binary files a/Leanote/resources/AppImages.xcassets/leanote-icon-blue.imageset/leanote-icon-blue@2x.png and b/Leanote/resources/AppImages.xcassets/leanote-icon-blue.imageset/leanote-icon-blue@2x.png differ diff --git a/Leanote/resources/AppImages.xcassets/leanote-icon-blue.imageset/leanote-icon-blue@3x.png b/Leanote/resources/AppImages.xcassets/leanote-icon-blue.imageset/leanote-icon-blue@3x.png index 2d6b9a3..a196e7a 100644 Binary files a/Leanote/resources/AppImages.xcassets/leanote-icon-blue.imageset/leanote-icon-blue@3x.png and b/Leanote/resources/AppImages.xcassets/leanote-icon-blue.imageset/leanote-icon-blue@3x.png differ diff --git a/Leanote/resources/AppImages.xcassets/leanote-icon-circle-zh.imageset/Contents.json b/Leanote/resources/AppImages.xcassets/leanote-icon-circle-zh.imageset/Contents.json new file mode 100644 index 0000000..c6b5bb6 --- /dev/null +++ b/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" + } +} \ No newline at end of file diff --git a/Leanote/resources/AppImages.xcassets/leanote-icon-circle-zh.imageset/leanote-icon-circle.png b/Leanote/resources/AppImages.xcassets/leanote-icon-circle-zh.imageset/leanote-icon-circle.png new file mode 100644 index 0000000..893472b Binary files /dev/null and b/Leanote/resources/AppImages.xcassets/leanote-icon-circle-zh.imageset/leanote-icon-circle.png differ diff --git a/Leanote/resources/AppImages.xcassets/leanote-icon-circle-zh.imageset/leanote-icon-circle@2x.png b/Leanote/resources/AppImages.xcassets/leanote-icon-circle-zh.imageset/leanote-icon-circle@2x.png new file mode 100644 index 0000000..665d7e6 Binary files /dev/null and b/Leanote/resources/AppImages.xcassets/leanote-icon-circle-zh.imageset/leanote-icon-circle@2x.png differ diff --git a/Leanote/resources/AppImages.xcassets/leanote-icon-circle.imageset/leanote-icon-circle.png b/Leanote/resources/AppImages.xcassets/leanote-icon-circle.imageset/leanote-icon-circle.png index 3bd7db5..584206e 100644 Binary files a/Leanote/resources/AppImages.xcassets/leanote-icon-circle.imageset/leanote-icon-circle.png and b/Leanote/resources/AppImages.xcassets/leanote-icon-circle.imageset/leanote-icon-circle.png differ diff --git a/Leanote/resources/AppImages.xcassets/leanote-icon-circle.imageset/leanote-icon-circle@2x.png b/Leanote/resources/AppImages.xcassets/leanote-icon-circle.imageset/leanote-icon-circle@2x.png index afcab79..bd0ccec 100644 Binary files a/Leanote/resources/AppImages.xcassets/leanote-icon-circle.imageset/leanote-icon-circle@2x.png and b/Leanote/resources/AppImages.xcassets/leanote-icon-circle.imageset/leanote-icon-circle@2x.png differ diff --git a/Leanote/resources/AppImages.xcassets/leanote-lauch-screen.imageset/leanote-lauch-screen.png b/Leanote/resources/AppImages.xcassets/leanote-lauch-screen.imageset/leanote-lauch-screen.png deleted file mode 100644 index 1160cba..0000000 Binary files a/Leanote/resources/AppImages.xcassets/leanote-lauch-screen.imageset/leanote-lauch-screen.png and /dev/null differ diff --git a/Leanote/resources/AppImages.xcassets/leanote-lauch-screen.imageset/Contents.json b/Leanote/resources/AppImages.xcassets/leanote-launch.imageset/Contents.json similarity index 76% rename from Leanote/resources/AppImages.xcassets/leanote-lauch-screen.imageset/Contents.json rename to Leanote/resources/AppImages.xcassets/leanote-launch.imageset/Contents.json index a635f3a..11975ce 100644 --- a/Leanote/resources/AppImages.xcassets/leanote-lauch-screen.imageset/Contents.json +++ b/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" }, { diff --git a/Leanote/resources/AppImages.xcassets/leanote-launch.imageset/leanote-launch-2x.png b/Leanote/resources/AppImages.xcassets/leanote-launch.imageset/leanote-launch-2x.png new file mode 100644 index 0000000..92dc43b Binary files /dev/null and b/Leanote/resources/AppImages.xcassets/leanote-launch.imageset/leanote-launch-2x.png differ diff --git a/Leanote/resources/AppImages.xcassets/leanote-launch.imageset/leanote-launch.png b/Leanote/resources/AppImages.xcassets/leanote-launch.imageset/leanote-launch.png new file mode 100644 index 0000000..407ac74 Binary files /dev/null and b/Leanote/resources/AppImages.xcassets/leanote-launch.imageset/leanote-launch.png differ diff --git a/Leanote/resources/ui/Launch Screen.storyboard b/Leanote/resources/ui/Launch Screen.storyboard index 1a7f274..226e6a5 100644 --- a/Leanote/resources/ui/Launch Screen.storyboard +++ b/Leanote/resources/ui/Launch Screen.storyboard @@ -3,7 +3,6 @@ - @@ -18,70 +17,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - + + - - - - - - - - - - - - @@ -90,6 +34,6 @@ - + diff --git a/Leanote/zh-Hans.lproj/InfoPlist.strings b/Leanote/zh-Hans.lproj/InfoPlist.strings index 0ddf1bd..5a827e8 100755 --- a/Leanote/zh-Hans.lproj/InfoPlist.strings +++ b/Leanote/zh-Hans.lproj/InfoPlist.strings @@ -1,3 +1,3 @@ /* Localized versions of Info.plist keys */ -"CFBundleDisplayName" = "Leanote"; \ No newline at end of file +"CFBundleDisplayName" = "蚂蚁笔记"; \ No newline at end of file diff --git a/Leanote/zh-Hans.lproj/Localizable.strings b/Leanote/zh-Hans.lproj/Localizable.strings index 00850c3..69a729d 100644 --- a/Leanote/zh-Hans.lproj/Localizable.strings +++ b/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" = "切换用户成功"; diff --git a/Podfile.lock b/Podfile.lock index a92e1a6..4fe27de 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -63,4 +63,4 @@ SPEC CHECKSUMS: WordPress-iOS-Shared: af84c229bd1cb0206f6015fd8fec9e262a88c780 WordPressCom-Analytics-iOS: 73de8c9a0f1a43bac03fd2fcd881389be73ee820 -COCOAPODS: 0.39.0 +COCOAPODS: 0.38.2