Improve samples

Kinnara · Mar 23, 2014 · d27c8f9 · d27c8f9
1 parent c382543
commit d27c8f9
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 26 deletions.
diff --git a/PhoneToolkitSample/Samples/ButtonsSample.xaml b/PhoneToolkitSample/Samples/ButtonsSample.xaml
@@ -13,7 +13,7 @@
     shell:SystemTray.IsVisible="True"
     Style="{StaticResource PageStyle}">
 
-    <toolkit:PivotEx Title="BUTTONS SAMPLE">
+    <toolkit:PivotEx Title="BUTTONS">
         <controls:PivotItem Header="image">
             <ListBox Margin="0,0,-12,0">
                 <ListBox.ItemContainerStyle>

diff --git a/PhoneToolkitSample/Samples/HubTileSample.xaml b/PhoneToolkitSample/Samples/HubTileSample.xaml
@@ -21,7 +21,7 @@
 
     <Grid x:Name="LayoutRoot" Background="Transparent">
 
-        <toolkit:PivotEx Title="HUBTILE SAMPLE" SelectionChanged="Pivot_SelectionChanged">
+        <toolkit:PivotEx Title="HUBTILE" SelectionChanged="Pivot_SelectionChanged">
 
             <!-- All images by Jeff Wilcox, used with permission -->
             <controls:PivotItem Header="food">

diff --git a/PhoneToolkitSample/Samples/PhoneTextBoxSample.xaml b/PhoneToolkitSample/Samples/PhoneTextBoxSample.xaml
@@ -20,7 +20,7 @@
     Style="{StaticResource PageStyle}">
 
     <toolkit:PageUI Header="phonetextbox" Style="{StaticResource ScrollablePageUIStyle}">
-        <Grid x:Name="ContentPanel" Margin="0,0,0,313">
+        <Grid x:Name="ContentPanel">
             <Grid.Children>
                 <StackPanel Orientation="Vertical">
                     <toolkit:PhoneTextBox PlaceholderText="First Name" />

diff --git a/PhoneToolkitSample/Samples/SlideInEffectSample.xaml b/PhoneToolkitSample/Samples/SlideInEffectSample.xaml
@@ -22,7 +22,7 @@
     <!--LayoutRoot-->
     <Grid x:Name="LayoutRoot" Background="Transparent">
         <!--Pivot Control-->
-        <toolkit:PivotEx Title="{StaticResource ApplicationTitle}">
+        <toolkit:PivotEx Title="SLIDEINEFFECT">
             <!--Pivot item one-->
             <controls:PivotItem Header="first">
                 <ListBox Margin="0,0,-12,0" ItemsSource="{Binding Items}">

diff --git a/PhoneToolkitSample/Samples/TiltEffectSample.xaml b/PhoneToolkitSample/Samples/TiltEffectSample.xaml
@@ -48,7 +48,7 @@
             <HyperlinkButton Content="Click for online documentation"
                              TargetName="_self"
                              HorizontalAlignment="Left"
-                             NavigateUri="http://msdn.microsoft.com/en-us/library/ff941094(VS.92).aspx"
+                             NavigateUri="http://msdn.microsoft.com/en-us/library/windowsphone/develop/ff941094(v=vs.105).aspx"
                              toolkit:TiltEffect.SuppressTilt="True"
                              CacheMode="BitmapCache"/>
 

diff --git a/PhoneToolkitSample/Samples/WrapPanelSample.xaml b/PhoneToolkitSample/Samples/WrapPanelSample.xaml
@@ -38,7 +38,7 @@
     </toolkit:TransitionService.NavigationOutTransition>
 
     <Grid x:Name="LayoutRoot">
-        <controls:Panorama Title="WrapPanel sample">
+        <controls:Panorama Title="wrappanel">
 
             <controls:PanoramaItem Header="home">
                 <StackPanel>

diff --git a/PhoneToolkitSample8/App.xaml b/PhoneToolkitSample8/App.xaml
@@ -44,6 +44,7 @@
                 <Setter.Value>
                     <DataTemplate>
                         <TextBlock Style="{StaticResource PhoneTextSubtleStyle}"
+                                   Foreground="{StaticResource PhoneTextMidContrastBrush}"
                                    Margin="23,-8,0,-5"
                                    Padding="0,13,0,0"
                                    Text="{Binding}"/>

