Skip to content

Commit 72d6f45

Browse files
BrycensRanchBrycensRanch
committed
fix(Avalonia): refine success validation for Custom Uploaders
- Fixes a bug where "Body: None" shorteners were reported as failed - Also drastically improves debugging experience by using ShareX's built in summary strings.
1 parent 6b5f789 commit 72d6f45

8 files changed

Lines changed: 211 additions & 210 deletions

File tree

‎SnapX.Avalonia/Converters/EnumToCollectionConverter.cs‎

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

‎SnapX.Avalonia/Styling/Resources.axaml‎

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,38 @@
11
<ResourceDictionary
2-
xmlns="https://github.com/avaloniaui"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:converters="clr-namespace:SnapX.Avalonia.Converters"
5-
xmlns:ui="using:FluentAvalonia.UI.Controls">
2+
xmlns="https://github.com/avaloniaui"
3+
xmlns:converters="clr-namespace:SnapX.Avalonia.Converters"
4+
xmlns:ui="using:FluentAvalonia.UI.Controls"
5+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
66

7-
<ui:SymbolIconSource x:Key="SaveIcon" Symbol="Save" />
8-
<ui:BitmapIconSource x:Key="BmpIcon" UriSource="avares://snapx-ui/SnapX_Icon.ico" />
7+
<ui:SymbolIconSource Symbol="Save" x:Key="SaveIcon" />
8+
<ui:BitmapIconSource UriSource="avares://snapx-ui/SnapX_Icon.ico" x:Key="BmpIcon" />
99

