Remove RESideMenu, MenuTableViewController, SidebarViewCell, SidebarController and references

Podfile

@@ -17,7 +17,6 @@ def iOS_pods
   pod 'OBSlider', '1.1.0'
   pod 'InAppSettingsKit', :git => 'git://github.com/fkuehne/InAppSettingsKit.git', :commit => '415ea6bb' #tvOS fix
   pod 'HockeySDK', '~>5.1.2', :subspecs => ['CrashOnlyLib']
-  pod 'RESideMenu', '~>4.0.7'
   pod 'PAPasscode', '~>1.0'
   pod 'GoogleAPIClient/Drive'
   pod 'VLC-LXReorderableCollectionViewFlowLayout', '0.1.3v'

Podfile.lock

@@ -51,7 +51,6 @@ PODS:
     - AFNetworking
     - xmlrpc
   - PAPasscode (1.0)
-  - RESideMenu (4.0.7)
   - SwiftLint (0.25.0)
   - TVVLCKit (3.0.2)
   - upnpx (1.4.0)
@@ -79,7 +78,6 @@ DEPENDENCIES:
   - OBSlider (= 1.1.0)
   - OROpenSubtitleDownloader (from `https://github.com/orta/OROpenSubtitleDownloader.git`, commit `0509eac2`)
   - PAPasscode (~> 1.0)
-  - RESideMenu (~> 4.0.7)
   - SwiftLint (~> 0.25.0)
   - TVVLCKit (= 3.0.2)
   - upnpx (~> 1.4.0)
@@ -140,7 +138,6 @@ SPEC CHECKSUMS:
   OBSlider: 490f108007bfdd5414a38650b211fe403a95b8a0
   OROpenSubtitleDownloader: 154b8c08acbf8836b77ac259018dc8b5baef907e
   PAPasscode: b408fb87c530cad58a554e26482e87dbb14b7bc2
-  RESideMenu: f24c508404b49c667344c54aba7e590883533958
   SwiftLint: e14651157288e9e01d6e1a71db7014fb5744a8ea
   TVVLCKit: 178e4f82f8b57320774821384e42eaac403d2faa
   upnpx: c695b99229e08154d23abe5c252cb64f1600f35d
@@ -150,6 +147,6 @@ SPEC CHECKSUMS:
   XKKeychain: 852ef663c56a7194c73d3c68e8d9d4f07b121d4f
   xmlrpc: 109bb21d15ed6d108b2c1ac5973a6a223a50f5f4
 
-PODFILE CHECKSUM: 7049ed97875cfde471396ccb609af0afd165ef7d
+PODFILE CHECKSUM: c8dbb4c0b180876fb032d297e7e1ca3dbf736b6b
 
 COCOAPODS: 1.4.0

Resources/About Contents.html

@@ -54,9 +54,6 @@ Copyright &copy; 2011, Deusty, LLC - <a href="#bsd2clause">2-clause BSD License<
 &nbsp;&nbsp;&nbsp;&nbsp;<a href="https://github.com/TheHungryBu/dropbox-sdk-obj-c">Dropbox for Objective-C</a><br />
 Copyright &copy; 2015-2017 Dropbox Inc. - <a href="#mit">MIT License</a><br />
 <br />
-&nbsp;&nbsp;&nbsp;&nbsp;<a href="https://github.com/romaonthego/RESideMenu">RESideMenu</a><br />
-Copyright &copy; 2013 Roman Efimov - <a href="#mit">MIT License</a><br />
-<br />
 &nbsp;&nbsp;&nbsp;&nbsp;<a href="http://code.google.com/p/google-api-objectivec-client/">Google APIs Client Library for Objective-C</a><br />
 Copyright &copy; 2011-2017 Google Inc. - <a href="#apache2">Apache 2 License</a><br />
 <br />
@@ -69,9 +66,6 @@ Copyright &copy; 2009-2014 Luc Vandal, Edovia Inc., Ortwin Gentz, FutureTap GmbH
 &nbsp;&nbsp;&nbsp;&nbsp;<a href="https://github.com/liveservices/LiveSDK-for-iOS">Live SDK for iOS</a><br />
 Copyright &copy; 2014 Microsoft Corporation - <a href="#apache2">Apache 2 License</a><br />
 <br />
-&nbsp;&nbsp;&nbsp;&nbsp;<a href="https://github.com/lxcid/LXReorderableCollectionViewFlowLayout">LXReorderableCollectionViewFlowLayout</a><br />
-Copyright &copy; 2012 Stan Chang Khin Boon and contributors - <a href="#mit">MIT License</a><br />
-<br />
 &nbsp;&nbsp;&nbsp;&nbsp;<a href="https://github.com/ole/OBSlider">OBSlider</a><br />
 Copyright &copy; 2011 Ole Begemann and contributors - <a href="#mit">MIT License</a><br />
 <br />

Sources/VLC for iOS-Prefix.pch

@@ -24,7 +24,6 @@
 #import "UIColor+Presets.h"
 #import "UIBarButtonItem+Theme.h"
 #import "VLCAlertView.h"
-#import "VLCSidebarController.h"
 #import "UIViewController+VLCAlert.h"
 
 #ifndef NDEBUG

Sources/VLCAppDelegate.h

@@ -14,7 +14,6 @@
  * Refer to the COPYING file of the official project for license.
  *****************************************************************************/
 
-#import "VLCMenuTableViewController.h"
 #import "VLCWatchCommunication.h"
 #import <AppAuth/AppAuth.h>
 

Sources/VLCAppDelegate.m

@@ -409,7 +409,7 @@ didFailToContinueUserActivityWithType:(NSString *)userActivityType
 
 - (void)application:(UIApplication *)application performActionForShortcutItem:(UIApplicationShortcutItem *)shortcutItem completionHandler:(void (^)(BOOL))completionHandler
 {
-    [[VLCSidebarController sharedInstance] performActionForShortcutItem:shortcutItem];
+    //TODO: shortcutItem should be implemented
 }
 
 #pragma mark - media discovering
@@ -467,8 +467,7 @@ didFailToContinueUserActivityWithType:(NSString *)userActivityType
              fileNameOfMedia:(NSString *)fileName
 {
     [[VLCDownloadViewController sharedInstance] addURLToDownloadList:url fileNameOfMedia:fileName];
-    [[VLCSidebarController sharedInstance] selectRowAtIndexPath:[NSIndexPath indexPathForRow:2 inSection:1]
-                                                 scrollPosition:UITableViewScrollPositionNone];
+    //TODO: open DownloadViewController
 }
 
 #pragma mark - playback

Sources/VLCDocumentPickerController.m

@@ -53,11 +53,6 @@
 {
     documentPicker.delegate = self;
 
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { // on iPhone it's done in menu table vc
-        [[VLCSidebarController sharedInstance] selectRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]
-                                                     scrollPosition:UITableViewScrollPositionNone];
-    }
-
     [[UIApplication sharedApplication].keyWindow.rootViewController presentViewController:documentPicker animated:YES completion:nil];
 }
 

Sources/VLCMenuButton.h

