Skip to content

Commit 472fbd3

Browse files
fix: improve sales analysis readability
Agent-Logs-Url: https://github.com/TransactionProcessing/TransactionMobile/sessions/d0e00a6b-13ed-4533-89b1-a23403fc4fb3 Co-authored-by: StuartFerguson <16325469+StuartFerguson@users.noreply.github.com>
1 parent 166e02f commit 472fbd3

3 files changed

Lines changed: 17 additions & 11 deletions

File tree

TransactionProcessor.Mobile/Pages/Reports/ReportsSalesAnalysisPage.xaml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515

1616
<DataTemplate x:Key="CardTemplate">
1717
<Frame x:DataType="reports1:SalesAnalysis"
18-
Style="{StaticResource TransactionFormCard}">
18+
Style="{StaticResource TransactionFormCard}"
19+
BackgroundColor="{DynamicResource salesAnalysisCardBackgroundColor}"
20+
BorderColor="{DynamicResource salesAnalysisCardBorderColor}">
1921
<Grid RowDefinitions="Auto,Auto,Auto"
2022
ColumnDefinitions="*,Auto"
2123
RowSpacing="12">
@@ -30,19 +32,19 @@
3032
<Label Text="{Binding MainTitle}"
3133
FontSize="18"
3234
FontAttributes="Bold"
33-
TextColor="{DynamicResource labelTextColor}"/>
35+
TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}"/>
3436

3537
<VerticalStackLayout
3638
Grid.Row="1"
3739
Grid.ColumnSpan="2"
3840
Spacing="2">
3941
<Label Text="{Binding TodaysTitle}"
4042
FontSize="14"
41-
TextColor="{DynamicResource labelTextColor}" />
43+
TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}" />
4244
<Label Text="{Binding TodaysValue}"
4345
FontSize="20"
4446
FontAttributes="Bold"
45-
TextColor="{DynamicResource labelTextColor}" />
47+
TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}" />
4648
</VerticalStackLayout>
4749

4850
<HorizontalStackLayout
@@ -51,12 +53,12 @@
5153
VerticalOptions="End">
5254
<Label Text="{Binding ComparisonTitle}"
5355
FontSize="12"
54-
TextColor="{DynamicResource labelTextColor}"
56+
TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}"
5557
Opacity="0.8"
5658
VerticalOptions="Center"/>
5759
<Label Text="{Binding ComparisonValue}"
5860
FontSize="12"
59-
TextColor="{DynamicResource labelTextColor}"
61+
TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}"
6062
Opacity="0.8"
6163
VerticalOptions="Center"/>
6264
</HorizontalStackLayout>
@@ -69,12 +71,12 @@
6971
VerticalOptions="End">
7072
<Label Text="{Binding VarianceTitle}"
7173
FontSize="12"
72-
TextColor="{DynamicResource labelTextColor}"
74+
TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}"
7375
Opacity="0.8"
7476
VerticalOptions="Center"/>
7577
<Label Text="{Binding VarianceValue}"
7678
FontSize="12"
77-
TextColor="{DynamicResource labelTextColor}"
79+
TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}"
7880
Opacity="0.8"
7981
VerticalOptions="Center"/>
8082
</HorizontalStackLayout>
@@ -92,16 +94,16 @@
9294
HorizontalTextAlignment="Center"
9395
VerticalOptions="End"
9496
FontAttributes="Bold"
95-
TextColor="{DynamicResource labelTextColor}"
97+
TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}"
9698
Padding="20,0,20,20"/>
9799

98100
<Picker x:Name="ComparisonDate"
99101
Title="Select Date for Comparison"
100102
ItemDisplayBinding="{Binding DisplayText}"
101103
ItemsSource="{Binding ComparisonDates}"
102104
SelectedItem="{Binding SelectedItem}"
103-
TextColor="{DynamicResource labelTextColor}"
104-
TitleColor="{DynamicResource labelTextColor}">
105+
TextColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}"
106+
TitleColor="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource Gray200}}">
105107
<Picker.Behaviors>
106108
<toolkit:EventToCommandBehavior
107109
EventName="SelectedIndexChanged"

TransactionProcessor.Mobile/Resources/Styles/DarkTheme.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232
<Color x:Key="cardBorderColor">#2F3640</Color>
3333
<Color x:Key="entryContainerBorderColor">#374151</Color>
3434
<Color x:Key="entryContainerBackgroundColor">#111827</Color>
35+
<Color x:Key="salesAnalysisCardBackgroundColor">#223247</Color>
36+
<Color x:Key="salesAnalysisCardBorderColor">#2D435B</Color>
3537
<Color x:Key="shellTabBarBackgroundColor">#1F2937</Color>
3638
<Color x:Key="shellTabBarForegroundColor">#F5F7FA</Color>
3739
<Color x:Key="shellTabBarUnselectedColor">#9CA3AF</Color>

TransactionProcessor.Mobile/Resources/Styles/LightTheme.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
<Color x:Key="cardBorderColor">#E1E1E1</Color>
3939
<Color x:Key="entryContainerBorderColor">#CFCFD3</Color>
4040
<Color x:Key="entryContainerBackgroundColor">#EFEFEF</Color>
41+
<Color x:Key="salesAnalysisCardBackgroundColor">#FFFFFF</Color>
42+
<Color x:Key="salesAnalysisCardBorderColor">#E1E1E1</Color>
4143
<Color x:Key="shellTabBarBackgroundColor">#FFFFFF</Color>
4244
<Color x:Key="shellTabBarForegroundColor">#4267B2</Color>
4345
<Color x:Key="shellTabBarUnselectedColor">#212125</Color>

0 commit comments

Comments
 (0)