Merge pull request #63 from unoplatform/dev/xygu/20201116/treasure-hu…

…nt-teardown chore: removed treasure hunt
unoplatform · Nov 16, 2020 · 9fbf149 · 9fbf149
2 parents 8248ec0 + 3f90479
commit 9fbf149
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 94 deletions.
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Assets/DotnetBot.png b/Uno.Gallery/Uno.Gallery.Shared/Assets/DotnetBot.png
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Converters/SecretConverter.cs b/Uno.Gallery/Uno.Gallery.Shared/Converters/SecretConverter.cs
diff --git a/Uno.Gallery/Uno.Gallery.Shared/Uno.Gallery.Shared.projitems b/Uno.Gallery/Uno.Gallery.Shared/Uno.Gallery.Shared.projitems
@@ -35,7 +35,6 @@
     <Content Include="$(MSBuildThisFileDirectory)Assets\Avatar.scale-300.png" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\Avatar.scale-400.png" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\BackButton.png" />
-    <Content Include="$(MSBuildThisFileDirectory)Assets\DotnetBot.png" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\FluentIcon_Medium.scale-100.png" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\FluentIcon_Medium.scale-150.png" />
     <Content Include="$(MSBuildThisFileDirectory)Assets\FluentIcon_Medium.scale-200.png" />
@@ -125,7 +124,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ThreeColorPaletteView.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converters\FromColorBrushToHexConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Converters\RandomColorConverter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Converters\SecretConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Domain\AnalyticsService.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Entities\Data\DividerItem.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Entities\Data\Record.cs" />

diff --git a/Uno.Gallery/Uno.Gallery.UWP/Views/Converters.xaml b/Uno.Gallery/Uno.Gallery.UWP/Views/Converters.xaml
@@ -33,6 +33,4 @@
 									 Provider="HashCode" />
 
 	<converters:DebugConverter x:Key="debug" />
-
-	<converters:SecretConverter x:Key="Secret" />
 </ResourceDictionary>
diff --git a/Uno.Gallery/Uno.Gallery.UWP/Views/SamplePages/ToggleSwitchSamplePage.xaml b/Uno.Gallery/Uno.Gallery.UWP/Views/SamplePages/ToggleSwitchSamplePage.xaml
@@ -15,57 +15,17 @@
 					<smtx:XamlDisplay UniqueKey="ToggleSwitchSamplePage_Fluent"
 									  smtx:XamlDisplayExtensions.Header="Default"
 									  smtx:XamlDisplayExtensions.IgnorePath="XamlDisplay\StackPanel\StackPanel">
-						<StackPanel>
-							<Grid Visibility="{Binding ElementName=HiddenLevel, Path=IsOn}"
-								  Margin="0,0,0,20">
-								<Grid.RowDefinitions>
-									<RowDefinition Height="Auto" />
-									<RowDefinition Height="Auto" />
-								</Grid.RowDefinitions>
-
-								<Border Grid.Row="0"
-										Background="#E2068C"
-										CornerRadius="15"
-										Margin="70,0,0,0"
-										Padding="10"
-										HorizontalAlignment="Left"
-										VerticalAlignment="Top">
-									<TextBlock TextWrapping="WrapWholeWords"
-											   FontSize="20"
-											   Foreground="White">
-										<Run Text="Congrats, you've uncovered the passcode for DotNetConf Treasure Hunt." />
-										<LineBreak /><Run Text="Please provide" />
-										<Span xml:space="preserve"><Run Text="&quot;" /><Run FontWeight="Bold"
-												 Text="{Binding ElementName=HiddenLevel, Path=IsOn, Converter={StaticResource Secret}}" /><Run Text="&quot;" /></Span>
-										<Run Text="passcode to Twitch bot." />
-									</TextBlock>
-								</Border>
-								<Polygon Grid.Row="1"
-										 Points="20,0 15,15, 16,16 18,16 19,15 40,0"
-										 Fill="#E2068C"
-										 Margin="65,0,0,70"
-										 VerticalAlignment="Top" />
-
-								<Image Grid.Row="0"
-									   Grid.RowSpan="2"
-									   Source="ms-appx:///Assets/DotnetBot.png"
-									   Width="100"
-									   HorizontalAlignment="Left"
-									   VerticalAlignment="Bottom" />
-							</Grid>
-							<StackPanel Spacing="20">
-								<ToggleSwitch x:Name="HiddenLevel"
-											  Header="OFF"
-											  Foreground="{StaticResource MaterialOnBackgroundBrush}" />
-								<ToggleSwitch Header="ON"
-											  Foreground="{StaticResource MaterialOnBackgroundBrush}"
-											  IsOn="True" />
-								<ToggleSwitch Header="DISABLED OFF"
-											  IsEnabled="False" />
-								<ToggleSwitch Header="DISABLED ON"
-											  IsEnabled="False"
-											  IsOn="True" />
-							</StackPanel>
+						<StackPanel Spacing="20">
+							<ToggleSwitch Header="OFF"
+										  Foreground="{StaticResource MaterialOnBackgroundBrush}" />
+							<ToggleSwitch Header="ON"
+										  Foreground="{StaticResource MaterialOnBackgroundBrush}"
+										  IsOn="True" />
+							<ToggleSwitch Header="DISABLED OFF"
+										  IsEnabled="False" />
+							<ToggleSwitch Header="DISABLED ON"
+										  IsEnabled="False"
+										  IsOn="True" />
 						</StackPanel>
 					</smtx:XamlDisplay>
 				</DataTemplate>