@@ -1,18 +0,0 @@
-/*****************************************************************************
- * VLCMenuButton.h
- * VLC for iOS
- *****************************************************************************
- * Copyright (c) 2013 VideoLAN. All rights reserved.
- * $Id$
- *
- * Authors: Gleb Pinigin <gpinigin # gmail.com>
- *          Felix Paul Kühne <fkuehne # videolan.org>
- *
- * Refer to the COPYING file of the official project for license.
- *****************************************************************************/
-
-#import <UIKit/UIKit.h>
-
-@interface VLCMenuButton : UIButton
-
-@end

Sources/VLCMenuButton.m

@@ -1,28 +0,0 @@
-/*****************************************************************************
- * VLCMenuButton.m
- * VLC for iOS
- *****************************************************************************
- * Copyright (c) 2013 VideoLAN. All rights reserved.
- * $Id$
- *
- * Authors: Gleb Pinigin <gpinigin # gmail.com>
- *
- * Refer to the COPYING file of the official project for license.
- *****************************************************************************/
-
-#import "VLCMenuButton.h"
-
-@implementation VLCMenuButton
-
-- (id)initWithCoder:(NSCoder *)aDecoder
-{
-    self = [super initWithCoder:aDecoder];
-    if (self) {
-        UIImage *background = [[UIImage imageNamed:@"menuButton"] resizableImageWithCapInsets:UIEdgeInsetsMake(5, 5, 5, 5)];
-        [self setBackgroundImage:background forState:UIControlStateNormal];
-    }
-    
-    return self;
-}
-
-@end

Sources/VLCMenuTableViewController.h

@@ -1,19 +0,0 @@
-/*****************************************************************************
- * VLCMenuTableViewController.h
- * VLC for iOS
- *****************************************************************************
- * Copyright (c) 2013 VideoLAN. All rights reserved.
- * $Id$
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan.org>
- *
- * Refer to the COPYING file of the official project for license.
- *****************************************************************************/
-
-#import <UIKit/UIKit.h>
-
-@interface VLCMenuTableViewController : UIViewController
-
-- (void)selectRowAtIndexPath:(NSIndexPath *)indexPath animated:(BOOL)animated scrollPosition:(UITableViewScrollPosition)scrollPosition;
-
-@end

Sources/VLCMenuTableViewController.m

