Fallback icons on unsupported platforms

Unigram/Unigram/Controls/AnimatedGlyphToggleButton.cs

@@ -21,6 +21,8 @@ public class AnimatedGlyphToggleButton : ToggleButton
         private FrameworkElement _label;
         private Visual _visual;
 
+        protected bool _animateOnToggle = true;
+
         public AnimatedGlyphToggleButton()
         {
             DefaultStyleKey = typeof(AnimatedGlyphToggleButton);
@@ -29,62 +31,93 @@ public AnimatedGlyphToggleButton()
             Unchecked += OnToggle;
         }
 
+        protected virtual bool IsRuntimeCompatible()
+        {
+            return false;
+        }
+
         protected override void OnApplyTemplate()
         {
+            if (IsRuntimeCompatible())
+            {
+                return;
+            }
+
             _label1 = _label = GetTemplateChild("ContentPresenter1") as FrameworkElement;
             _label2 = GetTemplateChild("ContentPresenter2") as FrameworkElement;
 
-            _visual1 = _visual = ElementCompositionPreview.GetElementVisual(_label1);
-            _visual2 = ElementCompositionPreview.GetElementVisual(_label2);
-
-            if (_label2 is TextBlock text2)
+            if (_label1 != null && _label2 != null)
             {
-                text2.Text = string.Empty;
+                _visual1 = _visual = ElementCompositionPreview.GetElementVisual(_label1);
+                _visual2 = ElementCompositionPreview.GetElementVisual(_label2);
+
+                if (_label2 is TextBlock text2)
+                {
+                    text2.Text = string.Empty;
+                }
+                else if (_label2 is ContentPresenter presenter2)
+                {
+                    presenter2.Content = new object();
+                }
+
+                _visual2.Opacity = 0;
+                _visual2.Scale = new Vector3();
+                _visual2.CenterPoint = new Vector3(10);
+
+                if (_label1 is TextBlock text1)
+                {
+                    text1.Text = (IsChecked == true ? CheckedGlyph : Glyph) ?? string.Empty;
+                }
+                else if (_label1 is ContentPresenter presenter1)
+                {
+                    presenter1.Content = (IsChecked == true ? CheckedContent : Content) ?? new object();
+                }
+
+                _visual1.Opacity = 1;
+                _visual1.Scale = new Vector3(1);
+                _visual1.CenterPoint = new Vector3(10);
             }
-            else if (_label2 is ContentPresenter presenter2)
+
+            base.OnApplyTemplate();
+        }
+
+        private void OnToggle(object sender, RoutedEventArgs e)
+        {
+            if (_animateOnToggle is false)
             {
-                presenter2.Content = new object();
+                return;
             }
 
-            _visual2.Opacity = 0;
-            _visual2.Scale = new Vector3();
-            _visual2.CenterPoint = new Vector3(10);
-
-            if (_label1 is TextBlock text1)
+            if (_label is TextBlock)
             {
-                text1.Text = IsChecked == true ? CheckedGlyph : Glyph ?? string.Empty;
+                OnGlyphChanged(IsChecked == true ? CheckedGlyph : Glyph);
             }
-            else if (_label1 is ContentPresenter presenter1)
+            else
             {
-                presenter1.Content = IsChecked == true ? CheckedContent : Content ?? new object();
+                OnGlyphChanged(IsChecked == true ? CheckedContent : Content);
             }
-
-            _visual1.Opacity = 1;
-            _visual1.Scale = new Vector3(1);
-            _visual1.CenterPoint = new Vector3(10);
-
-            base.OnApplyTemplate();
         }
 
