Skip to content

Commit

Permalink
No commit message
Browse files Browse the repository at this point in the history
  • Loading branch information
hauerCodes committed Dec 16, 2014
1 parent 03cb0e1 commit e4eb2f1
Show file tree
Hide file tree
Showing 13 changed files with 282 additions and 114 deletions.
2 changes: 1 addition & 1 deletion NumberRecognizer/NumberRecognizer.App/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ResourceDictionary Source="Style/AppStyle.xaml"/>
</ResourceDictionary.MergedDictionaries>
<!-- Application-specific resources -->
<x:String x:Key="AppName">Number Recognizer</x:String>
<x:String x:Key="AppName">NumberRecognizer</x:String>
</ResourceDictionary>
</Application.Resources>
</Application>
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,9 @@
<Compile Include="Help\ImageHelperRT.cs">
<ExcludeFromStyleCop>False</ExcludeFromStyleCop>
</Compile>
<Compile Include="View\NetworkRecognizePage.xaml.cs">
<DependentUpon>NetworkRecognizePage.xaml</DependentUpon>
</Compile>
<Compile Include="View\NetworkDetailPage.xaml.cs">
<DependentUpon>NetworkDetailPage.xaml</DependentUpon>
</Compile>
Expand Down Expand Up @@ -225,6 +228,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\NetworkRecognizePage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\NetworkDetailPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
Expand Down
10 changes: 10 additions & 0 deletions NumberRecognizer/NumberRecognizer.App/Style/AppStyle.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,16 @@
<Setter Property="VerticalAlignment" Value="Bottom" />
<Setter Property="Margin" Value="0,0,30,40" />
</Style>
<Style x:Key="CustomSecondaryHeaderTextBlockStyle" BasedOn="{StaticResource BaseTextBlockStyle}" TargetType="TextBlock">
<Setter Property="FontSize" Value="56"/>
<Setter Property="FontWeight" Value="Light"/>
<Setter Property="LineHeight" Value="40"/>
<Setter Property="Foreground" Value="OrangeRed" />
<Setter Property="IsHitTestVisible" Value="false" />
<Setter Property="TextWrapping" Value="NoWrap" />
<Setter Property="VerticalAlignment" Value="Bottom" />
<Setter Property="Margin" Value="0,0,30,40" />
</Style>
<Style x:Key="CustomTextBlockStyle" BasedOn="{StaticResource BaseTextBlockStyle}" TargetType="TextBlock">
<Setter Property="FontSize" Value="26.667"/>
<Setter Property="FontWeight" Value="Light"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<StackPanel Orientation="Horizontal" Grid.Column="1">
<TextBlock x:Name="pageTitle" Text="{StaticResource AppName}" Style="{StaticResource CustomHeaderTextBlockStyle}"
IsHitTestVisible="false" TextWrapping="NoWrap" VerticalAlignment="Bottom" Margin="0,0,30,40"/>
<TextBlock x:Name="pageSubtitle" Text="- Training Images" Style="{StaticResource CustomHeaderTextBlockStyle}"
<TextBlock x:Name="pageSubtitle" Text="- Training Images" Style="{StaticResource CustomSecondaryHeaderTextBlockStyle}"
IsHitTestVisible="false" TextWrapping="NoWrap" VerticalAlignment="Bottom" Margin="0,0,30,40"/>
</StackPanel>
<Button Grid.Column="2" Command="{Binding NextCommand}" Margin="39,59,39,0" Style="{StaticResource NavigationBackButtonNormalStyle}" RenderTransformOrigin="0.5,0.5">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,21 @@
</Page.DataContext>
<Page.BottomAppBar>
<AppBar Background="Orange" IsSticky="{Binding IsNetworkSelected, Mode=OneWay}" IsOpen="{Binding IsNetworkSelected, Mode=OneWay}">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
<AppBarButton Label="Create new Network" Icon="Add" Command="{Binding CreateNetworkCommand}"/>
<AppBarButton Label="Delete selected Network" Icon="Delete" Command="{Binding DeleteNetworkCommand}"/>
<AppBarSeparator/>
<AppBarButton Icon="Sync" Label="Refresh" Command="{Binding RefreshCommand}"/>
</StackPanel>
<Grid HorizontalAlignment="Stretch">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Grid.Column="0" HorizontalAlignment="Left">
<AppBarButton Label="Network Details" Icon="More" Command="{Binding NetworkDetails}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Right">
<AppBarButton Label="Create new Network" Icon="Add" Command="{Binding CreateNetworkCommand}"/>
<AppBarButton Label="Delete selected Network" Icon="Delete" Command="{Binding DeleteNetworkCommand}"/>
<AppBarSeparator/>
<AppBarButton Icon="Sync" Label="Refresh" Command="{Binding RefreshCommand}"/>
</StackPanel>
</Grid>
</AppBar>
</Page.BottomAppBar>

