Version 3.2.0 with Lazy/Delayed views LoadingView, code cleanup, and …

…binding context fixes
roubachof · Oct 24, 2024 · 07f3072 · 07f3072
1 parent d3a60ce
commit 07f3072
Show file tree

Hide file tree

Showing 20 changed files with 1,271 additions and 1,329 deletions.
diff --git a/Maui.Tabs/Maui.Tabs.csproj b/Maui.Tabs/Maui.Tabs.csproj
@@ -22,9 +22,9 @@
 
 	<PropertyGroup>
 		<Product>$(AssemblyName) ($(TargetFramework))</Product>
-		<AssemblyVersion>3.1.1</AssemblyVersion>
-		<AssemblyFileVersion>3.1.1</AssemblyFileVersion>
-		<Version>3.1.1</Version>
+		<AssemblyVersion>3.2.0</AssemblyVersion>
+		<AssemblyFileVersion>3.2.0</AssemblyFileVersion>
+		<Version>3.2.0</Version>
 		<PackOnBuild>true</PackOnBuild>
 		<NeutralLanguage>en</NeutralLanguage>
 
@@ -41,7 +41,7 @@
 		<PackageReadmeFile>docs\ReadMe.md</PackageReadmeFile>
 		<PackageTags>maui dotnetmaui xamarin.forms android ios uwp netstandard tabs segmented control bottombar fixed tabs scrollable tabs badge</PackageTags>
 		<PackageReleaseNotes>
-			Fixes for touch effects on tabs
+			Added loading view for Lazy and Delayed view.
 		</PackageReleaseNotes>
 
 		<Title>"Pure" MAUI Tabs (no renderers)</Title>

diff --git a/MauiSample/MainPage.xaml b/MauiSample/MainPage.xaml
@@ -2,6 +2,7 @@
 <ContentPage x:Class="MauiSample.MainPage"
              xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:controls="clr-namespace:SkiaSharp.Extended.UI.Controls;assembly=SkiaSharp.Extended.UI"
              xmlns:tabs="http://sharpnado.com"
              xmlns:viewModels="clr-namespace:MauiSample.Presentation.ViewModels"
              xmlns:views="clr-namespace:MauiSample.Presentation.Views"
@@ -48,7 +49,17 @@
                               AccentColor="{StaticResource Primary}"
                               Animate="True"
                               BindingContext="{Binding HomePageViewModel}"
-                              UseActivityIndicator="True" />
+                              DelayInMilliseconds="5000"
+                              UseActivityIndicator="True">
+                <tabs:DelayedView.LoadingView>
+                    <controls:SKLottieView WidthRequest="200"
+                                           HeightRequest="200"
+                                           HorizontalOptions="Center"
+                                           VerticalOptions="Center"
+                                           RepeatCount="-1"
+                                           Source="dino_pink.json" />
+                </tabs:DelayedView.LoadingView>
+            </tabs:DelayedView>
             <tabs:DelayedView x:TypeArguments="views:TabA"
                               AccentColor="{StaticResource Primary}"
                               Animate="True"

diff --git a/MauiSample/MauiProgram.cs b/MauiSample/MauiProgram.cs
@@ -5,6 +5,8 @@
 using MauiSample.Presentation.ViewModels;
 using Sharpnado.Tabs;
 
+using SkiaSharp.Views.Maui.Controls.Hosting;
+
 namespace MauiSample;
 
 public static class MauiProgram
@@ -15,6 +17,7 @@ public static MauiApp CreateMauiApp()
 		builder
 			.UseMauiApp<App>()
             .UseSharpnadoTabs(loggerEnable: true, debugLogEnable: true)
+			.UseSkiaSharp()
 			.ConfigureFonts(fonts =>
 			{
                 fonts.AddFont("OpenSans-Bold.ttf", "OpenSansBold");

diff --git a/MauiSample/MauiSample.csproj b/MauiSample/MauiSample.csproj
@@ -113,13 +113,15 @@
 	  <None Remove="Resources\Images\theme_96.png" />
 	  <None Remove="Resources\Images\the_internet.png" />
 	  <None Remove="Resources\Images\will_ferrell.jpg" />
+	  <None Remove="Resources\Raw\dino.json" />
 	  <None Remove="Resources\Splash\logo.png" />
 	</ItemGroup>
 
 	<ItemGroup>
 	  <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
 	  <PackageReference Include="Sharpnado.Maui.TaskLoaderView" Version="2.5.1" />
 	  <PackageReference Include="SimpleInjector" Version="5.4.0" />
+	  <PackageReference Include="SkiaSharp.Extended.UI.Maui" Version="2.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/MauiSample/Resources/Raw/dino_pink.json b/MauiSample/Resources/Raw/dino_pink.json
diff --git a/MauiSample/Resources/Styles/Styles.xaml b/MauiSample/Resources/Styles/Styles.xaml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <?xaml-comp compile="true" ?>
-<ResourceDictionary 
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/dotnet/2021/maui" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
     <Style TargetType="ActivityIndicator">
         <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
     </Style>
 
     <Style TargetType="IndicatorView">
-        <Setter Property="IndicatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}"/>
-        <Setter Property="SelectedIndicatorColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray100}}"/>
+        <Setter Property="IndicatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
+        <Setter Property="SelectedIndicatorColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray100}}" />
     </Style>
 
     <Style TargetType="Border">
         <Setter Property="Stroke" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
-        <Setter Property="StrokeShape" Value="Rectangle"/>
-        <Setter Property="StrokeThickness" Value="1"/>
+        <Setter Property="StrokeShape" Value="Rectangle" />
+        <Setter Property="StrokeThickness" Value="1" />
     </Style>
 
     <Style TargetType="BoxView">
@@ -26,10 +24,10 @@
     <Style TargetType="Button">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Primary}}" />
         <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
