further simplify our in-app settings implementation and solve the remaining issue with the subtitle encoding setting (close #8679)

AspenProject/VLCAddMediaViewController.h

@@ -8,12 +8,14 @@
 
 #import <UIKit/UIKit.h>
 
-@class VLCSettingsViewController;
+@class VLCSettingsController;
 @class VLCCircularProgressIndicator;
+@class IASKAppSettingsViewController;
 
 @interface VLCAddMediaViewController : UIViewController
 
-@property (strong, nonatomic) VLCSettingsViewController *settingsViewController;
+@property (strong, nonatomic) IASKAppSettingsViewController *settingsViewController;
+@property (strong, nonatomic) VLCSettingsController *settingsController;
 
 @property (strong, nonatomic) IBOutlet UIButton *dismissButton;
 @property (strong, nonatomic) IBOutlet UIButton *aboutButton;

AspenProject/VLCAddMediaViewController.m

@@ -12,10 +12,11 @@
 #import "VLCAboutViewController.h"
 #import "VLCMovieViewController.h"
 #import "VLCHTTPUploaderController.h"
-#import "VLCSettingsViewController.h"
+#import "VLCSettingsController.h"
 #import "HTTPServer.h"
 #import "Reachability.h"
 #import "VLCHTTPFileDownloader.h"
+#import "IASKAppSettingsViewController.h"
 
 #import <ifaddrs.h>
 #import <arpa/inet.h>
@@ -175,14 +176,22 @@
 - (IBAction)showSettings:(id)sender
 {
     if (!self.settingsViewController)
-        self.settingsViewController = [[VLCSettingsViewController alloc] initWithNibName:@"VLCSettingsViewController" bundle:nil];
+        self.settingsViewController = [[IASKAppSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped];
 
-    [self _hideAnimated:NO];
-
-    VLCAppDelegate* appDelegate = [UIApplication sharedApplication].delegate;
+    if (!self.settingsController)
+        self.settingsController = [[VLCSettingsController alloc] init];
 
     self.settingsViewController.modalPresentationStyle = UIModalPresentationFormSheet;
-    [appDelegate.playlistViewController.navigationController presentModalViewController:self.settingsViewController animated:YES];
+    self.settingsViewController.delegate = self.settingsController;
+    self.settingsViewController.showDoneButton = YES;
+    self.settingsViewController.showCreditsFooter = NO;
+
+    self.settingsController.viewController = self.settingsViewController;
+
+    UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:self.settingsViewController];
+    navController.navigationBarHidden = NO;
+    navController.navigationBar.barStyle = UIBarStyleBlack;
+    [self presentModalViewController:navController animated:YES];
 }
 
 - (NSString *)_currentIPAddress

AspenProject/VLCSettingsController.h

@@ -0,0 +1,16 @@
+//
+//  VLCSettingsController.h
+//  VLC for iOS
+//
+//  Created by Felix Paul Kühne on 23.05.13.
+//  Copyright (c) 2013 VideoLAN. All rights reserved.
+//
+
+#import "IASKAppSettingsViewController.h"
+#import "PAPasscodeViewController.h"
+
+@interface VLCSettingsController : NSObject <PAPasscodeViewControllerDelegate, IASKSettingsDelegate>
+
+@property (nonatomic, retain) IASKAppSettingsViewController *viewController;
+
+@end

AspenProject/VLCSettingsViewController.m

@@ -2,21 +2,23 @@
 //  VLCSettingsViewController.m
 //  VLC for iOS
 //
-//  Created by Felix Paul Kühne on 19.05.13.
+//  Created by Felix Paul Kühne on 23.05.13.
 //  Copyright (c) 2013 VideoLAN. All rights reserved.
 //
 
-#import "VLCSettingsViewController.h"
-#import "VLCPlaylistViewController.h"
-#import "PAPasscodeViewController.h"
+#import "VLCSettingsController.h"
 #import "VLCAppDelegate.h"
+#import "VLCPlaylistViewController.h"
 #import "IASKSettingsReader.h"
 
-@implementation VLCSettingsViewController
+@implementation VLCSettingsController
 
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+- (id)init
 {
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    self = [super init];
+    if (self)
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(settingDidChange:) name:kIASKAppSettingChanged object:nil];
+
     return self;
 }
 