-        private async void OnToggle(object sender, RoutedEventArgs e)
+        protected async void OnGlyphChanged(object newValue)
         {
             if (_visual == null || _label == null)
             {
                 return;
             }
+
             var visualShow = _visual == _visual1 ? _visual2 : _visual1;
             var visualHide = _visual == _visual1 ? _visual1 : _visual2;
 
             var labelShow = _visual == _visual1 ? _label2 : _label1;
             var labelHide = _visual == _visual1 ? _label1 : _label2;
 
-            if (labelShow is TextBlock textShow)
+            if (labelShow is TextBlock textShow && newValue is string glyph)
             {
-                textShow.Text = IsChecked == true ? CheckedGlyph : Glyph;
+                textShow.Text = glyph;
             }
             else if (labelShow is ContentPresenter presenterShow)
             {
-                presenterShow.Content = IsChecked == true ? CheckedContent : Content;
+                presenterShow.Content = newValue;
             }
 
             await this.UpdateLayoutAsync();

Unigram/Unigram/Controls/AnimatedIconToggleButton.cs

@@ -1,19 +1,20 @@
 using Microsoft.UI.Xaml.Controls;
-using System;
 using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Media;
 
 namespace Unigram.Controls
 {
-    public class AnimatedIconToggleButton : ToggleButton
+    public class AnimatedIconToggleButton : AnimatedGlyphToggleButton
     {
         public AnimatedIconToggleButton()
         {
             DefaultStyleKey = typeof(AnimatedIconToggleButton);
             RegisterPropertyChangedCallback(ForegroundProperty, OnForegroundChanged);
         }
+        protected override bool IsRuntimeCompatible()
+        {
+            return Windows.Foundation.Metadata.ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 11);
+        }
 
         private void OnForegroundChanged(DependencyObject sender, DependencyProperty dp)
         {
@@ -46,34 +47,5 @@ private static void OnSourceChanged(DependencyObject d, DependencyPropertyChange
         }
 
         #endregion
-
-        #region IsOneWay
-
-        public bool IsOneWay
-        {
-            get => (bool)GetValue(IsOneWayProperty);
-            set => SetValue(IsOneWayProperty, value);
-        }
-
-        public static readonly DependencyProperty IsOneWayProperty =
-            DependencyProperty.Register("IsOneWay", typeof(bool), typeof(AnimatedIconToggleButton), new PropertyMetadata(true));
-
-        #endregion
-
-        protected override void OnToggle()
-        {
-            if (IsOneWay)
-            {
-                var binding = GetBindingExpression(IsCheckedProperty);
-                if (binding != null && binding.ParentBinding.Mode == BindingMode.TwoWay)
-                {
-                    base.OnToggle();
-                }
-            }
-            else
-            {
-                base.OnToggle();
-            }
-        }
     }
 }

Unigram/Unigram/Controls/Chats/ChatStickerButton.cs

@@ -1,17 +1,17 @@
 using Microsoft.UI.Xaml.Controls;
 using System.Numerics;
 using Unigram.Assets.Icons;
+using Unigram.Converters;
 using Unigram.Services.Settings;
 using Windows.UI.Composition;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
 using Windows.UI.Xaml.Hosting;
 using Windows.UI.Xaml.Media;
 
 namespace Unigram.Controls.Chats
 {
-    public class ChatStickerButton : ToggleButton
+    public class ChatStickerButton : AnimatedGlyphToggleButton
     {
         private Border Icon;
 
@@ -25,6 +25,8 @@ public ChatStickerButton()
         {
             DefaultStyleKey = typeof(ChatStickerButton);
             RegisterPropertyChangedCallback(ForegroundProperty, OnForegroundChanged);
+
+            _animateOnToggle = false;
         }
 
         private void OnForegroundChanged(DependencyObject sender, DependencyProperty dp)
@@ -37,10 +39,22 @@ private void OnForegroundChanged(DependencyObject sender, DependencyProperty dp)
 
         protected override void OnApplyTemplate()
         {
+            base.OnApplyTemplate();
+
             Icon = GetTemplateChild(nameof(Icon)) as Border;
 
             OnSourceChanged(Source, StickersTab.None);
-            base.OnApplyTemplate();
+            OnGlyphChanged(Source switch
+            {
+                StickersTab.Emoji => Icons.Emoji24,
+                StickersTab.Stickers => Icons.Sticker24,
+                StickersTab.Animations => Icons.Gif24,
+            });
+        }
+
+        protected override bool IsRuntimeCompatible()
+        {
+            return Windows.Foundation.Metadata.ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 11);
         }
 
         #region Source
@@ -68,30 +82,43 @@ private void OnSourceChanged(StickersTab newValue, StickersTab oldValue)
                 return;
             }
 
-            if (_previous != null)
+            if (IsRuntimeCompatible())
             {
-                _previous.Dispose();
-                _previous = null;
-            }
+                if (_previous != null)
+                {
+                    _previous.Dispose();
+                    _previous = null;
+                }
 
-            if (_props != null)
-            {
-                _props.Dispose();
-                _props = null;
-            }
+                if (_props != null)
+                {
+                    _props.Dispose();
+                    _props = null;
+                }
 
-            var animate = oldValue != StickersTab.None;
-            var visual = GetVisual(newValue, oldValue, animate, Window.Current.Compositor, out var source, out _props);
+                var animate = oldValue != StickersTab.None;
+                var visual = GetVisual(newValue, oldValue, animate, Window.Current.Compositor, out var source, out _props);
 
-            _source = source;
-            _previous = visual;
+                _source = source;
+                _previous = visual;
 
-            if (Foreground is SolidColorBrush brush)
+                if (Foreground is SolidColorBrush brush)
+                {
+                    source.SetColorProperty("Color_000000", brush.Color);
+                }
+
+                ElementCompositionPreview.SetElementChildVisual(Icon, visual?.RootVisual);
+            }
+            else
             {
-                source.SetColorProperty("Color_000000", brush.Color);
+                OnGlyphChanged(newValue switch
+                {
+                    StickersTab.Emoji => Icons.Emoji24,
+                    StickersTab.Stickers => Icons.Sticker24,
+                    StickersTab.Animations => Icons.Gif24,
+                    _ => null
+                });
             }