@@ -1,311 +0,0 @@
-/*****************************************************************************
- * VLCMenuTableViewController.m
- * VLC for iOS
- *****************************************************************************
- * Copyright (c) 2013-2015 VideoLAN. All rights reserved.
- * $Id$
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan.org>
- *          Gleb Pinigin <gpinigin # gmail.com>
- *          Jean-Romain Prévost <jr # 3on.fr>
- *          Carola Nitz <nitz.carola # googlemail.com>
- *          Tamas Timar <ttimar.vlc # gmail.com>
- *          Pierre Sagaspe <pierre.sagaspe # me.com>
- *
- * Refer to the COPYING file of the official project for license.
- *****************************************************************************/
-
-#import "VLCMenuTableViewController.h"
-#import "VLCSidebarViewCell.h"
-#import <QuartzCore/QuartzCore.h>
-#import "VLCWiFiUploadTableViewCell.h"
-#import "VLCDownloadViewController.h"
-#import "VLCServerListViewController.h"
-#import "VLCOpenNetworkStreamViewController.h"
-#import "VLCSettingsController.h"
-#import "VLCAboutViewController.h"
-#import "VLCBugreporter.h"
-#import "VLCCloudServicesTableViewController.h"
-#import "VLC_iOS-Swift.h"
-
-#define ROW_HEIGHT 50.
-#define IPAD_ROW_HEIGHT 65.
-#define HEADER_HEIGHT 22.
-#define MENU_WIDTH 320.
-#define TOP_PADDING 20.
-#define STANDARD_PADDING 8.
-#define MAX_LEFT_INSET 170.
-#define COMPACT_INSET 20.
-
-static NSString *CellIdentifier = @"VLCMenuCell";
-static NSString *WiFiCellIdentifier = @"VLCMenuWiFiCell";
-
-@interface VLCMenuTableViewController () <UITableViewDataSource, UITableViewDelegate, VLCMediaViewControllerDelegate>
-{
-    NSArray *_sectionHeaderTexts;
-    NSArray *_menuItemsSectionOne;
-    NSArray *_menuItemsSectionTwo;
-    NSArray *_menuItemsSectionThree;
-
-    UITableView *_menuTableView;
-    NSLayoutConstraint *_heightConstraint;
-    NSLayoutConstraint *_leftTableConstraint;
-    VLCSettingsController *_settingsController;
-    VLCMediaViewController *_videoViewController;
-}
-
-@end
-
-@implementation VLCMenuTableViewController
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-
-    _sectionHeaderTexts = @[@"SECTION_HEADER_LIBRARY", @"SECTION_HEADER_NETWORK", @"Settings"];
-    _menuItemsSectionOne = @[@"LIBRARY_ALL_FILES", @"LIBRARY_MUSIC", @"LIBRARY_SERIES"];
-    _menuItemsSectionTwo = @[@"LOCAL_NETWORK", @"NETWORK_TITLE", @"DOWNLOAD_FROM_HTTP", @"WEBINTF_TITLE", @"CLOUD_SERVICES"];
-    _menuItemsSectionThree = @[@"Settings", @"ABOUT_APP"];
-
-    _menuTableView = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
-    _menuTableView.delegate = self;
-    _menuTableView.dataSource = self;
-    _menuTableView.backgroundColor = [UIColor VLCMenuBackgroundColor];
-    _menuTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-    _menuTableView.indicatorStyle = UIScrollViewIndicatorStyleWhite;
-    _menuTableView.rowHeight = UITableViewAutomaticDimension;
-    _menuTableView.sectionHeaderHeight = UITableViewAutomaticDimension;
-    _menuTableView.estimatedSectionHeaderHeight = HEADER_HEIGHT;
-    _menuTableView.estimatedRowHeight = UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? IPAD_ROW_HEIGHT : ROW_HEIGHT;
-    _menuTableView.scrollsToTop = NO;
-    _menuTableView.translatesAutoresizingMaskIntoConstraints = NO;
-    _menuTableView.showsHorizontalScrollIndicator = NO;
-    _menuTableView.showsVerticalScrollIndicator = NO;
-    [_menuTableView registerClass:[VLCWiFiUploadTableViewCell class] forCellReuseIdentifier:WiFiCellIdentifier];
-    [_menuTableView registerClass:[VLCSidebarViewCell class] forCellReuseIdentifier:CellIdentifier];
-
-    [self.view addSubview:_menuTableView];
-
-    NSDictionary *dict;
-
-    dict = NSDictionaryOfVariableBindings(_menuTableView);
-    NSDictionary *metrics = @{@"TopPadding": @(TOP_PADDING),
-                              @"Standard": @(STANDARD_PADDING),
-                              @"menuWidth" : @(MENU_WIDTH)
-                              };
-    // 20 to avoid seeing the tableview above the first sectionheader
-    [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|->=TopPadding-[_menuTableView]->=Standard-|" options:0 metrics:metrics views:dict]];
-    _heightConstraint = [NSLayoutConstraint constraintWithItem:_menuTableView attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:0 multiplier:1.0 constant:0];
-    _heightConstraint.priority = UILayoutPriorityRequired -1;
-    [self.view addConstraint:_heightConstraint];
-
-    [self.view addConstraint:[NSLayoutConstraint constraintWithItem:_menuTableView attribute:NSLayoutAttributeCenterY relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeCenterY multiplier:1.0 constant:0]];
-
-    _leftTableConstraint = [NSLayoutConstraint constraintWithItem:_menuTableView attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeLeading multiplier:1.0 constant:0];
-    [self.view addConstraint:_leftTableConstraint];
-    [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|->=0-[_menuTableView(==menuWidth)]" options:0 metrics:metrics views:dict]];
-
-    [self selectRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] animated:NO scrollPosition:UITableViewScrollPositionTop];
-}
-
-- (BOOL)shouldAutorotate
-{
-    UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
-    return (orientation == UIInterfaceOrientationPortraitUpsideDown) ? (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) : YES;
-}
-
-- (BOOL)canBecomeFirstResponder
-{
-    return YES;
-}
-
-- (void)viewDidLayoutSubviews
-{
-    [super viewDidLayoutSubviews];
-    _heightConstraint.constant = MIN(_menuTableView.contentSize.height, self.view.frame.size.height-TOP_PADDING-STANDARD_PADDING);
-    _leftTableConstraint.constant = MAX((self.view.frame.size.width*2 /3.0  - _menuTableView.frame.size.width)/2.0, STANDARD_PADDING);
-}
-#pragma mark - table view data source
-
-- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
-{
-    return 3;
-}
-
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
-{
-    if (section == 0) // media
-        return _menuItemsSectionOne.count;
-    else if (section == 1) // network
-        return _menuItemsSectionTwo.count;
-    else if (section == 2) // settings & co
-        return _menuItemsSectionThree.count;
-    else
-        return 0;
-}
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
-{
-    NSString *rawTitle;
-    NSUInteger section = indexPath.section;
-    if (section == 0)
-        rawTitle = _menuItemsSectionOne[indexPath.row];
-    else if(section == 1)
-        rawTitle = _menuItemsSectionTwo[indexPath.row];
-    else if(section == 2)
-        rawTitle = _menuItemsSectionThree[indexPath.row];
-
-    UITableViewCell *cell;
-    if ([rawTitle isEqualToString:@"WEBINTF_TITLE"]) {
-        cell = (VLCWiFiUploadTableViewCell *)[tableView dequeueReusableCellWithIdentifier:WiFiCellIdentifier];
-    } else {
-        cell = (VLCSidebarViewCell *)[tableView dequeueReusableCellWithIdentifier:CellIdentifier];
-    }
-
-    if (section == 0) {
-        if ([rawTitle isEqualToString:@"LIBRARY_ALL_FILES"])
-            cell.imageView.image = [UIImage imageNamed:@"AllFiles"];
-        else if ([rawTitle isEqualToString:@"LIBRARY_MUSIC"])
-            cell.imageView.image = [UIImage imageNamed:@"MusicAlbums"];
-        else if ([rawTitle isEqualToString:@"LIBRARY_SERIES"])
-            cell.imageView.image = [UIImage imageNamed:@"TVShowsIcon"];
-    } else if (section == 1) {
-        if ([rawTitle isEqualToString:@"LOCAL_NETWORK"])
-            cell.imageView.image = [UIImage imageNamed:@"Local"];
-        else if ([rawTitle isEqualToString:@"NETWORK_TITLE"])
-            cell.imageView.image = [UIImage imageNamed:@"OpenNetStream"];
-        else if ([rawTitle isEqualToString:@"DOWNLOAD_FROM_HTTP"])
-            cell.imageView.image = [UIImage imageNamed:@"Downloads"];
-        else if ([rawTitle isEqualToString:@"CLOUD_SERVICES"])
-            cell.imageView.image = [UIImage imageNamed:@"iCloudIcon"];
-    } else if (section == 2) {
-        if ([rawTitle isEqualToString:@"Settings"])
-            cell.imageView.image = [UIImage imageNamed:@"Settings"];
-        else
-            cell.imageView.image = [UIImage imageNamed:@"menuCone"];
-    }
-
-    if (![rawTitle isEqualToString:@"WEBINTF_TITLE"])
-        cell.textLabel.text = NSLocalizedString(rawTitle, nil);
-
-    return cell;
-}
-
-#pragma mark - table view delegation
-
-- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
-{
-    NSString *headerText = NSLocalizedString(_sectionHeaderTexts[section], nil);
-    UIView *headerView = nil;
-    if (headerText) {
-        headerView = [[UIView alloc] initWithFrame:CGRectZero];
-        headerView.backgroundColor = [UIColor VLCMenuBackgroundColor];
-
-        UILabel *textLabel = [UILabel new];
-        textLabel.text = headerText;
-        textLabel.font = [UIFont fontWithName:@"Helvetica-Bold" size:[UIFont systemFontSize]];
-        textLabel.textColor = [UIColor whiteColor];
-        textLabel.backgroundColor = [UIColor VLCMenuBackgroundColor];
-        [textLabel sizeToFit];
-        textLabel.translatesAutoresizingMaskIntoConstraints = NO;
-        [headerView addSubview:textLabel];
-
-        UIView *bottomLine = [UIView new];
-        bottomLine.backgroundColor = [UIColor whiteColor];
-        bottomLine.translatesAutoresizingMaskIntoConstraints = NO;
-        [headerView addSubview:bottomLine];
-
-        NSDictionary *dict = NSDictionaryOfVariableBindings(textLabel,bottomLine);
-        [headerView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[bottomLine]|" options:0 metrics:0 views:dict]];
-        [headerView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-(12)-[textLabel]" options:0 metrics:0 views:dict]];
-        [headerView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|->=0-[textLabel(==22)]->=0-[bottomLine(0.5)]|" options:0 metrics:0 views:dict]];
-    }
-    return headerView;
-}
-
-#pragma mark - menu implementation
-- (VLCSettingsController *)settingsController
-{
-    if (!_settingsController){
-        _settingsController = [[VLCSettingsController alloc] initWithStyle:UITableViewStyleGrouped];
-    }
-    return _settingsController;
-}
-
-- (VLCMediaViewController *)videoViewController
-{
-    if (!_videoViewController) {
-        _videoViewController = [[VLCMediaViewController alloc] initWithCollectionViewLayout:[UICollectionViewFlowLayout new]];
-    }
-    return _videoViewController;
-}
-
-- (void)_revealItem:(NSUInteger)itemIndex inSection:(NSUInteger)sectionNumber
-{
-    UIViewController *viewController;
-    if (sectionNumber == 1) {
-        if (itemIndex == 0)
-            viewController = [[VLCServerListViewController alloc] init];
-        else if (itemIndex == 1) {
-            viewController = [[VLCOpenNetworkStreamViewController alloc] initWithNibName:@"VLCOpenNetworkStreamViewController" bundle:nil];
-        } else if (itemIndex == 2)
-            viewController = [VLCDownloadViewController sharedInstance];
-        else if (itemIndex == 3)
-            [((VLCWiFiUploadTableViewCell *)[_menuTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:itemIndex inSection:sectionNumber]]) toggleHTTPServer];
-        else if (itemIndex == 4)
-            viewController = [[VLCCloudServicesTableViewController alloc] initWithNibName:@"VLCCloudServicesTableViewController" bundle:nil];
-    } else if (sectionNumber == 2) {
-        if (itemIndex == 0) {
-            viewController = self.settingsController;
-        } else if (itemIndex == 1)
-            viewController = [[VLCAboutViewController alloc] init];
-    } else {
-        viewController = self.videoViewController;
-    }
-
-    if (!viewController) {
-        APLog(@"no view controller found for menu item");
-        return;
-    }
-
-    VLCSidebarController *sidebarController = [VLCSidebarController sharedInstance];
-    if ([sidebarController.contentViewController isKindOfClass:[UINavigationController class]]) {
-        UINavigationController *navCon = (UINavigationController*)sidebarController.contentViewController;
-        navCon.viewControllers = @[viewController];
-    } else
-        sidebarController.contentViewController = [[UINavigationController alloc] initWithRootViewController:viewController];
-    [sidebarController hideSidebar];
-}
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
-{
-    [tableView deselectRowAtIndexPath:indexPath animated:YES];
-    [self _revealItem:indexPath.row inSection:indexPath.section];
-}
-
-#pragma mark Public Methods
-- (void)selectRowAtIndexPath:(NSIndexPath *)indexPath animated:(BOOL)animated scrollPosition:(UITableViewScrollPosition)scrollPosition
-{
-    [_menuTableView selectRowAtIndexPath:indexPath animated:animated scrollPosition:scrollPosition];
-    if (scrollPosition == UITableViewScrollPositionNone)
-        [_menuTableView scrollToRowAtIndexPath:indexPath atScrollPosition:scrollPosition animated:animated];
-    [self _revealItem:indexPath.row inSection:indexPath.section];
-}
-
-#pragma mark - shake for support
-- (void)motionEnded:(UIEventSubtype)motion withEvent:(UIEvent *)event
-{
-    if (motion == UIEventSubtypeMotionShake)
-        [[VLCBugreporter sharedInstance] handleBugreportRequest];
-}
-#pragma mark - VLCMediaViewControllerDelegate
-
-- (void)videoViewControllerDidSelectMediaObjectWithVLCMediaViewController:(VLCMediaViewController *)VLCMediaViewController mediaObject:(NSManagedObject *)mediaObject
-{
-    
-}
-
-- (void)videoViewControllerDidSelectBackbuttonWithVLCMediaViewController:(VLCMediaViewController *)VLCMediaViewController {
-    [[VLCSidebarController sharedInstance] toggleSidebar];
-}
-@end

Sources/VLCOpenNetworkStreamViewController.m

@@ -15,7 +15,6 @@
 #import "VLCOpenNetworkStreamViewController.h"
 #import "VLCPlaybackController.h"
 #import "VLCLibraryViewController.h"
-#import "VLCMenuTableViewController.h"
 #import "VLCStreamingHistoryCell.h"
 #import "UIDevice+VLC.h"
 #import "VLC_iOS-Swift.h"

Sources/VLCSettingsController.m

@@ -18,7 +18,7 @@
 #import <LocalAuthentication/LocalAuthentication.h>
 #import "VLC_iOS-Swift.h"
 
-@interface VLCSettingsController ()<PAPasscodeViewControllerDelegate, IASKSettingsDelegate>
+@interface VLCSettingsController ()<PAPasscodeViewControllerDelegate>
 
 @end
 
@@ -120,10 +120,6 @@
 
 #pragma mark - IASKSettings delegate
 
-- (void)settingsViewControllerDidEnd:(IASKAppSettingsViewController*)sender
-{
-    [[VLCSidebarController sharedInstance] toggleSidebar];
-}
 
 #pragma mark - PAPasscode delegate
 

Sources/VLCSidebarController.h

@@ -1,30 +0,0 @@
-/*****************************************************************************
- * VLCSidebarController.h
- * VLC for iOS
- *****************************************************************************
- * Copyright (c) 2015 VideoLAN. All rights reserved.
- * $Id$
- *
- * Author: Felix Paul Kühne <fkuehne # videolan.org>
- *
- * Refer to the COPYING file of the official project for license.
- *****************************************************************************/
-
-#import <Foundation/Foundation.h>
-
-@interface VLCSidebarController : NSObject
-
-+ (instancetype)sharedInstance;
-
-- (void)hideSidebar;
-- (void)toggleSidebar;
-- (void)resizeContentView;
-
-- (void)selectRowAtIndexPath:(NSIndexPath *)indexPath scrollPosition:(UITableViewScrollPosition)scrollPosition;
-
-- (void)performActionForShortcutItem:(UIApplicationShortcutItem *)shortcutItem;
-
-@property (readonly) UIViewController *fullViewController;
-@property (readwrite, retain) UIViewController *contentViewController;
-
-@end

Sources/VLCSidebarController.m

@@ -1,138 +0,0 @@
-/*****************************************************************************
- * VLCSidebarController.m
- * VLC for iOS
- *****************************************************************************
- * Copyright (c) 2015 VideoLAN. All rights reserved.
- * $Id$
- *
- * Author: Felix Paul Kühne <fkuehne # videolan.org>
- *
- * Refer to the COPYING file of the official project for license.
- *****************************************************************************/
-
-#import "VLCSidebarController.h"
-#import "VLCMenuTableViewController.h"
-#import "UIViewController+RESideMenu.h"
-#import "RESideMenu.h"
-#import "UIDevice+VLC.h"
-
-@interface VLCSidebarController() <RESideMenuDelegate>
-{
-    RESideMenu *_sideMenuViewController;
-    VLCMenuTableViewController *_menuViewController;
-    UIViewController *_contentViewController;
-    BOOL _menuVisible;
-}
-
-@end
-
-@implementation VLCSidebarController
-
-+ (instancetype)sharedInstance
-{
-    static VLCSidebarController *sharedInstance = nil;
-    static dispatch_once_t pred;
-
-    dispatch_once(&pred, ^{
-        sharedInstance = [VLCSidebarController new];
-    });
-
-    return sharedInstance;
-}
-
-- (instancetype)init
-{
-    self = [super init];
-
-    if (!self)
-        return self;
-    _menuViewController = [[VLCMenuTableViewController alloc] initWithNibName:nil bundle:nil];
-    if ([UIApplication sharedApplication].userInterfaceLayoutDirection == UIUserInterfaceLayoutDirectionLeftToRight) {
-        _sideMenuViewController = [[RESideMenu alloc] initWithContentViewController:nil
-                                                             leftMenuViewController:_menuViewController
-                                                            rightMenuViewController:nil];
-    } else {
-        _sideMenuViewController = [[RESideMenu alloc] initWithContentViewController:nil
-                                                             leftMenuViewController:nil
-                                                            rightMenuViewController:_menuViewController];
-    }
-    _sideMenuViewController.backgroundImage = [UIImage imageNamed:@"menu-background"];
-
-    _sideMenuViewController.delegate = self;
-
-    return self;
-}
-
-#pragma mark - VC handling
-
-- (UIViewController *)fullViewController
-{
-    return _sideMenuViewController;
-}
-
-- (void)setContentViewController:(UIViewController *)contentViewController
-{
-    contentViewController.view.backgroundColor = [UIColor VLCMenuBackgroundColor];
-    _sideMenuViewController.contentViewController = contentViewController;
-}
-
-- (UIViewController *)contentViewController
-{
-    return _sideMenuViewController.contentViewController;
-}
-
-#pragma mark - actual work
-
-- (void)selectRowAtIndexPath:(NSIndexPath *)indexPath scrollPosition:(UITableViewScrollPosition)scrollPosition
-{
-    [_menuViewController selectRowAtIndexPath:indexPath
-                                     animated:NO
-                               scrollPosition:scrollPosition];
-}
-
-- (void)hideSidebar
-{
-    _menuVisible = NO;
-    [_sideMenuViewController hideMenuViewController];
-}
-
-- (void)toggleSidebar
-{
-    _menuVisible = YES;
-    if ([UIApplication sharedApplication].userInterfaceLayoutDirection == UIUserInterfaceLayoutDirectionLeftToRight) {
-            [_sideMenuViewController presentLeftMenuViewController];
-    } else {
-            [_sideMenuViewController presentRightMenuViewController];
-    }
-}
-
-- (void)resizeContentView
-{
-    if (_menuVisible) {
-        [self hideSidebar];
-        [self toggleSidebar];
-    }
-}
-
-- (void)performActionForShortcutItem:(UIApplicationShortcutItem *)shortcutItem
-{
-    NSString *itemType = shortcutItem.type;
-    if ([itemType isEqualToString:kVLCApplicationShortcutLocalLibrary]) {
-        [self selectRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] scrollPosition:UITableViewScrollPositionNone];
-    } else if ([itemType isEqualToString:kVLCApplicationShortcutLocalServers]) {
-        [self selectRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:1] scrollPosition:UITableViewScrollPositionNone];
-    } else if ([itemType isEqualToString:kVLCApplicationShortcutOpenNetworkStream]) {
-        [self selectRowAtIndexPath:[NSIndexPath indexPathForRow:1 inSection:1] scrollPosition:UITableViewScrollPositionNone];
-    } else if ([itemType isEqualToString:kVLCApplicationShortcutClouds]) {
-        [self selectRowAtIndexPath:[NSIndexPath indexPathForRow:4 inSection:1] scrollPosition:UITableViewScrollPositionNone];
-    }
-}
-
-#pragma mark - RESideMenu Delegate
-
-- (void)sideMenu:(RESideMenu *)sideMenu willHideMenuViewController:(UIViewController *)menuViewController
-{
-    _menuVisible = NO;
-}
-
-@end

