Merge branch 'CommunityToolkit:main' into marquee

Author: Avid29

CommunityToolkit.Labs.Shared/Renderers/ToolkitSampleRenderer.xaml

@@ -7,6 +7,7 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
       xmlns:renderer="using:CommunityToolkit.Labs.Shared.Renderers"
+      xmlns:wasm="http://uno.ui/wasm"
       xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       Loaded="ToolkitSampleRenderer_Loaded"
       mc:Ignorable="d">
@@ -104,6 +105,7 @@
                                 DefaultLabelPosition="Collapsed"
                                 OverflowButtonVisibility="Collapsed">
 
+                        <!--  wasm:Visibility="Collapsed"  -->
                         <AppBarButton x:Name="ThemeBtn"
                                       Click="ThemeBtn_OnClick"
                                       Label="Toggle theme"
@@ -113,13 +115,16 @@
                             </AppBarButton.Icon>
                         </AppBarButton>
 
-                        <!--  TO DO: Implement FlowDirection  -->
-                        <!--<AppBarButton Label="Toggle right-to-left"
+                        <!--  wasm:Visibility="Collapsed"  -->
+                        <AppBarButton x:Name="FlowDirectionBtn"
+                                      Click="FlowDirectionBtn_OnClick"
+                                      Label="Toggle flow direction"
                                       ToolTipService.ToolTip="Toggle right-to-left">
+
                             <AppBarButton.Icon>
                                 <FontIcon Glyph="&#xE1A0;" />
                             </AppBarButton.Icon>
-                        </AppBarButton>-->
+                        </AppBarButton>
                         <AppBarSeparator x:Name="SeperatorLine" />
                         <AppBarButton x:Name="CodeBtn"
                                       Click="CodeBtn_OnClick"
@@ -143,7 +148,8 @@
                 <ContentControl x:Name="PageControl"
                                 Grid.Row="1"
                                 Padding="24"
-                                HorizontalAlignment="Left"
+                                HorizontalAlignment="Stretch"
+                                HorizontalContentAlignment="Stretch"
                                 Content="{x:Bind SampleControlInstance, Mode=OneWay}" />
 
 

CommunityToolkit.Labs.Shared/Renderers/ToolkitSampleRenderer.xaml.cs

@@ -277,6 +277,20 @@ private void ThemeBtn_OnClick(object sender, RoutedEventArgs e)
         }
     }
 
+    private void FlowDirectionBtn_OnClick(object sender, RoutedEventArgs e)
+    {
+#if !HAS_UNO
+        if (PageControl.FlowDirection == FlowDirection.LeftToRight)
+        {
+            PageControl.FlowDirection = FlowDirection.RightToLeft;
+        }
+        else
+        {
+            PageControl.FlowDirection = FlowDirection.LeftToRight;
+        }
+#endif
+    }
+
     private void CodeBtn_OnClick(object sender, RoutedEventArgs e)
     {
         SourcecodeExpander.IsExpanded = !SourcecodeExpander.IsExpanded;

Labs.MultiTarget.props

@@ -53,4 +53,14 @@
     <EmbeddedResource Remove="obj\bin\**" />
     <UpToDateCheckInput Remove="obj\bin\**" />
   </ItemGroup>
+
+  <!-- Workaround for Mac: https://developercommunity.visualstudio.com/t/XamarinMac-binaries-are-missing-in-173/10164443#T-N10164676 10/6/22 -->
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('xamarinmac')) ">
+    <Reference Include="Xamarin.Mac">
+      <HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
+      <HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Professional\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
+      <HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
+      <HintPath Condition="Exists('c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio')">c:\Program Files\Microsoft Visual Studio\2022\Preview\Common7\IDE\Extensions\Xamarin.VisualStudio\Xamarin.Mac.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 </Project>