Skip to content

Ran scripts/format_all. #1141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 6, 2017
Merged

Ran scripts/format_all. #1141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 23 additions & 20 deletions components/ProgressView/examples/ProgressViewExample.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ - (void)setupProgressViews {

_backwardProgressAnimateView = [[MDCProgressView alloc] init];
_backwardProgressAnimateView.translatesAutoresizingMaskIntoConstraints = NO;
_backwardProgressAnimateView.backwardProgressAnimationMode = MDCProgressViewBackwardAnimationModeAnimate;
_backwardProgressAnimateView.backwardProgressAnimationMode =
MDCProgressViewBackwardAnimationModeAnimate;
[self.view addSubview:_backwardProgressAnimateView];
// Have a non-zero progress at setup time.
_backwardProgressAnimateView.progress = 0.33;
Expand Down Expand Up @@ -155,16 +156,16 @@ - (void)setupConstraints {
@"h" : @2,
};

NSArray *verticalConstraints =
[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-(p)-"
"[stockView(==h)]-(p)-[stockLabel]-(s)-"
"[tintedView(==h)]-(p)-[tintedLabel]-(s)-"
"[coloredView(==h)]-(p)-[coloredLabel]-(s)-"
"[backwardResetView(==h)]-(p)-[backwardResetLabel]-(s)-"
"[backwardAnimateView(==h)]-(p)-[backwardAnimateLabel]"
options:0
metrics:metrics
views:views];
NSArray *verticalConstraints = [NSLayoutConstraint
constraintsWithVisualFormat:@"V:|-(p)-"
"[stockView(==h)]-(p)-[stockLabel]-(s)-"
"[tintedView(==h)]-(p)-[tintedLabel]-(s)-"
"[coloredView(==h)]-(p)-[coloredLabel]-(s)-"
"[backwardResetView(==h)]-(p)-[backwardResetLabel]-(s)-"
"[backwardAnimateView(==h)]-(p)-[backwardAnimateLabel]"
options:0
metrics:metrics
views:views];
[self.view addConstraints:verticalConstraints];

NSMutableArray *horizontalConstraints = [NSMutableArray array];
Expand Down Expand Up @@ -240,12 +241,13 @@ - (void)animateBackwardProgressResetView {
__weak ProgressViewExample *weakSelf = self;

[_backwardProgressResetView setProgress:1 - _backwardProgressResetView.progress
animated:YES
completion:^(BOOL finished) {
[weakSelf performSelector:@selector(animateBackwardProgressResetView)
withObject:nil
afterDelay:MDCProgressViewAnimationDuration];
}];
animated:YES
completion:^(BOOL finished) {
[weakSelf
performSelector:@selector(animateBackwardProgressResetView)
withObject:nil
afterDelay:MDCProgressViewAnimationDuration];
}];
}

- (void)animateBackwardProgressAnimateView {
Expand All @@ -254,9 +256,10 @@ - (void)animateBackwardProgressAnimateView {
[_backwardProgressAnimateView setProgress:1 - _backwardProgressResetView.progress
animated:YES
completion:^(BOOL finished) {
[weakSelf performSelector:@selector(animateBackwardProgressAnimateView)
withObject:nil
afterDelay:MDCProgressViewAnimationDuration];
[weakSelf
performSelector:@selector(animateBackwardProgressAnimateView)
withObject:nil
afterDelay:MDCProgressViewAnimationDuration];
}];
}

Expand Down
2 changes: 1 addition & 1 deletion components/ProgressView/src/MDCProgressView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ IB_DESIGNABLE

/**
The backward progress animation mode.

When animating progress which is lower than the current progress value, this mode
will determine which animation to use. The default is MDCProgressViewBackwardAnimationModeReset.
*/
Expand Down
3 changes: 2 additions & 1 deletion components/ProgressView/src/MDCProgressView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ - (void)setProgress:(float)progress {
- (void)setProgress:(float)progress
animated:(BOOL)animated
completion:(void (^__nullable)(BOOL finished))completion {
if (progress < self.progress && self.backwardProgressAnimationMode == MDCProgressViewBackwardAnimationModeReset) {
if (progress < self.progress &&
self.backwardProgressAnimationMode == MDCProgressViewBackwardAnimationModeReset) {
self.progress = 0;
[self updateProgressView];
}
Expand Down