Support other bundle than main MarkerView.viewFromXib() (ChartsOrg#3215)

* - Added optional in bundle to the viewFromXib() * Small styling fix * Keep only one method with Optional load from a bundle * Fixed new method signature in Obj-C Demo
fishbrain · Feb 20, 2018 · c5395c8 · c5395c8
1 parent ec1dc52
commit c5395c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ChartsDemo/Objective-C/Demos/RadarChartViewController.m b/ChartsDemo/Objective-C/Demos/RadarChartViewController.m
@@ -59,7 +59,7 @@ - (void)viewDidLoad
     _chartView.innerWebColor = UIColor.lightGrayColor;
     _chartView.webAlpha = 1.0;
 
-    RadarMarkerView *marker = (RadarMarkerView *)[RadarMarkerView viewFromXib];
+    RadarMarkerView *marker = (RadarMarkerView *)[RadarMarkerView viewFromXibIn:[NSBundle mainBundle]];
     marker.chartView = _chartView;
     _chartView.marker = marker;
 

diff --git a/Source/Charts/Components/MarkerView.swift b/Source/Charts/Components/MarkerView.swift
@@ -72,10 +72,10 @@ open class MarkerView: NSUIView, Marker
     }
 
     @objc
-    open class func viewFromXib() -> MarkerView?
+    open class func viewFromXib(in bundle: Bundle = .main) -> MarkerView?
     {
         #if !os(OSX)
-            return Bundle.main.loadNibNamed(
+            return bundle.loadNibNamed(
                 String(describing: self),
                 owner: nil,
                 options: nil)?[0] as? MarkerView
@@ -84,7 +84,7 @@ open class MarkerView: NSUIView, Marker
             var loadedObjects = NSArray()
             let loadedObjectsPointer = AutoreleasingUnsafeMutablePointer<NSArray?>(&loadedObjects)
 
-            if Bundle.main.loadNibNamed(
+            if bundle.loadNibNamed(
                 NSNib.Name(String(describing: self)),
                 owner: nil,
                 topLevelObjects: loadedObjectsPointer)