Merged PR 2242036: Update SG name

microsoft · Aug 20, 2018 · dfce35e · dfce35e
2 parents 8c8bbdd + d7f5fa8
commit dfce35e
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 14 deletions.
diff --git a/SampleGallery/Assets/StoreAssets/AppIcon.png b/SampleGallery/Assets/StoreAssets/AppIcon.png
diff --git a/SampleGallery/Assets/StoreAssets/SplashScreen.png b/SampleGallery/Assets/StoreAssets/SplashScreen.png
diff --git a/SampleGallery/Assets/StoreAssets/Square150.png b/SampleGallery/Assets/StoreAssets/Square150.png
diff --git a/...eGallery/Assets/StoreAssets/StoreLogo.png → ...ssets/StoreAssets/StoreLogo.scale-100.png b/...eGallery/Assets/StoreAssets/StoreLogo.png → ...ssets/StoreAssets/StoreLogo.scale-100.png
diff --git a/SampleGallery/Assets/StoreAssets/Wide.png b/SampleGallery/Assets/StoreAssets/Wide.png
diff --git a/SampleGallery/MainPage.xaml b/SampleGallery/MainPage.xaml
@@ -24,7 +24,7 @@
         </Grid.RowDefinitions>
 
         <Grid x:Name="TitleBarGrid" Grid.Row="0">
-            <TextBlock Style="{ThemeResource CaptionTextBlockStyle}" Padding="59,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left">Windows UI Sample Gallery</TextBlock>
+            <TextBlock Style="{ThemeResource CaptionTextBlockStyle}" Padding="59,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left">Windows Composition Samples</TextBlock>
         </Grid>
         <Grid Grid.Row="1" >
             <local:SampleGalleryUIIndirector

diff --git a/SampleGallery/Package.appxmanifest b/SampleGallery/Package.appxmanifest
@@ -15,7 +15,7 @@
   </Resources>
   <Applications>
     <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="CompositionSampleGallery.App">
-      <uap:VisualElements DisplayName="Windows UI Dev Labs Sample Gallery" Square150x150Logo="Assets\StoreAssets\Square150.png" Square44x44Logo="Assets\StoreAssets\AppIcon.png" Description="Sample gallery for the Windows.UI.Composition namespace." BackgroundColor="transparent">
+      <uap:VisualElements DisplayName="Windows Composition Samples" Square150x150Logo="Assets\StoreAssets\Square150.png" Square44x44Logo="Assets\StoreAssets\AppIcon.png" Description="Sample gallery for the Windows.UI.Composition namespace." BackgroundColor="transparent">
         <uap:DefaultTile Wide310x150Logo="Assets\StoreAssets\Wide.png">
           <uap:ShowNameOnTiles>
             <uap:ShowOn Tile="square150x150Logo" />

diff --git a/SampleGallery/Pages/HomePage.xaml b/SampleGallery/Pages/HomePage.xaml
@@ -52,10 +52,10 @@
                 </Paragraph>
                 <Paragraph Margin="15">
                     All of the samples shown here are available on Microsoft's
-                    <Hyperlink NavigateUri="http://aka.ms/windowsui">Windows UI Dev Labs</Hyperlink> repo on GitHub.
+                    <Hyperlink NavigateUri="http://aka.ms/windowsui">Windows Composition Samples</Hyperlink> repo on GitHub.
                 </Paragraph>
                 <Paragraph Margin="15">
-                    Want to preview and experiment with the very latest pre-release samples demonstrating visual effects, animations and interactions?  Become a Windows Insider and rebuild the Windows UI Dev Labs project against the latest Insider SDK and OS build to get samples that are otherwise hidden on major OS release builds.
+                    Want to preview and experiment with the very latest pre-release samples demonstrating visual effects, animations and interactions?  Become a Windows Insider and rebuild the Windows Composition Samples project against the latest Insider SDK and OS build to get samples that are otherwise hidden on major OS release builds.
                 </Paragraph>
             </RichTextBlock>
 

diff --git a/SampleGallery/SampleGallery.csproj b/SampleGallery/SampleGallery.csproj
@@ -388,25 +388,22 @@
     <Content Include="Assets\SampleThumbnails\VideoPlayground.PNG" />
     <Content Include="Assets\SampleThumbnails\ZoomWithPerspective.PNG" />
     <Content Include="Assets\SampleThumbnails\Z-OrderScrolling.PNG" />
