Code style cleanup

Baseflow · Sep 30, 2019 · 14dd8e2 · 14dd8e2
1 parent d17a345
commit 14dd8e2
Show file tree

Hide file tree

Showing 58 changed files with 204 additions and 269 deletions.
diff --git a/Samples/MaterialMvvmSample.Android/Properties/AssemblyInfo.cs b/Samples/MaterialMvvmSample.Android/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Android.App;
 

diff --git a/Samples/MaterialMvvmSample.iOS/Main.cs b/Samples/MaterialMvvmSample.iOS/Main.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using Foundation;
-using UIKit;
+using UIKit;
 
 namespace MaterialMvvmSample.iOS
 {

diff --git a/Samples/MaterialMvvmSample.iOS/Properties/AssemblyInfo.cs b/Samples/MaterialMvvmSample.iOS/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 

diff --git a/Samples/MaterialMvvmSample.iOS/Renderers/MViewCellRenderer.cs b/Samples/MaterialMvvmSample.iOS/Renderers/MViewCellRenderer.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using Foundation;
-using MaterialMvvmSample.iOS.Renderers;
+using MaterialMvvmSample.iOS.Renderers;
 using UIKit;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.iOS;

diff --git a/Samples/MaterialMvvmSample/App.xaml.cs b/Samples/MaterialMvvmSample/App.xaml.cs
@@ -1,6 +1,5 @@
 using MaterialMvvmSample.Utilities;
 using MaterialMvvmSample.Views;
-using System;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 

diff --git a/Samples/MaterialMvvmSample/Controls/CustomNavigationPage.cs b/Samples/MaterialMvvmSample/Controls/CustomNavigationPage.cs
@@ -1,8 +1,8 @@
-using MaterialMvvmSample.Utilities;
-using MaterialMvvmSample.ViewModels;
-using System;
+using System;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
+using MaterialMvvmSample.Utilities;
+using MaterialMvvmSample.ViewModels;
 using Xamarin.Forms;
 using XF.Material.Forms.UI;
 

diff --git a/Samples/MaterialMvvmSample/Utilities/NavigationService.cs b/Samples/MaterialMvvmSample/Utilities/NavigationService.cs
@@ -1,5 +1,5 @@
-using MaterialMvvmSample.Controls;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
+using MaterialMvvmSample.Controls;
 using Xamarin.Forms;
 
 namespace MaterialMvvmSample.Utilities

diff --git a/Samples/MaterialMvvmSample/ViewModels/MainViewModel.cs b/Samples/MaterialMvvmSample/ViewModels/MainViewModel.cs
@@ -1,12 +1,12 @@
-using MaterialMvvmSample.Utilities.Dialogs;
-using MaterialMvvmSample.Views;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Input;
+using MaterialMvvmSample.Utilities.Dialogs;
+using MaterialMvvmSample.Views;
 using Xamarin.Forms;
 using Xamarin.Forms.Internals;
 using XF.Material.Forms.Models;
@@ -96,7 +96,7 @@ public bool HasError
             "San Miguel Corporation",
             "YNGEN Holdings Inc.",
             "ERNI Development Center Philippines, Inc., Bern, Switzerland"
-        }; 
+        };
 
         public ICommand JobSelectedCommand => new Command<string>(async (s) => await this.ViewItemSelected(s));
 
@@ -146,29 +146,29 @@ private async Task ListMenuSelected(MaterialMenuResult s)
             switch (s.Index)
             {
                 case 0:
-                {
-                    var result = await _dialogService.AddNewJob();
-
-                    if (this.Models.Any(m => m.Title == result))
-                    {
-                        await _dialogService.AlertExistingJob(result);
-                    }
-                    else if (!string.IsNullOrEmpty(result))
                     {
-                        this.Models.Where(m => m.IsNew).ForEach(m => m.IsNew = false);
+                        var result = await _dialogService.AddNewJob();
 
-                        var model = new TestModel
+                        if (this.Models.Any(m => m.Title == result))
                         {
-                            Title = result,
-                            Id = Guid.NewGuid().ToString("N"),
-                            IsNew = true
-                        };
+                            await _dialogService.AlertExistingJob(result);
+                        }
+                        else if (!string.IsNullOrEmpty(result))
+                        {
+                            this.Models.Where(m => m.IsNew).ForEach(m => m.IsNew = false);
 
-                        this.Models.Add(model);
-                    }
+                            var model = new TestModel
+                            {
+                                Title = result,
+                                Id = Guid.NewGuid().ToString("N"),
+                                IsNew = true
+                            };
 
-                    break;
-                }
+                            this.Models.Add(model);
+                        }
+
+                        break;
+                    }
                 case 1:
                     this.Models = new ObservableCollection<TestModel>(this.Models.OrderBy(m => m.Title));
                     break;
