Skip to content
This repository was archived by the owner on Apr 29, 2024. It is now read-only.

Commit bc59290

Browse files
davidbritchdavidbritch
committed
Layout fixed.
1 parent d2e0cb6 commit bc59290

File tree

10 files changed

+148
-153
lines changed

10 files changed

+148
-153
lines changed

‎UserInterface/BrushDemos/BrushesDemos/App.xaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Application xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:d="http://xamarin.com/schemas/2014/forms/design" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" x:Class="BrushesDemos.App">
2+
<Application xmlns="http://xamarin.com/schemas/2014/forms"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4+
xmlns:d="http://xamarin.com/schemas/2014/forms/design"
5+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6+
mc:Ignorable="d"
7+
x:Class="BrushesDemos.App">
38
<Application.Resources>
49
</Application.Resources>
510
</Application>

‎UserInterface/BrushDemos/BrushesDemos/Controls/GradientColorPicker.xaml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<Grid Opacity="0.3"
77
BackgroundColor="Black" />
88
<Frame CornerRadius="12"
9-
HasShadow="false"
10-
Margin="35,25"
11-
Padding="12"
12-
BackgroundColor="White"
13-
HorizontalOptions="Center"
14-
VerticalOptions="Center">
9+
HasShadow="false"
10+
Margin="35,25"
11+
Padding="12"
12+
BackgroundColor="White"
13+
HorizontalOptions="Center"
14+
VerticalOptions="Center">
1515
<StackLayout Spacing="10">
1616
<ScrollView>
1717
<FlexLayout x:Name="colorsLayout"
@@ -21,29 +21,29 @@
2121
<BindableLayout.ItemTemplate>
2222
<DataTemplate>
2323
<Grid HeightRequest="50"
24-
WidthRequest="50">
24+
WidthRequest="50">
2525
<Grid.GestureRecognizers>
2626
<TapGestureRecognizer Tapped="OnColorSourceTapped" />
2727
</Grid.GestureRecognizers>
2828
<BoxView Margin="5"
29-
CornerRadius="12"
30-
HeightRequest="50"
31-
WidthRequest="50"
32-
Color="{Binding Color}" />
29+
CornerRadius="12"
30+
HeightRequest="50"
31+
WidthRequest="50"
32+
Color="{Binding Color}" />
3333
<BoxView IsVisible="{Binding IsSelected}"
34-
CornerRadius="6"
35-
HeightRequest="12"
36-
WidthRequest="12"
37-
Color="White"
38-
HorizontalOptions="Center"
39-
VerticalOptions="Center" />
34+
CornerRadius="6"
35+
HeightRequest="12"
36+
WidthRequest="12"
37+
Color="White"
38+
HorizontalOptions="Center"
39+
VerticalOptions="Center" />
4040
</Grid>
4141
</DataTemplate>
4242
</BindableLayout.ItemTemplate>
4343
</FlexLayout>
4444
</ScrollView>
4545
<StackLayout Orientation="Horizontal"
46-
HorizontalOptions="End">
46+
HorizontalOptions="End">
4747
<Button Text="Cancel"
4848
BackgroundColor="Transparent"
4949
FontAttributes="Bold"

‎UserInterface/BrushDemos/BrushesDemos/Views/AllSolidColorBrushesDemoPage.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<DataTemplate>
1515
<Grid ColumnDefinitions="0.2*, 0.5*, 0.3*">
1616
<BoxView Color="{Binding Color}"
17-
HeightRequest="20"
18-
WidthRequest="40"
19-
VerticalOptions="Center" />
17+
HeightRequest="20"
18+
WidthRequest="40"
19+
VerticalOptions="Center" />
2020
<Label Grid.Column="1"
2121
Text="{Binding Name}"
2222
VerticalOptions="Center" />

‎UserInterface/BrushDemos/BrushesDemos/Views/CSSDemoPage.xaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
</ContentPage.Resources>
1313