@@ -25,52 +27,6 @@
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
-- (IASKAppSettingsViewController*)appSettingsViewController {
-	if (!_appSettingsViewController) {
-		_appSettingsViewController = [[IASKAppSettingsViewController alloc] init];
-		_appSettingsViewController.delegate = self;
-	}
-	return _appSettingsViewController;
-}
-
-- (void)viewDidLoad
-{
-    self.dismissButton.title = NSLocalizedString(@"BUTTON_DONE", @"");
-
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(settingDidChange:) name:kIASKAppSettingChanged object:nil];
-
-    CGRect frame = self.view.frame;
-    CGFloat toolbarHeight = self.topToolbar.frame.size.height;
-    frame.size.height = frame.size.height - toolbarHeight;
-    frame.origin.y = frame.origin.y + toolbarHeight;
-    self.appSettingsViewController.tableView.frame = frame;
-    [self.view addSubview:self.appSettingsViewController.tableView];
-
-    [super viewDidLoad];
-}
-
-- (void)viewWillDisappear:(BOOL)animated
-{
-}
-
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-}
-
-- (IBAction)dismiss:(id)sender
-{
-    VLCAppDelegate* appDelegate = [UIApplication sharedApplication].delegate;
-    [appDelegate.playlistViewController.navigationController dismissModalViewControllerAnimated:YES];
-}
-
-#pragma mark - IASKAppSettingsViewController delegate
-
-- (void)settingsViewControllerDidEnd:(IASKAppSettingsViewController*)sender
-{
-    // adapt app behavior if needed
-}
-
 - (void)settingDidChange:(NSNotification*)notification
 {
     if ([notification.object isEqual:kVLCSettingPasscodeOnKey]) {
@@ -79,11 +35,17 @@
         if (passcodeOn) {
             PAPasscodeViewController *passcodeLockController = [[PAPasscodeViewController alloc] initForAction:PasscodeActionSet];
             passcodeLockController.delegate = self;
-            [self presentModalViewController:passcodeLockController animated:YES];
+            [self.viewController presentModalViewController:passcodeLockController animated:YES];
         }
     }
 }
 
+- (void)settingsViewControllerDidEnd:(IASKAppSettingsViewController*)sender
+{
+    VLCAppDelegate* appDelegate = [UIApplication sharedApplication].delegate;
+    [appDelegate.playlistViewController.navigationController dismissModalViewControllerAnimated:YES];
+}
+
 #pragma mark - PAPasscode delegate
 
 - (void)PAPasscodeViewControllerDidCancel:(PAPasscodeViewController *)controller

AspenProject/VLCSettingsViewController.h

@@ -1,22 +0,0 @@
-//
-//  VLCSettingsViewController.h
-//  VLC for iOS
-//
-//  Created by Felix Paul Kühne on 19.05.13.
-//  Copyright (c) 2013 VideoLAN. All rights reserved.
-//
-
-#import "IASKAppSettingsViewController.h"
-#import "PAPasscodeViewController.h"
-
-@interface VLCSettingsViewController : UIViewController <IASKSettingsDelegate, PAPasscodeViewControllerDelegate>
-
-@property (nonatomic, strong) IBOutlet UIToolbar *topToolbar;
-@property (nonatomic, strong) IBOutlet UIBarButtonItem *dismissButton;
-
-@property (nonatomic, retain) IBOutlet IASKAppSettingsViewController *appSettingsViewController;
-
-- (IBAction)dismiss:(id)sender;
-
-@end
-

Resources/VLCSettingsViewController.xib

