From 4b62e5265c323b6693d5487aceef0ddfee0d3efa Mon Sep 17 00:00:00 2001
From: Thorsten Sommer <mail@tsommer.org>
Date: Wed, 10 Aug 2022 21:05:38 +0200
Subject: [PATCH] Finished the navigation menu

- Added a NavItem component
- Replaced the navbar toggle icon
- Made the navbar tighter
- Fixed the navbar's padding
- Render the nav items dynamically
---
 .../UI MAUI/Components/NavItem.razor          |  9 +++++++
 .../UI MAUI/Components/NavItem.razor.cs       | 20 +++++++++++++++
 I18N Commander/UI MAUI/NavigationTarget.cs    | 15 +++++++++++
 .../UI MAUI/Shared/MainLayout.razor           | 25 ++++++++-----------
 .../UI MAUI/wwwroot/icons/nav-toggle.svg      |  1 +
 5 files changed, 55 insertions(+), 15 deletions(-)
 create mode 100644 I18N Commander/UI MAUI/Components/NavItem.razor
 create mode 100644 I18N Commander/UI MAUI/Components/NavItem.razor.cs
 create mode 100644 I18N Commander/UI MAUI/NavigationTarget.cs
 create mode 100644 I18N Commander/UI MAUI/wwwroot/icons/nav-toggle.svg

diff --git a/I18N Commander/UI MAUI/Components/NavItem.razor b/I18N Commander/UI MAUI/Components/NavItem.razor
new file mode 100644
index 0000000..40f4a8f
--- /dev/null
+++ b/I18N Commander/UI MAUI/Components/NavItem.razor	
@@ -0,0 +1,9 @@
+<li class="nav-item">
+    <a class="nav-link active" aria-current="page" href="@this.Route">
+        @if (this.ShowIcon)
+        {
+            <Icon Filename="@this.IconFilename" Size="25" AltText="@this.AltText" />
+        }
+        <span class="ms-1 align-middle">@this.Text</span>
+    </a>
+</li>
\ No newline at end of file
diff --git a/I18N Commander/UI MAUI/Components/NavItem.razor.cs b/I18N Commander/UI MAUI/Components/NavItem.razor.cs
new file mode 100644
index 0000000..66767ef
--- /dev/null
+++ b/I18N Commander/UI MAUI/Components/NavItem.razor.cs	
@@ -0,0 +1,20 @@
+using Microsoft.AspNetCore.Components;
+
+namespace UI_MAUI.Components;
+
+public partial class NavItem : ComponentBase
+{
+    [Parameter]
+    public string Route { get; set; }
+
+    [Parameter]
+    public string Text { get; set; }
+
+    [Parameter]
+    public bool ShowIcon { get; set; } = false;
+
+    [Parameter]
+    public string IconFilename { get; set; } = string.Empty;
+
+    private string AltText => $"Navigation: {this.Text}";
+}
\ No newline at end of file
diff --git a/I18N Commander/UI MAUI/NavigationTarget.cs b/I18N Commander/UI MAUI/NavigationTarget.cs
new file mode 100644
index 0000000..b50c842
--- /dev/null
+++ b/I18N Commander/UI MAUI/NavigationTarget.cs	
@@ -0,0 +1,15 @@
+namespace UI_MAUI;
+
+public readonly record struct NavigationTarget(string Text, string Route, string IconFilename)
+{
+    private static readonly NavigationTarget SETTINGS = new NavigationTarget("Settings", "settings", "settings.svg");
+    private static readonly NavigationTarget TRANSLATION = new NavigationTarget("Translation", "translation", "translation.svg");
+    private static readonly NavigationTarget LOAD_PROJECT = new NavigationTarget("Load Project", "load", "load.svg");
+    
+    public static IEnumerable<NavigationTarget> GetAll()
+    {
+        yield return SETTINGS;
+        yield return LOAD_PROJECT;
+        yield return TRANSLATION;
+    }
+};
\ No newline at end of file
diff --git a/I18N Commander/UI MAUI/Shared/MainLayout.razor b/I18N Commander/UI MAUI/Shared/MainLayout.razor
index 54a03ee..b52cf20 100644
--- a/I18N Commander/UI MAUI/Shared/MainLayout.razor	
+++ b/I18N Commander/UI MAUI/Shared/MainLayout.razor	
@@ -1,25 +1,20 @@
 @inherits LayoutComponentBase
 
-<nav class="navbar navbar-dark bg-dark navbar-expand-sm">
-    <div class="container-fluid">
-        <div class="navbar-brand">
+<nav class="navbar navbar-dark bg-dark navbar-expand-sm p-0">
+    <div class="container-fluid ps-1">
+        <div class="navbar-brand p-0">
             <Icon Filename="translation.svg" Size="35" AltText="App Icon" />
             <span class="fw-bold">I18N</span> <span class="fs-6">Commander</span>
         </div>
-        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
+        <button class="navbar-toggler p-0 my-1" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+            <Icon Filename="nav-toggle.svg" AltText="Toggles menu" Size="35" />
         </button>
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
-            <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-                <li class="nav-item">
-                    <a class="nav-link active" aria-current="page" href="#">Index</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#">Settings</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#">Translations</a>
-                </li>
+            <ul class="navbar-nav me-auto">
+                @foreach (var (text, route, iconFilename) in NavigationTarget.GetAll())
+                {
+                    <NavItem Text="@text" Route="@route" ShowIcon="@(!string.IsNullOrWhiteSpace(iconFilename))" IconFilename="@iconFilename" />
+                }
             </ul>
         </div>
     </div>
diff --git a/I18N Commander/UI MAUI/wwwroot/icons/nav-toggle.svg b/I18N Commander/UI MAUI/wwwroot/icons/nav-toggle.svg
new file mode 100644
index 0000000..469b51a
--- /dev/null
+++ b/I18N Commander/UI MAUI/wwwroot/icons/nav-toggle.svg	
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="512px" height="512px"><path fill="#546E7A" d="M6 14H42V18H6zM6 22H42V26H6zM6 30H42V34H6z"/><path fill="#2196F3" d="M24,45l-7-6.976h14L24,45z"/></svg>
\ No newline at end of file