10-
<!-- Override this so content doesn't appear in title bar area -->
11-
<Thickness x:Key="NavigationViewContentMargin">0,48,0,0</Thickness>
12-
<converters:AndBooleanConverter x:Key="AndBooleanConverter" />
13-
<converters:IsLocalFilePathConverter x:Key="IsLocalFilePathConverter" />
14-
<converters:FilePathValidConverter x:Key="FilePathValidConverter" />
15-
<converters:BooleanNegationConverter x:Key="NegateBool" />
16-
<converters:CountToBooleanConverter x:Key="CountToBoolean" />
17-
<converters:EqualsToParameterConverter x:Key="EqualsToParameterConverter" />
18-
<converters:InvertedCountToBooleanConverter x:Key="InvertedCountToBoolean" />
19-
<converters:StringNotNullOrWhitespaceConverter x:Key="StringValid" />
20-
<converters:FilePathToSizeConverter x:Key="FileSizeConverter" />
21-
<converters:HttpMethodTypeConverter x:Key="HttpMethodConverter" />
22-
<converters:CustomUploaderBodyConverter x:Key="BodyConverter" />
23-
<converters:CustomUploaderNameConverter x:Key="CustomUploaderNameConverter" />
24-
<converters:HeaderSecurityBlurConverter x:Key="HeaderSecurityBlurConverter" />
25-
<converters:EnumToCollectionConverter x:Key="EnumToCollectionConverter" />
26-
<converters:EnumToBooleanConverter x:Key="EnumToBool" />
27-
<ui:SymbolIconSource x:Key="HomeIcon" Symbol="Home" />
28-
<ui:SymbolIconSource x:Key="HomeIconFilled" Symbol="HomeFilled" />
29-
<StreamGeometry x:Key="HomeRegular">M21.6062 5.85517C23.0048 4.71494 24.9952 4.71494 26.3938 5.85517L39.5688 16.5966C40.4736 17.3342 41 18.4492 41 19.628V39.1134C41 41.2599 39.2875 43 37.175 43H32.075C29.9625 43 28.25 41.2599 28.25 39.1134V29.7492C28.25 29.0337 27.6792 28.4536 26.975 28.4536H21.025C20.3208 28.4536 19.75 29.0337 19.75 29.7492V39.1134C19.75 41.2599 18.0375 43 15.925 43H10.825C8.71251 43 7 41.2599 7 39.1134V19.628C7 18.4493 7.52645 17.3342 8.43124 16.5966L21.6062 5.85517ZM24.7979 7.87612C24.3317 7.49604 23.6683 7.49604 23.2021 7.87612L10.0271 18.6175C9.72548 18.8634 9.55 19.2351 9.55 19.628V39.1134C9.55 39.8289 10.1208 40.4089 10.825 40.4089H15.925C16.6292 40.4089 17.2 39.8289 17.2 39.1134V29.7492C17.2 27.6027 18.9125 25.8626 21.025 25.8626H26.975C29.0875 25.8626 30.8 27.6027 30.8 29.7492V39.1134C30.8 39.8289 31.3708 40.4089 32.075 40.4089H37.175C37.8792 40.4089 38.45 39.8289 38.45 39.1134V19.628C38.45 19.2351 38.2745 18.8634 37.9729 18.6175L24.7979 7.87612Z</StreamGeometry>
30-
<StreamGeometry x:Key="LineHorizontal3Regular">M2 4.5C2 4.22386 2.22386 4 2.5 4H17.5C17.7761 4 18 4.22386 18 4.5C18 4.77614 17.7761 5 17.5 5H2.5C2.22386 5 2 4.77614 2 4.5Z M2 9.5C2 9.22386 2.22386 9 2.5 9H17.5C17.7761 9 18 9.22386 18 9.5C18 9.77614 17.7761 10 17.5 10H2.5C2.22386 10 2 9.77614 2 9.5Z M2.5 14C2.22386 14 2 14.2239 2 14.5C2 14.7761 2.22386 15 2.5 15H17.5C17.7761 15 18 14.7761 18 14.5C18 14.2239 17.7761 14 17.5 14H2.5Z</StreamGeometry>
31-
<ui:SymbolIconSource x:Key="StarFilledIcon" Symbol="StarFilled" />
32-
<!-- <ui:SymbolIconSource Symbol="Settings" x:Key="SettingsIcon" /> -->
33-
<ui:SymbolIconSource x:Key="SettingsIconFilled" Symbol="SettingsFilled" />
10+
<!-- Override this so content doesn't appear in title bar area -->
11+
<Thickness x:Key="NavigationViewContentMargin">0,48,0,0</Thickness>
12+
<converters:AndBooleanConverter x:Key="AndBooleanConverter" />
13+
<converters:IsLocalFilePathConverter x:Key="IsLocalFilePathConverter" />
14+
<converters:FilePathValidConverter x:Key="FilePathValidConverter" />
15+
<converters:BooleanNegationConverter x:Key="NegateBool" />
16+
<converters:CountToBooleanConverter x:Key="CountToBoolean" />
17+
<converters:EqualsToParameterConverter x:Key="EqualsToParameterConverter" />
18+
<converters:InvertedCountToBooleanConverter x:Key="InvertedCountToBoolean" />
19+
<converters:StringNotNullOrWhitespaceConverter x:Key="StringValid" />
20+
<converters:FilePathToSizeConverter x:Key="FileSizeConverter" />
21+
<converters:HttpMethodTypeConverter x:Key="HttpMethodConverter" />
22+
<converters:CustomUploaderBodyConverter x:Key="BodyConverter" />
23+
<converters:CustomUploaderNameConverter x:Key="CustomUploaderNameConverter" />
24+
<converters:HeaderSecurityBlurConverter x:Key="HeaderSecurityBlurConverter" />
25+
<converters:EnumToBooleanConverter x:Key="EnumToBool" />
26+
<ui:SymbolIconSource Symbol="Home" x:Key="HomeIcon" />
27+
<ui:SymbolIconSource Symbol="HomeFilled" x:Key="HomeIconFilled" />
28+
<StreamGeometry x:Key="HomeRegular">M21.6062 5.85517C23.0048 4.71494 24.9952 4.71494 26.3938 5.85517L39.5688 16.5966C40.4736 17.3342 41 18.4492 41 19.628V39.1134C41 41.2599 39.2875 43 37.175 43H32.075C29.9625 43 28.25 41.2599 28.25 39.1134V29.7492C28.25 29.0337 27.6792 28.4536 26.975 28.4536H21.025C20.3208 28.4536 19.75 29.0337 19.75 29.7492V39.1134C19.75 41.2599 18.0375 43 15.925 43H10.825C8.71251 43 7 41.2599 7 39.1134V19.628C7 18.4493 7.52645 17.3342 8.43124 16.5966L21.6062 5.85517ZM24.7979 7.87612C24.3317 7.49604 23.6683 7.49604 23.2021 7.87612L10.0271 18.6175C9.72548 18.8634 9.55 19.2351 9.55 19.628V39.1134C9.55 39.8289 10.1208 40.4089 10.825 40.4089H15.925C16.6292 40.4089 17.2 39.8289 17.2 39.1134V29.7492C17.2 27.6027 18.9125 25.8626 21.025 25.8626H26.975C29.0875 25.8626 30.8 27.6027 30.8 29.7492V39.1134C30.8 39.8289 31.3708 40.4089 32.075 40.4089H37.175C37.8792 40.4089 38.45 39.8289 38.45 39.1134V19.628C38.45 19.2351 38.2745 18.8634 37.9729 18.6175L24.7979 7.87612Z</StreamGeometry>
29+
<StreamGeometry x:Key="LineHorizontal3Regular">M2 4.5C2 4.22386 2.22386 4 2.5 4H17.5C17.7761 4 18 4.22386 18 4.5C18 4.77614 17.7761 5 17.5 5H2.5C2.22386 5 2 4.77614 2 4.5Z M2 9.5C2 9.22386 2.22386 9 2.5 9H17.5C17.7761 9 18 9.22386 18 9.5C18 9.77614 17.7761 10 17.5 10H2.5C2.22386 10 2 9.77614 2 9.5Z M2.5 14C2.22386 14 2 14.2239 2 14.5C2 14.7761 2.22386 15 2.5 15H17.5C17.7761 15 18 14.7761 18 14.5C18 14.2239 17.7761 14 17.5 14H2.5Z</StreamGeometry>
30+
<ui:SymbolIconSource Symbol="StarFilled" x:Key="StarFilledIcon" />
31+
<!-- <ui:SymbolIconSource Symbol="Settings" x:Key="SettingsIcon" /> -->
32+
<ui:SymbolIconSource Symbol="SettingsFilled" x:Key="SettingsIconFilled" />
3433