Expand Down
34 changes: 18 additions & 16 deletions NumberRecognizer/NumberRecognizer.App/View/NetworkDetailPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">

<Page.DataContext>
<vm:NetworkDetailPageViewModel/>
</Page.DataContext>
<!--
This grid acts as a root panel for the page that defines two rows:
* Row 0 contains the back button and page title
Expand All @@ -42,8 +39,22 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Grid Grid.Column="0">
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden">

<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
<chart:ClusteredBarChart
Background="Transparent"
Style="{StaticResource ChartStyleVariableSize}"
ChartTitle=""
ChartTitleVisibility="Collapsed"
ChartLegendVisibility="Collapsed"
ChartSubTitle="">
<chart:ClusteredBarChart.Series>
<chart:ChartSeries
SeriesTitle="Fitness"
ItemsSource="{Binding FinalPoolFitnessTrend}"
DisplayMember="Name"
ValueMember="Value" />
</chart:ClusteredBarChart.Series>
</chart:ClusteredBarChart>
</ScrollViewer>
</Grid>
<Grid Grid.Column="1" Margin="2">
Expand All @@ -60,15 +71,6 @@
<RowDefinition Height="70"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="Please write your phone number on the canvas." Style="{StaticResource CustomTextBlockStyle}" VerticalAlignment="Center"/>
<control:InkCanvasRT Grid.Column="0" Grid.Row="1" x:Name="RecognitionInkCanvas"/>
<AppBarButton Command="{Binding RecognizeNumberCommand}" Grid.Column="1" Grid.Row="1" Icon="Accept" Padding="0" Margin="0" Height="100"/>
<TextBlock Grid.Row="3" Grid.Column="0" Text="Recognized Number" Style="{StaticResource CustomTextBlockStyle}" VerticalAlignment="Center"/>
<TextBox Text="{Binding RecognizedNumber}" IsEnabled="False" FontSize="50" Grid.Column="0" Grid.Row="4" TextAlignment="Center" CharacterSpacing="500"/>
<StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Center">
<AppBarButton Icon="Accept" Foreground="Green"/>
<AppBarButton Icon="Cancel" Foreground="Red"/>
</StackPanel>
</Grid>
</Grid>

Expand All @@ -85,8 +87,8 @@
AutomationProperties.AutomationId="BackButton"
AutomationProperties.ItemType="Navigation Button"/>
<StackPanel Orientation="Horizontal" Grid.Column="1">
<TextBlock x:Name="pageSubtitle" Text="{Binding Network.NetworkName}" Style="{StaticResource CustomHeaderTextBlockStyle}"
IsHitTestVisible="false" TextWrapping="NoWrap" VerticalAlignment="Bottom" Margin="0,0,30,40"/>
<TextBlock x:Name="pageTitle" Text="{Binding Network.NetworkName}" Style="{StaticResource CustomHeaderTextBlockStyle }" />
<TextBlock x:Name="pageSubtitle" Text="- Details" Style="{StaticResource CustomSecondaryHeaderTextBlockStyle}" />
</StackPanel>
</Grid>
</Grid>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@
// <summary>Item Detail Page.</summary>
//-----------------------------------------------------------------------

using NumberRecognizer.Cloud.Contract.Data;

namespace NumberRecognizer.App.View
{
using System;
using NumberRecognizer.App.Common;
using NumberRecognizer.App.NumberRecognizerService;
using NumberRecognizer.App.ViewModel;
using NumberRecognizer.Cloud.Contract.Data;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Navigation;

Expand All @@ -27,11 +26,6 @@ public sealed partial class NetworkDetailPage : Page
/// </summary>
private NavigationHelper navigationHelper;

/// <summary>
/// The default view model.
/// </summary>
private ObservableDictionary defaultViewModel = new ObservableDictionary();

/// <summary>
/// The view model.
/// </summary>
Expand Down Expand Up @@ -59,17 +53,6 @@ public NavigationHelper NavigationHelper
get { return this.navigationHelper; }
}

