Skip to content

Commit 2d148c6

Browse files
morning4coffe-devmorning4coffe-dev
committed
Minor adjustments from review
1 parent 4a311b2 commit 2d148c6

File tree

4 files changed

+16
-28
lines changed

4 files changed

+16
-28
lines changed

‎10.0/Apps/TipCalc/TipCalc/TipCalc.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,4 @@
6464
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
6565
</ItemGroup>
6666

67-
<ItemGroup>
68-
<MauiXaml Update="TipCalcPage.xaml">
69-
<Generator>MSBuild:Compile</Generator>
70-
</MauiXaml>
71-
</ItemGroup>
72-
7367
</Project>

‎10.0/Apps/TipCalc/TipCalc/TipCalcPage.xaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
x:Class="TipCalc.TipCalcPage">
66
<ContentPage.Resources>
77
<ResourceDictionary>
8-
<local:TipCalcModel x:Key="model" TipPercent="15" />
9-
<local:DoubleToStringConverter x:Key="stringConverter" />
10-
<local:DoubleRoundingConverter x:Key="roundConverter" />
8+
<local:TipCalcModel x:Key="Model" TipPercent="15" />
9+
<local:DoubleToStringConverter x:Key="StringConverter" />
10+
<local:DoubleRoundingConverter x:Key="RoundConverter" />
1111
</ResourceDictionary>
1212
</ContentPage.Resources>
1313

14-
<Grid BindingContext="{StaticResource model}" x:DataType="local:TipCalcModel" RowSpacing="8" ColumnSpacing="8" Padding="20">
14+
<Grid BindingContext="{StaticResource Model}" x:DataType="local:TipCalcModel" RowSpacing="8" ColumnSpacing="8" Padding="20">
1515
<Grid.Margin>
1616
<OnPlatform x:TypeArguments="Thickness">
1717
<On Platform="iOS" Value="5,20,5,0" />
@@ -33,15 +33,15 @@
3333
</Grid.ColumnDefinitions>
3434
<!-- Row 0 -->
3535
<Label Text="Food &amp; Drink:" Grid.Row="0" Grid.Column="0" FontSize="Large" HorizontalTextAlignment="End" VerticalTextAlignment="Center" />
36-
<Entry Grid.Row="0" Grid.Column="1" Keyboard="Numeric" Placeholder="Subtotal" Text="{Binding SubTotal, Converter={StaticResource stringConverter}}" />
36+
<Entry Grid.Row="0" Grid.Column="1" Keyboard="Numeric" Placeholder="Subtotal" Text="{Binding SubTotal, Converter={StaticResource StringConverter}}" />
3737
<!-- Row 1 -->
3838
<Label Text="Total after Tax:" Grid.Row="1" Grid.Column="0" FontSize="Large" HorizontalTextAlignment="End" VerticalTextAlignment="Center" />
39-
<Entry Grid.Row="1" Grid.Column="1" Keyboard="Numeric" Placeholder="Receipt total" Text="{Binding PostTaxTotal, Converter={StaticResource stringConverter}}" />
39+
<Entry Grid.Row="1" Grid.Column="1" Keyboard="Numeric" Placeholder="Receipt total" Text="{Binding PostTaxTotal, Converter={StaticResource StringConverter}}" />
4040
<!-- Row 2 -->
4141
<Label Text="Tip Percent:" Grid.Row="2" Grid.Column="0" FontSize="Large" HorizontalTextAlignment="End" VerticalTextAlignment="Center" />
42-
<Entry Grid.Row="2" Grid.Column="1" Keyboard="Numeric" Text="{Binding TipPercent, Converter={StaticResource stringConverter}}" />
42+
<Entry Grid.Row="2" Grid.Column="1" Keyboard="Numeric" Text="{Binding TipPercent, Converter={StaticResource StringConverter}}" />
4343
<!-- Row 3 -->
44-
<Slider Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Minimum="0" Maximum="100" Value="{Binding TipPercent, Mode=TwoWay, Converter={StaticResource roundConverter}, ConverterParameter=0.5}" />
44+
<Slider Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Minimum="0" Maximum="100" Value="{Binding TipPercent, Mode=TwoWay, Converter={StaticResource RoundConverter}, ConverterParameter=0.5}" />
4545
<!-- Row 4 -->
4646
<Label Text="Tip Amount:" Grid.Row="4" Grid.Column="0" FontSize="Large" HorizontalTextAlignment="End" VerticalTextAlignment="Center" />
4747
<ContentView BackgroundColor="#40808080" Grid.Row="4" Grid.Column="1" Padding="10,10,40,10">

