From 31e082f46e0523e6120937f8c8585e660d6d2cd3 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 20 Nov 2024 08:08:42 +0800
Subject: [PATCH] feat: enhance Carousel.

---
 src/Semi.Avalonia/Controls/Carousel.axaml     | 54 +++++++------------
 src/Semi.Avalonia/Converters/ItemConverter.cs | 14 +++++
 .../Converters/ItemToObjectConverter.cs       | 26 ---------
 src/Semi.Avalonia/Themes/Dark/Carousel.axaml  |  5 +-
 src/Semi.Avalonia/Themes/Light/Carousel.axaml |  5 +-
 .../Themes/Shared/Carousel.axaml              |  7 ++-
 6 files changed, 41 insertions(+), 70 deletions(-)
 create mode 100644 src/Semi.Avalonia/Converters/ItemConverter.cs
 delete mode 100644 src/Semi.Avalonia/Converters/ItemToObjectConverter.cs

diff --git a/src/Semi.Avalonia/Controls/Carousel.axaml b/src/Semi.Avalonia/Controls/Carousel.axaml
index fb41129..69be86a 100644
--- a/src/Semi.Avalonia/Controls/Carousel.axaml
+++ b/src/Semi.Avalonia/Controls/Carousel.axaml
@@ -1,9 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="clr-namespace:Semi.Avalonia.Converters"
+    xmlns:converter="clr-namespace:Semi.Avalonia.Converters"
     x:CompileBindings="True">
-    <converters:ItemToObjectConverter x:Key="ItemsConverter" />
     <Design.PreviewWith>
         <StackPanel Spacing="20" Width="800" Height="800">
             <StackPanel.Styles>
@@ -90,26 +89,26 @@
             <ControlTemplate TargetType="ListBoxItem">
                 <Ellipse
                     Name="Container"
-                    Width="{DynamicResource CarouselIndicatorWidth}"
-                    Height="{DynamicResource CarouselIndicatorHeight}"
+                    Width="{DynamicResource CarouselIndicatorDotWidth}"
+                    Height="{DynamicResource CarouselIndicatorDotHeight}"
                     Fill="{TemplateBinding Foreground}" />
             </ControlTemplate>
         </Setter>
-        <Style Selector="^:pointerover /template/ Ellipse#Container">
-            <Setter Property="Fill" Value="{DynamicResource CarouselIndicatorPointeroverForeground}" />
+        <Style Selector="^:pointerover">
+            <Setter Property="Foreground" Value="{DynamicResource CarouselIndicatorPointeroverForeground}" />
         </Style>
-        <Style Selector="^:pressed /template/ Ellipse#Container">
-            <Setter Property="Fill" Value="{DynamicResource CarouselIndicatorPressedForeground}" />
+        <Style Selector="^:pressed">
+            <Setter Property="Foreground" Value="{DynamicResource CarouselIndicatorPressedForeground}" />
         </Style>
-        <Style Selector="^:selected /template/ Ellipse#Container">
-            <Setter Property="Fill" Value="{DynamicResource CarouselIndicatorSelectedForeground}" />
+        <Style Selector="^:selected">
+            <Setter Property="Foreground" Value="{DynamicResource CarouselIndicatorSelectedForeground}" />
         </Style>
     </ControlTheme>
 
-    <ControlTheme x:Key="CarouselIndicatorLineListBoxItem" TargetType="ListBoxItem">
-        <Setter Property="Foreground" Value="{DynamicResource CarouselIndicatorForeground}" />
+    <ControlTheme x:Key="CarouselIndicatorLineListBoxItem"
+                  BasedOn="{StaticResource CarouselIndicatorDotListBoxItem}"
+                  TargetType="ListBoxItem">
         <Setter Property="Margin" Value="2 0"/>
-        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Template">
             <ControlTemplate TargetType="ListBoxItem">
                 <Rectangle
@@ -118,23 +117,14 @@
                     Fill="{TemplateBinding Foreground}" />
             </ControlTemplate>
         </Setter>
-        <Style Selector="^:pointerover /template/ Rectangle#Container">
-            <Setter Property="Fill" Value="{DynamicResource CarouselIndicatorPointeroverForeground}" />
-        </Style>
-        <Style Selector="^:pressed /template/ Rectangle#Container">
-            <Setter Property="Fill" Value="{DynamicResource CarouselIndicatorPressedForeground}" />
-        </Style>
-        <Style Selector="^:selected /template/ Rectangle#Container">
-            <Setter Property="Fill" Value="{DynamicResource CarouselIndicatorSelectedForeground}" />
-        </Style>
     </ControlTheme>
 
