Skip to content
This repository was archived by the owner on Nov 25, 2023. It is now read-only.

Commit 24e22f7

Browse files
vladzahariavladzaharia
committed
Revert some changes and support new zsa URLs
1 parent ac22797 commit 24e22f7

File tree

3 files changed

+66
-77
lines changed

3 files changed

+66
-77
lines changed

‎src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<TextBlock Text="{Binding ControlHintSpaceLabel}" Style="{StaticResource TbControlHintStyle}" />
6464
</StackPanel>
6565

66-
<Grid Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToHiddenConverter}}" Width="450">
66+
<Grid Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToHiddenConverter}}" Width="350">
6767
<Grid.ColumnDefinitions>
6868
<ColumnDefinition Width=".25*" />
6969
<ColumnDefinition Width="10" />
@@ -72,9 +72,9 @@
7272
<Image Grid.Column="0" Source="../Skins/Images/warning-sign.png" />
7373
<TextBlock Grid.Column="2" TextWrapping="WrapWithOverflow" FontSize="18" VerticalAlignment="Center"
7474
HorizontalAlignment="Left">
75-
<Run Text="{Binding NoLayoutWarningFirstLine, Mode=OneWay}" FontWeight="Medium" />
75+
<Run Text="{Binding NoLayoutWarningFirstLine, Mode=OneWay}" />
7676
<LineBreak />
77-
<Run Text="{Binding NoLayoutWarningSecondLine, Mode=OneWay}" FontSize="16" />
77+
<Run Text="{Binding NoLayoutWarningSecondLine, Mode=OneWay}" />
7878
</TextBlock>
7979
</Grid>
8080
</Grid>

‎src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/SettingsViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ private async Task UpdateLayout()
546546
var layoutHashIdGroupName = "layoutHashId";
547547
var layoutRevisionIdGroupName = "layoutRevisionId";
548548
var pattern =
549-
$"https://configure.ergodox-ez.com/(?:ergodox-ez|planck-ez|moonlander)/layouts/(?<{layoutHashIdGroupName}>default|[a-zA-Z0-9]{{4,}})(?:/(?<{layoutRevisionIdGroupName}>latest|[a-zA-Z0-9]+)(?:/[0-9]{{1,2}})?)?";
549+
$"https://configure.(?:ergodox-ez.com|zsa.io)/(?:ergodox-ez|planck-ez|moonlander)/layouts/(?<{layoutHashIdGroupName}>default|[a-zA-Z0-9]{{4,}})(?:/(?<{layoutRevisionIdGroupName}>latest|[a-zA-Z0-9]+)(?:/[0-9]{{1,2}})?)?";
550550
var layoutHashId = "default";
551551
var layoutRevisionId = "latest";
552552

‎src/InvvardDev.EZLayoutDisplay.Tests/Service/LayoutServiceTest.cs‎

Lines changed: 62 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,27 @@ public class LayoutServiceTest
1414
{
1515
private static ErgodoxLayout InitializeDataTree()
1616
{
17-
return new ErgodoxLayout
18-
{
19-
Title = "",
20-
HashId = "",
21-
Revision = new Revision
22-
{
23-
HashId = "hashId-1",
24-
Layers = new List<ErgodoxLayer> {
17+
return new ErgodoxLayout {
18+
Title = "",
19+
HashId = "",
20+
Revision = new Revision {
21+
HashId = "hashId-1",
22+
Layers = new List<ErgodoxLayer> {
2523
new ErgodoxLayer() {
2624
Color = "",
2725
Title = "",
2826
Position = 0,
2927
Keys = new List<ErgodoxKey>()
3028
}
3129
}
32-
}
33-
};
30+
}
31+
};
3432
}
3533

36-
[Theory]
37-
[InlineData("EOEb", true)]
38-
[InlineData("default", true)]
39-
[InlineData("test", false)]
34+
[ Theory ]
35+
[ InlineData("EOEb", true) ]
36+
[ InlineData("default", true) ]
37+
[ InlineData("test", false) ]
4038
public async Task GetLayoutInfo(string layoutHashId, bool exist)
4139
{
4240
// Arrange
@@ -65,10 +63,10 @@ public async Task GetLayoutInfo(string layoutHashId, bool exist)
6563
}
6664
}
6765

68-
[Theory]
69-
[InlineData("EOEb", true)]
70-
[InlineData("default", true)]
71-
[InlineData("test", false)]
66+
[ Theory ]
67+
[ InlineData("EOEb", true) ]
68+
[ InlineData("default", true) ]
69+
[ InlineData("test", false) ]
7270
public async Task GetErgodoxLayout(string layoutHashId, bool exist)
7371
{
7472
// Arrange
@@ -97,28 +95,25 @@ public async Task GetErgodoxLayout(string layoutHashId, bool exist)
9795
}
9896
}
9997

