Skip to content

Commit dc37c5d

Browse files
dualbiosdualbios
committed
clean code
1 parent e3d0ab0 commit dc37c5d

21 files changed

+669
-555
lines changed

‎src/FlaUInspect/App.xaml.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace FlaUInspect;
88

99
public partial class App {
1010
private void ApplicationStart(object sender, StartupEventArgs e) {
11-
var versionAttribute = Assembly.GetEntryAssembly()?.GetCustomAttribute(typeof(AssemblyFileVersionAttribute)) as AssemblyFileVersionAttribute;
11+
AssemblyFileVersionAttribute? versionAttribute = Assembly.GetEntryAssembly()?.GetCustomAttribute(typeof(AssemblyFileVersionAttribute)) as AssemblyFileVersionAttribute;
1212
string applicationVersion = versionAttribute?.Version ?? "N/A";
1313
InternalLogger logger = new ();
1414

@@ -33,11 +33,11 @@ private void ApplicationStart(object sender, StartupEventArgs e) {
3333
ChooseVersionWindow dialog = new ();
3434

3535
if (dialog.ShowDialog() == true) {
36-
36+
3737
MainViewModel mainViewModel = new (dialog.SelectedAutomationType, applicationVersion, logger);
38-
MainWindow mainWindow = new() { DataContext = mainViewModel };
38+
MainWindow mainWindow = new () { DataContext = mainViewModel };
3939

40-
//Re-enable normal shutdown mode.
40+
//Re-enable normal shutdown mode.
4141
Current.ShutdownMode = ShutdownMode.OnMainWindowClose;
4242
Current.MainWindow = mainWindow;
4343
mainWindow.Show();

‎src/FlaUInspect/Core/Converters/CountToVisibilityConverter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace FlaUInspect.Core.Converters;
66

7-
public class CountToVisibilityConverter : IValueConverter {
7+
public class CountToVisibilityConverter : IValueConverter {
88
public Visibility ZeroCountVisibility { get; set; } = Visibility.Collapsed;
99
public Visibility MultipleCountVisibility { get; set; } = Visibility.Visible;
1010

‎src/FlaUInspect/Core/ElementHighlighter.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ public static class ElementHighlighter {
99
public static void HighlightElement(AutomationElement? automationElement, ILogger? logger) {
1010
try {
1111
Task.Run(() => automationElement?.DrawHighlight(false, Color.Red, TimeSpan.FromSeconds(1)));
12-
}
13-
catch (PropertyNotSupportedException ex) {
12+
} catch (PropertyNotSupportedException ex) {
1413
logger?.LogError($"Exception: {ex.Message}");
1514
}
1615
}

‎src/FlaUInspect/Core/Extensions/AutomationPropertyExtensions.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ public static class AutomationPropertyExtensions {
77
try {
88
bool success = automationProperty.TryGetValue(out T? value);
99
return success ? value == null ? string.Empty : value.ToString() : "Not Supported";
10-
}
11-
catch (Exception ex) {
10+
} catch (Exception ex) {
1211
return $"Exception getting value ({ex.HResult})";
1312
}
1413
}

‎src/FlaUInspect/Core/Extensions/TaskExtensions.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ public static async Task<T> WaitAsync<T>(this Task<T> task, TimeSpan period, T d
1111
return result;
1212
}
1313
return defaultValue;
14-
}
15-
catch (Exception) {
14+
} catch (Exception) {
1615
return defaultValue;
1716
}
1817
}

‎src/FlaUInspect/Core/HoverMode.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,12 @@ private void DispatcherTimerTick(object? sender, EventArgs e) {
5050
if (!Equals(_currentHoveredElement, hoveredElement)) {
5151
_currentHoveredElement = hoveredElement;
5252
ElementHovered?.Invoke(hoveredElement);
53-
}
54-
else {
53+
} else {
5554
ElementHighlighter.HighlightElement(hoveredElement, _logger);
5655
}
57-
}
58-
catch (UnauthorizedAccessException) {
56+
} catch (UnauthorizedAccessException) {
5957
_logger?.LogError("You are accessing a protected UI element in hover mode.\nTry to start FlaUInspect as administrator.");
60-
}
61-
catch (Exception ex) {
58+
} catch (Exception ex) {
6259
_logger?.LogError($"Exception: {ex.Message}");
6360
}
6461
}

‎src/FlaUInspect/Core/Logger/LoggerExtensions.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ public static void LogTrace(this ILogger logger, string? message, params object?
3535
}
3636

3737
List<string> paramsName = Regex.Matches(formattedMessage, @"(\{\w+\})")
38-
.Cast<Match>()
39-
.Select(x => x.Groups[1].Value)
40-
.Where(x => !string.IsNullOrEmpty(x))
41-
.Select(x=>x!)
42-
.ToList();
38+
.Cast<Match>()
39+
.Select(x => x.Groups[1].Value)
40+
.Where(x => !string.IsNullOrEmpty(x))
41+
.Select(x => x!)
42+
.ToList();
4343

4444
for (var i = 0; i < paramsName.Count; i++) {
4545
if (i < args.Length) {

‎src/FlaUInspect/Core/PatternItemsFactory.cs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using System.Diagnostics.CodeAnalysis;
21
using System.Drawing;
32
using FlaUI.Core;
43
using FlaUI.Core.AutomationElements;
@@ -29,8 +28,7 @@ public class PatternItemsFactory(AutomationBase? automationBase) {
2928
public const string Details = "Details";
3029
public const string PatternSupport = "Pattern Support";
3130

32-
private readonly KeyValuePair<PatternId, Func<AutomationElement, IEnumerable<PatternItem>>>[] _patternsUia2Func =
33-
[
31+
private readonly KeyValuePair<PatternId, Func<AutomationElement, IEnumerable<PatternItem>>>[] _patternsUia2Func = [
3432
new (GridItemPattern.Pattern, AddGridItemPatternDetails),
3533
new (GridPattern.Pattern, AddGridPatternPatternDetails),
3634
new (RangeValuePattern.Pattern, AddRangeValuePatternDetails),
@@ -46,8 +44,7 @@ public class PatternItemsFactory(AutomationBase? automationBase) {
4644
new (InvokePattern.Pattern, AddInvokePatternDetails)
4745
];
4846

49-
private readonly KeyValuePair<PatternId, Func<AutomationElement, IEnumerable<PatternItem>>>[] _patternsUia3Func =
50-
[
47+
private readonly KeyValuePair<PatternId, Func<AutomationElement, IEnumerable<PatternItem>>>[] _patternsUia3Func = [
5148
new (FlaUI.UIA3.Patterns.GridItemPattern.Pattern, AddGridItemPatternDetails),
5249
new (FlaUI.UIA3.Patterns.GridPattern.Pattern, AddGridPatternPatternDetails),
5350
new (LegacyIAccessiblePattern.Pattern, AddLegacyIAccessiblePatternDetails),
@@ -61,12 +58,11 @@ public class PatternItemsFactory(AutomationBase? automationBase) {
6158
new (FlaUI.UIA3.Patterns.TogglePattern.Pattern, AddTogglePatternDetails),
6259
new (FlaUI.UIA3.Patterns.ValuePattern.Pattern, AddValuePatternDetails),
6360
new (FlaUI.UIA3.Patterns.WindowPattern.Pattern, AddWindowPatternDetails),
64-
new (FlaUI.UIA3.Patterns.InvokePattern.Pattern, AddInvokePatternDetails)
61+
new (InvokePattern.Pattern, AddInvokePatternDetails)
6562
];
6663

6764
public IDictionary<string, PatternItem[]> CreatePatternItemsForElement(AutomationElement element, HashSet<PatternId> allSupportedPatterns) {
68-
Dictionary<string, PatternItem[]> patternItems = new()
69-
{
65+
Dictionary<string, PatternItem[]> patternItems = new () {
7066
{ Identification, AddIdentificationDetails(element).ToArray() },
7167
{ Details, AddDetailsDetails(element).ToArray() },
7268
{ PatternSupport, AddPatternSupportDetails(element).ToArray() }
@@ -76,7 +72,7 @@ public IDictionary<string, PatternItem[]> CreatePatternItemsForElement(Automatio
7672
automationBase is UIA3Automation ? _patternsUia3Func : _patternsUia2Func;
7773

7874
foreach ((PatternId key, Func<AutomationElement, IEnumerable<PatternItem>> value) in patternsFactory.Where(kvp => allSupportedPatterns.Contains(kvp.Key))) {
79-
patternItems.Add(key.Name, (value.Invoke(element)).ToArray());
75+
patternItems.Add(key.Name, value.Invoke(element).ToArray());
8076
}
8177

8278
return patternItems;

‎src/FlaUInspect/Core/RelayCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public bool CanExecute(object? parameter) {
1414
if (parameter == null) {
1515
return true;
1616
}
17-
return (canExecuteEvaluator == null || canExecuteEvaluator.Invoke(parameter));
17+
return canExecuteEvaluator == null || canExecuteEvaluator.Invoke(parameter);
1818
}
1919

2020
public event EventHandler? CanExecuteChanged {

‎src/FlaUInspect/FlaUInspect.csproj‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -20,60 +20,60 @@
2020
</PropertyGroup>
2121

2222
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
23-
<OutputPath>bin\Debug\</OutputPath>
24-
<AssemblyName>FlaUInspect</AssemblyName>
23+
<OutputPath>bin\Debug\</OutputPath>
24+
<AssemblyName>FlaUInspect</AssemblyName>
2525
</PropertyGroup>
2626

2727
<PropertyGroup Condition=" '$(Configuration)' == 'UIA2' ">
28-
<DefineConstants>TRACE;AUTOMATION_UIA2</DefineConstants>
29-
<OutputPath>bin\UIA2\</OutputPath>
30-
<AssemblyName>FlaUInspect.UIA2</AssemblyName>
28+
<DefineConstants>TRACE;AUTOMATION_UIA2</DefineConstants>
29+
<OutputPath>bin\UIA2\</OutputPath>
30+
<AssemblyName>FlaUInspect.UIA2</AssemblyName>
3131
</PropertyGroup>
3232

3333
<PropertyGroup Condition=" '$(Configuration)' == 'UIA3' ">
34-
<DefineConstants>TRACE;AUTOMATION_UIA3</DefineConstants>
35-
<OutputPath>bin\UIA3\</OutputPath>
36-
<AssemblyName>FlaUInspect.UIA3</AssemblyName>
34+
<DefineConstants>TRACE;AUTOMATION_UIA3</DefineConstants>
35+
<OutputPath>bin\UIA3\</OutputPath>
36+
<AssemblyName>FlaUInspect.UIA3</AssemblyName>
3737
</PropertyGroup>
3838

3939
<ItemGroup>
40-
<PackageReference Include="FlaUI.Core" Version="5.0.0" />
41-
<PackageReference Include="FlaUI.UIA2" Version="5.0.0" />
42-
<PackageReference Include="FlaUI.UIA3" Version="5.0.0" />
40+
<PackageReference Include="FlaUI.Core" Version="5.0.0"/>
41+
<PackageReference Include="FlaUI.UIA2" Version="5.0.0"/>
42+
<PackageReference Include="FlaUI.UIA3" Version="5.0.0"/>
4343
</ItemGroup>
4444

4545
<ItemGroup>
46-
<Page Update="Resources\Icons.xaml">
47-
<Generator>MSBuild:Compile</Generator>
48-
<XamlRuntime>Wpf</XamlRuntime>
49-
<SubType>Designer</SubType>
50-
</Page>
51-
<Page Update="Resources\RibbonIcons.xaml">
52-
<Generator>MSBuild:Compile</Generator>
53-
<XamlRuntime>Wpf</XamlRuntime>
54-
<SubType>Designer</SubType>
55-
</Page>
56-
<Page Update="Resources\DetailsIcons.xaml">
57-
<Generator>MSBuild:Compile</Generator>
58-
<XamlRuntime>Wpf</XamlRuntime>
59-
<SubType>Designer</SubType>
60-
</Page>
61-
<Page Update="Resources\ChooseVersionIcons.xaml">
62-
<Generator>MSBuild:Compile</Generator>
63-
<XamlRuntime>Wpf</XamlRuntime>
64-
<SubType>Designer</SubType>
65-
</Page>
46+
<Page Update="Resources\Icons.xaml">
47+
<Generator>MSBuild:Compile</Generator>
48+
<XamlRuntime>Wpf</XamlRuntime>
49+
<SubType>Designer</SubType>
50+
</Page>
51+
<Page Update="Resources\RibbonIcons.xaml">
52+
<Generator>MSBuild:Compile</Generator>
53+
<XamlRuntime>Wpf</XamlRuntime>
54+
<SubType>Designer</SubType>
55+
</Page>
56+
<Page Update="Resources\DetailsIcons.xaml">
57+
<Generator>MSBuild:Compile</Generator>
58+
<XamlRuntime>Wpf</XamlRuntime>
59+
<SubType>Designer</SubType>
60+
</Page>
61+
<Page Update="Resources\ChooseVersionIcons.xaml">
62+
<Generator>MSBuild:Compile</Generator>
63+
<XamlRuntime>Wpf</XamlRuntime>
64+
<SubType>Designer</SubType>
65+
</Page>
6666
</ItemGroup>
6767

6868
<ItemGroup>
69-
<None Update="FlaUInspect.png">
70-
<Pack>True</Pack>
71-
<PackagePath></PackagePath>
72-
</None>
69+
<None Update="FlaUInspect.png">
70+
<Pack>True</Pack>
71+
<PackagePath></PackagePath>
72+
</None>
7373
</ItemGroup>
7474

7575
<ItemGroup>
76-
<None Remove="LICENSE" />
76+
<None Remove="LICENSE"/>
7777
</ItemGroup>
7878

7979
</Project>

0 commit comments

Comments
 (0)