gr606_sosan пре 2 година
родитељ
комит
a38f4c2469

+ 1 - 0
.idea/.idea.CUR/.idea/avalonia.xml

@@ -4,6 +4,7 @@
     <option name="projectPerEditor">
       <map>
         <entry key="Avalonia.UI/App.axaml" value="Avalonia.UI/Avalonia.UI.csproj" />
+        <entry key="Avalonia.UI/Views/Crime.axaml" value="Avalonia.UI/Avalonia.UI.csproj" />
         <entry key="Avalonia.UI/Views/InformationCriminals.axaml" value="Avalonia.UI/Avalonia.UI.csproj" />
         <entry key="Avalonia.UI/Views/MainWindow.axaml" value="Avalonia.UI/Avalonia.UI.csproj" />
         <entry key="Avalonia.UI/Views/MostWanted.axaml" value="Avalonia.UI/Avalonia.UI.csproj" />

+ 6 - 0
.idea/.idea.CUR/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>


BIN
Avalonia.UI/Assets/fbi.png


+ 2 - 0
Avalonia.UI/Avalonia.UI.csproj

@@ -25,6 +25,8 @@
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.18" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
+        <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
         <PackageReference Include="ReactiveUI" Version="13.2.10" />
         <PackageReference Include="System.Reactive" Version="5.0.0" />
         <PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />

+ 0 - 4
Avalonia.UI/HttpClient.cs

@@ -1,4 +0,0 @@
-namespace Avalonia.UI;
-
-
-    

+ 7 - 0
Avalonia.UI/Models/Deserealization.cs

@@ -0,0 +1,7 @@
+namespace Avalonia.UI.Models;
+
+public class Deserealization
+{
+    public string? status { get; set; }
+    public InformationCriminals[]? deserealize { get; set; }
+}

+ 62 - 0
Avalonia.UI/Models/InformationCriminals.cs

@@ -0,0 +1,62 @@
+using System.Collections;
+using Newtonsoft.Json;
+using System.Drawing;
+
+namespace Avalonia.UI.Models;
+
+public class InformationCriminals
+{
+
+
+    [JsonProperty("publication")]
+    public string? Newid { get; set; }
+    [JsonProperty("@id")] public string? Title { get; set; }
+    [JsonProperty("title")] public string? Office { get; set; }
+    [JsonProperty("field_offices")] public string? Detail { get; set; }
+    [JsonProperty("details")] public string? Pol { get; set; }
+    [JsonProperty("sex")] public string? National { get; set; }
+    [JsonProperty("nationality")] public int? Age { get; set; }
+    [JsonProperty("age_max")] public int? Height { get; set; }
+    [JsonProperty("height_max")] public string? Race { get; set; }
+    [JsonProperty("race_raw")] public string? Hair { get; set; }
+    [JsonProperty("hair_raw")] public string? Language { get; set; }
+    [JsonProperty("languages")] public string? Urlpdf { get; set; }
+    [JsonProperty("files")]   public OrdinaryUrl? OrdinaryUrl { get; set; }
+    
+    
+    public InformationCriminals(string? underNewid, string? underTitle, string? underOffice, string? 
+        underDetails, string? underPol, string? underNational,  int? underAge, int? underHeight, string? underRace,
+        string? underHair,  string? underLanguage, string? underPdf, OrdinaryUrl underOrdinary)
+    {
+        this.Newid = underNewid;
+        this.Title = underTitle;
+        this.Office = underOffice;
+        this.Detail = underDetails;
+        this.Pol = underPol;
+        this.National = underNational;
+        this.Age = underAge;
+        this.Height = underHeight;
+        this.Race = underRace;
+        this.Hair = underHair;
+        this.Language = underLanguage;
+        this.Urlpdf = underPdf;
+        this.OrdinaryUrl = underOrdinary;
+
+
+
+
+    }
+
+    
+    
+
+    
+
+
+}
+
+    
+    
+    
+    
+    

+ 6 - 0
Avalonia.UI/Models/MissingPerson.cs

@@ -0,0 +1,6 @@
+namespace Avalonia.UI.Models;
+
+public class MissingPerson
+{
+    
+}