‎9.0/Apps/TipCalc/TipCalc/TipCalc.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,4 @@
6464
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
6565
</ItemGroup>
6666

67-
<ItemGroup>
68-
<MauiXaml Update="TipCalcPage.xaml">
69-
<Generator>MSBuild:Compile</Generator>
70-
</MauiXaml>
71-
</ItemGroup>
72-
7367
</Project>

‎9.0/Apps/TipCalc/TipCalc/TipCalcPage.xaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
x:Class="TipCalc.TipCalcPage">
66
<ContentPage.Resources>
77
<ResourceDictionary>
8-
<local:TipCalcModel x:Key="model" TipPercent="15" />
9-
<local:DoubleToStringConverter x:Key="stringConverter" />
10-
<local:DoubleRoundingConverter x:Key="roundConverter" />
8+
<local:TipCalcModel x:Key="Model" TipPercent="15" />
9+
<local:DoubleToStringConverter x:Key="StringConverter" />
10+
<local:DoubleRoundingConverter x:Key="RoundConverter" />
1111
</ResourceDictionary>
1212
</ContentPage.Resources>
1313

14-
<Grid BindingContext="{StaticResource model}" x:DataType="local:TipCalcModel" RowSpacing="8" ColumnSpacing="8" Padding="20">
14+
<Grid BindingContext="{StaticResource Model}" x:DataType="local:TipCalcModel" RowSpacing="8" ColumnSpacing="8" Padding="20">
1515
<Grid.Margin>
1616
<OnPlatform x:TypeArguments="Thickness">
1717
<On Platform="iOS" Value="5,20,5,0" />
@@ -33,15 +33,15 @@
3333
</Grid.ColumnDefinitions>
3434
<!-- Row 0 -->
3535
<Label Text="Food &amp; Drink:" Grid.Row="0" Grid.Column="0" FontSize="Large" HorizontalTextAlignment="End" VerticalTextAlignment="Center" />
36-
<Entry Grid.Row="0" Grid.Column="1" Keyboard="Numeric" Placeholder="Subtotal" Text="{Binding SubTotal, Converter={StaticResource stringConverter}}" />
36+
<Entry Grid.Row="0" Grid.Column="1" Keyboard="Numeric" Placeholder="Subtotal" Text="{Binding SubTotal, Converter={StaticResource StringConverter}}" />
3737
<!-- Row 1 -->
3838
<Label Text="Total after Tax:" Grid.Row="1" Grid.Column="0" FontSize="Large" HorizontalTextAlignment="End" VerticalTextAlignment="Center" />
39-
<Entry Grid.Row="1" Grid.Column="1" Keyboard="Numeric" Placeholder="Receipt total" Text="{Binding PostTaxTotal, Converter={StaticResource stringConverter}}" />
39+
<Entry Grid.Row="1" Grid.Column="1" Keyboard="Numeric" Placeholder="Receipt total" Text="{Binding PostTaxTotal, Converter={StaticResource StringConverter}}" />
4040
<!-- Row 2 -->
4141
<Label Text="Tip Percent:" Grid.Row="2" Grid.Column="0" FontSize="Large" HorizontalTextAlignment="End" VerticalTextAlignment="Center" />
42-
<Entry Grid.Row="2" Grid.Column="1" Keyboard="Numeric" Text="{Binding TipPercent, Converter={StaticResource stringConverter}}" />
42+
<Entry Grid.Row="2" Grid.Column="1" Keyboard="Numeric" Text="{Binding TipPercent, Converter={StaticResource StringConverter}}" />
4343
<!-- Row 3 -->
44-
<Slider Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Minimum="0" Maximum="100" Value="{Binding TipPercent, Mode=TwoWay, Converter={StaticResource roundConverter}, ConverterParameter=0.5}" />
44+
<Slider Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Minimum="0" Maximum="100" Value="{Binding TipPercent, Mode=TwoWay, Converter={StaticResource RoundConverter}, ConverterParameter=0.5}" />
4545
<!-- Row 4 -->
4646
<Label Text="Tip Amount:" Grid.Row="4" Grid.Column="0" FontSize="Large" HorizontalTextAlignment="End" VerticalTextAlignment="Center" />
4747
<ContentView BackgroundColor="#40808080" Grid.Row="4" Grid.Column="1" Padding="10,10,40,10">

0 commit comments

Comments
 (0)