Skip to content

Commit e134b75

Browse files
mattleibowmattleibow
authored
Fixed sample (#301)
1 parent d69383f commit e134b75

11 files changed

Lines changed: 124 additions & 46 deletions

File tree

‎samples/SkiaSharpDemo/App.xaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
<ResourceDictionary.MergedDictionaries>
1212
<ResourceDictionary Source="Resources/Styles/Colors.xaml" />
1313
<ResourceDictionary Source="Resources/Styles/Styles.xaml" />
14-
<views:BottomTabBarResources />
15-
<views:OptionButtonsResources />
1614
</ResourceDictionary.MergedDictionaries>
1715

1816
<converters:RoundToIntConverter x:Key="RoundToInt" />

‎samples/SkiaSharpDemo/App.xaml.cs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
namespace SkiaSharpDemo;
1+
using SkiaSharpDemo.Views;
2+
3+
namespace SkiaSharpDemo;
24

35
public partial class App : Application
46
{
57
public App()
68
{
79
InitializeComponent();
810

9-
MainPage = new AppShell();
11+
Resources.MergedDictionaries.Add(new OptionButtonsResources());
12+
Resources.MergedDictionaries.Add(new BottomTabBarResources());
1013
}
14+
15+
protected override Window CreateWindow(IActivationState? activationState) =>
16+
new Window(new AppShell());
1117
}

‎samples/SkiaSharpDemo/Demos/BlurHash/BlurHashPage.xaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@
2525
</Grid>
2626

2727
<CarouselView Grid.Row="1"
28-
HeightRequest="1" MinimumHeightRequest="100"
29-
ItemsSource="{Binding Sources}" CurrentItem="{Binding Source}"
28+
MinimumHeightRequest="100"
29+
ItemsSource="{Binding Sources}"
30+
CurrentItem="{Binding Source}"
3031
PeekAreaInsets="24,0"
3132
Margin="-12,0">
3233
<CarouselView.ItemTemplate>

‎samples/SkiaSharpDemo/Demos/Confetti/ConfettiPage.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
HorizontalOptions="End" VerticalOptions="Start"
2323
IsVisible="{Binding IsComplete, Source={Reference confettiView}}" />
2424

25-
<views:BottomTabBar SelectedIndex="{Binding SelectedTab}" PagePadding="12,6">
25+
<views:BottomTabBar SelectedIndex="{Binding SelectedTab}" PagePadding="12" Background="{StaticResource BackgroundBrush}">
2626
<views:BottomTabCollection>
2727

2828
<!-- "add type" -->
@@ -101,7 +101,7 @@
101101
</views:BottomTab>
102102

103103
<views:BottomTab Title="&#xf3fd;" HorizontalOptions="Fill" VerticalOptions="Center">
104-
<Grid ColumnDefinitions="Auto,*,30"
104+
<Grid ColumnDefinitions="Auto,*,Auto"
105105
RowDefinitions="Auto,Auto"
106106
ColumnSpacing="12" RowSpacing="12" Padding="12">
107107
<Label Text="Min"
@@ -127,7 +127,7 @@
127127
</views:BottomTab>
128128

129129
<views:BottomTab Title="&#xf017;" HorizontalOptions="Fill" VerticalOptions="Center">
130-
<Grid ColumnDefinitions="Auto,*,30"
130+
<Grid ColumnDefinitions="Auto,*,Auto"
131131
RowDefinitions="Auto,Auto"
132132
ColumnSpacing="12" RowSpacing="12" Padding="12">
133133
<Label Text="Lifetime"

‎samples/SkiaSharpDemo/Demos/Extended/InterpolationPage.xaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
<StackLayout Spacing="12">
88

99
<Label Text="{Binding Interpolation, StringFormat='{}{0:0}%'}" HorizontalOptions="Center" />
10-
<Slider Minimum="0" Maximum="100" Value="{Binding Interpolation}"
11-
MinimumTrackColor="Black" MaximumTrackColor="Black"
12-
ThumbColor="Black" />
10+
<Slider Minimum="0" Maximum="100" Value="{Binding Interpolation}" />
1311

1412
<Button Text="Toggle Animation" Command="{Binding AnimateCommand}" />
1513

‎samples/SkiaSharpDemo/Demos/Extended/ShapesPage.xaml.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ private void OnPaintSurface(object sender, SKPaintSurfaceEventArgs e)
6565
{
6666
IsAntialias = true,
6767
TextSize = 12,
68+
Color = ((SolidColorBrush)App.Current!.Resources["ForegroundBrush"]).Color.ToSKColor(),
6869
};
6970

7071
// create the paint for the shapes

‎samples/SkiaSharpDemo/Resources/Styles/Colors.xaml‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,21 @@
44
xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
55
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
66

7+
<!-- Note: For Android please see also Platforms\Android\Resources\values\colors.xml -->
8+
79
<Color x:Key="Primary">#512BD4</Color>
10+
<Color x:Key="PrimaryDark">#ac99ea</Color>
11+
<Color x:Key="PrimaryDarkText">#242424</Color>
812
<Color x:Key="Secondary">#DFD8F7</Color>
13+
<Color x:Key="SecondaryDarkText">#9880e5</Color>
914
<Color x:Key="Tertiary">#2B0B98</Color>
15+
1016
<Color x:Key="White">White</Color>
1117
<Color x:Key="Black">Black</Color>
18+
<Color x:Key="Magenta">#D600AA</Color>
19+
<Color x:Key="MidnightBlue">#190649</Color>
20+
<Color x:Key="OffBlack">#1f1f1f</Color>
21+
1222
<Color x:Key="Gray100">#E1E1E1</Color>
1323
<Color x:Key="Gray200">#C8C8C8</Color>
1424
<Color x:Key="Gray300">#ACACAC</Color>
@@ -17,11 +27,13 @@
1727
<Color x:Key="Gray600">#404040</Color>
1828
<Color x:Key="Gray900">#212121</Color>
1929
<Color x:Key="Gray950">#141414</Color>
30+
2031
<SolidColorBrush x:Key="PrimaryBrush" Color="{StaticResource Primary}"/>
2132
<SolidColorBrush x:Key="SecondaryBrush" Color="{StaticResource Secondary}"/>
2233
<SolidColorBrush x:Key="TertiaryBrush" Color="{StaticResource Tertiary}"/>
2334
<SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource White}"/>
2435
<SolidColorBrush x:Key="BlackBrush" Color="{StaticResource Black}"/>
36+
2537
<SolidColorBrush x:Key="Gray100Brush" Color="{StaticResource Gray100}"/>
2638
<SolidColorBrush x:Key="Gray200Brush" Color="{StaticResource Gray200}"/>
2739
<SolidColorBrush x:Key="Gray300Brush" Color="{StaticResource Gray300}"/>
@@ -31,14 +43,7 @@
3143
<SolidColorBrush x:Key="Gray900Brush" Color="{StaticResource Gray900}"/>
3244
<SolidColorBrush x:Key="Gray950Brush" Color="{StaticResource Gray950}"/>
3345

34-
<Color x:Key="Yellow100Accent">#F7B548</Color>
35-
<Color x:Key="Yellow200Accent">#FFD590</Color>
36-
<Color x:Key="Yellow300Accent">#FFE5B9</Color>
37-
<Color x:Key="Cyan100Accent">#28C2D1</Color>
38-
<Color x:Key="Cyan200Accent">#7BDDEF</Color>
39-
<Color x:Key="Cyan300Accent">#C3F2F4</Color>
40-
<Color x:Key="Blue100Accent">#3E8EED</Color>
41-
<Color x:Key="Blue200Accent">#72ACF1</Color>
42-
<Color x:Key="Blue300Accent">#A7CBF6</Color>
46+
<SolidColorBrush x:Key="ForegroundBrush" Color="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
47+
<SolidColorBrush x:Key="BackgroundBrush" Color="{AppThemeBinding Light='#ccffffff', Dark='#cc1f1f1f'}" />
4348

4449
</ResourceDictionary>

0 commit comments

Comments
 (0)