@@ -1,362 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1296</int>
-		<string key="IBDocument.SystemVersion">12E52</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.39</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">2083</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBProxyObject</string>
-			<string>IBUIBarButtonItem</string>
-			<string>IBUITableView</string>
-			<string>IBUITableViewController</string>
-			<string>IBUIToolbar</string>
-			<string>IBUIView</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="IBProxyObject" id="372490531">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBProxyObject" id="975951072">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBUITableViewController" id="321639310">
-				<object class="IBUITableView" key="IBUIView" id="796830225">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">274</int>
-					<array class="NSMutableArray" key="NSSubviews"/>
-					<string key="NSFrame">{{0, 20}, {320, 548}}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
-					<string key="NSReuseIdentifierKey">_NS:10</string>
-					<object class="NSColor" key="IBUIBackgroundColor">
-						<int key="NSColorSpace">1</int>
-						<bytes key="NSRGB">MCAwIDAgMAA</bytes>
-						<string key="IBUIColorCocoaTouchKeyPath">groupTableViewBackgroundColor</string>
-					</object>
-					<bool key="IBUIOpaque">NO</bool>
-					<bool key="IBUIClipsSubviews">YES</bool>
-					<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-					<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-					<bool key="IBUIAlwaysBounceVertical">YES</bool>
-					<int key="IBUIStyle">1</int>
-					<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
-					<bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool>
-					<float key="IBUIRowHeight">44</float>
-					<float key="IBUISectionHeaderHeight">10</float>
-					<float key="IBUISectionFooterHeight">10</float>
-				</object>
-				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
-					<int key="IBUIInterfaceOrientation">1</int>
-					<int key="interfaceOrientation">1</int>
-				</object>
-				<object class="IBUIScreenMetrics" key="IBUISimulatedDestinationMetrics">
-					<string key="IBUISimulatedSizeMetricsClass">IBUIScreenMetrics</string>
-					<object class="NSMutableDictionary" key="IBUINormalizedOrientationToSizeMap">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<array key="dict.sortedKeys">
-							<integer value="1"/>
-							<integer value="3"/>
-						</array>
-						<array key="dict.values">
-							<string>{320, 568}</string>
-							<string>{568, 320}</string>
-						</array>
-					</object>
-					<string key="IBUITargetRuntime">IBCocoaTouchFramework</string>
-					<string key="IBUIDisplayName">Retina 4 Full Screen</string>
-					<int key="IBUIType">2</int>
-				</object>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-				<bool key="IBUIHorizontal">NO</bool>
-			</object>
-			<object class="IBUIView" id="1058981638">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">301</int>
-				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIToolbar" id="222768752">
-						<reference key="NSNextResponder" ref="1058981638"/>
-						<int key="NSvFlags">290</int>
-						<string key="NSFrameSize">{540, 44}</string>
-						<reference key="NSSuperview" ref="1058981638"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
-						<string key="NSReuseIdentifierKey">_NS:9</string>
-						<bool key="IBUIOpaque">NO</bool>
-						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<array class="NSMutableArray" key="IBUIItems">
-							<object class="IBUIBarButtonItem" id="883438531">
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<reference key="IBUIToolbar" ref="222768752"/>
-								<int key="IBUISystemItemIdentifier">5</int>
-							</object>
-							<object class="IBUIBarButtonItem" id="320254837">
-								<string key="IBUITitle">Done</string>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<int key="IBUIStyle">1</int>
-								<reference key="IBUIToolbar" ref="222768752"/>
-							</object>
-						</array>
-						<object class="NSColor" key="IBUITintColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MCAwIDAAA</bytes>
-							<string key="IBUIColorCocoaTouchKeyPath">darkTextColor</string>
-						</object>
-					</object>
-				</array>
-				<string key="NSFrameSize">{540, 568}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="222768752"/>
-				<string key="NSReuseIdentifierKey">_NS:9</string>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">3</int>
-					<bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes>
-				</object>
-				<int key="IBUIContentMode">4</int>
-				<object class="IBUISimulatedSizeMetrics" key="IBUISimulatedDestinationMetrics">
-					<string key="IBUISimulatedSizeMetricsClass">IBUISimulatedFreeformSizeMetricsSentinel</string>
-					<string key="IBUIDisplayName">Freeform</string>
-				</object>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="1058981638"/>
-					</object>
-					<int key="connectionID">5</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">dismissButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="320254837"/>
-					</object>
-					<int key="connectionID">38</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">appSettingsViewController</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="321639310"/>
-					</object>
-					<int key="connectionID">71</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">topToolbar</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="222768752"/>
-					</object>
-					<int key="connectionID">72</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">dismiss:</string>
-						<reference key="source" ref="320254837"/>
-						<reference key="destination" ref="372490531"/>
-					</object>
-					<int key="connectionID">37</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="321639310"/>
-						<reference key="destination" ref="372490531"/>
-					</object>
-					<int key="connectionID">70</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="796830225"/>
-						<reference key="destination" ref="321639310"/>
-					</object>
-					<int key="connectionID">68</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">dataSource</string>
-						<reference key="source" ref="796830225"/>
-						<reference key="destination" ref="321639310"/>
-					</object>
-					<int key="connectionID">69</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="372490531"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="975951072"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">66</int>
-						<reference key="object" ref="321639310"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="796830225"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">67</int>
-						<reference key="object" ref="796830225"/>
-						<array class="NSMutableArray" key="children"/>
-						<reference key="parent" ref="321639310"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4</int>
-						<reference key="object" ref="1058981638"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="222768752"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">11</int>
-						<reference key="object" ref="222768752"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="320254837"/>
-							<reference ref="883438531"/>
-						</array>
-						<reference key="parent" ref="1058981638"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="883438531"/>
-						<reference key="parent" ref="222768752"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="320254837"/>
-						<reference key="parent" ref="222768752"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.CustomClassName">VLCSettingsViewController</string>
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="-2.CustomClassName">UIResponder</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="66.CustomClassName">IASKAppSettingsViewController</string>
-				<string key="66.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="67.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">72</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">IASKAppSettingsViewController</string>
-					<string key="superclassName">UITableViewController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">delegate</string>
-						<string key="NS.object.0">id</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">delegate</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">delegate</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/IASKAppSettingsViewController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">VLCSettingsViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="dismiss:">id</string>
-						<string key="toggleSetting:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="dismiss:">
-							<string key="name">dismiss:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="toggleSetting:">
-							<string key="name">toggleSetting:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="appSettingsViewController">IASKAppSettingsViewController</string>
-						<string key="dismissButton">UIBarButtonItem</string>
-						<string key="topToolbar">UIToolbar</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="appSettingsViewController">
-							<string key="name">appSettingsViewController</string>
-							<string key="candidateClassName">IASKAppSettingsViewController</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="dismissButton">
-							<string key="name">dismissButton</string>
-							<string key="candidateClassName">UIBarButtonItem</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="topToolbar">
-							<string key="name">topToolbar</string>
-							<string key="candidateClassName">UIToolbar</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/VLCSettingsViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
-			<real value="1296" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">2083</string>
-	</data>
-</archive>

