Merge pull request #20 from muak/dev/net8

Dev/net8
muak · Jan 25, 2024 · 61164a2 · 61164a2
2 parents 2371092 + daa719a
commit 61164a2
Show file tree

Hide file tree

Showing 18 changed files with 194 additions and 100 deletions.
diff --git a/AiForms.Maui.SettingsView.sln b/AiForms.Maui.SettingsView.sln
@@ -8,9 +8,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsView", "SettingsView\SettingsView.csproj", "{B73793A3-0AA7-4086-8F2B-A3CE3A5E6BE1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{547F99F7-22F8-4C24-A613-9F088A9F2BD3}"
-	ProjectSection(SolutionItems) = preProject
-		nuget\AzurePipelines.nuspec = nuget\AzurePipelines.nuspec
-	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Sample/MauiProgram.cs b/Sample/MauiProgram.cs
@@ -25,13 +25,14 @@ public static MauiApp CreateMauiApp()
                     containerRegistry.RegisterForNavigation<ContentPage>();
                     containerRegistry.RegisterForNavigation<ListPage, ListViewModel>();
                     containerRegistry.RegisterForNavigation<CustomHeaderPage, CustomHeaderViewModel>();
+                    containerRegistry.RegisterForNavigation<TapSurveyPage, TapSurveyViewModel>();
                 })
-                .OnAppStart(navigationService =>
+                .OnAppStart(async(container, navigation) =>
                 {
-                    navigationService.CreateBuilder()
+                    await navigation.CreateBuilder()
                     .AddSegment(nameof(MyNavigationPage))
                     .AddSegment<MainViewModel>()
-                    .Navigate();
+                    .NavigateAsync();
                 })
                 .OnInitialized(container =>
                 {
@@ -46,21 +47,7 @@ public static MauiApp CreateMauiApp()
             {
                 fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
                 fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
-            });
-
-        ViewModelLocationProvider2.SetDefaultViewTypeToViewModelTypeResolver(viewType =>
-        {              
-            // Hoge     -> HogeViewModel
-            // HogePage -> HogeViewModel
-            // HogeView -> HogeViewModel
-            var viewName = viewType.FullName;
-            viewName = viewName.Replace(".Views.", ".ViewModels.");
-            viewName = viewName.EndsWith("Page") ? viewName.Replace("Page", "") : viewName;
-            var viewAssemblyName = viewType.GetTypeInfo().Assembly.FullName;
-            var suffix = viewName.EndsWith("View") ? "Model" : "ViewModel";
-            var viewModelName = String.Format(CultureInfo.InvariantCulture, "{0}{1}, {2}", viewName, suffix, viewAssemblyName);
-            return Type.GetType(viewModelName);
-        });
+            });        
 
         return builder.Build();
     }

diff --git a/Sample/Sample.csproj b/Sample/Sample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
 		<OutputType>Exe</OutputType>
 		<RootNamespace>Sample</RootNamespace>
 		<UseMaui>true</UseMaui>
@@ -31,22 +31,22 @@
 	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
 		<LangVersion>10.0</LangVersion>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-ios|AnyCPU'">
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-ios|AnyCPU'">
 		<CodesignKey>iPhone Developer</CodesignKey>
 		<MtouchLink>None</MtouchLink>
 		<CreatePackage>false</CreatePackage>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net7.0-ios|AnyCPU'">
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-ios|AnyCPU'">
 	  <CodesignKey>iPhone Developer</CodesignKey>
 	  <MtouchDebug>true</MtouchDebug>
 	  <!--<CodesignProvision>自動</CodesignProvision>-->
 	  <CreatePackage>false</CreatePackage>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-maccatalyst|AnyCPU'">
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-maccatalyst|AnyCPU'">
 	  <CodesignKey>Mac Developer</CodesignKey>
 	  <PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net7.0-android|AnyCPU'">
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android|AnyCPU'">
 	  <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>	  	  	  	  	  
 	</PropertyGroup>
 	<ItemGroup>
@@ -76,8 +76,9 @@
 	  <None Remove="Resources\Images\ic_close.svg" />
 	</ItemGroup>
 	<ItemGroup>
