Merge pull request #118 from Clancey/dev

Update Master

Comet.nuspec

@@ -23,6 +23,7 @@
       </group>
       <group targetFramework="monoandroid81" >
         <dependency id="Xamarin.FFImageLoading" version="2.4.11.982"/>
+        <dependency id="Xamarin.Essentials" version="1.3.0"/>
       </group>
       <group targetFramework="Xamarin.Mac20" >
         <dependency id="Xamarin.FFImageLoading" version="2.4.11.982"/>

build/build-dev.yml

@@ -1,40 +1,40 @@
 stages:
 - stage: BuildSource
   jobs:
-  # - job: BuildCometBlazor
-  #   displayName: Build Comet Blazor
-  #   pool:
-  #     vmImage: 'ubuntu-latest'
-  #   steps:
-  #     - task: UseDotNet@2
-  #       displayName: 'Use .NET Core sdk'
-  #       inputs:
-  #         packageType: sdk
-  #         version: 3.0.100-preview7-012821
-  #         includePreviewVersions: true
-  #         installationPath: $(Agent.ToolsDirectory)/dotnet
-  #     - task: DotNetCoreCLI@2
-  #       displayName: 'Build Blazor'
-  #       inputs:
-  #         command: 'build'
-  #         projects: 'Comet.Blazor.sln'
-  #         arguments: '-c $(BuildConfiguration)'
-  #     - task: DotNetCoreCLI@2
-  #       displayName: 'Test Blazor'
-  #       inputs:
-  #         command: 'test'
-  #         projects: 'Comet.Blazor.sln'
-  #         arguments: '-c $(BuildConfiguration)'
-  #     - task: DotNetCoreCLI@2
-  #       displayName: 'Pack Blazor'
-  #       inputs:
-  #         command: 'pack'
-  #         packagesToPack: 'src/Comet.Blazor/Comet.Blazor.csproj'
-  #         arguments: '-c $(BuildConfiguration)'
-  #     - task: PublishBuildArtifacts@1
-  #       inputs:
-  #         pathtoPublish: '$(Build.ArtifactStagingDirectory)'
-  #         artifactName: drop
+  - job: BuildCometBlazor
+    displayName: Build Comet Blazor
+    pool:
+      vmImage: 'ubuntu-latest'
+    steps:
+      - task: UseDotNet@2
+        displayName: 'Use .NET Core sdk'
+        inputs:
+          packageType: sdk
+          version: 3.0.100-preview8-013656
+          includePreviewVersions: true
+          installationPath: $(Agent.ToolsDirectory)/dotnet
+      - task: DotNetCoreCLI@2
+        displayName: 'Build Blazor'
+        inputs:
+          command: 'build'
+          projects: 'Comet.Blazor.sln'
+          arguments: '-c $(BuildConfiguration)'
+      - task: DotNetCoreCLI@2
+        displayName: 'Test Blazor'
+        inputs:
+          command: 'test'
+          projects: 'Comet.Blazor.sln'
+          arguments: '-c $(BuildConfiguration)'
+      - task: DotNetCoreCLI@2
+        displayName: 'Pack Blazor'
+        inputs:
+          command: 'pack'
+          packagesToPack: 'src/Comet.Blazor/Comet.Blazor.csproj'
+          arguments: '-c $(BuildConfiguration)'
+      - task: PublishBuildArtifacts@1
+        inputs:
+          pathtoPublish: '$(Build.ArtifactStagingDirectory)'
+          artifactName: drop
 
   - job: BuildCometMac
     displayName: Build Comet Mac

build/build-master.yml

@@ -10,7 +10,7 @@ stages:
         displayName: 'Use .NET Core sdk'
         inputs:
           packageType: sdk
-          version: 3.0.100-preview7-012821
+          version: 3.0.100-preview8-013656
           includePreviewVersions: true
           installationPath: $(Agent.ToolsDirectory)/dotnet
       - task: DotNetCoreCLI@2

build/package-github.yml

@@ -130,18 +130,34 @@ stages:
         SourceFolder: '$(Build.SourcesDirectory)'
         Contents: '**\*.nupkg'
         TargetFolder: '$(Build.ArtifactStagingDirectory)'
+
+    - script: echo Publish Nuget Github the code!
+
+    - task: Bash@3
+      inputs:
+        targetType: 'inline'
+        script: |
+          # Write your commands here
+          
+          nuget source Add -Name "GHNuget" \
+               -Source "https://nuget.pkg.github.com/Clancey/index.json" \
+               -UserName Clancey -Password $(gp)
+          
+          nuget push $(Build.ArtifactStagingDirectory)/**/*.nupkg -Source "GHNuget"
 
     - task: PublishBuildArtifacts@1
       inputs:
         PathtoPublish: '$(Build.ArtifactStagingDirectory)'
         ArtifactName: 'drop_nuget_alpha'
         publishLocation: 'Container'
-
-    - script: echo Publish Nuget Github the code!
 
