Fix minor controls

Author: pomianowski

.github/workflows/CI.yml

@@ -44,21 +44,35 @@ jobs:
       - name: Build
         run: msbuild MaterialWPF.sln -p:Configuration=Release -m
 
-      - name: Publish net50 windows
+      - name: Publish net60
         uses: actions/upload-artifact@v2
         id: publish_net5
         with:
-          name: MaterialWPF-NET5-Windows10
+          name: materialwpf_net6
           path: |
-            MaterialWPF/bin/Release/net5.0-windows10.0.17763.0
+            MaterialWPF/bin/Release/net6.0-windows
 
       - name: Publish net50
         uses: actions/upload-artifact@v2
         with:
-          name: MaterialWPF-NET5
+          name: materialwpf_net5
           path: |
             MaterialWPF/bin/Release/net5.0-windows
 
+      - name: Publish net48
+        uses: actions/upload-artifact@v2
+        with:
+          name: materialwpf_net48
+          path: |
+            MaterialWPF/bin/Release/net48
+
+      - name: Publish netcore3
+        uses: actions/upload-artifact@v2
+        with:
+          name: materialwpf_netcore3
+          path: |
+            MaterialWPF/bin/Release/netcoreapp3.1
+
       - name: Publish nupkg
         uses: actions/upload-artifact@v2
         with:

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>1.0.5</Version>
+    <Version>1.0.6</Version>
     <Copyright>MaterialWPF</Copyright>
   </PropertyGroup>
 </Project>

MaterialWPF.Demo/MainWindow.xaml.cs

@@ -1,6 +1,6 @@
-using System.Collections.ObjectModel;
+using MaterialWPF.UI;
+using System.Collections.ObjectModel;
 using System.Windows;
-using MaterialWPF.UI;
 
 namespace MaterialWPF.Demo
 {
@@ -19,10 +19,12 @@ public MainWindow()
             {
                 new NavItem { Icon = MaterialIcon.GridView, Name = "Dashboard", Tag = "dashboard", Type = typeof(Pages.Dashboard)},
                 new NavItem { Icon = MaterialIcon.AdjustHologram, Name = "Controls", Tag = "controls", Type = typeof(Pages.Controls)},
-                new NavItem { Icon = MaterialIcon.Input, Name = "Fields", Tag = "fields", Type = typeof(Pages.Fields)},
+                new NavItem { Icon = MaterialIcon.Input, Name = "Forms", Tag = "fields", Type = typeof(Pages.Fields)},
                 new NavItem { Icon = MaterialIcon.Color, Name = "Colors", Tag = "colors", Type = typeof(Pages.Colors)},
                 new NavItem { Icon = MaterialIcon.Calories, Name = "Icons", Tag = "icons", Type = typeof(Pages.Icons)},
+#if DEBUG
                 new NavItem { Icon = MaterialIcon.AlignLeft, Name = "Tree List", Tag = "treelist", Type = typeof(Pages.TreeList)}
+#endif
             };
 
             rootNavigation.Footer = new ObservableCollection<NavItem>
@@ -46,7 +48,10 @@ public void OnSettingsNavigate()
 
         private async void Splash()
         {
-            mainSplash.Version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+            System.Version? version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+            if (version != null)
+                mainSplash.Version = version.ToString();
+
             mainSplash.Logo = new System.Windows.Media.Imaging.BitmapImage(new System.Uri("pack://application:,,,/Assets/banner-dark.png"));
             mainSplash.SubTitle = "Loading a fantastic demo app...";
 
@@ -69,7 +74,7 @@ private void ToggleTheme(object sender, RoutedEventArgs e)
             if (rootNavigation.PageNow == "dashboard")
                 (rootNavigation.Items[0].Instance as Pages.Dashboard).ToggleTheme(isChecked);
 
-            if(!isChecked)
+            if (!isChecked)
                 MaterialWPF.Theme.Switch(MaterialWPF.MaterialTheme.Light);
             else
                 MaterialWPF.Theme.Switch(MaterialWPF.MaterialTheme.Dark);

MaterialWPF.Demo/Pages/Dashboard.xaml

@@ -67,9 +67,9 @@
             Margin="4,0,0,0">
             <TextBlock Text="GitHub Page" />
             <materialwpf:Hyperlink
-                Content="https://github.com/rapiddev/MaterialWPF"
+                Content="https://github.com/lepoco/MaterialWPF"
                 FontSize="10"
-                NavigateUri="https://github.com/rapiddev/MaterialWPF" />
+                NavigateUri="https://github.com/lepoco/MaterialWPF" />
 
             <TextBlock Margin="0,4,0,0" Text="Nuget Page" />
 

MaterialWPF.Demo/Pages/Settings.xaml

@@ -12,6 +12,6 @@
     mc:Ignorable="d">
 
     <Grid Margin="20">
-        <TextBlock Text="To be implemented..." />
+        <TextBlock Text="Just a navigation element at the bottom." />
     </Grid>
 </Page>

MaterialWPF/UI/Toast.cs

@@ -91,10 +91,10 @@ private void BuildToastTemplate()
 
             //Template start
             this._xmlTemplate += "<binding template=\"ToastText02\">"; //ToastGeneric works only with packaged project
-            
+
             if (!string.IsNullOrEmpty(this._header))
                 this._xmlTemplate += "<text id =\"1\">" + this._header + "</text>";
-            if(!string.IsNullOrEmpty(this._message))
+            if (!string.IsNullOrEmpty(this._message))
                 this._xmlTemplate += "<text id=\"2\">" + this._message + "</text>";
             if (!string.IsNullOrEmpty(this._footer))
                 this._xmlTemplate += "<text placement=\"attribution\">" + this._footer + "</text>";