Skip to content

Commit ca9d7e5

Browse files
zemotozemoto
committed
More miscellaneous code cleanup
1 parent 7310092 commit ca9d7e5

16 files changed

+234
-459
lines changed

‎.editorconfig‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[*.cs]
2+
3+
# IDE0008: Use explicit type
4+
dotnet_diagnostic.IDE0008.severity = none
5+
6+
# IDE0021: Use block body for constructors
7+
dotnet_diagnostic.IDE0021.severity = none
8+
9+
# IDE0022: Use block body for methods
10+
dotnet_diagnostic.IDE0022.severity = none
11+
12+
# IDE0130: Namespace does not match folder structure
13+
dotnet_diagnostic.IDE0130.severity = none

‎EnhancePoE/EnhancePoE.csproj‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,6 @@
199199
<Compile Include="Model\StashTabPropsList.cs" />
200200
<Compile Include="Model\Utility.cs" />
201201
<Compile Include="Model\Win32.cs" />
202-
<Compile Include="Properties\Resources.Designer.cs">
203-
<AutoGen>True</AutoGen>
204-
<DesignTime>True</DesignTime>
205-
<DependentUpon>Resources.resx</DependentUpon>
206-
</Compile>
207202
<Compile Include="UserControls\DynamicGridControl.xaml.cs">
208203
<DependentUpon>DynamicGridControl.xaml</DependentUpon>
209204
</Compile>
@@ -282,12 +277,10 @@
282277
<DependentUpon>Settings.settings</DependentUpon>
283278
<DesignTimeSharedInput>True</DesignTimeSharedInput>
284279
</Compile>
285-
<EmbeddedResource Include="Properties\Resources.resx">
286-
<Generator>ResXFileCodeGenerator</Generator>
287-
<SubType>Designer</SubType>
288-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
289-
</EmbeddedResource>
290280
<Resource Include="Fonts\password.ttf" />
281+
<None Include="..\.editorconfig">
282+
<Link>.editorconfig</Link>
283+
</None>
291284
<None Include="packages.config" />
292285
<None Include="Properties\app.manifest" />
293286
<None Include="Properties\Settings.settings">
@@ -324,13 +317,13 @@
324317
<None Include="Resources\password.ttf" />
325318
</ItemGroup>
326319
<ItemGroup>
327-
<Resource Include="coin.ico">
320+
<None Include="coin.ico">
328321
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
329-
</Resource>
322+
</None>
330323
<Resource Include="Assets\amulet.png" />
331324
<Resource Include="Assets\belt.png" />
332325
<Resource Include="Assets\ring.png" />
333-
<Content Include="Sounds\itemsPickedUp.mp3">
326+
<Content Include="Sounds\notificationSound.mp3">
334327
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
335328
</Content>
336329
</ItemGroup>

‎EnhancePoE/Model/ApiAdapter.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ private static void GetAllTabNames()
113113

