From 5348e3e33bab2ac6712b3c78255b93084066e8d6 Mon Sep 17 00:00:00 2001
From: James Montemagno <james.montemagno@gmail.com>
Date: Fri, 25 Mar 2022 16:12:37 -0700
Subject: [PATCH] cleanup background colors

---
 src/Mobile/Pages/CategoriesPage.xaml     | 3 ++-
 src/Mobile/Pages/CategoryPage.xaml       | 3 ++-
 src/Mobile/Pages/DiscoverPage.xaml       | 3 +--
 src/Mobile/Pages/EpisodeDetailPage.xaml  | 4 ++--
 src/Mobile/Pages/ListenLaterPage.xaml    | 4 ++--
 src/Mobile/Pages/ListenTogetherPage.xaml | 2 +-
 src/Mobile/Pages/SettingsPage.xaml       | 2 +-
 src/Mobile/Pages/ShowDetailPage.xaml     | 2 +-
 src/Mobile/Pages/SubscriptionsPage.xaml  | 2 +-
 9 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/Mobile/Pages/CategoriesPage.xaml b/src/Mobile/Pages/CategoriesPage.xaml
index 9ca94bb..5c3a8bb 100644
--- a/src/Mobile/Pages/CategoriesPage.xaml
+++ b/src/Mobile/Pages/CategoriesPage.xaml
@@ -6,7 +6,8 @@
              xmlns:res="clr-namespace:Microsoft.NetConf2021.Maui.Resources.Strings"
              x:Class="Microsoft.NetConf2021.Maui.Pages.CategoriesPage">
     <CollectionView ItemsSource="{Binding Categories}"
-                    Margin="10,0">
+                    Margin="10,0"
+                    Background="{AppThemeBinding Light={StaticResource Grey1}, Dark={StaticResource Grey9}}">
         <CollectionView.Header>
             <Label Text="{x:Static res:AppResource.Categories}"
                    Style="{StaticResource H5LabelStyle}" />
diff --git a/src/Mobile/Pages/CategoryPage.xaml b/src/Mobile/Pages/CategoryPage.xaml
index 0be608e..43e276d 100644
--- a/src/Mobile/Pages/CategoryPage.xaml
+++ b/src/Mobile/Pages/CategoryPage.xaml
@@ -7,7 +7,8 @@
              xmlns:controls="clr-namespace:Microsoft.NetConf2021.Maui.Controls"
              x:Class="Microsoft.NetConf2021.Maui.Pages.CategoryPage">
     <CollectionView ItemsSource="{Binding Shows}"
-                    Margin="10">
+                    Margin="10"
+                    Background="{AppThemeBinding Light={StaticResource Grey1}, Dark={StaticResource Grey9}}">
         <CollectionView.Header>
             <StackLayout>
                 <controls:HeaderControl TextToSearch="{Binding Text, Mode=OneWayToSource}"
diff --git a/src/Mobile/Pages/DiscoverPage.xaml b/src/Mobile/Pages/DiscoverPage.xaml
index 484d6b3..aad0eb1 100644
--- a/src/Mobile/Pages/DiscoverPage.xaml
+++ b/src/Mobile/Pages/DiscoverPage.xaml
@@ -6,7 +6,6 @@
              x:Name="this"
              xmlns:view="clr-namespace:Microsoft.NetConf2021.Maui.Views"
              xmlns:viewmodels="clr-namespace:Microsoft.NetConf2021.Maui.ViewModels"
-             BackgroundColor="{DynamicResource PageBackgroundColor}"
              xmlns:controls="clr-namespace:Microsoft.NetConf2021.Maui.Controls"
              Shell.NavBarIsVisible="False"
              x:DataType="viewmodels:DiscoverViewModel"
@@ -19,7 +18,7 @@
                     Value="{OnIdiom Desktop='48,0,0,12', Phone='16,0,0,0'}" />
         </Style>
     </ContentPage.Resources>
-    <Grid>
+    <Grid Background="{AppThemeBinding Light={StaticResource Grey1}, Dark={StaticResource Grey9}}">
         <StackLayout Margin="10,0">
             <controls:HeaderControl TextToSearch="{Binding Text, Mode=OneWayToSource}"
                                     SearchCommand="{Binding SearchCommand}"
diff --git a/src/Mobile/Pages/EpisodeDetailPage.xaml b/src/Mobile/Pages/EpisodeDetailPage.xaml
index c48d1f2..215daf1 100644
--- a/src/Mobile/Pages/EpisodeDetailPage.xaml
+++ b/src/Mobile/Pages/EpisodeDetailPage.xaml
@@ -8,7 +8,7 @@
              Title="{Binding Episode.Title}"
              xmlns:res="clr-namespace:Microsoft.NetConf2021.Maui.Resources.Strings"
              xmlns:controls="clr-namespace:Microsoft.NetConf2021.Maui.Controls">
