Commit 46a9f1c1 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

Move branding to menu

parent b188dba7
......@@ -76,8 +76,19 @@
_tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
_tableView.rowHeight = [VLCWiFiUploadTableViewCell heightOfCell];
self.view = _tableView;
[self.tableView selectRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] animated:NO scrollPosition:UITableViewScrollPositionTop];
self.view = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, kGHRevealSidebarWidth, CGRectGetHeight(self.view.bounds))];
[self.view addSubview:_tableView];
UIImageView *brandingBackgroundImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, kGHRevealSidebarWidth, 44.0f)];
brandingBackgroundImageView.contentMode = UIViewContentModeScaleToFill;
brandingBackgroundImageView.image = [UIImage imageNamed:@"searchBarBG"];
[self.view addSubview:brandingBackgroundImageView];
UIImageView *brandingImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, kGHRevealSidebarWidth, 44.0f)];
brandingImageView.contentMode = UIViewContentModeCenter;
brandingImageView.image = [UIImage imageNamed:@"title"];
[self.view addSubview:brandingImageView];
[self.tableView selectRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] animated:NO scrollPosition:UITableViewScrollPositionTop];
_reachability = [Reachability reachabilityForLocalWiFi];
[_reachability startNotifier];
......
......@@ -82,7 +82,7 @@
_tableView.rowHeight = [VLCPlaylistTableViewCell heightOfCell];
_tableView.separatorColor = [UIColor colorWithWhite:.122 alpha:1.];
}
self.navigationItem.titleView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"title"]];
self.title = NSLocalizedString(@"LIBRARY_ALL_FILES", @"");
_emptyLibraryView.emptyLibraryLabel.text = NSLocalizedString(@"EMPTY_LIBRARY", @"");
_emptyLibraryView.emptyLibraryLongDescriptionLabel.lineBreakMode = UILineBreakModeWordWrap;
......
......@@ -45,6 +45,7 @@
7AC862A91765E9510011611A /* jquery.ui.widget.js in Resources */ = {isa = PBXBuildFile; fileRef = 7AC862A11765E90C0011611A /* jquery.ui.widget.js */; };
7D00161C177056B700649F27 /* main.js in Resources */ = {isa = PBXBuildFile; fileRef = 7D00161A17704DAC00649F27 /* main.js */; };
7D02B0D217B6BE850099030D /* VLCLocalServerFolderListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D02B0D117B6BE850099030D /* VLCLocalServerFolderListViewController.m */; };
7D031C3617B6EF82002A82F9 /* searchBarBG.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D031C3517B6EF82002A82F9 /* searchBarBG.png */; };
7D07A4E9174EA47800759D10 /* VLCSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D07A4E7174EA47800759D10 /* VLCSettingsController.m */; };
7D07A4ED174EB81200759D10 /* VLCDropboxController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D07A4EC174EB81200759D10 /* VLCDropboxController.m */; };
7D07F708175665ED00CDE21C /* navBarBackground@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D07F706175665ED00CDE21C /* navBarBackground@2x.png */; };
......@@ -348,6 +349,7 @@
7D00161A17704DAC00649F27 /* main.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = main.js; sourceTree = "<group>"; };
7D02B0D017B6BE850099030D /* VLCLocalServerFolderListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCLocalServerFolderListViewController.h; sourceTree = "<group>"; };
7D02B0D117B6BE850099030D /* VLCLocalServerFolderListViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCLocalServerFolderListViewController.m; sourceTree = "<group>"; };
7D031C3517B6EF82002A82F9 /* searchBarBG.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = searchBarBG.png; 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>"; };
......@@ -1415,6 +1417,7 @@
7DEB3B7B1764A4080038FC70 /* menu */ = {
isa = PBXGroup;
children = (
7D031C3517B6EF82002A82F9 /* searchBarBG.png */,
7DEB3B771764A4040038FC70 /* input@2x.png */,
7DEB3B781764A4040038FC70 /* input.png */,
7DEB3B7317649F2C0038FC70 /* menuButton.png */,
......@@ -1732,6 +1735,7 @@
7D93044817B687C90054EAC6 /* VLCLocalNetworkListCell~ipad.xib in Resources */,
7D93044917B687C90054EAC6 /* VLCLocalNetworkListCell~iphone.xib in Resources */,
7D93045B17B6ACCF0054EAC6 /* VLCWiFiUploadTableViewCell.xib in Resources */,
7D031C3617B6EF82002A82F9 /* searchBarBG.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment