Add empty definition -> not supported message

Author: vladzaharia

src/InvvardDev.EZLayoutDisplay.Desktop/Properties/layoutDefinition.json

@@ -1 +1 @@
-[{"x":"0","y":"0","width":"1.5","voffset":".37"},{"x":"1.5","y":"0","voffset":".37","glow":"true"},{"x":"2.5","y":"0","voffset":".129","glow":"true"},{"x":"3.5","y":"0","glow":"true"},{"x":"4.5","y":"0","voffset":".129","glow":"true"},{"x":"5.5","y":"0","voffset":".24","glow":"true"},{"x":"6.5","y":"0","voffset":".24"},{"x":"0","y":"1","width":"1.5","voffset":".37"},{"x":"1.5","y":"1","voffset":".37","glow":"true"},{"x":"2.5","y":"1","voffset":".129","glow":"true"},{"x":"3.5","y":"1","glow":"true"},{"x":"4.5","y":"1","voffset":".129","glow":"true"},{"x":"5.5","y":"1","voffset":".24","glow":"true"},{"x":"6.5","y":"1","voffset":".24","height":"1.5"},{"x":"0","y":"2","width":"1.5","voffset":".37"},{"x":"1.5","y":"2","voffset":".37","glow":"true"},{"x":"2.5","y":"2","voffset":".129","glow":"true"},{"x":"3.5","y":"2","glow":"true"},{"x":"4.5","y":"2","voffset":".129","glow":"true"},{"x":"5.5","y":"2","voffset":".24","glow":"true"},{"x":"0","y":"3","width":"1.5","voffset":".37"},{"x":"1.5","y":"3","voffset":".37","glow":"true"},{"x":"2.5","y":"3","voffset":".129","glow":"true"},{"x":"3.5","y":"3","glow":"true"},{"x":"4.5","y":"3","voffset":".129","glow":"true"},{"x":"5.5","y":"3","voffset":".24","glow":"true"},{"x":"6.5","y":"3","voffset":"-.26","height":"1.5"},{"x":".5","y":"4","width":"1","voffset":".37"},{"x":"1.5","y":"4","voffset":".37","glow":"true"},{"x":"2.5","y":"4","voffset":".129","glow":"true"},{"x":"3.5","y":"4","glow":"true"},{"x":"4.5","y":"4","voffset":".129","glow":"true"},{"x":"7.5","y":"3","height":"1","hoffset":".37","voffset":".87","rotate":"30"},{"x":"8.5","y":"3","height":"1","hoffset":".24","voffset":"1.37","rotate":"30"},{"x":"8.5","y":"4","height":"1","hoffset":"-.26","voffset":"1.24","rotate":"30"},{"x":"6.5","y":"4","height":"2","voffset":".24","rotate":"30"},{"x":"7.5","y":"4","height":"2","hoffset":"-.13","voffset":".74","rotate":"30"},{"x":"8.5","y":"5","height":"1","hoffset":"-.76","voffset":"1.11","rotate":"30"},{"x":"12","y":"0","voffset":".24"},{"x":"13","y":"0","voffset":".24","glow":"true"},{"x":"14","y":"0","voffset":".129","glow":"true"},{"x":"15","y":"0","glow":"true"},{"x":"16","y":"0","voffset":".129","glow":"true"},{"x":"17","y":"0","voffset":".37","glow":"true"},{"x":"18","y":"0","width":"1.5","voffset":".37"},{"x":"12","y":"1","voffset":".24","height":"1.5"},{"x":"13","y":"1","voffset":".24","glow":"true"},{"x":"14","y":"1","voffset":".129","glow":"true"},{"x":"15","y":"1","glow":"true"},{"x":"16","y":"1","voffset":".129","glow":"true"},{"x":"17","y":"1","voffset":".37","glow":"true"},{"x":"18","y":"1","width":"1.5","voffset":".37"},{"x":"13","y":"2","voffset":".24","glow":"true"},{"x":"14","y":"2","voffset":".129","glow":"true"},{"x":"15","y":"2","glow":"true"},{"x":"16","y":"2","voffset":".129","glow":"true"},{"x":"17","y":"2","voffset":".37","glow":"true"},{"x":"18","y":"2","width":"1.5","voffset":".37"},{"x":"12","y":"3","voffset":"-.26","height":"1.5"},{"x":"13","y":"3","voffset":".24","glow":"true"},{"x":"14","y":"3","voffset":".129","glow":"true"},{"x":"15","y":"3","glow":"true"},{"x":"16","y":"3","voffset":".129","glow":"true"},{"x":"17","y":"3","voffset":".37","glow":"true"},{"x":"18","y":"3","width":"1.5","voffset":".37"},{"x":"14","y":"4","voffset":".129","glow":"true"},{"x":"15","y":"4","glow":"true"},{"x":"16","y":"4","voffset":".129","glow":"true"},{"x":"17","y":"4","voffset":".37","glow":"true"},{"x":"18","y":"4","width":"1","voffset":".37"},{"x":"10","y":"3","height":"1","hoffset":"-.24","voffset":"1.37","rotate":"-30","origin":"1,0"},{"x":"11","y":"3","height":"1","hoffset":"-.37","voffset":".87","rotate":"-30","origin":"1,0"},{"x":"10","y":"4","height":"1","hoffset":".26","voffset":"1.24","rotate":"-30","origin":"1,0"},{"x":"10","y":"5","height":"1","hoffset":".76","voffset":"1.11","rotate":"-30","origin":"1,0"},{"x":"11","y":"4","height":"2","hoffset":".13","voffset":".74","rotate":"-30","origin":"1,0"},{"x":"12","y":"4","height":"2","voffset":".24","rotate":"-30","origin":"1,0"}]
+[]

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

@@ -63,7 +63,7 @@
             <TextBlock Text="{Binding ControlHintSpaceLabel}" Style="{StaticResource TbControlHintStyle}" />
         </StackPanel>
 
-        <Grid Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToHiddenConverter}}" Width="350">
+        <Grid Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToHiddenConverter}}" Width="450">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width=".25*" />
                 <ColumnDefinition Width="10" />
@@ -72,9 +72,9 @@
             <Image Grid.Column="0" Source="../Skins/Images/warning-sign.png" />
             <TextBlock Grid.Column="2" TextWrapping="WrapWithOverflow" FontSize="18" VerticalAlignment="Center"
                        HorizontalAlignment="Left">
-                <Run Text="{Binding NoLayoutWarningFirstLine, Mode=OneWay}" />
+                <Run Text="{Binding NoLayoutWarningFirstLine, Mode=OneWay}" FontWeight="Medium" />
                 <LineBreak />
-                <Run Text="{Binding NoLayoutWarningSecondLine, Mode=OneWay}" />
+                <Run Text="{Binding NoLayoutWarningSecondLine, Mode=OneWay}" FontSize="16" />
             </TextBlock>
         </Grid>
     </Grid>

src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs

@@ -230,8 +230,6 @@ public DisplayLayoutViewModel(IWindowService windowService, ILayoutService layou
         private void SetLabelUi()
         {
             WindowTitle = "ErgoDox Layout";
-            NoLayoutWarningFirstLine = "No layout available !";
-            NoLayoutWarningSecondLine = "Please, go to the settings and update the layout.";
             CurrentLayerNameTitle = "Current layer :";
             CurrentLayerName = "";
             ControlHintSpaceLabel = "Scroll up/down or press 'Space' to display next layer";
@@ -267,6 +265,8 @@ private async void LoadCompleteLayout()
                 || !_ezLayout.EZLayers.SelectMany(l => l.EZKeys).Any())
             {
                 Logger.Info("No layout available");
+                NoLayoutWarningFirstLine = "No layout available!";
+                NoLayoutWarningSecondLine = "Please, go to the settings and update the layout.";
                 NoLayoutAvailable = true;
 
                 return;
@@ -275,6 +275,14 @@ private async void LoadCompleteLayout()
             NoLayoutAvailable = false;
             await PopulateLayoutTemplates(_ezLayout.Geometry);
 
+            if (_layoutTemplates.Count == 0)
+            {
+                Logger.Info("Geometry not supported");
+                NoLayoutWarningFirstLine = "Not supported!";
+                NoLayoutWarningSecondLine = "Sorry, your keyboard is not supported yet.";
+                NoLayoutAvailable = true;
+            }
+
             SwitchLayer();
         }
 
@@ -327,6 +335,8 @@ private async Task PopulateLayoutTemplates(string geometry)
             {
                 if (!(await LoadLayoutDefinition(geometry) is List<KeyTemplate> layoutTemplate)) break;
 
+                if (layoutTemplate.Count == 0) return;
+
                 for (int j = 0 ; j < layoutTemplate.Count ; j++)
                 {
                     layoutTemplate[j].EZKey = t.EZKeys[j];

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

@@ -487,7 +487,7 @@ private string GetKeyBoardDescription(string keyboardGeometry, string revisionMo
 
                     break;
                 case "moonlander":
-                    keyboardDescription = "Moonlander Mk1 ";
+                    keyboardDescription = "Moonlander ";
                     break;
                 default:
                     keyboardDescription = $"{keyboardGeometry} ";

src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/DisplayLayoutViewModelTest.cs

@@ -43,8 +43,8 @@ public void DisplayLayoutViewModel_Constructor()
 
             //Assert
             Assert.Equal("ErgoDox Layout", displayLayoutViewModel.WindowTitle);
-            Assert.Equal("No layout available !", displayLayoutViewModel.NoLayoutWarningFirstLine);
-            Assert.Equal("Please, go to the settings and update the layout.", displayLayoutViewModel.NoLayoutWarningSecondLine);
+            Assert.Equal("Not supported!", displayLayoutViewModel.NoLayoutWarningFirstLine);
+            Assert.Equal("Sorry, your keyboard is not supported yet.", displayLayoutViewModel.NoLayoutWarningSecondLine);
             Assert.Equal("Current layer :", displayLayoutViewModel.CurrentLayerNameTitle);
             Assert.Equal("", displayLayoutViewModel.CurrentLayerName);
             Assert.Equal("Scroll up/down or press 'Space' to display next layer", displayLayoutViewModel.ControlHintSpaceLabel);