-    - task: NuGetCommand@2
-      inputs:
-        command: 'push'
-        packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg'
-        nuGetFeedType: 'external'
-        publishFeedCredentials: 'ClanceyGitHubPackages'
+
+
+    # - task: NuGetCommand@2
+    #   inputs:
+    #     command: 'push'
+    #     packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg'
+    #     nuGetFeedType: 'external'
+    #     publishFeedCredentials: 'ClanceyGitHubPackages'
+
+

sample/.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": "Launch",
+            "type": "comet",
+            "request": "launch",
+            "preLaunchTask": "build"
+        }
+    ]
+}

sample/.vscode/tasks.json

@@ -0,0 +1,15 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558 
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "type": "comet",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        }
+    ]
+}

sample/Comet.Android.Sample/Comet.Android.Sample.csproj

@@ -106,7 +106,7 @@
     <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.1" />
     <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.1" />
     <PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.1" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.2.0" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.3.0" />
     <PackageReference Include="Xamarin.FFImageLoading">
       <Version>2.4.11.982</Version>
     </PackageReference>

sample/Comet.Blazor.Sample/Pages/_Host.cshtml

@@ -24,7 +24,7 @@
 <body>
     <app>@(await Html.RenderComponentAsync<App>())</app>
 
-    <script src="_Comet/Comet.js"></script>
+    <script src="_comet/comet.js"></script>
     <script src="_framework/blazor.server.js"></script>
 </body>
 </html>

sample/Comet.Blazor.Sample/_Imports.razor

@@ -1,6 +1,5 @@
 @using System.Net.Http
 @using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Layouts
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.JSInterop
 @using Comet.Blazor.Sample

sample/Comet.iOS.Sample/AppDelegate.cs

@@ -16,16 +16,16 @@ public class AppDelegate : UIApplicationDelegate {
 			get;
 			set;
 		}
-		public override void FinishedLaunching (UIApplication application)
+
+        UIWindow window;
+
+        public override void FinishedLaunching (UIApplication application)
 		{
 			base.FinishedLaunching (application);
 		}
-		UIWindow window;
+
 		public override bool FinishedLaunching (UIApplication application, NSDictionary launchOptions)
 		{
-            // Override point for customization after application launch.
-            // If not required for your application you can safely delete this method
-
 #if DEBUG
             Comet.Reload.Init();
 #endif

sample/Comet.iOS.Sample/Comet.iOS.Sample.csproj

@@ -80,7 +80,7 @@
     <PackageReference Include="SkiaSharp.Views">
       <Version>1.68.0</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Essentials" Version="1.2.0" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.3.0" />
     <PackageReference Include="Xamarin.FFImageLoading">
       <Version>2.4.11.982</Version>
     </PackageReference>

src/Comet.Android/Comet.Android.csproj

@@ -108,7 +108,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Essentials" Version="1.2.0" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.3.0" />
     <PackageReference Include="Xamarin.FFImageLoading" Version="2.4.11.982" />
     <PackageReference Include="Xamarin.Android.Support.v7.AppCompat">
       <Version>28.0.0.1</Version>

src/Comet.Android/Handlers/ViewHandler.cs

@@ -45,10 +45,10 @@ public static void MapClipShapeProperty(IViewHandler handler, View virtualView)
         public static void AddGestures(AndroidViewHandler handler, View view)
         {
             var gestures = view.Gestures;
-            if (!gestures.Any())
+            if (!(gestures?.Any() ?? false))
                 return;
             var listner = handler.GetGestureListener();
-            foreach (var gesture in view.Gestures)
+            foreach (var gesture in gestures)
                 listner.AddGesture(gesture);
         }
 
@@ -62,10 +62,10 @@ public static void AddGesture(AndroidViewHandler handler, Gesture gesture)
         public static void RemoveGestures(AndroidViewHandler handler, View view)
         {
             var gestures = view.Gestures;
-            if (!gestures.Any())
+            if (!(gestures?.Any() ?? false))
                 return;
             var listner = handler.GetGestureListener();
-            foreach (var gesture in view.Gestures)
+            foreach (var gesture in gestures)
                 listner.RemoveGesture(gesture);
             listner.Dispose();
 

src/Comet.Blazor/CanvasWriter.cs

@@ -12,8 +12,8 @@ public CanvasWriter(IJSRuntime jsRuntime)
             _jsRuntime = jsRuntime;
         }
 
-        public Task<SizeF> GetSizeAsync(object canvas) => _jsRuntime.InvokeAsync<SizeF>("Comet.canvas.getSize", new[] { canvas });
+        public Task<SizeF> GetSizeAsync(object canvas) => _jsRuntime.InvokeAsync<SizeF>("comet.canvas.getSize", new[] { canvas });
 
-        public Task DrawImageAsync(object canvas, byte[] bytes) => _jsRuntime.InvokeAsync<object>("Comet.canvas.drawImage", new[] { canvas, bytes });
+        public Task DrawImageAsync(object canvas, byte[] bytes) => _jsRuntime.InvokeAsync<object>("comet.canvas.drawImage", new[] { canvas, bytes });
     }
 }

