diff --git a/src/WeatherTwentyOne/App.xaml b/src/WeatherTwentyOne/App.xaml index 9156cee..7146e35 100644 --- a/src/WeatherTwentyOne/App.xaml +++ b/src/WeatherTwentyOne/App.xaml @@ -2,9 +2,86 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:windows="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific;assembly=Microsoft.Maui.Controls" xmlns:local="clr-namespace:WeatherTwentyOne" + xmlns:page="clr-namespace:WeatherTwentyOne.Pages" x:Class="WeatherTwentyOne.App" windows:Application.ImageDirectory="Assets"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/WeatherTwentyOne/App.xaml.cs b/src/WeatherTwentyOne/App.xaml.cs index 5d13769..ed0caf1 100644 --- a/src/WeatherTwentyOne/App.xaml.cs +++ b/src/WeatherTwentyOne/App.xaml.cs @@ -3,8 +3,6 @@ using Microsoft.Maui.Controls.Xaml; using WeatherTwentyOne.Pages; -[assembly: XamlCompilation(XamlCompilationOptions.Compile)] - namespace WeatherTwentyOne { public partial class App : Application @@ -12,9 +10,13 @@ public partial class App : Application public App() { InitializeComponent(); + + Routing.RegisterRoute("settings", typeof(SettingsPage)); } - protected override Window CreateWindow(IActivationState activationState) => - new Window(new NavigationPage(new HomePage())) { Title = "Weather TwentyOne" }; + void TapGestureRecognizer_Tapped(System.Object sender, System.EventArgs e) + { + Shell.Current.GoToAsync("///settings"); + } } } \ No newline at end of file diff --git a/src/WeatherTwentyOne/Pages/FavoritesPage.xaml b/src/WeatherTwentyOne/Pages/FavoritesPage.xaml index 5e2e37f..2f63d74 100644 --- a/src/WeatherTwentyOne/Pages/FavoritesPage.xaml +++ b/src/WeatherTwentyOne/Pages/FavoritesPage.xaml @@ -8,15 +8,8 @@ x:Class="WeatherTwentyOne.Pages.FavoritesPage" > - - - + - - + - - - - - \ No newline at end of file diff --git a/src/WeatherTwentyOne/Pages/FavoritesPage.xaml.cs b/src/WeatherTwentyOne/Pages/FavoritesPage.xaml.cs index e5138e0..4b105e5 100644 --- a/src/WeatherTwentyOne/Pages/FavoritesPage.xaml.cs +++ b/src/WeatherTwentyOne/Pages/FavoritesPage.xaml.cs @@ -13,8 +13,6 @@ public FavoritesPage() InitializeComponent(); BindingContext = new FavoritesViewModel(); - - NavBar.ActiveTab = "Favorites"; } protected override async void OnAppearing() diff --git a/src/WeatherTwentyOne/Pages/HomePage.xaml b/src/WeatherTwentyOne/Pages/HomePage.xaml index 2a083d0..b743a85 100644 --- a/src/WeatherTwentyOne/Pages/HomePage.xaml +++ b/src/WeatherTwentyOne/Pages/HomePage.xaml @@ -8,21 +8,20 @@ Title="Redmond, WA" x:Class="WeatherTwentyOne.Pages.HomePage"> - - + @@ -32,6 +31,7 @@ x:Name="WindWidget" WidthRequest="200" /> + @@ -43,16 +43,9 @@ - - - - + - + diff --git a/src/WeatherTwentyOne/Pages/HomePage.xaml.cs b/src/WeatherTwentyOne/Pages/HomePage.xaml.cs index 7afe638..5b61f76 100644 --- a/src/WeatherTwentyOne/Pages/HomePage.xaml.cs +++ b/src/WeatherTwentyOne/Pages/HomePage.xaml.cs @@ -17,8 +17,6 @@ public HomePage() { InitializeComponent(); - NavBar.ActiveTab = "Home"; - if (!isSetup) { isSetup = true; diff --git a/src/WeatherTwentyOne/Pages/MapPage.xaml b/src/WeatherTwentyOne/Pages/MapPage.xaml index f23fcdd..bdfc309 100644 --- a/src/WeatherTwentyOne/Pages/MapPage.xaml +++ b/src/WeatherTwentyOne/Pages/MapPage.xaml @@ -3,38 +3,23 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:m="clr-namespace:WeatherTwentyOne.Models" xmlns:v="clr-namespace:WeatherTwentyOne.Views" - xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls" - ios:Page.UseSafeArea="True" Title="Wind Map" x:Class="WeatherTwentyOne.Pages.MapPage"> - + Grid.Row="{OnPlatform iOS=1, Default=0}" + ColumnDefinitions="{OnIdiom Phone='*', Default='*,480'}" + RowDefinitions="*"> - - + + - - - - - + + - \ No newline at end of file diff --git a/src/WeatherTwentyOne/Pages/MapPage.xaml.cs b/src/WeatherTwentyOne/Pages/MapPage.xaml.cs index e31dda4..3ec318d 100644 --- a/src/WeatherTwentyOne/Pages/MapPage.xaml.cs +++ b/src/WeatherTwentyOne/Pages/MapPage.xaml.cs @@ -6,9 +6,7 @@ public partial class MapPage : ContentPage { public MapPage() { - InitializeComponent(); - - NavBar.ActiveTab = "Map"; + InitializeComponent(); } } } \ No newline at end of file diff --git a/src/WeatherTwentyOne/Pages/SettingsPage.xaml b/src/WeatherTwentyOne/Pages/SettingsPage.xaml index 9179fd6..123d69b 100644 --- a/src/WeatherTwentyOne/Pages/SettingsPage.xaml +++ b/src/WeatherTwentyOne/Pages/SettingsPage.xaml @@ -8,11 +8,10 @@ - @@ -115,24 +114,15 @@ - - - - - diff --git a/src/WeatherTwentyOne/Pages/SettingsPage.xaml.cs b/src/WeatherTwentyOne/Pages/SettingsPage.xaml.cs index 4c6e2d6..305df20 100644 --- a/src/WeatherTwentyOne/Pages/SettingsPage.xaml.cs +++ b/src/WeatherTwentyOne/Pages/SettingsPage.xaml.cs @@ -11,8 +11,6 @@ public SettingsPage() InitializeComponent(); BindingContext = new SettingsViewModel(); - - NavBar.ActiveTab = "Settings"; } async void OnSignOut(object sender, EventArgs eventArgs) diff --git a/src/WeatherTwentyOne/Resources/Styles/DefaultTheme.xaml b/src/WeatherTwentyOne/Resources/Styles/DefaultTheme.xaml index 479f040..7cb8229 100644 --- a/src/WeatherTwentyOne/Resources/Styles/DefaultTheme.xaml +++ b/src/WeatherTwentyOne/Resources/Styles/DefaultTheme.xaml @@ -37,6 +37,41 @@ Color="{StaticResource Background_Mid}" Size="16"/> + + + + +