refactor

InuInu2022 · Jun 10, 2024 · 7c48ec0 · 7c48ec0
1 parent f9c5e26
commit 7c48ec0
Show file tree

Hide file tree

Showing 11 changed files with 92 additions and 218 deletions.
diff --git a/SasaraUtil.UI/ViewModels/General/AudioConvertViewModel.cs b/SasaraUtil.UI/ViewModels/General/AudioConvertViewModel.cs
@@ -38,6 +38,9 @@ public sealed class AudioConvertViewModel
 
 	public INotificationMessageManager? Notify { get; set; }
 	public double StartTime { get; set; }
+
+	public Well DockPanelWell { get; }
+		= Well.Factory.Create<DockPanel>();
 	public Pile<DockPanel>? DockPanelPile {get;set;}
 	public ObservableCollection<AudioConvertFileListViewModel>? DroppedFiles { get; set; }
 	public bool IsDropAreaVisibile { get; set; } = true;
@@ -53,6 +56,8 @@ public AudioConvertViewModel()
 
 		StartTime = 0.0f;
 
+		DockPanelWell.Add(DragDrop.DropEvent, DropFileEventAsync);
+
 		ConvertAndSend = Command.Factory
 			.Create(SendToCeVIO());
 

diff --git a/SasaraUtil.UI/ViewModels/Song/BreathSuppressorViewModel.cs b/SasaraUtil.UI/ViewModels/Song/BreathSuppressorViewModel.cs
@@ -1,8 +1,5 @@
-using System;
 using System.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
+using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Notification;
 using Avalonia.Platform.Storage;
@@ -22,6 +19,9 @@ public class BreathSuppressorViewModel
 	private readonly INotificationMessageManager? _notify;
 	private readonly IStorageProvider? _storage;
 
+	public Well DockPanelWell { get; }
+		= Well.Factory.Create<DockPanel>();
+
 	public bool IsConvertable { get; set; }
 	public ObservableCollection<string> DroppedFiles { get; set; }
 	public string? TargetFileName { get; set; }
@@ -39,8 +39,10 @@ public class BreathSuppressorViewModel
 
 	public BreathSuppressorViewModel()
 	{
-		DroppedFiles = new();
-		CcsTrackData = new();
+		DroppedFiles = [];
+		CcsTrackData = [];
+
+		DockPanelWell.Add(DragDrop.DropEvent, DropFileEventAsync);
 
 		ResetFiles = Command.Factory
 			.CreateSync(ResetFile());
@@ -200,7 +202,7 @@ public async ValueTask DropFileEventAsync(DragEventArgs e)
 	private Action ResetFile()
 	=> () =>
 	{
-		DroppedFiles = new();
+		DroppedFiles = [];
 		IsConvertable = false;
 	};
 }

diff --git a/SasaraUtil.UI/ViewModels/Talk/CastSplitterViewModel.cs b/SasaraUtil.UI/ViewModels/Talk/CastSplitterViewModel.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Notification;
 using Avalonia.Platform.Storage;
@@ -24,6 +25,9 @@ public class CastSplitterViewModel
     private readonly IStorageProvider? _storage;
 
     public bool IsConvertable { get; set; }
+
+	public Well DockPanelWell { get; }
+		= Well.Factory.Create<DockPanel>();
 	public ObservableCollection<string> DroppedFiles { get; set; }
 	public string? TargetFileName { get; set; }
 	public ObservableCollection<CcsTrackViewModel> CcsTrackData { get; set; }
@@ -37,6 +41,8 @@ public CastSplitterViewModel()
 		DroppedFiles = new();
 		CcsTrackData = new();
 
+		DockPanelWell.Add(DragDrop.DropEvent, DropFileEventAsync);
+
 		ResetFiles = Command.Factory
 			.CreateSync(ResetFile());
 

diff --git a/SasaraUtil.UI/ViewModels/Talk/VocalPercussionViewModel.cs b/SasaraUtil.UI/ViewModels/Talk/VocalPercussionViewModel.cs
@@ -19,6 +19,7 @@
 using Avalonia.Platform.Storage;
 using SasaraUtil.UI.ViewModels.Utility;
 using CodingSeb.Localization;