diff --git a/PhoneToolkitSample8/Assets/AlignmentGrid.png b/PhoneToolkitSample8/Assets/AlignmentGrid.png
diff --git a/PhoneToolkitSample8/MainPage.xaml b/PhoneToolkitSample8/MainPage.xaml
@@ -10,25 +10,23 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
     shell:SystemTray.IsVisible="True"
-    Style="{StaticResource PageStyle}"
-    Margin="0,0,0,72">
+    SupportedOrientations="PortraitOrLandscape"
+    Style="{StaticResource PageStyle}">
 
     <toolkit:PageUI Header="samples">
         <Grid>
-            <phone:LongListSelector x:Name="lls" Margin="-12,0">
+            <phone:LongListSelector x:Name="lls" Margin="-12,0" SelectionChanged="lls_SelectionChanged">
                 <phone:LongListSelector.ListHeaderTemplate>
                     <DataTemplate>
                         <Rectangle Height="10"/>
                     </DataTemplate>
                 </phone:LongListSelector.ListHeaderTemplate>
                 <phone:LongListSelector.ItemTemplate>
                     <DataTemplate>
-                        <HyperlinkButton NavigateUri="{Binding Url}" Style="{StaticResource HyperlinkEmptyStyle}">
-                            <system:HeaderedContentControl
-                                Style="{StaticResource MultilineHyperlinkStyle}"
-                                Header="{Binding Header}"
-                                Content="{Binding Description}"/>
-                        </HyperlinkButton>
+                        <system:HeaderedContentControl
+                            Style="{StaticResource MultilineHyperlinkStyle}"
+                            Header="{Binding Header}"
+                            Content="{Binding Description}"/>
                     </DataTemplate>
                 </phone:LongListSelector.ItemTemplate>
                 <phone:LongListSelector.ListFooterTemplate>
@@ -41,10 +39,10 @@
     </toolkit:PageUI>
 
     <phone:PhoneApplicationPage.ApplicationBar>
-        <shell:ApplicationBar Opacity="0.999">
+        <shell:ApplicationBar>
             <shell:ApplicationBarIconButton 
                 IconUri="/Assets/ApplicationBar.settings.png" Text="Settings"
-                         IsEnabled="True" Click="ApplicationBarIconSettingsButton_Click"/>
+                IsEnabled="True" Click="ApplicationBarIconSettingsButton_Click"/>
         </shell:ApplicationBar>
     </phone:PhoneApplicationPage.ApplicationBar>
 </toolkit:BasePage>
diff --git a/PhoneToolkitSample8/MainPage.xaml.cs b/PhoneToolkitSample8/MainPage.xaml.cs
@@ -69,10 +69,20 @@ private void InitializeData()
             };
         }
 
+        private void lls_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            var item = lls.SelectedItem as SampleItem;
+            if (item != null)
+            {
+                lls.SelectedItem = null;
+                NavigationService.Navigate(new Uri(item.Url, UriKind.Relative));
+            }
+        }
+
         private void ApplicationBarIconSettingsButton_Click(object sender, EventArgs e)
         {
             NavigationService.Navigate(new Uri("/Settings.xaml", UriKind.RelativeOrAbsolute));
-        }   
+        }
     }
 
     public class SampleItem

diff --git a/PhoneToolkitSample8/PhoneToolkitSample.WP8.csproj b/PhoneToolkitSample8/PhoneToolkitSample.WP8.csproj
@@ -769,7 +769,6 @@ ar-SA;az-Latn-AZ;be-BY;bg-BG;ca-ES;cs-CZ;da-DK;de-DE;el-GR;en-GB;en-US;es-ES;es-
     <Content Include="..\PhoneToolkitSample\Toolkit.Content\ApplicationBar.Select.png">
       <Link>Toolkit.Content\ApplicationBar.Select.png</Link>
     </Content>
-    <Content Include="Assets\AlignmentGrid.png" />
     <Content Include="Assets\ApplicationIcon.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/PhoneToolkitSample8/Properties/WMAppManifest.xml b/PhoneToolkitSample8/Properties/WMAppManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Deployment xmlns="http://schemas.microsoft.com/windowsphone/2012/deployment" AppPlatformVersion="8.0">
   <DefaultLanguage xmlns="" code="en-US" />
