Skip to content

Commit

Permalink
Release 0.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@robinmanuelthiel
robinmanuelthiel committed Jul 14, 2019
1 parent 1a03796 commit 1a0f33c
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 63 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,3 +288,4 @@ __pycache__/
*.xsd.cs
Flex.Demo.Droid/Resources/Resource.designer.cs
.mfractor/
.DS_Store
22 changes: 2 additions & 20 deletions Flex.Demo/App.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,10 @@
<?xml version="1.0" encoding="utf-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"
xmlns:flex="clr-namespace:Flex.Controls;assembly=Flex"
x:Class="Flex.Demo.App">
<Application.Resources>
<!-- Application resource dictionary -->
<ResourceDictionary>
<Style
TargetType="flex:FlexButton"
x:Key="ToggleButton">
<Setter
Property="BackgroundColor"
Value="#6279B8" />
<Setter
Property="ForegroundColor"
Value="#ffffff" />
<Setter
Property="HighlightForegroundColor"
Value="#49516F" />
<Setter
Property="HighlightBackgroundColor"
Value="#8EA4D2" />
</Style>
</ResourceDictionary>
<!-- Application resource dictionary -->
</Application.Resources>
</Application>
21 changes: 14 additions & 7 deletions Flex.Demo/FlexDemoPage.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<ContentPage
xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
Expand All @@ -24,7 +24,14 @@
<On Platform="iOS" Value="Gray" />
</OnPlatform>
</Setter.Value>
</Setter>
</Setter>
</Style>

<Style x:Key="DefaultFlexButton" TargetType="flex:FlexButton">
<Setter Property="BackgroundColor" Value="#6279B8" />
<Setter Property="ForegroundColor" Value="#ffffff" />
<Setter Property="HighlightForegroundColor" Value="#49516F" />
<Setter Property="HighlightBackgroundColor" Value="#8EA4D2" />
</Style>
</ResourceDictionary>
</ContentPage.Resources>
Expand All @@ -47,7 +54,10 @@
IconPadding="0"
CornerRadius="38"
Icon="lightbulb.png"
Style="{StaticResource ToggleButton}"
ForegroundColor="#ffffff"
HighlightForegroundColor="#49516F"
BackgroundColor="#6279B8"
HighlightBackgroundColor="#8EA4D2"
BorderColor="#8EA4D2"
HighlightBorderColor="#8EA4D2"
BorderThickness="3"
Expand All @@ -67,10 +77,7 @@
CornerRadius="20"
Icon="lightbulb.png"
VerticalOptions="Start"
ForegroundColor="#ffffff"
HighlightForegroundColor="#49516F"
BackgroundColor="#6279B8"
HighlightBackgroundColor="#8EA4D2"/>
Style="{StaticResource DefaultFlexButton}"/>