@@ -192,35 +192,35 @@ private async Task MenuSelected(MaterialMenuResult i)
             switch (i.Index)
             {
                 case 0:
-                {
-                    if (model != null)
                     {
-                        var result = await _dialogService.EditJob(model.Title);
-
-                        if (!string.IsNullOrEmpty(result))
+                        if (model != null)
                         {
-                            model.Title = result;
+                            var result = await _dialogService.EditJob(model.Title);
+
+                            if (!string.IsNullOrEmpty(result))
+                            {
+                                model.Title = result;
+                            }
                         }
-                    }
 
-                    break;
-                }
+                        break;
+                    }
                 case 1:
-                {
-                    if (model != null)
                     {
-                        var confirmed = await _dialogService.DeleteJob(model.Title);
-
-                        if (confirmed == true)
+                        if (model != null)
                         {
-                            this.Models.Remove(model);
+                            var confirmed = await _dialogService.DeleteJob(model.Title);
 
-                            await _dialogService.JobDeleted();
+                            if (confirmed == true)
+                            {
+                                this.Models.Remove(model);
+
+                                await _dialogService.JobDeleted();
+                            }
                         }
-                    }
 
-                    break;
-                }
+                        break;
+                    }
             }
         }
     }

diff --git a/Samples/MaterialMvvmSample/ViewModels/SecondViewModel.cs b/Samples/MaterialMvvmSample/ViewModels/SecondViewModel.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace MaterialMvvmSample.ViewModels
+namespace MaterialMvvmSample.ViewModels
 {
     public class SecondViewModel : BaseViewModel
     {

diff --git a/Samples/MaterialMvvmSample/Views/MainView.xaml.cs b/Samples/MaterialMvvmSample/Views/MainView.xaml.cs
@@ -1,14 +1,5 @@
 using MaterialMvvmSample.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading.Tasks;
-using Xamarin.Forms;
-using XF.Material.Forms;
 using Xamarin.Forms.Xaml;
-using XF.Material.Forms.UI;
-using XF.Material.Forms.UI.Dialogs;
-using Xamarin.Forms.Internals;
 
 namespace MaterialMvvmSample.Views
 {

diff --git a/Samples/MaterialMvvmSample/Views/SecondView.xaml.cs b/Samples/MaterialMvvmSample/Views/SecondView.xaml.cs
@@ -4,13 +4,13 @@
 namespace MaterialMvvmSample.Views
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
-	public partial class SecondView : BaseSecondView
+    public partial class SecondView : BaseSecondView
     {
-		public SecondView ()
-		{
-			this.InitializeComponent ();
-		}
-	}
+        public SecondView()
+        {
+            this.InitializeComponent();
+        }
+    }
 
     public abstract class BaseSecondView : BaseView<SecondViewModel> { }
 }
diff --git a/XF.Material/FormsResources/MaterialColorConfiguration.cs b/XF.Material/FormsResources/MaterialColorConfiguration.cs
@@ -165,7 +165,7 @@ public Color Secondary
             {
                 var color = (Color)this.GetValue(SecondaryProperty);
 
-                if(color.IsDefault && this.Primary.IsDefault)
+                if (color.IsDefault && this.Primary.IsDefault)
                 {
                     return Color.Accent;
                 }

diff --git a/XF.Material/FormsResources/MaterialConfiguration.cs b/XF.Material/FormsResources/MaterialConfiguration.cs
@@ -24,7 +24,7 @@ public class MaterialConfiguration : BindableObject
         /// </summary>
         public MaterialFontConfiguration FontConfiguration
         {
-            get => (MaterialFontConfiguration) this.GetValue(FontConfigurationProperty);
+            get => (MaterialFontConfiguration)this.GetValue(FontConfigurationProperty);
             set => this.SetValue(FontConfigurationProperty, value);
         }
 
@@ -33,7 +33,7 @@ public MaterialFontConfiguration FontConfiguration
         /// </summary>
         public MaterialColorConfiguration ColorConfiguration
         {
-            get => (MaterialColorConfiguration) this.GetValue(ColorConfigurationProperty);
+            get => (MaterialColorConfiguration)this.GetValue(ColorConfigurationProperty);
             set => this.SetValue(ColorConfigurationProperty, value);
         }
     }

diff --git a/XF.Material/FormsResources/MaterialSizes.xaml.cs b/XF.Material/FormsResources/MaterialSizes.xaml.cs
@@ -4,11 +4,11 @@
 namespace XF.Material.Forms.Resources
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
-	public partial class MaterialSizes : ResourceDictionary
-	{
-		public MaterialSizes ()
-		{
-			this.InitializeComponent ();
-		}
-	}
+    public partial class MaterialSizes : ResourceDictionary
+    {
+        public MaterialSizes()
+        {
+            this.InitializeComponent();
+        }
+    }
 }
