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
c66b46b7
Commit
c66b46b7
authored
Dec 08, 2013
by
Carola Nitz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
GDrive: removed code for streaming and added truncation for celltext if it's too long
parent
5ca3334d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
28 deletions
+9
-28
Resources/VLCCloudStorageTableViewCell~ipad.xib
Resources/VLCCloudStorageTableViewCell~ipad.xib
+3
-3
Resources/VLCCloudStorageTableViewCell~iphone.xib
Resources/VLCCloudStorageTableViewCell~iphone.xib
+3
-3
Sources/VLCGoogleDriveController.h
Sources/VLCGoogleDriveController.h
+0
-1
Sources/VLCGoogleDriveController.m
Sources/VLCGoogleDriveController.m
+0
-6
Sources/VLCGoogleDriveTableViewController.m
Sources/VLCGoogleDriveTableViewController.m
+3
-15
No files found.
Resources/VLCCloudStorageTableViewCell~ipad.xib
View file @
c66b46b7
...
...
@@ -18,21 +18,21 @@
<rect
key=
"frame"
x=
"5"
y=
"8"
width=
"64"
height=
"64"
/>
<autoresizingMask
key=
"autoresizingMask"
flexibleMaxX=
"YES"
flexibleMaxY=
"YES"
/>
</imageView>
<label
opaque=
"NO"
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"left"
text=
"File Title"
lineBreakMode=
"
wordWrap
"
baselineAdjustment=
"none"
adjustsFontSizeToFit=
"NO"
id=
"6"
>
<label
opaque=
"NO"
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"left"
text=
"File Title"
lineBreakMode=
"
tailTruncation
"
baselineAdjustment=
"none"
adjustsFontSizeToFit=
"NO"
id=
"6"
>
<rect
key=
"frame"
x=
"83"
y=
"21"
width=
"177"
height=
"21"
/>
<autoresizingMask
key=
"autoresizingMask"
widthSizable=
"YES"
flexibleMaxY=
"YES"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"17"
/>
<color
key=
"textColor"
white=
"0.66666666666666663"
alpha=
"1"
colorSpace=
"calibratedWhite"
/>
<color
key=
"highlightedColor"
white=
"1"
alpha=
"1"
colorSpace=
"calibratedWhite"
/>
</label>
<label
opaque=
"NO"
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"left"
text=
"Folder Title"
lineBreakMode=
"
wordWrap
"
baselineAdjustment=
"none"
adjustsFontSizeToFit=
"NO"
id=
"23"
>
<label
opaque=
"NO"
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"left"
text=
"Folder Title"
lineBreakMode=
"
tailTruncation
"
baselineAdjustment=
"none"
adjustsFontSizeToFit=
"NO"
id=
"23"
>
<rect
key=
"frame"
x=
"83"
y=
"29"
width=
"177"
height=
"21"
/>
<autoresizingMask
key=
"autoresizingMask"
widthSizable=
"YES"
flexibleMaxY=
"YES"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"17"
/>
<color
key=
"textColor"
white=
"0.66666666666666663"
alpha=
"1"
colorSpace=
"calibratedWhite"
/>
<color
key=
"highlightedColor"
white=
"1"
alpha=
"1"
colorSpace=
"calibratedWhite"
/>
</label>
<label
opaque=
"NO"
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"left"
text=
"Subtitle — Subtitle"
lineBreakMode=
"
wordWrap
"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
id=
"7"
>
<label
opaque=
"NO"
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"left"
text=
"Subtitle — Subtitle"
lineBreakMode=
"
tailTruncation
"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
id=
"7"
>
<rect
key=
"frame"
x=
"83"
y=
"44"
width=
"177"
height=
"15"
/>
<autoresizingMask
key=
"autoresizingMask"
widthSizable=
"YES"
flexibleMaxY=
"YES"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"12"
/>
...
...
Resources/VLCCloudStorageTableViewCell~iphone.xib
View file @
c66b46b7
...
...
@@ -18,21 +18,21 @@
<rect
key=
"frame"
x=
"5"
y=
"8"
width=
"32"
height=
"32"
/>
<autoresizingMask
key=
"autoresizingMask"
flexibleMaxX=
"YES"
flexibleMaxY=
"YES"
/>
</imageView>
<label
opaque=
"NO"
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"left"
text=
"File Title"
lineBreakMode=
"
wordWrap
"
baselineAdjustment=
"none"
adjustsFontSizeToFit=
"NO"
id=
"6"
>
<label
opaque=
"NO"
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"left"
text=
"File Title"
lineBreakMode=
"
tailTruncation
"
baselineAdjustment=
"none"
adjustsFontSizeToFit=
"NO"
id=
"6"
>
<rect
key=
"frame"
x=
"45"
y=
"8"
width=
"230"
height=
"18"
/>
<autoresizingMask
key=
"autoresizingMask"
widthSizable=
"YES"
flexibleMaxY=
"YES"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"14"
/>
<color
key=
"textColor"
white=
"0.66666666666666663"
alpha=
"1"
colorSpace=
"calibratedWhite"
/>
<color
key=
"highlightedColor"
white=
"1"
alpha=
"1"
colorSpace=
"calibratedWhite"
/>
</label>
<label
opaque=
"NO"
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"left"
text=
"Folder Title"
lineBreakMode=
"
wordWrap
"
baselineAdjustment=
"none"
adjustsFontSizeToFit=
"NO"
id=
"23"
>
<label
opaque=
"NO"
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"left"
text=
"Folder Title"
lineBreakMode=
"
tailTruncation
"
baselineAdjustment=
"none"
adjustsFontSizeToFit=
"NO"
id=
"23"
>
<rect
key=
"frame"
x=
"45"
y=
"15"
width=
"230"
height=
"18"
/>
<autoresizingMask
key=
"autoresizingMask"
widthSizable=
"YES"
flexibleMaxY=
"YES"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"14"
/>
<color
key=
"textColor"
white=
"0.66666666666666663"
alpha=
"1"
colorSpace=
"calibratedWhite"
/>
<color
key=
"highlightedColor"
white=
"1"
alpha=
"1"
colorSpace=
"calibratedWhite"
/>
</label>
<label
opaque=
"NO"
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"left"
text=
"Subtitle — Subtitle"
lineBreakMode=
"
wordWrap
"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
id=
"7"
>
<label
opaque=
"NO"
clipsSubviews=
"YES"
userInteractionEnabled=
"NO"
contentMode=
"left"
text=
"Subtitle — Subtitle"
lineBreakMode=
"
tailTruncation
"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
id=
"7"
>
<rect
key=
"frame"
x=
"45"
y=
"25"
width=
"230"
height=
"15"
/>
<autoresizingMask
key=
"autoresizingMask"
widthSizable=
"YES"
flexibleMinY=
"YES"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"12"
/>
...
...
Sources/VLCGoogleDriveController.h
View file @
c66b46b7
...
...
@@ -41,6 +41,5 @@
-
(
void
)
requestFileListing
;
-
(
BOOL
)
hasMoreFiles
;
-
(
void
)
downloadFileToDocumentFolder
:(
GTLDriveFile
*
)
file
;
-
(
void
)
streamFile
:(
GTLDriveFile
*
)
file
;
@end
Sources/VLCGoogleDriveController.m
View file @
c66b46b7
...
...
@@ -137,12 +137,6 @@
}];
}
-
(
void
)
streamFile
:(
GTLDriveFile
*
)
file
{
VLCAppDelegate
*
appDelegate
=
(
VLCAppDelegate
*
)[
UIApplication
sharedApplication
].
delegate
;
[
appDelegate
openMovieFromURL
:[
NSURL
URLWithString
:
file
.
webContentLink
]];
}
-
(
void
)
_triggerNextDownload
{
if
(
_listOfGoogleDriveFilesToDownload
.
count
>
0
&&
!
_downloadInProgress
)
{
...
...
Sources/VLCGoogleDriveTableViewController.m
View file @
c66b46b7
...
...
@@ -202,6 +202,7 @@
cell
=
[
VLCCloudStorageTableViewCell
cellWithReuseIdentifier
:
CellIdentifier
];
cell
.
driveFile
=
_googleDriveController
.
currentListFiles
[
indexPath
.
row
];
cell
.
downloadButton
.
hidden
=
YES
;
cell
.
delegate
=
self
;
return
cell
;
...
...
@@ -217,8 +218,8 @@
-
(
void
)
tableView
:(
UITableView
*
)
tableView
didSelectRowAtIndexPath
:(
NSIndexPath
*
)
indexPath
{
_selectedFile
=
_googleDriveController
.
currentListFiles
[
indexPath
.
row
];
[
_googleDriveController
streamFile
:
_selectedFile
];
_selectedFile
=
nil
;
UIAlertView
*
alert
=
[[
UIAlertView
alloc
]
initWithTitle
:
NSLocalizedString
(
@"DROPBOX_DOWNLOAD"
,
@""
)
message
:[
NSString
stringWithFormat
:
NSLocalizedString
(
@"DROPBOX_DL_LONG"
,
@""
),
_selectedFile
.
title
,
[[
UIDevice
currentDevice
]
model
]]
delegate
:
self
cancelButtonTitle
:
NSLocalizedString
(
@"BUTTON_CANCEL"
,
@""
)
otherButtonTitles
:
NSLocalizedString
(
@"BUTTON_DOWNLOAD"
,
@""
),
nil
];
[
alert
show
]
;
[
self
.
tableView
deselectRowAtIndexPath
:
indexPath
animated
:
NO
];
}
...
...
@@ -242,19 +243,6 @@
_selectedFile
=
nil
;
}
#pragma mark - table view cell delegation
#pragma mark - VLCLocalNetworkListCell delegation
-
(
void
)
triggerDownloadForCell
:(
VLCCloudStorageTableViewCell
*
)
cell
{
_selectedFile
=
_googleDriveController
.
currentListFiles
[[
self
.
tableView
indexPathForCell
:
cell
].
row
];
/* selected item is a proper file, ask the user if s/he wants to download it */
UIAlertView
*
alert
=
[[
UIAlertView
alloc
]
initWithTitle
:
NSLocalizedString
(
@"DROPBOX_DOWNLOAD"
,
@""
)
message
:[
NSString
stringWithFormat
:
NSLocalizedString
(
@"DROPBOX_DL_LONG"
,
@""
),
_selectedFile
.
title
,
[[
UIDevice
currentDevice
]
model
]]
delegate
:
self
cancelButtonTitle
:
NSLocalizedString
(
@"BUTTON_CANCEL"
,
@""
)
otherButtonTitles
:
NSLocalizedString
(
@"BUTTON_DOWNLOAD"
,
@""
),
nil
];
[
alert
show
];
}
#pragma mark - google drive controller delegate
-
(
void
)
mediaListUpdated
...
...
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