-	  <PackageReference Include="Prism.DryIoc.Maui" Version="8.1.273-pre" />
-	  <PackageReference Include="ReactiveProperty" Version="8.1.2" />
+	  <PackageReference Include="Prism.DryIoc.Maui" Version="9.0.271-pre" />
+	  <PackageReference Include="ReactiveProperty" Version="9.3.4" />
+	  <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
 	</ItemGroup>
 	<ItemGroup>
 	  <Folder Include="Views\" />

diff --git a/Sample/ViewModels/MainViewModel.cs b/Sample/ViewModels/MainViewModel.cs
@@ -48,7 +48,7 @@ public MainViewModel(INavigationService navigationService)
 
                 //Description.Value += "01234567890";
                 //await navigationService.NavigateAsync("ListPage");
-                await navigationService.NavigateAsync("CustomHeaderPage");
+                await navigationService.NavigateAsync("TapSurveyPage");
             });
 
             AddContentCommand.Subscribe(_ =>

diff --git a/Sample/ViewModels/TapSurveyViewModel.cs b/Sample/ViewModels/TapSurveyViewModel.cs
@@ -0,0 +1,10 @@
+using System;
+namespace Sample.ViewModels;
+
+public class TapSurveyViewModel:BindableBase
+{
+    public TapSurveyViewModel()
+    {
+    }
+}
+
diff --git a/Sample/Views/TapSurveyPage.xaml b/Sample/Views/TapSurveyPage.xaml
@@ -0,0 +1,67 @@
+<?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:sv="clr-namespace:AiForms.Settings;assembly=SettingsView"
+             x:Class="Sample.Views.TapSurveyPage"
+             Title="TapSurveyPage">
+    <sv:SettingsView>
+
+        <sv:Section>
+            <sv:Section.HeaderView>
+                <HorizontalStackLayout>
+                    <Label Text="Header" HeightRequest="44">
+                        <Label.GestureRecognizers>
+                            <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped_3" />
+                        </Label.GestureRecognizers>
+                    </Label>
+                </HorizontalStackLayout>
+            </sv:Section.HeaderView>
+
+            <sv:Section.FooterView>
+                <HorizontalStackLayout>
+                    <Label Text="Footer" HeightRequest="44">
+                        <Label.GestureRecognizers>
+                            <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped_4" />
+                        </Label.GestureRecognizers>
+                    </Label>
+                </HorizontalStackLayout>
+            </sv:Section.FooterView>
+
+            <sv:CustomCell IsSelectable="True">
+
+                <Grid ColumnDefinitions="*,*,*">
+                    <StackLayout Grid.Column="0">
+                        <StackLayout.GestureRecognizers>
+                            <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped" />
+                        </StackLayout.GestureRecognizers>
+                        <Image />
+                        <Label Text="A"
+                               FontAttributes="Bold"
+                               HorizontalOptions="Center"/>
+                    </StackLayout>
+                    <StackLayout Grid.Column="1">
+                        <StackLayout.GestureRecognizers>
+                            <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped_1" />
+                        </StackLayout.GestureRecognizers>
+                        <Image />
+                        <Label Text="B"
+                               FontAttributes="Bold"
+                               HorizontalOptions="Center"/>
+                    </StackLayout>
+                    <StackLayout Grid.Column="2">
+                        <StackLayout.GestureRecognizers>
+                            <TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped_2" />
+                        </StackLayout.GestureRecognizers>
+                        <Image />
+                        <Label Text="C"
+                               FontAttributes="Bold"
+                               HorizontalOptions="Center"/>
+                    </StackLayout>
+                </Grid>
+
+            </sv:CustomCell>
+
+        </sv:Section>
+
+    </sv:SettingsView>
+</ContentPage>
diff --git a/Sample/Views/TapSurveyPage.xaml.cs b/Sample/Views/TapSurveyPage.xaml.cs
@@ -0,0 +1,29 @@
+namespace Sample.Views;
+
+public partial class TapSurveyPage : ContentPage
+{
+    public TapSurveyPage()
+    {
+        InitializeComponent();
+    }
+
+    void TapGestureRecognizer_Tapped(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
+    {
+    }
+
+    void TapGestureRecognizer_Tapped_1(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
+    {
+    }
+
+    void TapGestureRecognizer_Tapped_2(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
+    {
+    }
+
+    void TapGestureRecognizer_Tapped_3(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
+    {
+    }
+
+    void TapGestureRecognizer_Tapped_4(System.Object sender, Microsoft.Maui.Controls.TappedEventArgs e)
+    {
+    }
+}
diff --git a/SettingsView/Platforms/Android/Cells/CellBaseView.cs b/SettingsView/Platforms/Android/Cells/CellBaseView.cs
@@ -21,7 +21,7 @@ namespace AiForms.Settings.Platforms.Droid;
 /// Cell base view.
 /// </summary>
 [Android.Runtime.Preserve(AllMembers = true)]
-public class CellBaseView : ARelativeLayout
+public class CellBaseView : ARelativeLayout, IImageSourcePartSetter
 {
     CellBase _cell;
     public CellBase Cell
@@ -81,8 +81,12 @@ public CellBase Cell
     /// Gets the hint label.
     /// </summary>
     /// <value>The hint label.</value>
-    public TextView HintLabel { get; private set; }
-
+    public TextView HintLabel { get; private set; }
+
+    IElementHandler IImageSourcePartSetter.Handler => Cell.Handler;
+
+    IImageSourcePart IImageSourcePartSetter.ImageSourcePart => Cell;
+
     protected Lazy<IFontManager> _fontManager;
     ImageSourcePartLoader _imageLoader;
     /// <summary>
@@ -554,18 +558,18 @@ internal void UpdateIcon(bool forceLoad = false)
         {
             IconView.Visibility = ViewStates.Visible;
 
-            _imageLoader = new ImageSourcePartLoader(Cell.Handler, () => Cell, OnSetImageSource);
+            _imageLoader = new ImageSourcePartLoader(this);
             _imageLoader?.UpdateImageSourceAsync();
         }
         else
         {
             IconView.Visibility = ViewStates.Gone;
         }
-    }    
-
-    private void OnSetImageSource(Drawable drawable)
+    }
+
+    void IImageSourcePartSetter.SetImageSource(Drawable platformImage)
     {
-        IconView?.SetImageDrawable(drawable);
+        IconView?.SetImageDrawable(platformImage);
     }
 
     Bitmap CreateRoundImage(Bitmap image)
@@ -653,9 +657,6 @@ protected override void Dispose(bool disposing)
             Background = null;
         }
         base.Dispose(disposing);
-    }
-
-
-
+    }    
 }
 