-    <ControlTheme x:Key="CarouselIndicatorColumnarListBoxItem" TargetType="ListBoxItem">
-        <Setter Property="Foreground" Value="{DynamicResource CarouselIndicatorForeground}" />
+    <ControlTheme x:Key="CarouselIndicatorColumnarListBoxItem"
+                  BasedOn="{StaticResource CarouselIndicatorDotListBoxItem}"
+                  TargetType="ListBoxItem">
         <Setter Property="Width" Value="{DynamicResource CarouselIndicatorColumnarWidth}"/>
         <Setter Property="Height" Value="{DynamicResource CarouselIndicatorColumnarSelectedHeight}"/>
         <Setter Property="Margin" Value="2 0"/>
-        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="Template">
             <ControlTemplate TargetType="ListBoxItem">
                 <Rectangle
@@ -151,14 +141,7 @@
                 </Rectangle>
             </ControlTemplate>
         </Setter>
-        <Style Selector="^:pointerover /template/ Rectangle#Container">
-            <Setter Property="Fill" Value="{DynamicResource CarouselIndicatorPointeroverForeground}" />
-        </Style>
-        <Style Selector="^:pressed /template/ Rectangle#Container">
-            <Setter Property="Fill" Value="{DynamicResource CarouselIndicatorPressedForeground}" />
-        </Style>
         <Style Selector="^:selected /template/ Rectangle#Container">
-            <Setter Property="Fill" Value="{DynamicResource CarouselIndicatorSelectedForeground}" />
             <Setter Property="Height" Value="{DynamicResource CarouselIndicatorColumnarSelectedHeight}" />
         </Style>
     </ControlTheme>
@@ -215,8 +198,9 @@
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         ItemContainerTheme="{DynamicResource CarouselIndicatorDotListBoxItem}"
-                        ItemsSource="{TemplateBinding ItemCount, Mode=OneWay, Converter={StaticResource ItemsConverter}}"
-                        SelectedIndex="{TemplateBinding SelectedIndex, Mode=TwoWay}">
+                        ItemsSource="{TemplateBinding ItemCount, Converter={x:Static converter:ItemConverter.ItemToObjectConverter}}"
+                        IsVisible="{TemplateBinding ItemCount, Converter={x:Static converter:ItemConverter.ItemVisibleConverter}}"
+                        SelectedIndex="{TemplateBinding SelectedIndex}">
                         <ListBox.ItemsPanel>
                             <ItemsPanelTemplate>
                                 <StackPanel Orientation="Horizontal" />
@@ -230,6 +214,7 @@
                         Theme="{DynamicResource CarouselButton}"
                         Margin="{DynamicResource CarouselButtonMargin}"
                         Foreground="{DynamicResource CarouselButtonForeground}"
+                        IsVisible="{TemplateBinding ItemCount, Converter={x:Static converter:ItemConverter.ItemVisibleConverter}}"
                         Command="{Binding $parent[Carousel].Previous}" />
                     <Button
                         Grid.Row="0"
@@ -238,6 +223,7 @@
                         Theme="{DynamicResource CarouselButton}"
                         Margin="{DynamicResource CarouselButtonMargin}"
                         Foreground="{DynamicResource CarouselButtonForeground}"
+                        IsVisible="{TemplateBinding ItemCount, Converter={x:Static converter:ItemConverter.ItemVisibleConverter}}"
                         Command="{Binding $parent[Carousel].Next}"
                         RenderTransform="rotate(180deg)" />
                 </Grid>
