diff --git a/AiForms.Effects.Droid/AddCommandPlatformEffect.cs b/AiForms.Effects.Droid/AddCommandPlatformEffect.cs index 362dcdc..cdb67dc 100644 --- a/AiForms.Effects.Droid/AddCommandPlatformEffect.cs +++ b/AiForms.Effects.Droid/AddCommandPlatformEffect.cs @@ -419,12 +419,6 @@ RippleDrawable CreateRipple(Android.Graphics.Color color) var mask = new ColorDrawable(Android.Graphics.Color.White); return _ripple = new RippleDrawable(getPressedColorSelector(color), null, mask); } - else if (back is RippleDrawable) { - _ripple = back.GetConstantState().NewDrawable() as RippleDrawable; - _ripple.SetColor(getPressedColorSelector(color)); - - return _ripple; - } else { return _ripple = new RippleDrawable(getPressedColorSelector(color), back, null); } diff --git a/AiForms.Effects.Droid/AiForms.Effects.Droid.csproj b/AiForms.Effects.Droid/AiForms.Effects.Droid.csproj index 85455b1..98f4131 100644 --- a/AiForms.Effects.Droid/AiForms.Effects.Droid.csproj +++ b/AiForms.Effects.Droid/AiForms.Effects.Droid.csproj @@ -1,6 +1,6 @@ - + Debug AnyCPU @@ -9,7 +9,7 @@ Library AiForms.Effects.Droid AiForms.Effects.Droid - v8.0 + v8.1 Resources\Resource.designer.cs Resource Resources @@ -93,19 +93,19 @@ ..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll - ..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\FormsViewGroup.dll + ..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\FormsViewGroup.dll - ..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Core.dll + ..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + ..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll - ..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Platform.dll + ..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\Xamarin.Forms.Platform.dll - ..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll + ..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll @@ -160,5 +160,5 @@ - + \ No newline at end of file diff --git a/AiForms.Effects.Droid/ToFlatButtonPlatformEffect.cs b/AiForms.Effects.Droid/ToFlatButtonPlatformEffect.cs index 9da8c4b..2a5390e 100644 --- a/AiForms.Effects.Droid/ToFlatButtonPlatformEffect.cs +++ b/AiForms.Effects.Droid/ToFlatButtonPlatformEffect.cs @@ -6,6 +6,7 @@ using Android.Support.V7.Widget; using Xamarin.Forms; using Xamarin.Forms.Platform.Android; +using System; [assembly: ExportEffect(typeof(ToFlatButtonPlatformEffect), nameof(ToFlatButton))] namespace AiForms.Effects.Droid @@ -22,7 +23,6 @@ public class ToFlatButtonPlatformEffect : AiEffectBase private Drawable OrgBackground; private StateListAnimator OrgStateListAnimator; - private ColorStateList OrgBackgroundTint; protected override void OnAttached() { @@ -34,12 +34,9 @@ protected override void OnAttached() OrgBackground = NativeButton.Background; OrgStateListAnimator = NativeButton.StateListAnimator; - OrgBackgroundTint = NativeButton.SupportBackgroundTintList; //shadow off NativeButton.StateListAnimator = null; - //disabled default background - NativeButton.SupportBackgroundTintList = null; Shape = new GradientDrawable(); Shape.SetShape(ShapeType.Rectangle); @@ -57,7 +54,6 @@ protected override void OnDetached() if (!IsDisposed) { NativeButton.Background = OrgBackground; NativeButton.StateListAnimator = OrgStateListAnimator; - NativeButton.SupportBackgroundTintList = OrgBackgroundTint; } Colors.Dispose(); Shape.Dispose(); @@ -68,7 +64,6 @@ protected override void OnDetached() NativeButton = null; OrgBackground = null; OrgStateListAnimator = null; - OrgBackgroundTint = null; Colors = null; Shape = null; @@ -88,7 +83,7 @@ protected override void OnElementPropertyChanged(System.ComponentModel.PropertyC if (e.PropertyName == VisualElement.BackgroundColorProperty.PropertyName) { UpdateBackgroundColor(); } - else if (e.PropertyName == Button.BorderRadiusProperty.PropertyName) { + else if (e.PropertyName == Button.CornerRadiusProperty.PropertyName || e.PropertyName == Button.BorderRadiusProperty.PropertyName) { UpdateBorderRadius(); } else if (e.PropertyName == Button.BorderWidthProperty.PropertyName) { @@ -130,7 +125,7 @@ void UpdateBackgroundColor() } void UpdateBorderRadius() { - var size = (float)Control.Context.ToPixels(FormsButton.BorderRadius); + var size = (float)Control.Context.ToPixels(Math.Max(FormsButton.CornerRadius,FormsButton.BorderRadius)); Shape.SetCornerRadius(size); } void UpdateBorder() diff --git a/AiForms.Effects.Droid/packages.config b/AiForms.Effects.Droid/packages.config index 48756ce..a38a340 100644 --- a/AiForms.Effects.Droid/packages.config +++ b/AiForms.Effects.Droid/packages.config @@ -16,5 +16,5 @@ - + \ No newline at end of file diff --git a/AiForms.Effects.iOS/AiForms.Effects.iOS.csproj b/AiForms.Effects.iOS/AiForms.Effects.iOS.csproj index 256db19..33a187f 100644 --- a/AiForms.Effects.iOS/AiForms.Effects.iOS.csproj +++ b/AiForms.Effects.iOS/AiForms.Effects.iOS.csproj @@ -1,6 +1,6 @@ - + Debug AnyCPU @@ -47,16 +47,16 @@ - ..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + ..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll + ..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - ..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + ..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll - ..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + ..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll @@ -92,5 +92,5 @@ - + \ No newline at end of file diff --git a/AiForms.Effects.iOS/packages.config b/AiForms.Effects.iOS/packages.config index 5247602..bcd1520 100644 --- a/AiForms.Effects.iOS/packages.config +++ b/AiForms.Effects.iOS/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/AiForms.Effects/AiForms.Effects.nuget.props b/AiForms.Effects/AiForms.Effects.nuget.props index 28c3cc4..51fc71e 100644 --- a/AiForms.Effects/AiForms.Effects.nuget.props +++ b/AiForms.Effects/AiForms.Effects.nuget.props @@ -13,6 +13,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/AiForms.Effects/AiForms.Effects.nuget.targets b/AiForms.Effects/AiForms.Effects.nuget.targets index f685a79..70edce6 100644 --- a/AiForms.Effects/AiForms.Effects.nuget.targets +++ b/AiForms.Effects/AiForms.Effects.nuget.targets @@ -4,6 +4,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/AiForms.Effects/project.json b/AiForms.Effects/project.json index 4d219d0..24547c1 100644 --- a/AiForms.Effects/project.json +++ b/AiForms.Effects/project.json @@ -1,8 +1,8 @@ { "dependencies": { - "Xamarin.Forms": "2.5.0.121934", + "Microsoft.NETCore.Portable.Compatibility": "1.0.1", "NETStandard.Library": "1.6.0", - "Microsoft.NETCore.Portable.Compatibility": "1.0.1" + "Xamarin.Forms": "2.5.0.280555" }, "frameworks": { "netstandard1.4": {} diff --git a/README.md b/README.md index 570d694..ce4c3d5 100644 --- a/README.md +++ b/README.md @@ -280,7 +280,7 @@ There are properties of Command and Parameter for tap and long tap. |SearchBar |❌ |❌ | |Slider |✅ |❌ | |Stepper |✅ |❌ | -|Switch |❌ |✅ | +|Switch |❌ |❌ | |TableView |❌ |❌ | |TimePicker |❌ |✅ | |WebView |❌ |❌ | diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp.Droid/AiEffects.TestApp.Droid.csproj b/Tests/AiEffects.TestApp/AiEffects.TestApp.Droid/AiEffects.TestApp.Droid.csproj index 89774a9..60dd92e 100644 --- a/Tests/AiEffects.TestApp/AiEffects.TestApp.Droid/AiEffects.TestApp.Droid.csproj +++ b/Tests/AiEffects.TestApp/AiEffects.TestApp.Droid/AiEffects.TestApp.Droid.csproj @@ -1,6 +1,6 @@ - + Debug AnyCPU @@ -9,7 +9,7 @@ Library AiEffects.TestApp.Droid AiEffects.TestApp.Droid - v8.0 + v8.1 True Resources\Resource.designer.cs Resource @@ -102,21 +102,6 @@ ..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.v7.MediaRouter.dll - - ..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\FormsViewGroup.dll - - - ..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Core.dll - - - ..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll - - - ..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Platform.dll - - - ..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll - ..\..\..\packages\Prism.Core.6.3.0\lib\MonoAndroid10\Prism.dll @@ -146,6 +131,21 @@ ..\..\..\packages\ReactiveProperty.3.6.0\lib\MonoAndroid\ReactiveProperty.dll + + ..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\FormsViewGroup.dll + + + ..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\Xamarin.Forms.Core.dll + + + ..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll + + + ..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\Xamarin.Forms.Platform.dll + + + ..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll + @@ -209,5 +209,5 @@ - + \ No newline at end of file diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp.Droid/packages.config b/Tests/AiEffects.TestApp/AiEffects.TestApp.Droid/packages.config index 3b65884..a829927 100644 --- a/Tests/AiEffects.TestApp/AiEffects.TestApp.Droid/packages.config +++ b/Tests/AiEffects.TestApp/AiEffects.TestApp.Droid/packages.config @@ -81,5 +81,5 @@ - + \ No newline at end of file diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp.iOS/AiEffects.TestApp.iOS.csproj b/Tests/AiEffects.TestApp/AiEffects.TestApp.iOS/AiEffects.TestApp.iOS.csproj index 9cdc3aa..5f1b5a6 100644 --- a/Tests/AiEffects.TestApp/AiEffects.TestApp.iOS/AiEffects.TestApp.iOS.csproj +++ b/Tests/AiEffects.TestApp/AiEffects.TestApp.iOS/AiEffects.TestApp.iOS.csproj @@ -1,6 +1,6 @@  - + Debug iPhoneSimulator @@ -97,18 +97,6 @@ ..\..\..\packages\Xamarin.TestCloud.Agent.0.20.6\lib\Xamarin.iOS10\Calabash.dll - - ..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - - - ..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - - - ..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll - - - ..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll - ..\..\..\packages\Prism.Core.6.3.0\lib\Xamarin.iOS10\Prism.dll @@ -138,6 +126,18 @@ ..\..\..\packages\ReactiveProperty.3.6.0\lib\Xamarin.iOS10\ReactiveProperty.iOS.dll + + ..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + + + ..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll + + + ..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + + + ..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + @@ -178,5 +178,5 @@ - + \ No newline at end of file diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp.iOS/packages.config b/Tests/AiEffects.TestApp/AiEffects.TestApp.iOS/packages.config index 3d7d259..9b0133b 100644 --- a/Tests/AiEffects.TestApp/AiEffects.TestApp.iOS/packages.config +++ b/Tests/AiEffects.TestApp/AiEffects.TestApp.iOS/packages.config @@ -68,6 +68,6 @@ - + \ No newline at end of file diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.csproj b/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.csproj index 6c04eb9..b44efef 100644 --- a/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.csproj +++ b/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.csproj @@ -84,6 +84,7 @@ ViewCellPage.xaml + diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.nuget.props b/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.nuget.props index faaf2cd..5eb885e 100644 --- a/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.nuget.props +++ b/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.nuget.props @@ -13,6 +13,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.nuget.targets b/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.nuget.targets index f685a79..70edce6 100644 --- a/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.nuget.targets +++ b/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.nuget.targets @@ -4,6 +4,6 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + \ No newline at end of file diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp/ViewModels/ToFlatButtonPageViewModel.cs b/Tests/AiEffects.TestApp/AiEffects.TestApp/ViewModels/ToFlatButtonPageViewModel.cs new file mode 100644 index 0000000..5a873d5 --- /dev/null +++ b/Tests/AiEffects.TestApp/AiEffects.TestApp/ViewModels/ToFlatButtonPageViewModel.cs @@ -0,0 +1,13 @@ +using System; +using Reactive.Bindings; +namespace AiEffects.TestApp.ViewModels +{ + public class ToFlatButtonPageViewModel + { + public ReactiveProperty On { get; set; } = new ReactiveProperty(true); + + public ToFlatButtonPageViewModel() + { + } + } +} diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp/Views/ToFlatButtonPage.xaml b/Tests/AiEffects.TestApp/AiEffects.TestApp/Views/ToFlatButtonPage.xaml index 17b4a99..d7a15c6 100644 --- a/Tests/AiEffects.TestApp/AiEffects.TestApp/Views/ToFlatButtonPage.xaml +++ b/Tests/AiEffects.TestApp/AiEffects.TestApp/Views/ToFlatButtonPage.xaml @@ -20,22 +20,22 @@