Merge branch 'release/0.1.1' into main

Author: Luca

.github/workflows/deploy.yml

@@ -40,7 +40,8 @@ jobs:
 
       - name: Deploy and Restart Service
         run: |
+          sudo systemctl stop pi-touch-date.service || true
           mkdir -p /home/pi/pi-touch-date
           cp -r ./deploy/* /home/pi/pi-touch-date/
           chmod +x /home/pi/pi-touch-date/PiTouchDate
-          sudo systemctl restart pi-touch-date.service
+          sudo systemctl start pi-touch-date.service

PiTouchDate/Controls/ScreenKeyboard/ScreenKeyboard.axaml.cs

@@ -33,7 +33,7 @@ public event EventHandler<ScreenKeyPressEventArgs> KeyPress
         remove => RemoveHandler(KeyPressEvent, value);
     }
 
-    private enum KeyboardMode { Lower, Upper, Symbols }
+    private enum KeyboardMode { Lower, Upper, Symbols, Symbols2 }
 
     // label, action, column width multiplier
     private record struct KeyDef(string Label, string Action, double Width = 1.0);
@@ -59,7 +59,15 @@ private record struct KeyDef(string Label, string Action, double Width = 1.0);
         [K("1"), K("2"), K("3"), K("4"), K("5"), K("6"), K("7"), K("8"), K("9"), K("0")],
         [K("!"), K("@"), K("#"), K("$"), K("%"), K("&"), K("*"), K("("), K(")"), K("-"), K("?")],
         [K("_"), K("="), K("+"), K("["), K("]"), K("{"), K("}"), K(";"), K(":"), K("'")],
-        [Sp("abc", "ModeLower", 2.0), Sp("spazio", "Space", 6.0), Sp("⌫", "Backspace", 2.0)],
+        [Sp("abc", "ModeLower", 1.5), Sp("▸", "ModeSymbols2", 1.5), Sp("spazio", "Space", 5.0), Sp(".", ".", 0.75), Sp("⌫", "Backspace", 1.25)],
+    ];
+
+    private static readonly KeyDef[][] SymbolRows2 =
+    [
+        [K("^"), K("~"), K("`"), K("\""), K("<"), K(">"), K("/"), K("\\"), K("|"), K(",")],
+        [K("."), K("€"), K("£"), K("¥"), K("°"), K("•"), K("–"), K("—"), K("×"), K("÷")],
+        [K("±"), K("™"), K("©"), K("®"), K("←"), K("→"), K("↑"), K("↓"), K("§"), K("¶")],
+        [Sp("◀", "ModeSymbols", 1.5), Sp("abc", "ModeLower", 1.5), Sp("spazio", "Space", 5.0), Sp("⌫", "Backspace", 2.0)],
     ];
 
     private static KeyDef K(string key) => new(key, key);
@@ -89,6 +97,7 @@ private void BuildKeyboard()
         {
             KeyboardMode.Upper => UpperRows,
             KeyboardMode.Symbols => SymbolRows,
+            KeyboardMode.Symbols2 => SymbolRows2,
             _ => LowerRows,
         };
 
@@ -134,7 +143,7 @@ private Button CreateKeyButton(KeyDef key)
         var button = new Button { Content = key.Label };
         button.Classes.Add("key");
 
-        bool isSpecial = key.Action is "ModeUpper" or "ModeLower" or "ModeSymbols"
+        bool isSpecial = key.Action is "ModeUpper" or "ModeLower" or "ModeSymbols" or "ModeSymbols2"
                                     or "Backspace" or "Space" or "123" or "abc";
 
         if (isSpecial) button.Classes.Add("key-special");
@@ -148,9 +157,10 @@ private void HandleKeyPress(string action)
     {
         switch (action)
         {
-            case "ModeUpper":   _mode = KeyboardMode.Upper;   BuildKeyboard(); return;
-            case "ModeLower":   _mode = KeyboardMode.Lower;   BuildKeyboard(); return;
-            case "ModeSymbols": _mode = KeyboardMode.Symbols; BuildKeyboard(); return;
+            case "ModeUpper":    _mode = KeyboardMode.Upper;    BuildKeyboard(); return;
+            case "ModeLower":    _mode = KeyboardMode.Lower;    BuildKeyboard(); return;
+            case "ModeSymbols":  _mode = KeyboardMode.Symbols;  BuildKeyboard(); return;
+            case "ModeSymbols2": _mode = KeyboardMode.Symbols2; BuildKeyboard(); return;
         }
 
         var key = action == "Space" ? " " : action;

PiTouchDate/ViewModels/Overlays/WifiSettingsOverlayViewModel.cs

@@ -50,14 +50,29 @@ public string WifiPassword
         set => this.RaiseAndSetIfChanged(ref _wifiPassword, value);
     }
 
+    private bool _showPassword = false;
+    public bool ShowPassword
+    {
+        get => _showPassword;
+        set
+        {
+            this.RaiseAndSetIfChanged(ref _showPassword, value);
+            this.RaisePropertyChanged(nameof(PasswordMaskChar));
+        }
+    }
+
+    public char PasswordMaskChar => ShowPassword ? '\0' : '●';
+
     public ObservableCollection<WifiNetwork> Networks { get; } = new();
 
     // ----------  Commands  ----------
     public ReactiveCommand<Unit, bool> ConnectCommand { get; }
 
     public ReactiveCommand<string, Unit> KeyPressCommand { get; }
 
-    public ReactiveCommand<Unit, Unit> CancelConnectionCommand {get; }
+    public ReactiveCommand<Unit, Unit> CancelConnectionCommand { get; }
+
+    public ReactiveCommand<Unit, Unit> ToggleShowPasswordCommand { get; }
 
 
 
@@ -68,6 +83,7 @@ public WifiSettingsViewModel()
         KeyPressCommand = ReactiveCommand.Create<string>(OnKeyPress);
         ConnectCommand = ReactiveCommand.CreateFromTask(ConnectCommandHandler);
         CancelConnectionCommand = ReactiveCommand.Create(CancelConnectionCommandHandler);
+        ToggleShowPasswordCommand = ReactiveCommand.Create(() => { ShowPassword = !ShowPassword; });
 
         _isConnecting = ConnectCommand.IsExecuting
             .ToProperty(this, x => x.IsConnecting, scheduler: RxApp.MainThreadScheduler);
@@ -130,6 +146,7 @@ public void SelectNetwork(WifiNetwork network)
     {
         SelectedNetwork = network;
         WifiPassword = string.Empty;
+        ShowPassword = false;
     }
 
     // ----------  Commands handlers  ----------

PiTouchDate/Views/Overlays/WifiSettingsView.axaml

@@ -88,9 +88,26 @@
                 </Button>
             </Grid>
 
-            <!-- Passord input -->
-            <TextBox Grid.Row="1" HorizontalAlignment="Stretch" Margin="0,10,0,0" PasswordChar="●"
-                     Text="{Binding WifiPassword, UpdateSourceTrigger=PropertyChanged}"/>
+            <!-- Password input -->
+            <Panel Grid.Row="1" Margin="0,10,0,0">
+                <TextBox HorizontalAlignment="Stretch"
+                         PasswordChar="{Binding PasswordMaskChar}"
+                         Text="{Binding WifiPassword, UpdateSourceTrigger=PropertyChanged}"
+                         Padding="12,8,44,8"/>
+                <Button HorizontalAlignment="Right" VerticalAlignment="Center"
+                        Margin="0,0,6,0" Padding="6"
+                        Background="Transparent" BorderThickness="0"
+                        Command="{Binding ToggleShowPasswordCommand}">
+                    <Panel>
+                        <PathIcon Data="{DynamicResource SemiIconEyeOpened}"
+                                  Width="18" Height="18" Opacity="0.6"
+                                  IsVisible="{Binding !ShowPassword}"/>
+                        <PathIcon Data="{DynamicResource SemiIconEyeClosedSolid}"
+                                  Width="18" Height="18" Opacity="0.6"
+                                  IsVisible="{Binding ShowPassword}"/>
+                    </Panel>
+                </Button>
+            </Panel>
 
             <!-- Screen keyboard -->
             <controls:ScreenKeyboard Grid.Row="2" Margin="0,10,0,0" KeyPressCommand="{Binding KeyPressCommand}"/>