+ 16 - 0
Avalonia.UI/Models/OrdinaryUrl.cs

@@ -0,0 +1,16 @@
+namespace Avalonia.UI.Models;
+
+public class OrdinaryUrl
+{
+    public string? type { get; set; }
+    public string? url { get; set; }
+    public string? suggested_link_text { get; set; }
+    
+    public OrdinaryUrl(string? type, string? url, string? suggested_link_text)
+    {
+        this.type = type;
+        this.url = url;
+        this.suggested_link_text = suggested_link_text;
+    }
+    
+}

+ 60 - 7
Avalonia.UI/Program.cs

@@ -1,23 +1,76 @@
 using Avalonia;
 using Avalonia.ReactiveUI;
 using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
 
 namespace Avalonia.UI
 {
+    /*
+    class WantedPersons
+    {
+        public string title { get; set; }
+        public char dates_of_birth_used { get; set; }
+        public string nationality { get; set; }
+        public string race_raw { get; set; }
+        public string race { get; set; }
+        public string hair_raw { get; set; }
+        public string place_of_birth { get; set; }
+        public string person_classification { get; set; }
+        public string description { get; set; }
+        public int height_max { get; set; }
+        public int height_min { get; set; }
+
+        
+
+        public override string ToString()
+        {
+            return $"{title}: {dates_of_birth_used}: {nationality} nationality: {race_raw}:" +
+                   $" {race}: {hair_raw}: {place_of_birth}: {person_classification}: {description}:" +
+                   $"{height_max}: {height_min}";
+        }
+        */
+        
+    
     class Program
     {
-        // Initialization code. Don't use any Avalonia, third-party APIs or any
-        // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
-        // yet and stuff might break.
+        
         [STAThread]
-        public static void Main(string[] args) => BuildAvaloniaApp()
-            .StartWithClassicDesktopLifetime(args);
+        public static void  Main(string[] args)
+        {
+            /*
+            using var client = new HttpClient();
+
+            client.BaseAddress = new Uri("https://www.fbi.gov/wanted");
+            client.DefaultRequestHeaders.Add("MostWanted Persons", "");
+            client.DefaultRequestHeaders.Accept.Add(
+                new MediaTypeWithQualityHeaderValue("application/json"));
+
+            var url = "repos/symfony/symfony/persons";
+            HttpResponseMessage response = await client.GetAsync(url);
+            response.EnsureSuccessStatusCode();
+            var resp = await response.Content.ReadAsStringAsync();
+
+            List<WantedPersons> persons = JsonConvert.DeserializeObject<List<WantedPersons>>(resp);
+*/
+            BuildAvaloniaApp()
+                .StartWithClassicDesktopLifetime(args);
+        }
 
-        // Avalonia configuration, don't remove; also used by visual designer.
         public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()
                 .UsePlatformDetect()
                 .LogToTrace()
                 .UseReactiveUI();
+
+       
+
+       
+        
+
     }
-}
+}
+

+ 1 - 3
Avalonia.UI/ViewModels/VID.cs

@@ -1,8 +1,6 @@
-
-
 namespace Avalonia.UI.ViewModels;
 
-public class VID : ViewModelBase
+public class Crime
 {
     
 }

+ 0 - 45
Avalonia.UI/ViewModels/InformationCriminals.cs

@@ -1,45 +0,0 @@
-using System.Collections.ObjectModel;
-using System.Reactive;
-using ReactiveUI;
-
-
-namespace Avalonia.UI.ViewModels;
-
-public  class InformationCriminals : ViewModelBase
-{
-    private bool _isBusy;
-    private string? _searchText;
-
-    public string? SearchText
-    {
-        get => _searchText;
-        set => this.RaiseAndSetIfChanged(ref _searchText, value);
-    }
-    public bool IsBusy
-    {
-        get => _isBusy;
-        set => this.RaiseAndSetIfChanged(ref _isBusy, value);
-    }
-    private VID? _selectedVID;
-
-
-    public ObservableCollection<VID> SearchResults { get; } = new();
-
-    public VID? SelectedSomething
-    {
-        get => _selectedVID;
-        set => this.RaiseAndSetIfChanged(ref _selectedVID, value);
-    }
-    public InformationCriminals()
-    {
-        SearchResults.Add(new VID());
-        SearchResults.Add(new VID());
-        SearchResults.Add(new VID());
-    }
-    public ReactiveCommand<Unit, VID?> BMCommand { get; }
-    
-    BMCommand  = ReactiveCommand.Create(() =>
-    {
-        return SelectedAlbum;
-    });
-}

