Skip to content

Commit 181fcbb

Browse files
authored
Latest MAUI 10.0.60 & selection dialog fix on IOS [LEGACY] (#219)
* Update Directory.Packages.props * Update build-ios.yml * Fix selection dialog
1 parent 1c086d5 commit 181fcbb

3 files changed

Lines changed: 15 additions & 12 deletions

File tree

.github/workflows/build-ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ permissions:
3030
contents: read
3131

3232
env:
33-
XCODE_VERSION: '26.2'
33+
XCODE_VERSION: '26.4.1'
3434
TARGET_FRAMEWORK: 'net10.0-ios'
3535
TARGET_RUNTIME: 'ios-arm64'
3636

BrickController2/BrickController2/UI/Controls/Dialogs.xaml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,22 @@
6262
<!-- Selection dialog -->
6363
<ContentView x:Name="SelectionDialog" IsVisible="false" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All">
6464
<Border Style="{StaticResource DialogBorderStyle}" VerticalOptions="Start" Margin="0,50,0,50">
65-
<Grid RowDefinitions="Auto, Auto, *, Auto, Auto">
66-
<Label Grid.Row="0" x:Name="SelectionDialogTitle" HorizontalOptions="Center" FontAttributes="Bold" FontSize="Large"/>
67-
<BoxView Grid.Row="1" Style="{StaticResource DividerBoxViewStyle}" Margin="0,8,0,8"/>
68-
<CollectionView Grid.Row="2" x:Name="SelectionDialogItems" SelectionMode="Single" VerticalOptions="FillAndExpand">
65+
<VerticalStackLayout>
66+
<Label x:Name="SelectionDialogTitle" HorizontalOptions="Center" FontAttributes="Bold" FontSize="Large"/>
67+
<BoxView Style="{StaticResource DividerBoxViewStyle}" Margin="0,8,0,8"/>
68+
<CollectionView x:Name="SelectionDialogItems" SelectionMode="Single" VerticalOptions="FillAndExpand"
69+
ItemSizingStrategy="MeasureFirstItem"
70+
MinimumHeightRequest="40"
71+
MaximumHeightRequest="200">
6972
<CollectionView.ItemTemplate>
7073
<DataTemplate>
7174
<Label Text="{Binding}" FontSize="{OnIdiom Large, Desktop=Medium}" FontAttributes="Bold" Margin="0,4"/>
7275
</DataTemplate>
7376
</CollectionView.ItemTemplate>
7477
</CollectionView>
75-
<BoxView Grid.Row="3" Style="{StaticResource DividerBoxViewStyle}" Margin="0,16,0,16"/>
76-
<Button Grid.Row="4" x:Name="SelectionDialogCancelButton" BackgroundColor="{DynamicResource NegativeColor}" Margin="{OnIdiom '16,0,16,0', Desktop='96,0,96,0'}"/>
77-
</Grid>
78+
<BoxView Style="{StaticResource DividerBoxViewStyle}" Margin="0,16,0,16"/>
79+
<Button x:Name="SelectionDialogCancelButton" BackgroundColor="{DynamicResource NegativeColor}" Margin="{OnIdiom '16,0,16,0', Desktop='96,0,96,0'}"/>
80+
</VerticalStackLayout>
7881
</Border>
7982
</ContentView>
8083

Directory.Packages.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<ItemGroup>
66
<PackageVersion Include="Autofac" Version="9.1.0" />
77
<PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
8-
<PackageVersion Include="Microsoft.Maui.Controls" Version="10.0.51" />
9-
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.51" />
10-
<PackageVersion Include="Microsoft.Maui.Essentials" Version="10.0.51" />
8+
<PackageVersion Include="Microsoft.Maui.Controls" Version="10.0.60" />
9+
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.60" />
10+
<PackageVersion Include="Microsoft.Maui.Essentials" Version="10.0.60" />
1111
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
1212
<PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
1313
<PackageVersion Include="SQLiteNetExtensions" Version="2.1.0" />
@@ -18,7 +18,7 @@
1818
<ItemGroup>
1919
<!--unit / component tests-->
2020
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
21-
<PackageVersion Include="FluentAssertions" Version="7.2.0" />
21+
<PackageVersion Include="FluentAssertions" Version="7.2.2" />
2222
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
2323
<PackageVersion Include="Moq" Version="4.20.72" />
2424
<PackageVersion Include="xunit" Version="2.9.3" />

0 commit comments

Comments
 (0)