Skip to content

Commit 9b3f16a

Browse files
samunohitosamunohito
authored
Merge pull request #1 from samunohito/feature/reformat_code
リリースのためのダミープルリクのついでに、コード全体にフォーマッタをかけて作成
2 parents be0fce7 + 0005cab commit 9b3f16a

32 files changed

+132
-119
lines changed

‎Directory.Build.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ItemGroup>
4-
<PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
5-
<Version>3.4.255</Version>
6-
<PrivateAssets>all</PrivateAssets>
7-
</PackageReference>
8-
</ItemGroup>
3+
<ItemGroup>
4+
<PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
5+
<Version>3.4.255</Version>
6+
<PrivateAssets>all</PrivateAssets>
7+
</PackageReference>
8+
</ItemGroup>
99
</Project>

‎SimpleVolumeMixer/App.xaml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,24 @@
2222
MahApps.Metro resource dictionaries.
2323
Learn more about using MahApps.Metro at https://mahapps.com/
2424
-->
25-
<ResourceDictionary
25+
<ResourceDictionary
2626
Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
27-
<ResourceDictionary
27+
<ResourceDictionary
2828
Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
29-
29+
3030
<!--Material Design-->
3131
<materialDesign:MahAppsBundledTheme BaseTheme="Inherit" PrimaryColor="Grey" SecondaryColor="Lime" />
3232
<ResourceDictionary
3333
Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
34-
<ResourceDictionary
34+
<ResourceDictionary
3535
Source="pack://application:,,,/MaterialDesignColors;component/Themes/MaterialDesignColor.Grey.Primary.xaml" />
3636

3737
<!--Material Design: MahApps統合設定 -->
3838
<ResourceDictionary
3939
Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Fonts.xaml" />
4040
<ResourceDictionary
4141
Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Flyout.xaml" />
42-
42+
4343
<ResourceDictionary Source="/UI/Styles/_FontSizes.xaml" />
4444
<ResourceDictionary Source="/UI/Styles/_Thickness.xaml" />
4545
<ResourceDictionary Source="/UI/Styles/MetroWindow.xaml" />
@@ -49,11 +49,14 @@
4949
</ResourceDictionary.MergedDictionaries>
5050

5151
<SolidColorBrush x:Key="PrimaryHueLightBrush" Color="{StaticResource Primary200}" po:Freeze="True" />
52-
<SolidColorBrush x:Key="PrimaryHueLightForegroundBrush" Color="{StaticResource Primary200Foreground}" po:Freeze="True" />
52+
<SolidColorBrush x:Key="PrimaryHueLightForegroundBrush" Color="{StaticResource Primary200Foreground}"
53+
po:Freeze="True" />
5354
<SolidColorBrush x:Key="PrimaryHueMidBrush" Color="{StaticResource Primary500}" po:Freeze="True" />
54-
<SolidColorBrush x:Key="PrimaryHueMidForegroundBrush" Color="{StaticResource Primary500Foreground}" po:Freeze="True" />
55+
<SolidColorBrush x:Key="PrimaryHueMidForegroundBrush" Color="{StaticResource Primary500Foreground}"
56+
po:Freeze="True" />
5557
<SolidColorBrush x:Key="PrimaryHueDarkBrush" Color="{StaticResource Primary700}" po:Freeze="True" />
56-
<SolidColorBrush x:Key="PrimaryHueDarkForegroundBrush" Color="{StaticResource Primary700Foreground}" po:Freeze="True" />
58+
<SolidColorBrush x:Key="PrimaryHueDarkForegroundBrush" Color="{StaticResource Primary700Foreground}"
59+
po:Freeze="True" />
5760
</ResourceDictionary>
5861
</Application.Resources>
5962
</prism:PrismApplication>

‎SimpleVolumeMixer/App.xaml.cs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected override async void OnInitialized()
4747

4848
var themeSelectorService = Container.Resolve<IThemeSelectorService>();
4949
themeSelectorService.InitializeTheme();
50-
50+
5151
base.OnInitialized();
5252
await Task.CompletedTask;
5353
}
@@ -66,15 +66,18 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
6666
containerRegistry.Register<ISystemService, SystemService>();
6767
containerRegistry.Register<IPersistAndRestoreService, PersistAndRestoreService>();
6868
containerRegistry.Register<IThemeSelectorService, ThemeSelectorService>();
69-
69+
7070
// UseCases
71-
containerRegistry.GetContainer().RegisterType<AudioSessionsPageUseCase>(new DisposableComponentLifetimeManager());
71+
containerRegistry.GetContainer()
72+
.RegisterType<AudioSessionsPageUseCase>(new DisposableComponentLifetimeManager());
7273

7374
// Views
7475
containerRegistry.RegisterForNavigation<SettingsPage, SettingsPageViewModel>(PageKeys.Settings);
7576
containerRegistry.RegisterForNavigation<AudioSessionsPage, AudioSessionsPageViewModel>(PageKeys.AudioSessions);
76-
containerRegistry.RegisterForNavigation<AudioSessionsSubHorizontalPage, AudioSessionsPageSubViewModel>(PageKeys.AudioSessionsSubHorizontal);
77-
containerRegistry.RegisterForNavigation<AudioSessionsSubVerticalPage, AudioSessionsPageSubViewModel>(PageKeys.AudioSessionsSubVertical);
77+
containerRegistry.RegisterForNavigation<AudioSessionsSubHorizontalPage, AudioSessionsPageSubViewModel>(
78+
PageKeys.AudioSessionsSubHorizontal);
79+
containerRegistry.RegisterForNavigation<AudioSessionsSubVerticalPage, AudioSessionsPageSubViewModel>(
80+
PageKeys.AudioSessionsSubVertical);
7881
containerRegistry.RegisterForNavigation<AudioDevicesPage, AudioDevicesPageViewModel>(PageKeys.AudioDevices);
7982

