diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Maui.FreakyControls.csproj b/MAUI.FreakyControls/MAUI.FreakyControls/Maui.FreakyControls.csproj index 68333135..6cc35032 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Maui.FreakyControls.csproj +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Maui.FreakyControls.csproj @@ -12,9 +12,9 @@ 10.0.17763.0 10.0.17763.0 Maui.FreakyControls - 0.4.7 - 0.4.7 - 0.4.7-pre + 0.4.8 + 0.4.8 + 0.4.8 en FreakyControls diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/Android/Resources/values/styles.xml b/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/Android/Resources/values/styles.xml index b04695a2..d706271c 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/Android/Resources/values/styles.xml +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/Android/Resources/values/styles.xml @@ -1,9 +1,40 @@ - + + @color/colorPrimary + @color/colorPrimaryDark + @color/colorAccent + @color/colorActionMenuTextColor + @style/ThemeOverlay.AppCompat.Dark.ActionBar + @style/Widget.Design.BottomNavigationView + @style/MauiMaterialButton + @style/MauiCheckBox + false + @style/MauiAlertDialogTheme + false + true + true + ?attr/colorPrimary + @style/ActionMode + + + \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignaturePadView.xaml b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignaturePadView.xaml index ecb15f60..c8b76170 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignaturePadView.xaml +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignaturePadView.xaml @@ -9,11 +9,8 @@ - - - + + WidthRequest="{Binding ClearWidthRequest,Source={x:Reference this}}"> @@ -51,8 +44,6 @@ @@ -74,5 +65,5 @@ TextColor="{Binding CaptionTextColor, Source={x:Reference this}}" VerticalOptions="End" /> - + \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignaturePadView.xaml.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignaturePadView.xaml.cs index fc45a799..3df4a185 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignaturePadView.xaml.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakySignatureView/FreakySignaturePadView.xaml.cs @@ -136,6 +136,36 @@ public FreakySignaturePadView() public bool IsBlank => (bool)GetValue(IsBlankProperty); + public static readonly BindableProperty ClearHeightRequestProperty = BindableProperty.Create( + nameof(ClearHeightRequest), + typeof(double), + typeof(FreakySignaturePadView), + 35.0); + + public static readonly BindableProperty ClearWidthRequestProperty = BindableProperty.Create( + nameof(ClearWidthRequest), + typeof(double), + typeof(FreakySignaturePadView), + 35.0); + + /// + /// Gets or sets the width of the clear button + /// + public double ClearWidthRequest + { + get => (double)GetValue(ClearWidthRequestProperty); + set => SetValue(ClearWidthRequestProperty, value); + } + + /// + /// Gets or sets the height of the clear button + /// + public double ClearHeightRequest + { + get => (double)GetValue(ClearHeightRequestProperty); + set => SetValue(ClearHeightRequestProperty, value); + } + /// /// Gets or sets the color of the signature strokes. /// diff --git a/MAUI.FreakyControls/Samples/Platforms/Android/MainActivity.cs b/MAUI.FreakyControls/Samples/Platforms/Android/MainActivity.cs index 8ca6804d..0d2eba8d 100644 --- a/MAUI.FreakyControls/Samples/Platforms/Android/MainActivity.cs +++ b/MAUI.FreakyControls/Samples/Platforms/Android/MainActivity.cs @@ -1,18 +1,18 @@ -using Android.App; -using Android.Content.PM; -using Android.OS; -using Maui.FreakyControls.Platforms.Android; +using Android.App; +using Android.Content.PM; +using Android.OS; +using Maui.FreakyControls.Platforms.Android; using System.Diagnostics; -using Color = Android.Graphics.Color; - -namespace Samples; - -[Activity(Theme = "@style/FreakyControls.MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)] -public class MainActivity : FreakyMauiAppCompatActivity -{ - protected override void OnCreate(Bundle savedInstanceState) - { - base.OnCreate(savedInstanceState); - this.Window.SetNavigationBarColor(Color.Black); - } +using Color = Android.Graphics.Color; + +namespace Samples; + +[Activity(Theme = "@style/FreakyControls.MainTheme.Dark", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)] +public class MainActivity : FreakyMauiAppCompatActivity +{ + protected override void OnCreate(Bundle savedInstanceState) + { + base.OnCreate(savedInstanceState); + this.Window.SetNavigationBarColor(Color.Black); + } } \ No newline at end of file diff --git a/MAUI.FreakyControls/Samples/Samples.csproj b/MAUI.FreakyControls/Samples/Samples.csproj index da907396..3e4fcbbc 100644 --- a/MAUI.FreakyControls/Samples/Samples.csproj +++ b/MAUI.FreakyControls/Samples/Samples.csproj @@ -87,8 +87,8 @@ - - + + diff --git a/MAUI.FreakyControls/Samples/SignatureView/SignatureView.xaml b/MAUI.FreakyControls/Samples/SignatureView/SignatureView.xaml index 31e2aedb..6646292a 100644 --- a/MAUI.FreakyControls/Samples/SignatureView/SignatureView.xaml +++ b/MAUI.FreakyControls/Samples/SignatureView/SignatureView.xaml @@ -11,6 +11,8 @@