Merge pull request #15 from AvantiPoint/dev/ds/dialogs

Adding Dialog Demo
AvantiPoint · Apr 9, 2024 · 954755b · 954755b
2 parents b8dfe8a + fbfa019
commit 954755b
Show file tree

Hide file tree

Showing 22 changed files with 165 additions and 29 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -17,4 +17,33 @@ jobs:
     with:
       name: MauiMicroMvvm
       solution-path: build.slnf
-      install-workload: maui
+      install-workload: maui
+
+  validate:
+    needs: [build]
+    runs-on: macos-14
+    steps:
+      - name: Setup Xcode
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '15.2'
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - name: Download Artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: NuGet
+          path: Artifacts
+      - name: Install Templates
+        run: dotnet new install Artifacts/AvantiPoint.MauiMicroMvvm.Templates.*.nupkg
+      - name: Add Local Source
+        run: dotnet nuget add source ${{ github.workspace }}/Artifacts --name Artifacts
+      - name: Create Test Project
+        run: dotnet new maui-micro -o TestProject
+      - name: Workload Install
+        run: dotnet workload install maui
+        working-directory: TestProject
+      - name: Build Project
+        run: dotnet build
+        working-directory: TestProject
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+  "recommendations": [
+    "ms-dotnettools.dotnet-maui"
+  ]
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,14 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": ".NET MAUI",
+      "type": "maui",
+      "request": "launch",
+      "preLaunchTask": "maui: Build"
+    }
+  ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,6 @@
+{
+    "cSpell.words": [
+        "autowire",
+        "Mvvm"
+    ]
+}
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -14,6 +14,8 @@
     <RepositoryUrl>https://github.com/AvantiPoint/mauimicromvvm.git</RepositoryUrl>
     <PackageProjectUrl>https://github.com/AvantiPoint/mauimicromvvm</PackageProjectUrl>
     <NeutralLanguage>en</NeutralLanguage>
+    <Nullable>enable</Nullable>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -36,15 +38,4 @@
           PackagePath="" />
     <SourceRoot Include="$(MSBuildThisFileDirectory)" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,14 @@
+<Project>
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.3" Condition="$(IsPackable) == 'true'"/>
+    <PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" Condition="$(IsPackable) != 'true'"/>
+    <PackageVersion Include="ReactiveUI" Version="19.5.39" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageVersion Include="Refit" Version="7.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
+    <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+  </ItemGroup>
+</Project>
diff --git a/sample/MauiMicroSample/AppShell.xaml b/sample/MauiMicroSample/AppShell.xaml
@@ -16,6 +16,11 @@
     </Tab>
   </FlyoutItem>
 
+  <FlyoutItem Title="Dialog Demo"
+              Icon="dialog.png">
+    <Tab micro:MauiMicro.Route="DialogDemo" />
+  </FlyoutItem>
+
   <FlyoutItem Title="Message Demo"
               Icon="messages.png">
     <Tab micro:MauiMicro.Route="MessageDemoPage" />

diff --git a/sample/MauiMicroSample/MauiMicroSample.csproj b/sample/MauiMicroSample/MauiMicroSample.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>$(DotNetVersion)-android;$(DotNetVersion)-ios;$(DotNetVersion)-maccatalyst</TargetFrameworks>
@@ -16,7 +16,6 @@
 
     <!-- App Identifier -->
     <ApplicationId>com.avantipoint.mauimicro</ApplicationId>
-    <ApplicationIdGuid>CE320681-9974-4D30-B5AB-3FC8834733FD</ApplicationIdGuid>
 
     <!-- Versions -->
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
@@ -49,8 +48,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageReference Include="Refit" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Maui.Controls" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
+    <PackageReference Include="Refit" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sample/MauiMicroSample/MauiProgram.cs b/sample/MauiMicroSample/MauiProgram.cs
@@ -23,6 +23,7 @@ public static MauiApp CreateMauiApp()
             });
 
         builder.Services.MapView<MainPage, MainPageViewModel>()
+            .MapView<DialogDemo, DialogDemoViewModel>()
             .MapView<MessageDemoPage, MessageDemoPageViewModel>()
             .MapView<MessageDisplay, MessageDisplayViewModel>()
             .MapView<MauiInfluencersPage, MauiInfluencersViewModel>()