src/Comet.Blazor/Comet.Blazor.csproj

@@ -9,12 +9,11 @@
 
   <ItemGroup>
     <None Remove="Comet.js" />
+    <None Remove="Scripts\comet.js" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Scripts\Comet.js">
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </EmbeddedResource>
+    <EmbeddedResource Include="Scripts\comet.js" />
   </ItemGroup>
 
   <ItemGroup>

src/Comet.Blazor/CometExtensions.cs

@@ -16,11 +16,11 @@ public static void UseComet(this IApplicationBuilder app)
             UI.Init();
 
             app.UseImages();
-            app.Map("/_Comet/Comet.js", app2 =>
+            app.Map("/_comet/comet.js", app2 =>
             {
                 app2.Run(async ctx =>
                 {
-                    using (var stream = typeof(CometExtensions).Assembly.GetManifestResourceStream(typeof(CometExtensions), "Scripts.Comet.js"))
+                    using (var stream = typeof(CometExtensions).Assembly.GetManifestResourceStream(typeof(CometExtensions), "Scripts.comet.js"))
                     {
                         ctx.Response.StatusCode = 200;
                         ctx.Response.ContentType = "application/javascript";

src/Comet.Blazor/CometPage.razor

@@ -1,6 +1,6 @@
 @using Comet.Blazor.Components
 
-<div class="Comet-page" @onmousedown="@OnMouseDown">
+<div class="comet-page" @onmousedown="@OnMouseDown">
     <nav aria-label="breadcrumb">
         <ol class="breadcrumb">
             @foreach (var view in _navigationStack.Reverse())

src/Comet.Blazor/Components/BButton.razor

@@ -1,6 +1,6 @@
 @inherits CometComponentBase
 
-<span class="Comet-button">
+<span class="comet-button">
     <button class="btn btn-primary" @onclick="@OnClick">@Text</button>
 </span>
 

src/Comet.Blazor/Components/BContainerView.razor

@@ -1,6 +1,6 @@
 @inherits CometComponentBase
 
-<div class="container-fluid Comet-containerview">
+<div class="container-fluid comet-containerview">
     @foreach (var view in Views)
     {
         <BView @key="@view" View="@view" />

src/Comet.Blazor/Components/BImage.razor

@@ -1,6 +1,6 @@
 @inherits CometComponentBase
 
-<span class="Comet-img">
+<span class="comet-img">
     <img src="@Url" />
 </span>
 

src/Comet.Blazor/Components/BListView.razor

@@ -1,6 +1,6 @@
 @inherits CometComponentBase
 
-<ui class="Comet-listview list-group">
+<ui class="comet-listview list-group">
     @if (List != null)
     {
         var cursor = HasOnSelected ? "Pointer" : "Default";

src/Comet.Blazor/Components/BProgressBar.razor

@@ -2,13 +2,13 @@
 
 @if (IsIndeterminate)
 {
-    <div class="Comet-progress progress">
+    <div class="comet-progress progress">
         <div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" style="width: 100%" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" />
     </div>
 }
 else
 {
-    <div class="Comet-progress progress">
+    <div class="comet-progress progress">
         <div class="progress-bar" role="progressbar" style="width: @Value%" aria-valuenow="@Value" aria-valuemin="0" aria-valuemax="100" />
     </div>
 }

src/Comet.Blazor/Components/BShape.razor

@@ -5,7 +5,7 @@
 
 @inject CanvasWriter Writer;
 
-<canvas @ref="@_canvas" />
+<canvas @ref="@_canvas" @ref:suppressField />
 
 @code {
     private object _canvas;

src/Comet.Blazor/Components/BSpacer.razor

@@ -1,5 +1,5 @@
 @inherits CometComponentBase
 
-<span class="Comet-spacer">
+<span class="comet-spacer">
     <br />
 </span>

src/Comet.Blazor/Components/BTabView.razor

@@ -1,6 +1,6 @@
 @inherits CometComponentBase
 
-<div class="Comet-tabview">
+<div class="comet-tabview">
     <div class="nav nav-tabs" role="tablist">
         @foreach (var view in Views)
         {

src/Comet.Blazor/Components/BText.razor

@@ -1,6 +1,6 @@
 @inherits CometComponentBase
 
-<div class="Comet-text">
+<div class="comet-text">
     <p>@Value</p>
 </div>
 

src/Comet.Blazor/Components/BTextField.razor

@@ -1,7 +1,7 @@
 @inherits CometComponentBase
 
 <div class="form-group">
-    <div class="Comet-textfield">
+    <div class="comet-textfield">
         <input class="form-control" type="text" value="@Text" @onchange="@OnChange" @oninput="@OnInput"/>
     </div>
 </div>