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
Carola
vlc-ios
Commits
e95d821d
Commit
e95d821d
authored
Jan 29, 2018
by
Carola Nitz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
VLCCloudServicesTableViewController: update to adopt the new themes
parent
39778c05
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
93 additions
and
58 deletions
+93
-58
Sources/VLCCloudServicesTableViewController.m
Sources/VLCCloudServicesTableViewController.m
+12
-4
vlc-ios/Images.xcassets/cloudServices/Box.imageset/Contents.json
.../Images.xcassets/cloudServices/Box.imageset/Contents.json
+9
-6
vlc-ios/Images.xcassets/cloudServices/Drive.imageset/Contents.json
...mages.xcassets/cloudServices/Drive.imageset/Contents.json
+9
-6
vlc-ios/Images.xcassets/cloudServices/DriveWhite.imageset/Contents.json
....xcassets/cloudServices/DriveWhite.imageset/Contents.json
+9
-6
vlc-ios/Images.xcassets/cloudServices/Dropbox.imageset/Contents.json
...ges.xcassets/cloudServices/Dropbox.imageset/Contents.json
+9
-6
vlc-ios/Images.xcassets/cloudServices/OneDrive.imageset/Contents.json
...es.xcassets/cloudServices/OneDrive.imageset/Contents.json
+9
-6
vlc-ios/Images.xcassets/cloudServices/OneDriveWhite.imageset/Contents.json
...assets/cloudServices/OneDriveWhite.imageset/Contents.json
+9
-6
vlc-ios/Images.xcassets/cloudServices/dropbox-white.imageset/Contents.json
...assets/cloudServices/dropbox-white.imageset/Contents.json
+9
-6
vlc-ios/Images.xcassets/cloudServices/iCloud.imageset/Contents.json
...ages.xcassets/cloudServices/iCloud.imageset/Contents.json
+9
-6
vlc-ios/Images.xcassets/cloudServices/iCloudIcon.imageset/Contents.json
....xcassets/cloudServices/iCloudIcon.imageset/Contents.json
+9
-6
No files found.
Sources/VLCCloudServicesTableViewController.m
View file @
e95d821d
...
...
@@ -22,6 +22,7 @@
#import "VLCCloudServiceCell.h"
#import "VLCGoogleDriveController.h"
#import "VLC_iOS-Swift.h"
@interface
VLCCloudServicesTableViewController
()
...
...
@@ -39,8 +40,8 @@
[
super
viewDidLoad
];
[
self
.
tableView
registerNib
:[
UINib
nibWithNibName
:
@"VLCCloudServiceCell"
bundle
:
nil
]
forCellReuseIdentifier
:
@"CloudServiceCell"
];
self
.
tableView
.
separatorColor
=
[
UIColor
VLCDarkBackgroundColor
];
self
.
tableView
.
backgroundColor
=
[
UIColor
VLCDarkBackgroundColor
];
[[
NSNotificationCenter
defaultCenter
]
addObserver
:
self
selector
:
@selector
(
themeDidChange
)
name
:
kVLCThemeDidChangeNotification
object
:
nil
];
[
self
themeDidChange
];
self
.
dropboxTableViewController
=
[[
VLCDropboxTableViewController
alloc
]
initWithNibName
:
@"VLCCloudStorageTableViewController"
bundle
:
nil
];
self
.
googleDriveTableViewController
=
[[
VLCGoogleDriveTableViewController
alloc
]
initWithNibName
:
@"VLCCloudStorageTableViewController"
bundle
:
nil
];
...
...
@@ -50,6 +51,12 @@
self
.
documentPickerController
=
[
VLCDocumentPickerController
new
];
}
-
(
void
)
themeDidChange
{
self
.
tableView
.
separatorColor
=
PresentationTheme
.
current
.
colors
.
background
;
self
.
tableView
.
backgroundColor
=
PresentationTheme
.
current
.
colors
.
background
;
}
-
(
void
)
viewWillAppear
:(
BOOL
)
animated
{
[[
NSNotificationCenter
defaultCenter
]
addObserver
:
self
selector
:
@selector
(
authenticationSessionsChanged
:
)
name
:
VLCOneDriveControllerSessionUpdated
object
:
nil
];
...
...
@@ -71,8 +78,7 @@
-
(
void
)
tableView
:(
UITableView
*
)
tableView
willDisplayCell
:(
UITableViewCell
*
)
cell
forRowAtIndexPath
:(
NSIndexPath
*
)
indexPath
{
cell
.
backgroundColor
=
(
indexPath
.
row
%
2
==
0
)?
[
UIColor
blackColor
]:
[
UIColor
VLCDarkBackgroundColor
];
cell
.
backgroundColor
=
(
indexPath
.
row
%
2
==
0
)?
PresentationTheme
.
current
.
colors
.
cellBackgroundA
:
PresentationTheme
.
current
.
colors
.
cellBackgroundB
;
if
([
cell
respondsToSelector
:
@selector
(
setSeparatorInset
:)])
{
[
cell
setSeparatorInset
:
UIEdgeInsetsZero
];
}
...
...
@@ -89,6 +95,8 @@
-
(
UITableViewCell
*
)
tableView
:(
UITableView
*
)
tableView
cellForRowAtIndexPath
:(
NSIndexPath
*
)
indexPath
{
VLCCloudServiceCell
*
cell
=
[
tableView
dequeueReusableCellWithIdentifier
:
@"CloudServiceCell"
forIndexPath
:
indexPath
];
cell
.
cloudTitle
.
textColor
=
cell
.
cloudInformation
.
textColor
=
cell
.
lonesomeCloudTitle
.
textColor
=
PresentationTheme
.
current
.
colors
.
cellTextColor
;
cell
.
icon
.
tintColor
=
PresentationTheme
.
current
.
colors
.
cellTextColor
;
switch
(
indexPath
.
row
)
{
case
0
:
{
//Dropbox
...
...
vlc-ios/Images.xcassets/cloudServices/Box.imageset/Contents.json
View file @
e95d821d
...
...
@@ -2,22 +2,25 @@
"images"
:
[
{
"idiom"
:
"universal"
,
"
scale"
:
"1x
"
,
"
filename"
:
"Box.png
"
"
filename"
:
"Box.png
"
,
"
scale"
:
"1x
"
},
{
"idiom"
:
"universal"
,
"
scale"
:
"2x
"
,
"
filename"
:
"Box@2x.png
"
"
filename"
:
"Box@2x.png
"
,
"
scale"
:
"2x
"
},
{
"idiom"
:
"universal"
,
"
scale"
:
"3x
"
,
"
filename"
:
"Box@3x.png
"
"
filename"
:
"Box@3x.png
"
,
"
scale"
:
"3x
"
}
],
"info"
:
{
"version"
:
1
,
"author"
:
"xcode"
},
"properties"
:
{
"template-rendering-intent"
:
"template"
}
}
\ No newline at end of file
vlc-ios/Images.xcassets/cloudServices/Drive.imageset/Contents.json
View file @
e95d821d
...
...
@@ -2,22 +2,25 @@
"images"
:
[
{
"idiom"
:
"universal"
,
"
scale"
:
"1x
"
,
"
filename"
:
"Drive.png
"
"
filename"
:
"Drive.png
"
,
"
scale"
:
"1x
"
},
{
"idiom"
:
"universal"
,
"
scale"
:
"2x
"
,
"
filename"
:
"Drive@2x.png
"
"
filename"
:
"Drive@2x.png
"
,
"
scale"
:
"2x
"
},
{
"idiom"
:
"universal"
,
"
scale"
:
"3x
"
,
"
filename"
:
"Drive@3x.png
"
"
filename"
:
"Drive@3x.png
"
,
"
scale"
:
"3x
"
}
],
"info"
:
{
"version"
:
1
,
"author"
:
"xcode"
},
"properties"
:
{
"template-rendering-intent"
:
"template"
}
}
\ No newline at end of file
vlc-ios/Images.xcassets/cloudServices/DriveWhite.imageset/Contents.json
View file @
e95d821d
...
...
@@ -2,22 +2,25 @@
"images"
:
[
{
"idiom"
:
"universal"
,
"
scale"
:
"1x
"
,
"
filename"
:
"DriveWhite.png
"
"
filename"
:
"DriveWhite.png
"
,
"
scale"
:
"1x
"
},
{
"idiom"
:
"universal"
,
"
scale"
:
"2x
"
,
"
filename"
:
"DriveWhite@2x.png
"
"
filename"
:
"DriveWhite@2x.png
"
,
"
scale"
:
"2x
"
},
{
"idiom"
:
"universal"
,
"
scale"
:
"3x
"
,
"
filename"
:
"DriveWhite@3x.png
"
"
filename"
:
"DriveWhite@3x.png
"
,
"
scale"
:
"3x
"
}
],
"info"
:
{
"version"
:
1
,
"author"
:
"xcode"
},
"properties"
:
{
"template-rendering-intent"
:
"template"
}
}
\ No newline at end of file
vlc-ios/Images.xcassets/cloudServices/Dropbox.imageset/Contents.json
View file @
e95d821d
...
...
@@ -2,22 +2,25 @@
"images"
:
[
{
"idiom"
:
"universal"
,
"
scale"
:
"1x
"
,
"
filename"
:
"Dropbox.png
"
"
filename"
:
"Dropbox.png
"
,
"
scale"
:
"1x
"
},
{
"idiom"
:
"universal"
,
"
scale"
:
"2x
"
,
"
filename"
:
"Dropbox@2x.png
"
"
filename"
:
"Dropbox@2x.png
"
,
"
scale"
:
"2x
"
},
{
"idiom"
:
"universal"
,
"
scale"
:
"3x
"
,
"
filename"
:
"Dropbox@3x.png
"
"
filename"
:
"Dropbox@3x.png
"
,
"
scale"
:
"3x
"
}
],
"info"
:
{
"version"
:
1
,
"author"
:
"xcode"
},
"properties"
:
{
"template-rendering-intent"
:
"template"
}
}
\ No newline at end of file
vlc-ios/Images.xcassets/cloudServices/OneDrive.imageset/Contents.json
View file @
e95d821d
...
...
@@ -2,22 +2,25 @@
"images"
:
[
{
"idiom"
:
"universal"
,
"
scale"
:
"1x
"
,
"
filename"
:
"OneDrive.png
"
"
filename"
:
"OneDrive.png
"
,
"
scale"
:
"1x
"
},
{
"idiom"
:
"universal"
,
"
scale"
:
"2x
"
,
"
filename"
:
"OneDrive@2x.png
"
"
filename"
:
"OneDrive@2x.png
"
,
"
scale"
:
"2x
"
},
{
"idiom"
:
"universal"
,
"
scale"
:
"3x
"
,
"
filename"
:
"OneDrive@3x.png
"
"
filename"
:
"OneDrive@3x.png
"
,
"
scale"
:
"3x
"
}
],
"info"
:
{
"version"
:
1
,
"author"
:
"xcode"
},
"properties"
:
{
"template-rendering-intent"
:
"template"
}
}
\ No newline at end of file
vlc-ios/Images.xcassets/cloudServices/OneDriveWhite.imageset/Contents.json
View file @
e95d821d
...
...
@@ -2,22 +2,25 @@
"images"
:
[
{
"idiom"
:
"universal"
,
"
scale"
:
"1x
"
,
"
filename"
:
"OneDriveWhite.png
"
"
filename"
:
"OneDriveWhite.png
"
,
"
scale"
:
"1x
"
},
{
"idiom"
:
"universal"
,
"
scale"
:
"2x
"
,
"
filename"
:
"OneDriveWhite@2x.png
"
"
filename"
:
"OneDriveWhite@2x.png
"
,
"
scale"
:
"2x
"
},
{
"idiom"
:
"universal"
,
"
scale"
:
"3x
"
,
"
filename"
:
"OneDriveWhite@3x.png
"
"
filename"
:
"OneDriveWhite@3x.png
"
,
"
scale"
:
"3x
"
}
],
"info"
:
{
"version"
:
1
,
"author"
:
"xcode"
},
"properties"
:
{
"template-rendering-intent"
:
"template"
}
}
\ No newline at end of file
vlc-ios/Images.xcassets/cloudServices/dropbox-white.imageset/Contents.json
View file @
e95d821d
...
...
@@ -2,22 +2,25 @@
"images"
:
[
{
"idiom"
:
"universal"
,
"
scale"
:
"1x
"
,
"
filename"
:
"dropbox-white.png
"
"
filename"
:
"dropbox-white.png
"
,
"
scale"
:
"1x
"
},
{
"idiom"
:
"universal"
,
"
scale"
:
"2x
"
,
"
filename"
:
"dropbox-white@2x.png
"
"
filename"
:
"dropbox-white@2x.png
"
,
"
scale"
:
"2x
"
},
{
"idiom"
:
"universal"
,
"
scale"
:
"3x
"
,
"
filename"
:
"dropbox-white@3x.png
"
"
filename"
:
"dropbox-white@3x.png
"
,
"
scale"
:
"3x
"
}
],
"info"
:
{
"version"
:
1
,
"author"
:
"xcode"
},
"properties"
:
{
"template-rendering-intent"
:
"template"
}
}
\ No newline at end of file
vlc-ios/Images.xcassets/cloudServices/iCloud.imageset/Contents.json
View file @
e95d821d
...
...
@@ -2,22 +2,25 @@
"images"
:
[
{
"idiom"
:
"universal"
,
"
scale"
:
"1x
"
,
"
filename"
:
"iCloud.png
"
"
filename"
:
"iCloud.png
"
,
"
scale"
:
"1x
"
},
{
"idiom"
:
"universal"
,
"
scale"
:
"2x
"
,
"
filename"
:
"iCloud@2x.png
"
"
filename"
:
"iCloud@2x.png
"
,
"
scale"
:
"2x
"
},
{
"idiom"
:
"universal"
,
"
scale"
:
"3x
"
,
"
filename"
:
"iCloud@3x.png
"
"
filename"
:
"iCloud@3x.png
"
,
"
scale"
:
"3x
"
}
],
"info"
:
{
"version"
:
1
,
"author"
:
"xcode"
},
"properties"
:
{
"template-rendering-intent"
:
"template"
}
}
\ No newline at end of file
vlc-ios/Images.xcassets/cloudServices/iCloudIcon.imageset/Contents.json
View file @
e95d821d
...
...
@@ -2,22 +2,25 @@
"images"
:
[
{
"idiom"
:
"universal"
,
"
scale"
:
"1x
"
,
"
filename"
:
"iCloudIcon.png
"
"
filename"
:
"iCloudIcon.png
"
,
"
scale"
:
"1x
"
},
{
"idiom"
:
"universal"
,
"
scale"
:
"2x
"
,
"
filename"
:
"iCloudIcon@2x.png
"
"
filename"
:
"iCloudIcon@2x.png
"
,
"
scale"
:
"2x
"
},
{
"idiom"
:
"universal"
,
"
scale"
:
"3x
"
,
"
filename"
:
"iCloudIcon@3x.png
"
"
filename"
:
"iCloudIcon@3x.png
"
,
"
scale"
:
"3x
"
}
],
"info"
:
{
"version"
:
1
,
"author"
:
"xcode"
},
"properties"
:
{
"template-rendering-intent"
:
"template"
}
}
\ No newline at end of file
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