diff --git a/src/IF.Lastfm.Syro/App.xaml b/src/IF.Lastfm.Syro/App.xaml index 5b52198..5400c1d 100644 --- a/src/IF.Lastfm.Syro/App.xaml +++ b/src/IF.Lastfm.Syro/App.xaml @@ -8,16 +8,36 @@ - - + + + + + - + #C0D73B + #C0D73B + + + + + + + + + + + - - - \ No newline at end of file diff --git a/src/IF.Lastfm.Syro/App.xaml.cs b/src/IF.Lastfm.Syro/App.xaml.cs index 2999ea2..c07b056 100644 --- a/src/IF.Lastfm.Syro/App.xaml.cs +++ b/src/IF.Lastfm.Syro/App.xaml.cs @@ -11,5 +11,10 @@ public partial class App : Application private static ViewModelLocator _kernel; public static ViewModelLocator Kernel { get { return _kernel; } } + + public App() + { + _kernel = new ViewModelLocator(); + } } } diff --git a/src/IF.Lastfm.Syro/IF.Lastfm.Syro.csproj b/src/IF.Lastfm.Syro/IF.Lastfm.Syro.csproj index a876846..7ad0c25 100644 --- a/src/IF.Lastfm.Syro/IF.Lastfm.Syro.csproj +++ b/src/IF.Lastfm.Syro/IF.Lastfm.Syro.csproj @@ -111,6 +111,10 @@ MSBuild:Compile Designer + + Designer + MSBuild:Compile + diff --git a/src/IF.Lastfm.Syro/MainWindow.xaml b/src/IF.Lastfm.Syro/MainWindow.xaml index 2dbea34..c600a81 100644 --- a/src/IF.Lastfm.Syro/MainWindow.xaml +++ b/src/IF.Lastfm.Syro/MainWindow.xaml @@ -21,17 +21,10 @@ VerticalAlignment="Center"> - - - - + - - - + diff --git a/src/IF.Lastfm.Syro/MainWindow.xaml.cs b/src/IF.Lastfm.Syro/MainWindow.xaml.cs index 67ce6c4..690213c 100644 --- a/src/IF.Lastfm.Syro/MainWindow.xaml.cs +++ b/src/IF.Lastfm.Syro/MainWindow.xaml.cs @@ -1,10 +1,14 @@ -namespace IF.Lastfm.Syro +using System; + +namespace IF.Lastfm.Syro { public partial class MainWindow { public MainWindow() { InitializeComponent(); + + RootFrame.NavigationService.Navigate(new Uri("/Pages/MainPage.xaml", UriKind.Relative)); } } } diff --git a/src/IF.Lastfm.Syro/Pages/MainPage.xaml b/src/IF.Lastfm.Syro/Pages/MainPage.xaml index d76495f..1dfbea6 100644 --- a/src/IF.Lastfm.Syro/Pages/MainPage.xaml +++ b/src/IF.Lastfm.Syro/Pages/MainPage.xaml @@ -5,9 +5,34 @@ xmlns:local="using:IF.Lastfm.Dev.Syro.Pages" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - mc:Ignorable="d"> + xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls" + mc:Ignorable="d" + d:DataContext="{Binding Source=MainViewModel}"> + + - + + + + + Coming soon... + + + + + + + + + + + diff --git a/src/IF.Lastfm.Syro/Resources/SyroTabControl.xaml b/src/IF.Lastfm.Syro/Resources/SyroTabControl.xaml new file mode 100644 index 0000000..e15bda7 --- /dev/null +++ b/src/IF.Lastfm.Syro/Resources/SyroTabControl.xaml @@ -0,0 +1,213 @@ + + + + + + #C0D73B + + + + + + + + + + + + + + + + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file