114114
private static async Task<bool> GetProps( string accName, string league )
115115
{
116-
//Trace.WriteLine(IsFetching, "isfetching props");
117116
if ( IsFetching )
118117
{
119118
return false;
@@ -145,25 +144,20 @@ private static async Task<bool> GetProps( string accName, string league )
145144
using ( var handler = new HttpClientHandler() { CookieContainer = cC } )
146145
using ( var client = new HttpClient( handler ) )
147146
{
148-
//Trace.WriteLine("is here");
149147
// add user agent
150148
client.DefaultRequestHeaders.Add( "User-Agent", $"EnhancePoEApp/v{Assembly.GetExecutingAssembly().GetName().Version}" );
151149
using ( var res = await client.GetAsync( propsUri ) )
152150
{
153-
//Trace.WriteLine("is NOT here");
154151
if ( res.IsSuccessStatusCode )
155152
{
156-
//Trace.WriteLine("is not herre");
157153
using ( var content = res.Content )
158154
{
159155
string resContent = await content.ReadAsStringAsync();
160-
//Trace.Write(resContent);
161156
PropsList = JsonSerializer.Deserialize<StashTabPropsList>( resContent );
162157

163158
Trace.WriteLine( res.Headers, "res headers" );
164159

165160
// get new rate limit values
166-
//RateLimit.IncreaseRequestCounter();
167161
string rateLimit = res.Headers.GetValues( "X-Rate-Limit-Account" ).FirstOrDefault();
168162
string rateLimitState = res.Headers.GetValues( "X-Rate-Limit-Account-State" ).FirstOrDefault();
169163
string responseTime = res.Headers.GetValues( "Date" ).FirstOrDefault();
@@ -187,7 +181,6 @@ private static async Task<bool> GetProps( string accName, string league )
187181
}
188182
}
189183

190-
//await Task.Delay(1000);
191184
IsFetching = false;
192185
return true;
193186
}

‎EnhancePoE/Model/Coordinates.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,24 +118,24 @@ private static List<Cell> GetAllActiveCells( int index )
118118

119119
private static void OverlayClickEvent()
120120
{
121-
if ( MainWindow.stashTabOverlay.IsOpen )
121+
if ( MainWindow.StashTabOverlay.IsOpen )
122122
{
123-
int selectedIndex = MainWindow.stashTabOverlay.StashTabOverlayTabControl.SelectedIndex;
123+
int selectedIndex = MainWindow.StashTabOverlay.StashTabOverlayTabControl.SelectedIndex;
124124
bool isHit = false;
125125
int hitIndex = -1;
126126

127127
var activeCells = GetAllActiveCells( selectedIndex );
128128

129129
var buttonList = new List<ButtonAndCell>();
130130

131-
if ( CheckForEditButtonHit( MainWindow.stashTabOverlay.EditModeButton ) )
131+
if ( CheckForEditButtonHit( MainWindow.StashTabOverlay.EditModeButton ) )
132132
{
133-
MainWindow.stashTabOverlay.HandleEditButton();
133+
MainWindow.StashTabOverlay.HandleEditButton();
134134
}
135135

136136
if ( StashTabList.StashTabs[selectedIndex].Quad )
137137
{
138-
var ctrl = MainWindow.stashTabOverlay.StashTabOverlayTabControl.SelectedContent as UserControls.DynamicGridControlQuad;
138+
var ctrl = MainWindow.StashTabOverlay.StashTabOverlayTabControl.SelectedContent as UserControls.DynamicGridControlQuad;
139139
foreach ( var cell in activeCells )
140140
{
141141
buttonList.Add( new ButtonAndCell
@@ -162,13 +162,13 @@ private static void OverlayClickEvent()
162162
{
163163
if ( CheckForHeaderHit( StashTabList.StashTabs[stash] ) )
164164
{
165-
MainWindow.stashTabOverlay.StashTabOverlayTabControl.SelectedIndex = stash;
165+
MainWindow.StashTabOverlay.StashTabOverlayTabControl.SelectedIndex = stash;
166166
}
167167
}
168168
}
169169
else
170170
{
171-
var ctrl = MainWindow.stashTabOverlay.StashTabOverlayTabControl.SelectedContent as UserControls.DynamicGridControl;
171+
var ctrl = MainWindow.StashTabOverlay.StashTabOverlayTabControl.SelectedContent as UserControls.DynamicGridControl;
172172
foreach ( var cell in activeCells )
173173
{
174174
buttonList.Add( new ButtonAndCell
@@ -194,7 +194,7 @@ private static void OverlayClickEvent()
194194
{
195195
if ( CheckForHeaderHit( StashTabList.StashTabs[stash] ) )
196196
{
197-
MainWindow.stashTabOverlay.StashTabOverlayTabControl.SelectedIndex = stash;
197+
MainWindow.StashTabOverlay.StashTabOverlayTabControl.SelectedIndex = stash;
198198
}
199199
}
200200
}

‎EnhancePoE/Model/Data.cs‎

Lines changed: 35 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.Diagnostics;
44
using System.Threading;
5-
using System.Threading.Tasks;
65
using System.Windows.Media;
76
using EnhancePoE.Model;
87

@@ -14,8 +13,6 @@ public static class Data
1413
public static ActiveItemTypes PreviousActiveItems { get; set; }
1514
public static MediaPlayer Player { get; set; } = new MediaPlayer();
1615

17-
public static MediaPlayer PlayerSet { get; set; } = new MediaPlayer();
18-
1916
public static int SetAmount { get; set; }
2017
public static int SetTargetAmount { get; set; }
2118

@@ -271,16 +268,16 @@ public static void CheckActives()
271268
{
272269
if ( ApiAdapter.FetchError )
273270
{
274-
MainWindow.overlay.WarningMessage = "Fetching Error...";
275-
MainWindow.overlay.ShadowOpacity = 1;
276-
MainWindow.overlay.WarningMessageVisibility = System.Windows.Visibility.Visible;
271+
MainWindow.Overlay.WarningMessage = "Fetching Error...";
272+
MainWindow.Overlay.ShadowOpacity = 1;
273+
MainWindow.Overlay.WarningMessageVisibility = System.Windows.Visibility.Visible;
277274
return;
278275
}
279276
if ( StashTabList.StashTabs.Count == 0 )
280277
{
281-
MainWindow.overlay.WarningMessage = "No Stashtabs found...";
282-
MainWindow.overlay.ShadowOpacity = 1;
283-
MainWindow.overlay.WarningMessageVisibility = System.Windows.Visibility.Visible;
278+
MainWindow.Overlay.WarningMessage = "No Stashtabs found...";
279+
MainWindow.Overlay.ShadowOpacity = 1;
280+
MainWindow.Overlay.WarningMessageVisibility = System.Windows.Visibility.Visible;
284281
return;
285282
}
286283
if ( Properties.Settings.Default.Sound )
@@ -459,14 +456,14 @@ public static void CheckActives()
459456
Trace.WriteLine( "section list cleared" );
460457
}
461458

462-
_ = MainWindow.overlay.Dispatcher.Invoke( () => MainWindow.overlay.FullSetsText = fullSets.ToString() );
459+
_ = MainWindow.Overlay.Dispatcher.Invoke( () => MainWindow.Overlay.FullSetsText = fullSets.ToString() );
463460

464461
// invoke chaos missing
465462
if ( missingChaos && !Properties.Settings.Default.RegalRecipe )
466463
{
467-
MainWindow.overlay.WarningMessage = "Need lower level items!";
468-
MainWindow.overlay.ShadowOpacity = 1;
469-
MainWindow.overlay.WarningMessageVisibility = System.Windows.Visibility.Visible;
464+
MainWindow.Overlay.WarningMessage = "Need lower level items!";
465+
MainWindow.Overlay.ShadowOpacity = 1;
466+
MainWindow.Overlay.WarningMessageVisibility = System.Windows.Visibility.Visible;
470467
}
471468

472469
// invoke exalted recipe ready
@@ -479,18 +476,18 @@ public static void CheckActives()
479476
|| ItemSetHunter.EmptyItemSlots.Count == 0
480477
|| ItemSetRedeemer.EmptyItemSlots.Count == 0 )
481478
{
482-
MainWindow.overlay.WarningMessage = "Exalted Recipe ready!";
483-
MainWindow.overlay.ShadowOpacity = 1;
484-
MainWindow.overlay.WarningMessageVisibility = System.Windows.Visibility.Visible;
479+
MainWindow.Overlay.WarningMessage = "Exalted Recipe ready!";
480+
MainWindow.Overlay.ShadowOpacity = 1;
481+
MainWindow.Overlay.WarningMessageVisibility = System.Windows.Visibility.Visible;
485482
}
486483
}
487484

488485
// invoke set full
489486
if ( fullSets == SetTargetAmount && !missingChaos )
490487
{
491-
MainWindow.overlay.WarningMessage = "Sets full!";
492-
MainWindow.overlay.ShadowOpacity = 1;
493-
MainWindow.overlay.WarningMessageVisibility = System.Windows.Visibility.Visible;
488+
MainWindow.Overlay.WarningMessage = "Sets full!";
489+
MainWindow.Overlay.ShadowOpacity = 1;
490+
MainWindow.Overlay.WarningMessageVisibility = System.Windows.Visibility.Visible;
494491
}
495492

496493
Trace.WriteLine( fullSets, "full sets" );
@@ -632,26 +629,26 @@ public static void CalculateItemAmounts()
632629
Trace.WriteLine( a );
633630
}
634631
amounts[4] = weaponsSmall + weaponBig;
635-
MainWindow.overlay.RingsAmount = amounts[0];
636-
MainWindow.overlay.AmuletsAmount = amounts[1];
637-
MainWindow.overlay.BeltsAmount = amounts[2];
638-
MainWindow.overlay.ChestsAmount = amounts[3];
639-
MainWindow.overlay.WeaponsAmount = amounts[4];
640-
MainWindow.overlay.GlovesAmount = amounts[5];
641-
MainWindow.overlay.HelmetsAmount = amounts[6];
642-
MainWindow.overlay.BootsAmount = amounts[7];
632+
MainWindow.Overlay.RingsAmount = amounts[0];
633+
MainWindow.Overlay.AmuletsAmount = amounts[1];
634+
MainWindow.Overlay.BeltsAmount = amounts[2];
635+
MainWindow.Overlay.ChestsAmount = amounts[3];
636+
MainWindow.Overlay.WeaponsAmount = amounts[4];
637+
MainWindow.Overlay.GlovesAmount = amounts[5];
638+
MainWindow.Overlay.HelmetsAmount = amounts[6];
639+
MainWindow.Overlay.BootsAmount = amounts[7];
643640
}
644641
else if ( Properties.Settings.Default.ShowItemAmount == 2 )
645642
{
646643
amounts[4] = weaponsSmall + weaponBig;
647-
MainWindow.overlay.RingsAmount = Math.Max( ( SetTargetAmount * 2 ) - amounts[0], 0 );
648-
MainWindow.overlay.AmuletsAmount = Math.Max( SetTargetAmount - amounts[1], 0 );
649-
MainWindow.overlay.BeltsAmount = Math.Max( SetTargetAmount - amounts[2], 0 );
650-
MainWindow.overlay.ChestsAmount = Math.Max( SetTargetAmount - amounts[3], 0 );
651-
MainWindow.overlay.WeaponsAmount = Math.Max( ( SetTargetAmount * 2 ) - ( weaponsSmall + ( weaponBig * 2 ) ), 0 );
652-
MainWindow.overlay.GlovesAmount = Math.Max( SetTargetAmount - amounts[5], 0 );
653-
MainWindow.overlay.HelmetsAmount = Math.Max( SetTargetAmount - amounts[6], 0 );
654-
MainWindow.overlay.BootsAmount = Math.Max( SetTargetAmount - amounts[7], 0 );
644+
MainWindow.Overlay.RingsAmount = Math.Max( ( SetTargetAmount * 2 ) - amounts[0], 0 );
645+
MainWindow.Overlay.AmuletsAmount = Math.Max( SetTargetAmount - amounts[1], 0 );
646+
MainWindow.Overlay.BeltsAmount = Math.Max( SetTargetAmount - amounts[2], 0 );
647+
MainWindow.Overlay.ChestsAmount = Math.Max( SetTargetAmount - amounts[3], 0 );
648+
MainWindow.Overlay.WeaponsAmount = Math.Max( ( SetTargetAmount * 2 ) - ( weaponsSmall + ( weaponBig * 2 ) ), 0 );
649+
MainWindow.Overlay.GlovesAmount = Math.Max( SetTargetAmount - amounts[5], 0 );
650+
MainWindow.Overlay.HelmetsAmount = Math.Max( SetTargetAmount - amounts[6], 0 );
651+
MainWindow.Overlay.BootsAmount = Math.Max( SetTargetAmount - amounts[7], 0 );
655652
}
656653
}
657654
}
@@ -663,13 +660,6 @@ public static void PlayNotificationSound()
663660
Player.Play();
664661
}
665662

666-
public static void PlayNotificationSoundSetPicked()
667-
{
668-
PlayerSet.Volume = (double)( Properties.Settings.Default.Volume / 100.0 );
669-
PlayerSet.Position = TimeSpan.Zero;
670-
PlayerSet.Play();
671-
}
672-
673663
public static StashTab GetStashTabFromItem( Item item )
674664
{
675665
foreach ( var s in StashTabList.StashTabs )
@@ -701,14 +691,14 @@ public static void ActivateNextCell( bool active, Cell cell )
701691
if ( ItemSetListHighlight[0].ItemList.Count == 0 )
702692
{
703693
ItemSetListHighlight.RemoveAt( 0 );
704-
PlayerSet.Dispatcher.Invoke( () => PlayNotificationSoundSetPicked() );
694+
Player.Dispatcher.Invoke( () => PlayNotificationSound() );
705695
}
706696
}
707697
else
708698
{
709699
if ( ItemSetListHighlight.Count > 0 )
710700
{
711-
PlayerSet.Dispatcher.Invoke( () => PlayNotificationSoundSetPicked() );
701+
Player.Dispatcher.Invoke( () => PlayNotificationSound() );
712702
}
713703
}
714704

@@ -784,7 +774,7 @@ public static void ActivateNextCell( bool active, Cell cell )
784774

785775
// activate next set
786776
ActivateNextCell( true, null );
787-
PlayerSet.Dispatcher.Invoke( () => PlayNotificationSoundSetPicked() );
777+
Player.Dispatcher.Invoke( () => PlayNotificationSound() );
788778
}
789779
}
790780
}

‎EnhancePoE/Properties/Resources.Designer.cs‎

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)