chore: switch source and fix tab groups

Author: DevTKSS

.github/workflows/build-deploy-docs.yml

@@ -17,15 +17,19 @@ on:
   workflow_dispatch:
 
 permissions:
-  contents: write
+  contents: read
+  pages: write
+  id-token: write
 
 concurrency:
   group: pages
-  cancel-in-progress: true
+  cancel-in-progress: false
 
 jobs:
-  build:
-    name: Build DocFX site
+  publish-docs:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
     runs-on: windows-latest
 
     steps:
@@ -44,55 +48,18 @@ jobs:
 
       - name: Install DocFX as .NET tool
         run: |
-          dotnet tool install -g docfx --version 2.78.3
+          dotnet tool update -g docfx
           docfx --version
 
-      - name: Build metadata
+      - name: Build DocFX site
         working-directory: docs
-        run: |
-          docfx metadata docfx.json --logLevel Verbose
-
-      - name: Build site
-        working-directory: docs
-        run: |
-          docfx build docfx.json --logLevel Verbose
+        run: docfx docfx.json
 
-      - name: Prepare publish folder (gh-pages/docs)
-        run: |
-          New-Item -ItemType Directory -Force -Path public/docs | Out-Null
-          Copy-Item -Path "docs/_site/*" -Destination "public/docs" -Recurse -Force
-          if (Test-Path "docs/.nojekyll") { Copy-Item -Force "docs/.nojekyll" "public/docs/.nojekyll" }
-        shell: pwsh
-
-      - name: Upload site artifact
-        uses: actions/upload-artifact@v4
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
         with:
-          name: docfx-site
-          path: public/docs
+          path: 'docs/_site'
 
-  deploy:
-    if: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request' }}
-    name: Deploy to GitHub Pages (gh-pages/docs)
-    needs: build
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Download site artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: docfx-site
-          path: public/docs
-
-      - name: Publish to gh-pages
-        uses: peaceiris/actions-gh-pages@v4
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_branch: gh-pages
-          publish_dir: public
-          keep_files: false
-          force_orphan: true
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

README.md

