Merge pull request #6 from ShawnLaMountain/main

Updating Sample App to use FAB control
ThunderDesign · Mar 23, 2022 · eec97c2 · eec97c2
2 parents 57a9717 + 7430f8b
commit eec97c2
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 20,922 deletions.
diff --git a/samples/Xamarin/SimpleContacts/SimpleContacts.Android/SimpleContacts.Android.csproj b/samples/Xamarin/SimpleContacts/SimpleContacts.Android/SimpleContacts.Android.csproj
@@ -17,7 +17,7 @@
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v12.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
     <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
     <AndroidUseAapt2>true</AndroidUseAapt2>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>

diff --git a/samples/Xamarin/SimpleContacts/SimpleContacts/App.xaml b/samples/Xamarin/SimpleContacts/SimpleContacts/App.xaml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Application xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="SimpleContacts.App">
+             x:Class="SimpleContacts.App"
+             xmlns:fab="clr-namespace:ThunderDesign.Xamarin.Forms.FloatingActionButton.Controls;assembly=ThunderDesign.Xamarin.Forms.FloatingActionButton">
     <!--
         Define global resources and styles here, that apply to all pages in your app.
     -->
@@ -67,6 +68,14 @@
                     </Setter.Value>
                 </Setter>
             </Style>
+
+            <Style x:Key="RoundFAB" TargetType="fab:FloatingActionButton">
+                <Setter Property="TextColor" Value="White"></Setter>
+                <Setter Property="FontSize" Value="30"></Setter>
+                <Setter Property="WidthRequest" Value="56"></Setter>
+                <Setter Property="HeightRequest" Value="56"></Setter>
+                <Setter Property="CornerRadius" Value="28"></Setter>
+            </Style>
             <Style TargetType="Button">
                 <Setter Property="TextColor" Value="White"></Setter>
                 <Setter Property="VisualStateManager.VisualStateGroups">
@@ -86,6 +95,24 @@
                     </VisualStateGroupList>
                 </Setter>
             </Style>
+            <Style TargetType="fab:FloatingActionButton">
+                <Setter Property="VisualStateManager.VisualStateGroups">
+                    <VisualStateGroupList>
+                        <VisualStateGroup x:Name="CommonStates">
+                            <VisualState x:Name="Normal">
+                                <VisualState.Setters>
+                                    <Setter Property="BackgroundColor" Value="{StaticResource Primary}" />
+                                </VisualState.Setters>
+                            </VisualState>
+                            <VisualState x:Name="Disabled">
+                                <VisualState.Setters>
+                                    <Setter Property="BackgroundColor" Value="#332196F3" />
+                                </VisualState.Setters>
+                            </VisualState>
+                        </VisualStateGroup>
+                    </VisualStateGroupList>
+                </Setter>
+            </Style>
         </ResourceDictionary>        
     </Application.Resources>
 </Application>
diff --git a/samples/Xamarin/SimpleContacts/SimpleContacts/Controls/FloatingActionButton.xaml b/samples/Xamarin/SimpleContacts/SimpleContacts/Controls/FloatingActionButton.xaml
diff --git a/samples/Xamarin/SimpleContacts/SimpleContacts/Controls/FloatingActionButton.xaml.cs b/samples/Xamarin/SimpleContacts/SimpleContacts/Controls/FloatingActionButton.xaml.cs
diff --git a/samples/Xamarin/SimpleContacts/SimpleContacts/Extentions/ElementExtensions.cs b/samples/Xamarin/SimpleContacts/SimpleContacts/Extentions/ElementExtensions.cs