+ 19 - 8
Avalonia.UI/ViewModels/MainWindowViewModel.cs

@@ -7,24 +7,35 @@ using System.Windows.Input;
 using ReactiveUI;
 using System.Text;
 using System.Collections.Generic;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
 
 
 namespace Avalonia.UI.ViewModels
 {
     public class MainWindowViewModel : ViewModelBase
     {
-        public MainWindowViewModel()
+        public string Color => "#263740";
+        public string Title => "Разыскиваются ФБР";
+        
+        
+        //Окно не открывается
+        /*public MainWindowViewModel()
         {
-            ShowDialog = new Interaction<InformationCriminals, VID?>();
-            Command1 = ReactiveCommand.CreateFromTask(async() =>
+            ShowDialog = new Interaction<Crime, Statistic?>();
+
+            WantedCommand = ReactiveCommand.CreateFromTask(async () =>
             {
-                var  info = new InformationCriminals();
+                var store = new Crime();
 
-                var result = await ShowDialog.Handle(info);
+                var result = await ShowDialog.Handle(store);
             });
-        }
+        }*/
+
+        /*public ICommand WantedCommand { get; }
 
-        public ICommand Command1 { get; }
-        public Interaction<InformationCriminals, VID?> ShowDialog { get; }
+        public Interaction<Crime, Statistic?> ShowDialog { get; }*/
     }
+    
+    
 }

+ 6 - 0
Avalonia.UI/ViewModels/Statistic.cs

@@ -0,0 +1,6 @@
+namespace Avalonia.UI.ViewModels;
+
+public class Statistic
+{
+    
+}

+ 9 - 0
Avalonia.UI/Views/Crime.axaml

@@ -0,0 +1,9 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        x:Class="Avalonia.UI.Views.Crime"
+        Title="Crime">
+    
+</Window>

+ 3 - 2
Avalonia.UI/Views/MostWanted.axaml.cs

@@ -4,9 +4,9 @@ using Avalonia.Markup.Xaml;
 
 namespace Avalonia.UI.Views;
 
