Skip to content

Commit

Permalink
no message
Browse files Browse the repository at this point in the history
  • Loading branch information
titman committed Aug 6, 2015
1 parent 3126ac1 commit 81130ca
Show file tree
Hide file tree
Showing 43 changed files with 426 additions and 164 deletions.
50 changes: 28 additions & 22 deletions LIKE/LIKE/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,6 @@ -(void) load:(NSDictionary *)launchOptions
self.home = [LKHomeViewController viewController];


self.tabBarController = [[LKTabBarController alloc] initWithViewControllers:@[LC_UINAVIGATION(self.home)]];

self.window.rootViewController = self.tabBarController;



if (IOS8_OR_LATER) {

UIUserNotificationSettings * settings = [UIUserNotificationSettings settingsForTypes:(UIRemoteNotificationTypeBadge|UIRemoteNotificationTypeSound|UIRemoteNotificationTypeAlert) categories:nil];
Expand All @@ -108,27 +102,39 @@ -(void) load:(NSDictionary *)launchOptions
}


self.tabBarController = [[LKTabBarController alloc] initWithViewControllers:@[LC_UINAVIGATION(self.home)]];

self.window.rootViewController = self.tabBarController;


if (!LKLocalUser.singleton.isLogin) {

LCUIImageView * imageView = LCUIImageView.view;
imageView.image = [LKWelcome image];
imageView.viewFrameWidth = LC_DEVICE_WIDTH;
imageView.viewFrameHeight = LC_DEVICE_HEIGHT + 20;
imageView.contentMode = UIViewContentModeScaleAspectFit;
[LC_KEYWINDOW addSubview:imageView];

[LCUIApplication presentViewController:LKLoginViewController.viewController];

LCUIImageView * imageView = LCUIImageView.view;
imageView.image = [LKWelcome image];
imageView.viewFrameWidth = LC_DEVICE_WIDTH;
imageView.viewFrameHeight = LC_DEVICE_HEIGHT + 20;
imageView.contentMode = UIViewContentModeScaleAspectFit;
[LC_KEYWINDOW addSubview:imageView];

[UIView animateWithDuration:1.5 delay:0 options:UIViewAnimationOptionCurveLinear animations:^{

imageView.transform = CGAffineTransformMakeScale(1.5, 1.5);
imageView.alpha = 0;

} completion:^(BOOL finished) {

[imageView removeFromSuperview];
LKLoginViewController * login = LKLoginViewController.viewController;
[login view];

[self.tabBarController presentViewController:login animated:NO completion:^{

[UIView animateWithDuration:1.5 delay:0 options:UIViewAnimationOptionCurveLinear animations:^{

imageView.transform = CGAffineTransformMakeScale(1.5, 1.5);
imageView.alpha = 0;

} completion:^(BOOL finished) {

[imageView removeFromSuperview];

}];
}];


}

// // welcom...
Expand Down
2 changes: 1 addition & 1 deletion LIKE/LIKE/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.1.0.4</string>
<string>1.1.0.7</string>
<key>FacebookAppID</key>
<string>368579790017819</string>
<key>FacebookDisplayName</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@
"添加标签(最多12个字)" = "New tag (12-character limit)";

// LKSearchPlaceHolderView
"搜索" = "Related tags ";
"相关内容" = " ";
"搜索相关内容" = "Related tags \"%@\"";
"搜索相关用户" = "Related users \"%@\"";
"最近搜索过的标签" = "Search history";
" 发现更多有趣内容" = " Search & Explore";

Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 6 additions & 0 deletions LIKE/LIKE/LCFramework/UIKit/Extension/UIView+LCExtension.m
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ -(void) setCornerRadius:(CGFloat)cornerRadius

self.layer.masksToBounds = YES;
}
else{

self.layer.shouldRasterize = YES;
self.layer.rasterizationScale = [UIScreen mainScreen].scale; // or [UIScreen mainScreen]
}

}

-(CGFloat) cornerRadius
Expand Down
8 changes: 4 additions & 4 deletions LIKE/LIKE/LCFramework/UIKit/LCUIImageView.m
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ - (M13ProgressViewRing *)indicator
self.ADD(_indicator);
}

[_indicator setProgress:0 animated:YES];
[_indicator setProgress:0 animated:NO];

return _indicator;
}
Expand Down Expand Up @@ -318,7 +318,7 @@ -(void) handleNotification:(NSNotification *)notification

LC_FAST_ANIMATIONS(0.15, ^{

self.indicator.alpha = 0;
_indicator.alpha = 0;
});


