Skip to content

Commit b239e81

Browse files
David BritchDavid Britch
authored andcommitted
Moved converters used by single pages from App class to the pages concerned. Part of dotnet-architecture#231
1 parent 331bffa commit b239e81

4 files changed

Lines changed: 13 additions & 9 deletions

File tree

src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<Application xmlns="http://xamarin.com/schemas/2014/forms"
33
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
44
xmlns:light="clr-namespace:Xamarin.Forms.Themes;assembly=Xamarin.Forms.Theme.Light"
@@ -101,17 +101,12 @@
101101
<!-- CONVERTERS -->
102102
<converters:CountToBoolConverter x:Key="CountToBoolConverter" />
103103
<converters:DatetimeConverter x:Key="DatetimeConverter" />
104-
<converters:FirstValidationErrorConverter x:Key="FirstValidationErrorConverter" />
105104
<converters:ImageConverter x:Key="ImageConverter" />
106105
<converters:ItemTappedEventArgsConverter x:Key="ItemTappedEventArgsConverter" />
107106
<converters:InverseCountToBoolConverter x:Key="InverseCountToBoolConverter" />
108107
<converters:InverseBoolConverter x:Key="InverseBoolConverter" />
109108
<converters:ItemsToHeightConverter x:Key="ItemsToHeightConverter" />
110109
<converters:ToUpperConverter x:Key="ToUpperConverter" />
111-
<converters:WebNavigatingEventArgsConverter x:Key="WebNavigatingEventArgsConverter" />
112-
<converters:WebNavigatedEventArgsConverter x:Key="WebNavigatedEventArgsConverter" />
113-
<converters:StringNullOrEmptyBoolConverter x:Key="StringNullOrEmptyBoolConverter" />
114-
<converters:DoubleConverter x:Key="DoubleConverter" />
115110

116111
<!-- STYLES -->
117112
<Style x:Key="ValidationErrorLabelStyle"

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignDetailsView.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@
22
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
33
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
44
x:Class="eShopOnContainers.Core.Views.CampaignDetailsView"
5+
xmlns:converters="clr-namespace:eShopOnContainers.Core.Converters;assembly=eShopOnContainers.Core"
56
xmlns:viewModelBase="clr-namespace:eShopOnContainers.Core.ViewModels.Base;assembly=eShopOnContainers.Core"
67
viewModelBase:ViewModelLocator.AutoWireViewModel="true"
78
Title="Campaign Details">
89
<ContentPage.Resources>
910
<ResourceDictionary>
11+
<converters:StringNullOrEmptyBoolConverter x:Key="StringNullOrEmptyBoolConverter" />
12+
1013
<Style x:Key="CampaignTitleStyle"
1114
TargetType="{x:Type Label}">
1215
<Setter Property="FontFamily"

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
x:Class="eShopOnContainers.Core.Views.LoginView"
55
xmlns:viewModelBase="clr-namespace:eShopOnContainers.Core.ViewModels.Base;assembly=eShopOnContainers.Core"
66
xmlns:animations="clr-namespace:eShopOnContainers.Core.Animations;assembly=eShopOnContainers.Core"
7+
xmlns:converters="clr-namespace:eShopOnContainers.Core.Converters;assembly=eShopOnContainers.Core"
78
xmlns:triggers="clr-namespace:eShopOnContainers.Core.Triggers;assembly=eShopOnContainers.Core"
89
xmlns:behaviors="clr-namespace:eShopOnContainers.Core.Behaviors;assembly=eShopOnContainers.Core"
910
viewModelBase:ViewModelLocator.AutoWireViewModel="true">
@@ -15,7 +16,10 @@
1516
</ContentPage.Title>
1617
<ContentPage.Resources>
1718
<ResourceDictionary>
18-
19+
<converters:FirstValidationErrorConverter x:Key="FirstValidationErrorConverter" />
20+
<converters:WebNavigatingEventArgsConverter x:Key="WebNavigatingEventArgsConverter" />
21+
<converters:WebNavigatedEventArgsConverter x:Key="WebNavigatedEventArgsConverter" />
22+
1923
<Style x:Key="TitleLabelStyle"
2024
TargetType="{x:Type Label}">
2125
<Setter Property="FontFamily"

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
44
x:Class="eShopOnContainers.Core.Views.SettingsView"
55
xmlns:viewModelBase="clr-namespace:eShopOnContainers.Core.ViewModels.Base;assembly=eShopOnContainers.Core"
6-
xmlns:controls="clr-namespace:eShopOnContainers.Core.Controls;assembly=eShopOnContainers.Core"
6+
xmlns:controls="clr-namespace:eShopOnContainers.Core.Controls;assembly=eShopOnContainers.Core"
7+
xmlns:converters="clr-namespace:eShopOnContainers.Core.Converters;assembly=eShopOnContainers.Core"
78
xmlns:animations="clr-namespace:eShopOnContainers.Core.Animations;assembly=eShopOnContainers.Core"
89
xmlns:triggers="clr-namespace:eShopOnContainers.Core.Triggers;assembly=eShopOnContainers.Core"
910
viewModelBase:ViewModelLocator.AutoWireViewModel="true"
1011
Title="Settings">
1112
<ContentPage.Resources>
1213
<ResourceDictionary>
13-
14+
<converters:DoubleConverter x:Key="DoubleConverter" />
15+
1416
<Style x:Key="SettingsStackLayoutStyle" TargetType="{x:Type StackLayout}">
1517
<Setter Property="Margin"
1618
Value="6" />

0 commit comments

Comments
 (0)