diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Maui.FreakyControls.csproj b/MAUI.FreakyControls/MAUI.FreakyControls/Maui.FreakyControls.csproj index 5a235799..68333135 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Maui.FreakyControls.csproj +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Maui.FreakyControls.csproj @@ -146,4 +146,9 @@ + + + false + + \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/Android/Resources/values/styles.xml b/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/Android/Resources/values/styles.xml new file mode 100644 index 00000000..b04695a2 --- /dev/null +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Platforms/Android/Resources/values/styles.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyCodeView/CodeView.cs b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyCodeView/CodeView.cs index c7b6e636..3ac28212 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyCodeView/CodeView.cs +++ b/MAUI.FreakyControls/MAUI.FreakyControls/Shared/FreakyCodeView/CodeView.cs @@ -35,14 +35,13 @@ public CodeView() Dot = new Border() { StrokeShape = new Ellipse() { Fill = DefaultColor }, - Stroke = DefaultColor, - StrokeThickness = 1, + StrokeThickness = 0, HorizontalOptions = LayoutOptions.Center, VerticalOptions = LayoutOptions.Center, HeightRequest = DefaultDotSize, WidthRequest = DefaultDotSize, Scale = 0, - Padding = 0 + Padding = 0, }; CharLabel = new Label() @@ -82,7 +81,11 @@ public void SetRadius(ItemShape shapeType) { if (shapeType == ItemShape.Circle) { - this.StrokeShape = new RoundRectangle() { CornerRadius = (float)HeightRequest / 2 }; + this.StrokeShape = new Ellipse() + { + WidthRequest = (float)HeightRequest / 2, + HeightRequest = (float)HeightRequest / 2 + }; } else if (shapeType == ItemShape.Square) { diff --git a/MAUI.FreakyControls/MAUI.FreakyControls/readme.md b/MAUI.FreakyControls/MAUI.FreakyControls/readme.md index 0c84fc80..82a1e90c 100644 --- a/MAUI.FreakyControls/MAUI.FreakyControls/readme.md +++ b/MAUI.FreakyControls/MAUI.FreakyControls/readme.md @@ -8,25 +8,31 @@ Install-Package FreakyControls -Version xx.xx.xx Add the following using statement and Initialization in your MauiProgram: +```c# using MAUI.FreakyControls.Extensions; namespace Samples; public static class MauiProgram { -public static MauiApp CreateMauiApp() -{ -var builder = MauiApp.CreateBuilder(); -builder -.UseMauiApp() - .ConfigureFonts(fonts => - { - fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); - fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); - }); - //Takes one argument if you would like to init Skiasharp through FreakyControls or not. (Used for RadioButton, Checkbox & SVGImageView) + public static MauiApp CreateMauiApp() + { + var builder = MauiApp.CreateBuilder(); + + builder + .UseMauiApp() + .ConfigureFonts(fonts => + { + fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); + fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); + }); + + // Takes one argument if you would like to init Skiasharp through FreakyControls + // or not. (Used for RadioButton, Checkbox & SVGImageView) builder.InitializeFreakyControls(); + return builder.Build(); } } - +``` + Now you can use the controls in your app. diff --git a/MAUI.FreakyControls/Samples/InputViews/InputViews.xaml b/MAUI.FreakyControls/Samples/InputViews/InputViews.xaml index 1597b9e2..7feff030 100644 --- a/MAUI.FreakyControls/Samples/InputViews/InputViews.xaml +++ b/MAUI.FreakyControls/Samples/InputViews/InputViews.xaml @@ -1,4 +1,4 @@ - + - - - \ No newline at end of file + diff --git a/MAUI.FreakyControls/Samples/Platforms/Android/MainActivity.cs b/MAUI.FreakyControls/Samples/Platforms/Android/MainActivity.cs index 03af81aa..8ca6804d 100644 --- a/MAUI.FreakyControls/Samples/Platforms/Android/MainActivity.cs +++ b/MAUI.FreakyControls/Samples/Platforms/Android/MainActivity.cs @@ -7,7 +7,7 @@ namespace Samples; -[Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)] +[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) diff --git a/MAUI.FreakyControls/Samples/Samples.csproj b/MAUI.FreakyControls/Samples/Samples.csproj index fce6a31d..da907396 100644 --- a/MAUI.FreakyControls/Samples/Samples.csproj +++ b/MAUI.FreakyControls/Samples/Samples.csproj @@ -69,7 +69,6 @@ - @@ -122,6 +121,5 @@ - diff --git a/README.md b/README.md index 251e56a5..ab0e5a01 100644 --- a/README.md +++ b/README.md @@ -54,26 +54,31 @@ Run the following command to add our Nuget to your .Net MAUI app: Add the following using statement and Initialization in your MauiProgram: - using MAUI.FreakyControls.Extensions; - namespace Samples; - - public static class MauiProgram - { - public static MauiApp CreateMauiApp() - { - var builder = MauiApp.CreateBuilder(); - builder - .UseMauiApp() - .ConfigureFonts(fonts => - { - fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); - fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); - }); - //Takes one argument if you would like to init Skiasharp through FreakyControls or not. (Used for RadioButton, Checkbox & SVGImageView) +```c# +using MAUI.FreakyControls.Extensions; +namespace Samples; + +public static class MauiProgram +{ + public static MauiApp CreateMauiApp() + { + var builder = MauiApp.CreateBuilder(); + builder + .UseMauiApp() + .ConfigureFonts(fonts => + { + fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); + fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); + }); + + //Takes one argument if you would like to init Skiasharp + // through FreakyControls or not. (Used for RadioButton, Checkbox & SVGImageView) builder.InitializeFreakyControls(); + return builder.Build(); } } +``` Now you can use the controls in your app.