-
-            ElementCompositionPreview.SetElementChildVisual(Icon, visual?.RootVisual);
         }
 
         private IAnimatedVisual GetVisual(StickersTab newValue, StickersTab oldValue, bool animate, Compositor compositor, out IAnimatedVisualSource2 source, out CompositionPropertySet properties)

Unigram/Unigram/Converters/ReplyInfoToGlyphConverter.cs

@@ -104,7 +104,9 @@ public class Icons
         public const string Image = "\uEB9F";
 
         public const string Sticker = "\uF4AA";
+        public const string Sticker24 = "\uE9E2";
         public const string Gif = "\uF4A9";
+        public const string Gif24 = "\uE9E1";
 
         public const string Reactions = "\uE980";
         public const string Mention16 = "\uE986";
@@ -187,6 +189,7 @@ public class Icons
         public const string FolderMove = "\uE92B";
         public const string FolderAdd = "\uE929";
         public const string Emoji = "\uE76E";
+        public const string Emoji24 = "\uE9E3";
         public const string ChevronUp = "\uE0E4";
         public const string ChevronDown = "\uE0E5";
         public const string ChevronRight = "\uE0E3";

Unigram/Unigram/Themes/Generic.xaml

@@ -3905,7 +3905,7 @@
         <Setter Property="FontFamily"
                 Value="{StaticResource SymbolThemeFontFamily}" />
         <Setter Property="FontSize"
-                Value="{StaticResource GlyphMediumFontSize}" />
+                Value="{StaticResource GlyphLargeFontSize}" />
         <Setter Property="FontWeight"
                 Value="Normal" />
         <Setter Property="Height"
@@ -4007,6 +4007,17 @@
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                         <Grid x:Name="RootGrid">
+                            <TextBlock x:Name="ContentPresenter1"
+                                       Margin="{TemplateBinding Padding}"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       AutomationProperties.AccessibilityView="Raw" />
+                            <TextBlock x:Name="ContentPresenter2"
+                                       Margin="{TemplateBinding Padding}"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       AutomationProperties.AccessibilityView="Raw" />
+
                             <muxc:AnimatedIcon x:Name="Icon"
                                                Source="{TemplateBinding Source}"
                                                muxc:AnimatedIcon.State="Normal"
@@ -4507,6 +4518,17 @@
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                         <Grid x:Name="RootGrid">
+                            <TextBlock x:Name="ContentPresenter1"
+                                       Margin="{TemplateBinding Padding}"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       AutomationProperties.AccessibilityView="Raw" />
+                            <TextBlock x:Name="ContentPresenter2"
+                                       Margin="{TemplateBinding Padding}"
+                                       HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                       AutomationProperties.AccessibilityView="Raw" />
+
                             <Border x:Name="Icon"
                                     Width="24"
                                     Height="24"

Unigram/Unigram/Views/ChatView.xaml

@@ -1249,6 +1249,8 @@
                                                            Command="{x:Bind ViewModel.ToggleSilentCommand}"
                                                            FontSize="{StaticResource GlyphLargeFontSize}"
                                                            VerticalAlignment="Bottom"
+                                                           Glyph=""
+                                                           CheckedGlyph=""
                                                            Grid.Column="1">
                             <controls:AnimatedIconToggleButton.Source>
                                 <icons:MuteUnmute />
@@ -1311,6 +1313,8 @@
                           Canvas.ZIndex="1000">
                         <chats:ChatRecordButton x:Name="btnVoiceMessage"
                                                 AllowFocusOnInteraction="False"
+                                                Glyph="&#xE9E4;"
+                                                CheckedGlyph="&#xE9E0;"
                                                 RecordingStarted="VoiceButton_RecordingStarted"
                                                 RecordingStopped="VoiceButton_RecordingStopped"
                                                 RecordingLocked="VoiceButton_RecordingLocked"