Skip to content

Commit

Permalink
Fixed version tag
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreasReitberger committed Oct 3, 2022
1 parent 77c0270 commit 94f8a62
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Version>1.0.2</Version>
<Version>1.0.4</Version>
<Title>MAUI Shared Styles Library</Title>
<Copyright>Andreas Reitberger</Copyright>
<PackageProjectUrl>https://github.com/AndreasReitberger/SharedMauiXamlStyles</PackageProjectUrl>
Expand Down Expand Up @@ -68,7 +68,7 @@


<ItemGroup>
<PackageReference Include="SharedMauiCoreLibrary" Version="1.0.3" />
<PackageReference Include="SharedMauiCoreLibrary" Version="1.0.4" />
<PackageReference Include="Syncfusion.Maui.Charts" Version="20.3.47" />
<PackageReference Include="Syncfusion.Maui.Core" Version="20.3.47" />
<PackageReference Include="Syncfusion.Maui.DataGrid" Version="20.3.47" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,26 @@
<Setter Property="ClearButtonIconColor" Value="{DynamicResource PrimaryColor}" />
<Setter Property="IsClearButtonVisible" Value="True" />
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray100}}" />
<Setter Property="FontFamily" Value="{StaticResource MontserratRegular}"/>
<!--<Setter Property="FontFamily" Value="{StaticResource MontserratRegular}"/>-->
<Setter Property="Margin" Value="4,2"/>

<!--
<Setter Property="VisualStateManager.VisualStateGroups">
<VisualStateGroupList>
<VisualStateGroup>
<VisualState x:Name="Default">
<VisualState.Setters>
<Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray900}}" />
<Setter Property="BackgroundColor" Value="{OnPlatform Android={AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray900}}, Default={AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray100}}" />
<Setter Property="BackgroundColor" Value="{OnPlatform Android={AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray100}}, Default={AppThemeBinding Light={StaticResource Gray800}, Dark={StaticResource Gray200}}}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateGroupList>
</Setter>
-->
</Style>

<Style TargetType="inputs:SfComboBox" BasedOn="{StaticResource DefaultComboBoxStyle}"/>
Expand All @@ -47,27 +46,26 @@
<Setter Property="ClearButtonIconColor" Value="{DynamicResource PrimaryColor}" />
<Setter Property="IsClearButtonVisible" Value="True" />
<Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray100}}" />
<Setter Property="FontFamily" Value="{StaticResource MontserratRegular}"/>
<!--<Setter Property="FontFamily" Value="{StaticResource MontserratRegular}"/>-->
<Setter Property="Margin" Value="4,2"/>

<!--
<Setter Property="VisualStateManager.VisualStateGroups">
<VisualStateGroupList>
<VisualStateGroup>
<VisualState x:Name="Default">
<VisualState.Setters>
<Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray900}}" />
<Setter Property="BackgroundColor" Value="{OnPlatform Android={AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray900}}, Default={AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}}" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray100}}" />
<Setter Property="BackgroundColor" Value="{OnPlatform Android={AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray100}}, Default={AppThemeBinding Light={StaticResource Gray800}, Dark={StaticResource Gray200}}}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateGroupList>
</Setter>
-->
</Style>

<Style TargetType="controls:MultiSelectComboBox" BasedOn="{StaticResource DefaultMultiSelectComboBox}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/Themes/SharedColors.xaml" />
<ResourceDictionary Source="/Themes/ItemTemplates/ListViewSwipeTemplates.xaml" />
</ResourceDictionary.MergedDictionaries>
<Style TargetType="listView:SfListView">
<!--<Setter Property="SelectionBackgroundColor" Value="{AppThemeBinding Light={DynamicResource PrimaryColor}, Dark={DynamicResource LightGray}}" />-->
Expand All @@ -17,4 +18,11 @@
</Trigger>
</Style.Triggers>
</Style>

<Style x:Key="ListViewDeleteEditSwipeableStyle" TargetType="listView:SfListView">
<Setter Property="AllowSwiping" Value="True" />
<Setter Property="SwipeThreshold" Value="70" />
<Setter Property="StartSwipeTemplate" Value="{StaticResource DeleteSwipeTemplate}" />
<Setter Property="EndSwipeTemplate" Value="{StaticResource EditSwipeTemplate}" />
</Style>
</ResourceDictionary>

0 comments on commit 94f8a62

Please sign in to comment.