<flex:FlexButton
HeightRequest="40"
Expand Down
66 changes: 33 additions & 33 deletions FlexButton.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flex.iOS", "Flex.iOS\Flex.i
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flex.Demo.iOS", "Flex.Demo.iOS\Flex.Demo.iOS.csproj", "{56D7D974-CB4E-4529-AE84-51EF1450F6FC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flex.Demo.Droid", "Flex.Demo.Droid\Flex.Demo.Droid.csproj", "{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flex.Demo.UITests", "Flex.Demo.UITests\Flex.Demo.UITests.csproj", "{E11780C4-2D05-48BE-A8C2-C0C89463A8D1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flex", "Flex\Flex.csproj", "{4FBE2794-BD54-4C5E-B95A-46B2D5606C5F}"
Expand All @@ -27,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flex.Demo.UWP", "Flex.Demo.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flex.UWP", "Flex.UWP\Flex.UWP.csproj", "{82BBCD26-EE52-4701-BD3B-3AC28FE9C235}"
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Flex.Demo.Droid", "Flex.Demo.Droid\Flex.Demo.Droid.csproj", "{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -97,36 +97,6 @@ Global
{56D7D974-CB4E-4529-AE84-51EF1450F6FC}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{56D7D974-CB4E-4529-AE84-51EF1450F6FC}.Release|x64.ActiveCfg = Release|iPhoneSimulator
{56D7D974-CB4E-4529-AE84-51EF1450F6FC}.Release|x86.ActiveCfg = Release|iPhoneSimulator
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Debug|ARM.ActiveCfg = Debug|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Debug|ARM.Build.0 = Debug|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Debug|ARM.Deploy.0 = Debug|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Debug|iPhone.Build.0 = Debug|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Debug|x64.ActiveCfg = Debug|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Debug|x64.Build.0 = Debug|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Debug|x64.Deploy.0 = Debug|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Debug|x86.ActiveCfg = Debug|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Debug|x86.Build.0 = Debug|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Debug|x86.Deploy.0 = Debug|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Release|Any CPU.Build.0 = Release|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Release|ARM.ActiveCfg = Release|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Release|ARM.Build.0 = Release|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Release|ARM.Deploy.0 = Release|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Release|iPhone.ActiveCfg = Release|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Release|iPhone.Build.0 = Release|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Release|x64.ActiveCfg = Release|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Release|x64.Build.0 = Release|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Release|x64.Deploy.0 = Release|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Release|x86.ActiveCfg = Release|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Release|x86.Build.0 = Release|Any CPU
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F}.Release|x86.Deploy.0 = Release|Any CPU
{E11780C4-2D05-48BE-A8C2-C0C89463A8D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E11780C4-2D05-48BE-A8C2-C0C89463A8D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E11780C4-2D05-48BE-A8C2-C0C89463A8D1}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -251,16 +221,46 @@ Global
{82BBCD26-EE52-4701-BD3B-3AC28FE9C235}.Release|x64.Build.0 = Release|x64
{82BBCD26-EE52-4701-BD3B-3AC28FE9C235}.Release|x86.ActiveCfg = Release|x86
{82BBCD26-EE52-4701-BD3B-3AC28FE9C235}.Release|x86.Build.0 = Release|x86
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Debug|ARM.ActiveCfg = Debug|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Debug|ARM.Build.0 = Debug|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Debug|ARM.Deploy.0 = Debug|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Debug|iPhone.Build.0 = Debug|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Debug|x64.ActiveCfg = Debug|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Debug|x64.Build.0 = Debug|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Debug|x64.Deploy.0 = Debug|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Debug|x86.ActiveCfg = Debug|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Debug|x86.Build.0 = Debug|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Debug|x86.Deploy.0 = Debug|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Release|Any CPU.Build.0 = Release|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Release|ARM.ActiveCfg = Release|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Release|ARM.Build.0 = Release|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Release|ARM.Deploy.0 = Release|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Release|iPhone.ActiveCfg = Release|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Release|iPhone.Build.0 = Release|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Release|x64.ActiveCfg = Release|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Release|x64.Build.0 = Release|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Release|x64.Deploy.0 = Release|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Release|x86.ActiveCfg = Release|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Release|x86.Build.0 = Release|Any CPU
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551}.Release|x86.Deploy.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{56D7D974-CB4E-4529-AE84-51EF1450F6FC} = {0DE97C93-9067-448F-BB07-6DAF257F67EE}
{5C61ACDA-5832-40D3-91F9-B0E19E828D7F} = {0DE97C93-9067-448F-BB07-6DAF257F67EE}
{E11780C4-2D05-48BE-A8C2-C0C89463A8D1} = {0DE97C93-9067-448F-BB07-6DAF257F67EE}
{1A52E52B-9644-4C1C-9E25-6C72FE33C25D} = {0DE97C93-9067-448F-BB07-6DAF257F67EE}
{FE0AADE0-65A2-465D-B38F-0E61E2763491} = {0DE97C93-9067-448F-BB07-6DAF257F67EE}
{2A4B970A-F4EF-4A22-A5DA-CF8A3940F551} = {0DE97C93-9067-448F-BB07-6DAF257F67EE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {22158A5A-6CDB-4920-837E-2808DFDDCA5D}
Expand Down
6 changes: 3 additions & 3 deletions Nuget/Forms.Controls.FlexButton.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata minClientVersion="">
<id>Forms.Controls.FlexButton</id>
<version>0.9.1</version>
<version>0.10.0</version>
<title>FlexButton for Xamarin.Forms</title>
<authors>Robin-Manuel Thiel</authors>
<owners>Robin-Manuel Thiel</owners>
<licenseUrl>https://github.com/robinmanuelthiel/flexbutton/blob/master/LICENSE</licenseUrl>
<license type="expression">MIT</license>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<projectUrl>https://github.com/robinmanuelthiel/flexbutton</projectUrl>
<iconUrl>https://raw.githubusercontent.com/robinmanuelthiel/flexbutton/master/Design/Logo-150.png</iconUrl>
<description>Flexible button control for Xamarin.Forms</description>
<summary>Flexible button control for Xamarin.Forms</summary>
<releaseNotes>Fix crash on UWP</releaseNotes>
<releaseNotes>Add support for Xamarin.Forms 4.0 and Styles</releaseNotes>
<copyright></copyright>
<language></language>
<tags>flex xamarin.forms control button flexbutton xamarin flexible pill</tags>
Expand Down

0 comments on commit 1a0f33c

Please sign in to comment.