fix

brandFromNSK · Apr 19, 2018 · 8895e46 · 8895e46
1 parent 1e162c9
commit 8895e46
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/Classes/MVVM/IDMVVMTableModule/Contractor/IDMVVMTableContractor.m b/Classes/MVVM/IDMVVMTableModule/Contractor/IDMVVMTableContractor.m
@@ -81,9 +81,9 @@ - (void)registerReusableCellWithCellViewModels:(NSArray<id<IDCellViewModelProtoc
         if ([[NSBundle mainBundle] pathForResource:reusableIdentifier ofType:@"nib"] != nil) {
             UINib *cellNib = [UINib nibWithNibName:reusableIdentifier bundle:nil];
 
-            NSArray* nibViews = [[NSBundle mainBundle] loadNibNamed:reusableIdentifier
-                                                              owner:self
-                                                            options:nil];
+            NSArray* nibViews = [[NSBundle bundleForClass:cellClass] loadNibNamed:reusableIdentifier
+                                                                            owner:self
+                                                                          options:nil];
 
             if (nibViews.firstObject) {
                 [self.tableView registerNib:cellNib forCellReuseIdentifier:reusableIdentifier];

diff --git a/...VVM/Elements/IDEmpty/View/IDEmptyCell.xib → Classes/NIBs/IDEmptyCell.xib b/...VVM/Elements/IDEmpty/View/IDEmptyCell.xib → Classes/NIBs/IDEmptyCell.xib
diff --git a/.../MVVM/Elements/IDInfo/View/IDInfoCell.xib → Classes/NIBs/IDInfoCell.xib b/.../MVVM/Elements/IDInfo/View/IDInfoCell.xib → Classes/NIBs/IDInfoCell.xib
diff --git a/...ption/View/IDRightSideDescriptionCell.xib → Classes/NIBs/IDRightSideDescriptionCell.xib b/...ption/View/IDRightSideDescriptionCell.xib → Classes/NIBs/IDRightSideDescriptionCell.xib
diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
@@ -196,6 +196,7 @@
 		551F0CEE2086066200F3A443 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				55DFE0022088B6AF00C42170 /* NIBs */,
 				55DFDFD92087415F00C42170 /* IDTableModuleCoreMVVM.h */,
 				551F0D842086093400F3A443 /* JVFloatLabeledTextField_v1.2.1 */,
 				551F0D8E208609FF00F3A443 /* Categories */,
@@ -298,7 +299,6 @@
 			children = (
 				551F0D0E208606AF00F3A443 /* IDEmptyCell.h */,
 				551F0D0D208606AF00F3A443 /* IDEmptyCell.m */,
-				551F0D0F208606AF00F3A443 /* IDEmptyCell.xib */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -325,7 +325,6 @@
 			isa = PBXGroup;
 			children = (
 				551F0D1D208606AF00F3A443 /* IDInfoCell.h */,
-				551F0D1E208606AF00F3A443 /* IDInfoCell.xib */,
 				551F0D1F208606AF00F3A443 /* IDInfoCell.m */,
 			);
 			path = View;
@@ -353,7 +352,6 @@
 			isa = PBXGroup;
 			children = (
 				551F0D25208606AF00F3A443 /* IDRightSideDescriptionCell.h */,
-				551F0D26208606AF00F3A443 /* IDRightSideDescriptionCell.xib */,
 				551F0D27208606AF00F3A443 /* IDRightSideDescriptionCell.m */,
 			);
 			path = View;
@@ -538,6 +536,16 @@
 			path = SectionViewModel;
 			sourceTree = "<group>";
 		};
+		55DFE0022088B6AF00C42170 /* NIBs */ = {
+			isa = PBXGroup;
+			children = (
+				551F0D0F208606AF00F3A443 /* IDEmptyCell.xib */,
+				551F0D1E208606AF00F3A443 /* IDInfoCell.xib */,
+				551F0D26208606AF00F3A443 /* IDRightSideDescriptionCell.xib */,
+			);
+			path = NIBs;
+			sourceTree = "<group>";
+		};
 		60B25F54650F3AE2C789DF5A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (

diff --git a/IDTableModuleCore.podspec b/IDTableModuleCore.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'IDTableModuleCore'
-  s.version          = '0.0.5'
+  s.version          = '0.0.6'
   s.summary          = 'IDTableModuleCore created for easy module configuration based on UITableView'
 
 # This description is used to generate tags and improve search results.
@@ -27,7 +27,9 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '9.0'
 
   s.source_files = 'Classes/**/*.{h,m}'
-  s.resource_bundles = 'Classes/**/*.xib'
+  s.resource_bundles = {
+	'{podName}' => ['{podName}/Classes/NIBs/*.xib']
+  }
 
   # s.public_header_files = 'Pod/Classes/**/*.h'
   # s.frameworks = 'UIKit', 'MapKit'