Skip to content

Commit 0918561

Browse files
HBehrensHBehrens
committed
fix: correct position of shadow while scrubbing on 3.5 inch display
1 parent 227d4de commit 0918561

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎BeamMusicPlayerExampleTests/BeamMusicPlayerTakeScreenshotsTests.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ -(BeamMusicPlayerViewController *)viewController {
144144

145145
-(void)initVCWithDescription:(NSDictionary *)description {
146146
[self.appDelegate initViewMusicPlayerViewControllerWithDescription:description];
147+
[self.viewController showScrobbleOverlay:YES animated:NO];
147148
}
148149

149150
-(void)testScreenshotForDescriptionAtIndex:(NSUInteger)index {

‎Source/BeamMusicPlayerViewController.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,15 @@
6969
-(void)playTrack:(NSUInteger)track atPosition:(CGFloat)position volume:(CGFloat)volume;
7070

7171

72+
/**
73+
* Shows or Hides the scrobble overlay in 3.5 inch displays
74+
*
75+
* @param show Yes, to show, No to hide overlay
76+
* @param animated Yes, to smoothly fade overlay
77+
*/
78+
-(void)showScrobbleOverlay:(BOOL)show animated:(BOOL)animated;
79+
80+
7281
/**
7382
* Starts playback. If the player is already playing, this method does nothing except wasting some cycles.
7483
*/

‎Source/BeamMusicPlayerViewController.m‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,11 @@ -(BOOL)isTallPhone {
268268
return (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) && (screenSize.height > 480.0f);
269269
}
270270

271+
-(BOOL)isSmallPhone {
272+
CGSize screenSize = [[UIScreen mainScreen] bounds].size;
273+
return (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) && (screenSize.height <= 480.0f);
274+
}
275+
271276
#pragma mark - Playback Management
272277

273278
-(BOOL)numberOfTracksAvailable {
@@ -569,18 +574,21 @@ -(IBAction)previousAction:(id)sender {
569574
[self previous];
570575
}
571576

577+
-(void)showScrobbleOverlay:(BOOL)show animated:(BOOL)animated {
578+
if(!self.isSmallPhone)
579+
return;
580+
581+
[UIView animateWithDuration:animated?0.25:0 animations:^{
582+
self.scrobbleOverlay.alpha = show ? 1 : 0;
583+
}];
584+
}
585+
572586

573587
/**
574588
* Called when the cover art is tapped. Either shows or hides the scrobble-ui
575589
*/
576590
-(IBAction)coverArtTapped:(id)sender {
577-
[UIView animateWithDuration:0.25 animations:^{
578-
if ( self.scrobbleOverlay.alpha == 0 ){
579-
[self.scrobbleOverlay setAlpha:1];
580-
} else {
581-
[self.scrobbleOverlay setAlpha:0];
582-
}
583-
}];
591+
[self showScrobbleOverlay:self.scrobbleOverlay.alpha == 0 animated:YES];
584592
}
585593

586594

‎Source/BeamMusicPlayerViewController.xib‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@
116116
<string key="NSFrame">{{18, 12}, {284, 23}}</string>
117117
<reference key="NSSuperview" ref="662525002"/>
118118
<reference key="NSWindow"/>
119-
<reference key="NSNextKeyView"/>
120119
<string key="NSReuseIdentifierKey">_NS:9</string>
121120
<bool key="IBUIOpaque">NO</bool>
122121
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -415,11 +414,10 @@
415414
</object>
416415
<object class="IBUIImageView" id="627743492">
417416
<reference key="NSNextResponder" ref="774585933"/>
418-
<int key="NSvFlags">292</int>
419-
<string key="NSFrame">{{0, 118}, {320, 64}}</string>
417+
<int key="NSvFlags">290</int>
418+
<string key="NSFrame">{{0, 134}, {320, 64}}</string>
420419
<reference key="NSSuperview" ref="774585933"/>
421420
<reference key="NSWindow"/>
422-
<reference key="NSNextKeyView"/>
423421
<string key="NSReuseIdentifierKey">_NS:9</string>
424422
<float key="IBUIAlpha">0.0</float>
425423
<bool key="IBUIUserInteractionEnabled">NO</bool>
@@ -445,15 +443,14 @@
445443
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
446444
</object>
447445
<object class="IBUIView" id="720318041">
448-
<reference key="NSNextResponder"/>
446+
<nil key="NSNextResponder"/>
449447
<int key="NSvFlags">274</int>
450448
<array class="NSMutableArray" key="NSSubviews">
451449
<object class="IBUILabel" id="580380735">
452450
<reference key="NSNextResponder" ref="720318041"/>
453451
<int key="NSvFlags">292</int>
454452
<string key="NSFrame">{{0, -1}, {200, 19}}</string>
455453
<reference key="NSSuperview" ref="720318041"/>
456-
<reference key="NSWindow"/>
457454
<reference key="NSNextKeyView" ref="949447879"/>
458455
<string key="NSReuseIdentifierKey">_NS:9</string>
459456
<bool key="IBUIOpaque">NO</bool>
@@ -485,7 +482,6 @@
485482
<int key="NSvFlags">292</int>
486483
<string key="NSFrame">{{0, 12}, {200, 19}}</string>
487484
<reference key="NSSuperview" ref="720318041"/>
488-
<reference key="NSWindow"/>
489485
<reference key="NSNextKeyView" ref="527282778"/>
490486
<string key="NSReuseIdentifierKey">_NS:9</string>
491487
<bool key="IBUIOpaque">NO</bool>
@@ -508,8 +504,6 @@
508504
<int key="NSvFlags">292</int>
509505
<string key="NSFrame">{{0, 25}, {200, 19}}</string>
510506
<reference key="NSSuperview" ref="720318041"/>
511-
<reference key="NSWindow"/>
512-
<reference key="NSNextKeyView"/>
513507
<string key="NSReuseIdentifierKey">_NS:9</string>
514508
<bool key="IBUIOpaque">NO</bool>
515509
<bool key="IBUIClipsSubviews">YES</bool>
@@ -529,23 +523,20 @@
529523
</object>
530524
</array>
531525
<string key="NSFrameSize">{200, 44}</string>
532-
<reference key="NSSuperview"/>
533-
<reference key="NSWindow"/>
534526
<reference key="NSNextKeyView" ref="580380735"/>
535527
<string key="NSReuseIdentifierKey">_NS:9</string>
536528
<reference key="IBUIBackgroundColor" ref="54823016"/>
537529
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
538530
</object>
539531
<object class="IBUIView" id="53878954">
540-
<reference key="NSNextResponder"/>
532+
<nil key="NSNextResponder"/>
541533
<int key="NSvFlags">274</int>
542534
<array class="NSMutableArray" key="NSSubviews">
543535
<object class="IBUIView" id="311401416">
544536
<reference key="NSNextResponder" ref="53878954"/>
545537
<int key="NSvFlags">290</int>
546538
<string key="NSFrame">{{0, -1}, {200, 19}}</string>
547539
<reference key="NSSuperview" ref="53878954"/>
548-
<reference key="NSWindow"/>
549540
<reference key="NSNextKeyView" ref="309051780"/>
550541
<string key="NSReuseIdentifierKey">_NS:9</string>
551542
<object class="NSColor" key="IBUIBackgroundColor">
@@ -562,7 +553,6 @@
562553
<int key="NSvFlags">290</int>
563554
<string key="NSFrame">{{0, 12}, {200, 19}}</string>
564555
<reference key="NSSuperview" ref="53878954"/>
565-
<reference key="NSWindow"/>
566556
<reference key="NSNextKeyView" ref="650723945"/>
567557
<string key="NSReuseIdentifierKey">_NS:9</string>
568558
<object class="NSColor" key="IBUIBackgroundColor">
@@ -577,8 +567,6 @@
577567
<int key="NSvFlags">290</int>
578568
<string key="NSFrame">{{0, 25}, {200, 19}}</string>
579569
<reference key="NSSuperview" ref="53878954"/>
580-
<reference key="NSWindow"/>
581-
<reference key="NSNextKeyView"/>
582570
<string key="NSReuseIdentifierKey">_NS:9</string>
583571
<object class="NSColor" key="IBUIBackgroundColor">
584572
<int key="NSColorSpace">3</int>
@@ -589,8 +577,6 @@
589577
</object>
590578
</array>
591579
<string key="NSFrameSize">{200, 44}</string>
592-
<reference key="NSSuperview"/>
593-
<reference key="NSWindow"/>
594580
<reference key="NSNextKeyView" ref="311401416"/>
595581
<string key="NSReuseIdentifierKey">_NS:9</string>
596582
<reference key="IBUIBackgroundColor" ref="54823016"/>
@@ -1432,10 +1418,6 @@
14321418
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
14331419
<real value="1296" key="NS.object.0"/>
14341420
</object>
1435-
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
1436-
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
1437-
<real value="1552" key="NS.object.0"/>
1438-
</object>
14391421
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
14401422
<int key="IBDocument.defaultPropertyAccessControl">3</int>
14411423
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">

0 commit comments

Comments
 (0)