Merge pull request #15 from IeuanWalker/Fix/ButtonMoved

Demo/App.iOS/App.iOS.csproj

@@ -36,6 +36,8 @@
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
     <MtouchArch>x86_64</MtouchArch>
+    <CodesignKey>Apple Development: Ieuan Walker (R4SVVV33HW)</CodesignKey>
+    <CodesignProvision>VS: WildCard Development</CodesignProvision>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>

Demo/App/App.csproj

@@ -19,4 +19,10 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Scr\StateButton\StateButton.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="ButtonNotInScrollViewPage.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>

Demo/App/App.xaml.cs

@@ -8,7 +8,7 @@ public App()
         {
             InitializeComponent();
 
-            MainPage = new MainPage();
+            MainPage = new NavigationPage(new MainPage());
         }
     }
 }

Demo/App/ButtonNotInScrollViewPage.xaml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage x:Class="App.ButtonNotInScrollViewPage"
+             xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:stateButton="clr-namespace:StateButton;assembly=StateButton">
+    <ContentPage.Content>
+        <StackLayout Padding="20">
+            <stateButton:StateButton AutomationProperties.IsInAccessibleTree="True"
+                                     AutomationProperties.Name="Test"
+                                     Clicked="StateButton_Clicked"
+                                     HorizontalOptions="Center"
+                                     Released="StateButton_Released">
+                <stateButton:StateButton.Content>
+                    <Frame Padding="20,10" BackgroundColor="Red">
+                        <Frame.Triggers>
+                            <DataTrigger Binding="{Binding Source={RelativeSource AncestorType={x:Type stateButton:StateButton}}, Path=State}"
+                                         TargetType="Frame"
+                                         Value="Pressed">
+                                <Setter Property="BackgroundColor" Value="LightGray" />
+                            </DataTrigger>
+                        </Frame.Triggers>
+                        <Label Text="Test" TextColor="White">
+                            <Label.Triggers>
+                                <DataTrigger Binding="{Binding Source={RelativeSource AncestorType={x:Type stateButton:StateButton}}, Path=State}"
+                                             TargetType="Label"
+                                             Value="Pressed">
+                                    <Setter Property="TextColor" Value="Blue" />
+                                </DataTrigger>
+                            </Label.Triggers>
+                        </Label>
+                    </Frame>
+                </stateButton:StateButton.Content>
+            </stateButton:StateButton>
+        </StackLayout>
+    </ContentPage.Content>
+</ContentPage>

Demo/App/ButtonNotInScrollViewPage.xaml.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace App
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class ButtonNotInScrollViewPage : ContentPage
+    {
+        public ButtonNotInScrollViewPage()
+        {
+            InitializeComponent();
+        }
+
+        private async void StateButton_Clicked(object sender, EventArgs e)
+        {
+            await DisplayAlert("Clicked", string.Empty, "OK");
+        }
+
+        private async void StateButton_Released(object sender, EventArgs e)
+        {
+            await DisplayAlert("Release", string.Empty, "OK");
+        }
+    }
+}

Demo/App/MainPage.xaml

@@ -4,13 +4,16 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:app="clr-namespace:App;assembly=App"
              xmlns:stateButton="clr-namespace:StateButton;assembly=StateButton"
-             xmlns:xct="http://xamarin.com/schemas/2020/toolkit">
+             xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
+             NavigationPage.HasNavigationBar="False">
     <ContentPage.BindingContext>
         <app:TestViewModel />
     </ContentPage.BindingContext>
     <ScrollView>
         <StackLayout Padding="20,10">
-            <!--  Events  -->
+            <Button Clicked="BtnNotInScrollView_Clicked" Text="Test button not in scrollview" />
+
+            <!-- Events -->
             <Label FontSize="Large" Text="Events" />
             <Label FontSize="Medium" Text="Clicked" />
             <stateButton:StateButton AutomationProperties.IsInAccessibleTree="True"
@@ -89,7 +92,7 @@
                      BackgroundColor="LightGray"
                      HeightRequest="1"
                      HorizontalOptions="Fill" />
-            <!--  Commands  -->
+            <!-- Commands -->
             <Label FontSize="Large" Text="Commands" />
             <Label FontSize="Medium" Text="Clicked" />
             <stateButton:StateButton ClickedCommand="{Binding ClickedCommand}" HorizontalOptions="Center">
@@ -165,7 +168,7 @@
                      BackgroundColor="LightGray"
                      HeightRequest="1"
                      HorizontalOptions="Fill" />
-            <!--  Visual state manager  -->
+            <!-- Visual state manager -->
             <Label FontSize="Large" Text="Visual state manager" />
             <stateButton:StateButton HorizontalOptions="Center">
                 <stateButton:StateButton.Content>
@@ -193,7 +196,7 @@
                      BackgroundColor="LightGray"
                      HeightRequest="1"
                      HorizontalOptions="Fill" />
-            <!--  Complex  -->
+            <!-- Complex -->
             <Label FontSize="Large" Text="Complex" />
             <stateButton:StateButton Clicked="Card_OnClicked" HorizontalOptions="Fill">
                 <stateButton:StateButton.Behaviors>
@@ -285,7 +288,7 @@
                      BackgroundColor="LightGray"
                      HeightRequest="1"
                      HorizontalOptions="Fill" />
-            <!--  Experiment  -->
+            <!-- Experiment -->
             <Label FontSize="Large" Text="Experiment" />
             <stateButton:StateButton HorizontalOptions="Fill">
                 <stateButton:StateButton.Content>

Demo/App/MainPage.xaml.cs

