Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
VLC-iOS
Commits
f387b312
Commit
f387b312
authored
Dec 15, 2013
by
Felix Paul Kühne
Browse files
Cloud Login: use a flat 'Login' button on iOS 7
parent
f831de03
Changes
7
Hide whitespace changes
Inline
Side-by-side
Resources/VLCCloudStorageTableViewCell~ipad.xib
View file @
f387b312
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"50
2
3"
systemVersion=
"12F45"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"503
7
"
systemVersion=
"12F45"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
>
<dependencies>
<deployment
defaultVersion=
"1552"
identifier=
"iOS"
/>
<development
version=
"5000"
identifier=
"xcode"
/>
...
...
Resources/VLCCloudStorageTableViewCell~iphone.xib
View file @
f387b312
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"50
2
3"
systemVersion=
"12F45"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"503
7
"
systemVersion=
"12F45"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
>
<dependencies>
<deployment
defaultVersion=
"1552"
identifier=
"iOS"
/>
<development
version=
"5000"
identifier=
"xcode"
/>
...
...
Resources/VLCCloudStorageTableViewController.xib
View file @
f387b312
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"50
2
3"
systemVersion=
"12F45"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"503
7
"
systemVersion=
"12F45"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
>
<dependencies>
<deployment
defaultVersion=
"1552"
identifier=
"iOS"
/>
<development
version=
"5000"
identifier=
"xcode"
/>
...
...
@@ -9,6 +9,7 @@
<placeholder
placeholderIdentifier=
"IBFilesOwner"
id=
"-1"
userLabel=
"File's Owner"
customClass=
"VLCCloudStorageTableViewController"
>
<connections>
<outlet
property=
"cloudStorageLogo"
destination=
"9"
id=
"9Q5-Ar-xu1"
/>
<outlet
property=
"flatLoginButton"
destination=
"M6b-xw-TrY"
id=
"L3S-pJ-rzh"
/>
<outlet
property=
"loginButton"
destination=
"20"
id=
"AIe-DC-rE2"
/>
<outlet
property=
"loginToCloudStorageView"
destination=
"8"
id=
"Hry-dm-Ayh"
/>
<outlet
property=
"tableView"
destination=
"29"
id=
"30"
/>
...
...
@@ -35,7 +36,7 @@
<simulatedToolbarMetrics
key=
"simulatedBottomBarMetrics"
barStyle=
"black"
/>
<simulatedScreenMetrics
key=
"simulatedDestinationMetrics"
type=
"retina4"
/>
</view>
<view
contentMode=
"scaleToFill"
id=
"8"
customClass=
"CloudStorageTableViewControllerLogin"
>
<view
contentMode=
"scaleToFill"
id=
"8"
>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"320"
height=
"568"
/>
<autoresizingMask
key=
"autoresizingMask"
widthSizable=
"YES"
heightSizable=
"YES"
/>
<subviews>
...
...
@@ -58,6 +59,16 @@
<action
selector=
"loginAction:"
destination=
"-1"
eventType=
"touchUpInside"
id=
"Ny5-mX-HmE"
/>
</connections>
</button>
<button
contentMode=
"scaleToFill"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
lineBreakMode=
"middleTruncation"
id=
"M6b-xw-TrY"
userLabel=
"Button - Login"
>
<rect
key=
"frame"
x=
"0.0"
y=
"386"
width=
"320"
height=
"40"
/>
<autoresizingMask
key=
"autoresizingMask"
flexibleMinX=
"YES"
flexibleMaxX=
"YES"
flexibleMinY=
"YES"
flexibleMaxY=
"YES"
/>
<color
key=
"backgroundColor"
white=
"0.0"
alpha=
"1"
colorSpace=
"calibratedWhite"
/>
<fontDescription
key=
"fontDescription"
type=
"boldSystem"
pointSize=
"15"
/>
<state
key=
"normal"
title=
"Login"
/>
<connections>
<action
selector=
"loginAction:"
destination=
"-1"
eventType=
"touchUpInside"
id=
"OkA-ZX-ZSn"
/>
</connections>
</button>
</subviews>
<color
key=
"backgroundColor"
red=
"0.12156862745098039"
green=
"0.12156862745098039"
blue=
"0.12156862745098039"
alpha=
"1"
colorSpace=
"calibratedRGB"
/>
<simulatedScreenMetrics
key=
"simulatedDestinationMetrics"
type=
"retina4"
/>
...
...
Resources/VLCNetworkLoginViewController.xib
View file @
f387b312
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"50
2
3"
systemVersion=
"12F45"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
>
<document
type=
"com.apple.InterfaceBuilder3.CocoaTouch.XIB"
version=
"3.0"
toolsVersion=
"503
7
"
systemVersion=
"12F45"
targetRuntime=
"iOS.CocoaTouch"
propertyAccessControl=
"none"
>
<dependencies>
<deployment
defaultVersion=
"1552"
identifier=
"iOS"
/>
<development
version=
"5000"
identifier=
"xcode"
/>
...
...
Sources/VLCCloudStorageTableViewController.h
View file @
f387b312
...
...
@@ -17,6 +17,7 @@
@property
(
nonatomic
,
strong
)
IBOutlet
UITableView
*
tableView
;
@property
(
nonatomic
,
strong
)
IBOutlet
UIView
*
loginToCloudStorageView
;
@property
(
nonatomic
,
strong
)
IBOutlet
UIButton
*
loginButton
;
@property
(
nonatomic
,
strong
)
IBOutlet
UIButton
*
flatLoginButton
;
@property
(
nonatomic
,
strong
)
IBOutlet
UIImageView
*
cloudStorageLogo
;
-
(
IBAction
)
loginAction
:(
id
)
sender
;
...
...
Sources/VLCDropboxTableViewController.m
View file @
f387b312
...
...
@@ -76,7 +76,13 @@
[
_downloadingBarLabel
setTitleTextAttributes
:@{
UITextAttributeFont
:
[
UIFont
systemFontOfSize
:
11
.]
}
forState
:
UIControlStateNormal
];
[
self
.
cloudStorageLogo
setImage
:[
UIImage
imageNamed
:
@"dropbox-white.png"
]];
[
self
.
loginButton
setTitle
:
NSLocalizedString
(
@"DROPBOX_LOGIN"
,
@""
)
forState
:
UIControlStateNormal
];
if
(
!
SYSTEM_RUNS_IOS7_OR_LATER
)
{
self
.
flatLoginButton
.
hidden
=
YES
;
[
self
.
loginButton
setTitle
:
NSLocalizedString
(
@"DROPBOX_LOGIN"
,
@""
)
forState
:
UIControlStateNormal
];
}
else
{
self
.
loginButton
.
hidden
=
YES
;
[
self
.
flatLoginButton
setTitle
:
NSLocalizedString
(
@"DROPBOX_LOGIN"
,
@""
)
forState
:
UIControlStateNormal
];
}
[
self
.
navigationController
.
toolbar
setBackgroundImage
:[
UIImage
imageNamed
:
@"sudHeaderBg"
]
forToolbarPosition
:
UIToolbarPositionAny
barMetrics
:
UIBarMetricsDefault
];
...
...
Sources/VLCGoogleDriveTableViewController.m
View file @
f387b312
...
...
@@ -76,7 +76,13 @@
[
self
.
cloudStorageLogo
setImage
:[
UIImage
imageNamed
:
@"DriveWhite"
]];
[
self
.
loginButton
setTitle
:
NSLocalizedString
(
@"DROPBOX_LOGIN"
,
@""
)
forState
:
UIControlStateNormal
];
if
(
!
SYSTEM_RUNS_IOS7_OR_LATER
)
{
self
.
flatLoginButton
.
hidden
=
YES
;
[
self
.
loginButton
setTitle
:
NSLocalizedString
(
@"DROPBOX_LOGIN"
,
@""
)
forState
:
UIControlStateNormal
];
}
else
{
self
.
loginButton
.
hidden
=
YES
;
[
self
.
flatLoginButton
setTitle
:
NSLocalizedString
(
@"DROPBOX_LOGIN"
,
@""
)
forState
:
UIControlStateNormal
];
}
[
self
.
navigationController
.
toolbar
setBackgroundImage
:[
UIImage
imageNamed
:
@"sudHeaderBg"
]
forToolbarPosition
:
UIToolbarPositionAny
barMetrics
:
UIBarMetricsDefault
];
...
...
Write
Preview
Supports
Markdown
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