Skip to content

Commit 672b81c

Browse files
committed
chore: switch source and fix tab groups
1 parent cff0d89 commit 672b81c

File tree

5 files changed

+62
-79
lines changed

5 files changed

+62
-79
lines changed

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

Lines changed: 17 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,19 @@ on:
1717
workflow_dispatch:
1818

1919
permissions:
20-
contents: write
20+
contents: read
21+
pages: write
22+
id-token: write
2123

2224
concurrency:
2325
group: pages
24-
cancel-in-progress: true
26+
cancel-in-progress: false
2527

2628
jobs:
27-
build:
28-
name: Build DocFX site
29+
publish-docs:
30+
environment:
31+
name: github-pages
32+
url: ${{ steps.deployment.outputs.page_url }}
2933
runs-on: windows-latest
3034

3135
steps:
@@ -44,55 +48,18 @@ jobs:
4448
4549
- name: Install DocFX as .NET tool
4650
run: |
47-
dotnet tool install -g docfx --version 2.78.3
51+
dotnet tool update -g docfx
4852
docfx --version
4953
50-
- name: Build metadata
54+
- name: Build DocFX site
5155
working-directory: docs
52-
run: |
53-
docfx metadata docfx.json --logLevel Verbose
54-
55-
- name: Build site
56-
working-directory: docs
57-
run: |
58-
docfx build docfx.json --logLevel Verbose
56+
run: docfx docfx.json
5957

60-
- name: Prepare publish folder (gh-pages/docs)
61-
run: |
62-
New-Item -ItemType Directory -Force -Path public/docs | Out-Null
63-
Copy-Item -Path "docs/_site/*" -Destination "public/docs" -Recurse -Force
64-
if (Test-Path "docs/.nojekyll") { Copy-Item -Force "docs/.nojekyll" "public/docs/.nojekyll" }
65-
shell: pwsh
66-
67-
- name: Upload site artifact
68-
uses: actions/upload-artifact@v4
58+
- name: Upload artifact
59+
uses: actions/upload-pages-artifact@v3
6960
with:
70-
name: docfx-site
71-
path: public/docs
61+
path: 'docs/_site'
7262

73-
deploy:
74-
if: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request' }}
75-
name: Deploy to GitHub Pages (gh-pages/docs)
76-
needs: build
77-
runs-on: ubuntu-latest
78-
79-
steps:
80-
- name: Checkout
81-
uses: actions/checkout@v4
82-
with:
83-
fetch-depth: 0
84-
85-
- name: Download site artifact
86-
uses: actions/download-artifact@v4
87-
with:
88-
name: docfx-site
89-
path: public/docs
90-
91-
- name: Publish to gh-pages
92-
uses: peaceiris/actions-gh-pages@v4
93-
with:
94-
github_token: ${{ secrets.GITHUB_TOKEN }}
95-
publish_branch: gh-pages
96-
publish_dir: public
97-
keep_files: false
98-
force_orphan: true
63+
- name: Deploy to GitHub Pages
64+
id: deployment
65+
uses: actions/deploy-pages@v4

README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# DevTKSS Uno Samples
22

