Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC-iOS
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
311
Issues
311
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
VideoLAN
VLC-iOS
Commits
6a08098a
Commit
6a08098a
authored
Aug 10, 2013
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Unify menu behavior for pad and phone form factors
parent
c72e8c36
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
39 deletions
+13
-39
AspenProject/VLCAboutViewController.m
AspenProject/VLCAboutViewController.m
+2
-5
AspenProject/VLCDropboxTableViewController.m
AspenProject/VLCDropboxTableViewController.m
+2
-6
AspenProject/VLCHTTPDownloadViewController.m
AspenProject/VLCHTTPDownloadViewController.m
+1
-2
AspenProject/VLCMenuViewController.m
AspenProject/VLCMenuViewController.m
+6
-19
AspenProject/VLCOpenNetworkStreamViewController.m
AspenProject/VLCOpenNetworkStreamViewController.m
+1
-3
AspenProject/VLCSettingsController.m
AspenProject/VLCSettingsController.m
+1
-4
No files found.
AspenProject/VLCAboutViewController.m
View file @
6a08098a
...
...
@@ -24,11 +24,8 @@
[
contributeButton
setBackgroundImage
:[
UIImage
imageNamed
:
@"button"
]
forState
:
UIControlStateNormal
barMetrics
:
UIBarMetricsDefault
];
[
contributeButton
setBackgroundImage
:[
UIImage
imageNamed
:
@"buttonHighlight"
]
forState
:
UIControlStateHighlighted
barMetrics
:
UIBarMetricsDefault
];
if
(
UI_USER_INTERFACE_IDIOM
()
==
UIUserInterfaceIdiomPhone
)
{
self
.
navigationItem
.
rightBarButtonItem
=
contributeButton
;
self
.
navigationItem
.
leftBarButtonItem
=
[
UIBarButtonItem
themedRevealMenuButtonWithTarget
:
self
andSelector
:
@selector
(
goBack
:
)];
}
else
self
.
navigationItem
.
leftBarButtonItem
=
contributeButton
;
self
.
navigationItem
.
rightBarButtonItem
=
contributeButton
;
self
.
navigationItem
.
leftBarButtonItem
=
[
UIBarButtonItem
themedRevealMenuButtonWithTarget
:
self
andSelector
:
@selector
(
goBack
:
)];
NSMutableString
*
htmlContent
=
[
NSMutableString
stringWithContentsOfFile
:[[
NSBundle
mainBundle
]
pathForResource
:
@"About Contents"
ofType
:
@"html"
]
encoding
:
NSUTF8StringEncoding
error
:
nil
];
[
htmlContent
replaceOccurrencesOfString
:
@"ASPENVERSION"
withString
:[[
NSString
stringWithFormat
:
NSLocalizedString
(
@"VERSION_FORMAT"
,
@""
),
[[
NSBundle
mainBundle
]
objectForInfoDictionaryKey
:
@"CFBundleVersion"
]]
stringByAppendingFormat
:
@" %@"
,
kVLCVersionCodename
]
options
:
NSLiteralSearch
range
:
NSMakeRange
(
0
,
1000
)];
...
...
AspenProject/VLCDropboxTableViewController.m
View file @
6a08098a
...
...
@@ -56,8 +56,7 @@
_backButton
=
[
UIBarButtonItem
themedBackButtonWithTarget
:
self
andSelector
:
@selector
(
goBack
:
)];
_backToMenuButton
=
[
UIBarButtonItem
themedRevealMenuButtonWithTarget
:
self
andSelector
:
@selector
(
goBack
:
)];
if
(
UI_USER_INTERFACE_IDIOM
()
==
UIUserInterfaceIdiomPhone
)
self
.
navigationItem
.
leftBarButtonItem
=
_backToMenuButton
;
self
.
navigationItem
.
leftBarButtonItem
=
_backToMenuButton
;
self
.
tableView
.
rowHeight
=
[
VLCDropboxTableViewCell
heightOfCell
];
self
.
tableView
.
separatorColor
=
[
UIColor
colorWithWhite
:.
122
alpha
:
1
.];
...
...
@@ -117,10 +116,7 @@
[
_activityIndicator
startAnimating
];
[
_dropboxController
requestDirectoryListingAtPath
:
_currentPath
];
if
(
UI_USER_INTERFACE_IDIOM
()
==
UIUserInterfaceIdiomPad
)
self
.
navigationItem
.
leftBarButtonItem
=
!
[
_currentPath
isEqualToString
:
@"/"
]
?
_backButton
:
nil
;
else
self
.
navigationItem
.
leftBarButtonItem
=
!
[
_currentPath
isEqualToString
:
@"/"
]
?
_backButton
:
_backToMenuButton
;
self
.
navigationItem
.
leftBarButtonItem
=
!
[
_currentPath
isEqualToString
:
@"/"
]
?
_backButton
:
_backToMenuButton
;
}
#pragma mark - interface interaction
...
...
AspenProject/VLCHTTPDownloadViewController.m
View file @
6a08098a
...
...
@@ -26,8 +26,7 @@
{
[
self
.
downloadButton
setTitle
:
NSLocalizedString
(
@"BUTTON_DOWNLOAD"
,
@""
)
forState
:
UIControlStateNormal
];
_currentDownloads
=
[[
NSMutableArray
alloc
]
init
];
if
(
UI_USER_INTERFACE_IDIOM
()
==
UIUserInterfaceIdiomPhone
)
self
.
navigationItem
.
leftBarButtonItem
=
[
UIBarButtonItem
themedRevealMenuButtonWithTarget
:
self
andSelector
:
@selector
(
goBack
:
)];
self
.
navigationItem
.
leftBarButtonItem
=
[
UIBarButtonItem
themedRevealMenuButtonWithTarget
:
self
andSelector
:
@selector
(
goBack
:
)];
self
.
title
=
NSLocalizedString
(
@"DOWNLOAD_FROM_HTTP"
,
@""
);
[
super
viewDidLoad
];
}
...
...
AspenProject/VLCMenuViewController.m
View file @
6a08098a
...
...
@@ -123,8 +123,7 @@
if
(
!
self
.
settingsViewController
)
{
self
.
settingsViewController
=
[[
IASKAppSettingsViewController
alloc
]
initWithStyle
:
UITableViewStyleGrouped
];
self
.
settingsController
.
viewController
=
self
.
settingsViewController
;
if
(
UI_USER_INTERFACE_IDIOM
()
==
UIUserInterfaceIdiomPhone
)
self
.
settingsViewController
.
navigationItem
.
leftBarButtonItem
=
[
UIBarButtonItem
themedBackButtonWithTarget
:
self
.
settingsViewController
andSelector
:
@selector
(
dismiss
:
)];
self
.
settingsViewController
.
navigationItem
.
leftBarButtonItem
=
[
UIBarButtonItem
themedBackButtonWithTarget
:
self
.
settingsViewController
andSelector
:
@selector
(
dismiss
:
)];
}
self
.
settingsViewController
.
modalPresentationStyle
=
UIModalPresentationFormSheet
;
...
...
@@ -164,24 +163,12 @@
-
(
void
)
_presentViewController
:(
UIViewController
*
)
viewController
{
if
(
UI_USER_INTERFACE_IDIOM
()
==
UIUserInterfaceIdiomPad
)
{
UINavigationController
*
navController
=
[[
UINavigationController
alloc
]
initWithRootViewController
:
viewController
];
[
navController
loadTheme
];
navController
.
modalPresentationStyle
=
UIModalPresentationFormSheet
;
[
self
presentModalViewController
:
navController
animated
:
YES
];
if
(
viewController
.
navigationItem
.
rightBarButtonItem
==
nil
)
{
UIBarButtonItem
*
doneButton
=
[
UIBarButtonItem
themedDoneButtonWithTarget
:
self
andSelector
:
@selector
(
_dismissModalViewController
)];
viewController
.
navigationItem
.
rightBarButtonItem
=
doneButton
;
}
}
else
{
UINavigationController
*
navController
=
[[
UINavigationController
alloc
]
initWithRootViewController
:
viewController
];
[
navController
loadTheme
];
UINavigationController
*
navController
=
[[
UINavigationController
alloc
]
initWithRootViewController
:
viewController
];
[
navController
loadTheme
];
GHRevealViewController
*
ghVC
=
[(
VLCAppDelegate
*
)[
UIApplication
sharedApplication
].
delegate
revealController
];
ghVC
.
contentViewController
=
navController
;
[
ghVC
toggleSidebar
:
NO
duration
:
kGHRevealSidebarDefaultAnimationDuration
];
}
GHRevealViewController
*
ghVC
=
[(
VLCAppDelegate
*
)[
UIApplication
sharedApplication
].
delegate
revealController
];
ghVC
.
contentViewController
=
navController
;
[
ghVC
toggleSidebar
:
NO
duration
:
kGHRevealSidebarDefaultAnimationDuration
];
}
#pragma mark - shake to support
...
...
AspenProject/VLCOpenNetworkStreamViewController.m
View file @
6a08098a
...
...
@@ -36,9 +36,7 @@
[
self
.
openButton
setTitle
:
NSLocalizedString
(
@"BUTTON_OPEN"
,
@""
)
forState
:
UIControlStateNormal
];
[
self
.
privateModeLabel
setText
:
NSLocalizedString
(
@"PRIVATE_PLAYBACK_TOGGLE"
,
@""
)];
self
.
title
=
NSLocalizedString
(
@"OPEN_NETWORK"
,
@""
);
if
(
UI_USER_INTERFACE_IDIOM
()
==
UIUserInterfaceIdiomPhone
)
self
.
navigationItem
.
leftBarButtonItem
=
[
UIBarButtonItem
themedRevealMenuButtonWithTarget
:
self
andSelector
:
@selector
(
goBack
:
)];
self
.
navigationItem
.
leftBarButtonItem
=
[
UIBarButtonItem
themedRevealMenuButtonWithTarget
:
self
andSelector
:
@selector
(
goBack
:
)];
}
-
(
void
)
viewWillAppear
:(
BOOL
)
animated
...
...
AspenProject/VLCSettingsController.m
View file @
6a08098a
...
...
@@ -45,10 +45,7 @@
-
(
void
)
settingsViewControllerDidEnd
:(
IASKAppSettingsViewController
*
)
sender
{
if
(
UI_USER_INTERFACE_IDIOM
()
==
UIUserInterfaceIdiomPhone
)
[[(
VLCAppDelegate
*
)[
UIApplication
sharedApplication
].
delegate
revealController
]
toggleSidebar
:
!
[(
VLCAppDelegate
*
)[
UIApplication
sharedApplication
].
delegate
revealController
].
sidebarShowing
duration
:
kGHRevealSidebarDefaultAnimationDuration
];
else
[
self
.
viewController
.
navigationController
dismissModalViewControllerAnimated
:
YES
];
[[(
VLCAppDelegate
*
)[
UIApplication
sharedApplication
].
delegate
revealController
]
toggleSidebar
:
!
[(
VLCAppDelegate
*
)[
UIApplication
sharedApplication
].
delegate
revealController
].
sidebarShowing
duration
:
kGHRevealSidebarDefaultAnimationDuration
];
}
-
(
void
)
settingsViewController
:(
IASKAppSettingsViewController
*
)
sender
buttonTappedForSpecifier
:(
IASKSpecifier
*
)
specifier
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment