Dev

.github/workflows/build.yml

@@ -9,44 +9,36 @@ on:
         default: 'warning'
 
   push:
-    branches: [ master, dev, preview ]
+    branches:
+    - master
+    - dev
+    - preview
+    - v*
     paths:
     - "src/**"
     - ".github/workflows/**"
 
-env:
-  ShinyVersion: 2.0.0
-  DotNetVersion: 6.0.100
-
 jobs:
   build:
 
     runs-on: windows-latest
 
     steps:
-    - name: Add msbuild to PATH
-      uses: microsoft/[email protected]
-
-    - uses: actions/checkout@v2
-
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+    - name: Checkout
+      uses: actions/checkout@v2
       with:
-        dotnet-version: ${{ env.DotNetVersion }}
+          fetch-depth: 0
 
-    - name: Generate Build Number
-      id: buildnumber
-      uses: einaregilsson/build-number@v3
+    - name: Setup .NET 8.0
+      uses: actions/setup-dotnet@v3
       with:
-        token: ${{secrets.github_token}}
+        dotnet-version: 8.0.x
 
-    - name: Build Preview
-      if: ${{ github.ref == 'refs/heads/preview' }}
-      run: msbuild Build.slnf /restore -m -property:Configuration=Release -property:ShinyVersion=${{env.ShinyVersion}}.${{steps.buildnumber.outputs.build_number}}-preview
+    - name: Add .NET Workloads
+      run: dotnet workload install maui
 
-    - name: Build Release
-      if: ${{ github.ref != 'refs/heads/preview' }}
-      run: msbuild Build.slnf /restore -m -property:Configuration=Release -property:ShinyVersion=${{env.ShinyVersion}}.${{steps.buildnumber.outputs.build_number}}
+    - name: Build
+      run: dotnet build Build.slnf /restore -m -property:Configuration=Release -property:PublicRelease=true
 
     - name: Post NuGet Artifacts
       uses: actions/upload-artifact@v2
@@ -55,5 +47,5 @@ jobs:
         path: '**/*.nupkg'
 
     - name: Publish NuGets
-      if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/preview' }}
+      if: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/v') }}
       run: dotnet nuget push **\*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGETAPIKEY }} --skip-duplicate

Build.slnf

@@ -2,8 +2,6 @@
   "solution": {
     "path": "Shiny.Framework.sln",
     "projects": [
-      "src\\Shiny.Extensions.Dialogs.XfMaterial\\Shiny.Extensions.Dialogs.XfMaterial.csproj",
-      "src\\Shiny.Extensions.Dialogs\\Shiny.Extensions.Dialogs.csproj",
       "src\\Shiny.Framework\\Shiny.Framework.csproj"
     ]
   }

Sample/App.xaml

@@ -0,0 +1,15 @@
+<?xml version = "1.0" encoding = "UTF-8" ?>
+<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:Sample"
+             x:Class="Sample.App">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Resources/Styles/Colors.xaml" />
+                <ResourceDictionary Source="Resources/Styles/Styles.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
+

Sample/App.xaml.cs

@@ -0,0 +1,10 @@
+namespace Sample;
+
+public partial class App : Application
+{
+	public App()
+	{
+		this.InitializeComponent();
+	}
+}
+

Sample/DialogsPage.xaml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:sample="clr-namespace:Sample"
+             x:DataType="sample:DialogsViewModel"
+             x:Class="Sample.DialogsPage"
+             Title="Dialogs">
+
+    <VerticalStackLayout>
+        <Frame BorderColor="Black"
+               BackgroundColor="LemonChiffon"
+               CornerRadius="0"
+               Padding="10">
+            <Label Text="{Binding Message}"
+                   TextColor="Black"
+                   VerticalOptions="FillAndExpand"
+                   VerticalTextAlignment="Center"
+                   HorizontalOptions="Center"
+                   HorizontalTextAlignment="Center" />
+        </Frame>
+
+        <Button Text="Snackbar"
+                Command="{Binding Snackbar}" />
+
+    </VerticalStackLayout>
+</ContentPage>

Sample/DialogsPage.xaml.cs

@@ -0,0 +1,9 @@
+namespace Sample;
+
+public partial class DialogsPage : ContentPage
+{
+	public DialogsPage()
+	{
+		this.InitializeComponent();
+	}
+}

Sample/DialogsViewModel.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Windows.Input;
+using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
+using Shiny;
+
+namespace Sample;
+
+
+public class DialogsViewModel : ViewModel
+{
+    public DialogsViewModel(BaseServices services) : base(services)
+    {
+        this.Snackbar = ReactiveCommand.CreateFromTask(async () =>
+        {
+            this.Message = "Testing Snackbar";
+            var clicked = await this.Dialogs.Snackbar("This is a snackbar", 5000, "OK");
+            this.Message = clicked ? "The snackbar was tapped" : "The snackbar was not touched";
+        });
+
+        //this.Dialogs.ActionSheet
+    }
+
+
+    public ICommand Snackbar { get; }
+    [Reactive] public string Message { get; private set; }
+}