VLC for iOS.xcodeproj/project.pbxproj

@@ -39,6 +39,7 @@
 		2915544317490D4A00B86CAD /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2915544217490D4A00B86CAD /* Security.framework */; };
 		293DF2F417494F8200BB880F /* DropboxSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D05ADEA174945CE0087550C /* DropboxSDK.framework */; };
 		29CE2D44174912C600922D8F /* VLCHTTPUploaderController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29CE2D42174912C600922D8F /* VLCHTTPUploaderController.m */; };
+		7D07A4E9174EA47800759D10 /* VLCSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D07A4E7174EA47800759D10 /* VLCSettingsController.m */; };
 		7D10BC761743FA0F00DA7059 /* audio.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC6A1743FA0F00DA7059 /* audio.png */; };
 		7D10BC771743FA0F00DA7059 /* audio@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC6B1743FA0F00DA7059 /* audio@2x.png */; };
 		7D10BC781743FA0F00DA7059 /* backward.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D10BC6C1743FA0F00DA7059 /* backward.png */; };
@@ -109,8 +110,6 @@
 		7D6BA1171748EFE100C0E203 /* VLCAddMediaViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D6BA1151748EFE100C0E203 /* VLCAddMediaViewController.m */; };
 		7D6BA1181748EFE100C0E203 /* VLCAddMediaViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BA1161748EFE100C0E203 /* VLCAddMediaViewController~ipad.xib */; };
 		7D6BA11A174911C200C0E203 /* VLCAddMediaViewController~iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BA119174911C200C0E203 /* VLCAddMediaViewController~iphone.xib */; };
