My Videos - Selection and Deletion (#860)

Source/OEXMyVideosSubSectionViewController.m

@@ -21,7 +21,6 @@
 #import "OEXDateFormatting.h"
 #import "OEXInterface.h"
 #import "OEXHelperVideoDownload.h"
-#import "OEXStatusMessageViewController.h"
 #import "OEXStyles.h"
 #import "OEXUserDetails.h"
 #import "OEXVideoPathEntry.h"
@@ -47,7 +46,7 @@ typedef NS_ENUM (NSUInteger, OEXAlertType) {
     OEXAlertTypePlayBackContentUnAvailable
 };
 
-@interface OEXMyVideosSubSectionViewController () <UITableViewDelegate, OEXStatusMessageControlling>
+@interface OEXMyVideosSubSectionViewController () <UITableViewDelegate>
 {
     NSIndexPath* clickedIndexpath;
 }
@@ -81,16 +80,6 @@ @interface OEXMyVideosSubSectionViewController () <UITableViewDelegate, OEXStatu
 
 @implementation OEXMyVideosSubSectionViewController
 
-- (CGFloat)verticalOffsetForStatusController:(OEXStatusMessageViewController*)controller {
-    return CGRectGetMaxY(self.navigationController.navigationBar.frame);
-}
-
-- (NSArray*)overlayViewsForStatusController:(OEXStatusMessageViewController*)controller {
-    NSMutableArray* result = [[NSMutableArray alloc] init];
-    [result oex_safeAddObjectOrNil:self.selectAllButton];
-    return result;
-}
-
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
 
@@ -919,8 +908,7 @@ - (void)updateNavigationItemButtons {
 
 - (void)movieTimedOut {
     if(!_videoPlayerInterface.moviePlayerController.isFullscreen) {
-        [[OEXStatusMessageViewController sharedInstance]
-         showMessage:[Strings timeoutCheckInternetConnection] onViewController:self];
+        [self showOverlayMessage:[Strings timeoutCheckInternetConnection]];
         [_videoPlayerInterface.moviePlayerController stop];
     }
     else {
@@ -970,9 +958,6 @@ - (void)alertView:(UIAlertView*)alertView clickedButtonAtIndex:(NSInteger)button
                 [self performSelector:@selector(pop) withObject:nil afterDelay:1.0];
             }
             else {
-                NSString* message = [Strings videosDeletedWithCount:deleteCount formatted:nil];
-                [[OEXStatusMessageViewController sharedInstance] showMessage:message onViewController:self];
-
                 // clear all objects form array after deletion.
                 // To obtain correct count on next deletion process.
 
@@ -981,7 +966,6 @@ - (void)alertView:(UIAlertView*)alertView clickedButtonAtIndex:(NSInteger)button
                 [self.table_SubSectionVideos reloadData];
             }
 
-//            [self disableDeleteButton];
             [self cancelTableClicked:nil];
         }
     }

Source/OEXMyVideosViewController.m

@@ -1222,9 +1222,6 @@ - (void)alertView:(UIAlertView*)alertView clickedButtonAtIndex:(NSInteger)button
             [self.table_RecentVideos reloadData];
             [self.table_MyVideos reloadData];
 
-            NSString* message = [Strings videosDeletedWithCount:deleteCount formatted:nil];
-            [self showOverlayMessage:message];
-
             // clear all objects form array after deletion.
             // To obtain correct count on next deletion process.
             [self.arr_SelectedObjects removeAllObjects];

Source/UIViewController+Overlay.swift

@@ -26,7 +26,7 @@ private class StatusMessageView : UIView {
         addSubview(messageLabel)
 
         self.backgroundColor = OEXStyles.sharedStyles().neutralDark().colorWithAlphaComponent(0.75)
-        messageLabel.attributedText = OEXStatusMessageViewController.statusMessageStyle().attributedStringWithText(message)
+        messageLabel.attributedText = statusMessageStyle.attributedStringWithText(message)
         messageLabel.snp_makeConstraints { make in
             make.top.equalTo(self).offset(margin)
             make.leading.equalTo(self).offset(margin)
@@ -38,6 +38,14 @@ private class StatusMessageView : UIView {
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+
+    private var statusMessageStyle: OEXMutableTextStyle {
+        let style = OEXMutableTextStyle(weight: .Normal, size: .Base, color: UIColor.whiteColor())
+        style.alignment = .Center;
+        style.lineBreakMode = NSLineBreakMode.ByWordWrapping;
+        return style;
+
+    }
 }
 
 private let visibleDuration: NSTimeInterval = 5.0

Source/edX-Bridging-Header.h

@@ -48,7 +48,6 @@
 #import "OEXRemovable.h"
 #import "OEXRouter.h"
 #import "OEXSession.h"
-#import "OEXStatusMessageViewController.h"
 #import "OEXStyles.h"
 #import "OEXTextStyle.h"
 #import "OEXSwitchStyle.h"