Skip to content

Commit

Permalink
Merge pull request #185 from Strypper/175-bug-progress-bar-page-incon…
Browse files Browse the repository at this point in the history 
…sistent-styling

175 bug progress bar page inconsistent styling
  • Loading branch information
@Strypper
Strypper authored Mar 17, 2024
2 parents dd0be74 + ff5094c commit 9f8d10f
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 62 deletions.
115 changes: 54 additions & 61 deletions src/Features/Gallery/Pages/BuiltIn/Controls/ProgressBar/ProgressBarPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,11 @@

<Border Padding="20" StrokeShape="RoundRectangle 4">
<VerticalStackLayout Spacing="10">
<Label FontSize="Medium"
HorizontalOptions="Start"
VerticalOptions="Center"
<Label Style="{x:StaticResource DocumentSectionTitleStyle}"
Text="Basic Progress Bar" />
<BoxView Background="White"
HeightRequest="1"
VerticalOptions="End"/>
<Grid ColumnDefinitions="0.25*, 0.75*"
RowDefinitions="auto, auto, auto">
RowDefinitions="auto, auto, auto"
RowSpacing="5">
<Label Grid.Column="0"
Grid.Row="0"
Text="This ProgressBar prepersent 0%"/>
Expand Down Expand Up @@ -94,37 +90,35 @@

<Border Padding="20" StrokeShape="RoundRectangle 4">
<VerticalStackLayout Spacing="10">
<Label FontSize="Medium"
HorizontalOptions="Start"
VerticalOptions="Center"
<Label Style="{x:StaticResource DocumentSectionTitleStyle}"
Text="Progress Bar with Color Changing" />
<BoxView Background="White"
HeightRequest="1"
VerticalOptions="End"/>
<CollectionView Footer="{x:StaticResource PropertiesListFooter}"
Header="{x:StaticResource PropertiesListHeader}"
ItemsSource="{x:StaticResource PropertyItemsSource}"
Style="{x:StaticResource PropertiesListStyle}"/>
<Frame BackgroundColor="#313131"
BorderColor="#313131"
Padding="5" >
<Grid ColumnDefinitions="0.1*, 0.6*, 0.1*, 0.2*">
<Label Grid.Column="0"
Text="0%"
VerticalOptions="Center"
HorizontalOptions="Center"/>
<ProgressBar x:Name="ProgressBar1"
Grid.Column="1"
Progress="0"/>
<Label x:Name="ProgressLabel"
Grid.Column="2"
Text="0%"
VerticalOptions="Center"
HorizontalOptions="Center"/>
<Button x:Name="ProgressBarLoadButton"
Grid.Column="3"
Clicked="ProgressBarLoadButtonClicked"
Text="Load"/>
</Grid>
</Frame>

<Grid ColumnDefinitions="0.1*, 0.6*, 0.1*, 0.2*">
<Label Grid.Column="0"
Text="0%"
VerticalOptions="Center"
HorizontalOptions="Center"/>
<ProgressBar x:Name="ProgressBar1"
Grid.Column="1"
Progress="0"/>
<Label x:Name="ProgressLabel"
Grid.Column="2"
Text="0%"
VerticalOptions="Center"
HorizontalOptions="Center"/>
<Button x:Name="ProgressBarLoadButton"
Grid.Column="3"
Clicked="ProgressBarLoadButtonClicked"
Text="Load"/>
</Grid>

<Label Text="This is xaml for the design" />
<app:SourceCodeExpander CodeType="Xaml" Code="{x:Binding XamlColorProgressBar}"/>
<Label Text="This is code behind" />
Expand All @@ -134,37 +128,36 @@

<Border Padding="20" StrokeShape="RoundRectangle 4">
<VerticalStackLayout Spacing="10">
<Label FontSize="Medium"
HorizontalOptions="Start"
Text="ProgressBar with Progress Animated"
VerticalOptions="Center" />
<BoxView Background="White"
HeightRequest="1"
VerticalOptions="End"/>
<Label Style="{x:StaticResource DocumentSectionTitleStyle}"
Text="ProgressBar with Progress Animation" />
<CollectionView ItemsSource="{x:StaticResource AnimatedProgressBar}"
Style="{x:StaticResource PropertiesListStyle}"/>
<Grid ColumnDefinitions="0.1*, 0.6*, 0.1*, 0.2*">
<Label Grid.Column="0"
Text="{Binding Path=Progress,
Source={x:Reference ProgressBar2},
Converter={StaticResource ProgressBarPercentageConverter},
ConverterParameter={x:Type x:String}}"
VerticalOptions="Center"
HorizontalOptions="Center"/>
<ProgressBar x:Name="ProgressBar2"
Grid.Column="1"
Margin="10"
Progress="0"
ProgressColor="Red"/>
<Label Grid.Column="2"
Text="100%"
VerticalOptions="Center"
HorizontalOptions="Center"/>
<Button x:Name="ProgressBarRunButton"
Grid.Column="3"
Clicked="ProgressBarRunButtonClicked"
Text="Run" />
</Grid>
<Frame BackgroundColor="#313131"
BorderColor="#313131"
Padding="5">
<Grid ColumnDefinitions="0.1*, 0.6*, 0.1*, 0.2*">
<Label Grid.Column="0"
Text="{Binding Path=Progress,
Source={x:Reference ProgressBar2},
Converter={StaticResource ProgressBarPercentageConverter},
ConverterParameter={x:Type x:String}}"
VerticalOptions="Center"
HorizontalOptions="Center"/>
<ProgressBar x:Name="ProgressBar2"
Grid.Column="1"
Margin="10"
Progress="0"
ProgressColor="Red"/>
<Label Grid.Column="2"
Text="100%"
VerticalOptions="Center"
HorizontalOptions="Center"/>
<Button x:Name="ProgressBarRunButton"
Grid.Column="3"
Clicked="ProgressBarRunButtonClicked"
Text="Run" />
</Grid>
</Frame>

<Label Text="This is xaml code" />
<app:SourceCodeExpander CodeType="Xaml" Code="{x:Binding }" />
Expand Down
4 changes: 3 additions & 1 deletion src/Features/Gallery/Pages/BuiltIn/Controls/ProgressBar/ProgressBarPageViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ public ProgressBarPageViewModel(IAppNavigator appNavigator)

[ObservableProperty]
string xamlStandardProgressBar =
"<ProgressBar Progress=\"0\"/>";
"<ProgressBar Progress=\"0\"/>\r\n" +
"<ProgressBar Progress=\"0.5\"/>\r\n" +
"<ProgressBar Progress=\"1\"/>\r\n";

[ObservableProperty]
string xamlColorProgressBar =
Expand Down

0 comments on commit 9f8d10f

Please sign in to comment.