Update XLFormRowDescriptor.m to support <Class>.self for custom cells (#1041)

Author: bagatte

XLForm/XL/Descriptors/XLFormRowDescriptor.m

@@ -119,40 +119,42 @@ +(instancetype)formRowDescriptorWithTag:(NSString *)tag rowType:(NSString *)rowT
 
 -(XLFormBaseCell *)cellForFormController:(XLFormViewController * __unused)formController
 {
-    if (!_cell){
+    if (!_cell) {
         id cellClass = self.cellClass ?: [XLFormViewController cellClassesForRowDescriptorTypes][self.rowType];
+        
+        NSBundle *bundle = [NSBundle mainBundle];
+        NSString *cellClassString = cellClass;
+        NSString *cellResource = nil;
+        
         NSAssert(cellClass, @"Not defined XLFormRowDescriptorType: %@", self.rowType ?: @"");
+        
         if ([cellClass isKindOfClass:[NSString class]]) {
-            NSString *cellClassString = cellClass;
-            NSString *cellResource = nil;
-            NSBundle *bundle = nil;
             if ([cellClassString rangeOfString:@"/"].location != NSNotFound) {
                 NSArray *components = [cellClassString componentsSeparatedByString:@"/"];
                 cellResource = [components lastObject];
                 NSString *folderName = [components firstObject];
                 NSString *bundlePath = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:folderName];
                 bundle = [NSBundle bundleWithPath:bundlePath];
             } else {
-                bundle = [NSBundle bundleForClass:NSClassFromString(cellClass)];
-                cellResource = cellClassString;
-                if ([cellClassString rangeOfString:@"."].location != NSNotFound) {
-                    NSArray *components = [cellClassString componentsSeparatedByString:@"."];
-                    cellResource = [components lastObject];
-                }
-            }
-            NSParameterAssert(bundle != nil);
-            NSParameterAssert(cellResource != nil);
-            
-            if ([bundle pathForResource:cellResource ofType:@"nib"]){
-                _cell = [[bundle loadNibNamed:cellResource owner:nil options:nil] firstObject];
+                cellResource = [cellClassString componentsSeparatedByString:@"."].lastObject;
             }
+        } else {
+            cellResource = [NSStringFromClass(cellClass) componentsSeparatedByString:@"."].lastObject;
+        }
+        
+        if ([bundle pathForResource:cellResource ofType:@"nib"]) {
+            _cell = [[bundle loadNibNamed:cellResource owner:nil options:nil] firstObject];
         } else {
             _cell = [[cellClass alloc] initWithStyle:self.cellStyle reuseIdentifier:nil];
         }
+        
         _cell.rowDescriptor = self;
+        
         NSAssert([_cell isKindOfClass:[XLFormBaseCell class]], @"UITableViewCell must extend from XLFormBaseCell");
+        
         [self configureCellAtCreationTime];
     }
+    
     return _cell;
 }