8083
containerRegistry.RegisterForNavigation<ShellWindow, ShellWindowViewModel>();

‎SimpleVolumeMixer/Core/Helper/Component/DisposableComponent.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void Dispose()
5858
{
5959
return;
6060
}
61-
61+
6262
OnDisposing();
6363
_disposable.Dispose();
6464
OnDisposed();

‎SimpleVolumeMixer/Core/Helper/Component/KeyValueInstanceManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ private void KeyOnDisposed(object? sender, EventArgs e)
3939
{
4040
return;
4141
}
42-
42+
4343
lock (_gate)
4444
{
4545
var key = (TK)sender;

‎SimpleVolumeMixer/Core/Helper/Component/QueueProcessor.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
namespace SimpleVolumeMixer.Core.Helper.Component;
88

9-
109
public class QueueProcessor<TP, TR> : DisposableComponent
1110
{
1211
private readonly BlockingCollection<QueueProcessorHandle<TP, TR>> _handles;
@@ -45,7 +44,7 @@ private void DoProcess()
4544
handle.Executed = true;
4645
continue;
4746
}
48-
47+
4948
handle.Result = handle.Function(handle.Argument);
5049
handle.Executed = true;
5150
}
@@ -56,4 +55,4 @@ protected override void OnDisposing()
5655
StopRequest();
5756
base.OnDisposing();
5857
}
59-
}
58+
}

‎SimpleVolumeMixer/Core/Helper/CoreAudio/AudioSessionAccessorManager.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public class AudioSessionAccessorManager : SynchronizedReactiveCollectionWrapper
1515
/// いずれかのセッションが破棄される際に呼び出される
1616
/// </summary>
1717
public event EventHandler<AudioSessionAccessorEventArgs>? SessionDisposing;
18+
1819
/// <summary>
1920
/// いずれかのセッションが破棄された際に呼び出される
2021
/// </summary>
@@ -31,7 +32,7 @@ public AudioSessionAccessorManager(AudioDeviceAccessor device, ILogger logger)
3132
_sessionManager.SessionManagerClosed += OnSessionManagerClosed;
3233
_sessionManager.SessionCreated += OnSessionCreated;
3334
}
34-
35+
3536
/// <summary>
3637
/// 引数のPIDを持つセッションが内蔵コレクションにあるかを確認する
3738
/// </summary>
@@ -178,7 +179,7 @@ public void CloseSession()
178179
{
179180
_sessionManager.CloseSessionManager();
180181
}
181-
182+
182183
/// <summary>
183184
/// CoreAudioAPIから新規セッションが作成された旨の通知が届いた際に呼び出される
184185
/// </summary>
@@ -192,10 +193,10 @@ private void OnSessionCreated(object? sender, SessionCreatedEventArgs e)
192193
{
193194
return;
194195
}
195-
196+
196197
Add(e.NewSession);
197198
}
198-
199+
199200
/// <summary>
200201
/// セッションマネージャの取得が完了した際に呼び出される。
201202
/// </summary>

‎SimpleVolumeMixer/Core/Helper/CoreAudio/AudioSessionManagerAccessor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public async Task OpenSessionManager()
5353
{
5454
// 古いインスタンスがある場合は破棄
5555
CloseSessionManager();
56-
56+
5757
// 個別で破棄するのでDisposableには入れない
5858
_sessionManager = sessionManager;
5959
_eventAdapter = new AudioSessionManagerEventAdapter(sessionManager, _logger);
@@ -92,7 +92,7 @@ public void CloseSessionManager()
9292
{
9393
return null;
9494
}
95-
95+
9696
return _sessionManager.GetSessionEnumerator();
9797
}
9898
}

‎SimpleVolumeMixer/Core/Helper/CoreAudio/Event/AudioDeviceAccessorEventArgs.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ public AudioDeviceAccessorEventArgs(AudioDeviceAccessor device)
88
{
99
Device = device;
1010
}
11-
11+
1212
public AudioDeviceAccessor Device { get; }
1313
}

‎SimpleVolumeMixer/Core/Helper/CoreAudio/Event/AudioSessionAccessorSimpleVolumeChangedEventArgs.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
public class AudioSessionAccessorSimpleVolumeChangedEventArgs : AudioSessionAccessorEventArgs
44
{
5-
public AudioSessionAccessorSimpleVolumeChangedEventArgs(AudioSessionAccessor session, float newVolume, bool isMuted) :
5+
public AudioSessionAccessorSimpleVolumeChangedEventArgs(AudioSessionAccessor session, float newVolume, bool isMuted)
6+
:
67
base(session)
78
{
89
NewVolume = newVolume;

0 commit comments

Comments
 (0)