@@ -55,5 +55,10 @@ private async void NestButton_OnClicked(object sender, EventArgs e)
         {
             await DisplayAlert("Nested state button clicked", string.Empty, "OK");
         }
+
+        private async void BtnNotInScrollView_Clicked(object sender, EventArgs e)
+        {
+            await Navigation.PushAsync(new ButtonNotInScrollViewPage());
+        }
     }
 }

Scr/StateButton.Android/StateButtonRenderer.cs

@@ -19,6 +19,7 @@ public StateButtonRenderer(Context context) : base(context)
             SetAccessibilityDelegate(new MyAccessibilityDelegate());
         }
 
+        private Rect rect;
         protected override void OnElementChanged(ElementChangedEventArgs<Frame> e)
         {
             base.OnElementChanged(e);
@@ -33,9 +34,11 @@ protected override void OnElementChanged(ElementChangedEventArgs<Frame> e)
 
             Touch += (sender, te) =>
             {
+                var v = (AndroidView.View)sender;
                 switch (te.Event.Action)
                 {
                     case MotionEventActions.Down:
+                        rect = new Rect(v.Left, v.Top, v.Right, v.Bottom);
                         foreach (IGestureRecognizer recognizer in Element.GestureRecognizers.Where(x => x is TouchGestureRecognizer))
                         {
                             if (recognizer is TouchGestureRecognizer touchGestureRecognizer)
@@ -46,12 +49,20 @@ protected override void OnElementChanged(ElementChangedEventArgs<Frame> e)
                         break;
 
                     case MotionEventActions.Up:
+
                         foreach (IGestureRecognizer recognizer in Element.GestureRecognizers.Where(x => x is TouchGestureRecognizer))
                         {
                             if (recognizer is TouchGestureRecognizer touchGestureRecognizer)
                             {
-                                touchGestureRecognizer.Released();
-                                touchGestureRecognizer.Clicked();
+                                if (rect.Contains(v.Left + (int)te.Event.GetX(), v.Top + (int)te.Event.GetY()))
+                                {
+                                    touchGestureRecognizer.Released();
+                                    touchGestureRecognizer.Clicked();
+                                }
+                                else
+                                {
+                                    touchGestureRecognizer.Released();
+                                }
                             }
                         }
                         break;
@@ -65,6 +76,18 @@ protected override void OnElementChanged(ElementChangedEventArgs<Frame> e)
                             }
                         }
                         break;
+                    case MotionEventActions.Move:
+                        foreach (IGestureRecognizer recognizer in Element.GestureRecognizers.Where(x => x is TouchGestureRecognizer))
+                        {
+                            if (recognizer is TouchGestureRecognizer touchGestureRecognizer)
+                            {
+                                if (!rect.Contains(v.Left + (int)te.Event.GetX(), v.Top + (int)te.Event.GetY()))
+                                {
+                                    touchGestureRecognizer.Released();
+                                }
+                            }
+                        }
+                        break;
                 }
             };
         }

Scr/StateButton/StateButton.xaml.cs

@@ -159,6 +159,8 @@ private void ReleasedGesture()
         {
             if (!IsEnabled) return;
 
+            if (State.Equals(ButtonStateEnum.NotPressed)) return;
+
             Released?.Invoke(this, EventArgs.Empty);
             ReleasedCommand?.Execute(ReleasedCommandParameter);
 

Settings.XamlStyler

@@ -0,0 +1,41 @@
+{
+  "AttributesTolerance": 2,
+  "KeepFirstAttributeOnSameLine": true,
+  "MaxAttributeCharactersPerLine": 0,
+  "MaxAttributesPerLine": 1,
+  "NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransfom, SkewTransform, RotateTransform, TranslateTransform, Trigger, Condition, Setter",
+  "SeparateByGroups": false,
+  "AttributeIndentation": 0,
+  "AttributeIndentationStyle": 1,
+  "RemoveDesignTimeReferences": false,
+  "EnableAttributeReordering": true,
+  "AttributeOrderingRuleGroups": [
+    "x:Class",
+    "xmlns, xmlns:x",
+    "xmlns:*",
+    "x:Key, Key, x:Name, Name, x:Uid, Uid, Title",
+    "Grid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan, Canvas.Left, Canvas.Top, Canvas.Right, Canvas.Bottom",
+    "Width, Height, MinWidth, MinHeight, MaxWidth, MaxHeight",
+    "Margin, Padding, HorizontalAlignment, VerticalAlignment, HorizontalContentAlignment, VerticalContentAlignment, Panel.ZIndex",
+    "*:*, *",
+    "PageSource, PageIndex, Offset, Color, TargetName, Property, Value, StartPoint, EndPoint",
+    "mc:Ignorable, d:IsDataSource, d:LayoutOverrides, d:IsStaticText",
+    "Storyboard.*, From, To, Duration"
+  ],
+  "FirstLineAttributes": "",
+  "OrderAttributesByName": true,
+  "PutEndingBracketOnNewLine": false,
+  "RemoveEndingTagOfEmptyElement": true,
+  "SpaceBeforeClosingSlash": true,
+  "RootElementLineBreakRule": 0,
+  "ReorderVSM": 2,
+  "ReorderGridChildren": false,
+  "ReorderCanvasChildren": false,
+  "ReorderSetters": 0,
+  "FormatMarkupExtension": true,
+  "NoNewLineMarkupExtensions": "x:Bind, Binding",
+  "ThicknessSeparator": 2,
+  "ThicknessAttributes": "Margin, Padding, BorderThickness, ThumbnailClipMargin",
+  "FormatOnSave": true,
+  "CommentPadding": 1
+}