-		7D6BA11E17491F5F00C0E203 /* VLCSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D6BA11C17491F5F00C0E203 /* VLCSettingsViewController.m */; };
-		7D6BA11F17491F5F00C0E203 /* VLCSettingsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BA11D17491F5F00C0E203 /* VLCSettingsViewController.xib */; };
 		7D94FCDF16DE7D1000F2623B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D94FCDE16DE7D1000F2623B /* UIKit.framework */; };
 		7D94FCE116DE7D1000F2623B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D94FCE016DE7D1000F2623B /* Foundation.framework */; };
 		7D94FCE316DE7D1000F2623B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D94FCE216DE7D1000F2623B /* CoreGraphics.framework */; };
@@ -233,6 +232,8 @@
 		29CE2D41174912C600922D8F /* VLCHTTPUploaderController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCHTTPUploaderController.h; sourceTree = "<group>"; };
 		29CE2D42174912C600922D8F /* VLCHTTPUploaderController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCHTTPUploaderController.m; sourceTree = "<group>"; };
 		7D05ADEA174945CE0087550C /* DropboxSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DropboxSDK.framework; path = ImportedSources/Dropbox/DropboxSDK.framework; sourceTree = "<group>"; };
+		7D07A4E6174EA47800759D10 /* VLCSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCSettingsController.h; sourceTree = "<group>"; };
+		7D07A4E7174EA47800759D10 /* VLCSettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCSettingsController.m; sourceTree = "<group>"; };
 		7D10BC6A1743FA0F00DA7059 /* audio.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = audio.png; sourceTree = "<group>"; };
 		7D10BC6B1743FA0F00DA7059 /* audio@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "audio@2x.png"; sourceTree = "<group>"; };
 		7D10BC6C1743FA0F00DA7059 /* backward.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = backward.png; sourceTree = "<group>"; };
@@ -338,9 +339,6 @@
 		7D6BA1151748EFE100C0E203 /* VLCAddMediaViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCAddMediaViewController.m; sourceTree = "<group>"; };
 		7D6BA1161748EFE100C0E203 /* VLCAddMediaViewController~ipad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCAddMediaViewController~ipad.xib"; path = "../Resources/VLCAddMediaViewController~ipad.xib"; sourceTree = "<group>"; };
 		7D6BA119174911C200C0E203 /* VLCAddMediaViewController~iphone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "VLCAddMediaViewController~iphone.xib"; path = "Resources/VLCAddMediaViewController~iphone.xib"; sourceTree = SOURCE_ROOT; };
-		7D6BA11B17491F5F00C0E203 /* VLCSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCSettingsViewController.h; sourceTree = "<group>"; };
-		7D6BA11C17491F5F00C0E203 /* VLCSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCSettingsViewController.m; sourceTree = "<group>"; };
-		7D6BA11D17491F5F00C0E203 /* VLCSettingsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCSettingsViewController.xib; path = ../Resources/VLCSettingsViewController.xib; sourceTree = "<group>"; };
 		7D94FCDB16DE7D1000F2623B /* VLC for iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "VLC for iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		7D94FCDE16DE7D1000F2623B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		7D94FCE016DE7D1000F2623B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -812,6 +810,7 @@
 				7D94FCF916DE7D1100F2623B /* VLCMovieViewController.h */,
 				7D94FCFA16DE7D1100F2623B /* VLCMovieViewController.m */,
 				7DA62099170A0CE500643D11 /* VLCPlaylistTableViewCell.h */,