100-
[Fact]
98+
[ Fact ]
10199
public void PrepareEZLayout_OneLayer_ManyKeys()
102100
{
103101
// Arrange
104102
ILayoutService layoutService = new LayoutService();
105103
ErgodoxLayout ergodoxLayout = InitializeDataTree();
106104
var keys = ergodoxLayout.Revision.Layers.First().Keys;
107-
keys.Add(new ErgodoxKey()
108-
{
109-
GlowColor = "",
110-
Code = "KC_A"
111-
});
112-
keys.Add(new ErgodoxKey()
113-
{
114-
GlowColor = "",
115-
Code = "KC_0"
116-
});
117-
keys.Add(new ErgodoxKey()
118-
{
119-
GlowColor = "",
120-
Code = "KC_TRANSPARENT"
121-
});
105+
keys.Add(new ErgodoxKey() {
106+
GlowColor = "",
107+
Code = "KC_A"
108+
});
109+
keys.Add(new ErgodoxKey() {
110+
GlowColor = "",
111+
Code = "KC_0"
112+
});
113+
keys.Add(new ErgodoxKey() {
114+
GlowColor = "",
115+
Code = "KC_TRANSPARENT"
116+
});
122117
EZLayout ezLayoutResult;
123118

124119
// Act
@@ -137,48 +132,42 @@ public void PrepareEZLayout_OneLayer_ManyKeys()
137132
Assert.Equal(KeyCategory.Other, keyResults[2].KeyCategory);
138133
}
139134

140-
[Fact]
135+
[ Fact ]
141136
public void PrepareEZLayout_TwoLayer_ManyKeys()
142137
{
143138
// Arrange
144139
ILayoutService layoutService = new LayoutService();
145140
ErgodoxLayout ergodoxLayout = InitializeDataTree();
146141
var layer0Keys = ergodoxLayout.Revision.Layers.First().Keys;
147-
layer0Keys.Add(new ErgodoxKey()
148-
{
149-
GlowColor = "",
150-
Code = "KC_A"
151-
});
152-
layer0Keys.Add(new ErgodoxKey()
153-
{
154-
GlowColor = "",
155-
Code = "KC_0"
156-
});
157-
layer0Keys.Add(new ErgodoxKey()
158-
{
159-
GlowColor = "",
160-
Code = "KC_TRANSPARENT"
161-
});
142+
layer0Keys.Add(new ErgodoxKey() {
143+
GlowColor = "",
144+
Code = "KC_A"
145+
});
146+
layer0Keys.Add(new ErgodoxKey() {
147+
GlowColor = "",
148+
Code = "KC_0"
149+
});
150+
layer0Keys.Add(new ErgodoxKey() {
151+
GlowColor = "",
152+
Code = "KC_TRANSPARENT"
153+
});
162154

163155
ergodoxLayout.Revision
164-
.Layers.Add(new ErgodoxLayer
165-
{
166-
Color = "color",
167-
Title = "Layer 2",
168-
Position = 1,
169-
Keys = new List<ErgodoxKey>()
170-
});
156+
.Layers.Add(new ErgodoxLayer {
157+
Color = "color",
158+
Title = "Layer 2",
159+
Position = 1,
160+
Keys = new List<ErgodoxKey>()
161+
});
171162
var layer1Keys = ergodoxLayout.Revision.Layers[1].Keys;
172-
layer1Keys.Add(new ErgodoxKey()
173-
{
174-
GlowColor = "",
175-
Code = "KC_F1"
176-
});
177-
layer1Keys.Add(new ErgodoxKey()
178-
{
179-
GlowColor = "",
180-
Code = "KC_SPACE"
181-
});
163+
layer1Keys.Add(new ErgodoxKey() {
164+
GlowColor = "",
165+
Code = "KC_F1"
166+
});
167+
layer1Keys.Add(new ErgodoxKey() {
168+
GlowColor = "",
169+
Code = "KC_SPACE"
170+
});
182171
EZLayout ezLayoutResult;
183172

184173
// Act
@@ -204,7 +193,7 @@ public void PrepareEZLayout_TwoLayer_ManyKeys()
204193
Assert.Equal(KeyCategory.Spacing, layer1KeyResults[1].KeyCategory);
205194
}
206195

207-
[Fact]
196+
[ Fact ]
208197
public async Task GetErgodoxLayout_HashIdNull()
209198
{
210199
// Arrange
@@ -214,11 +203,11 @@ public async Task GetErgodoxLayout_HashIdNull()
214203
await Assert.ThrowsAsync<ArgumentNullException>(() => layoutService.GetErgodoxLayout("", ""));
215204
}
216205

217-
[Theory]
218-
[InlineData("ergodox-ez", true)]
219-
[InlineData("moonlander", true)]
220-
[InlineData("planck-ez", false)]
221-
[InlineData("foobarbaz", false)]
206+
[ Theory ]
207+
[ InlineData("ergodox-ez", true) ]
208+
[ InlineData("moonlander", true) ]
209+
[ InlineData("planck-ez", false) ]
210+
[ InlineData("foobarbaz", false) ]
222211
public void SupportsGeometry(string geometry, bool expected)
223212
{
224213
// Arrange

0 commit comments

Comments
 (0)