Sources/VLCSidebarViewCell.h

@@ -1,17 +0,0 @@
-/*****************************************************************************
- * VLCSidebarViewCell.h
- * VLC for iOS
- *****************************************************************************
- * Copyright (c) 2013-2015 VideoLAN. All rights reserved.
- * $Id$
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan.org>
- *
- * Refer to the COPYING file of the official project for license.
- *****************************************************************************/
-
-#import <UIKit/UIKit.h>
-
-@interface VLCSidebarViewCell : UITableViewCell
-
-@end

Sources/VLCSidebarViewCell.m

@@ -1,28 +0,0 @@
-/*****************************************************************************
- * VLCSidebarViewCell.m
- * VLC for iOS
- *****************************************************************************
- * Copyright (c) 2013-2015 VideoLAN. All rights reserved.
- * $Id$
- *
- * Authors: Felix Paul Kühne <fkuehne # videolan.org>
- *
- * Refer to the COPYING file of the official project for license.
- *****************************************************************************/
-
-#import "VLCSidebarViewCell.h"
-
-@implementation VLCSidebarViewCell
-
-- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
-{
-    if ((self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])) {
-        self.clipsToBounds = YES;
-        self.backgroundColor = [UIColor clearColor];
-        self.selectionStyle =  UITableViewCellSelectionStyleNone;
-        self.textLabel.textColor = [UIColor whiteColor];
-    }
-    return self;
-}
-
-@end

