Empty view for media library view #29

mkchoi212 · 2018-04-09T06:18:54Z

Nothing much to it!
Just displays the empty view when the media controller is empty 😄
Please note that I made some adjustments to the UI as I saw fit to the new UI.

carolanitz

really unsure of the if (self) block. I don't think that's how you would initialize this view

carolanitz · 2018-04-09T07:37:02Z

Sources/VLCLibraryViewController.m

@@ -39,6 +40,20 @@

 @implementation EmptyLibraryView

+- (id)initWithFrame:(CGRect)frame isInFolder:(bool)inFolder


The inFolder bool can go, we won't have folders anymore

Can I go ahead and delete all localized strings for FOLDER_EMPTY and FOLDER_EMPTY_LONG?

carolanitz · 2018-04-09T07:37:57Z

Sources/VLCLibraryViewController.m

+{
+    if (self) {
+        NSArray *subviewArray = [[NSBundle mainBundle] loadNibNamed:@"VLCEmptyLibraryView" owner:self options:nil];
+        self = [subviewArray objectAtIndex:0];


you should always use .firstObject because it will give you nil if there are not subviews.
Right now this would crash if something goes wrong with loading the Nib

This doesn't look correct to me. Shouldn't it be if (!self) and then you initialize? I need to take another look but it feels to me like this code doesn't belong here as well

My 5 cents:
Usually override of init require call
self = [super init];
In this case self will be setup properly and we need to check for "if (self)".
In case if we need load view from xib file the common solution is to make static method to do this. For example:

+ (instanceType)emptyLibraryViewInFolder:(bool)inFolder { NSArray *subviewArray = [[NSBundle mainBundle] loadNibNamed:@"VLCEmptyLibraryView" owner:self options:nil]; EmptyLibraryView *result = subviewArray.firstObject; [result setupEmptyValuesInFolder:inFolder]; return result; } - (void)setupEmptyValuesInFolder:(bool)inFolder { _emptyLibraryLabel.text = inFolder ? NSLocalizedString(@"FOLDER_EMPTY", nil) : NSLocalizedString(@"EMPTY_LIBRARY", nil); _emptyLibraryLongDescriptionLabel.text = inFolder ? NSLocalizedString(@"FOLDER_EMPTY_LONG", nil) : NSLocalizedString(@"EMPTY_LIBRARY_LONG", nil); [_learnMoreButton setTitle:NSLocalizedString(@"BUTTON_LEARN_MORE", nil) forState:UIControlStateNormal]; _learnMoreButton.hidden = inFolder; }

thumbs up for the mentioning of super

carolanitz · 2018-04-09T07:40:11Z

SharedSources/MediaDataSource.swift

@@ -27,7 +28,13 @@ public class MediaDataSourceAndDelegate:NSObject, UICollectionViewDataSource, UI
    }

    public func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return Int(services.mediaDataSource.numberOfFiles())
+        let numItems = Int(services.mediaDataSource.numberOfFiles())
+        if numItems == 0 {


can we write
Bool hasMedia = numItems > 0
collectionView.backgroundView?.isHidden = hasMedia

dcordero · 2018-04-09T18:11:39Z

Sources/MediaViewController.swift

@@ -53,6 +54,7 @@ public class VLCMediaViewController: UICollectionViewController, UISearchResults
        setupCollectionView()
        setupSearchController()
        setupNavigationBar()
+        setUpEmptyBackgroundView()


setUp vs setup

I do not have any preference among them, but just because of karma I think they should be all the same.

Oh I didn't even notice that. Thanks @dcordero

carolanitz · 2018-04-10T12:21:21Z

SharedSources/MediaDataSource.swift

-        return Int(services.mediaDataSource.numberOfFiles())
+        let numItems = Int(services.mediaDataSource.numberOfFiles())
+        let hasMedia = numItems > 0
+        collectionView.backgroundView?.isHidden = hasMedia


This code shouldn't go here. A view should not be modified from a model class

we should also consider not just hiding the emptyview but consider removing it. It might lead to side effects having this view still in the view hierarchy

carolanitz · 2018-04-10T12:22:47Z

VLC-iOS-Bridging-Header.h

@@ -9,6 +9,7 @@
 #import "VLCConstants.h"
 #import "VLCDownloadViewController.h"
 #import "VLCLibrarySearchDisplayDataSource.h"
+#import "VLCLibraryViewController.h"


Why do you need the LibraryViewController?

VLCLibraryViewController.h is where EmptyLibraryView is declared and used within VLCLibraryViewController.h. Maybe writing a new version of it in Swift is beneficial in the long run?

Yes I think it should be taken out since VLCLibraryViewController will be removed "soon".

It shouldn't have been declared in the LibraryViewController in the first place. It needs to live in it's own file. You don't have to write a new version in Swift, just move it into it's own class via copy paste :)

carolanitz · 2018-04-10T12:27:55Z

Apple-TV/VLCServerBrowsingTVViewController.m

@@ -48,7 +48,7 @@ - (void)viewDidLoad
 {
    [super viewDidLoad];

-    self.nothingFoundLabel.text = NSLocalizedString(@"FOLDER_EMPTY", nil);


I wouldn't change any AppleTV related code in this PR

carolanitz · 2018-04-10T12:30:36Z

Sources/VLCLibraryViewController.m

@@ -406,8 +406,8 @@ - (void)_displayEmptyLibraryViewIfNeeded

    if ([_mediaDataSource numberOfFiles] == 0) {
        _inFolder = (_libraryMode == VLCLibraryModeFolder || _libraryMode == VLCLibraryModeCreateFolder);


the VLCLibrarycontroller doesn't need to be touched here. It's gonna be deleted anyway

carolanitz · 2018-04-10T16:26:53Z

Sources/VLCLibraryViewController.h

@@ -37,6 +37,7 @@
 @property (nonatomic, strong) IBOutlet UIActivityIndicatorView *activityIndicator;
 @property (nonatomic, strong) IBOutlet UIButton *learnMoreButton;

+- (id)initWithFrame:(CGRect)frame;


doesn't need to be defined since EmptyView is a UIView subclass

carolanitz · 2018-04-10T16:34:52Z

Sources/VLCLibraryViewController.m

+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        NSArray *subviewArray = [[NSBundle mainBundle] loadNibNamed:@"VLCEmptyLibraryView" owner:self options:nil];


initiWithFrame is actually the wrong place to load from the nib. You should take a look how it's done everywhere else. You're also calling super and assigning it to self, then checking for nil and then assigning self = subviewArray.firstObject; without having the nil check again. I missed that the first time this needs to be done differently

carolanitz · 2018-04-10T16:37:50Z

SharedSources/MediaDataSource.swift

-        return Int(services.mediaDataSource.numberOfFiles())
+        let numItems = Int(services.mediaDataSource.numberOfFiles())
+        let hasMedia = numItems > 0
+        collectionView.backgroundView?.isHidden = hasMedia


we should also consider not just hiding the emptyview but consider removing it. It might lead to side effects having this view still in the view hierarchy

carolanitz · 2018-04-21T14:36:10Z

Sources/MediaViewController.swift

@@ -105,6 +109,19 @@ public class VLCMediaViewController: UICollectionViewController, UISearchResults
    func setupNavigationBar() {
        navigationItem.leftBarButtonItem = UIBarButtonItem(title: NSLocalizedString("SORT", comment: ""), style: .plain, target: self, action: #selector(sort))
    }
+
+    func setupEmptyBackgroundView() {
+        emptyView = VLCEmptyLibraryView.init()


you shouldn't have the init() here and should instantiate the View here from the nib

carolanitz · 2018-04-21T14:38:02Z

Sources/MediaViewController.swift

@@ -19,6 +20,7 @@ import Foundation

 public class VLCMediaViewController: UICollectionViewController, UISearchResultsUpdating, UISearchControllerDelegate {
    private var services: Services
+    private var emptyView: VLCEmptyLibraryView?


I think you can use a lazy var here and do the instantiation here

carolanitz · 2018-04-21T14:41:47Z

Sources/MediaViewController.swift

+    }
+
+    func displayEmptyViewIfNeeded() {
+        guard let view = emptyView, collectionView?.numberOfItems(inSection: 0) == 0 else {


since the emptyview will be lazy it's not optional anymore and you can simply write
collectionView?.backgroundView = collectionView?.numberOfItems(inSection: 0) == 0 ? emptyView : nil

carolanitz · 2018-04-21T14:52:50Z

Sources/VLCEmptyLibraryView.m

+
+@implementation VLCEmptyLibraryView
+
+ (instancetype)init


This should probably be initWithCoder and you shouldn't have an instance of VLCEmptyView in it's own init, also no asserts but give the view in the xib an identifier and you load the nib with identifier

that should remove the whole looking through subviews and you just got one instance but this code belongs in the mediaviewcontroller. Also New Classes should be in Swift 😀

carolanitz · 2018-04-21T15:00:08Z

Sources/VLCEmptyLibraryView.m

+    NSAssert([[subviews firstObject] isKindOfClass:[VLCEmptyLibraryView class]], @"Loaded VLCEmptyLibraryView nib is invalid");
+
+    VLCEmptyLibraryView *view = subviews.firstObject;
+    view.emptyLibraryLabel.text = NSLocalizedString(@"EMPTY_LIBRARY", nil);


you should move this code in override awakeFromNib()

carolanitz · 2018-04-22T14:26:43Z

Sources/MediaViewController.swift

+    lazy var emptyView: VLCEmptyLibraryView = {
+        let name = String(describing: VLCEmptyLibraryView.self)
+        let nib = Bundle.main.loadNibNamed(name, owner: self, options: nil)
+        guard let emptyView = nib?.first as? VLCEmptyLibraryView else { fatalError("Can't find nib for \(name)") }


I don't think we need to crash the app if we can't display an emptyview. An assertion and returning a UIView would've been just as fine

Note this uses pre-existing VLCEmptyLibraryView Objective-C code

Minor changes to color of background and sizes of labels

Specifically `FOLDER_EMPTY_*`

carolanitz · 2018-04-25T23:31:03Z

merged with 6c1b909 & fbcf87b

carolanitz requested changes Apr 9, 2018

View reviewed changes

dcordero reviewed Apr 9, 2018

View reviewed changes

mkchoi212 force-pushed the empty-view branch from aeb30c4 to 4542080 Compare April 9, 2018 19:39

carolanitz requested changes Apr 10, 2018

View reviewed changes

carolanitz reviewed Apr 10, 2018

View reviewed changes

carolanitz requested changes Apr 10, 2018

View reviewed changes

mkchoi212 force-pushed the empty-view branch 6 times, most recently from 224352f to 0651009 Compare April 18, 2018 19:19

mkchoi212 force-pushed the empty-view branch from 0651009 to e1da98b Compare April 19, 2018 22:22

carolanitz requested changes Apr 21, 2018

View reviewed changes

carolanitz reviewed Apr 21, 2018

View reviewed changes

mkchoi212 force-pushed the empty-view branch from e1da98b to d73f8bb Compare April 22, 2018 00:29

carolanitz reviewed Apr 22, 2018

View reviewed changes

carolanitz approved these changes Apr 22, 2018

View reviewed changes

mkchoi212 added 3 commits April 22, 2018 13:23

[UI] Include empty view for media controllers

24ff2ae

Note this uses pre-existing VLCEmptyLibraryView Objective-C code

[UI] Adjust empty view to new UI

1bd9eef

Minor changes to color of background and sizes of labels

Remove references to old localization string

8f6e034

Specifically `FOLDER_EMPTY_*`

mkchoi212 force-pushed the empty-view branch from d73f8bb to 8f6e034 Compare April 22, 2018 18:23

carolanitz closed this Apr 25, 2018

Empty view for media library view #29

Empty view for media library view #29

mkchoi212 commented Apr 9, 2018

carolanitz left a comment

carolanitz Apr 9, 2018

mkchoi212 Apr 9, 2018

carolanitz Apr 9, 2018

carolanitz Apr 9, 2018

carolanitz Apr 9, 2018

Hruks Apr 9, 2018

carolanitz Apr 9, 2018

carolanitz Apr 9, 2018

dcordero Apr 9, 2018

mkchoi212 Apr 9, 2018

carolanitz Apr 10, 2018 •

edited

carolanitz Apr 10, 2018

carolanitz Apr 10, 2018

mkchoi212 Apr 10, 2018

Mikanbu Apr 10, 2018

carolanitz Apr 10, 2018

carolanitz Apr 10, 2018 •

edited

carolanitz Apr 10, 2018

carolanitz Apr 10, 2018

carolanitz Apr 10, 2018

carolanitz Apr 10, 2018

carolanitz Apr 21, 2018

carolanitz Apr 21, 2018

carolanitz Apr 21, 2018

carolanitz Apr 21, 2018

carolanitz Apr 21, 2018

carolanitz Apr 21, 2018

carolanitz Apr 22, 2018

carolanitz commented Apr 25, 2018

		@@ -39,6 +40,20 @@

		@implementation EmptyLibraryView

		- (id)initWithFrame:(CGRect)frame isInFolder:(bool)inFolder

		@@ -406,8 +406,8 @@ - (void)_displayEmptyLibraryViewIfNeeded

		if ([_mediaDataSource numberOfFiles] == 0) {
		_inFolder = (_libraryMode == VLCLibraryModeFolder \|\| _libraryMode == VLCLibraryModeCreateFolder);

Empty view for media library view #29

Empty view for media library view #29

Conversation

mkchoi212 commented Apr 9, 2018

carolanitz left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

carolanitz Apr 10, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

carolanitz Apr 10, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

carolanitz commented Apr 25, 2018

carolanitz Apr 10, 2018 •

edited

carolanitz Apr 10, 2018 •

edited