-        <Setter Property="FontSize" Value="14"/>
-        <Setter Property="CornerRadius" Value="8"/>
-        <Setter Property="Padding" Value="14,10"/>
+        <Setter Property="FontFamily" Value="OpenSansRegular" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="CornerRadius" Value="8" />
+        <Setter Property="Padding" Value="14,10" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
@@ -64,8 +62,8 @@
     <Style TargetType="DatePicker">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
-        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="FontFamily" Value="OpenSansRegular" />
+        <Setter Property="FontSize" Value="14" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
@@ -83,7 +81,7 @@
     <Style TargetType="Editor">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="FontFamily" Value="OpenSansRegular" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
         <Setter Property="VisualStateManager.VisualStateGroups">
@@ -103,7 +101,7 @@
     <Style TargetType="Entry">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="FontFamily" Value="OpenSansRegular" />
         <Setter Property="FontSize" Value="14" />
         <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
         <Setter Property="VisualStateManager.VisualStateGroups">
@@ -128,9 +126,9 @@
 
     <Style TargetType="ImageButton">
         <Setter Property="Opacity" Value="1" />
-        <Setter Property="BorderColor" Value="Transparent"/>
-        <Setter Property="BorderWidth" Value="0"/>
-        <Setter Property="CornerRadius" Value="0"/>
+        <Setter Property="BorderColor" Value="Transparent" />
+        <Setter Property="BorderWidth" Value="0" />
+        <Setter Property="CornerRadius" Value="0" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
@@ -172,8 +170,8 @@
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
         <Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
-        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="FontFamily" Value="OpenSansRegular" />
+        <Setter Property="FontSize" Value="14" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
@@ -206,10 +204,10 @@
     </Style>
 
     <Style TargetType="RadioButton">
-        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Background" Value="Transparent" />
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
-        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="FontFamily" Value="OpenSansRegular" />
+        <Setter Property="FontSize" Value="14" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
@@ -288,9 +286,9 @@
                     <VisualState x:Name="Normal" />
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="MinimumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"/>
-                            <Setter Property="MaximumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"/>
-                            <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}"/>
+                            <Setter Property="MinimumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="MaximumTrackColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="ThumbColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray600}}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -333,9 +331,9 @@
 
     <Style TargetType="TimePicker">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
-        <Setter Property="FontSize" Value="14"/>
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="FontFamily" Value="OpenSansRegular" />
+        <Setter Property="FontSize" Value="14" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
@@ -350,12 +348,12 @@
         </Setter>
     </Style>
 
-    <Style TargetType="Page" ApplyToDerivedTypes="True">
-        <Setter Property="Padding" Value="0"/>
+    <Style ApplyToDerivedTypes="True" TargetType="Page">
+        <Setter Property="Padding" Value="0" />
         <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
     </Style>
 
-    <Style TargetType="Shell" ApplyToDerivedTypes="True">
+    <Style ApplyToDerivedTypes="True" TargetType="Shell">
         <Setter Property="Shell.BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource Gray950}}" />
         <Setter Property="Shell.ForegroundColor" Value="{OnPlatform WinUI={StaticResource Primary}, Default={StaticResource White}}" />
         <Setter Property="Shell.TitleColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource White}}" />

diff --git a/Tabs/Tabs/BottomTabItem.xaml.cs b/Tabs/Tabs/BottomTabItem.xaml.cs
@@ -3,9 +3,6 @@
 
 using Sharpnado.Tabs.Effects;
 
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-
 namespace Sharpnado.Tabs
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
@@ -39,7 +36,7 @@ public partial class BottomTabItem : TabTextItem
             declaringType: typeof(TabTextItem),
             defaultValue: null);
 
-        private readonly bool _isInitialized = false;
+        private readonly bool _isInitialized;
 
         public BottomTabItem()
         {

diff --git a/Tabs/Tabs/DelayedView.cs b/Tabs/Tabs/DelayedView.cs
@@ -7,20 +7,32 @@ public class DelayedView<TView> : LazyView<TView>
 {
     public int DelayInMilliseconds { get; set; } = 200;
 
+    private View? _currentlyBuiltView;
+
+    protected override void OnBindingContextChanged()
+    {
+        base.OnBindingContextChanged();
+
+        if (_currentlyBuiltView != null)
+        {
+            _currentlyBuiltView.BindingContext = BindingContext;
+        }
+    }
+
     public override void LoadView()
     {
         TaskMonitor.Create(
             async () =>
                 {
-                    View? view = new TView
+                    _currentlyBuiltView = new TView
                     {
                         BindingContext = BindingContext,
                     };
 
                     await Task.Delay(DelayInMilliseconds);
 
                     IsLoaded = true;
-                    Content = view;
+                    Content = _currentlyBuiltView;
                 });
     }
 }

diff --git a/Tabs/Tabs/Initializer.cs b/Tabs/Tabs/Initializer.cs
@@ -4,10 +4,6 @@ public static class Initializer
     {
         public static void Initialize(bool loggerEnable, bool debugLogEnable)
         {
-#if !NET6_0_OR_GREATER
-            Shades.Initializer.Initialize(loggerEnable: false);
-#endif
-
             InternalLogger.EnableDebug = debugLogEnable;
             InternalLogger.EnableLogging = loggerEnable;
         }