@@ -1,14 +1,14 @@
 # DevTKSS Uno Samples
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/DevTKSS/DevTKSS.Uno.SampleApps/blob/master/LICENSE.md)
-[![Documentation](https://img.shields.io/badge/docs-online-green.svg)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/)
+[![Documentation](https://img.shields.io/badge/docs-online-green.svg)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/)
 [![Uno.Sdk](https://img.shields.io/badge/Uno.Sdk-6.3.28+-purple.svg)](https://platform.uno/)
 
 ## Welcome to this Samples and Tutorials Library! ❤️
 
 This is a collection of Sample Apps and Tutorials for the [Uno Platform](https://platform.uno/), created to fill the gap of missing **German-localized** learning content. Most tutorials are available in both **German** (primary) and **English**.
 
-**Quick Links:** [Get Started](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/articles/en/HowTo-Setup-DevelopmentEnvironment-en.html) | [Documentation](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/) | [Video Tutorials (German)](https://youtube.com/playlist?list=PLEL6kb4Bivm_g81iKBl-f0eYPNr5h2dFX) | [Discussions](https://github.com/DevTKSS/DevTKSS.Uno.SampleApps/discussions)
+**Quick Links:** [Get Started](https://devtkss.github.io/DevTKSS.Uno.SampleApps/articles/en/HowTo-Setup-DevelopmentEnvironment-en.html) | [Documentation](https://devtkss.github.io/DevTKSS.Uno.SampleApps/) | [Video Tutorials (German)](https://youtube.com/playlist?list=PLEL6kb4Bivm_g81iKBl-f0eYPNr5h2dFX) | [Discussions](https://github.com/DevTKSS/DevTKSS.Uno.SampleApps/discussions)
 
 ---
 
@@ -29,23 +29,23 @@ Before diving into the samples, make sure you have:
 - **Uno.Check** tool installed and verified (run `uno-check`)
 
 > [!TIP]
-> For detailed setup instructions, see our [Development Environment Setup Guide](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/articles/en/HowTo-Setup-DevelopmentEnvironment-en.html).
+> For detailed setup instructions, see our [Development Environment Setup Guide](https://devtkss.github.io/DevTKSS.Uno.SampleApps/articles/en/HowTo-Setup-DevelopmentEnvironment-en.html).
 
 ---
 
 ## Sample Applications
 
 ### Mvux Gallery
 
-![Mvux Gallery Showcase Thumbnail](./docs/articles/.attachments/DevTKSS%20Uno%20Mvux%20Samples%20Gallery%20App-Thumbnail.png)
+![Mvux Gallery Showcase Thumbnail](https://raw.githubusercontent.com/DevTKSS/DevTKSS.Uno.SampleApps/master/docs/articles/.attachments/DevTKSS%20Uno%20Mvux%20Samples%20Gallery%20App-Thumbnail.png)
 
 **Want to see a quick showcase of what you can explore?**
 
-![Mvux Gallery ShowCase](./docs/articles/.attachments/MvuxGallery-ShowCase.gif)
+![Mvux Gallery ShowCase](https://raw.githubusercontent.com/DevTKSS/DevTKSS.Uno.SampleApps/master/docs/articles/.attachments/MvuxGallery-ShowCase.gif)
 
 The [Mvux Gallery](https://github.com/DevTKSS/DevTKSS.Uno.SampleApps/tree/master/src/DevTKSS.Uno.Samples.MvuxGallery/) demonstrates modern Uno Platform development patterns with a comprehensive example application.
 
-**[View Detailed Mvux Gallery Overview](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/articles/en/MvuxGallery-Overview-en.html)**
+**[View Detailed Mvux Gallery Overview](https://devtkss.github.io/DevTKSS.Uno.SampleApps/articles/en/MvuxGallery-Overview-en.html)**
 
 #### Featured Controls
 
@@ -59,8 +59,8 @@ The [Mvux Gallery](https://github.com/DevTKSS/DevTKSS.Uno.SampleApps/tree/master
 
 - **[MVUX](https://platform.uno/docs/articles/external/uno.extensions/doc/Learn/Mvux/Overview.html)** - Model-View-Update-eXtended pattern
 - **Navigation**
-  - [Navigation via XAML](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/articles/en/Navigation/HowTo-Defining-UI-NavigationView-en.html)
-  - [React to Route Changes with IRouteNotifier](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/articles/en/Navigation/HowTo-ChangeRoutes-en.html)
+  - [Navigation via XAML](https://devtkss.github.io/DevTKSS.Uno.SampleApps/articles/en/Navigation/HowTo-Defining-UI-NavigationView-en.html)
+  - [React to Route Changes with IRouteNotifier](https://devtkss.github.io/DevTKSS.Uno.SampleApps/articles/en/Navigation/HowTo-ChangeRoutes-en.html)
 - **Hosting** - App Host Builder pattern
 - **Dependency Injection** - Constructor injection
 - **Serialization** - JSON data handling
@@ -77,7 +77,7 @@ The [Mvux Gallery](https://github.com/DevTKSS/DevTKSS.Uno.SampleApps/tree/master
 
 ### Xaml Navigation App
 
-![Image of final Xaml Navigation App](https://github.com/DevTKSS/DevTKSS.Uno.SampleApps/blob/master/doc/articles/.attachments/DevTKSS.Uno.XamlNavigationApp.png)
+![Image of final Xaml Navigation App](https://raw.githubusercontent.com/DevTKSS/DevTKSS.Uno.SampleApps/master/docs/articles/.attachments/DevTKSS.Uno.XamlNavigationApp.png)
 
 A complete tutorial application demonstrating navigation patterns with MVUX and XAML.
 
@@ -89,7 +89,7 @@ A complete tutorial application demonstrating navigation patterns with MVUX and
 
 **Available Resources:**
 
-- **[Tutorial Documentation](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/articles/en/Navigation/Extensions-Navigation-en.html)** - Step-by-step guide (🇩🇪 German | 🇬🇧 English)
+- **[Tutorial Documentation](https://devtkss.github.io/DevTKSS.Uno.SampleApps/articles/en/Navigation/Extensions-Navigation-en.html)** - Step-by-step guide (🇩🇪 German | 🇬🇧 English)
 - **[Video Tutorial Series](https://youtube.com/playlist?list=PLEL6kb4Bivm_g81iKBl-f0eYPNr5h2dFX)** - Complete walkthrough (🇩🇪 German with English subtitles)
 - **[Source Code](https://github.com/DevTKSS/DevTKSS.Uno.SampleApps/tree/master/src/DevTKSS.Uno.XamlNavigationApp-1/)** - Browse the implementation
 
@@ -101,10 +101,10 @@ You can access all tutorials and guides in both English and German. Use the tabl
 
 | Section                  | English                                                                 | German                                                                  |
 |--------------------------|------------------------------------------------------------------------|-------------------------------------------------------------------------|
-| Getting Started          | [Guide (EN)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/articles/en/HowTo-Setup-DevelopmentEnvironment-en.html) | [Anleitung (DE)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/articles/de/HowTo-Setup-DevelopmentEnvironment-de.html) |
-| Mvux Gallery Overview    | [Overview (EN)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/articles/en/MvuxGallery-Overview-en.html) | [Übersicht (DE)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/articles/de/MvuxGallery-Overview-de.html) |
-| Navigation Tutorials     | [Navigation (EN)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/articles/en/Navigation/Extensions-Navigation-en.html) | [Navigation (DE)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/articles/de/Navigation/Extensions-Navigation-de.html) |
-| All Docs Index           | [Docs Home (EN)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/) | [Docs Home (DE)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/index.html?lang=de) |
+| Getting Started          | [Guide (EN)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/articles/en/HowTo-Setup-DevelopmentEnvironment-en.html) | [Anleitung (DE)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/articles/de/HowTo-Setup-DevelopmentEnvironment-de.html) |
+| Mvux Gallery Overview    | [Overview (EN)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/articles/en/MvuxGallery-Overview-en.html) | [Übersicht (DE)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/articles/de/MvuxGallery-Overview-de.html) |
+| Navigation Tutorials     | [Navigation (EN)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/articles/en/Navigation/Extensions-Navigation-en.html) | [Navigation (DE)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/articles/de/Navigation/Extensions-Navigation-de.html) |
+| All Docs Index           | [Docs Home (EN)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/) | [Docs Home (DE)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/index.html?lang=de) |
 
 Most content is available in both German (original) and English (translated).
 

docs/articles/de/Navigation/HowTo-UpgradeExistingApp-de.md

@@ -6,19 +6,22 @@ uid: DevTKSS.Uno.ExtensionsNavigation.UpgradeExistingApp.de
 
 Solltest du schon eine existierende Uno Anwendung haben, kannst du die Extensions Navigation natürlich hinzufügen.
 
+## Hinzufügen der UnoFeatures
+
 In der Projektdatei, zu erkennen an der Endung `.csproj`, brauchst du dafür neben dem `Uno.Sdk` folgende `UnoFeatures` Elemente:
 
-# [Mvux](#tab/mvux)
+### [Mvux](#tab/mvux)
 
 ```xml
 <UnoFeatures>
     Hosting;
     Mvux;
     Navigation;
+    Toolkit;
 </UnoFeatures>
 ```
 
-# [Mvvm](#tab/mvvm)
+### [Mvvm](#tab/mvvm)
 
 ```xml
 <UnoFeatures>
@@ -29,10 +32,17 @@ In der Projektdatei, zu erkennen an der Endung `.csproj`, brauchst du dafür neb
 </UnoFeatures>
 ```
 
-# [On Launched](#tab/mvux/on-launched)
+***
+
+> [!TIP]
+> Das `Toolkit` Feature wird nur benötigt, wenn Navigations-Steuerelemente wie `TabBar` oder `DrawerControl` verwendet werden sollen.
+
+## App.xaml.cs Konfiguration
 
 Füge deiner Datei `App.xaml.cs` folgenden Inhalt hinzu, wenn nicht bereits enthalten:
 
+### [Mvux](#tab/mvux-on-launched)
+
 ```diff
 +    protected async override void OnLaunched(LaunchActivatedEventArgs args)
 +    {
@@ -54,9 +64,7 @@ Füge deiner Datei `App.xaml.cs` folgenden Inhalt hinzu, wenn nicht bereits enth
     }
 ```
 
-# [On Launched](#tab/mvvm/on-launched)
-
-Füge deiner Datei `App.xaml.cs` folgenden Inhalt hinzu, wenn nicht bereits enthalten:
+### [Mvvm](#tab/mvvm-on-launched)
 
 ```diff
 +    protected async override void OnLaunched(LaunchActivatedEventArgs args)
@@ -79,7 +87,7 @@ Füge deiner Datei `App.xaml.cs` folgenden Inhalt hinzu, wenn nicht bereits enth
     }
 ```
 
----
+***
 
 ## Nächste Schritte
 

docs/articles/en/Navigation/HowTo-UpgradeExistingApp-en.md

@@ -6,19 +6,22 @@ uid: DevTKSS.Uno.ExtensionsNavigation.UpgradeExistingApp.en
 
 If you already have an existing Uno application, you can of course add Extensions Navigation.
 
+## Adding UnoFeatures
+
 In the project file, recognizable by the `.csproj` extension, you need the following `UnoFeatures` elements in addition to the `Uno.Sdk`:
 
-# [Mvux](#tab/mvux)
+### [Mvux](#tab/mvux)
 
 ```xml
 <UnoFeatures>
     Hosting;
     Mvux;
     Navigation;
+    Toolkit;
 </UnoFeatures>
 ```
 
-# [Mvvm](#tab/mvvm)
+### [Mvvm](#tab/mvvm)
 
 ```xml
 <UnoFeatures>
@@ -29,10 +32,17 @@ In the project file, recognizable by the `.csproj` extension, you need the follo
 </UnoFeatures>
 ```
 
-# [On Launched](#tab/mvux/on-launched)
+***
+
+> [!TIP]
+> The `Toolkit` feature is only required to use navigation controls like `TabBar` or `DrawerControl`.
+
+## App.xaml.cs Configuration
 
 Add the following content to your `App.xaml.cs` file if not already included:
 
+### [Mvux](#tab/mvux-on-launched)
+
 ```diff
 +    protected async override void OnLaunched(LaunchActivatedEventArgs args)
 +    {
@@ -54,9 +64,7 @@ Add the following content to your `App.xaml.cs` file if not already included:
     }
 ```
 
-# [On Launched](#tab/mvvm/on-launched)
-
-Add the following content to your `App.xaml.cs` file if not already included:
+### [Mvvm](#tab/mvvm-on-launched)
 
 ```diff
 +    protected async override void OnLaunched(LaunchActivatedEventArgs args)
@@ -79,7 +87,7 @@ Add the following content to your `App.xaml.cs` file if not already included:
     }
 ```
 
----
+***
 
 ## Next Steps
 

docs/docfx.json

@@ -99,7 +99,7 @@
     },
     "output": "_site",
     "sitemap": {
-      "baseUrl": "https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/"
+      "baseUrl": "https://devtkss.github.io/DevTKSS.Uno.SampleApps"
     }
   }
 }