diff --git a/SettingsView/Platforms/Android/FormsViewContainer.cs b/SettingsView/Platforms/Android/FormsViewContainer.cs
@@ -138,6 +138,11 @@ public void DisconnectHandler()
 
     public void UpdateCell(View view)
     {
+        // Workaround GestureRecognizer bug
+        // TODO: if fix this issue, remove the following code.
+        // https://github.com/dotnet/maui/issues/17948
+        view.Parent = Application.Current.MainPage;
+
         if (_contentView == view && !CustomCell.IsForceLayout)
         {
             return;

diff --git a/SettingsView/Platforms/Android/HeaderFooterContainer.cs b/SettingsView/Platforms/Android/HeaderFooterContainer.cs
@@ -110,6 +110,11 @@ public void UpdateIsEnabled()
 
     public void UpdateCell(View view)
     {
+        // Workaround GestureRecognizer bug
+        // TODO: if fix this issue, remove the following code.
+        // https://github.com/dotnet/maui/issues/17948
+        view.Parent = Application.Current.MainPage;
+
         if (_contentView != null)
         {
             _contentView.PropertyChanged -= CellPropertyChanged;

diff --git a/SettingsView/Platforms/iOS/Cells/CellBaseView.cs b/SettingsView/Platforms/iOS/Cells/CellBaseView.cs
@@ -21,7 +21,7 @@ namespace AiForms.Settings.Platforms.iOS;
 /// Cell base view.
 /// </summary>
 [Foundation.Preserve(AllMembers = true)]
-public class CellBaseView : UITableViewCell
+public class CellBaseView : UITableViewCell, IImageSourcePartSetter
 {
     /// <summary>
     /// Gets the hint label.
@@ -83,6 +83,9 @@ public CellBase Cell
     /// <value>The content stack.</value>
     protected UIStackView ContentStack { get; private set; }
 
+    IElementHandler IImageSourcePartSetter.Handler => Cell.Handler;
+    IImageSourcePart IImageSourcePartSetter.ImageSourcePart => Cell;
+
     protected UIStackView StackH;
     protected UIStackView StackV;
 
@@ -505,18 +508,18 @@ internal void UpdateIcon()
             //hide IconView because UIStackView Distribution won't work when a image isn't set.
             IconView.Hidden = false;
 
-        _imageLoader = new ImageSourcePartLoader(Cell.Handler, () => Cell, OnSetImageSource);
-        _imageLoader.UpdateImageSourceAsync();                 
-    }
+            _imageLoader = new ImageSourcePartLoader(this);
+            _imageLoader.UpdateImageSourceAsync();                 
+        }
         else
         {
             IconView.Hidden = true;
         }
     }
 
-    private void OnSetImageSource(UIImage image)
+    void IImageSourcePartSetter.SetImageSource(UIImage platformImage)
     {
-        IconView.Image = image;
+        IconView.Image = platformImage;
         SetNeedsLayout();
     }
 
@@ -754,5 +757,6 @@ protected virtual void SetUpContentView()
         }
     }
 
