Separate http and https

Author: DevoTalk

fast cf ip scanner/ViewModels/IpOptionViewModel.cs

@@ -15,8 +15,11 @@ public partial class IpOptionViewModel : BaseViewModel
     IpOptionModel _ipOptions;
 
     [ObservableProperty]
-    ObservableCollection<PortForShow> ports;
-    
+    ObservableCollection<PortForShow> httpPorts;
+
+    [ObservableProperty]
+    ObservableCollection<PortForShow> httpsPorts;
+
     [ObservableProperty]
     int maxPingOfIP;
 
@@ -35,7 +38,8 @@ public partial class IpOptionViewModel : BaseViewModel
 
     public IpOptionViewModel()
     {
-        ports = new ObservableCollection<PortForShow>();
+        httpPorts = new ObservableCollection<PortForShow>();
+        httpsPorts = new ObservableCollection<PortForShow>();
     }
 
     [ObservableProperty]
@@ -47,11 +51,16 @@ protected override void OnPropertyChanged(PropertyChangedEventArgs e)
         base.OnPropertyChanged(e);
         if (e.PropertyName == "IpOptions" && !saved)
         {
-            var allPorts = Constants.HttpPorts.Concat(Constants.HttpsPorts);
+            var allHttpPorts = Constants.HttpPorts;
+            var allHttpsPorts = Constants.HttpsPorts;
             var selectedPort = IpOptions.Ports;
-            foreach (var port in allPorts)
+            foreach (var port in allHttpPorts)
             {
-                Ports.Add(new PortForShow(port, selectedPort.Any(p => p == port)));
+                HttpPorts.Add(new PortForShow(port, selectedPort.Any(p => p == port)));
+            }
+            foreach (var port in allHttpsPorts)
+            {
+                HttpsPorts.Add(new PortForShow(port, selectedPort.Any(p => p == port)));
             }
             MaxPingOfIP = IpOptions.MaxPingOfIP;
             MinimumCountOfValidIp = IpOptions.MinimumCountOfValidIp;
@@ -66,7 +75,8 @@ async void Save()
     {
         saved = true;
         IpOptions.Ports.Clear();
-        IpOptions.Ports.AddRange(Ports.Where(p => p.IsChecked).Select(p => p.Port));
+        IpOptions.Ports.AddRange(HttpPorts.Where(p => p.IsChecked).Select(p => p.Port));
+        IpOptions.Ports.AddRange(HttpsPorts.Where(p => p.IsChecked).Select(p => p.Port));
         if (IpOptions.Ports.Count == 0)
         {
             IpOptions.Ports.AddRange(GetRandomPort());
@@ -129,7 +139,8 @@ async void Save()
 
         if (saved)
         {
-            totalTestForEachIp = CountOfRepeatTestForEachIp * (Ports.Where(p=>p.IsChecked)).Count();
+            var countSelectedOfPorts = HttpPorts.Where(p => p.IsChecked).Count() + HttpsPorts.Where(p => p.IsChecked).Count();
+            totalTestForEachIp = CountOfRepeatTestForEachIp * countSelectedOfPorts;
             var countOfIpInEachRange = CountOfIpForTest / CountOfIpRanges;
 
             await App.Current.MainPage.DisplayAlert("Info", $"{CountOfIpForTest} ips in {CountOfIpRanges} ranges will be tested {totalTestForEachIp} times", "ok");
@@ -150,8 +161,5 @@ public string[] GetRandomPort(int count = 3)
         return randomPorts;
     }
 
-    public void UpdateVar()
-    {
-        totalTestForEachIp = CountOfRepeatTestForEachIp * (Ports.Where(p => p.IsChecked)).Count();
-    }
+    
 }

fast cf ip scanner/Views/IpOptionsPage.xaml

@@ -7,9 +7,9 @@
              x:DataType="viewmodel:IpOptionViewModel">
     <ScrollView>
         <StackLayout Padding="20">
-           
-            <Label Text="Ports:"/>
-            <CollectionView ItemsSource="{Binding Ports}">
+
+            <Label Text="Http Ports:"/>
+            <CollectionView ItemsSource="{Binding HttpPorts}">
                 <CollectionView.ItemsLayout>
                     <LinearItemsLayout Orientation="Horizontal" />
                 </CollectionView.ItemsLayout>
@@ -22,8 +22,28 @@
                                    TextColor="White"/>
                             <CheckBox IsChecked="{Binding IsChecked}"
                                   VerticalOptions="CenterAndExpand"
-                                  Color="DodgerBlue"
-                                  CheckedChanged="CheckBox_CheckedChanged">
+                                  Color="DodgerBlue">
+
+                            </CheckBox>
+                        </StackLayout>
+                    </DataTemplate>
+                </CollectionView.ItemTemplate>
+            </CollectionView>
+            <Label Text="Https Ports:"/>
+            <CollectionView ItemsSource="{Binding HttpsPorts}">
+                <CollectionView.ItemsLayout>
+                    <LinearItemsLayout Orientation="Horizontal" />
+                </CollectionView.ItemsLayout>
+                <CollectionView.ItemTemplate>
+                    <DataTemplate x:DataType="viewmodel:PortForShow">
+                        <StackLayout Orientation="Horizontal" Spacing="10" Padding="5">
+                            <Label Text="{Binding Port}"
+                       VerticalOptions="CenterAndExpand"
+                       FontSize="Small"
+                       TextColor="White"/>
+                            <CheckBox IsChecked="{Binding IsChecked}"
+                      VerticalOptions="CenterAndExpand"
+                      Color="DodgerBlue">
 
                             </CheckBox>
                         </StackLayout>

fast cf ip scanner/Views/IpOptionsPage.xaml.cs

@@ -10,8 +10,5 @@ public IpOptionsPage(IpOptionViewModel viewModel)
         vm = viewModel;
     }
 
-    private void CheckBox_CheckedChanged(object sender, CheckedChangedEventArgs e)
-    {
-        vm.UpdateVar();
-    }
+    
 }