Sample/GlobalUsings.cs

@@ -0,0 +1 @@
+global using Shiny;

Sample/MainPage.xaml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:sample="clr-namespace:Sample"
+             x:DataType="sample:MainViewModel"
+             x:Class="Sample.MainPage"
+             Title="Shiny Framework">
+
+    <VerticalStackLayout>
+        <Button Text="Test Global Command Exception Handler"
+                Command="{Binding TestGEH}" />
+
+        <Button Text="Validation Sample"
+                Command="{Binding NavToValidate}" />
+
+        <Button Text="Dialog Samples"
+                Command="{Binding NavToDialogs}" />
+
+        <Label Text="{Binding [LocalizeKey]}" />
+    </VerticalStackLayout>
+</ContentPage>
+

Sample/MainPage.xaml.cs

@@ -0,0 +1,11 @@
+namespace Sample;
+
+public partial class MainPage : ContentPage
+{
+	public MainPage()
+	{
+		this.InitializeComponent();
+	}
+}
+
+

Sample/MainViewModel.cs

@@ -0,0 +1,32 @@
+using System.Windows.Input;
+using ReactiveUI;
+
+namespace Sample;
+
+
+public class MainViewModel : ViewModel
+{
+    //public const string LocalizeKey = nameof(LocalizeKey);
+
+
+    public MainViewModel(BaseServices services) : base(services)
+    {
+        // TODO: test localization
+        this.TestGEH = ReactiveCommand.Create(
+            () =>
+            {
+                throw new ArgumentException("This shouldn't crash your app.  You should be seeing this message in a dialog");
+            }
+            //this.WhenValid() // this is a hack to ensure prism & shiny are playing nice together
+        );
+
+        this.NavToValidate = this.Navigation.Command("ValidationPage");
+        this.NavToDialogs = this.Navigation.Command("DialogsPage");
+    }
+
+
+    public ICommand TestGEH { get; }
+    public ICommand NavToValidate { get; }
+    public ICommand NavToDialogs { get; }
+}
+

Sample/MainViewModel.resx

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>2.0</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<data name="LocalizeKey" xml:space="preserve">
+		<value>This is test localization</value>
+	</data>
+</root>
+

Sample/MauiProgram.cs

@@ -0,0 +1,50 @@
+using Prism.Container.DryIoc;
+using Shiny;
+using Prism.Navigation;
+
+namespace Sample;
+
+
+public static class MauiProgram
+{
+	public static MauiApp CreateMauiApp()
+	{
+		try
+		{
+			var builder = MauiApp
+				.CreateBuilder()
+				.UseMauiApp<App>()
+				.UseShinyFramework(
+					new DryIocContainerExtension(),
+					prism => prism.CreateWindow(
+						"NavigationPage/MainPage",
+						ex =>
+						{
+							Console.WriteLine(ex);
+						}
+					),
+                    new(ErrorAlertType.FullError)
+                )
+				.ConfigureFonts(fonts =>
+				{
+					fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
+					fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
+				});
+
+			builder.Services.AddLocalization();
+			builder.Services.AddDataAnnotationValidation();
+
+			builder.Services.RegisterForNavigation<MainPage, MainViewModel>();
+			builder.Services.RegisterForNavigation<DialogsPage, DialogsViewModel>();
+			builder.Services.RegisterForNavigation<ValidationPage, ValidationViewModel>();
+
+			return builder.Build();
+		}
+		catch (Exception ex)
+		{
+			Console.WriteLine(ex);
+			throw;
+		}
+	}
+}
+

Sample/Platforms/Android/AndroidManifest.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="android.permission.INTERNET" />
+</manifest>

Sample/Platforms/Android/MainActivity.cs

@@ -0,0 +1,11 @@
+using Android.App;
+using Android.Content.PM;
+using Android.OS;
+
+namespace Sample;
+
+[Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
+public class MainActivity : MauiAppCompatActivity
+{
+}
+

Sample/Platforms/Android/MainApplication.cs

@@ -0,0 +1,16 @@
+using Android.App;
+using Android.Runtime;
+
+namespace Sample;
+
+[Application]
+public class MainApplication : MauiApplication
+{
+	public MainApplication(IntPtr handle, JniHandleOwnership ownership)
+		: base(handle, ownership)
+	{
+	}
+
+	protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+}
+

Sample/Platforms/Android/Resources/values/colors.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#512BD4</color>
+    <color name="colorPrimaryDark">#2B0B98</color>
+    <color name="colorAccent">#2B0B98</color>
+</resources>
+

Sample/Platforms/MacCatalyst/AppDelegate.cs

@@ -0,0 +1,10 @@
+using Foundation;
+
+namespace Sample;
+
+[Register("AppDelegate")]
+public class AppDelegate : MauiUIApplicationDelegate
+{
+	protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+}
+