+
 }
 
diff --git a/SettingsView/Platforms/iOS/Cells/CustomCellContent.cs b/SettingsView/Platforms/iOS/Cells/CustomCellContent.cs
@@ -96,6 +96,11 @@ protected virtual void UpdateIsEnabled()
 
     public virtual void UpdateCell(View newCell, UITableView tableView)
     {
+        // Workaround GestureRecognizer bug
+        // TODO: if fix this issue, remove the following code.
+        // https://github.com/dotnet/maui/issues/17948
+        newCell.Parent = Application.Current.MainPage;
+
         _tableView = tableView;       
 
         var oldCell = _virtualCell;
@@ -149,6 +154,11 @@ public virtual void UpdateCell(View newCell, UITableView tableView)
         }
         else
         {
+            // Workaround GestureRecognizer bug
+            // TODO: if fix this issue, remove the following code.
+            // https://github.com/dotnet/maui/issues/17948
+            newCell.Parent = Application.Current.MainPage;
+
             // If Handler is not generated, generate it.            
             handler = newCell.ToHandler(newCell.FindMauiContext());
         }

diff --git a/SettingsView/Platforms/iOS/CustomHeaderFooterView.cs b/SettingsView/Platforms/iOS/CustomHeaderFooterView.cs
@@ -142,6 +142,11 @@ protected virtual void UpdateIsEnabled()
 
     public virtual void UpdateCell(View newCell,UITableView tableView)
     {
+        // Workaround GestureRecognizer bug
+        // TODO: if fix this issue, remove the following code.
+        // https://github.com/dotnet/maui/issues/17948
+        newCell.Parent = Application.Current.MainPage;
+
         if (_virtualCell == newCell)
         {
             return;

diff --git a/SettingsView/Platforms/iOS/Extensions/DisposeHelpers.cs b/SettingsView/Platforms/iOS/Extensions/DisposeHelpers.cs
@@ -5,7 +5,7 @@ namespace AiForms.Settings.Platforms.iOS;
 
 public static class DisposeHelpers
 {
-    static Type ModalWrapper = typeof(Element).Assembly.GetType("Microsoft.Maui.Controls.Platform.ModalWrapper");
+    static Type ModalWrapper = typeof(Element).Assembly.GetType("Microsoft.Maui.Controls.Platform.ControlsModalWrapper");
     static MethodInfo ModalWrapperDispose = ModalWrapper.GetMethod("Dispose");
     static MethodInfo ElementDescendants = typeof(Element).GetMethods(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance).FirstOrDefault(x => x.Name == "Descendants" && !x.IsGenericMethod);