VLC.xcodeproj/project.pbxproj

@@ -94,12 +94,10 @@
 		7D30F3C4183AB24C00FFC021 /* VLCHTTPUploaderController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3C1183AB24C00FFC021 /* VLCHTTPUploaderController.m */; };
 		7D30F3C7183AB26F00FFC021 /* VLCOpenNetworkStreamViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3C6183AB26F00FFC021 /* VLCOpenNetworkStreamViewController.m */; };
 		7D30F3CA183AB27A00FFC021 /* VLCDownloadViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3C9183AB27A00FFC021 /* VLCDownloadViewController.m */; };
-		7D30F3CD183AB29300FFC021 /* VLCMenuTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3CC183AB29300FFC021 /* VLCMenuTableViewController.m */; };
 		7D30F3D0183AB2AC00FFC021 /* VLCMediaFileDiscoverer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3CF183AB2AC00FFC021 /* VLCMediaFileDiscoverer.m */; };
 		7D30F3D7183AB2F100FFC021 /* VLCNetworkListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3D2183AB2F100FFC021 /* VLCNetworkListCell.m */; };
 		7D30F3DC183AB2F900FFC021 /* VLCNetworkLoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3DB183AB2F900FFC021 /* VLCNetworkLoginViewController.m */; };
 		7D30F3DF183AB31E00FFC021 /* VLCWiFiUploadTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3DE183AB31E00FFC021 /* VLCWiFiUploadTableViewCell.m */; };
-		7D30F3E2183AB33200FFC021 /* VLCSidebarViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3E1183AB33200FFC021 /* VLCSidebarViewCell.m */; };
 		7D30F3EA183AB34200FFC021 /* VLCGoogleDriveController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3E5183AB34200FFC021 /* VLCGoogleDriveController.m */; };
 		7D30F3EC183AB34200FFC021 /* VLCGoogleDriveTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3E9183AB34200FFC021 /* VLCGoogleDriveTableViewController.m */; };
 		7D32B384185E293D006CA474 /* Raleway.woff in Resources */ = {isa = PBXBuildFile; fileRef = 7D32B383185E293D006CA474 /* Raleway.woff */; };
@@ -116,7 +114,6 @@
 		7D3784AE183A9906009EE944 /* VLCDropboxTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D3784AC183A9906009EE944 /* VLCDropboxTableViewController.m */; };
 		7D3784BE183A9938009EE944 /* UIBarButtonItem+Theme.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D3784B3183A9938009EE944 /* UIBarButtonItem+Theme.m */; };
 		7D3784C0183A9938009EE944 /* VLCLinearProgressIndicator.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D3784B7183A9938009EE944 /* VLCLinearProgressIndicator.m */; };
