code reload fixes

AndreiMisiukevich · Apr 14, 2020 · 440a841 · 440a841
1 parent aa970ff
commit 440a841
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Reloader/Xamarin.Forms.HotReload.Reloader/HotReloader.cs b/Reloader/Xamarin.Forms.HotReload.Reloader/HotReloader.cs
@@ -612,7 +612,7 @@ private void ReloadElement(object obj, ReloadItem reloadItem, Type csharpType =
                 {
                     var prop = obj.GetType().GetProperty("HotReloadCtorParams", BindingFlags.Instance | BindingFlags.NonPublic)
                         ?? obj.GetType().GetProperty("HotReloadCtorParams", BindingFlags.Instance | BindingFlags.Public);
-                    var parameters = prop?.GetValue(obj) ?? new object[0];
+                    var parameters = (prop?.GetValue(obj) as object[]) ?? new object[0];
                     switch (obj)
                     {
                         case Page page:
@@ -685,7 +685,7 @@ private void ReloadElement(object obj, ReloadItem reloadItem, Type csharpType =
                     }
                 }
             }
-            catch
+            catch(Exception ex)
             {
                 Console.WriteLine("### HOTRELOAD ERROR: CANNOT RELOAD C# CODE ###");
             }
@@ -1178,7 +1178,7 @@ private void OnLoaded(object element, bool isReloaded)
                 {
                     var method = element.GetType().GetMethod("OnHotReloaded", BindingFlags.Instance | BindingFlags.NonPublic)
                         ?? element.GetType().GetMethod("OnHotReloaded", BindingFlags.Instance | BindingFlags.Public);
-                    method?.Invoke(element, null);
+                    method?.Invoke(element, new object[0]);
                 }
             }
             catch (Exception ex)

diff --git a/Sample/Xamarin.Forms.HotReload.Sample/Pages/CodePage.cs b/Sample/Xamarin.Forms.HotReload.Sample/Pages/CodePage.cs
@@ -14,7 +14,7 @@ public CodePage()
                     new Label {
                         VerticalOptions = LayoutOptions.CenterAndExpand,
                         HorizontalOptions = LayoutOptions.CenterAndExpand,
-                        Text = "Hello ContentPage!!!!!"
+                        Text = "Hello ContentPage!!!!"
                     }
                 }
             };

diff --git a/Sample/Xamarin.Forms.HotReload.Sample/Pages/ItemsPage.xaml b/Sample/Xamarin.Forms.HotReload.Sample/Pages/ItemsPage.xaml
@@ -17,7 +17,7 @@
                     color: red;
                     font-size: 20;
                 }
-            ]]>
+            ]]> 
         </StyleSheet>
 
         <StyleSheet Source="../Assets/styles.css" />
@@ -36,7 +36,7 @@
             SelectionMode="None"
             VerticalOptions="FillAndExpand"
             ItemTapped="OnItemTapped"
-            RowHeight="180"
+            RowHeight="180" 
             BackgroundColor="{StaticResource ListBgColor}"
             ItemsSource="{Binding Items}">
             <ListView.ItemTemplate>