Skip to content

Commit

Permalink
Improving Simple sample
Browse files Browse the repository at this point in the history
  • Loading branch information
Jerry Nixon committed Sep 14, 2018
1 parent a73b41b commit d0bdf49
Show file tree
Hide file tree
Showing 94 changed files with 47 additions and 41 deletions.
Expand Up @@ -148,10 +148,6 @@
<Project>{648c8631-c97f-4b81-98fc-f4370317751a}</Project>
<Name>Prism.Windows</Name>
</ProjectReference>
<ProjectReference Include="..\..\Source\SampleData\SampleData.csproj">
<Project>{b8442c8a-b688-48d2-8ba7-325a675cc611}</Project>
<Name>SampleData</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Models\" />
Expand Down
File renamed without changes.
24 changes: 24 additions & 0 deletions Samples/Sample.Prism.Windows.Simple/Controls/AppBarLiteral.cs
@@ -0,0 +1,24 @@
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Markup;

namespace Sample.Controls
{
[ContentProperty(Name = nameof(LiteralContent))]
public sealed class AppBarLiteral : AppBarSeparator
{
public AppBarLiteral()
{
DefaultStyleKey = typeof(AppBarLiteral);
}

public object LiteralContent
{
get { return (object)GetValue(LiteralContentProperty); }
set { SetValue(LiteralContentProperty, value); }
}
public static readonly DependencyProperty LiteralContentProperty =
DependencyProperty.Register(nameof(LiteralContent), typeof(object),
typeof(AppBarLiteral), new PropertyMetadata(null));
}
}
Expand Up @@ -142,11 +142,11 @@
<Folder Include="Services\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Prism.Unity.Windows\Prism.Unity.Windows.csproj">
<ProjectReference Include="..\..\Source\Prism.Unity.Windows\Prism.Unity.Windows.csproj">
<Project>{cc3018eb-6d2b-4306-94a1-3a7cba7a8f18}</Project>
<Name>Prism.Unity.Windows</Name>
</ProjectReference>
<ProjectReference Include="..\Prism.Windows\Prism.Windows.csproj">
<ProjectReference Include="..\..\Source\Prism.Windows\Prism.Windows.csproj">
<Project>{648c8631-c97f-4b81-98fc-f4370317751a}</Project>
<Name>Prism.Windows</Name>
</ProjectReference>
Expand Down
Expand Up @@ -5,8 +5,8 @@
<Style TargetType="local:AppBarLiteral">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate>
<ContentPresenter Content="{TemplateBinding Tag}" />
<ControlTemplate TargetType="local:AppBarLiteral">
<ContentPresenter Content="{TemplateBinding LiteralContent}" />
</ControlTemplate>
</Setter.Value>
</Setter>
Expand Down
Expand Up @@ -26,9 +26,7 @@
<TextBlock Text="Star Trek" VerticalAlignment="Center" Margin="16,8,0,0" Style="{StaticResource TitleTextBlockStyle}" />
</CommandBar.Content>
<controls:AppBarLiteral>
<controls:AppBarLiteral.Tag>
<AutoSuggestBox QueryIcon="Find" PlaceholderText="Search" Text="{x:Bind ViewModel.SearchString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="250" Margin="0,8,4,0" />
</controls:AppBarLiteral.Tag>
<AutoSuggestBox QueryIcon="Find" PlaceholderText="Search" Text="{x:Bind ViewModel.SearchString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="250" Margin="0,8,4,0" />
</controls:AppBarLiteral>
<AppBarButton Label="Info" Icon="World" />
</CommandBar>
Expand Down
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 0 additions & 12 deletions Source/Sample.Prism.Windows.Simple/Controls/AppBarLiteral.cs

This file was deleted.

36 changes: 18 additions & 18 deletions Template 10.sln
Expand Up @@ -15,9 +15,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Prism.Windows.Templa
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Prism.Windows.Blank", "Samples\Sample.Prism.Windows.Blank\Sample.Prism.Windows.Blank.csproj", "{BAA0FB40-0650-4D90-97F7-0F3CE89AA079}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleData", "Source\SampleData\SampleData.csproj", "{B8442C8A-B688-48D2-8BA7-325A675CC611}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Prism.Windows.Simple", "Samples\Sample.Prism.Windows.Simple\Sample.Prism.Windows.Simple.csproj", "{31F58AE8-CEED-4C10-9566-38CDAE9DA082}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Prism.Windows.Simple", "Source\Sample.Prism.Windows.Simple\Sample.Prism.Windows.Simple.csproj", "{31F58AE8-CEED-4C10-9566-38CDAE9DA082}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleData", "Samples\SampleData\SampleData.csproj", "{B8442C8A-B688-48D2-8BA7-325A675CC611}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -135,22 +135,6 @@ Global
{BAA0FB40-0650-4D90-97F7-0F3CE89AA079}.Release|x86.ActiveCfg = Release|x86
{BAA0FB40-0650-4D90-97F7-0F3CE89AA079}.Release|x86.Build.0 = Release|x86
{BAA0FB40-0650-4D90-97F7-0F3CE89AA079}.Release|x86.Deploy.0 = Release|x86
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Debug|ARM.ActiveCfg = Debug|ARM
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Debug|ARM.Build.0 = Debug|ARM
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Debug|x64.ActiveCfg = Debug|x64
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Debug|x64.Build.0 = Debug|x64
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Debug|x86.ActiveCfg = Debug|x86
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Debug|x86.Build.0 = Debug|x86
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Release|Any CPU.Build.0 = Release|Any CPU
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Release|ARM.ActiveCfg = Release|ARM
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Release|ARM.Build.0 = Release|ARM
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Release|x64.ActiveCfg = Release|x64
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Release|x64.Build.0 = Release|x64
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Release|x86.ActiveCfg = Release|x86
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Release|x86.Build.0 = Release|x86
{31F58AE8-CEED-4C10-9566-38CDAE9DA082}.Debug|Any CPU.ActiveCfg = Debug|x86
{31F58AE8-CEED-4C10-9566-38CDAE9DA082}.Debug|ARM.ActiveCfg = Debug|ARM
{31F58AE8-CEED-4C10-9566-38CDAE9DA082}.Debug|ARM.Build.0 = Debug|ARM
Expand All @@ -171,6 +155,22 @@ Global
{31F58AE8-CEED-4C10-9566-38CDAE9DA082}.Release|x86.ActiveCfg = Release|x86
{31F58AE8-CEED-4C10-9566-38CDAE9DA082}.Release|x86.Build.0 = Release|x86
{31F58AE8-CEED-4C10-9566-38CDAE9DA082}.Release|x86.Deploy.0 = Release|x86
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Debug|ARM.ActiveCfg = Debug|ARM
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Debug|ARM.Build.0 = Debug|ARM
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Debug|x64.ActiveCfg = Debug|x64
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Debug|x64.Build.0 = Debug|x64
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Debug|x86.ActiveCfg = Debug|x86
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Debug|x86.Build.0 = Debug|x86
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Release|Any CPU.Build.0 = Release|Any CPU
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Release|ARM.ActiveCfg = Release|ARM
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Release|ARM.Build.0 = Release|ARM
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Release|x64.ActiveCfg = Release|x64
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Release|x64.Build.0 = Release|x64
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Release|x86.ActiveCfg = Release|x86
{B8442C8A-B688-48D2-8BA7-325A675CC611}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down

0 comments on commit d0bdf49

Please sign in to comment.