+				7D31CF061746AEF2005997E0 /* UI Elements */,
 				7DA6209A170A0CE500643D11 /* VLCPlaylistTableViewCell.m */,
 				7D6B07F51716D45B003280C4 /* VLCPlaylistGridView.h */,
 				7D6B07F61716D45B003280C4 /* VLCPlaylistGridView.m */,
@@ -823,9 +822,8 @@
 				7D6BA1151748EFE100C0E203 /* VLCAddMediaViewController.m */,
 				7D3EB015174A46FB002062C2 /* VLCHTTPFileDownloader.h */,
 				7D3EB016174A46FB002062C2 /* VLCHTTPFileDownloader.m */,
-				7D6BA11B17491F5F00C0E203 /* VLCSettingsViewController.h */,
-				7D6BA11C17491F5F00C0E203 /* VLCSettingsViewController.m */,
-				7D31CF061746AEF2005997E0 /* UI Elements */,
+				7D07A4E6174EA47800759D10 /* VLCSettingsController.h */,
+				7D07A4E7174EA47800759D10 /* VLCSettingsController.m */,
 				7DADC5601704FACC001DAC63 /* Imported */,
 				7DADC55C1704FAA8001DAC63 /* XIBs */,
 				A7924697170F0ED20036AAF2 /* Resources */,
@@ -852,7 +850,6 @@
 				7D33D41517182615008AF0E0 /* VLCMovieViewController~ipad.xib */,
 				7D6BA1161748EFE100C0E203 /* VLCAddMediaViewController~ipad.xib */,
 				7D6BA119174911C200C0E203 /* VLCAddMediaViewController~iphone.xib */,
-				7D6BA11D17491F5F00C0E203 /* VLCSettingsViewController.xib */,
 				A79246BD170F114E0036AAF2 /* VLCMovieViewController~iphone.xib */,
 				A79246C0170F114E0036AAF2 /* VLCPlaylistViewController~iphone.xib */,
 				A79246BC170F114E0036AAF2 /* VLCPlaylistViewController~ipad.xib */,
@@ -1065,7 +1062,6 @@
 				7D6BA11A174911C200C0E203 /* VLCAddMediaViewController~iphone.xib in Resources */,
 				29125E5617492219003F03E5 /* index.html in Resources */,
 				29125E5717492219003F03E5 /* upload.html in Resources */,
-				7D6BA11F17491F5F00C0E203 /* VLCSettingsViewController.xib in Resources */,
 				7D3EAFF8174A2651002062C2 /* vlcetix512.png in Resources */,
 				7D3EAFFD174A265C002062C2 /* vlcetix57.png in Resources */,
 				7D3EAFFE174A265C002062C2 /* vlcetix72.png in Resources */,
@@ -1143,7 +1139,6 @@
 				2915544117490B9C00B86CAD /* WebSocket.m in Sources */,
 				7D6BA1171748EFE100C0E203 /* VLCAddMediaViewController.m in Sources */,
 				29CE2D44174912C600922D8F /* VLCHTTPUploaderController.m in Sources */,
-				7D6BA11E17491F5F00C0E203 /* VLCSettingsViewController.m in Sources */,
 				7D3EB012174A3530002062C2 /* Reachability.m in Sources */,
 				7D3EB017174A46FB002062C2 /* VLCHTTPFileDownloader.m in Sources */,
 				A7A0E9FB174BA66000162F25 /* PAPasscodeViewController.m in Sources */,
@@ -1161,6 +1156,7 @@
 				7D6B08F6174D65B500A05173 /* IASKSlider.m in Sources */,
 				7D6B08F7174D65B500A05173 /* IASKSwitch.m in Sources */,
 				7D6B08F8174D65B500A05173 /* IASKTextField.m in Sources */,
+				7D07A4E9174EA47800759D10 /* VLCSettingsController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};