diff --git a/XF.Material/Platforms/Android/Material.cs b/XF.Material/Platforms/Android/Material.cs
@@ -1,11 +1,11 @@
-using Android.App;
+using System;
+using System.Linq;
+using Android.App;
 using Android.Content;
 using Android.OS;
 using Android.Support.V7.App;
 using Rg.Plugins.Popup;
 using Rg.Plugins.Popup.Services;
-using System;
-using System.Linq;
 using XF.Material.Forms.UI.Dialogs;
 
 namespace XF.Material.Droid

diff --git a/XF.Material/Platforms/Android/MaterialHelper.cs b/XF.Material/Platforms/Android/MaterialHelper.cs
@@ -1,5 +1,4 @@
-using Android.App;
-using Android.Content;
+using System;
 using Android.Content.Res;
 using Android.Graphics;
 using Android.Graphics.Drawables;
@@ -8,9 +7,6 @@
 using Android.Support.V4.Graphics.Drawable;
 using Android.Support.V4.View;
 using Android.Util;
-using Android.Views.InputMethods;
-using Android.Widget;
-using System;
 using Xamarin.Forms.Platform.Android;
 
 namespace XF.Material.Droid

diff --git a/XF.Material/Platforms/Android/Renderers/Internals/MaterialDatePickerRenderer.cs b/XF.Material/Platforms/Android/Renderers/Internals/MaterialDatePickerRenderer.cs
@@ -1,18 +1,10 @@
-using Android.App;
+using System.ComponentModel;
 using Android.Content;
 using Android.Graphics.Drawables;
-using Android.Runtime;
-using Android.Support.V4.Content;
-using Android.Views;
-using Android.Views.InputMethods;
-using Android.Widget;
-using System.ComponentModel;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
 using XF.Material.Droid.Renderers.Internals;
 using XF.Material.Forms.UI.Internals;
-using static Android.Text.TextUtils;
-using static Android.Widget.TextView;
 
 [assembly: ExportRenderer(typeof(MaterialDatePicker), typeof(MaterialDatePickerRenderer))]
 namespace XF.Material.Droid.Renderers.Internals
@@ -36,12 +28,12 @@ protected override void OnElementChanged(ElementChangedEventArgs<Xamarin.Forms.D
 
         protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            base.OnElementPropertyChanged(sender, e);  
+            base.OnElementPropertyChanged(sender, e);
         }
 
         private void SetControl()
         {
-            if(this.Control == null)
+            if (this.Control == null)
             {
                 return;
             }
@@ -53,7 +45,7 @@ private void SetControl()
 
             var layoutParams = new MarginLayoutParams(this.Control.LayoutParameters);
             layoutParams.SetMargins(0, 0, 0, 0);
-            this.Control.LayoutParameters = layoutParams;            
-        }        
+            this.Control.LayoutParameters = layoutParams;
+        }
     }
 }
diff --git a/XF.Material/Platforms/Android/Renderers/Internals/MaterialElementRenderer.cs b/XF.Material/Platforms/Android/Renderers/Internals/MaterialElementRenderer.cs
@@ -11,18 +11,18 @@ namespace XF.Material.Droid.Renderers.Internals
 {
     internal class MaterialElementRenderer : ViewRenderer<View, Android.Views.View>
     {
-        public MaterialElementRenderer(Context context): base(context) { }
+        public MaterialElementRenderer(Context context) : base(context) { }
 
         protected override void OnElementChanged(ElementChangedEventArgs<View> e)
         {
             base.OnElementChanged(e);
 
-            if(e?.OldElement != null)
+            if (e?.OldElement != null)
             {
                 (this.Element as IMaterialElementConfiguration)?.ElementChanged(false);
             }
 
-            if(e?.NewElement != null)
+            if (e?.NewElement != null)
             {
                 (this.Element as IMaterialElementConfiguration)?.ElementChanged(true);
             }