Merged controls

Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj

@@ -206,9 +206,13 @@
     <Content Include="SamplePages\Bing Service\BingCode.bind" />
     <Content Include="SamplePages\Bing Service\icon.png" />
     <Content Include="SamplePages\BlurBehavior\blurBehavior.gif" />
+    <Content Include="SamplePages\OffsetBehavior\offsetBehavior.gif" />
+    <Content Include="SamplePages\OpacityBehavior\opacityBehavior.gif" />
     <Content Include="SamplePages\ParallaxBehavior\ParallaxBackground.png" />
+    <Content Include="SamplePages\RotationBehavior\rotationBehavior.gif" />
     <Content Include="SamplePages\RotatorTile\icon.png" />
     <Content Include="SamplePages\LiveTile\icon.jpg" />
+    <Content Include="SamplePages\ScaleBehavior\scaleBehavior.gif" />
     <Content Include="SamplePages\Toast\icon.jpg" />
     <Content Include="SamplePages\Twitter Service\TwitterCode.bind" />
     <Content Include="SamplePages\Twitter Service\icon.png" />
@@ -222,9 +226,7 @@
     <Content Include="SamplePages\WeatherLiveTileAndToast\icon.jpg" />
     <Content Include="SamplePages\WeatherLiveTileAndToast\WeatherLiveTileAndToastCode.bind" />
     <Content Include="SamplePages\ImageEx\ImageExCode.bind" />
-    <Content Include="SamplePages\OffsetBehavior\offsetBehavior.gif" />
     <Content Include="SamplePages\OffsetBehavior\OffsetBehaviorCode.bind" />
-    <Content Include="SamplePages\OpacityBehavior\opacityBehavior.gif" />
     <Content Include="SamplePages\OpacityBehavior\OpacityBehaviorCode.bind" />
     <Content Include="SamplePages\PullToRefreshListView\icon.PNG" />
     <Content Include="SamplePages\PullToRefreshListView\PullToRefreshListViewCode.bind" />
@@ -232,9 +234,7 @@
     <Content Include="SamplePages\RadialGauge\RadialGaugeCode.bind" />
     <Content Include="SamplePages\RangeSelector\icon.jpg" />
     <Content Include="SamplePages\ResponsiveGridView\icon.jpg" />
-    <Content Include="SamplePages\RotationBehavior\rotationBehavior.gif" />
     <Content Include="SamplePages\RotationBehavior\RotationBehaviorCode.bind" />
-    <Content Include="SamplePages\ScaleBehavior\scaleBehavior.gif" />
     <Content Include="SamplePages\ScaleBehavior\ScaleBehaviorCode.bind" />
     <Content Include="SamplePages\SlidableListItem\icon.png" />
     <Content Include="SamplePages\SlidableListItem\SlidableListItemCode.bind" />

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/OffsetBehavior/OffsetBehaviorCode.bind

