diff --git a/ChooseLocation/ChooseLocation/View/ChooseLocationView.h b/ChooseLocation/ChooseLocation/View/ChooseLocationView.h index bcf9ef0..ffdb198 100644 --- a/ChooseLocation/ChooseLocation/View/ChooseLocationView.h +++ b/ChooseLocation/ChooseLocation/View/ChooseLocationView.h @@ -16,4 +16,6 @@ @property (nonatomic,copy) NSString * areaCode; +- (instancetype)initWithFrame:(CGRect)frame withScaling:(CGFloat)scaling; + @end diff --git a/ChooseLocation/ChooseLocation/View/ChooseLocationView.m b/ChooseLocation/ChooseLocation/View/ChooseLocationView.m index 1458878..5602336 100644 --- a/ChooseLocation/ChooseLocation/View/ChooseLocationView.m +++ b/ChooseLocation/ChooseLocation/View/ChooseLocationView.m @@ -28,14 +28,15 @@ @interface ChooseLocationView () @property (nonatomic,strong) ChooseLocationView *chooseLocationView; @property (nonatomic,strong) UIView *cover; @@ -29,7 +34,8 @@ - (void)viewDidLoad { - (IBAction)chooseLocation:(UIButton *)sender { [UIView animateWithDuration:0.25 animations:^{ - self.view.transform =CGAffineTransformMakeScale(0.95, 0.95); + self.view.transform =CGAffineTransformMakeScale(SCALING, SCALING); + self.chooseLocationView.frame = CGRectMake(-(kScreenWidth * (1 - SCALING)), kScreenHeight - 350, kScreenWidth * (2.0 - SCALING), 350); }]; self.cover.hidden = !self.cover.hidden; self.chooseLocationView.hidden = self.cover.hidden; @@ -56,8 +62,7 @@ - (void)tapCover:(UITapGestureRecognizer *)tap{ - (ChooseLocationView *)chooseLocationView{ if (!_chooseLocationView) { - _chooseLocationView = [[ChooseLocationView alloc]initWithFrame:CGRectMake(0, [UIScreen mainScreen].bounds.size.height - 350, [UIScreen mainScreen].bounds.size.width, 350)]; - + _chooseLocationView = [[ChooseLocationView alloc]initWithFrame:CGRectMake(-(kScreenWidth * (1 - SCALING)), kScreenHeight, kScreenWidth * (2.0 - SCALING), 350) withScaling:SCALING]; } return _chooseLocationView; } @@ -73,6 +78,9 @@ - (UIView *)cover{ [UIView animateWithDuration:0.25 animations:^{ weakSelf.addresslabel.text = weakSelf.chooseLocationView.address; weakSelf.view.transform = CGAffineTransformIdentity; + weakSelf.cover.alpha = 0; + weakSelf.chooseLocationView.frame = CGRectMake(-(kScreenWidth * (1 - SCALING)), kScreenHeight, kScreenWidth * (2.0 - SCALING), 350); + } completion:^(BOOL finished) { weakSelf.cover.hidden = YES; }]; }; @@ -81,6 +89,7 @@ - (UIView *)cover{ tap.delegate = self; _cover.hidden = YES; } + _cover.alpha = 1; return _cover; } @end