cleanup background colors

pull/57/head
James Montemagno 2022-03-25 16:12:37 -07:00
parent d5a05e8c80
commit 5348e3e33b
9 changed files with 13 additions and 12 deletions

View File

@ -6,7 +6,8 @@
xmlns:res="clr-namespace:Microsoft.NetConf2021.Maui.Resources.Strings" xmlns:res="clr-namespace:Microsoft.NetConf2021.Maui.Resources.Strings"
x:Class="Microsoft.NetConf2021.Maui.Pages.CategoriesPage"> x:Class="Microsoft.NetConf2021.Maui.Pages.CategoriesPage">
<CollectionView ItemsSource="{Binding Categories}" <CollectionView ItemsSource="{Binding Categories}"
Margin="10,0"> Margin="10,0"
Background="{AppThemeBinding Light={StaticResource Grey1}, Dark={StaticResource Grey9}}">
<CollectionView.Header> <CollectionView.Header>
<Label Text="{x:Static res:AppResource.Categories}" <Label Text="{x:Static res:AppResource.Categories}"
Style="{StaticResource H5LabelStyle}" /> Style="{StaticResource H5LabelStyle}" />

View File

@ -7,7 +7,8 @@
xmlns:controls="clr-namespace:Microsoft.NetConf2021.Maui.Controls" xmlns:controls="clr-namespace:Microsoft.NetConf2021.Maui.Controls"
x:Class="Microsoft.NetConf2021.Maui.Pages.CategoryPage"> x:Class="Microsoft.NetConf2021.Maui.Pages.CategoryPage">
<CollectionView ItemsSource="{Binding Shows}" <CollectionView ItemsSource="{Binding Shows}"
Margin="10"> Margin="10"
Background="{AppThemeBinding Light={StaticResource Grey1}, Dark={StaticResource Grey9}}">
<CollectionView.Header> <CollectionView.Header>
<StackLayout> <StackLayout>
<controls:HeaderControl TextToSearch="{Binding Text, Mode=OneWayToSource}" <controls:HeaderControl TextToSearch="{Binding Text, Mode=OneWayToSource}"

View File

@ -6,7 +6,6 @@
x:Name="this" x:Name="this"
xmlns:view="clr-namespace:Microsoft.NetConf2021.Maui.Views" xmlns:view="clr-namespace:Microsoft.NetConf2021.Maui.Views"
xmlns:viewmodels="clr-namespace:Microsoft.NetConf2021.Maui.ViewModels" xmlns:viewmodels="clr-namespace:Microsoft.NetConf2021.Maui.ViewModels"
BackgroundColor="{DynamicResource PageBackgroundColor}"
xmlns:controls="clr-namespace:Microsoft.NetConf2021.Maui.Controls" xmlns:controls="clr-namespace:Microsoft.NetConf2021.Maui.Controls"
Shell.NavBarIsVisible="False" Shell.NavBarIsVisible="False"
x:DataType="viewmodels:DiscoverViewModel" x:DataType="viewmodels:DiscoverViewModel"
@ -19,7 +18,7 @@
Value="{OnIdiom Desktop='48,0,0,12', Phone='16,0,0,0'}" /> Value="{OnIdiom Desktop='48,0,0,12', Phone='16,0,0,0'}" />
</Style> </Style>
</ContentPage.Resources> </ContentPage.Resources>
<Grid> <Grid Background="{AppThemeBinding Light={StaticResource Grey1}, Dark={StaticResource Grey9}}">
<StackLayout Margin="10,0"> <StackLayout Margin="10,0">
<controls:HeaderControl TextToSearch="{Binding Text, Mode=OneWayToSource}" <controls:HeaderControl TextToSearch="{Binding Text, Mode=OneWayToSource}"
SearchCommand="{Binding SearchCommand}" SearchCommand="{Binding SearchCommand}"

View File

@ -8,7 +8,7 @@
Title="{Binding Episode.Title}" Title="{Binding Episode.Title}"
xmlns:res="clr-namespace:Microsoft.NetConf2021.Maui.Resources.Strings" xmlns:res="clr-namespace:Microsoft.NetConf2021.Maui.Resources.Strings"
xmlns:controls="clr-namespace:Microsoft.NetConf2021.Maui.Controls"> xmlns:controls="clr-namespace:Microsoft.NetConf2021.Maui.Controls">
<Grid> <GridBackground="{AppThemeBinding Light={StaticResource Grey1}, Dark={StaticResource Grey9}}">
<ScrollView> <ScrollView>
<VerticalStackLayout Padding="16" <VerticalStackLayout Padding="16"
Spacing="8"> Spacing="8">
@ -73,5 +73,5 @@
VerticalOptions="End"> VerticalOptions="End">
</controls:Player> </controls:Player>
</Grid> </GridBackground>
</ContentPage> </ContentPage>