@@ -1,5 +1,5 @@
-// Animate the rectangle offset
-MyRectangle.Offset(
+// Animate the toolkit logo
+ToolkitLogo.Offset(
                 duration: Duration,
                 delay: Delay,
                 offsetX: (float)OffsetX,

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/OffsetBehavior/OffsetBehaviorPage.xaml

@@ -11,7 +11,7 @@
     mc:Ignorable="d">
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Rectangle x:Name="MyRectangle" Fill="red" Height="100" Width="100" >
+        <Image x:Name="ToolkitLogo" Source="ms-appx:///Assets/Square150x150Logo.png" Height="100" Width="100" >
             <interactivity:Interaction.Behaviors>
                 <behaviors:Offset x:Name="Offset" 
                                   OffsetX="{Binding OffsetX.Value, Mode=TwoWay}" 
@@ -21,7 +21,7 @@
                                   Delay="{Binding Delay.Value, Mode=TwoWay}" 
                                   AutomaticallyStart="{Binding AutomaticallyStart.Value, Mode=TwoWay}"/>
             </interactivity:Interaction.Behaviors>
-        </Rectangle>
+        </Image>
         <StackPanel HorizontalAlignment="Right" VerticalAlignment="Bottom">
             <Button Content="Apply" Margin="10">
                 <interactivity:Interaction.Behaviors>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/OpacityBehavior/OpacityBehaviorCode.bind

@@ -1,2 +1,2 @@
 // Animate opacity:
-MyRectangle.Opacity(Duration, Delay, (float)Value);
+ToolkitLogo.Opacity(Duration, Delay, (float)Value);

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/OpacityBehavior/OpacityBehaviorPage.xaml

@@ -9,7 +9,7 @@
     x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.OpacityBehaviorPage"
     mc:Ignorable="d">
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Rectangle x:Name="MyRectangle" Fill="red" Height="100" Width="100" >
+        <Image x:Name="ToolkitLogo" Source="ms-appx:///Assets/Square150x150Logo.png" Height="100" Width="100" >
             <interactivity:Interaction.Behaviors>
                 <behaviors:Opacity x:Name="OpacityBehavior" 
                                    Value="{Binding Value.Value, Mode=TwoWay}" 
@@ -17,7 +17,7 @@
                                    Delay="{Binding Delay.Value, Mode=TwoWay}" 
                                    AutomaticallyStart="{Binding AutomaticallyStart.Value, Mode=TwoWay}"/>
             </interactivity:Interaction.Behaviors>
-        </Rectangle>
+        </Image>
         <StackPanel HorizontalAlignment="Right" VerticalAlignment="Bottom">
             <Button Content="Apply" Margin="10">
                 <interactivity:Interaction.Behaviors>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RotationBehavior/RotationBehaviorCode.bind

@@ -1,5 +1,5 @@
 // Animate rotation:
-MyRectangle.Rotate(
+ToolkitLogo.Rotate(
                 duration: Duration,
                 delay: Delay,
                 value: (float)Value,

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/RotationBehavior/RotationBehaviorPage.xaml

@@ -10,7 +10,7 @@
     mc:Ignorable="d">
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Rectangle x:Name="MyRectangle" Fill="red" Height="100" Width="100" >
+        <Image x:Name="ToolkitLogo" Source="ms-appx:///Assets/Square150x150Logo.png" Height="100" Width="100" >
             <interactivity:Interaction.Behaviors>
                 <behaviors:Rotation x:Name="Rotation" 
                                     Value="{Binding Value.Value, Mode=TwoWay}" 
@@ -21,7 +21,7 @@
                                     Delay="{Binding Delay.Value, Mode=TwoWay}" 
                                     AutomaticallyStart="{Binding AutomaticallyStart.Value, Mode=TwoWay}"/>
             </interactivity:Interaction.Behaviors>
-        </Rectangle>
+        </Image>
         <StackPanel HorizontalAlignment="Right" VerticalAlignment="Bottom">
             <Button Content="Apply" Margin="10">
                 <interactivity:Interaction.Behaviors>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScaleBehavior/ScaleBehaviorCode.bind

@@ -1,5 +1,5 @@
 // Animate scaling:
-MyRectangle.Scale(
+ToolkitLogo.Scale(
                 duration: Duration,
                 delay: Delay,
                 centerX: (float)CenterX,

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScaleBehavior/ScaleBehaviorPage.xaml

@@ -10,7 +10,7 @@
     mc:Ignorable="d">
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Rectangle x:Name="MyRectangle" Fill="red" Height="100" Width="100" >
+        <Image x:Name="ToolkitLogo" Source="ms-appx:///Assets/Square150x150Logo.png" Height="100" Width="100" >
             <interactivity:Interaction.Behaviors>
                 <behaviors:Scale x:Name="Scale" 
                                  ScaleX="{Binding ScaleX.Value, Mode=TwoWay}" 
@@ -23,7 +23,7 @@
                                  Delay="{Binding Delay.Value, Mode=TwoWay}" 
                                  AutomaticallyStart="{Binding AutomaticallyStart.Value, Mode=TwoWay}"/>
             </interactivity:Interaction.Behaviors>
-        </Rectangle>
+        </Image>
         <StackPanel HorizontalAlignment="Right" VerticalAlignment="Bottom">
             <Button Content="Apply" Margin="10">
                 <interactivity:Interaction.Behaviors>