Skip to content

Commit ed4a725

Browse files
committed
change CollectionView in scan page
1 parent d6211fd commit ed4a725

File tree

1 file changed

+33
-16
lines changed

1 file changed

+33
-16
lines changed

fast cf ip scanner/Views/ScanPage.xaml

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<ScrollView>
1616
<VerticalStackLayout Padding="10" Spacing="20">
1717

18-
<Grid RowDefinitions="1*,1*,100*" ColumnDefinitions=".2*,.1*,.3*" Margin="10">
18+
<Grid RowDefinitions="1*,1*,100*" ColumnDefinitions=".33*,.33*,.33*" Margin="10">
1919
<Button Text="Start"
2020
IsEnabled="{Binding IsBusy, Converter={StaticResource InverseBooleanConverter}}"
2121
Grid.Column="0"
@@ -24,21 +24,28 @@
2424
Command="{Binding GetValidIPsCommand}"
2525
HorizontalOptions="FillAndExpand"
2626
VerticalOptions="FillAndExpand" />
27-
<Label Text="Max ping:"
27+
<!--<Button Text="Stop"
28+
IsEnabled="{Binding IsBusy}"
29+
IsVisible="{Binding IsBusy}"
30+
Grid.Column="0"
31+
Grid.Row="0"
32+
Grid.RowSpan="2"
33+
Command="{Binding GetValidIPsCommand}"
34+
HorizontalOptions="FillAndExpand"
35+
VerticalOptions="FillAndExpand" />-->
36+
<Label Text="Max ping: "
2837
HorizontalOptions="End"
29-
VerticalOptions="Center"
3038
Grid.Row="0"
3139
Grid.Column="1"
3240
TextColor="White" />
3341
<Label Grid.Column="2"
3442
Grid.Row="0"
35-
Margin="10,0"
3643
Text="{Binding Source={x:Reference numericStepper}, Path=Value}"
3744
TextColor="White" />
3845
<Stepper Increment="100"
3946
Value="{Binding MaxPingOfIP}"
4047
Maximum="10000"
41-
Grid.Column="2"
48+
Grid.Column="3"
4249
Grid.Row="1"
4350
x:Name="numericStepper" />
4451
</Grid>
@@ -52,19 +59,29 @@
5259
IsVisible="{Binding IsBusy, Converter={StaticResource InverseBooleanConverter}}">
5360
<CollectionView.ItemTemplate>
5461
<DataTemplate x:DataType="model:IPModel">
55-
<StackLayout Padding="15"
56-
Orientation="Horizontal"
57-
Spacing="10">
58-
<Label Text="ip :" TextColor="White" />
59-
<Label Text="{Binding IP}" TextColor="White" />
60-
<Label Text="ping :" TextColor="White" />
61-
<Label Text="{Binding Ping}" TextColor="White" />
62-
<Label Text="ports :" TextColor="White" />
63-
<Label Text="{Binding Ports}" TextColor="White" />
64-
65-
</StackLayout>
62+
<Grid Padding="15">
63+
<Grid.ColumnDefinitions>
64+
<ColumnDefinition Width="Auto" />
65+
<ColumnDefinition Width="*" />
66+
</Grid.ColumnDefinitions>
67+
<Grid.RowDefinitions>
68+
<RowDefinition Height="Auto" />
69+
<RowDefinition Height="Auto" />
70+
<RowDefinition Height="Auto" />
71+
</Grid.RowDefinitions>
72+
73+
<Label Grid.Row="0" Grid.Column="0" Text="ip :" TextColor="White" />
74+
<Label Grid.Row="0" Grid.Column="1" Text="{Binding IP}" TextColor="White" />
75+
76+
<Label Grid.Row="1" Grid.Column="0" Text="ping :" TextColor="White" />
77+
<Label Grid.Row="1" Grid.Column="1" Text="{Binding Ping}" TextColor="White" />
78+
79+
<Label Grid.Row="2" Grid.Column="0" Text="ports :" TextColor="White" />
80+
<Label Grid.Row="2" Grid.Column="1" Text="{Binding Ports}" TextColor="White" />
81+
</Grid>
6682
</DataTemplate>
6783
</CollectionView.ItemTemplate>
84+
6885
</CollectionView>
6986

7087
<ActivityIndicator IsRunning="{Binding IsBusy}" IsVisible="{Binding IsBusy}" />

0 commit comments

Comments
 (0)