Merge pull request #1988 from martijn00/StyleCop

StyleCop run on some issue's
MvvmCross · Jun 23, 2017 · b8b860e · b8b860e
2 parents 14b32ed + 2732ecf
commit b8b860e
Show file tree

Hide file tree

Showing 126 changed files with 488 additions and 243 deletions.
diff --git a/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Core.UI/MvxSwipeRefreshLayout.cs b/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Core.UI/MvxSwipeRefreshLayout.cs
@@ -37,7 +37,10 @@ public MvxSwipeRefreshLayout(Context context, IAttributeSet attributes)
 
         public ICommand RefreshCommand
         {
-            get { return _refreshCommand; }
+            get
+            {
+                return _refreshCommand;
+            }
             set
             {
                 _refreshCommand = value;

diff --git a/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Design/MvxBottomSheetDialogFragment.cs b/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Design/MvxBottomSheetDialogFragment.cs
@@ -36,7 +36,10 @@ protected MvxBottomSheetDialogFragment(IntPtr javaReference, JniHandleOwnership
 
 		public object DataContext
 		{
-			get { return _dataContext; }
+			get
+            {
+                return _dataContext;
+            }
 			set
 			{
 				_dataContext = value;

diff --git a/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Fragment/MvxDialogFragment.cs b/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Fragment/MvxDialogFragment.cs
@@ -35,7 +35,10 @@ protected MvxDialogFragment(IntPtr javaReference, JniHandleOwnership transfer)
 
         public object DataContext
         {
-            get { return _dataContext; }
+            get
+            {
+                return _dataContext;
+            }
             set
             {
                 _dataContext = value;

diff --git a/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Fragment/MvxFragment.cs b/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Fragment/MvxFragment.cs
@@ -49,7 +49,10 @@ protected MvxFragment(IntPtr javaReference, JniHandleOwnership transfer)
 
         public object DataContext
         {
-            get { return _dataContext; }
+            get
+            {
+                return _dataContext;
+            }
             set
             {
                 _dataContext = value;
@@ -60,7 +63,10 @@ public object DataContext
 
         public virtual IMvxViewModel ViewModel
         {
-            get { return DataContext as IMvxViewModel; }
+            get
+            {
+                return DataContext as IMvxViewModel;
+            }
             set
             {
                 DataContext = value;

diff --git a/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Fragment/MvxFragmentActivity.cs b/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Fragment/MvxFragmentActivity.cs
@@ -44,7 +44,10 @@ public object DataContext
 
         public IMvxViewModel ViewModel
         {
-            get { return DataContext as IMvxViewModel; }
+            get
+            {
+                return DataContext as IMvxViewModel;
+            }
             set
             {
                 DataContext = value;

diff --git a/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Fragment/MvxFragmentStatePagerAdapter.cs b/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Fragment/MvxFragmentStatePagerAdapter.cs
@@ -91,5 +91,4 @@ public FragmentInfo(string title, Type fragmentType, Type viewModelType)
             public Fragment CachedFragment { get; set; }
         }
     }
-}
-
+}
diff --git a/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V14.Preference/MvxPreferenceFragment.cs b/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V14.Preference/MvxPreferenceFragment.cs
@@ -27,7 +27,10 @@ protected MvxPreferenceFragment(IntPtr javaReference, JniHandleOwnership transfe
 
 		public object DataContext
 		{
-			get { return _dataContext; }
+			get
+            {
+                return _dataContext;
+            }
 			set
 			{
 				_dataContext = value;
@@ -38,7 +41,10 @@ public object DataContext
 
 		public virtual IMvxViewModel ViewModel
 		{
-			get { return DataContext as IMvxViewModel; }
+			get
+            {
+                return DataContext as IMvxViewModel;
+            }
 			set
 			{
 				DataContext = value;
@@ -57,7 +63,6 @@ public abstract class MvxPreferenceFragment<TViewModel>
 		: MvxPreferenceFragment, IMvxFragmentView<TViewModel> 
         where TViewModel : class, IMvxViewModel
 	{
-
 		protected MvxPreferenceFragment()
 		{
 		}

diff --git a/...ross-AndroidSupport/MvvmCross.Droid.Support.V17.Leanback/Adapters/MvxBaseObjectAdapter.cs b/...ross-AndroidSupport/MvvmCross.Droid.Support.V17.Leanback/Adapters/MvxBaseObjectAdapter.cs
@@ -24,7 +24,10 @@ public abstract class MvxBaseObjectAdapter
 
         public IEnumerable ItemsSource
         {
-            get { return _itemsSource; }
+            get
+            {
+                return _itemsSource;
+            }
             set
             {
                 if (ReferenceEquals(_itemsSource, value))

diff --git a/...AndroidSupport/MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxBrowseSupportFragment.cs b/...AndroidSupport/MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxBrowseSupportFragment.cs
@@ -43,7 +43,10 @@ protected MvxBrowseSupportFragment(IntPtr javaReference, JniHandleOwnership tran
 
         public object DataContext
         {
-            get { return _dataContext; }
+            get
+            {
+                return _dataContext;
+            }
             set
             {
                 _dataContext = value;
@@ -54,7 +57,10 @@ public object DataContext
 
         public virtual IMvxViewModel ViewModel
         {
-            get { return DataContext as IMvxViewModel; }
+            get
+            {
+                return DataContext as IMvxViewModel;
+            }
             set
             {
                 DataContext = value;

diff --git a/...ndroidSupport/MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxDetailsSupportFragment.cs b/...ndroidSupport/MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxDetailsSupportFragment.cs
@@ -43,7 +43,10 @@ protected MvxDetailsSupportFragment(IntPtr javaReference, JniHandleOwnership tra
 
         public object DataContext
         {
-            get { return _dataContext; }
+            get
+            {
+                return _dataContext;
+            }
             set
             {
                 _dataContext = value;
@@ -54,7 +57,10 @@ public object DataContext
 
         public virtual IMvxViewModel ViewModel
         {
-            get { return DataContext as IMvxViewModel; }
+            get
+            {
+                return DataContext as IMvxViewModel;
+            }
             set
             {
                 DataContext = value;

diff --git a/...oidSupport/MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxGuidedStepSupportFragment.cs b/...oidSupport/MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxGuidedStepSupportFragment.cs
@@ -43,7 +43,10 @@ protected MvxGuidedStepSupportFragment(IntPtr javaReference, JniHandleOwnership
 
         public object DataContext
         {
-            get { return _dataContext; }
+            get
+            {
+                return _dataContext;
+            }
             set
             {
                 _dataContext = value;
@@ -54,7 +57,10 @@ public object DataContext
 
         public virtual IMvxViewModel ViewModel
         {
-            get { return DataContext as IMvxViewModel; }
+            get
+            { 
+                return DataContext as IMvxViewModel;
+            }
             set
             {
                 DataContext = value;

diff --git a/...ndroidSupport/MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxHeadersSupportFragment.cs b/...ndroidSupport/MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxHeadersSupportFragment.cs
@@ -43,7 +43,10 @@ protected MvxHeadersSupportFragment(IntPtr javaReference, JniHandleOwnership tra
 
         public object DataContext
         {
-            get { return _dataContext; }
+            get
+            {
+                return _dataContext;
+            }
             set
             {
                 _dataContext = value;
@@ -54,7 +57,10 @@ public object DataContext
 
         public virtual IMvxViewModel ViewModel
         {
-            get { return DataContext as IMvxViewModel; }
+            get
+            {
+                return DataContext as IMvxViewModel;
+            }
             set
             {
                 DataContext = value;

diff --git a/...droidSupport/MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxPlaybackSupportFragment.cs b/...droidSupport/MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxPlaybackSupportFragment.cs
@@ -43,7 +43,10 @@ protected MvxPlaybackSupportFragment(IntPtr javaReference, JniHandleOwnership tr
 
         public object DataContext
         {
-            get { return _dataContext; }
+            get
+            {
+                return _dataContext;
+            }
             set
             {
                 _dataContext = value;
@@ -54,7 +57,10 @@ public object DataContext
 
         public virtual IMvxViewModel ViewModel
         {
-            get { return DataContext as IMvxViewModel; }
+            get
+            {
+                return DataContext as IMvxViewModel;
+            }
             set
             {
                 DataContext = value;

diff --git a/...s-AndroidSupport/MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxRowsSupportFragment.cs b/...s-AndroidSupport/MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxRowsSupportFragment.cs
@@ -43,7 +43,10 @@ protected MvxRowsSupportFragment(IntPtr javaReference, JniHandleOwnership transf
 
         public object DataContext
         {
-            get { return _dataContext; }
+            get
+            {
+                return _dataContext;
+            }
             set
             {
                 _dataContext = value;
@@ -54,7 +57,10 @@ public object DataContext
 
         public virtual IMvxViewModel ViewModel
         {
-            get { return DataContext as IMvxViewModel; }
+            get
+            {
+                return DataContext as IMvxViewModel;
+            }
             set
             {
                 DataContext = value;

diff --git a/...AndroidSupport/MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxSearchSupportFragment.cs b/...AndroidSupport/MvvmCross.Droid.Support.V17.Leanback/Fragments/MvxSearchSupportFragment.cs
@@ -43,7 +43,10 @@ protected MvxSearchSupportFragment(IntPtr javaReference, JniHandleOwnership tran
 
         public object DataContext
         {
-            get { return _dataContext; }
+            get
+            {
+                return _dataContext;
+            }
             set
             {
                 _dataContext = value;
@@ -54,7 +57,10 @@ public object DataContext
 
         public virtual IMvxViewModel ViewModel
         {
-            get { return DataContext as IMvxViewModel; }
+            get
+            {
+                return DataContext as IMvxViewModel;
+            }
             set
             {
                 DataContext = value;

diff --git a/...ross-AndroidSupport/MvvmCross.Droid.Support.V17.Leanback/Widgets/MvxHorizontalGridView.cs b/...ross-AndroidSupport/MvvmCross.Droid.Support.V17.Leanback/Widgets/MvxHorizontalGridView.cs
@@ -81,7 +81,10 @@ public MvxHorizontalGridView(Context context, IAttributeSet attrs, int defStyle,
 
         public new IMvxRecyclerAdapter Adapter
         {
-            get { return GetAdapter() as IMvxRecyclerAdapter; }
+            get
+            {
+                return GetAdapter() as IMvxRecyclerAdapter;
+            }
             set
             {
                 var existing = Adapter;

diff --git a/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V7.AppCompat/MvxAppCompatActivity.cs b/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V7.AppCompat/MvxAppCompatActivity.cs
@@ -45,7 +45,10 @@ public object DataContext
 
         public IMvxViewModel ViewModel
         {
-            get { return DataContext as IMvxViewModel; }
+            get
+            {
+                return DataContext as IMvxViewModel;
+            }
             set
             {
                 DataContext = value;

diff --git a/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V7.AppCompat/MvxAppCompatDialogFragment.cs b/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V7.AppCompat/MvxAppCompatDialogFragment.cs
@@ -36,7 +36,10 @@ protected MvxAppCompatDialogFragment(IntPtr javaReference, JniHandleOwnership tr
 
         public object DataContext
         {
-            get { return _dataContext; }
+            get
+            {
+                return _dataContext;
+            }
             set
             {
                 _dataContext = value;

diff --git a/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V7.AppCompat/MvxAppCompatSetup.cs b/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V7.AppCompat/MvxAppCompatSetup.cs
@@ -53,5 +53,4 @@ protected override void FillBindingNames(IMvxBindingNameRegistry registry)
             base.FillBindingNames(registry);
         }
     }
-}
-
+}
diff --git a/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V7.AppCompat/MvxAppCompatSetupHelper.cs b/MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V7.AppCompat/MvxAppCompatSetupHelper.cs
@@ -48,7 +48,6 @@ public static void FillDefaultBindingNames(IMvxBindingNameRegistry registry)
         {
             registry.AddOrOverwrite(typeof(SearchView), MvxAppCompatPropertyBinding.SearchView_Query);
             registry.AddOrOverwrite(typeof(MvxAppCompatImageView), nameof(MvxAppCompatImageView.ImageUrl));
-
         }
     }
-}
+}
diff --git a/.../MvvmCross.Droid.Support.V7.AppCompat/Target/MvxAppCompatRadioGroupSelectedItemBinding.cs b/.../MvvmCross.Droid.Support.V7.AppCompat/Target/MvxAppCompatRadioGroupSelectedItemBinding.cs
@@ -60,7 +60,8 @@ private void RadioGroupCheckedChanged(object sender, RadioGroup.CheckedChangeEve
             }
 
             bool changed = CheckValueChanged(newValue);
-            if (!changed) { return; }
+            if (!changed)
+                return;
 
             _currentValue = newValue;
             FireValueChanged(newValue);

diff --git a/...idSupport/MvvmCross.Droid.Support.V7.AppCompat/Widget/MvxAppCompatAutoCompleteTextView.cs b/...idSupport/MvvmCross.Droid.Support.V7.AppCompat/Widget/MvxAppCompatAutoCompleteTextView.cs
@@ -67,7 +67,10 @@ protected virtual void OnItemSelected(int position)
 
         public new MvxFilteringAdapter Adapter
         {
-            get { return base.Adapter as MvxFilteringAdapter; }
+            get
+            {
+                return base.Adapter as MvxFilteringAdapter;
+            }
             set
             {
                 var existing = Adapter;
@@ -114,7 +117,10 @@ public int ItemTemplateId
 
         public object SelectedObject
         {
-            get { return _selectedObject; }
+            get
+            {
+                return _selectedObject;
+            }
             private set
             {
                 if (_selectedObject == value)

diff --git a/...ross-AndroidSupport/MvvmCross.Droid.Support.V7.AppCompat/Widget/MvxAppCompatRadioGroup.cs b/...ross-AndroidSupport/MvvmCross.Droid.Support.V7.AppCompat/Widget/MvxAppCompatRadioGroup.cs
@@ -75,7 +75,10 @@ private void OnChildViewRemoved(object sender, ChildViewRemovedEventArgs childVi
 
         public IMvxAdapterWithChangedEvent Adapter
         {
-            get { return _adapter; }
+            get
+            {
+                return _adapter;
+            }
             protected set
             {
                 var existing = _adapter;