1414
<StackLayout Margin="20">
15-
<Label Text="linear-gradient(90deg, rgb(255, 0, 0),rgb(255, 153, 51))"/>
15+
<Label Text="linear-gradient(90deg, rgb(255, 0, 0),rgb(255, 153, 51))" />
1616
<Grid StyleClass="linearGradientStyleWithCss90deg" />
17-
<Label Text="linear-gradient(180deg, rgb(255, 0, 0),rgb(255, 153, 51))"/>
17+
<Label Text="linear-gradient(180deg, rgb(255, 0, 0),rgb(255, 153, 51))" />
1818
<Grid StyleClass="linearGradientStyleWithCss180deg" />
19-
<Label Text="linear-gradient(270deg, rgb(255, 0, 0),rgb(255, 153, 51))"/>
19+
<Label Text="linear-gradient(270deg, rgb(255, 0, 0),rgb(255, 153, 51))" />
2020
<Grid StyleClass="linearGradientStyleWithCss270deg" />
21-
<Label Text="radial-gradient(circle, rgb(255, 0, 0) 25%, rgb(0, 255, 0) 50%, rgb(0, 0, 255) 75%)"/>
21+
<Label Text="radial-gradient(circle, rgb(255, 0, 0) 25%, rgb(0, 255, 0) 50%, rgb(0, 0, 255) 75%)" />
2222
<Grid StyleClass="radialGradientStyleWithCss" />
23-
<Label Text="radial-gradient(circle at left, rgb(255, 0, 0) 25%, rgb(0, 255, 0) 50%, rgb(0, 0, 255) 75%)"/>
23+
<Label Text="radial-gradient(circle at left, rgb(255, 0, 0) 25%, rgb(0, 255, 0) 50%, rgb(0, 0, 255) 75%)" />
2424
<Grid StyleClass="radialGradientStyleWithCssLeft" />
25-
<Label Text="radial-gradient(circle at right, rgb(255, 0, 0) 25%, rgb(0, 255, 0) 50%, rgb(0, 0, 255) 75%)"/>
25+
<Label Text="radial-gradient(circle at right, rgb(255, 0, 0) 25%, rgb(0, 255, 0) 50%, rgb(0, 0, 255) 75%)" />
2626
<Grid StyleClass="radialGradientStyleWithCssRight" />
2727
</StackLayout>
2828
</ContentPage>

‎UserInterface/BrushDemos/BrushesDemos/Views/LinearGradientBrushDemoPage.xaml‎

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,61 +7,58 @@
77
<StackLayout Margin="20">
88
<Label Text="LinearGradientBrush (Horizontal)"
99
FontAttributes="Bold" />
10-
<Frame
11-
Margin="0,20,0,0"
12-
BorderColor="LightGray"
13-
HasShadow="True"
14-
CornerRadius="12"
15-
HeightRequest="120"
16-
WidthRequest="120">
10+
<Frame Margin="0,20,0,0"
11+
BorderColor="LightGray"
12+
HasShadow="True"
13+
CornerRadius="12"
14+
HeightRequest="120"
15+
WidthRequest="120">
1716
<Frame.Background>
1817
<!-- StartPoint defaults to (0,0) -->
1918
<LinearGradientBrush EndPoint="1,0">
2019
<GradientStop Color="Yellow"
21-
Offset="0.1" />
20+
Offset="0.1" />
2221
<GradientStop Color="Green"
23-
Offset="1.0" />
22+
Offset="1.0" />
2423
</LinearGradientBrush>
2524
</Frame.Background>
2625
</Frame>
2726
<Label Margin="0,20,0,0"
2827
Text="LinearGradientBrush (Vertical)"
2928
FontAttributes="Bold" />
30-
<Frame
31-
Margin="0,20,0,0"
32-
BorderColor="LightGray"
33-
HasShadow="True"
34-
CornerRadius="12"
35-
HeightRequest="120"
36-
WidthRequest="120">
29+
<Frame Margin="0,20,0,0"
30+
BorderColor="LightGray"
31+
HasShadow="True"
32+
CornerRadius="12"
33+
HeightRequest="120"
34+
WidthRequest="120">
3735
<Frame.Background>
3836
<!-- StartPoint defaults to (0,0) -->
3937
<LinearGradientBrush EndPoint="0,1">
4038
<GradientStop Color="Yellow"
41-
Offset="0.1" />
39+
Offset="0.1" />
4240
<GradientStop Color="Green"
43-
Offset="1.0" />
41+
Offset="1.0" />
4442
</LinearGradientBrush>
4543
</Frame.Background>
4644
</Frame>
4745
<Label Margin="0,20,0,0"
4846
Text="LinearGradientBrush (Diagonal)"
4947
FontAttributes="Bold" />
50-
<Frame
51-
Margin="0,20,0,0"
52-
BorderColor="LightGray"
53-
HasShadow="True"
54-
CornerRadius="12"
55-
HeightRequest="120"
56-
WidthRequest="120">
48+
<Frame Margin="0,20,0,0"
49+
BorderColor="LightGray"
50+
HasShadow="True"
51+
CornerRadius="12"
52+
HeightRequest="120"
53+
WidthRequest="120">
5754
<Frame.Background>
5855
<!-- StartPoint defaults to (0,0)
5956
Endpoint defaults to (1,1) -->
6057
<LinearGradientBrush>
6158
<GradientStop Color="Yellow"
62-
Offset="0.1" />
59+
Offset="0.1" />
6360
<GradientStop Color="Green"
64-
Offset="1.0" />
61+
Offset="1.0" />
6562
</LinearGradientBrush>
6663
</Frame.Background>
6764
</Frame>