diff --git a/sample/MauiMicroSample/Pages/DialogDemo.xaml b/sample/MauiMicroSample/Pages/DialogDemo.xaml
@@ -0,0 +1,16 @@
+<?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"
+             x:Class="MauiMicroSample.Pages.DialogDemo"
+             xmlns:micro="http://schemas.mauimicromvvm.com/2022/dotnet/maui"
+             xmlns:vm="clr-namespace:MauiMicroSample.ViewModels"
+             micro:MauiMicro.Autowire="True"
+             x:DataType="vm:DialogDemoViewModel"
+             Title="Dialog Demo">
+  <VerticalStackLayout Spacing="5"
+                       Padding="10">
+    <Label Text="Dialog Demo" Style="{DynamicResource Title}" />
+    <Button Text="Display Alert" Command="{Binding ShowAlertCommand}" />
+    <Button Text="Display ActionSheet" Command="{Binding ShowActionSheetCommand}" />
+  </VerticalStackLayout>
+</ContentPage>
diff --git a/sample/MauiMicroSample/Pages/DialogDemo.xaml.cs b/sample/MauiMicroSample/Pages/DialogDemo.xaml.cs
@@ -0,0 +1,9 @@
+namespace MauiMicroSample.Pages;
+
+public partial class DialogDemo : ContentPage
+{
+	public DialogDemo()
+	{
+		InitializeComponent();
+	}
+}
diff --git a/sample/MauiMicroSample/Pages/MainPage.xaml.cs b/sample/MauiMicroSample/Pages/MainPage.xaml.cs
@@ -1,10 +1,9 @@
-namespace MauiMicroSample.Pages
+namespace MauiMicroSample.Pages;
+
+public partial class MainPage : ContentPage
 {
-    public partial class MainPage : ContentPage
+    public MainPage()
     {
-        public MainPage()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }
diff --git a/sample/MauiMicroSample/Resources/Images/dialog.svg b/sample/MauiMicroSample/Resources/Images/dialog.svg
diff --git a/sample/MauiMicroSample/ViewModels/DialogDemoViewModel.cs b/sample/MauiMicroSample/ViewModels/DialogDemoViewModel.cs
@@ -0,0 +1,23 @@
+using System.Windows.Input;
+using MauiMicroMvvm;
+
+namespace MauiMicroSample.ViewModels;
+
+public class DialogDemoViewModel : MauiMicroViewModel
+{
+    public DialogDemoViewModel(ViewModelContext context) 
+        : base(context)
+    {
+        ShowActionSheetCommand = new Command(async () => {
+            await context.PageDialogs.DisplayActionSheet("Sample Action Sheet", "Cancel", "Destroy", "Button 1", "Button 2");
+        });
+
+        ShowAlertCommand = new Command(async () => {
+            await context.PageDialogs.DisplayAlert("Sample Alert", "This is a sample alert", "Accept", "Cancel");
+        });
+    }
+
+    public ICommand ShowAlertCommand { get; }
+
+    public ICommand ShowActionSheetCommand { get; }
+}
diff --git a/src/MauiMicroMvvm.Rx/MauiMicroMvvm.Rx.csproj b/src/MauiMicroMvvm.Rx/MauiMicroMvvm.Rx.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>$(DotNetVersion)</TargetFramework>
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ReactiveUI" Version="19.5.39" />
+    <PackageReference Include="ReactiveUI" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.template.config/template.json b/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.template.config/template.json
@@ -30,7 +30,7 @@
       "datatype": "choice",
       "enableQuotelessLiterals": true,
       "replaces": "$dotnetversion$",
-      "defaultValue": "net7.0",
+      "defaultValue": "net8.0",
       "description": "Target Framework",
       "choices": [
         {

diff --git a/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.vscode/extensions.json b/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+  "recommendations": [
+    "ms-dotnettools.dotnet-maui"
+  ]
+}
diff --git a/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.vscode/launch.json b/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/.vscode/launch.json
@@ -0,0 +1,14 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": ".NET MAUI",
+      "type": "maui",
+      "request": "launch",
+      "preLaunchTask": "maui: Build"
+    }
+  ]
+}
diff --git a/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/MauiMicroApp.1.csproj b/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/MauiMicroApp.1.csproj
@@ -17,7 +17,6 @@
 
     <!-- App Identifier -->
     <ApplicationId>$ApplicationId$</ApplicationId>
-    <ApplicationIdGuid>683037c3-6415-40f7-a541-bdc57964b0d2</ApplicationIdGuid>
 
     <!-- Versions -->
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
@@ -52,6 +51,8 @@
     <!--#else -->
     <PackageReference Include="AvantiPoint.MauiMicroMvvm" Version="$MauiMicroVersion$" />
     <!--#endif -->
+    <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$MicrosoftLoggingVersion$" />
   </ItemGroup>
 

diff --git a/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/ViewModels/MainViewModel.cs b/src/MauiMicroMvvm.Templates/content/MauiMicroApp.1/ViewModels/MainViewModel.cs
@@ -41,5 +41,8 @@ private void OnClickCommand()
             Message = $"Pressed {_count} times!";
 
         _screenReader.Announce(Message);
+
+        if (_count > 3)
+            PageDialogs.DisplayAlert("Stop it!", "You're pressing too much!", "OK");
     }
 }
diff --git a/src/MauiMicroMvvm/MauiMicroMvvm.csproj b/src/MauiMicroMvvm/MauiMicroMvvm.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
+    <PackageReference Include="Microsoft.Maui.Controls" />
   </ItemGroup>
 
 </Project>
diff --git a/src/MauiMicroMvvm/Xaml/MauiMicro.cs b/src/MauiMicroMvvm/Xaml/MauiMicro.cs
@@ -46,10 +46,10 @@ private static void OnRouteChanged(BindableObject bindable, object oldValue, obj
             return;
 
         content.Route = route;
-        SetContentTempalte(content, route);
+        SetContentTemplate(content, route);
     }
 
-    private static void SetContentTempalte(ShellContent content, string route)
+    private static void SetContentTemplate(ShellContent content, string route)
     {
         content.ContentTemplate = new DataTemplate(() => CreateView(route));
     }