33
[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/DevTKSS/DevTKSS.Uno.SampleApps/blob/master/LICENSE.md)
4-
[![Documentation](https://img.shields.io/badge/docs-online-green.svg)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/)
4+
[![Documentation](https://img.shields.io/badge/docs-online-green.svg)](https://devtkss.github.io/DevTKSS.Uno.SampleApps/)
55
[![Uno.Sdk](https://img.shields.io/badge/Uno.Sdk-6.3.28+-purple.svg)](https://platform.uno/)
66

77
## Welcome to this Samples and Tutorials Library! ❤️
88

99
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**.
1010

11-
**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)
11+
**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)
1212

1313
---
1414

@@ -29,23 +29,23 @@ Before diving into the samples, make sure you have:
2929
- **Uno.Check** tool installed and verified (run `uno-check`)
3030

3131
> [!TIP]
32-
> 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).
32+
> For detailed setup instructions, see our [Development Environment Setup Guide](https://devtkss.github.io/DevTKSS.Uno.SampleApps/articles/en/HowTo-Setup-DevelopmentEnvironment-en.html).
3333
3434
---
3535

3636
## Sample Applications
3737

3838
### Mvux Gallery
3939

40-
![Mvux Gallery Showcase Thumbnail](./docs/articles/.attachments/DevTKSS%20Uno%20Mvux%20Samples%20Gallery%20App-Thumbnail.png)
40+
![Mvux Gallery Showcase Thumbnail](https://raw.githubusercontent.com/DevTKSS/DevTKSS.Uno.SampleApps/master/docs/articles/.attachments/DevTKSS%20Uno%20Mvux%20Samples%20Gallery%20App-Thumbnail.png)
4141

4242
**Want to see a quick showcase of what you can explore?**
4343

44-
![Mvux Gallery ShowCase](./docs/articles/.attachments/MvuxGallery-ShowCase.gif)
44+
![Mvux Gallery ShowCase](https://raw.githubusercontent.com/DevTKSS/DevTKSS.Uno.SampleApps/master/docs/articles/.attachments/MvuxGallery-ShowCase.gif)
4545

4646
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.
4747

48-
**[View Detailed Mvux Gallery Overview](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/articles/en/MvuxGallery-Overview-en.html)**
48+
**[View Detailed Mvux Gallery Overview](https://devtkss.github.io/DevTKSS.Uno.SampleApps/articles/en/MvuxGallery-Overview-en.html)**
4949

5050
#### Featured Controls
5151

@@ -59,8 +59,8 @@ The [Mvux Gallery](https://github.com/DevTKSS/DevTKSS.Uno.SampleApps/tree/master
5959

6060
- **[MVUX](https://platform.uno/docs/articles/external/uno.extensions/doc/Learn/Mvux/Overview.html)** - Model-View-Update-eXtended pattern
6161
- **Navigation**
62-
- [Navigation via XAML](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/articles/en/Navigation/HowTo-Defining-UI-NavigationView-en.html)
63-
- [React to Route Changes with IRouteNotifier](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/articles/en/Navigation/HowTo-ChangeRoutes-en.html)
62+
- [Navigation via XAML](https://devtkss.github.io/DevTKSS.Uno.SampleApps/articles/en/Navigation/HowTo-Defining-UI-NavigationView-en.html)
63+
- [React to Route Changes with IRouteNotifier](https://devtkss.github.io/DevTKSS.Uno.SampleApps/articles/en/Navigation/HowTo-ChangeRoutes-en.html)
6464
- **Hosting** - App Host Builder pattern
6565
- **Dependency Injection** - Constructor injection
6666
- **Serialization** - JSON data handling
@@ -77,7 +77,7 @@ The [Mvux Gallery](https://github.com/DevTKSS/DevTKSS.Uno.SampleApps/tree/master
7777

7878
### Xaml Navigation App
7979

80-
![Image of final Xaml Navigation App](https://github.com/DevTKSS/DevTKSS.Uno.SampleApps/blob/master/doc/articles/.attachments/DevTKSS.Uno.XamlNavigationApp.png)
80+
![Image of final Xaml Navigation App](https://raw.githubusercontent.com/DevTKSS/DevTKSS.Uno.SampleApps/master/docs/articles/.attachments/DevTKSS.Uno.XamlNavigationApp.png)
8181

8282
A complete tutorial application demonstrating navigation patterns with MVUX and XAML.
8383

@@ -89,7 +89,7 @@ A complete tutorial application demonstrating navigation patterns with MVUX and
8989

9090
**Available Resources:**
9191

92-
- **[Tutorial Documentation](https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/articles/en/Navigation/Extensions-Navigation-en.html)** - Step-by-step guide (🇩🇪 German | 🇬🇧 English)
92+
- **[Tutorial Documentation](https://devtkss.github.io/DevTKSS.Uno.SampleApps/articles/en/Navigation/Extensions-Navigation-en.html)** - Step-by-step guide (🇩🇪 German | 🇬🇧 English)
9393
- **[Video Tutorial Series](https://youtube.com/playlist?list=PLEL6kb4Bivm_g81iKBl-f0eYPNr5h2dFX)** - Complete walkthrough (🇩🇪 German with English subtitles)
9494
- **[Source Code](https://github.com/DevTKSS/DevTKSS.Uno.SampleApps/tree/master/src/DevTKSS.Uno.XamlNavigationApp-1/)** - Browse the implementation
9595

@@ -101,10 +101,10 @@ You can access all tutorials and guides in both English and German. Use the tabl
101101

102102
| Section | English | German |
103103
|--------------------------|------------------------------------------------------------------------|-------------------------------------------------------------------------|
104-
| 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) |
105-
| 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) |
106-
| 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) |
107-
| 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) |
104+
| 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) |
105+
| 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) |
106+
| 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) |
107+
| 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) |
108108

109109
Most content is available in both German (original) and English (translated).
110110

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

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,22 @@ uid: DevTKSS.Uno.ExtensionsNavigation.UpgradeExistingApp.de
66

77
Solltest du schon eine existierende Uno Anwendung haben, kannst du die Extensions Navigation natürlich hinzufügen.
88

9+
## Hinzufügen der UnoFeatures
10+
911
In der Projektdatei, zu erkennen an der Endung `.csproj`, brauchst du dafür neben dem `Uno.Sdk` folgende `UnoFeatures` Elemente:
1012

11-
# [Mvux](#tab/mvux)
13+
### [Mvux](#tab/mvux)
1214

1315
```xml
1416
<UnoFeatures>
1517
Hosting;
1618
Mvux;
1719
Navigation;
20+
Toolkit;
1821
</UnoFeatures>
1922
```
2023

21-
# [Mvvm](#tab/mvvm)
24+
### [Mvvm](#tab/mvvm)
2225

2326
```xml
2427
<UnoFeatures>
@@ -29,10 +32,17 @@ In der Projektdatei, zu erkennen an der Endung `.csproj`, brauchst du dafür neb
2932
</UnoFeatures>
3033
```
3134

32-
# [On Launched](#tab/mvux/on-launched)
35+
***
36+
37+
> [!TIP]
38+
> Das `Toolkit` Feature wird nur benötigt, wenn Navigations-Steuerelemente wie `TabBar` oder `DrawerControl` verwendet werden sollen.
39+
40+
## App.xaml.cs Konfiguration
3341

3442
Füge deiner Datei `App.xaml.cs` folgenden Inhalt hinzu, wenn nicht bereits enthalten:
3543

44+
### [Mvux](#tab/mvux-on-launched)
45+
3646
```diff
3747
+ protected async override void OnLaunched(LaunchActivatedEventArgs args)
3848
+ {
@@ -54,9 +64,7 @@ Füge deiner Datei `App.xaml.cs` folgenden Inhalt hinzu, wenn nicht bereits enth
5464
}
5565
```
5666

57-
# [On Launched](#tab/mvvm/on-launched)
58-
59-
Füge deiner Datei `App.xaml.cs` folgenden Inhalt hinzu, wenn nicht bereits enthalten:
67+
### [Mvvm](#tab/mvvm-on-launched)
6068

6169
```diff
6270
+ 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
7987
}
8088
```
8189

82-
---
90+
***
8391

8492
## Nächste Schritte
8593

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

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,22 @@ uid: DevTKSS.Uno.ExtensionsNavigation.UpgradeExistingApp.en
66

77
If you already have an existing Uno application, you can of course add Extensions Navigation.
88

9+
## Adding UnoFeatures
10+
911
In the project file, recognizable by the `.csproj` extension, you need the following `UnoFeatures` elements in addition to the `Uno.Sdk`:
1012

11-
# [Mvux](#tab/mvux)
13+
### [Mvux](#tab/mvux)
1214

1315
```xml
1416
<UnoFeatures>
1517
Hosting;
1618
Mvux;
1719
Navigation;
20+
Toolkit;
1821
</UnoFeatures>
1922
```
2023

21-
# [Mvvm](#tab/mvvm)
24+
### [Mvvm](#tab/mvvm)
2225

2326
```xml
2427
<UnoFeatures>
@@ -29,10 +32,17 @@ In the project file, recognizable by the `.csproj` extension, you need the follo
2932
</UnoFeatures>
3033
```
3134

32-
# [On Launched](#tab/mvux/on-launched)
35+
***
36+
37+
> [!TIP]
38+
> The `Toolkit` feature is only required to use navigation controls like `TabBar` or `DrawerControl`.
39+
40+
## App.xaml.cs Configuration
3341

3442
Add the following content to your `App.xaml.cs` file if not already included:
3543

44+
### [Mvux](#tab/mvux-on-launched)
45+
3646
```diff
3747
+ protected async override void OnLaunched(LaunchActivatedEventArgs args)
3848
+ {
@@ -54,9 +64,7 @@ Add the following content to your `App.xaml.cs` file if not already included:
5464
}
5565
```
5666

57-
# [On Launched](#tab/mvvm/on-launched)
58-
59-
Add the following content to your `App.xaml.cs` file if not already included:
67+
### [Mvvm](#tab/mvvm-on-launched)
6068

6169
```diff
6270
+ 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:
7987
}
8088
```
8189

82-
---
90+
***
8391

8492
## Next Steps
8593

docs/docfx.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
},
100100
"output": "_site",
101101
"sitemap": {
102-
"baseUrl": "https://devtkss.github.io/DevTKSS.Uno.SampleApps/docs/"
102+
"baseUrl": "https://devtkss.github.io/DevTKSS.Uno.SampleApps"
103103
}
104104
}
105105
}

0 commit comments

Comments
 (0)