‎UserInterface/BrushDemos/BrushesDemos/Views/LinearGradientBrushExplorerPage.xaml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,35 @@
1414
HeightRequest="120"
1515
WidthRequest="120">
1616
<Label Text="LinearGradientBrush"
17-
HorizontalOptions="Center"
18-
VerticalOptions="Center" />
17+
HorizontalOptions="Center"
18+
VerticalOptions="Center" />
1919
</Frame>
2020
</Grid>
2121
<ScrollView Grid.Row="1"
2222
Margin="12,0"
2323
Padding="12">
2424
<StackLayout>
2525
<Label Text="Gradients"
26-
FontSize="24"
27-
VerticalTextAlignment="Center" />
26+
FontSize="24"
27+
VerticalTextAlignment="Center" />
2828
<StackLayout x:Name="gradientsStackLayout">
2929
<BindableLayout.ItemTemplate>
3030
<DataTemplate>
3131
<StackLayout Orientation="Horizontal"
32-
Spacing="8">
32+
Spacing="8">
3333
<Entry Placeholder="Gradient color (hex)"
34-
BackgroundColor="{Binding Color}"
35-
TextChanged="OnGradientChanged"
36-
HorizontalOptions="FillAndExpand" />
34+
BackgroundColor="{Binding Color}"
35+
TextChanged="OnGradientChanged"
36+
HorizontalOptions="FillAndExpand" />
3737
<Frame CornerRadius="6"
38-
HasShadow="false"
39-
BorderColor="LightGray"
40-
BackgroundColor="{Binding Color}">
38+
HasShadow="false"
39+
BorderColor="LightGray"
40+
BackgroundColor="{Binding Color}">
4141
<Frame.GestureRecognizers>
4242
<TapGestureRecognizer Tapped="OnColorPickerTapped" />
4343
</Frame.GestureRecognizers>
4444
<Label Text="..."
45-
HorizontalOptions="Center" />
45+
HorizontalOptions="Center" />
4646
</Frame>
4747
</StackLayout>
4848
</DataTemplate>
@@ -55,19 +55,19 @@
5555
Clicked="OnRemoveButtonClicked" />
5656
</StackLayout>
5757
<Label Text="Start point"
58-
FontSize="24" />
58+
FontSize="24" />
5959
<Entry x:Name="startPointEntry"
60-
Placeholder="Start point"
61-
TextChanged="OnStartPointChanged"
62-
Text="0, 0"
63-
Keyboard="Numeric" />
60+
Placeholder="Start point"
61+
TextChanged="OnStartPointChanged"
62+
Text="0, 0"
63+
Keyboard="Numeric" />
6464
<Label Text="End point"
65-
FontSize="24" />
65+
FontSize="24" />
6666
<Entry x:Name="endPointEntry"
67-
Placeholder="End point"
68-
TextChanged="OnEndPointChanged"
69-
Text="1, 1"
70-
Keyboard="Numeric" />
67+
Placeholder="End point"
68+
TextChanged="OnEndPointChanged"
69+
Text="1, 1"
70+
Keyboard="Numeric" />
7171
</StackLayout>
7272
</ScrollView>
7373
</Grid>