/// <summary>
/// Gets This can be changed to a strongly typed view model.
/// </summary>
/// <value>
/// The default view model.
/// </value>
public ObservableDictionary DefaultViewModel
{
get { return this.defaultViewModel; }
}

/// <summary>
/// Invoked when the Page is loaded and becomes the current source of a parent Frame.
/// </summary>
Expand Down Expand Up @@ -101,10 +84,8 @@ protected override void OnNavigatedFrom(NavigationEventArgs e)
/// session. The state will be null the first time a page is visited.</param>
private void NavigationHelper_LoadState(object sender, LoadStateEventArgs e)
{
// TODO: Create an appropriate data model for your problem domain to replace the sample data
this.viewModel = (NetworkDetailPageViewModel)this.DataContext;
this.viewModel.Network = (NetworkInfo)e.NavigationParameter;
this.viewModel.InkCanvas = this.RecognitionInkCanvas;
this.viewModel = new NetworkDetailPageViewModel(e.NavigationParameter as NetworkInfo);
this.DataContext = viewModel;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<Page
x:Name="pageRoot"
x:Class="NumberRecognizer.App.View.NetworkRecognizePage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:NumberRecognizer.App"
xmlns:data="using:NumberRecognizer.App.DataModel"
xmlns:common="using:NumberRecognizer.App.Common"
xmlns:vm="using:NumberRecognizer.App.ViewModel"
xmlns:chart="using:De.TorstenMandelkow.MetroChart"
xmlns:control="using:NumberRecognizer.App.Control"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">

<!--<Page.DataContext>
<vm:NetworkDetailPageViewModel/>
</Page.DataContext>-->
<!--
This grid acts as a root panel for the page that defines two rows:
* Row 0 contains the back button and page title
* Row 1 contains the rest of the page layout
-->
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Grid.ChildrenTransitions>
<TransitionCollection>
<EntranceThemeTransition/>
</TransitionCollection>
</Grid.ChildrenTransitions>
<Grid.RowDefinitions>
<RowDefinition Height="140"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>

<!--
TODO: Content should be placed within the following grid
to show details for the current item
-->
<Grid Grid.Row="1" x:Name="contentRegion">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Grid Grid.Column="0">
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Hidden">

</ScrollViewer>
</Grid>
<Grid Grid.Column="0" Margin="20,2,2,2">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="50"/>
<RowDefinition Height="80"/>
<RowDefinition Height="50"/>
<RowDefinition Height="50"/>
<RowDefinition Height="100"/>
<RowDefinition Height="70"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" Text="Please write your phone number on the canvas." Style="{StaticResource CustomTextBlockStyle}" VerticalAlignment="Center"/>
<control:InkCanvasRT Grid.Column="0" Grid.Row="1" x:Name="RecognitionInkCanvas"/>
<AppBarButton Command="{Binding RecognizeNumberCommand}" Grid.Column="1" Grid.Row="1" Icon="Accept" Padding="0" Margin="0" Height="100"/>
<TextBlock Grid.Row="3" Grid.Column="0" Text="Recognized Number" Style="{StaticResource CustomTextBlockStyle}" VerticalAlignment="Center"/>
<TextBox Text="{Binding RecognizedNumber}" IsEnabled="False" FontSize="50" Grid.Column="0" Grid.Row="4" TextAlignment="Center" CharacterSpacing="500"/>
<StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Center">
<AppBarButton Icon="Accept" Foreground="Green"/>
<AppBarButton Icon="Cancel" Foreground="Red"/>
</StackPanel>
</Grid>
</Grid>

<!-- Back button and page title -->
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Button x:Name="backButton" Margin="39,59,39,0" Command="{Binding NavigationHelper.GoBackCommand, ElementName=pageRoot}"
Style="{StaticResource NavigationBackButtonNormalStyle}"
VerticalAlignment="Top"
AutomationProperties.Name="Back"
AutomationProperties.AutomationId="BackButton"
AutomationProperties.ItemType="Navigation Button"/>
<StackPanel Orientation="Horizontal" Grid.Column="1">
<TextBlock x:Name="pageTitle" Text="{Binding NetworkName}" Style="{StaticResource CustomHeaderTextBlockStyle }" />
<TextBlock x:Name="pageSubtitle" Text="- Recognize" Style="{StaticResource CustomSecondaryHeaderTextBlockStyle}" />
</StackPanel>
</Grid>
</Grid>
</Page>
Loading

0 comments on commit e4eb2f1

Please sign in to comment.