35-
<PathIcon x:Key="SettingsIcon" Data="M12 2C13.1 2 14 2.9 14 4C14 4.93 13.36 5.71 12.47 5.92C12.47 5.92 12.01 8 12.01 8C12.78 8 13.55 8.09 14.31 8.24C14.63 7.39 15.39 6.8 16.31 6.8C17.41 6.8 18.3 7.69 18.3 8.79C18.3 9.67 17.66 10.41 16.83 10.64C16.83 10.64 16.47 12 16.47 12C17.64 12 18.8 12.17 19.93 12.49C20.4 11.63 21.16 11 22 11C23.1 11 24 11.9 24 13C24 14.1 23.1 15 22 15C21.16 15 20.4 14.37 19.93 13.51C18.8 13.83 17.64 14 16.47 14C16.47 14 16.83 15.36 16.83 15.36C17.66 15.59 18.3 16.33 18.3 17.21C18.3 18.31 17.41 19.2 16.31 19.2C15.39 19.2 14.63 18.61 14.31 17.76C13.55 17.91 12.78 18 12.01 18C12.01 18 12.47 20.08 12.47 20.08C13.36 20.29 14 21.07 14 22C14 23.1 13.1 24 12 24C10.9 24 10 23.1 10 22C10 21.07 10.64 20.29 11.53 20.08C11.53 20.08 12 18 12 18C11.22 18 10.45 17.91 9.69 17.76C9.37 18.61 8.61 19.2 7.69 19.2C6.59 19.2 5.7 18.31 5.7 17.21C5.7 16.33 6.34 15.59 7.17 15.36C7.17 15.36 7.53 14 7.53 14C6.36 14 5.2 13.83 4.07 13.51C3.6 14.37 2.84 15 2 15C0.9 15 0 14.1 0 13C0 11.9 0.9 11 2 11C2.84 11 3.6 11.63 4.07 12.49C5.2 12.17 6.36 12 7.53 12C7.53 12 7.17 10.64 7.17 10.64C6.34 10.41 5.7 9.67 5.7 8.79C5.7 7.69 6.59 6.8 7.69 6.8C8.61 6.8 9.37 7.39 9.69 8.24C10.45 8.09 11.22 8 12 8C12 8 11.53 5.92 11.53 5.92C10.64 5.71 10 4.93 10 4C10 2.9 10.9 2 12 2Z" />
34+
<PathIcon Data="M12 2C13.1 2 14 2.9 14 4C14 4.93 13.36 5.71 12.47 5.92C12.47 5.92 12.01 8 12.01 8C12.78 8 13.55 8.09 14.31 8.24C14.63 7.39 15.39 6.8 16.31 6.8C17.41 6.8 18.3 7.69 18.3 8.79C18.3 9.67 17.66 10.41 16.83 10.64C16.83 10.64 16.47 12 16.47 12C17.64 12 18.8 12.17 19.93 12.49C20.4 11.63 21.16 11 22 11C23.1 11 24 11.9 24 13C24 14.1 23.1 15 22 15C21.16 15 20.4 14.37 19.93 13.51C18.8 13.83 17.64 14 16.47 14C16.47 14 16.83 15.36 16.83 15.36C17.66 15.59 18.3 16.33 18.3 17.21C18.3 18.31 17.41 19.2 16.31 19.2C15.39 19.2 14.63 18.61 14.31 17.76C13.55 17.91 12.78 18 12.01 18C12.01 18 12.47 20.08 12.47 20.08C13.36 20.29 14 21.07 14 22C14 23.1 13.1 24 12 24C10.9 24 10 23.1 10 22C10 21.07 10.64 20.29 11.53 20.08C11.53 20.08 12 18 12 18C11.22 18 10.45 17.91 9.69 17.76C9.37 18.61 8.61 19.2 7.69 19.2C6.59 19.2 5.7 18.31 5.7 17.21C5.7 16.33 6.34 15.59 7.17 15.36C7.17 15.36 7.53 14 7.53 14C6.36 14 5.2 13.83 4.07 13.51C3.6 14.37 2.84 15 2 15C0.9 15 0 14.1 0 13C0 11.9 0.9 11 2 11C2.84 11 3.6 11.63 4.07 12.49C5.2 12.17 6.36 12 7.53 12C7.53 12 7.17 10.64 7.17 10.64C6.34 10.41 5.7 9.67 5.7 8.79C5.7 7.69 6.59 6.8 7.69 6.8C8.61 6.8 9.37 7.39 9.69 8.24C10.45 8.09 11.22 8 12 8C12 8 11.53 5.92 11.53 5.92C10.64 5.71 10 4.93 10 4C10 2.9 10.9 2 12 2Z" x:Key="SettingsIcon" />
3635

