Skip to content

Commit 6454cc0

Browse files
committed
UI changes to MAUI app.
1 parent 445d7ff commit 6454cc0

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

Examples/MAUI-gRPC/MauiAntClientApp/AppShell.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
xmlns:local="clr-namespace:MauiAntClientApp"
77
xmlns:views="clr-namespace:MauiAntClientApp.Views"
88
Shell.FlyoutBehavior="Disabled"
9+
Shell.ForegroundColor="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource SecondaryDarkText}}"
910
Title="MauiAntClientApp">
1011

1112
<ShellContent

Examples/MAUI-gRPC/MauiAntClientApp/Views/HomePage.xaml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,18 @@
1414
</ContentPage.Resources>
1515
<Grid Margin="16" RowDefinitions="Auto, *">
1616
<Frame>
17-
<Grid ColumnDefinitions="*, Auto">
18-
<StackLayout>
19-
<Label Text="{Binding ServerIPAddress, StringFormat='ANT Radio Server - {0}'}"/>
20-
<BoxView BackgroundColor="Black" HeightRequest="2" HorizontalOptions="Fill"/>
21-
<Label Text="{Binding ProductDescription, StringFormat='Description - {0}'}"/>
22-
<Label Text="{Binding SerialString, StringFormat='Serial Number - {0}'}"/>
23-
<Label Text="{Binding HostVersion, StringFormat='Host Version - {0}'}"/>
24-
</StackLayout>
25-
<ImageButton Source="more_arrow.png" Aspect="AspectFill" Background="Transparent" Grid.Column="2" HeightRequest="40" WidthRequest="40" Command="{Binding ShowRadioCapabilitiesCommand}"/>
26-
</Grid>
17+
<StackLayout>
18+
<Label Text="{Binding ServerIPAddress, StringFormat='ANT Radio Server - {0}'}"/>
19+
<BoxView BackgroundColor="Black" HeightRequest="2" HorizontalOptions="Fill" Margin="0,0,0,4"/>
20+
<Grid Padding="8" ColumnDefinitions="*, Auto">
21+
<StackLayout>
22+
<Label Text="{Binding ProductDescription, StringFormat='Description - {0}'}"/>
23+
<Label Text="{Binding SerialString, StringFormat='Serial Number - {0}'}"/>
24+
<Label Text="{Binding HostVersion, StringFormat='Host Version - {0}'}"/>
25+
</StackLayout>
26+
<ImageButton Source="more_arrow.png" Aspect="AspectFill" Background="Transparent" Grid.Column="1" HeightRequest="32" WidthRequest="32" Command="{Binding ShowRadioCapabilitiesCommand}"/>
27+
</Grid>
28+
</StackLayout>
2729
</Frame>
2830
<Frame Grid.Row="1">
2931
<StackLayout>
@@ -32,11 +34,11 @@
3234
<CollectionView x:Name="antDevices" ItemsSource="{Binding AntDevices}" SelectionMode="Single" VerticalOptions="StartAndExpand">
3335
<CollectionView.ItemTemplate>
3436
<DataTemplate x:DataType="ant:AntDevice">
35-
<Grid Padding="10" RowDefinitions="Auto, Auto" ColumnDefinitions="Auto, *, Auto">
37+
<Grid Padding="8" RowDefinitions="Auto, Auto" ColumnDefinitions="Auto, *, Auto">
3638
<Image Margin="0,0,10,0" Grid.RowSpan="2" Source="{Binding ., Converter={StaticResource StreamToImage}}" Aspect="AspectFill" HeightRequest="40" WidthRequest="40"/>
3739
<Label Grid.Column="1" Text="{Binding .}"/>
3840
<Label Grid.Column="1" Grid.Row="1" Text="{Binding Path=ChannelId.DeviceNumber, StringFormat='Device Number - {0}'}"/>
39-
<ImageButton Source="more_arrow.png" Aspect="AspectFill" Background="Transparent" Grid.Column="2" Grid.RowSpan="2" HeightRequest="40" WidthRequest="40" Command="{Binding Path=ShowDetailsCommand, Source={x:RelativeSource AncestorType={x:Type viewmodels:HomePageViewModel}}}" CommandParameter="{Binding}"/>
41+
<ImageButton Source="more_arrow.png" Aspect="AspectFill" Background="Transparent" Grid.Column="2" Grid.RowSpan="2" HeightRequest="32" WidthRequest="32" Command="{Binding Path=ShowDetailsCommand, Source={x:RelativeSource AncestorType={x:Type viewmodels:HomePageViewModel}}}" CommandParameter="{Binding}"/>
4042
</Grid>
4143
</DataTemplate>
4244
</CollectionView.ItemTemplate>

0 commit comments

Comments
 (0)