‎UserInterface/BrushDemos/BrushesDemos/Views/RadialGradientBrushDemoPage.xaml‎

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,61 +7,58 @@
77
<StackLayout Margin="20">
88
<Label Text="RadialGradientBrush (Upper left)"
99
FontAttributes="Bold" />
10-
<Frame
11-
Margin="0,20,0,0"
12-
BorderColor="LightGray"
13-
HasShadow="True"
14-
CornerRadius="12"
15-
HeightRequest="120"
16-
WidthRequest="120">
10+
<Frame Margin="0,20,0,0"
11+
BorderColor="LightGray"
12+
HasShadow="True"
13+
CornerRadius="12"
14+
HeightRequest="120"
15+
WidthRequest="120">
1716
<Frame.Background>
1817
<!-- Radius defaults to (0.5) -->
1918
<RadialGradientBrush Center="0.0,0.0">
2019
<GradientStop Color="Red"
21-
Offset="0.1" />
20+
Offset="0.1" />
2221
<GradientStop Color="DarkBlue"
23-
Offset="1.0" />
22+
Offset="1.0" />
2423
</RadialGradientBrush>
2524
</Frame.Background>
2625
</Frame>
2726
<Label Margin="0,20,0,0"
2827
Text="RadialGradientBrush (Center)"
2928
FontAttributes="Bold" />
30-
<Frame
31-
Margin="0,20,0,0"
32-
BorderColor="LightGray"
33-
HasShadow="True"
34-
CornerRadius="12"
35-
HeightRequest="120"
36-
WidthRequest="120">
29+
<Frame Margin="0,20,0,0"
30+
BorderColor="LightGray"
31+
HasShadow="True"
32+
CornerRadius="12"
33+
HeightRequest="120"
34+
WidthRequest="120">
3735
<Frame.Background>
3836
<!-- Center defaults to (0.5,0.5)
3937
Radius defaults to (0.5) -->
4038
<RadialGradientBrush>
4139
<GradientStop Color="Red"
42-
Offset="0.1" />
40+
Offset="0.1" />
4341
<GradientStop Color="DarkBlue"
44-
Offset="1.0" />
42+
Offset="1.0" />
4543
</RadialGradientBrush>
4644
</Frame.Background>
4745
</Frame>
4846
<Label Margin="0,20,0,0"
4947
Text="RadialGradientBrush (Lower right)"
5048
FontAttributes="Bold" />
51-
<Frame
52-
Margin="0,20,0,0"
53-
BorderColor="LightGray"
54-
HasShadow="True"
55-
CornerRadius="12"
56-
HeightRequest="120"
57-
WidthRequest="120">
49+
<Frame Margin="0,20,0,0"
50+
BorderColor="LightGray"
51+
HasShadow="True"
52+
CornerRadius="12"
53+
HeightRequest="120"
54+
WidthRequest="120">
5855
<Frame.Background>
5956
<!-- Radius defaults to (0.5) -->
6057
<RadialGradientBrush Center="1.0,1.0">
6158
<GradientStop Color="Red"
62-
Offset="0.1" />
59+
Offset="0.1" />
6360
<GradientStop Color="DarkBlue"
64-
Offset="1.0" />
61+
Offset="1.0" />
6562
</RadialGradientBrush>
6663
</Frame.Background>
6764
</Frame>

0 commit comments

Comments
 (0)