Merge pull request #3314 from paulppn/fix/ios_simple_table_view

Fixed the MvxSimpleTableViewSource; now can work with both storyboard and xib-cells
MvvmCross · Mar 12, 2019 · 27d6579 · 27d6579
2 parents 32f1906 + 0efc6b3
commit 27d6579
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/MvvmCross/Platforms/Ios/Binding/Views/MvxSimpleTableViewSource.cs b/MvvmCross/Platforms/Ios/Binding/Views/MvxSimpleTableViewSource.cs
@@ -23,21 +23,17 @@ public MvxSimpleTableViewSource(IntPtr handle)
             MvxLog.Instance.Warn("MvxSimpleTableViewSource IntPtr constructor used - we expect this only to be called during memory leak debugging - see https://github.com/MvvmCross/MvvmCross/pull/467");
         }
 
-        public MvxSimpleTableViewSource(UITableView tableView, string cellIdentifier)
-            : base(tableView)
-        {
-            _cellIdentifier = new NSString(cellIdentifier);
-            tableView.RegisterNibForCellReuse(UINib.FromName(cellIdentifier, NSBundle.MainBundle), cellIdentifier);
-        }
-
         public MvxSimpleTableViewSource(UITableView tableView, string nibName, string cellIdentifier = null,
-                                        NSBundle bundle = null)
+                                        NSBundle bundle = null, bool registerNibForCellReuse = true)
             : base(tableView)
         {
             // if no cellIdentifier supplied, then use the nibName as cellId
             cellIdentifier = cellIdentifier ?? nibName;
             _cellIdentifier = new NSString(cellIdentifier);
-            tableView.RegisterNibForCellReuse(UINib.FromName(nibName, bundle ?? NSBundle.MainBundle), cellIdentifier);
+
+            if (registerNibForCellReuse) {
+                tableView.RegisterNibForCellReuse(UINib.FromName(nibName, bundle ?? NSBundle.MainBundle), cellIdentifier);
+            }
         }
 
         public MvxSimpleTableViewSource(UITableView tableView, Type cellType, string cellIdentifier = null)

diff --git a/MvvmCross/Platforms/Tvos/Binding/Views/MvxSimpleTableViewSource.cs b/MvvmCross/Platforms/Tvos/Binding/Views/MvxSimpleTableViewSource.cs
@@ -23,21 +23,17 @@ public MvxSimpleTableViewSource(IntPtr handle)
             MvxLog.Instance.Warn("MvxSimpleTableViewSource IntPtr constructor used - we expect this only to be called during memory leak debugging - see https://github.com/MvvmCross/MvvmCross/pull/467");
         }
 
-        public MvxSimpleTableViewSource(UITableView tableView, string cellIdentifier)
-            : base(tableView)
-        {
-            _cellIdentifier = new NSString(cellIdentifier);
-            tableView.RegisterNibForCellReuse(UINib.FromName(cellIdentifier, NSBundle.MainBundle), cellIdentifier);
-        }
-
         public MvxSimpleTableViewSource(UITableView tableView, string nibName, string cellIdentifier = null,
-                                        NSBundle bundle = null)
+                                        NSBundle bundle = null, bool registerNibForCellReuse = true)
             : base(tableView)
         {
             // if no cellIdentifier supplied, then use the nibName as cellId
             cellIdentifier = cellIdentifier ?? nibName;
             _cellIdentifier = new NSString(cellIdentifier);
-            tableView.RegisterNibForCellReuse(UINib.FromName(nibName, bundle ?? NSBundle.MainBundle), cellIdentifier);
+
+            if (registerNibForCellReuse) {
+                tableView.RegisterNibForCellReuse(UINib.FromName(nibName, bundle ?? NSBundle.MainBundle), cellIdentifier);
+            }
         }
 
         public MvxSimpleTableViewSource(UITableView tableView, Type cellType, string cellIdentifier = null)