View File

@ -8,7 +8,7 @@
Style="{StaticResource MainSectionStyle}" Style="{StaticResource MainSectionStyle}"
x:Class="Microsoft.NetConf2021.Maui.Pages.ListenLaterPage"> x:Class="Microsoft.NetConf2021.Maui.Pages.ListenLaterPage">
<ContentPage.Content> <ContentPage.Content>
<Grid> <GridBackground="{AppThemeBinding Light={StaticResource Grey1}, Dark={StaticResource Grey9}}">
<CollectionView ItemsSource="{Binding Episodes}" <CollectionView ItemsSource="{Binding Episodes}"
Margin="10,0"> Margin="10,0">
<CollectionView.Header> <CollectionView.Header>
@ -124,6 +124,6 @@
</Grid> </Grid>
<controls:Player x:Name="player" <controls:Player x:Name="player"
VerticalOptions="End" /> VerticalOptions="End" />
</Grid> </GridBackground>
</ContentPage.Content> </ContentPage.Content>
</ContentPage> </ContentPage>

View File

@ -9,7 +9,7 @@
Shell.NavBarIsVisible="False" Shell.NavBarIsVisible="False"
xmlns:controls="clr-namespace:Microsoft.NetConf2021.Maui.Controls" xmlns:controls="clr-namespace:Microsoft.NetConf2021.Maui.Controls"
x:Class="Microsoft.NetConf2021.Maui.Pages.ListenTogetherPage"> x:Class="Microsoft.NetConf2021.Maui.Pages.ListenTogetherPage">
<Grid RowDefinitions="*,auto"> <Grid RowDefinitions="*,auto" Background="{AppThemeBinding Light={StaticResource Grey1}, Dark={StaticResource Grey9}}">
<b:BlazorWebView x:Name="MyWebView" <b:BlazorWebView x:Name="MyWebView"
Margin="10,0" Margin="10,0"
HostPage="wwwroot/index.html" HostPage="wwwroot/index.html"

View File

@ -9,7 +9,7 @@
x:Class="Microsoft.NetConf2021.Maui.Pages.SettingsPage"> x:Class="Microsoft.NetConf2021.Maui.Pages.SettingsPage">
<Grid RowDefinitions="auto,auto,auto,auto,auto,auto,auto,auto" <Grid RowDefinitions="auto,auto,auto,auto,auto,auto,auto,auto"
ColumnDefinitions="2*,8*" ColumnDefinitions="2*,8*"
Padding="16"> Padding="16"Background="{AppThemeBinding Light={StaticResource Grey1}, Dark={StaticResource Grey9}}">
<Label Text="{x:Static res:AppResource.Download_Settings}" <Label Text="{x:Static res:AppResource.Download_Settings}"
Margin="0,0,0,20" Margin="0,0,0,20"
Style="{StaticResource H6LabelStyle}" Style="{StaticResource H6LabelStyle}"

View File

@ -10,7 +10,7 @@
Title="{Binding Show.Show.Title}" Title="{Binding Show.Show.Title}"
Style="{StaticResource DetailPageStyle}" Style="{StaticResource DetailPageStyle}"
x:DataType="viewmodels:ShowDetailViewModel"> x:DataType="viewmodels:ShowDetailViewModel">
<Grid> <Grid Background="{AppThemeBinding Light={StaticResource Grey1}, Dark={StaticResource Grey9}}">
<StackLayout Margin="10,0"> <StackLayout Margin="10,0">
<controls:HeaderControl IsVisible="{OnIdiom Default=true, Phone=false}" <controls:HeaderControl IsVisible="{OnIdiom Default=true, Phone=false}"
ShowSearchCategories="False" ShowSearchCategories="False"

View File

@ -11,7 +11,7 @@
x:Class="Microsoft.NetConf2021.Maui.Pages.SubscriptionsPage" x:Class="Microsoft.NetConf2021.Maui.Pages.SubscriptionsPage"
x:DataType="viewmodels:SubscriptionsViewModel"> x:DataType="viewmodels:SubscriptionsViewModel">
<ContentPage.Content> <ContentPage.Content>
<Grid> <Grid Background="{AppThemeBinding Light={StaticResource Grey1}, Dark={StaticResource Grey9}}">
<CollectionView x:Name="subscribedPodcasts" <CollectionView x:Name="subscribedPodcasts"
Margin="10,0" Margin="10,0"
SelectionMode="None" SelectionMode="None"