Expand Down Expand Up @@ -352,7 +352,7 @@ -(void) handleNotification:(NSNotification *)notification

LC_FAST_ANIMATIONS(0.15, ^{

self.indicator.alpha = 0;
_indicator.alpha = 0;
});

}
Expand All @@ -369,7 +369,7 @@ -(void) handleNotification:(NSNotification *)notification

if (self.showIndicator) {

[self.indicator setProgress:[object doubleValue] animated:YES];
[_indicator setProgress:[object doubleValue] animated:YES];
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell

ALAsset * asset = self.datasource[indexPath.row - 1];

cell.image = [UIImage imageWithCGImage:asset.thumbnail];
cell.image = [[UIImage imageWithCGImage:asset.thumbnail] autoOrientation];

return cell;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ -(void) buildUI

@normally(self);

if ([self checkOnSelectedTags:item.tagString]) {
if ([self checkOnSelectedTags:item.tagValue.tag]) {

[self showTopMessageErrorHud:LC_LO(@"该标签已经存在")];
}
Expand Down
38 changes: 31 additions & 7 deletions LIKE/LIKE/LKApplication/Application/Home/LKHomeViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ -(void) viewDidLoad
}

[self.tableView insertRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:index.integerValue inSection:0]] withRowAnimation:UITableViewRowAnimationFade];

[self performSelector:@selector(scrollViewScrollToTop) withObject:nil afterDelay:0.5];
};

Expand Down Expand Up @@ -513,6 +514,7 @@ -(void) handleNavigationBarButton:(LCUINavigationBarButtonType)type
self.attentionViewController.tableView.scrollsToTop = NO;
self.tableView.scrollsToTop = YES;
self.tableView.hidden = NO;

[self.view bringSubviewToFront:self.tableView];
[self.view bringSubviewToFront:self.inputView];

Expand Down Expand Up @@ -637,7 +639,10 @@ -(void) handleNotification:(NSNotification *)notification

-(void) scrollViewScrollToTop
{
[self.tableView setContentOffset:LC_POINT(0, 0) animated:YES];
LC_FAST_ANIMATIONS(0.25, ^{

[self.tableView setContentOffset:LC_POINT(0, 0) animated:NO];
});
}

-(void) reloadData
Expand Down Expand Up @@ -933,15 +938,22 @@ -(void) setFeedType:(LKHomepageFeedType)feedType
self.titleView = [LCUIImageView viewWithImage:[UIImage imageNamed:@"HomeLikeIcon.png" useCache:YES]];
self.titleView.alpha = 0;

LC_FAST_ANIMATIONS(0.25, ^{
left.userInteractionEnabled = NO;
right.userInteractionEnabled = NO;

[UIView animateWithDuration:0.25 animations:^{

left.alpha = 1;
right.alpha = 1;
self.tableView.alpha = 1;
self.titleView.alpha = 1;

});

} completion:^(BOOL finished) {

left.userInteractionEnabled = YES;
right.userInteractionEnabled = YES;

}];
});
}
else if (feedType == LKHomepageFeedTypeNotification){
Expand Down Expand Up @@ -980,12 +992,19 @@ -(void) setFeedType:(LKHomepageFeedType)feedType
self.titleView = header;
self.titleView.alpha = 0;

LC_FAST_ANIMATIONS(0.25, ^{
left.userInteractionEnabled = NO;

[UIView animateWithDuration:0.25 animations:^{

left.alpha = 1;
notification.alpha = 1;
self.titleView.alpha = 1;
});

} completion:^(BOOL finished) {

left.userInteractionEnabled = YES;

}];
}];

_feedType = feedType;
Expand Down Expand Up @@ -1026,7 +1045,9 @@ -(void) setFeedType:(LKHomepageFeedType)feedType
self.titleView = header;
self.titleView.alpha = 0;


left.userInteractionEnabled = NO;
right.userInteractionEnabled = NO;

[UIView animateWithDuration:0.25 animations:^{

left.alpha = 1;
Expand All @@ -1035,6 +1056,8 @@ -(void) setFeedType:(LKHomepageFeedType)feedType

} completion:^(BOOL finished) {

left.userInteractionEnabled = YES;
right.userInteractionEnabled = YES;
}];

[self scrollViewDidScroll:self.attentionViewController.tableView];
Expand Down Expand Up @@ -1154,6 +1177,7 @@ -(void) searchAction
}
});


LC_APPDELEGATE.tabBarController.assistiveTouchButton.hidden = YES;

LKSearchViewController * view = LKSearchViewController.view;
Expand Down
Loading

0 comments on commit 81130ca

Please sign in to comment.