-		7D3784C1183A9938009EE944 /* VLCMenuButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D3784B9183A9938009EE944 /* VLCMenuButton.m */; };
 		7D3784C2183A9938009EE944 /* VLCSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D3784BB183A9938009EE944 /* VLCSlider.m */; };
 		7D3784C3183A9938009EE944 /* VLCStatusLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D3784BD183A9938009EE944 /* VLCStatusLabel.m */; };
 		7D3784C8183A9972009EE944 /* NSString+SupportedMedia.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D3784C5183A9972009EE944 /* NSString+SupportedMedia.m */; };
@@ -196,7 +193,6 @@
 		7D3CF7F62050265B00FA0C1F /* VLCWatchMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = DD3EA6301AF50CFE007FF096 /* VLCWatchMessage.m */; };
 		7D3CF7F72050265B00FA0C1F /* VLCBoxTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 41CD695B1A29D72600E60BCE /* VLCBoxTableViewController.m */; };
 		7D3CF7F82050265B00FA0C1F /* VLCPlexParser.m in Sources */ = {isa = PBXBuildFile; fileRef = DD3EFF181BDEBCE500B68579 /* VLCPlexParser.m */; };
-		7D3CF7F92050265B00FA0C1F /* VLCMenuButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D3784B9183A9938009EE944 /* VLCMenuButton.m */; };
 		7D3CF7FA2050265B00FA0C1F /* VLCBoxController.m in Sources */ = {isa = PBXBuildFile; fileRef = 41CD69591A29D72600E60BCE /* VLCBoxController.m */; };
 		7D3CF7FB2050265B00FA0C1F /* VLCSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D3784BB183A9938009EE944 /* VLCSlider.m */; };
 		7D3CF7FC2050265B00FA0C1F /* VLCStatusLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D3784BD183A9938009EE944 /* VLCStatusLabel.m */; };
@@ -227,7 +223,6 @@
 		7D3CF8152050265B00FA0C1F /* VLCLocalNetworkServiceBrowserSAP.m in Sources */ = {isa = PBXBuildFile; fileRef = DDEAECC51BDEC79D00756C83 /* VLCLocalNetworkServiceBrowserSAP.m */; };
 		7D3CF8162050265B00FA0C1F /* VLCLocalNetworkServiceBrowserPlex.m in Sources */ = {isa = PBXBuildFile; fileRef = DD3EFF121BDEBCE500B68579 /* VLCLocalNetworkServiceBrowserPlex.m */; };
 		7D3CF8172050265B00FA0C1F /* VLCMediaData+VLCDragAndDrop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 412BE7521FC4947400ACCC42 /* VLCMediaData+VLCDragAndDrop.swift */; };
-		7D3CF8182050265B00FA0C1F /* VLCMenuTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3CC183AB29300FFC021 /* VLCMenuTableViewController.m */; };
 		7D3CF8192050265B00FA0C1F /* VLCLocalNetworkServiceBrowserUPnP.m in Sources */ = {isa = PBXBuildFile; fileRef = DD3EFF231BDEBCE500B68579 /* VLCLocalNetworkServiceBrowserUPnP.m */; };
 		7D3CF81A2050265B00FA0C1F /* VLCPlaybackNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D9CB9DB1A4C55EF00BB74B4 /* VLCPlaybackNavigationController.m */; };
 		7D3CF81B2050265B00FA0C1F /* VLCMediaFileDiscoverer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3CF183AB2AC00FFC021 /* VLCMediaFileDiscoverer.m */; };
@@ -238,12 +233,10 @@
 		7D3CF8202050265B00FA0C1F /* VLCLocalNetworkServiceUPnP.m in Sources */ = {isa = PBXBuildFile; fileRef = DD3EFF251BDEBCE500B68579 /* VLCLocalNetworkServiceUPnP.m */; };
 		7D3CF8212050265B00FA0C1F /* VLCNetworkListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3D2183AB2F100FFC021 /* VLCNetworkListCell.m */; };
 		7D3CF8222050265B00FA0C1F /* VLCOneDriveController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D1052ED1A4DCD1E00295F08 /* VLCOneDriveController.m */; };
-		7D3CF8232050265B00FA0C1F /* VLCSidebarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DAE0C361B2EF85B00C53996 /* VLCSidebarController.m */; };
 		7D3CF8242050265B00FA0C1F /* VLCNetworkLoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3DB183AB2F900FFC021 /* VLCNetworkLoginViewController.m */; };
 		7D3CF8252050265B00FA0C1F /* VLCStringsForLocalization.m in Sources */ = {isa = PBXBuildFile; fileRef = 419A2C651F37A4B70069D224 /* VLCStringsForLocalization.m */; };
 		7D3CF8262050265B00FA0C1F /* VLCNetworkServerLoginInformation+Keychain.m in Sources */ = {isa = PBXBuildFile; fileRef = DDA1B9081CE902EE0076BC45 /* VLCNetworkServerLoginInformation+Keychain.m */; };
 		7D3CF8272050265B00FA0C1F /* VLCWiFiUploadTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3DE183AB31E00FFC021 /* VLCWiFiUploadTableViewCell.m */; };
-		7D3CF8282050265B00FA0C1F /* VLCSidebarViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3E1183AB33200FFC021 /* VLCSidebarViewCell.m */; };
 		7D3CF8292050265B00FA0C1F /* VLCGoogleDriveController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D30F3E5183AB34200FFC021 /* VLCGoogleDriveController.m */; };
 		7D3CF82A2050265B00FA0C1F /* VLCRemoteControlService.m in Sources */ = {isa = PBXBuildFile; fileRef = 417D7F5F1F7BA26200DDF36A /* VLCRemoteControlService.m */; };
 		7D3CF82B2050265B00FA0C1F /* VLCPlayerDisplayController.m in Sources */ = {isa = PBXBuildFile; fileRef = DD510B6F1B14E564003BA71C /* VLCPlayerDisplayController.m */; };
@@ -396,7 +389,6 @@
 		7D9870681A3E03D5009CF27D /* papasscode_marker.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D9870621A3E03D5009CF27D /* papasscode_marker.png */; };
 		7D9870691A3E03D5009CF27D /* papasscode_marker@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D9870631A3E03D5009CF27D /* papasscode_marker@2x.png */; };
 		7D9CB9DC1A4C55EF00BB74B4 /* VLCPlaybackNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D9CB9DB1A4C55EF00BB74B4 /* VLCPlaybackNavigationController.m */; };
-		7DAE0C371B2EF85B00C53996 /* VLCSidebarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DAE0C361B2EF85B00C53996 /* VLCSidebarController.m */; };
 		7DB174A71CD20D7B0085BCF0 /* VLCSearchableServerBrowsingTVViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DB174A61CD20D7B0085BCF0 /* VLCSearchableServerBrowsingTVViewController.m */; };
 		7DB174B41CD20DC00085BCF0 /* VLCNetworkServerSearchBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DB174B11CD20DC00085BCF0 /* VLCNetworkServerSearchBrowser.m */; };
 		7DB174B51CD20DC00085BCF0 /* VLCSearchController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DB174B31CD20DC00085BCF0 /* VLCSearchController.m */; };