-  <App xmlns="" ProductID="{4c1d7cd5-dfb5-444a-a501-fda7e470fbe7}" Title="Toolkit Sample 8" RuntimeType="Silverlight" Version="1.0.0.0" Genre="apps.normal" Author="PhoneToolkitSample8 author" Description="Sample description" Publisher="PhoneToolkitSample8" PublisherID="{da591e47-a61c-4a03-b06d-eafdb63e4a90}">
+  <App xmlns="" ProductID="{4c1d7cd5-dfb5-444a-a501-fda7e470fbe7}" Title="WPToolkit Sample 8" RuntimeType="Silverlight" Version="1.0.0.0" Genre="apps.normal" Author="PhoneToolkitSample8 author" Description="Sample description" Publisher="PhoneToolkitSample8" PublisherID="{da591e47-a61c-4a03-b06d-eafdb63e4a90}">
     <IconPath IsRelative="true" IsResource="false">Assets\ApplicationIcon.png</IconPath>
     <Capabilities>
       <Capability Name="ID_CAP_NETWORKING" />
@@ -23,11 +23,11 @@
           <SmallImageURI IsRelative="true" IsResource="false">Assets\Tiles\IconicTileSmall.png</SmallImageURI>
           <Count>0</Count>
           <IconImageURI IsRelative="true" IsResource="false">Assets\Tiles\IconicTileMediumLarge.png</IconImageURI>
-          <Title>Toolkit Sample 8</Title>
+          <Title>WPToolkit Sample 8</Title>
           <Message>
           </Message>
           <BackgroundColor>#68217A</BackgroundColor>
-          <HasLarge>True</HasLarge>
+          <HasLarge>False</HasLarge>
           <LargeContent1>
           </LargeContent1>
           <LargeContent2>

diff --git a/PhoneToolkitSample8/Samples/LabelSample.xaml b/PhoneToolkitSample8/Samples/LabelSample.xaml
@@ -27,7 +27,7 @@
         </ResourceDictionary>
     </toolkit:BasePage.Resources>
 
-    <phone:Pivot Title="LABEL SAMPLE">
+    <phone:Pivot Title="LABEL">
         <phone:PivotItem Header="features">
             <ScrollViewer Margin="-12,0">
                 <StackPanel Margin="12,10,12,95">

diff --git a/PhoneToolkitSample8/Samples/LongListMultiSelectorSample.xaml b/PhoneToolkitSample8/Samples/LongListMultiSelectorSample.xaml
@@ -145,7 +145,7 @@
 
     <Grid x:Name="LayoutRoot" Background="Transparent">
         <!--Pivot Control-->
-        <toolkit:PivotEx Title="LONGLISTMULTISELECTOR SAMPLE"
+        <toolkit:PivotEx Title="LONGLISTMULTISELECTOR"
                          x:Name="SamplePivot"
                          SelectionChanged="OnPivotSelectionChanged"
                          LoadingPivotItem="OnPivotLoadingPivotItem"

diff --git a/PhoneToolkitSample8/Samples/LongListSelectorSample.xaml b/PhoneToolkitSample8/Samples/LongListSelectorSample.xaml
@@ -100,7 +100,7 @@
     </phone:PhoneApplicationPage.Resources>
 
     <Grid x:Name="LayoutRoot" Background="Transparent">
-        <toolkit:PivotEx Title="LONGLISTSELECTOR SAMPLES"
+        <toolkit:PivotEx Title="LONGLISTSELECTOR"
                          TitlePanelStyle="{StaticResource TurnstileFeatherTitlePanelStyle}">
             <controls:PivotItem Header="buddies">
                 <phone:LongListSelector x:Name="buddies"

diff --git a/PhoneToolkitSample8/Samples/SpeechTextBoxSample.xaml b/PhoneToolkitSample8/Samples/SpeechTextBoxSample.xaml
@@ -13,7 +13,7 @@
     Style="{StaticResource PageStyle}">
 
     <toolkit:PageUI Header="speechtextbox" Style="{StaticResource ScrollablePageUIStyle}">
-        <Grid x:Name="ContentPanel" Margin="0,0,0,313">
+        <Grid x:Name="ContentPanel">
             <StackPanel Orientation="Vertical">
                 <TextBlock Text="Simple SpeechTextBox"
                            Foreground="{StaticResource PhoneSubtleBrush}"