37-
<ui:PathIconSource x:Key="SwapThemeIcon" Data="M 23.935547,4.0019531 C 23.275047,4.0354318 22.748047,4.5831669 22.748047,5.2519531 V 7.7519531 C 22.748047,8.4423031 23.307647,9.0019531 23.998047,9.0019531 24.688347,9.0019531 25.248047,8.4423031 25.248047,7.7519531 V 5.2519531 C 25.248047,4.5615931 24.688347,4.0019531 23.998047,4.0019531 23.976472,4.0019531 23.956853,4.0008732 23.935547,4.0019531 Z M 10.25,9 C 9.9300987,9 9.6093094,9.1231125 9.3652344,9.3671875 8.8770744,9.8553475 8.8770744,10.646666 9.3652344,11.134766 L 11.865234,13.634766 C 12.353334,14.122966 13.146666,14.122966 13.634766,13.634766 14.122966,13.146666 14.122966,12.355287 13.634766,11.867188 L 11.134766,9.3671875 C 10.890716,9.1231125 10.569901,9 10.25,9 Z M 37.75,9 C 37.430087,9 37.111288,9.1231125 36.867188,9.3671875 L 34.367188,11.867188 C 33.879088,12.355287 33.879087,13.146666 34.367188,13.634766 34.855388,14.122966 35.646666,14.122966 36.134766,13.634766 L 38.634766,11.134766 C 39.122966,10.646666 39.122966,9.8553475 38.634766,9.3671875 38.390716,9.1231125 38.069913,9 37.75,9 Z M 24,14 C 18.47715,14 14,18.47715 14,24 14,29.5228 18.47715,34 24,34 29.5228,34 34,29.5228 34,24 34,18.47715 29.5228,14 24,14 Z M 24,15.5 C 28.6944,15.5 32.5,19.30558 32.5,24 32.5,28.6944 28.6944,32.5 24,32.5 Z M 5.25,22.75 C 4.55965,22.75 4,23.3097 4,24 4,24.6904 4.55965,25.25 5.25,25.25 H 7.75 C 8.44035,25.25 9,24.6904 9,24 9,23.3097 8.44035,22.75 7.75,22.75 Z M 40.25,22.75 C 39.5596,22.75 39,23.3097 39,24 39,24.6904 39.5596,25.25 40.25,25.25 H 42.75 C 43.4403,25.25 44,24.6904 44,24 44,23.3097 43.4403,22.75 42.75,22.75 Z M 12.75,34 C 12.4301,34 12.109284,34.123087 11.865234,34.367188 L 9.3652344,36.867188 C 8.8770744,37.355287 8.8770744,38.146666 9.3652344,38.634766 9.8533844,39.122966 10.646666,39.122966 11.134766,38.634766 L 13.634766,36.134766 C 14.122966,35.646666 14.122966,34.855288 13.634766,34.367188 13.390716,34.123087 13.0699,34 12.75,34 Z M 35.25,34 C 34.930087,34 34.611288,34.123087 34.367188,34.367188 33.879088,34.855288 33.879087,35.646666 34.367188,36.134766 L 36.867188,38.634766 C 37.355388,39.122966 38.146666,39.122966 38.634766,38.634766 39.122966,38.146666 39.122966,37.355287 38.634766,36.867188 L 36.134766,34.367188 C 35.890716,34.123087 35.569913,34 35.25,34 Z M 23.998047,39 C 23.307647,39 22.748047,39.5597 22.748047,40.25 V 42.75 C 22.748047,43.4404 23.307647,44 23.998047,44 24.688347,44 25.248047,43.4404 25.248047,42.75 V 40.25 C 25.248047,39.5597 24.688347,39 23.998047,39 Z" />
36+
<ui:PathIconSource Data="M 23.935547,4.0019531 C 23.275047,4.0354318 22.748047,4.5831669 22.748047,5.2519531 V 7.7519531 C 22.748047,8.4423031 23.307647,9.0019531 23.998047,9.0019531 24.688347,9.0019531 25.248047,8.4423031 25.248047,7.7519531 V 5.2519531 C 25.248047,4.5615931 24.688347,4.0019531 23.998047,4.0019531 23.976472,4.0019531 23.956853,4.0008732 23.935547,4.0019531 Z M 10.25,9 C 9.9300987,9 9.6093094,9.1231125 9.3652344,9.3671875 8.8770744,9.8553475 8.8770744,10.646666 9.3652344,11.134766 L 11.865234,13.634766 C 12.353334,14.122966 13.146666,14.122966 13.634766,13.634766 14.122966,13.146666 14.122966,12.355287 13.634766,11.867188 L 11.134766,9.3671875 C 10.890716,9.1231125 10.569901,9 10.25,9 Z M 37.75,9 C 37.430087,9 37.111288,9.1231125 36.867188,9.3671875 L 34.367188,11.867188 C 33.879088,12.355287 33.879087,13.146666 34.367188,13.634766 34.855388,14.122966 35.646666,14.122966 36.134766,13.634766 L 38.634766,11.134766 C 39.122966,10.646666 39.122966,9.8553475 38.634766,9.3671875 38.390716,9.1231125 38.069913,9 37.75,9 Z M 24,14 C 18.47715,14 14,18.47715 14,24 14,29.5228 18.47715,34 24,34 29.5228,34 34,29.5228 34,24 34,18.47715 29.5228,14 24,14 Z M 24,15.5 C 28.6944,15.5 32.5,19.30558 32.5,24 32.5,28.6944 28.6944,32.5 24,32.5 Z M 5.25,22.75 C 4.55965,22.75 4,23.3097 4,24 4,24.6904 4.55965,25.25 5.25,25.25 H 7.75 C 8.44035,25.25 9,24.6904 9,24 9,23.3097 8.44035,22.75 7.75,22.75 Z M 40.25,22.75 C 39.5596,22.75 39,23.3097 39,24 39,24.6904 39.5596,25.25 40.25,25.25 H 42.75 C 43.4403,25.25 44,24.6904 44,24 44,23.3097 43.4403,22.75 42.75,22.75 Z M 12.75,34 C 12.4301,34 12.109284,34.123087 11.865234,34.367188 L 9.3652344,36.867188 C 8.8770744,37.355287 8.8770744,38.146666 9.3652344,38.634766 9.8533844,39.122966 10.646666,39.122966 11.134766,38.634766 L 13.634766,36.134766 C 14.122966,35.646666 14.122966,34.855288 13.634766,34.367188 13.390716,34.123087 13.0699,34 12.75,34 Z M 35.25,34 C 34.930087,34 34.611288,34.123087 34.367188,34.367188 33.879088,34.855288 33.879087,35.646666 34.367188,36.134766 L 36.867188,38.634766 C 37.355388,39.122966 38.146666,39.122966 38.634766,38.634766 39.122966,38.146666 39.122966,37.355287 38.634766,36.867188 L 36.134766,34.367188 C 35.890716,34.123087 35.569913,34 35.25,34 Z M 23.998047,39 C 23.307647,39 22.748047,39.5597 22.748047,40.25 V 42.75 C 22.748047,43.4404 23.307647,44 23.998047,44 24.688347,44 25.248047,43.4404 25.248047,42.75 V 40.25 C 25.248047,39.5597 24.688347,39 23.998047,39 Z" x:Key="SwapThemeIcon" />
3837

3938
</ResourceDictionary>

0 commit comments

Comments
 (0)