diff --git a/src/Semi.Avalonia/Converters/ItemConverter.cs b/src/Semi.Avalonia/Converters/ItemConverter.cs
new file mode 100644
index 0000000..396972e
--- /dev/null
+++ b/src/Semi.Avalonia/Converters/ItemConverter.cs
@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Linq;
+using Avalonia.Data.Converters;
+
+namespace Semi.Avalonia.Converters;
+
+public static class ItemConverter
+{
+    public static readonly IValueConverter ItemVisibleConverter =
+        new FuncValueConverter<int?, bool>(count => count is > 1);
+
+    public static readonly IValueConverter ItemToObjectConverter =
+        new FuncValueConverter<int?, IEnumerable>(count => Enumerable.Repeat(new object(), count ?? 0));
+}
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Converters/ItemToObjectConverter.cs b/src/Semi.Avalonia/Converters/ItemToObjectConverter.cs
deleted file mode 100644
index 455f030..0000000
--- a/src/Semi.Avalonia/Converters/ItemToObjectConverter.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using Avalonia.Collections;
-using Avalonia.Controls;
-using Avalonia.Data.Converters;
-
-namespace Semi.Avalonia.Converters;
-
-public class ItemToObjectConverter: IValueConverter
-{
-    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        if (value is int i)
-        {
-            return Enumerable.Repeat(new object(), i).ToList();
-        }
-        return new List<object>();
-    }
-
-    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
-}
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Carousel.axaml b/src/Semi.Avalonia/Themes/Dark/Carousel.axaml
index 561a92f..4f990b9 100644
--- a/src/Semi.Avalonia/Themes/Dark/Carousel.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Carousel.axaml
@@ -1,9 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="CarouselButtonForeground" Opacity="0.5" Color="Black" />
-    <SolidColorBrush x:Key="CarouselButtonPointeroverForeground" Opacity="0.7" Color="Black" />
-    <SolidColorBrush x:Key="CarouselButtonPressedForeground" Opacity="0.7" Color="Black" />
+    <SolidColorBrush x:Key="CarouselButtonPointeroverForeground" Color="Black" />
     <SolidColorBrush x:Key="CarouselIndicatorForeground" Opacity="0.5" Color="Black" />
     <SolidColorBrush x:Key="CarouselIndicatorPointeroverForeground" Opacity="0.7" Color="Black" />
-    <SolidColorBrush x:Key="CarouselIndicatorPressedForeground" Opacity="0.7" Color="Black" />
+    <SolidColorBrush x:Key="CarouselIndicatorPressedForeground" Color="Black" />
     <SolidColorBrush x:Key="CarouselIndicatorSelectedForeground" Color="Black" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Carousel.axaml b/src/Semi.Avalonia/Themes/Light/Carousel.axaml
index 561a92f..4f990b9 100644
--- a/src/Semi.Avalonia/Themes/Light/Carousel.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Carousel.axaml
@@ -1,9 +1,8 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="CarouselButtonForeground" Opacity="0.5" Color="Black" />
-    <SolidColorBrush x:Key="CarouselButtonPointeroverForeground" Opacity="0.7" Color="Black" />
-    <SolidColorBrush x:Key="CarouselButtonPressedForeground" Opacity="0.7" Color="Black" />
+    <SolidColorBrush x:Key="CarouselButtonPointeroverForeground" Color="Black" />
     <SolidColorBrush x:Key="CarouselIndicatorForeground" Opacity="0.5" Color="Black" />
     <SolidColorBrush x:Key="CarouselIndicatorPointeroverForeground" Opacity="0.7" Color="Black" />
-    <SolidColorBrush x:Key="CarouselIndicatorPressedForeground" Opacity="0.7" Color="Black" />
+    <SolidColorBrush x:Key="CarouselIndicatorPressedForeground" Color="Black" />
     <SolidColorBrush x:Key="CarouselIndicatorSelectedForeground" Color="Black" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Carousel.axaml b/src/Semi.Avalonia/Themes/Shared/Carousel.axaml
index 62ba3e0..db828ba 100644
--- a/src/Semi.Avalonia/Themes/Shared/Carousel.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Carousel.axaml
@@ -1,15 +1,14 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StreamGeometry x:Key="CarouselButtonGlyph">M16.2782 4.23933C16.864 4.82511 16.864 5.77486 16.2782 6.36065L10.6213 12.0175L16.2782 17.6744C16.864 18.2601 16.864 19.2099 16.2782 19.7957C15.6924 20.3815 14.7426 20.3815 14.1569 19.7957L7.43934 13.0782C6.85355 12.4924 6.85355 11.5426 7.43934 10.9568L14.1569 4.23933C14.7426 3.65354 15.6924 3.65354 16.2782 4.23933Z</StreamGeometry>
 
-    <x:Double x:Key="CarouselIndicatorWidth">8</x:Double>
-    <x:Double x:Key="CarouselIndicatorHeight">8</x:Double>
+    <x:Double x:Key="CarouselIndicatorDotWidth">8</x:Double>
+    <x:Double x:Key="CarouselIndicatorDotHeight">8</x:Double>
 
-    <x:Double x:Key="CarouselIndicatorLineWidth">78</x:Double>
     <x:Double x:Key="CarouselIndicatorLineHeight">4</x:Double>
 
     <x:Double x:Key="CarouselIndicatorColumnarWidth">4</x:Double>
     <x:Double x:Key="CarouselIndicatorColumnarHeight">12</x:Double>
     <x:Double x:Key="CarouselIndicatorColumnarSelectedHeight">20</x:Double>
 
-    <Thickness x:Key="CarouselButtonMargin">8</Thickness>
+    <Thickness x:Key="CarouselButtonMargin">20</Thickness>
 </ResourceDictionary>
\ No newline at end of file