-    <Content Include="Assets\StoreAssets\AppIcon.png" />
     <Content Include="Assets\StoreAssets\AppIcon.scale-150.png" />
     <Content Include="Assets\StoreAssets\AppIcon.scale-200.png" />
     <Content Include="Assets\StoreAssets\AppIcon.scale-300.png" />
     <Content Include="Assets\StoreAssets\AppIcon.scale-400.png" />
-    <Content Include="Assets\StoreAssets\SplashScreen.png" />
     <Content Include="Assets\StoreAssets\SplashScreen.scale-150.png" />
     <Content Include="Assets\StoreAssets\SplashScreen.scale-200.png" />
     <Content Include="Assets\StoreAssets\SplashScreen.scale-300.png" />
     <Content Include="Assets\StoreAssets\SplashScreen.scale-400.png" />
-    <Content Include="Assets\StoreAssets\Square150.png" />
     <Content Include="Assets\StoreAssets\Square150.scale-150.png" />
     <Content Include="Assets\StoreAssets\Square150.scale-200.png" />
     <Content Include="Assets\StoreAssets\Square150.scale-300.png" />
     <Content Include="Assets\StoreAssets\Square150.scale-400.png" />
+    <Content Include="Assets\StoreAssets\StoreLogo.scale-100.png" />
     <Content Include="Assets\StoreAssets\StoreLogo.scale-200.png" />
     <Content Include="Assets\StoreAssets\StoreLogo.scale-300.png" />
     <Content Include="Assets\StoreAssets\StoreLogo.scale-400.png" />
-    <Content Include="Assets\StoreAssets\Wide.png" />
     <Content Include="Assets\StoreAssets\Wide.scale-150.png" />
     <Content Include="Assets\StoreAssets\Wide.scale-200.png" />
     <Content Include="Assets\StoreAssets\Wide.scale-300.png" />
@@ -426,7 +423,6 @@
     <Content Include="Assets\NormalMapsAndMasks\conemap.jpg" />
     <Content Include="Assets\NormalMapsAndMasks\pointmap.jpg" />
     <Content Include="Properties\Default.rd.xml" />
-    <Content Include="Assets\StoreAssets\StoreLogo.png" />
     <Content Include="Assets\Other\BlueBall.png" />
     <Content Include="Assets\Other\RedBall.png" />
     <Content Include="Assets\NormalMapsAndMasks\SphericalWithMask.png" />

diff --git a/SampleGallery/Settings.xaml b/SampleGallery/Settings.xaml
@@ -26,10 +26,10 @@
 
                 <RichTextBlock MaxWidth="840" Margin="0,10,0,0" IsTextSelectionEnabled="True">
                     <Paragraph>
-                        This app showcases core platform building blocks which power Fluent design and can be used to create more delightful, engaging experiences. The source code to this app is available on
-                        <Hyperlink NavigateUri="https://github.com/Microsoft/WindowsUIDevLabs">
-                            https://github.com/Microsoft/WindowsUIDevLabs
-                        </Hyperlink>.
+                        This app showcases core platform building blocks which power Fluent design and can be used to create more delightful, engaging experiences. The source code to this app is available on the
+                        <Hyperlink NavigateUri="http://aka.ms/windowsui">
+                            Windows Composition Samples
+                        </Hyperlink> repo on GitHub.
                     </Paragraph>
                 </RichTextBlock>
 

diff --git a/SampleGallery/Shared/Social.xaml.cs b/SampleGallery/Shared/Social.xaml.cs
@@ -30,6 +30,6 @@ public Social()
 
         private async void TwitterPanel_Tapped(object sender, TappedRoutedEventArgs e){ await Launcher.LaunchUriAsync(new Uri("https://twitter.com/WindowsUI")); }
 
-        private async void GitHubPanel_Tapped(object sender, TappedRoutedEventArgs e){ await Launcher.LaunchUriAsync(new Uri("https://github.com/Microsoft/WindowsUIDevLabs")); }
+        private async void GitHubPanel_Tapped(object sender, TappedRoutedEventArgs e){ await Launcher.LaunchUriAsync(new Uri("http://aka.ms/windowsui")); }
     }
 }