diff --git a/Application/Resources/Images/CommonImages.xcassets/Images/view_count_audio.imageset/Contents.json b/Application/Resources/Images/CommonImages.xcassets/Images/view_count_audio.imageset/Contents.json deleted file mode 100644 index 957100ac6..000000000 --- a/Application/Resources/Images/CommonImages.xcassets/Images/view_count_audio.imageset/Contents.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "images" : [ - { - "filename" : "listen_16v4.pdf", - "idiom" : "iphone" - }, - { - "filename" : "listen_16v4-1.pdf", - "idiom" : "ipad" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "template-rendering-intent" : "template" - } -} diff --git a/Application/Resources/Images/CommonImages.xcassets/Images/view_count_audio.imageset/listen_16v4-1.pdf b/Application/Resources/Images/CommonImages.xcassets/Images/view_count_audio.imageset/listen_16v4-1.pdf deleted file mode 100644 index 78611a4cf..000000000 Binary files a/Application/Resources/Images/CommonImages.xcassets/Images/view_count_audio.imageset/listen_16v4-1.pdf and /dev/null differ diff --git a/Application/Resources/Images/CommonImages.xcassets/Images/view_count_audio.imageset/listen_16v4.pdf b/Application/Resources/Images/CommonImages.xcassets/Images/view_count_audio.imageset/listen_16v4.pdf deleted file mode 100644 index 78611a4cf..000000000 Binary files a/Application/Resources/Images/CommonImages.xcassets/Images/view_count_audio.imageset/listen_16v4.pdf and /dev/null differ diff --git a/Application/Resources/Images/CommonImages.xcassets/Images/view_count_video.imageset/Contents.json b/Application/Resources/Images/CommonImages.xcassets/Images/view_count_video.imageset/Contents.json deleted file mode 100644 index c913b1776..000000000 --- a/Application/Resources/Images/CommonImages.xcassets/Images/view_count_video.imageset/Contents.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "images" : [ - { - "filename" : "view_22v6.pdf", - "idiom" : "iphone" - }, - { - "filename" : "view_22v6-1.pdf", - "idiom" : "ipad" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "template-rendering-intent" : "template" - } -} diff --git a/Application/Resources/Images/CommonImages.xcassets/Images/view_count_video.imageset/view_22v6-1.pdf b/Application/Resources/Images/CommonImages.xcassets/Images/view_count_video.imageset/view_22v6-1.pdf deleted file mode 100644 index cfcc62283..000000000 Binary files a/Application/Resources/Images/CommonImages.xcassets/Images/view_count_video.imageset/view_22v6-1.pdf and /dev/null differ diff --git a/Application/Resources/Images/CommonImages.xcassets/Images/view_count_video.imageset/view_22v6.pdf b/Application/Resources/Images/CommonImages.xcassets/Images/view_count_video.imageset/view_22v6.pdf deleted file mode 100644 index cfcc62283..000000000 Binary files a/Application/Resources/Images/CommonImages.xcassets/Images/view_count_video.imageset/view_22v6.pdf and /dev/null differ diff --git a/Application/Sources/Player/MediaPlayerViewController.m b/Application/Sources/Player/MediaPlayerViewController.m index 7af23c80e..a80b3e71e 100755 --- a/Application/Sources/Player/MediaPlayerViewController.m +++ b/Application/Sources/Player/MediaPlayerViewController.m @@ -113,8 +113,6 @@ @interface MediaPlayerViewController () @property (nonatomic, weak) IBOutlet UILabel *titleLabel; @property (nonatomic, weak) IBOutlet UILabel *availabilityLabel; @property (nonatomic, weak) IBOutlet UIStackView *viewCountStackView; -@property (nonatomic, weak) IBOutlet UIImageView *viewCountImageView; -@property (nonatomic, weak) IBOutlet UILabel *viewCountLabel; @property (nonatomic, weak) IBOutlet UIButton *detailsButton; @property (nonatomic, weak) IBOutlet UILabel *summaryLabel; @@ -829,30 +827,6 @@ - (void)reloadDetailsWithMedia:(SRGMedia *)media mainChapterMedia:(SRGMedia *)ma [self removeSongPanel]; - self.viewCountLabel.font = [SRGFont fontWithStyle:SRGFontStyleSubtitle1]; - - NSPredicate *socialViewsPredicate = [NSPredicate predicateWithFormat:@"%K == %@", @keypath(SRGSocialCount.new, type), @(SRGSocialCountTypeSRGView)]; - SRGSocialCount *socialCount = [media.socialCounts filteredArrayUsingPredicate:socialViewsPredicate].firstObject; - if (socialCount && socialCount.value >= ApplicationConfiguration.sharedApplicationConfiguration.minimumSocialViewCount) { - NSString *viewCountString = [NSNumberFormatter localizedStringFromNumber:@(socialCount.value) numberStyle:NSNumberFormatterDecimalStyle]; - if (media.mediaType == SRGMediaTypeAudio) { - self.viewCountLabel.text = [NSString stringWithFormat:NSLocalizedString(@"%@ listenings", @"Label displaying the number of listenings on the player"), viewCountString]; - self.viewCountLabel.accessibilityLabel = [NSString stringWithFormat:PlaySRGAccessibilityLocalizedString(@"%@ listenings", @"Label displaying the number of listenings on the player"), viewCountString]; - self.viewCountImageView.image = [UIImage imageNamed:@"view_count_audio"]; - } - else { - self.viewCountLabel.text = [NSString stringWithFormat:NSLocalizedString(@"%@ views", @"Label displaying the number of views on the player"), viewCountString]; - self.viewCountLabel.accessibilityLabel = [NSString stringWithFormat:PlaySRGAccessibilityLocalizedString(@"%@ views", @"Label displaying the number of views on the player"), viewCountString]; - self.viewCountImageView.image = [UIImage imageNamed:@"view_count_video"]; - } - self.viewCountImageView.hidden = NO; - self.viewCountLabel.hidden = NO; - } - else { - self.viewCountImageView.hidden = YES; - self.viewCountLabel.hidden = YES; - } - [self reloadDetailsWithShow:media.show]; SRGResource *resource = self.letterboxController.resource; diff --git a/Application/Sources/Player/MediaPlayerViewController.storyboard b/Application/Sources/Player/MediaPlayerViewController.storyboard index a31f50531..365e0c622 100755 --- a/Application/Sources/Player/MediaPlayerViewController.storyboard +++ b/Application/Sources/Player/MediaPlayerViewController.storyboard @@ -1,9 +1,9 @@ - + - + @@ -137,7 +137,7 @@ - + @@ -171,50 +171,27 @@ - + - + - + - - - - - - - - - - - - - - - - - - +