Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
VLC-iOS
Commits
62557810
Commit
62557810
authored
Jun 16, 2013
by
Romain Goyet
Committed by
Felix Paul Kühne
Jun 17, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Factorizing the "Done" button code
Signed-off-by:
Felix Paul Kühne
<
fkuehne@videolan.org
>
parent
d6396764
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
53 additions
and
8 deletions
+53
-8
AspenProject/UIBarButtonItem+Theme.h
AspenProject/UIBarButtonItem+Theme.h
+15
-0
AspenProject/UIBarButtonItem+Theme.m
AspenProject/UIBarButtonItem+Theme.m
+30
-0
AspenProject/VLCAboutViewController.m
AspenProject/VLCAboutViewController.m
+2
-8
VLC for iOS.xcodeproj/project.pbxproj
VLC for iOS.xcodeproj/project.pbxproj
+6
-0
No files found.
AspenProject/UIBarButtonItem+Theme.h
0 → 100644
View file @
62557810
//
// UIBarButtonItem+Theme.h
// VLC for iOS
//
// Created by Romain Goyet on 14/06/13.
// Copyright (c) 2013 Applidium. All rights reserved.
//
// Refer to the COPYING file of the official project for license.
//
#import <UIKit/UIKit.h>
@interface
UIBarButtonItem
(
Theme
)
+
(
UIBarButtonItem
*
)
themedDoneButtonWithTarget
:(
id
)
target
andSelector
:(
SEL
)
selector
;
@end
AspenProject/UIBarButtonItem+Theme.m
0 → 100644
View file @
62557810
//
// UIBarButtonItem+Theme.m
// VLC for iOS
//
// Created by Romain Goyet on 14/06/13.
// Copyright (c) 2013 Applidium. All rights reserved.
//
// Refer to the COPYING file of the official project for license.
//
#import "UIBarButtonItem+Theme.h"
@implementation
UIBarButtonItem
(
Theme
)
+
(
UIBarButtonItem
*
)
themedDoneButtonWithTarget
:(
id
)
target
andSelector
:(
SEL
)
selector
{
UIBarButtonItem
*
doneButton
=
[[
UIBarButtonItem
alloc
]
initWithTitle
:
NSLocalizedString
(
@"BUTTON_DONE"
,
@""
)
style:
UIBarButtonItemStyleBordered
target:
target
action:
selector
];
[
doneButton
setBackgroundImage
:[
UIImage
imageNamed
:
@"doneButton"
]
forState:
UIControlStateNormal
barMetrics:
UIBarMetricsDefault
];
[
doneButton
setBackgroundImage
:[
UIImage
imageNamed
:
@"doneButtonHighlight"
]
forState:
UIControlStateHighlighted
barMetrics:
UIBarMetricsDefault
];
[
doneButton
setTitleTextAttributes
:@{
UITextAttributeTextShadowColor
:
[
UIColor
whiteColor
],
UITextAttributeTextColor
:
[
UIColor
blackColor
]}
forState:
UIControlStateNormal
];
return
doneButton
;
}
@end
AspenProject/VLCAboutViewController.m
View file @
62557810
...
...
@@ -9,6 +9,7 @@
//
#import "VLCAboutViewController.h"
#import "UIBarButtonItem+Theme.h"
@implementation
VLCAboutViewController
...
...
@@ -28,15 +29,8 @@
self
.
aspenVersion
.
text
=
[[
NSString
stringWithFormat
:
NSLocalizedString
(
@"VERSION_FORMAT"
,
@""
),
[[
NSBundle
mainBundle
]
objectForInfoDictionaryKey
:
@"CFBundleVersion"
]]
stringByAppendingFormat
:
@" %@"
,
kVLCVersionCodename
];
self
.
vlckitVersion
.
text
=
[
NSString
stringWithFormat
:
NSLocalizedString
(
@"BASED_ON_FORMAT"
,
@""
),[[
VLCLibrary
sharedLibrary
]
version
]];
UIBarButtonItem
*
dismissButton
=
[[
UIBarButtonItem
alloc
]
initWithTitle
:
NSLocalizedString
(
@"BUTTON_DONE"
,
@""
)
style:
UIBarButtonItemStyleBordered
target:
self
action:
@selector
(
dismiss
)];
[
dismissButton
setBackgroundImage
:[
UIImage
imageNamed
:
@"doneButton"
]
forState
:
UIControlStateNormal
barMetrics
:
UIBarMetricsDefault
];
[
dismissButton
setBackgroundImage
:[
UIImage
imageNamed
:
@"doneButtonHighlight"
]
forState
:
UIControlStateHighlighted
barMetrics
:
UIBarMetricsDefault
];
[
dismissButton
setTitleTextAttributes
:@{
UITextAttributeTextShadowColor
:
[
UIColor
whiteColor
],
UITextAttributeTextColor
:
[
UIColor
blackColor
]}
forState
:
UIControlStateNormal
];
if
(
UI_USER_INTERFACE_IDIOM
()
==
UIUserInterfaceIdiomPad
)
self
.
navigationItem
.
rightBarButtonItem
=
dismiss
Button
;
self
.
navigationItem
.
rightBarButtonItem
=
[
UIBarButtonItem
themedDoneButtonWithTarget
:
self
andSelector
:
@selector
(
dismiss
)]
;
}
-
(
BOOL
)
webView
:(
UIWebView
*
)
webView
shouldStartLoadWithRequest
:(
NSURLRequest
*
)
request
navigationType
:(
UIWebViewNavigationType
)
navigationType
...
...
VLC for iOS.xcodeproj/project.pbxproj
View file @
62557810
...
...
@@ -37,6 +37,7 @@
293DF2F417494F8200BB880F
/* DropboxSDK.framework in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7D05ADEA174945CE0087550C
/* DropboxSDK.framework */
;
};
29CE2D44174912C600922D8F
/* VLCHTTPUploaderController.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
29CE2D42174912C600922D8F
/* VLCHTTPUploaderController.m */
;
};
7A50619F176E3D410036E15D
/* UINavigationController+Theme.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7A50619E176E3D410036E15D
/* UINavigationController+Theme.m */
;
};
7A5061A2176E41160036E15D
/* UIBarButtonItem+Theme.m in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7A5061A1176E41160036E15D
/* UIBarButtonItem+Theme.m */
;
};
7A57C1371769F0BA00807630
/* VLCMenuViewController.xib in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7A57C1361769F0BA00807630
/* VLCMenuViewController.xib */
;
};
7AC8629D1765DC560011611A
/* style.css in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7AC8629B1765DC560011611A
/* style.css */
;
};
7AC862A61765E9510011611A
/* jquery-1.10.1.min.js in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
7AC8629E1765E90C0011611A
/* jquery-1.10.1.min.js */
;
};
...
...
@@ -326,6 +327,8 @@
29CE2D42174912C600922D8F
/* VLCHTTPUploaderController.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
VLCHTTPUploaderController.m
;
sourceTree
=
"<group>"
;
};
7A50619D176E3D410036E15D
/* UINavigationController+Theme.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
"UINavigationController+Theme.h"
;
sourceTree
=
"<group>"
;
};
7A50619E176E3D410036E15D
/* UINavigationController+Theme.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
"UINavigationController+Theme.m"
;
sourceTree
=
"<group>"
;
};
7A5061A0176E41160036E15D
/* UIBarButtonItem+Theme.h */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.h
;
path
=
"UIBarButtonItem+Theme.h"
;
sourceTree
=
"<group>"
;
};
7A5061A1176E41160036E15D
/* UIBarButtonItem+Theme.m */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.c.objc
;
path
=
"UIBarButtonItem+Theme.m"
;
sourceTree
=
"<group>"
;
};
7A57C1361769F0BA00807630
/* VLCMenuViewController.xib */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
file.xib
;
name
=
VLCMenuViewController.xib
;
path
=
Resources/VLCMenuViewController.xib
;
sourceTree
=
SOURCE_ROOT
;
};
7AC8629B1765DC560011611A
/* style.css */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
text.css
;
path
=
style.css
;
sourceTree
=
"<group>"
;
};
7AC8629E1765E90C0011611A
/* jquery-1.10.1.min.js */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
sourcecode.javascript
;
path
=
"jquery-1.10.1.min.js"
;
sourceTree
=
"<group>"
;
};
...
...
@@ -927,6 +930,8 @@
7D47D72E1761101700E86BAD
/* VLCSlider.m */
,
7A50619D176E3D410036E15D
/* UINavigationController+Theme.h */
,
7A50619E176E3D410036E15D
/* UINavigationController+Theme.m */
,
7A5061A0176E41160036E15D
/* UIBarButtonItem+Theme.h */
,
7A5061A1176E41160036E15D
/* UIBarButtonItem+Theme.m */
,
);
name
=
"UI Elements"
;
sourceTree
=
"<group>"
;
...
...
@@ -1658,6 +1663,7 @@
7D2339AF176DE72E008D223C
/* VLCOpenNetworkStreamViewController.m in Sources */
,
7DB43835176E20CC00F460EE
/* VLCHTTPDownloadViewController.m in Sources */
,
7A50619F176E3D410036E15D
/* UINavigationController+Theme.m in Sources */
,
7A5061A2176E41160036E15D
/* UIBarButtonItem+Theme.m in Sources */
,
);
runOnlyForDeploymentPostprocessing
=
0
;
};
...
...
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