diff --git a/.gitignore b/.gitignore index b0eb4b4..a91c994 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .vs/ mono_crash.* +.idea/ # User-specific files *.suo diff --git a/Sample/Sample.Droid/MainActivity.cs b/Sample/Sample.Droid/MainActivity.cs index af36678..29776f6 100644 --- a/Sample/Sample.Droid/MainActivity.cs +++ b/Sample/Sample.Droid/MainActivity.cs @@ -19,7 +19,7 @@ protected override void OnCreate(Bundle bundle) global::Xamarin.Forms.Forms.SetFlags("FastRenderers_Experimental"); global::Xamarin.Forms.Forms.Init(this, bundle); AiForms.Effects.Droid.Effects.Init(); - Xamarin.Forms.Svg.Droid.SvgImage.Init(); + Xamarin.Forms.Svg.Droid.SvgImage.Init(this); AiForms.Renderers.Droid.SettingsViewInit.Init(); diff --git a/Sample/Sample.Droid/Properties/AndroidManifest.xml b/Sample/Sample.Droid/Properties/AndroidManifest.xml index ce8ad28..4461e97 100644 --- a/Sample/Sample.Droid/Properties/AndroidManifest.xml +++ b/Sample/Sample.Droid/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/Sample/Sample.Droid/Sample.Droid.csproj b/Sample/Sample.Droid/Sample.Droid.csproj index 9656ee3..315c464 100644 --- a/Sample/Sample.Droid/Sample.Droid.csproj +++ b/Sample/Sample.Droid/Sample.Droid.csproj @@ -1,9 +1,8 @@ - false - v9.0 + v10.0 Debug @@ -13,7 +12,7 @@ Library Sample.Droid Sample.Droid - v9.0 + v10.0 True Resources\Resource.designer.cs Resource @@ -42,226 +41,20 @@ true false armeabi-v7a;arm64-v8a;x86_64;x86 + + + apk - - ..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - - ..\packages\NGraphics.0.4.0\lib\MonoAndroid10\NGraphics.Android.dll - - - ..\packages\NGraphics.0.4.0\lib\MonoAndroid10\NGraphics.dll - - - ..\packages\Xamarin.Forms.Svg.0.0.1-pre\lib\MonoAndroid\SvgImageSource.dll - - - ..\packages\Xamarin.Forms.Svg.0.0.1-pre\lib\MonoAndroid\SvgImageSource.Droid.dll - - - ..\packages\Xamarin.Android.Support.Annotations.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Annotations.dll - - - ..\packages\Xamarin.Android.Support.Compat.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Compat.dll - - - ..\packages\Xamarin.Android.Support.Core.UI.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Core.UI.dll - - - ..\packages\Xamarin.Android.Support.Core.Utils.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Core.Utils.dll - - - ..\packages\Xamarin.Android.Support.Media.Compat.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Media.Compat.dll - - - ..\packages\Xamarin.Android.Support.Fragment.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Fragment.dll - - - ..\packages\Xamarin.Android.Support.Transition.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Transition.dll - - - ..\packages\Xamarin.Android.Support.v4.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v4.dll - - - ..\packages\Xamarin.Android.Support.v7.CardView.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v7.CardView.dll - - - ..\packages\Xamarin.Android.Support.v7.Palette.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v7.Palette.dll - - - ..\packages\Xamarin.Android.Support.v7.RecyclerView.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.dll - - - ..\packages\Xamarin.Android.Support.Vector.Drawable.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Vector.Drawable.dll - - - ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.dll - - - ..\packages\Xamarin.Android.Support.v7.AppCompat.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\packages\Xamarin.Android.Support.Design.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Design.dll - - - ..\packages\Xamarin.Android.Support.v7.MediaRouter.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.dll - - - ..\packages\AiForms.Layouts.1.0.4\lib\netstandard1.1\AiForms.Layouts.dll - - - ..\packages\Prism.Core.7.0.0.396\lib\netstandard2.0\Prism.dll - - - ..\packages\Unity.5.5.5\lib\netstandard2.0\CommonServiceLocator.dll - - - ..\packages\Unity.5.5.5\lib\netstandard2.0\Unity.Abstractions.dll - - - ..\packages\Unity.5.5.5\lib\netstandard2.0\Unity.Container.dll - - - ..\packages\Unity.5.5.5\lib\netstandard2.0\Unity.ServiceLocation.dll - - - ..\packages\Prism.Forms.7.0.0.396\lib\netstandard2.0\Prism.Forms.dll - - - ..\packages\Prism.Unity.Forms.7.0.0.396\lib\netstandard2.0\Prism.Unity.Forms.dll - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\netstandard1.0\System.Reactive.Interfaces.dll - - - ..\packages\System.Reactive.Core.3.1.1\lib\netstandard1.3\System.Reactive.Core.dll - - - ..\packages\System.Reactive.Linq.3.1.1\lib\netstandard1.3\System.Reactive.Linq.dll - - - ..\packages\System.Reactive.PlatformServices.3.1.1\lib\netstandard1.3\System.Reactive.PlatformServices.dll - - - ..\packages\ReactiveProperty.4.2.2\lib\MonoAndroid\ReactiveProperty.Android.dll - - - ..\packages\ReactiveProperty.4.2.2\lib\MonoAndroid\ReactiveProperty.dll - - - ..\packages\Xamarin.Forms.4.7.0.1142\lib\MonoAndroid90\FormsViewGroup.dll - - - ..\packages\Xamarin.Forms.4.7.0.1142\lib\MonoAndroid90\Xamarin.Forms.Core.dll - - - ..\packages\Xamarin.Forms.4.7.0.1142\lib\MonoAndroid90\Xamarin.Forms.Platform.Android.dll - - - ..\packages\Xamarin.Forms.4.7.0.1142\lib\MonoAndroid90\Xamarin.Forms.Platform.dll - - - ..\packages\Xamarin.Forms.4.7.0.1142\lib\MonoAndroid90\Xamarin.Forms.Xaml.dll - - - ..\packages\AiForms.Effects.1.5.5\lib\MonoAndroid\AiForms.Effects.dll - - - ..\packages\AiForms.Effects.1.5.5\lib\MonoAndroid\AiForms.Effects.Droid.dll - - - ..\packages\Xamarin.Android.Arch.Core.Common.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Core.Common.dll - - - ..\packages\Xamarin.Android.Arch.Core.Runtime.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Core.Runtime.dll - - - ..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.dll - - - ..\packages\Xamarin.Android.Arch.Lifecycle.LiveData.Core.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.dll - - - ..\packages\Xamarin.Android.Arch.Lifecycle.LiveData.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.dll - - - ..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.dll - - - ..\packages\Xamarin.Android.Arch.Lifecycle.ViewModel.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.dll - - - ..\packages\Xamarin.Android.Support.Collections.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Collections.dll - - - ..\packages\Xamarin.Android.Support.CursorAdapter.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.CursorAdapter.dll - - - ..\packages\Xamarin.Android.Support.DocumentFile.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.DocumentFile.dll - - - ..\packages\Xamarin.Android.Support.Interpolator.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Interpolator.dll - - - ..\packages\Xamarin.Android.Support.LocalBroadcastManager.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.dll - - - ..\packages\Xamarin.Android.Support.Print.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Print.dll - - - ..\packages\Xamarin.Android.Support.VersionedParcelable.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.VersionedParcelable.dll - - - ..\packages\Xamarin.Android.Support.AsyncLayoutInflater.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.dll - - - ..\packages\Xamarin.Android.Support.CustomView.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.CustomView.dll - - - ..\packages\Xamarin.Android.Support.CoordinaterLayout.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.dll - - - ..\packages\Xamarin.Android.Support.DrawerLayout.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.DrawerLayout.dll - - - ..\packages\Xamarin.Android.Support.Loader.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Loader.dll - - - ..\packages\Xamarin.Android.Support.SlidingPaneLayout.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.dll - - - ..\packages\Xamarin.Android.Support.SwipeRefreshLayout.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.dll - - - ..\packages\Xamarin.Android.Support.ViewPager.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.ViewPager.dll - - - ..\packages\Xamarin.Android.Support.CustomTabs.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.CustomTabs.dll - - - - - {2DB58246-77D5-4190-B0A0-F125B538309B} - Sample - - - {8FFB1EF3-FAF3-478C-B9F1-4D02E599C3C6} - SettingsView - - - {2CC418E1-CE33-48E2-8E89-A87669BD9E28} - SettingsView.Droid - @@ -272,7 +65,6 @@ - @@ -287,48 +79,40 @@ + + + + 7.0.0.396 + + + 4.2.2 + + + 1.0.3 + + + 1.5.5 + + + 28.0.0.3 + + + + + {2CC418E1-CE33-48E2-8E89-A87669BD9E28} + SettingsView.Droid + + + {8FFB1EF3-FAF3-478C-B9F1-4D02E599C3C6} + SettingsView + + + {2DB58246-77D5-4190-B0A0-F125B538309B} + Sample + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sample/Sample.Droid/packages.config b/Sample/Sample.Droid/packages.config deleted file mode 100644 index 2855bab..0000000 --- a/Sample/Sample.Droid/packages.config +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sample/Sample.iOS/Sample.iOS.csproj b/Sample/Sample.iOS/Sample.iOS.csproj index 302fcfa..ad8aa2d 100644 --- a/Sample/Sample.iOS/Sample.iOS.csproj +++ b/Sample/Sample.iOS/Sample.iOS.csproj @@ -1,6 +1,5 @@ - Debug iPhoneSimulator @@ -84,80 +83,8 @@ - - ..\packages\NGraphics.0.4.0\lib\Xamarin.iOS10\NGraphics.dll - - - ..\packages\NGraphics.0.4.0\lib\Xamarin.iOS10\NGraphics.iOS.dll - - - ..\packages\Xamarin.Forms.Svg.0.0.1-pre\lib\Xamarin.iOS10\SvgImageSource.dll - - - ..\packages\Xamarin.Forms.Svg.0.0.1-pre\lib\Xamarin.iOS10\SvgImageSource.iOS.dll - - - ..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - - - ..\packages\AiForms.Layouts.1.0.4\lib\netstandard1.1\AiForms.Layouts.dll - - - ..\packages\Prism.Core.7.0.0.396\lib\netstandard2.0\Prism.dll - - - ..\packages\Unity.5.5.5\lib\netstandard2.0\CommonServiceLocator.dll - - - ..\packages\Unity.5.5.5\lib\netstandard2.0\Unity.Abstractions.dll - - - ..\packages\Unity.5.5.5\lib\netstandard2.0\Unity.Container.dll - - - ..\packages\Unity.5.5.5\lib\netstandard2.0\Unity.ServiceLocation.dll - - - ..\packages\Prism.Forms.7.0.0.396\lib\netstandard2.0\Prism.Forms.dll - - - ..\packages\Prism.Unity.Forms.7.0.0.396\lib\netstandard2.0\Prism.Unity.Forms.dll - - - ..\packages\System.Reactive.Interfaces.3.1.1\lib\netstandard1.0\System.Reactive.Interfaces.dll - - - ..\packages\System.Reactive.Core.3.1.1\lib\netstandard1.3\System.Reactive.Core.dll - - - ..\packages\System.Reactive.Linq.3.1.1\lib\netstandard1.3\System.Reactive.Linq.dll - - - ..\packages\System.Reactive.PlatformServices.3.1.1\lib\netstandard1.3\System.Reactive.PlatformServices.dll - - - ..\packages\ReactiveProperty.4.2.2\lib\Xamarin.iOS10\ReactiveProperty.dll - - - ..\packages\ReactiveProperty.4.2.2\lib\Xamarin.iOS10\ReactiveProperty.iOS.dll - - - ..\packages\Xamarin.Forms.4.7.0.1142\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - - - ..\packages\Xamarin.Forms.4.7.0.1142\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - - - ..\packages\Xamarin.Forms.4.7.0.1142\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll - - - ..\packages\AiForms.Effects.1.5.5\lib\Xamarin.iOS10\AiForms.Effects.dll - - - ..\packages\AiForms.Effects.1.5.5\lib\Xamarin.iOS10\AiForms.Effects.iOS.dll - @@ -182,7 +109,6 @@ - @@ -192,7 +118,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file diff --git a/Sample/Sample.iOS/packages.config b/Sample/Sample.iOS/packages.config deleted file mode 100644 index 7e36faa..0000000 --- a/Sample/Sample.iOS/packages.config +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sample/Sample/Sample.csproj b/Sample/Sample/Sample.csproj index 070e821..6b3aa37 100644 --- a/Sample/Sample/Sample.csproj +++ b/Sample/Sample/Sample.csproj @@ -13,11 +13,11 @@ - + - + diff --git a/SettingsView.Droid/Cells/CheckboxCellRenderer.cs b/SettingsView.Droid/Cells/CheckboxCellRenderer.cs index 8ecd455..8fbaa35 100644 --- a/SettingsView.Droid/Cells/CheckboxCellRenderer.cs +++ b/SettingsView.Droid/Cells/CheckboxCellRenderer.cs @@ -2,12 +2,12 @@ using Xamarin.Forms; using Android.Widget; using Android.Content; -using Android.Support.V7.Widget; using Android.Views; using Xamarin.Forms.Platform.Android; using Android.Content.Res; using Android.Graphics.Drawables; using Android.Runtime; +using AndroidX.AppCompat.Widget; [assembly: ExportRenderer(typeof(AiForms.Renderers.CheckboxCell), typeof(AiForms.Renderers.Droid.CheckboxCellRenderer))] namespace AiForms.Renderers.Droid diff --git a/SettingsView.Droid/Cells/SwitchCellRenderer.cs b/SettingsView.Droid/Cells/SwitchCellRenderer.cs index 7fc8efe..26548ea 100644 --- a/SettingsView.Droid/Cells/SwitchCellRenderer.cs +++ b/SettingsView.Droid/Cells/SwitchCellRenderer.cs @@ -3,9 +3,9 @@ using Android.Content.Res; using Android.Graphics.Drawables; using Android.Runtime; -using Android.Support.V7.Widget; using Android.Views; using Android.Widget; +using AndroidX.AppCompat.Widget; using Xamarin.Forms; using Xamarin.Forms.Platform.Android; diff --git a/SettingsView.Droid/ModelProxy.cs b/SettingsView.Droid/ModelProxy.cs index 36337cb..2e94ad8 100644 --- a/SettingsView.Droid/ModelProxy.cs +++ b/SettingsView.Droid/ModelProxy.cs @@ -1,12 +1,11 @@ using System; using System.Collections.Generic; +using System.Collections.Specialized; using System.Linq; +using Android.OS; +using AndroidX.RecyclerView.Widget; using Xamarin.Forms; -using System.Collections.ObjectModel; using Xamarin.Forms.Internals; -using System.Collections.Specialized; -using Android.Support.V7.Widget; -using Android.OS; namespace AiForms.Renderers.Droid { diff --git a/SettingsView.Droid/SVItemdecoration.cs b/SettingsView.Droid/SVItemdecoration.cs index 7ee7883..44db8c8 100644 --- a/SettingsView.Droid/SVItemdecoration.cs +++ b/SettingsView.Droid/SVItemdecoration.cs @@ -1,11 +1,8 @@ -using System; -using Android.Content; +using System.Linq; using Android.Graphics; -using Android.Support.V7.Widget; -using Android.Views; -using Android.Widget; using Android.Graphics.Drawables; -using System.Linq; +using Android.Views; +using AndroidX.RecyclerView.Widget; namespace AiForms.Renderers.Droid { diff --git a/SettingsView.Droid/SettingsView.Droid.csproj b/SettingsView.Droid/SettingsView.Droid.csproj index 5eb760f..c841d91 100644 --- a/SettingsView.Droid/SettingsView.Droid.csproj +++ b/SettingsView.Droid/SettingsView.Droid.csproj @@ -1,6 +1,5 @@ - Debug AnyCPU @@ -9,7 +8,7 @@ Library AiForms.Renderers.Droid SettingsView.Droid - v9.0 + v10.0 Resources\Resource.designer.cs Resource Resources @@ -43,139 +42,7 @@ - - ..\packages\Xamarin.Android.Support.Annotations.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Annotations.dll - - - ..\packages\Xamarin.Android.Support.Compat.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Compat.dll - - - ..\packages\Xamarin.Android.Support.Core.UI.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Core.UI.dll - - - ..\packages\Xamarin.Android.Support.Core.Utils.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Core.Utils.dll - - - ..\packages\Xamarin.Android.Support.Media.Compat.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Media.Compat.dll - - - ..\packages\Xamarin.Android.Support.Fragment.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Fragment.dll - - - ..\packages\Xamarin.Android.Support.Transition.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Transition.dll - - - ..\packages\Xamarin.Android.Support.v4.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v4.dll - - - ..\packages\Xamarin.Android.Support.v7.CardView.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v7.CardView.dll - - - ..\packages\Xamarin.Android.Support.v7.Palette.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v7.Palette.dll - - - ..\packages\Xamarin.Android.Support.v7.RecyclerView.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v7.RecyclerView.dll - - - ..\packages\Xamarin.Android.Support.Vector.Drawable.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Vector.Drawable.dll - - - ..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Animated.Vector.Drawable.dll - - - ..\packages\Xamarin.Android.Support.v7.AppCompat.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v7.AppCompat.dll - - - ..\packages\Xamarin.Android.Support.Design.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Design.dll - - - ..\packages\Xamarin.Android.Support.v7.MediaRouter.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.v7.MediaRouter.dll - - - ..\packages\Xamarin.Forms.4.6.0.800\lib\MonoAndroid90\FormsViewGroup.dll - - - ..\packages\Xamarin.Forms.4.6.0.800\lib\MonoAndroid90\Xamarin.Forms.Core.dll - - - ..\packages\Xamarin.Forms.4.6.0.800\lib\MonoAndroid90\Xamarin.Forms.Platform.Android.dll - - - ..\packages\Xamarin.Forms.4.6.0.800\lib\MonoAndroid90\Xamarin.Forms.Platform.dll - - - ..\packages\Xamarin.Forms.4.6.0.800\lib\MonoAndroid90\Xamarin.Forms.Xaml.dll - - - ..\packages\Xamarin.Android.Arch.Core.Common.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Core.Common.dll - - - ..\packages\Xamarin.Android.Arch.Core.Runtime.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Core.Runtime.dll - - - ..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Common.dll - - - ..\packages\Xamarin.Android.Arch.Lifecycle.LiveData.Core.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.Core.dll - - - ..\packages\Xamarin.Android.Arch.Lifecycle.LiveData.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.LiveData.dll - - - ..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.Runtime.dll - - - ..\packages\Xamarin.Android.Arch.Lifecycle.ViewModel.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Lifecycle.ViewModel.dll - - - ..\packages\Xamarin.Android.Support.Collections.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Collections.dll - - - ..\packages\Xamarin.Android.Support.CursorAdapter.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.CursorAdapter.dll - - - ..\packages\Xamarin.Android.Support.DocumentFile.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.DocumentFile.dll - - - ..\packages\Xamarin.Android.Support.Interpolator.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Interpolator.dll - - - ..\packages\Xamarin.Android.Support.LocalBroadcastManager.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.LocalBroadcastManager.dll - - - ..\packages\Xamarin.Android.Support.Print.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Print.dll - - - ..\packages\Xamarin.Android.Support.VersionedParcelable.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.VersionedParcelable.dll - - - ..\packages\Xamarin.Android.Support.AsyncLayoutInflater.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.AsyncLayoutInflater.dll - - - ..\packages\Xamarin.Android.Support.CustomView.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.CustomView.dll - - - ..\packages\Xamarin.Android.Support.CoordinaterLayout.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.CoordinaterLayout.dll - - - ..\packages\Xamarin.Android.Support.DrawerLayout.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.DrawerLayout.dll - - - ..\packages\Xamarin.Android.Support.Loader.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.Loader.dll - - - ..\packages\Xamarin.Android.Support.SlidingPaneLayout.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.SlidingPaneLayout.dll - - - ..\packages\Xamarin.Android.Support.SwipeRefreshLayout.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.SwipeRefreshLayout.dll - - - ..\packages\Xamarin.Android.Support.ViewPager.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.ViewPager.dll - - - ..\packages\Xamarin.Android.Support.CustomTabs.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.CustomTabs.dll - @@ -215,7 +82,6 @@ - @@ -240,49 +106,12 @@ - {FD2D256D-7898-494A-9FDC-C04482BF8C0E} + {8FFB1EF3-FAF3-478C-B9F1-4D02E599C3C6} SettingsView + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SettingsView.Droid/SettingsViewLayoutManager.cs b/SettingsView.Droid/SettingsViewLayoutManager.cs index d7402db..5098708 100644 --- a/SettingsView.Droid/SettingsViewLayoutManager.cs +++ b/SettingsView.Droid/SettingsViewLayoutManager.cs @@ -1,11 +1,6 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using Android.Graphics; -using Android.Support.V7.Widget; -using Android.Views; -using Java.Util; -using Xamarin.Forms; +using AndroidX.RecyclerView.Widget; using Xamarin.Forms.Platform.Android; namespace AiForms.Renderers.Droid diff --git a/SettingsView.Droid/SettingsViewRecyclerAdapter.cs b/SettingsView.Droid/SettingsViewRecyclerAdapter.cs index 8392c62..f4876e2 100644 --- a/SettingsView.Droid/SettingsViewRecyclerAdapter.cs +++ b/SettingsView.Droid/SettingsViewRecyclerAdapter.cs @@ -3,9 +3,9 @@ using System.Linq; using AiForms.Renderers.Droid.Extensions; using Android.Content; -using Android.Support.V7.Widget; using Android.Views; using Android.Widget; +using AndroidX.RecyclerView.Widget; using Xamarin.Forms; using Xamarin.Forms.Platform.Android; using AView = Android.Views.View; diff --git a/SettingsView.Droid/SettingsViewRenderer.cs b/SettingsView.Droid/SettingsViewRenderer.cs index e12c6ba..83752dd 100644 --- a/SettingsView.Droid/SettingsViewRenderer.cs +++ b/SettingsView.Droid/SettingsViewRenderer.cs @@ -5,9 +5,8 @@ using AiForms.Renderers.Droid; using Android.Content; using Android.Graphics.Drawables; -using Android.Support.V7.Widget; -using Android.Support.V7.Widget.Helper; using Android.Views; +using AndroidX.RecyclerView.Widget; using Xamarin.Forms; using Xamarin.Forms.Platform.Android; @@ -32,7 +31,7 @@ public class SettingsViewRenderer : ViewRenderer /// /// Initializes a new instance of the class. /// - public SettingsViewRenderer(Context context):base(context) + public SettingsViewRenderer(Context context):base(context) { AutoPackage = false; } diff --git a/SettingsView.Droid/ViewHolders.cs b/SettingsView.Droid/ViewHolders.cs index e0410e7..63c9ebb 100644 --- a/SettingsView.Droid/ViewHolders.cs +++ b/SettingsView.Droid/ViewHolders.cs @@ -1,10 +1,8 @@ -using System; -using Android.Support.V7.Widget; +using Android.Views; using Android.Widget; +using AndroidX.RecyclerView.Widget; using Xamarin.Forms; using AView = Android.Views.View; -using Android.Views; -using Xamarin.Forms.Platform.Android; namespace AiForms.Renderers.Droid { diff --git a/SettingsView.Droid/packages.config b/SettingsView.Droid/packages.config deleted file mode 100644 index a801393..0000000 --- a/SettingsView.Droid/packages.config +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SettingsView.iOS/Cells/DatePickerCellRenderer.cs b/SettingsView.iOS/Cells/DatePickerCellRenderer.cs index 7790190..72a06da 100644 --- a/SettingsView.iOS/Cells/DatePickerCellRenderer.cs +++ b/SettingsView.iOS/Cells/DatePickerCellRenderer.cs @@ -123,6 +123,10 @@ public override void LayoutSubviews() void SetUpDatePicker() { _picker = new UIDatePicker { Mode = UIDatePickerMode.Date, TimeZone = new Foundation.NSTimeZone("UTC") }; + if (UIDevice.CurrentDevice.CheckSystemVersion(13, 4)) + { + _picker.PreferredDatePickerStyle = UIDatePickerStyle.Wheels; + } var width = UIScreen.MainScreen.Bounds.Width; var toolbar = new UIToolbar(new CGRect(0, 0, width, 44)) { BarStyle = UIBarStyle.Default, Translucent = true }; diff --git a/SettingsView.iOS/Cells/TimePickerCellRenderer.cs b/SettingsView.iOS/Cells/TimePickerCellRenderer.cs index b7cf313..d0813f3 100644 --- a/SettingsView.iOS/Cells/TimePickerCellRenderer.cs +++ b/SettingsView.iOS/Cells/TimePickerCellRenderer.cs @@ -119,6 +119,10 @@ public override void LayoutSubviews() void SetUpTimePicker() { _picker = new UIDatePicker { Mode = UIDatePickerMode.Time, TimeZone = new NSTimeZone("UTC") }; + if (UIDevice.CurrentDevice.CheckSystemVersion(13, 4)) + { + _picker.PreferredDatePickerStyle = UIDatePickerStyle.Wheels; + } _titleLabel = new UILabel(); _titleLabel.TextAlignment = UITextAlignment.Center; diff --git a/SettingsView.iOS/SettingsView.iOS.csproj b/SettingsView.iOS/SettingsView.iOS.csproj index 2d9a1f0..1ccf7e7 100644 --- a/SettingsView.iOS/SettingsView.iOS.csproj +++ b/SettingsView.iOS/SettingsView.iOS.csproj @@ -1,6 +1,5 @@ - Debug AnyCPU @@ -49,15 +48,6 @@ - - ..\packages\Xamarin.Forms.4.6.0.800\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - - - ..\packages\Xamarin.Forms.4.6.0.800\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - - - ..\packages\Xamarin.Forms.4.6.0.800\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll - @@ -102,16 +92,15 @@ - - - {FD2D256D-7898-494A-9FDC-C04482BF8C0E} SettingsView + + + - \ No newline at end of file diff --git a/SettingsView.iOS/packages.config b/SettingsView.iOS/packages.config deleted file mode 100644 index 69df5ce..0000000 --- a/SettingsView.iOS/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/nuget/AzurePipelines.nuspec b/nuget/AzurePipelines.nuspec index 4cdb457..0393413 100644 --- a/nuget/AzurePipelines.nuspec +++ b/nuget/AzurePipelines.nuspec @@ -15,6 +15,10 @@ There are various cells such as (LabelCell,ButtonCell,CommandCell,SwitchCell,Che +## News + +* Corrensponded to iOS14 and AndroidX. + ## New Features * [SettingsView] ItemDroppedEvent and ItemDroppedCommand property. @@ -31,7 +35,6 @@ There are various cells such as (LabelCell,ButtonCell,CommandCell,SwitchCell,Che ## Bug fixes -* * [iOS] Crash ScrollToTop ScrollToBottom when no elements. * [Android] Fix reordering bug. * [Android] Fix Sequence contains no elements. #113 #86