-public partial class MostWanted : Window
+public partial class Crime : Window
 {
-    public MostWanted()
+    public Crime()
     {
         InitializeComponent();
 #if DEBUG
@@ -18,4 +18,5 @@ public partial class MostWanted : Window
     {
         AvaloniaXamlLoader.Load(this);
     }
+    
 }

+ 75 - 47
Avalonia.UI/Views/MainWindow.axaml

@@ -3,64 +3,92 @@
         xmlns:vm="using:Avalonia.UI.ViewModels"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+        mc:Ignorable="d" d:DesignWidth="1000" d:DesignHeight="450"
         WindowStartupLocation="CenterScreen" 
         x:Class="Avalonia.UI.Views.MainWindow"
         Icon="/Assets/avalonia-logo.ico"
-        Title="Avalonia.UI">
+        Title="{Binding Title}">
+       
     
-    <Grid>
-        <Design.DataContext>
+    <Design.DataContext>
         <vm:MainWindowViewModel />
     </Design.DataContext>
-        <Panel>
-            <ExperimentalAcrylicBorder IsHitTestVisible="False">
-                <ExperimentalAcrylicBorder.Material>
-                    <ExperimentalAcrylicMaterial
-                        BackgroundSource="Digger"
-                        TintColor="Black"
-                        TintOpacity="1"
-                        MaterialOpacity="0.65" />
-                </ExperimentalAcrylicBorder.Material>
-            </ExperimentalAcrylicBorder>
-            <StackPanel>
-                <TextBlock 
-                    FontSize="25"
-                    FontFamily="Impact "
-                    Margin="10, 10,20,20"
-                    TextAlignment="Right"
-                           FontStyle="Normal"
-                    Text="Разыскиваются ФБР" />
-                
-            </StackPanel>
+    
+    <Grid Background="{Binding Color}">
+        
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50"> </RowDefinition>
+                <RowDefinition Height="50"> </RowDefinition>
+            <RowDefinition Height="50"> </RowDefinition>
+            <RowDefinition Height="50"> </RowDefinition>
+            <RowDefinition Height="50"> </RowDefinition>
+            <RowDefinition> </RowDefinition>
+        </Grid.RowDefinitions>
+        
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition></ColumnDefinition>
+            <ColumnDefinition></ColumnDefinition>
+            <ColumnDefinition></ColumnDefinition>
+            <ColumnDefinition></ColumnDefinition>
+            <ColumnDefinition></ColumnDefinition>
+        </Grid.ColumnDefinitions>
+        
+        <Image Grid.Column="0" Grid.Row="0" Margin="10,60,20,20" Width="150" Height="150" Source="/Assets/fbi.png">
+        </Image>
+        
+             <StackPanel Grid.Row="0" Grid.Column="1">
             <Grid>
-                <TextBlock 
-                    FontSize="20"
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="500"></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Label  FontFamily="Impact"  FontStyle="25" Grid.Row="0" Grid.Column="0" Margin="1,1,1, 1" FontSize="50" Content="{Binding Title}"></Label>
+            </Grid>
+        </StackPanel>
+        <Label  FontFamily="Impact"  FontStyle="25" Grid.Row="4" Grid.Column="0" Margin="1,1,1, 1" FontSize="25" Content="Разделы"></Label>
+        <StackPanel Grid.Row="5" Grid.Column="0">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition > </RowDefinition>
+                    <RowDefinition > </RowDefinition>
+                    <RowDefinition > </RowDefinition>
+                </Grid.RowDefinitions>
+                
+                <Button HorizontalAlignment="Left" Click="MostWanted" FontFamily="Impact" FontSize="15" Margin="10,0,0,0" Grid.Row="0" Grid.Column="0" Content="Самые разыскиваемые" ></Button>
+                <!--  <Button HorizontalAlignment="Left" Click="Statistic" FontFamily="Impact" FontStyle="25" Margin="15,0,0,0" Grid.Row="0" Grid.Column="0" Content="Статистика преступлений" ></Button>
+                <Button HorizontalAlignment="Left" Click="Notes" FontFamily="Impact" FontStyle="25" Margin="15,0,0,0" Grid.Row="0" Grid.Column="0" Content="Пропавшие без вести"></Button> -->
+            </Grid>
+        </StackPanel>
+        
+        
+        <ScrollViewer Grid.Column="3" Grid.Row="2" >
+        <DataGrid Name="DataGrid" x:Name="DataInput"  IsVisible="False" IsReadOnly="True"  >
+            <DataGrid.RowDetailsTemplate>
+                <DataTemplate>
+                    <StackPanel>
+                    <TextBlock  HorizontalAlignment="Center" Margin="10,10,10,10" FontFamily="Times New Roman" FontSize="12"></TextBlock>
+                    </StackPanel>
+                </DataTemplate>
+            </DataGrid.RowDetailsTemplate>
+        </DataGrid>
+        </ScrollViewer>
+       
+        
+      
+        <!--<TextBlock 
+                    FontSize="30"
                     FontFamily="Impact "
-                    Margin="100, 60,20,20"
+                    Margin="20, 150,20,20"
                     HorizontalAlignment="Left"
                     TextAlignment="Right"
                     FontStyle="Normal"
                     Text="Разделы" />
                 <Label Content="Что расследуем?" HorizontalAlignment="Right"
-                       Margin="100, 260,40,20"   FontFamily="Impact "  FontSize="20"/>
-                <!--<Button Content="Разделы" Margin="10, 50,20,20"  Width="100" Height="40" HorizontalAlignment="Left" VerticalAlignment="Top" >
-                <Button.ContextMenu>
-                    <ContextMenu>
-                        <Button Content="">
-                        </Button>
-                        <MenuItem Header="Элемент 2"/>
-                        <MenuItem Header="Элемент 3"/>
-                        <MenuItem Header="Элемент 4"/>
-                    </ContextMenu>
-                </Button.ContextMenu>
-           -->
-                <Button Content="Самые Разыскиваемые" HorizontalAlignment="Center" Margin="10, 10 ,300,200" Command="{Binding Command1 }"/>
-                <Button Content="Статистика преступлений" HorizontalAlignment="Center" Margin="10, 10 ,300,100" Command="{Binding Command2 }"/>
-                <Button Content="Пропавшие без вести" HorizontalAlignment="Center" Margin="10, 10 ,300,1" Command="{Binding Command3 }"/>
-                <Button Content="Читать дальше" HorizontalAlignment="Right" Margin="10, 200 ,40,1" Command="{Binding Command4}"/>
-            </Grid>
-        </Panel>
-        </Grid>
-    <!--<TextBlock Text="{Binding Greeting}" HorizontalAlignment="Center" VerticalAlignment="Center"/> -->
+                       Margin="100, 460,40,20"   FontFamily="Impact "  FontSize="20"/>
+                <Button Content="Самые pазыскиваемые" HorizontalAlignment="Center" Margin="10, 10 ,220,200" Command="{Binding Command1 }"/>
+                <Button Content="Статистика преступлений" HorizontalAlignment="Center" Margin="10, 10 ,200,100" Command="{Binding Command2 }"/>
+                <Button Content="Пропавшие без вести" HorizontalAlignment="Center" Margin="10, 10 ,230,1" Command="{Binding Command3 }"/>
+                <Button Content="Читать дальше" HorizontalAlignment="Right" Margin="10, 350 ,40,1" Command="{Binding Command4}"/>-->
+        
+ 
+    </Grid>
 </Window>

+ 63 - 7
Avalonia.UI/Views/MainWindow.axaml.cs

@@ -1,31 +1,87 @@
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using Avalonia.UI.ViewModels;
 using Avalonia.ReactiveUI;
 using ReactiveUI;
+using Newtonsoft.Json;
+using Avalonia.UI.Models;
+using System.Net;
+using System.Net.Http;
 
 namespace Avalonia.UI.Views
 {
-    public partial class MainWindow : ReactiveWindow<MainWindowViewModel>
+    
+    public partial class MainWindow : Window //ReactiveWindow<MainWindowViewModel>
     {
        
         public MainWindow()
         {
-            
             InitializeComponent();
-            this.WhenActivated(d => d(ViewModel!.ShowDialog.RegisterHandler(DoShowDialogAsync)));
+            
+            string link = "https://api.fbi.gov/wanted/v1/list";
+            Api(link);
 
+            //Окно не открывается
+           // this.WhenActivated(d => d(ViewModel!.ShowDialog.RegisterHandler(DoShowDialogAsync)));
         }
-        private async Task DoShowDialogAsync(InteractionContext<InformationCriminals, VID?> interaction)
+        /*private async Task DoShowDialogAsync(InteractionContext<Crime, Statistic?> interaction)
         {
-            var dialog = new InformationCriminals();
+            var dialog = new Crime();
             dialog.DataContext = interaction.Input;
 
-            var result = await dialog.ShowDialog<VID?>(this);
+            var result = await dialog.ShowDialog<Statistic?>(this);
             interaction.SetOutput(result);
+        }*/
+        
+        public void Api(string way)
+        {
+            DataInput.Items = null;
+            InformationCriminal.Clear();
+
+           
+                using (var client = new HttpClient())
+                {
+                    var newway = new Uri(way);
+
+                    var itog = client.GetAsync(newway).Result;
+
+                    var newformat = itog.Content.ReadAsStringAsync().Result;
+                    Deserealization? deserealization = JsonConvert.DeserializeObject<Deserealization>(newformat);
+
+                    var realization = deserealization.deserealize;
+                    foreach (var result in realization)
+                    {
+                        OrdinaryUrls.Add(new OrdinaryUrl(result.OrdinaryUrl.type, result.OrdinaryUrl.url,
+                            result.OrdinaryUrl.suggested_link_text));
+                        InformationCriminal.Add(new InformationCriminals(result.Newid, result.Title, result.Office,
+                            result.Detail,
+                            result.Pol, result.National, result.Age, result.Height, result.Race, result.Hair,
+                            result.Language, result.Urlpdf, result.OrdinaryUrl));
+                    }
+
+                    DataInput.Items = InformationCriminal;
+                }
+            
         }
+       
+       
+        private void MostWanted(object? sender, RoutedEventArgs e)
+        {
+            string link = "https://api.fbi.gov/wanted/v1/list";
+            
+            Api(link);
+        }
+        
+        
+        public List<InformationCriminals> InformationCriminal = new List<InformationCriminals>(8);
+        public List<OrdinaryUrl> OrdinaryUrls = new List<OrdinaryUrl>();
+        
+       
     }
-   
+    
 }

+ 0 - 28
Avalonia.UI/Views/MostWanted.axaml

@@ -1,28 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="using:Avalonia.UI.Views"
-        
-        mc:Ignorable="d" d:DesignWidth="1000" d:DesignHeight="550"
-        WindowStartupLocation="CenterOwner" 
-        
-        x:Class="Avalonia.UI.Views.MostWanted"
-        Title="MostWanted">
-        
-        <Panel>
-                <ExperimentalAcrylicBorder IsHitTestVisible="False">
-                        <ExperimentalAcrylicBorder.Material>
-                                <ExperimentalAcrylicMaterial
-                                        BackgroundSource="Digger"
-                                        TintColor="Black"
-                                        TintOpacity="1"
-                                        MaterialOpacity="0.65" />
-                        </ExperimentalAcrylicBorder.Material>
-                </ExperimentalAcrylicBorder>
-
-                <Panel Margin="40">
-                        <local:InformationCriminals />
-                </Panel>
-        </Panel>
-</Window>

+ 0 - 26
Avalonia.UI/Views/NewVid.axaml

@@ -1,26 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Avalonia.UI.Views.NewVid">
-    <StackPanel Spacing="5" Width="200">
-        <Border CornerRadius="10" ClipToBounds="True">
-            <Panel Background="#7FFF22DD">
-                <Image Width="200" Stretch="Uniform" Source="{Binding Cover}" />
-                <Panel Height="200" IsVisible="{Binding Cover, Converter={x:Static ObjectConverters.IsNull}}">
-                    <PathIcon Height="75" Width="75" Data="{StaticResource Default_Picture}" />
-                </Panel>
-            </Panel>
-        </Border>
-        <TextBlock Text="{Binding Title}" HorizontalAlignment="Center" />
-        <TextBlock Text="{Binding FullName}" HorizontalAlignment="Center" />
-        <ListBox Items="{Binding SearchResults}" SelectedItem="{Binding SelectedSomething}" Background="Transparent" Margin="0 20">
-            <ListBox.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <WrapPanel />
-                </ItemsPanelTemplate>
-            </ListBox.ItemsPanel>
-        </ListBox>
-    </StackPanel>
-</UserControl>

+ 0 - 18
Avalonia.UI/Views/NewVid.axaml.cs

@@ -1,18 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace Avalonia.UI.Views;
-
-public partial class NewVid : UserControl
-{
-    public NewVid()
-    {
-        InitializeComponent();
-    }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-}

+ 0 - 16
Avalonia.UI/Views/NewView.axaml

@@ -1,16 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Avalonia.UI.Views.NewView">
-    
-    <DockPanel>
-        <StackPanel DockPanel.Dock="Top">
-            <TextBox Text="{Binding SearchText}" Watermark="" />
-            <ProgressBar IsIndeterminate="True" IsVisible="{Binding IsBusy}" />
-        </StackPanel>
-        <Button Command="{Binding BMCommand}" Content="Check" DockPanel.Dock="Bottom" HorizontalAlignment="Center" />
-        <ListBox Items="{Binding SearchResults}" SelectedItem="{Binding SelectedSomething}" Background="Transparent" Margin="0 20" />
-    </DockPanel>
-</UserControl>

+ 0 - 18
Avalonia.UI/Views/NewView.axaml.cs

@@ -1,18 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-
-namespace Avalonia.UI.Views;
-
-public partial class NewView : UserControl
-{
-    public NewView()
-    {
-        InitializeComponent();
-    }
-
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-}