+using Avalonia.Controls;
 
 namespace SasaraUtil.ViewModels.VocalPercussion;
 
@@ -38,6 +39,9 @@ public class VocalPercussionViewModel
 	public Command? SaveFile { get; set; }
 	public Command? SelectFile { get; set; }
 	public Command? Ready { get; set; }
+
+	public Well DockPanelWell { get; }
+		= Well.Factory.Create<DockPanel>();
 	public bool IsOpenWithCeVIO { get; set; }
 	public int SelectedTalkApp { get; set; } = -1;
 
@@ -46,17 +50,19 @@ public class VocalPercussionViewModel
 	public int SelectedTalkCast { get; set; }
 
 	public ObservableCollection<string> TalkCasts { get; set; }
-		= new();
+		= [];
 
 	private static readonly string[] patterns = ["*.ccs"];
 
 	public VocalPercussionViewModel()
 	{
-		DroppedFiles = new();
-		CcsTrackData = new();
+		DroppedFiles = [];
+		CcsTrackData = [];
 		TalkApps = new(Enum.GetValues(typeof(TalkApps)).Cast<TalkApps>());
 		SelectedTalkApp = 0;
 
+		DockPanelWell.Add(DragDrop.DropEvent, DropFileEventAsync);
+
 		ResetFiles = Command.Factory
 			.CreateSync(ResetFile());
 
@@ -274,8 +280,8 @@ ReadOnlyCollection<string> pathes
 	private Action ResetFile()
 	=> () =>
 	{
-		DroppedFiles = new();
-		CcsTrackData = new();
+		DroppedFiles = [];
+		CcsTrackData = [];
 		IsConvertable = false;
 	};
 

diff --git a/SasaraUtil.UI/Views/General/AudioConvert.axaml b/SasaraUtil.UI/Views/General/AudioConvert.axaml
@@ -25,6 +25,7 @@
 		<DockPanel
 			Margin="5"
 			DragDrop.AllowDrop="True"
+			epoxy:Fountain.Well="{Binding DockPanelWell}"
 			epoxy:Anchor.Pile="{Binding DockPanelPile}"
 			Opacity="1"
 			Background="{DynamicResource ApplicationPageBackgroundThemeBrush}">

diff --git a/SasaraUtil.UI/Views/Song/BreathSuppressor.axaml b/SasaraUtil.UI/Views/Song/BreathSuppressor.axaml
@@ -22,6 +22,7 @@
 		Margin="5"
 		Opacity="1"
 		DragDrop.AllowDrop="True"
+		epoxy:Fountain.Well="{Binding DockPanelWell}"
 		Background="{DynamicResource ApplicationPageBackgroundThemeBrush}">
 
 		<WrapPanel

diff --git a/SasaraUtil.UI/Views/Song/BreathSuppressor.axaml.cs b/SasaraUtil.UI/Views/Song/BreathSuppressor.axaml.cs
@@ -11,7 +11,7 @@ public BreathSuppressor()
     {
         this.InitializeComponent();
 
-        AddHandler(DragDrop.DropEvent, DropAsync);
+        //AddHandler(DragDrop.DropEvent, DropAsync);
     }
 
     async void DropAsync(object? sender, DragEventArgs e)

diff --git a/SasaraUtil.UI/Views/Talk/CastSplitter.axaml b/SasaraUtil.UI/Views/Talk/CastSplitter.axaml
@@ -23,6 +23,7 @@
 		<DockPanel
 			 Margin="5"
 			 DragDrop.AllowDrop="True"
+			 epoxy:Fountain.Well="{Binding DockPanelWell}"
 			 Opacity="1"
 			 Background="{DynamicResource ApplicationPageBackgroundThemeBrush}">
 			<WrapPanel

diff --git a/SasaraUtil.UI/Views/Talk/CastSplitter.axaml.cs b/SasaraUtil.UI/Views/Talk/CastSplitter.axaml.cs
@@ -10,7 +10,7 @@ public CastSplitter()
 	{
 		this.InitializeComponent();
 
-		AddHandler(DragDrop.DropEvent, DropAsync);
+		//AddHandler(DragDrop.DropEvent, DropAsync);
 	}
 
 	async void DropAsync(object? sender, DragEventArgs e)