-    <Grid>
+    <GridBackground="{AppThemeBinding Light={StaticResource Grey1}, Dark={StaticResource Grey9}}">
         <ScrollView>
             <VerticalStackLayout Padding="16"
                                  Spacing="8">
@@ -73,5 +73,5 @@
                          VerticalOptions="End">
         </controls:Player>
 
-    </Grid>
+    </GridBackground>
 </ContentPage>
\ No newline at end of file
diff --git a/src/Mobile/Pages/ListenLaterPage.xaml b/src/Mobile/Pages/ListenLaterPage.xaml
index d646210..9bab69a 100644
--- a/src/Mobile/Pages/ListenLaterPage.xaml
+++ b/src/Mobile/Pages/ListenLaterPage.xaml
@@ -8,7 +8,7 @@
              Style="{StaticResource MainSectionStyle}"
              x:Class="Microsoft.NetConf2021.Maui.Pages.ListenLaterPage">
     <ContentPage.Content>
-        <Grid>
+        <GridBackground="{AppThemeBinding Light={StaticResource Grey1}, Dark={StaticResource Grey9}}">
             <CollectionView ItemsSource="{Binding Episodes}"
                             Margin="10,0">
                 <CollectionView.Header>
@@ -124,6 +124,6 @@
             </Grid>
             <controls:Player x:Name="player"
                              VerticalOptions="End" />
-        </Grid>
+        </GridBackground>
     </ContentPage.Content>
 </ContentPage>
\ No newline at end of file
diff --git a/src/Mobile/Pages/ListenTogetherPage.xaml b/src/Mobile/Pages/ListenTogetherPage.xaml
index 69c4cb9..5de748e 100644
--- a/src/Mobile/Pages/ListenTogetherPage.xaml
+++ b/src/Mobile/Pages/ListenTogetherPage.xaml
@@ -9,7 +9,7 @@
              Shell.NavBarIsVisible="False"
              xmlns:controls="clr-namespace:Microsoft.NetConf2021.Maui.Controls"
              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"
                          Margin="10,0"
                          HostPage="wwwroot/index.html"
diff --git a/src/Mobile/Pages/SettingsPage.xaml b/src/Mobile/Pages/SettingsPage.xaml
index f9114a3..a30e860 100644
--- a/src/Mobile/Pages/SettingsPage.xaml
+++ b/src/Mobile/Pages/SettingsPage.xaml
@@ -9,7 +9,7 @@
     x:Class="Microsoft.NetConf2021.Maui.Pages.SettingsPage">
     <Grid RowDefinitions="auto,auto,auto,auto,auto,auto,auto,auto"
           ColumnDefinitions="2*,8*"
-          Padding="16">
+          Padding="16"Background="{AppThemeBinding Light={StaticResource Grey1}, Dark={StaticResource Grey9}}">
         <Label Text="{x:Static res:AppResource.Download_Settings}"
                Margin="0,0,0,20"
                Style="{StaticResource H6LabelStyle}"
diff --git a/src/Mobile/Pages/ShowDetailPage.xaml b/src/Mobile/Pages/ShowDetailPage.xaml
index 2f79366..545564a 100644
--- a/src/Mobile/Pages/ShowDetailPage.xaml
+++ b/src/Mobile/Pages/ShowDetailPage.xaml
@@ -10,7 +10,7 @@
              Title="{Binding Show.Show.Title}"
              Style="{StaticResource DetailPageStyle}"
              x:DataType="viewmodels:ShowDetailViewModel">
-    <Grid>
+    <Grid Background="{AppThemeBinding Light={StaticResource Grey1}, Dark={StaticResource Grey9}}">
         <StackLayout Margin="10,0">
             <controls:HeaderControl IsVisible="{OnIdiom Default=true, Phone=false}"
                                     ShowSearchCategories="False"
diff --git a/src/Mobile/Pages/SubscriptionsPage.xaml b/src/Mobile/Pages/SubscriptionsPage.xaml
index 5144e76..ef1df4b 100644
--- a/src/Mobile/Pages/SubscriptionsPage.xaml
+++ b/src/Mobile/Pages/SubscriptionsPage.xaml
@@ -11,7 +11,7 @@
              x:Class="Microsoft.NetConf2021.Maui.Pages.SubscriptionsPage"
              x:DataType="viewmodels:SubscriptionsViewModel">
     <ContentPage.Content>
-        <Grid>
+        <Grid Background="{AppThemeBinding Light={StaticResource Grey1}, Dark={StaticResource Grey9}}">
             <CollectionView x:Name="subscribedPodcasts"
                             Margin="10,0"
                             SelectionMode="None"