@@ -954,8 +946,6 @@
 		7D30F3C6183AB26F00FFC021 /* VLCOpenNetworkStreamViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCOpenNetworkStreamViewController.m; path = Sources/VLCOpenNetworkStreamViewController.m; sourceTree = SOURCE_ROOT; };
 		7D30F3C8183AB27A00FFC021 /* VLCDownloadViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCDownloadViewController.h; path = Sources/VLCDownloadViewController.h; sourceTree = SOURCE_ROOT; };
 		7D30F3C9183AB27A00FFC021 /* VLCDownloadViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCDownloadViewController.m; path = Sources/VLCDownloadViewController.m; sourceTree = SOURCE_ROOT; };
-		7D30F3CB183AB29300FFC021 /* VLCMenuTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCMenuTableViewController.h; path = Sources/VLCMenuTableViewController.h; sourceTree = SOURCE_ROOT; };
-		7D30F3CC183AB29300FFC021 /* VLCMenuTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCMenuTableViewController.m; path = Sources/VLCMenuTableViewController.m; sourceTree = SOURCE_ROOT; };
 		7D30F3CE183AB2AC00FFC021 /* VLCMediaFileDiscoverer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCMediaFileDiscoverer.h; path = Sources/VLCMediaFileDiscoverer.h; sourceTree = SOURCE_ROOT; };
 		7D30F3CF183AB2AC00FFC021 /* VLCMediaFileDiscoverer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCMediaFileDiscoverer.m; path = Sources/VLCMediaFileDiscoverer.m; sourceTree = SOURCE_ROOT; };
 		7D30F3D1183AB2F100FFC021 /* VLCNetworkListCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCNetworkListCell.h; path = Sources/LocalNetworkConnectivity/VLCNetworkListCell.h; sourceTree = SOURCE_ROOT; };
@@ -964,8 +954,6 @@
 		7D30F3DB183AB2F900FFC021 /* VLCNetworkLoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCNetworkLoginViewController.m; path = Sources/LocalNetworkConnectivity/VLCNetworkLoginViewController.m; sourceTree = SOURCE_ROOT; };
 		7D30F3DD183AB31E00FFC021 /* VLCWiFiUploadTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCWiFiUploadTableViewCell.h; path = Sources/VLCWiFiUploadTableViewCell.h; sourceTree = SOURCE_ROOT; };
 		7D30F3DE183AB31E00FFC021 /* VLCWiFiUploadTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCWiFiUploadTableViewCell.m; path = Sources/VLCWiFiUploadTableViewCell.m; sourceTree = SOURCE_ROOT; };
-		7D30F3E0183AB33200FFC021 /* VLCSidebarViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCSidebarViewCell.h; path = Sources/VLCSidebarViewCell.h; sourceTree = SOURCE_ROOT; };
-		7D30F3E1183AB33200FFC021 /* VLCSidebarViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCSidebarViewCell.m; path = Sources/VLCSidebarViewCell.m; sourceTree = SOURCE_ROOT; };
 		7D30F3E3183AB34200FFC021 /* VLCGoogleDriveConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCGoogleDriveConstants.h; path = Sources/VLCGoogleDriveConstants.h; sourceTree = SOURCE_ROOT; };
 		7D30F3E4183AB34200FFC021 /* VLCGoogleDriveController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCGoogleDriveController.h; path = Sources/VLCGoogleDriveController.h; sourceTree = SOURCE_ROOT; };
 		7D30F3E5183AB34200FFC021 /* VLCGoogleDriveController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCGoogleDriveController.m; path = Sources/VLCGoogleDriveController.m; sourceTree = SOURCE_ROOT; };
@@ -1003,8 +991,6 @@
 		7D3784B3183A9938009EE944 /* UIBarButtonItem+Theme.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIBarButtonItem+Theme.m"; path = "Sources/UIBarButtonItem+Theme.m"; sourceTree = SOURCE_ROOT; };
 		7D3784B6183A9938009EE944 /* VLCLinearProgressIndicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCLinearProgressIndicator.h; path = Sources/VLCLinearProgressIndicator.h; sourceTree = SOURCE_ROOT; };
 		7D3784B7183A9938009EE944 /* VLCLinearProgressIndicator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCLinearProgressIndicator.m; path = Sources/VLCLinearProgressIndicator.m; sourceTree = SOURCE_ROOT; };
-		7D3784B8183A9938009EE944 /* VLCMenuButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCMenuButton.h; path = Sources/VLCMenuButton.h; sourceTree = SOURCE_ROOT; };
-		7D3784B9183A9938009EE944 /* VLCMenuButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCMenuButton.m; path = Sources/VLCMenuButton.m; sourceTree = SOURCE_ROOT; };
 		7D3784BA183A9938009EE944 /* VLCSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCSlider.h; path = Sources/VLCSlider.h; sourceTree = SOURCE_ROOT; };
 		7D3784BB183A9938009EE944 /* VLCSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCSlider.m; path = Sources/VLCSlider.m; sourceTree = SOURCE_ROOT; };
 		7D3784BC183A9938009EE944 /* VLCStatusLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCStatusLabel.h; path = Sources/VLCStatusLabel.h; sourceTree = SOURCE_ROOT; };
@@ -1111,8 +1097,6 @@
 		7D9B6B0817C9625F00F9425D /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; lineEnding = 0; name = sl; path = sl.lproj/Localizable.strings; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.simpleColoring; };
 		7D9CB9DA1A4C55EF00BB74B4 /* VLCPlaybackNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCPlaybackNavigationController.h; path = Sources/VLCPlaybackNavigationController.h; sourceTree = SOURCE_ROOT; };
 		7D9CB9DB1A4C55EF00BB74B4 /* VLCPlaybackNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCPlaybackNavigationController.m; path = Sources/VLCPlaybackNavigationController.m; sourceTree = SOURCE_ROOT; };
-		7DAE0C351B2EF85B00C53996 /* VLCSidebarController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCSidebarController.h; path = Sources/VLCSidebarController.h; sourceTree = SOURCE_ROOT; };
-		7DAE0C361B2EF85B00C53996 /* VLCSidebarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VLCSidebarController.m; path = Sources/VLCSidebarController.m; sourceTree = SOURCE_ROOT; };
 		7DB174A51CD20D7B0085BCF0 /* VLCSearchableServerBrowsingTVViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCSearchableServerBrowsingTVViewController.h; sourceTree = "<group>"; };
 		7DB174A61CD20D7B0085BCF0 /* VLCSearchableServerBrowsingTVViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCSearchableServerBrowsingTVViewController.m; sourceTree = "<group>"; };
 		7DB174B01CD20DC00085BCF0 /* VLCNetworkServerSearchBrowser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VLCNetworkServerSearchBrowser.h; path = "Apple-TV/VLCNetworkServerSearchBrowser.h"; sourceTree = SOURCE_ROOT; };
@@ -1736,14 +1720,8 @@
 		7D2339AB176DE70E008D223C /* Menu */ = {
 			isa = PBXGroup;
 			children = (
-				7D30F3CB183AB29300FFC021 /* VLCMenuTableViewController.h */,
-				7D30F3CC183AB29300FFC021 /* VLCMenuTableViewController.m */,
 				7D30F3DD183AB31E00FFC021 /* VLCWiFiUploadTableViewCell.h */,
 				7D30F3DE183AB31E00FFC021 /* VLCWiFiUploadTableViewCell.m */,
-				7D30F3E0183AB33200FFC021 /* VLCSidebarViewCell.h */,
-				7D30F3E1183AB33200FFC021 /* VLCSidebarViewCell.m */,
-				7DAE0C351B2EF85B00C53996 /* VLCSidebarController.h */,
-				7DAE0C361B2EF85B00C53996 /* VLCSidebarController.m */,
 			);
 			name = Menu;
 			sourceTree = "<group>";
@@ -1797,8 +1775,6 @@
 				7D3784B3183A9938009EE944 /* UIBarButtonItem+Theme.m */,
 				7D3784B6183A9938009EE944 /* VLCLinearProgressIndicator.h */,
 				7D3784B7183A9938009EE944 /* VLCLinearProgressIndicator.m */,
-				7D3784B8183A9938009EE944 /* VLCMenuButton.h */,
-				7D3784B9183A9938009EE944 /* VLCMenuButton.m */,
 				7D3784BA183A9938009EE944 /* VLCSlider.h */,
 				7D3784BB183A9938009EE944 /* VLCSlider.m */,
 				7D3784BC183A9938009EE944 /* VLCStatusLabel.h */,
@@ -3886,7 +3862,6 @@
 				7D3CF7F62050265B00FA0C1F /* VLCWatchMessage.m in Sources */,
 				7D3CF7F72050265B00FA0C1F /* VLCBoxTableViewController.m in Sources */,
 				7D3CF7F82050265B00FA0C1F /* VLCPlexParser.m in Sources */,
-				7D3CF7F92050265B00FA0C1F /* VLCMenuButton.m in Sources */,
 				7D3CF7FA2050265B00FA0C1F /* VLCBoxController.m in Sources */,
 				7D3CF7FB2050265B00FA0C1F /* VLCSlider.m in Sources */,
 				7D3CF7FC2050265B00FA0C1F /* VLCStatusLabel.m in Sources */,
@@ -3917,7 +3892,6 @@
 				7D3CF8152050265B00FA0C1F /* VLCLocalNetworkServiceBrowserSAP.m in Sources */,
 				7D3CF8162050265B00FA0C1F /* VLCLocalNetworkServiceBrowserPlex.m in Sources */,
 				7D3CF8172050265B00FA0C1F /* VLCMediaData+VLCDragAndDrop.swift in Sources */,
-				7D3CF8182050265B00FA0C1F /* VLCMenuTableViewController.m in Sources */,
 				7D3CF8192050265B00FA0C1F /* VLCLocalNetworkServiceBrowserUPnP.m in Sources */,
 				7D3CF81A2050265B00FA0C1F /* VLCPlaybackNavigationController.m in Sources */,
 				7D3CF81B2050265B00FA0C1F /* VLCMediaFileDiscoverer.m in Sources */,
@@ -3928,12 +3902,10 @@
 				7D3CF8202050265B00FA0C1F /* VLCLocalNetworkServiceUPnP.m in Sources */,
 				7D3CF8212050265B00FA0C1F /* VLCNetworkListCell.m in Sources */,
 				7D3CF8222050265B00FA0C1F /* VLCOneDriveController.m in Sources */,
-				7D3CF8232050265B00FA0C1F /* VLCSidebarController.m in Sources */,
 				7D3CF8242050265B00FA0C1F /* VLCNetworkLoginViewController.m in Sources */,
 				7D3CF8252050265B00FA0C1F /* VLCStringsForLocalization.m in Sources */,
 				7D3CF8262050265B00FA0C1F /* VLCNetworkServerLoginInformation+Keychain.m in Sources */,
 				7D3CF8272050265B00FA0C1F /* VLCWiFiUploadTableViewCell.m in Sources */,
-				7D3CF8282050265B00FA0C1F /* VLCSidebarViewCell.m in Sources */,
 				7D3CF8292050265B00FA0C1F /* VLCGoogleDriveController.m in Sources */,
 				7D3CF82A2050265B00FA0C1F /* VLCRemoteControlService.m in Sources */,
 				7D3CF82B2050265B00FA0C1F /* VLCPlayerDisplayController.m in Sources */,
@@ -4026,7 +3998,6 @@
 				DD3EA6311AF50CFE007FF096 /* VLCWatchMessage.m in Sources */,
 				41CD695D1A29D72600E60BCE /* VLCBoxTableViewController.m in Sources */,
 				DD3EFF4F1BDEBCE500B68579 /* VLCPlexParser.m in Sources */,
-				7D3784C1183A9938009EE944 /* VLCMenuButton.m in Sources */,
 				41CD695C1A29D72600E60BCE /* VLCBoxController.m in Sources */,
 				7D3784C2183A9938009EE944 /* VLCSlider.m in Sources */,
 				7D3784C3183A9938009EE944 /* VLCStatusLabel.m in Sources */,
@@ -4057,7 +4028,6 @@
 				7D30F3CA183AB27A00FFC021 /* VLCDownloadViewController.m in Sources */,
 				DDEAECC61BDEC79D00756C83 /* VLCLocalNetworkServiceBrowserSAP.m in Sources */,
 				DD3EFF491BDEBCE500B68579 /* VLCLocalNetworkServiceBrowserPlex.m in Sources */,
-				7D30F3CD183AB29300FFC021 /* VLCMenuTableViewController.m in Sources */,
 				DD3EFF571BDEBCE500B68579 /* VLCLocalNetworkServiceBrowserUPnP.m in Sources */,
 				7D9CB9DC1A4C55EF00BB74B4 /* VLCPlaybackNavigationController.m in Sources */,
 				7D30F3D0183AB2AC00FFC021 /* VLCMediaFileDiscoverer.m in Sources */,
@@ -4069,12 +4039,10 @@
 				7D30F3D7183AB2F100FFC021 /* VLCNetworkListCell.m in Sources */,
 				7D1052EE1A4DCD1E00295F08 /* VLCOneDriveController.m in Sources */,
 				414396C22023316C005E3FAF /* AppearanceManager.swift in Sources */,
-				7DAE0C371B2EF85B00C53996 /* VLCSidebarController.m in Sources */,
 				7D30F3DC183AB2F900FFC021 /* VLCNetworkLoginViewController.m in Sources */,
 				419A2C661F37A4B70069D224 /* VLCStringsForLocalization.m in Sources */,
 				DDA1B9091CE902EE0076BC45 /* VLCNetworkServerLoginInformation+Keychain.m in Sources */,
 				7D30F3DF183AB31E00FFC021 /* VLCWiFiUploadTableViewCell.m in Sources */,
-				7D30F3E2183AB33200FFC021 /* VLCSidebarViewCell.m in Sources */,
 				7D30F3EA183AB34200FFC021 /* VLCGoogleDriveController.m in Sources */,
 				417D7F601F7BA26200DDF36A /* VLCRemoteControlService.m in Sources */,
 				DD510B701B14E564003BA71C /* VLCPlayerDisplayController.m in Sources */,