ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev

Browse Source
This commit is contained in:
Cesar De la Torre 2017-11-09 11:43:17 -08:00
commit ad01496e32
14 changed files with 277 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

229
src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml
View File

@ -34,148 +34,139 @@
<Color x:Key="AndroidListViewBackgroundColor">Transparent</Color> <Color x:Key="AndroidListViewBackgroundColor">Transparent</Color>
<Color x:Key="iOSListViewBackgroundColor">Transparent</Color> <Color x:Key="iOSListViewBackgroundColor">Transparent</Color>
<OnPlatform <OnPlatform x:TypeArguments="Color"
x:TypeArguments="Color" x:Key="ActivityIndicatorColor">
x:Key="ActivityIndicatorColor" <On Platform="iOS" Value="{ StaticResource iOSDefaultTintColor }" />
iOS="{ StaticResource iOSDefaultTintColor }" /> </OnPlatform>
<OnPlatform <OnPlatform x:TypeArguments="Color"
x:TypeArguments="Color" x:Key="DefaultButtonClassBackgroundColor">
x:Key="DefaultButtonClassBackgroundColor" <On Platform="iOS" Value="{ StaticResource iOSDefaultButtonClassBackgroundColor }" />
Android="{ StaticResource AndroidDefaultButtonClassBackgroundColor }" <On Platform="Android" Value="{ StaticResource AndroidDefaultButtonClassBackgroundColor }" />
iOS="{ StaticResource iOSDefaultButtonClassBackgroundColor }" /> </OnPlatform>
<OnPlatform <OnPlatform x:TypeArguments="Color"
x:TypeArguments="Color" x:Key="DefaultButtonClassBorderColor">
x:Key="DefaultButtonClassBorderColor" <On Platform="iOS" Value="{ StaticResource iOSDefaultButtonClassBorderColor }" />
Android="{ StaticResource AndroidDefaultButtonClassBorderColor }" <On Platform="Android" Value="{ StaticResource AndroidDefaultButtonClassBorderColor }" />
iOS="{ StaticResource iOSDefaultButtonClassBorderColor }" /> </OnPlatform>
<OnPlatform <OnPlatform x:TypeArguments="Color"
x:TypeArguments="Color" x:Key="DefaultButtonClassTextColor">
x:Key="DefaultButtonClassTextColor" <On Platform="iOS" Value="{ StaticResource iOSDefaultButtonClassTextColor }" />
Android="{ StaticResource AndroidDefaultButtonClassTextColor }" <On Platform="Android" Value="{ StaticResource AndroidDefaultButtonClassTextColor }" />
iOS="{ StaticResource iOSDefaultButtonClassTextColor }" /> </OnPlatform>
<OnPlatform <OnPlatform x:TypeArguments="Color"
x:TypeArguments="Color" x:Key="EntryBackgroundColor">
x:Key="EntryBackgroundColor" <On Platform="iOS" Value="{ StaticResource iOSEntryBackgroundColor }" />
Android="{ StaticResource AndroidEntryBackgroundColor }" <On Platform="Android" Value="{ StaticResource AndroidEntryBackgroundColor }" />
iOS="{ StaticResource iOSEntryBackgroundColor }" /> </OnPlatform>
<OnPlatform <OnPlatform x:TypeArguments="Color"
x:TypeArguments="Color" x:Key="ThemeListViewBackgroundColor">
x:Key="ThemeListViewBackgroundColor" <On Platform="iOS" Value="{ StaticResource iOSListViewBackgroundColor }" />
Android="{ StaticResource AndroidListViewBackgroundColor }" <On Platform="Android" Value="{ StaticResource AndroidListViewBackgroundColor }" />
iOS="{ StaticResource iOSListViewBackgroundColor }" /> </OnPlatform>
<!-- SIZES --> <!-- SIZES -->
<OnPlatform <OnPlatform x:TypeArguments="x:Double"
x:TypeArguments="x:Double" x:Key="BaseButtonBorderRadius">
x:Key="BaseButtonBorderRadius" <On Platform="iOS" Value="6" />
iOS="6" /> </OnPlatform>
<OnPlatform <OnPlatform x:TypeArguments="x:Double"
x:TypeArguments="x:Double" x:Key="BaseButtonBorderWidth">
x:Key="BaseButtonBorderWidth" <On Platform="iOS, Android" Value="0" />
Android="0" </OnPlatform>
iOS="0" />
<!-- FONTS --> <!-- FONTS -->
<OnPlatform <OnPlatform x:Key="MontserratRegular"
x:Key="MontserratRegular" x:TypeArguments="x:String">
x:TypeArguments="x:String" <On Platform="iOS" Value="Montserrat-Regular" />
iOS="Montserrat-Regular" <On Platform="Android" Value="Montserrat-Regular.ttf#Montserrat" />
Android="Montserrat-Regular.ttf#Montserrat" <On Platform="UWP, WinRT, WinPhone" Value="Assets/Fonts/Montserrat-Regular.ttf#Montserrat" />
WinPhone="Assets/Fonts/Montserrat-Regular.ttf#Montserrat"/> </OnPlatform>
<OnPlatform <OnPlatform x:Key="MontserratBold"
x:Key="MontserratBold" x:TypeArguments="x:String">
x:TypeArguments="x:String" <On Platform="iOS" Value="Montserrat-Bold" />
iOS="Montserrat-Bold" <On Platform="Android" Value="Montserrat-Bold.ttf#Montserrat" />
Android="Montserrat-Bold.ttf#Montserrat" <On Platform="UWP, WinRT, WinPhone" Value="Assets/Fonts/Montserrat-Bold.ttf#Montserrat" />
WinPhone="Assets/Fonts/Montserrat-Bold.ttf#Montserrat"/> </OnPlatform>
<OnPlatform <OnPlatform x:Key="SourceSansProRegular"
x:Key="SourceSansProRegular" x:TypeArguments="x:String">
x:TypeArguments="x:String" <On Platform="iOS" Value="SourceSansPro-Regular" />
iOS="SourceSansPro-Regular" <On Platform="Android" Value="SourceSansPro-Regular.ttf#Source Sans Pro" />
Android="SourceSansPro-Regular.ttf#Source Sans Pro" <On Platform="UWP, WinRT, WinPhone" Value="Assets/Fonts/SourceSansPro-Regular.ttf#Source Sans Pro" />
WinPhone="Assets/Fonts/SourceSansPro-Regular.ttf#Source Sans Pro"/> </OnPlatform>
<OnPlatform <OnPlatform x:TypeArguments="x:Double"
x:TypeArguments="x:Double" x:Key="BaseButtonFontSize">
x:Key="BaseButtonFontSize" <On Platform="iOS" Value="18" />
Android="16" <On Platform="Android" Value="16" />
iOS="18" /> </OnPlatform>
<OnPlatform <OnPlatform x:TypeArguments="x:Double"
x:TypeArguments="x:Double" x:Key="BaseFontSize">
x:Key="BaseFontSize" <On Platform="iOS" Value="16" />
Android="15" <On Platform="Android" Value="15" />
iOS="16" /> </OnPlatform>
<OnPlatform <OnPlatform x:Key="LittleSize"
x:Key="LittleSize" x:TypeArguments="x:Double">
x:TypeArguments="x:Double" <On Platform="iOS" Value="11" />
iOS="11" <On Platform="Android, UWP, WinRT, WinPhone" Value="12" />
Android="12" </OnPlatform>
WinPhone="12"/>
<OnPlatform <OnPlatform x:Key="MidMediumSize"
x:Key="MidMediumSize" x:TypeArguments="x:Double">
x:TypeArguments="x:Double" <On Platform="iOS" Value="12" />
iOS="12" <On Platform="Android, UWP, WinRT, WinPhone" Value="14" />
Android="14" </OnPlatform>
WinPhone="14"/>
<OnPlatform <OnPlatform x:Key="MediumSize"
x:Key="MediumSize" x:TypeArguments="x:Double">
x:TypeArguments="x:Double" <On Platform="iOS" Value="14" />
iOS="14" <On Platform="Android, UWP, WinRT, WinPhone" Value="16" />
Android="16" </OnPlatform>
WinPhone="16"/>
<OnPlatform <OnPlatform x:Key="LargeSize"
x:Key="LargeSize" x:TypeArguments="x:Double">
x:TypeArguments="x:Double" <On Platform="iOS" Value="16" />
iOS="16" <On Platform="Android, UWP, WinRT, WinPhone" Value="18" />
Android="18" </OnPlatform>
WinPhone="18"/>
<OnPlatform <OnPlatform x:Key="LargerSize"
x:Key="LargerSize" x:TypeArguments="x:Double">
x:TypeArguments="x:Double" <On Platform="iOS" Value="18" />
iOS="18" <On Platform="Android, UWP, WinRT, WinPhone" Value="20" />
Android="20" </OnPlatform>
WinPhone="20"/>
<OnPlatform <OnPlatform x:Key="BigSize"
x:Key="BigSize" x:TypeArguments="x:Double">
x:TypeArguments="x:Double" <On Platform="iOS" Value="20" />
iOS="20" <On Platform="Android, UWP, WinRT, WinPhone" Value="24" />
Android="24" </OnPlatform>
WinPhone="24"/>
<OnPlatform <OnPlatform x:Key="ExtraBigSize"
x:Key="ExtraBigSize" x:TypeArguments="x:Double">
x:TypeArguments="x:Double" <On Platform="iOS" Value="24" />
iOS="24" <On Platform="Android, UWP, WinRT, WinPhone" Value="32" />
Android="32" </OnPlatform>
WinPhone="32"/>
<OnPlatform <OnPlatform x:Key="HugeSize"
x:Key="HugeSize" x:TypeArguments="x:Double">
x:TypeArguments="x:Double" <On Platform="iOS" Value="32" />
iOS="32" <On Platform="Android, UWP, WinRT, WinPhone" Value="48" />
Android="48" </OnPlatform>
WinPhone="48"/>
<OnPlatform <OnPlatform x:TypeArguments="FontAttributes"
x:TypeArguments="FontAttributes" x:Key="BaseButtonFontAttributes">
x:Key="BaseButtonFontAttributes" <On Platform="iOS" Value="Bold" />
Android="None" <On Platform="Android" Value="None" />
iOS="Bold" /> </OnPlatform>
<!-- CONVERTERS --> <!-- CONVERTERS -->
<converters:CountToBoolConverter x:Key="CountToBoolConverter" /> <converters:CountToBoolConverter x:Key="CountToBoolConverter" />

18
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Controls/AddBasketButton.xaml
View File

@ -44,11 +44,10 @@
<!-- ANDROID --> <!-- ANDROID -->
<Grid> <Grid>
<Grid.IsVisible> <Grid.IsVisible>
<OnPlatform <OnPlatform x:TypeArguments="x:Boolean">
x:TypeArguments="x:Boolean" <On Platform="iOS, Android" Value="True" />
Android="True" <On Platform="UWP, WinRT, WinPhone" Value="False" />
iOS="True" </OnPlatform>
WinPhone="False"/>
</Grid.IsVisible> </Grid.IsVisible>
<BoxView <BoxView
BackgroundColor="{StaticResource LightGreenColor}" BackgroundColor="{StaticResource LightGreenColor}"
@ -64,11 +63,10 @@
<!-- IOS & UWP --> <!-- IOS & UWP -->
<Grid> <Grid>
<Grid.IsVisible> <Grid.IsVisible>
<OnPlatform <OnPlatform x:TypeArguments="x:Boolean">
x:TypeArguments="x:Boolean" <On Platform="iOS, Android" Value="False" />
Android="False" <On Platform="UWP, WinRT, WinPhone" Value="True" />
iOS="False" </OnPlatform>
WinPhone="True"/>
</Grid.IsVisible> </Grid.IsVisible>
<Image <Image
Source="Assets\circle_button_background.png" Source="Assets\circle_button_background.png"

9
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignDetailsView.xaml
View File

@ -171,11 +171,10 @@
VerticalOptions="Center" VerticalOptions="Center"
HorizontalOptions="Center"> HorizontalOptions="Center">
<ActivityIndicator.WidthRequest> <ActivityIndicator.WidthRequest>
<OnPlatform <OnPlatform x:TypeArguments="x:Double">
x:TypeArguments="x:Double" <On Platform="iOS, Android" Value="100" />
iOS="100" <On Platform="UWP, WinRT, WinPhone" Value="400" />
Android="100" </OnPlatform>
WinPhone="400" />
</ActivityIndicator.WidthRequest> </ActivityIndicator.WidthRequest>
</ActivityIndicator> </ActivityIndicator>
</Grid> </Grid>

9
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignView.xaml
View File

@ -90,11 +90,10 @@
VerticalOptions="Center" VerticalOptions="Center"
HorizontalOptions="Center"> HorizontalOptions="Center">
<ActivityIndicator.WidthRequest> <ActivityIndicator.WidthRequest>
<OnPlatform <OnPlatform x:TypeArguments="x:Double">
x:TypeArguments="x:Double" <On Platform="iOS, Android" Value="100" />
iOS="100" <On Platform="UWP, WinRT, WinPhone" Value="400" />
Android="100" </OnPlatform>
WinPhone="400" />
</ActivityIndicator.WidthRequest> </ActivityIndicator.WidthRequest>
</ActivityIndicator> </ActivityIndicator>
</Grid> </Grid>

9
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CatalogView.xaml
View File

@ -114,11 +114,10 @@
VerticalOptions="Center" VerticalOptions="Center"
HorizontalOptions="Center"> HorizontalOptions="Center">
<ActivityIndicator.WidthRequest> <ActivityIndicator.WidthRequest>
<OnPlatform <OnPlatform x:TypeArguments="x:Double">
x:TypeArguments="x:Double" <On Platform="iOS, Android" Value="100" />
iOS="100" <On Platform="UWP, WinRT, WinPhone" Value="400" />
Android="100" </OnPlatform>
WinPhone="400" />
</ActivityIndicator.WidthRequest> </ActivityIndicator.WidthRequest>
</ActivityIndicator> </ActivityIndicator>
</Grid> </Grid>

9
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CheckoutView.xaml
View File

@ -231,11 +231,10 @@
VerticalOptions="Center" VerticalOptions="Center"
HorizontalOptions="Center"> HorizontalOptions="Center">
<ActivityIndicator.WidthRequest> <ActivityIndicator.WidthRequest>
<OnPlatform <OnPlatform x:TypeArguments="x:Double">
x:TypeArguments="x:Double" <On Platform="iOS, Android" Value="100" />
iOS="100" <On Platform="UWP, WinRT, WinPhone" Value="400" />
Android="100" </OnPlatform>
WinPhone="400" />
</ActivityIndicator.WidthRequest> </ActivityIndicator.WidthRequest>
</ActivityIndicator> </ActivityIndicator>
</Grid> </Grid>

18
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/FiltersView.xaml
View File

@ -76,11 +76,10 @@
SelectedItem="{Binding Brand, Mode=TwoWay}" SelectedItem="{Binding Brand, Mode=TwoWay}"
Style="{StaticResource FilterPickerStyle}"> Style="{StaticResource FilterPickerStyle}">
<Picker.HeightRequest> <Picker.HeightRequest>
<OnPlatform <OnPlatform x:TypeArguments="x:Double">
x:TypeArguments="x:Double" <On Platform="iOS, Android" Value="48" />
Android="48" <On Platform="UWP, WinRT, WinPhone" Value="36" />
iOS="48" </OnPlatform>
WinPhone="36"/>
</Picker.HeightRequest> </Picker.HeightRequest>
</Picker> </Picker>
<!-- TYPE --> <!-- TYPE -->
@ -91,11 +90,10 @@
SelectedItem="{Binding Type, Mode=TwoWay}" SelectedItem="{Binding Type, Mode=TwoWay}"
Style="{StaticResource FilterPickerStyle}"> Style="{StaticResource FilterPickerStyle}">
<Picker.HeightRequest> <Picker.HeightRequest>
<OnPlatform <OnPlatform x:TypeArguments="x:Double">
x:TypeArguments="x:Double" <On Platform="iOS, Android" Value="48" />
Android="48" <On Platform="UWP, WinRT, WinPhone" Value="36" />
iOS="48" </OnPlatform>
WinPhone="36"/>
</Picker.HeightRequest> </Picker.HeightRequest>
</Picker> </Picker>
<Button <Button

84
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml
View File

@ -9,10 +9,9 @@
xmlns:behaviors="clr-namespace:eShopOnContainers.Core.Behaviors;assembly=eShopOnContainers.Core" xmlns:behaviors="clr-namespace:eShopOnContainers.Core.Behaviors;assembly=eShopOnContainers.Core"
viewModelBase:ViewModelLocator.AutoWireViewModel="true"> viewModelBase:ViewModelLocator.AutoWireViewModel="true">
<ContentPage.Title> <ContentPage.Title>
<OnPlatform <OnPlatform x:TypeArguments="x:String">
x:TypeArguments="x:String" <On Platform="iOS, UWP, WinRT, WinPhone" Value="eShop on Containers" />
iOS="eShop on Containers" </OnPlatform>
WinPhone="eShop on Containers"/>
</ContentPage.Title> </ContentPage.Title>
<ContentPage.Resources> <ContentPage.Resources>
<ResourceDictionary> <ResourceDictionary>
@ -179,10 +178,10 @@
Style="{StaticResource HeaderLabelStyle}" /> Style="{StaticResource HeaderLabelStyle}" />
<Entry Text="{Binding UserName.Value, Mode=TwoWay}"> <Entry Text="{Binding UserName.Value, Mode=TwoWay}">
<Entry.Style> <Entry.Style>
<OnPlatform x:TypeArguments="Style" <OnPlatform x:TypeArguments="Style">
iOS="{StaticResource EntryStyle}" <On Platform="iOS, Android" Value="{StaticResource EntryStyle}" />
Android="{StaticResource EntryStyle}" <On Platform="UWP, WinRT, WinPhone" Value="{StaticResource UwpEntryStyle}" />
WinPhone="{StaticResource UwpEntryStyle}"/> </OnPlatform>
</Entry.Style> </Entry.Style>
<Entry.Behaviors> <Entry.Behaviors>
<behaviors:EventToCommandBehavior <behaviors:EventToCommandBehavior
@ -208,10 +207,10 @@
IsPassword="True" IsPassword="True"
Text="{Binding Password.Value, Mode=TwoWay}"> Text="{Binding Password.Value, Mode=TwoWay}">
<Entry.Style> <Entry.Style>
<OnPlatform x:TypeArguments="Style" <OnPlatform x:TypeArguments="Style">
iOS="{StaticResource EntryStyle}" <On Platform="iOS, Android" Value="{StaticResource EntryStyle}" />
Android="{StaticResource EntryStyle}" <On Platform="UWP, WinRT, WinPhone" Value="{StaticResource UwpEntryStyle}" />
WinPhone="{StaticResource UwpEntryStyle}"/> </OnPlatform>
</Entry.Style> </Entry.Style>
<Entry.Behaviors> <Entry.Behaviors>
<behaviors:EventToCommandBehavior <behaviors:EventToCommandBehavior
@ -270,11 +269,10 @@
Grid.ColumnSpan="3" Grid.ColumnSpan="3"
Aspect="AspectFill"> Aspect="AspectFill">
<Image.Source> <Image.Source>
<OnPlatform <OnPlatform x:TypeArguments="ImageSource">
x:TypeArguments="ImageSource" <On Platform="iOS, Android" Value="banner.png" />
Android="banner.png" <On Platform="UWP, WinRT, WinPhone" Value="Assets\banner.png" />
iOS="banner.png" </OnPlatform>
WinPhone="Assets\banner.png"/>
</Image.Source> </Image.Source>
</Image> </Image>
<Grid <Grid
@ -319,11 +317,10 @@
<Image <Image
Style="{StaticResource SettingsImageStyle}"> Style="{StaticResource SettingsImageStyle}">
<Image.Source> <Image.Source>
<OnPlatform <OnPlatform x:TypeArguments="ImageSource">
x:TypeArguments="ImageSource" <On Platform="iOS, Android" Value="app_settings" />
WinPhone="Assets/app_settings.png" <On Platform="UWP, WinRT, WinPhone" Value="Assets/app_settings.png" />
Android="app_settings" </OnPlatform>
iOS="app_settings"/>
</Image.Source> </Image.Source>
</Image> </Image>
<Grid.GestureRecognizers> <Grid.GestureRecognizers>
@ -345,24 +342,22 @@
AbsoluteLayout.LayoutFlags="All"> AbsoluteLayout.LayoutFlags="All">
<WebView.Behaviors> <WebView.Behaviors>
<OnPlatform x:TypeArguments="Behavior"> <OnPlatform x:TypeArguments="Behavior">
<OnPlatform.Android> <On Platform="iOS, Android">
<behaviors:EventToCommandBehavior <On.Value>
EventName="Navigating" <behaviors:EventToCommandBehavior
EventArgsConverter="{StaticResource WebNavigatingEventArgsConverter}" EventName="Navigating"
Command="{Binding NavigateCommand}" /> EventArgsConverter="{StaticResource WebNavigatingEventArgsConverter}"
</OnPlatform.Android> Command="{Binding NavigateCommand}" />
<OnPlatform.iOS> </On.Value>
<behaviors:EventToCommandBehavior </On>
EventName="Navigating" <On Platform="UWP">
EventArgsConverter="{StaticResource WebNavigatingEventArgsConverter}" <On.Value>
Command="{Binding NavigateCommand}" /> <behaviors:EventToCommandBehavior
</OnPlatform.iOS> EventName="Navigated"
<OnPlatform.WinPhone> EventArgsConverter="{StaticResource WebNavigatedEventArgsConverter}"
<behaviors:EventToCommandBehavior Command="{Binding NavigateCommand}" />
EventName="Navigated" </On.Value>
EventArgsConverter="{StaticResource WebNavigatedEventArgsConverter}" </On>
Command="{Binding NavigateCommand}" />
</OnPlatform.WinPhone>
</OnPlatform> </OnPlatform>
</WebView.Behaviors> </WebView.Behaviors>
</WebView> </WebView>
@ -376,11 +371,10 @@
VerticalOptions="Center" VerticalOptions="Center"
HorizontalOptions="Center"> HorizontalOptions="Center">
<ActivityIndicator.WidthRequest> <ActivityIndicator.WidthRequest>
<OnPlatform <OnPlatform x:TypeArguments="x:Double">
x:TypeArguments="x:Double" <On Platform="iOS, Android" Value="100" />
iOS="100" <On Platform="UWP, WinRT, WinPhone" Value="400" />
Android="100" </OnPlatform>
WinPhone="400" />
</ActivityIndicator.WidthRequest> </ActivityIndicator.WidthRequest>
</ActivityIndicator> </ActivityIndicator>
</Grid> </Grid>

52
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml
View File

@ -10,21 +10,19 @@
BarTextColor="{StaticResource WhiteColor}" BarTextColor="{StaticResource WhiteColor}"
viewModelBase:ViewModelLocator.AutoWireViewModel="true"> viewModelBase:ViewModelLocator.AutoWireViewModel="true">
<TabbedPage.Title> <TabbedPage.Title>
<OnPlatform <OnPlatform x:TypeArguments="x:String">
x:TypeArguments="x:String" <On Platform="iOS, UWP, WinRT, WinPhone" Value="eShop on Containers" />
iOS="eShop on Containers" </OnPlatform>
WinPhone="eShop on Containers"/>
</TabbedPage.Title> </TabbedPage.Title>
<ContentPage.ToolbarItems> <ContentPage.ToolbarItems>
<ToolbarItem <ToolbarItem
Command="{Binding SettingsCommand}" Command="{Binding SettingsCommand}"
Text="Settings"> Text="Settings">
<ToolbarItem.Icon> <ToolbarItem.Icon>
<OnPlatform <OnPlatform x:TypeArguments="FileImageSource">
x:TypeArguments="FileImageSource" <On Platform="iOS, Android" Value="app_settings" />
WinPhone="Assets/app_settings.png" <On Platform="UWP, WinRT, WinPhone" Value="Assets/app_settings.png" />
Android="app_settings" </OnPlatform>
iOS="app_settings"/>
</ToolbarItem.Icon> </ToolbarItem.Icon>
</ToolbarItem> </ToolbarItem>
</ContentPage.ToolbarItems> </ContentPage.ToolbarItems>
@ -32,22 +30,20 @@
<views:CatalogView <views:CatalogView
x:Name="HomeView"> x:Name="HomeView">
<views:CatalogView.Icon> <views:CatalogView.Icon>
<OnPlatform <OnPlatform x:TypeArguments="FileImageSource">
x:TypeArguments="FileImageSource" <On Platform="iOS, Android" Value="menu_filter" />
Android="menu_filter" <On Platform="UWP, WinRT, WinPhone" Value="Assets\menu_filter.png" />
iOS="menu_filter" </OnPlatform>
WinPhone="Assets\menu_filter.png"/>
</views:CatalogView.Icon> </views:CatalogView.Icon>
</views:CatalogView> </views:CatalogView>
<!-- PROFILE --> <!-- PROFILE -->
<views:ProfileView <views:ProfileView
x:Name="ProfileView"> x:Name="ProfileView">
<views:ProfileView.Icon> <views:ProfileView.Icon>
<OnPlatform <OnPlatform x:TypeArguments="FileImageSource">
x:TypeArguments="FileImageSource" <On Platform="iOS, Android" Value="menu_profile" />
Android="menu_profile" <On Platform="UWP, WinRT, WinPhone" Value="Assets\menu_profile.png" />
iOS="menu_profile" </OnPlatform>
WinPhone="Assets\menu_profile.png"/>
</views:ProfileView.Icon> </views:ProfileView.Icon>
</views:ProfileView> </views:ProfileView>
<!-- BASKET --> <!-- BASKET -->
@ -56,22 +52,20 @@
controls:CustomTabbedPage.BadgeText="{Binding BadgeCount}" controls:CustomTabbedPage.BadgeText="{Binding BadgeCount}"
controls:CustomTabbedPage.BadgeColor="{StaticResource LightGreenColor}"> controls:CustomTabbedPage.BadgeColor="{StaticResource LightGreenColor}">
<views:BasketView.Icon> <views:BasketView.Icon>
<OnPlatform <OnPlatform x:TypeArguments="FileImageSource">
x:TypeArguments="FileImageSource" <On Platform="iOS, Android" Value="menu_cart" />
Android="menu_cart" <On Platform="UWP, WinRT, WinPhone" Value="Assets\menu_cart.png" />
iOS="menu_cart" </OnPlatform>
WinPhone="Assets\menu_cart.png"/>
</views:BasketView.Icon> </views:BasketView.Icon>
</views:BasketView> </views:BasketView>
<!-- CAMPAIGNS --> <!-- CAMPAIGNS -->
<views:CampaignView <views:CampaignView
x:Name="CampaignView"> x:Name="CampaignView">
<views:CampaignView.Icon> <views:CampaignView.Icon>
<OnPlatform <OnPlatform x:TypeArguments="FileImageSource">
x:TypeArguments="FileImageSource" <On Platform="iOS, Android" Value="menu_campaigns" />
Android="menu_campaigns" <On Platform="UWP, WinRT, WinPhone" Value="Assets\menu_campaigns.png" />
iOS="menu_campaigns" </OnPlatform>
WinPhone="Assets\menu_campaigns.png"/>
</views:CampaignView.Icon> </views:CampaignView.Icon>
</views:CampaignView> </views:CampaignView>
</TabbedPage> </TabbedPage>

9
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/OrderDetailView.xaml
View File

@ -264,11 +264,10 @@
VerticalOptions="Center" VerticalOptions="Center"
HorizontalOptions="Center"> HorizontalOptions="Center">
<ActivityIndicator.WidthRequest> <ActivityIndicator.WidthRequest>
<OnPlatform <OnPlatform x:TypeArguments="x:Double">
x:TypeArguments="x:Double" <On Platform="iOS, Android" Value="100" />
iOS="100" <On Platform="UWP, WinRT, WinPhone" Value="400" />
Android="100" </OnPlatform>
WinPhone="400" />
</ActivityIndicator.WidthRequest> </ActivityIndicator.WidthRequest>
</ActivityIndicator> </ActivityIndicator>
</Grid> </Grid>

90
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/SettingsView.xaml
View File

@ -99,11 +99,10 @@
<animations:FadeInAnimation <animations:FadeInAnimation
Direction="Up"> Direction="Up">
<animations:FadeInAnimation.Duration> <animations:FadeInAnimation.Duration>
<OnPlatform <OnPlatform x:TypeArguments="x:String">
x:TypeArguments="x:String" <On Platform="iOS" Value="0" />
Android="500" <On Platform="Android, UWP, WinRT, WinPhone" Value="500" />
iOS="0" </OnPlatform>
WinPhone="500"/>
</animations:FadeInAnimation.Duration> </animations:FadeInAnimation.Duration>
</animations:FadeInAnimation> </animations:FadeInAnimation>
</animations:StoryBoard> </animations:StoryBoard>
@ -156,16 +155,18 @@
Command="{Binding ToggleMockServicesCommand}" Command="{Binding ToggleMockServicesCommand}"
Style="{StaticResource SettingsToggleButtonStyle}"> Style="{StaticResource SettingsToggleButtonStyle}">
<controls:ToggleButton.CheckedImage> <controls:ToggleButton.CheckedImage>
<OnPlatform x:TypeArguments="ImageSource" <OnPlatform x:TypeArguments="ImageSource">
Android="switch_on.png" <On Platform="iOS" Value="switchOn.png" />
iOS="switchOn.png" <On Platform="Android" Value="switch_on.png" />
WinPhone="Assets/switchOn.png"/> <On Platform="UWP, WinRT, WinPhone" Value="Assets/switchOn.png" />
</OnPlatform>
</controls:ToggleButton.CheckedImage> </controls:ToggleButton.CheckedImage>
<controls:ToggleButton.UnCheckedImage> <controls:ToggleButton.UnCheckedImage>
<OnPlatform x:TypeArguments="ImageSource" <OnPlatform x:TypeArguments="ImageSource">
Android="switch_off.png" <On Platform="iOS" Value="switchOff.png" />
iOS="switchOff.png" <On Platform="Android" Value="switch_off.png" />
WinPhone="Assets/switchOff.png"/> <On Platform="UWP, WinRT, WinPhone" Value="Assets/switchOff.png" />
</OnPlatform>
</controls:ToggleButton.UnCheckedImage> </controls:ToggleButton.UnCheckedImage>
</controls:ToggleButton> </controls:ToggleButton>
<!-- ENDPOINT --> <!-- ENDPOINT -->
@ -181,11 +182,10 @@
<Entry <Entry
Text="{Binding Endpoint, Mode=TwoWay}"> Text="{Binding Endpoint, Mode=TwoWay}">
<Entry.Style> <Entry.Style>
<OnPlatform <OnPlatform x:TypeArguments="Style">
x:TypeArguments="Style" <On Platform="iOS, Android" Value="{StaticResource SettingsEntryStyle}" />
iOS="{StaticResource SettingsEntryStyle}" <On Platform="UWP, WinRT, WinPhone" Value="{StaticResource SettingsUwpEntryStyle}" />
Android="{StaticResource SettingsEntryStyle}" </OnPlatform>
WinPhone="{StaticResource SettingsUwpEntryStyle}"/>
</Entry.Style> </Entry.Style>
</Entry> </Entry>
</StackLayout> </StackLayout>
@ -212,16 +212,18 @@
Style="{StaticResource SettingsToggleButtonStyle}" Style="{StaticResource SettingsToggleButtonStyle}"
IsVisible="{Binding UserIsLogged}"> IsVisible="{Binding UserIsLogged}">
<controls:ToggleButton.CheckedImage> <controls:ToggleButton.CheckedImage>
<OnPlatform x:TypeArguments="ImageSource" <OnPlatform x:TypeArguments="ImageSource">
Android="switch_on.png" <On Platform="iOS" Value="switchOn.png" />
iOS="switchOn.png" <On Platform="Android" Value="switch_on.png" />
WinPhone="Assets/switchOn.png"/> <On Platform="UWP, WinRT, WinPhone" Value="Assets/switchOn.png" />
</OnPlatform>
</controls:ToggleButton.CheckedImage> </controls:ToggleButton.CheckedImage>
<controls:ToggleButton.UnCheckedImage> <controls:ToggleButton.UnCheckedImage>
<OnPlatform x:TypeArguments="ImageSource" <OnPlatform x:TypeArguments="ImageSource">
Android="switch_off.png" <On Platform="iOS" Value="switchOff.png" />
iOS="switchOff.png" <On Platform="Android" Value="switch_off.png" />
WinPhone="Assets/switchOff.png"/> <On Platform="UWP, WinRT, WinPhone" Value="Assets/switchOff.png" />
</OnPlatform>
</controls:ToggleButton.UnCheckedImage> </controls:ToggleButton.UnCheckedImage>
</controls:ToggleButton> </controls:ToggleButton>
<!-- FAKE LOCATIONS --> <!-- FAKE LOCATIONS -->
@ -238,11 +240,10 @@
Text="{Binding Latitude, Mode=TwoWay, Converter={StaticResource DoubleConverter}}" Text="{Binding Latitude, Mode=TwoWay, Converter={StaticResource DoubleConverter}}"
Keyboard="Text"> Keyboard="Text">
<Entry.Style> <Entry.Style>
<OnPlatform <OnPlatform x:TypeArguments="Style">
x:TypeArguments="Style" <On Platform="iOS, Android" Value="{StaticResource SettingsEntryStyle}" />
iOS="{StaticResource SettingsEntryStyle}" <On Platform="UWP, WinRT, WinPhone" Value="{StaticResource SettingsUwpEntryStyle}" />
Android="{StaticResource SettingsEntryStyle}" </OnPlatform>
WinPhone="{StaticResource SettingsUwpEntryStyle}"/>
</Entry.Style> </Entry.Style>
</Entry> </Entry>
<Label <Label
@ -252,11 +253,10 @@
Text="{Binding Longitude, Mode=TwoWay, Converter={StaticResource DoubleConverter}}" Text="{Binding Longitude, Mode=TwoWay, Converter={StaticResource DoubleConverter}}"
Keyboard="Text"> Keyboard="Text">
<Entry.Style> <Entry.Style>
<OnPlatform <OnPlatform x:TypeArguments="Style">
x:TypeArguments="Style" <On Platform="iOS, Android" Value="{StaticResource SettingsEntryStyle}" />
iOS="{StaticResource SettingsEntryStyle}" <On Platform="UWP, WinRT, WinPhone" Value="{StaticResource SettingsUwpEntryStyle}" />
Android="{StaticResource SettingsEntryStyle}" </OnPlatform>
WinPhone="{StaticResource SettingsUwpEntryStyle}"/>
</Entry.Style> </Entry.Style>
</Entry> </Entry>
<Button <Button
@ -289,16 +289,18 @@
Style="{StaticResource SettingsToggleButtonStyle}" Style="{StaticResource SettingsToggleButtonStyle}"
IsVisible="{Binding UseFakeLocation, Converter={StaticResource InverseBoolConverter}}"> IsVisible="{Binding UseFakeLocation, Converter={StaticResource InverseBoolConverter}}">
<controls:ToggleButton.CheckedImage> <controls:ToggleButton.CheckedImage>
<OnPlatform x:TypeArguments="ImageSource" <OnPlatform x:TypeArguments="ImageSource">
Android="switch_on.png" <On Platform="iOS" Value="switchOn.png" />
iOS="switchOn.png" <On Platform="Android" Value="switch_on.png" />
WinPhone="Assets/switchOn.png"/> <On Platform="UWP, WinRT, WinPhone" Value="Assets/switchOn.png" />
</OnPlatform>
</controls:ToggleButton.CheckedImage> </controls:ToggleButton.CheckedImage>
<controls:ToggleButton.UnCheckedImage> <controls:ToggleButton.UnCheckedImage>
<OnPlatform x:TypeArguments="ImageSource" <OnPlatform x:TypeArguments="ImageSource">
Android="switch_off.png" <On Platform="iOS" Value="switchOff.png" />
iOS="switchOff.png" <On Platform="Android" Value="switch_off.png" />
WinPhone="Assets/switchOff.png"/> <On Platform="UWP, WinRT, WinPhone" Value="Assets/switchOff.png" />
</OnPlatform>
</controls:ToggleButton.UnCheckedImage> </controls:ToggleButton.UnCheckedImage>
</controls:ToggleButton> </controls:ToggleButton>
</Grid> </Grid>

11
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/BasketItemTemplate.xaml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ContentView <ContentView
xmlns="http://xamarin.com/schemas/2014/forms" xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
@ -71,11 +71,10 @@
<Grid <Grid
BackgroundColor="{StaticResource BackgroundColor}"> BackgroundColor="{StaticResource BackgroundColor}">
<Grid.Padding> <Grid.Padding>
<OnPlatform <OnPlatform x:TypeArguments="Thickness">
x:TypeArguments="Thickness" <On Platform="iOS, Android" Value="0" />
Android="0" <On Platform="UWP, WinRT, WinPhone" Value="12, 0" />
iOS="0" </OnPlatform>
WinPhone="12, 0"/>
</Grid.Padding> </Grid.Padding>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />

20
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/CampaignTemplate.xaml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ContentView <ContentView
xmlns="http://xamarin.com/schemas/2014/forms" xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
@ -59,18 +59,16 @@
Source="{Binding PictureUri}" Source="{Binding PictureUri}"
Aspect="AspectFill"> Aspect="AspectFill">
<ffimageloading:CachedImage.LoadingPlaceholder> <ffimageloading:CachedImage.LoadingPlaceholder>
<OnPlatform <OnPlatform x:TypeArguments="ImageSource">
x:TypeArguments="ImageSource" <On Platform="iOS, Android" Value="default_campaign" />
iOS="default_campaign" <On Platform="UWP, WinRT, WinPhone" Value="Assets/default_campaign.png" />
Android="default_campaign" </OnPlatform>
WinPhone="Assets/default_campaign.png"/>
</ffimageloading:CachedImage.LoadingPlaceholder> </ffimageloading:CachedImage.LoadingPlaceholder>
<ffimageloading:CachedImage.ErrorPlaceholder> <ffimageloading:CachedImage.ErrorPlaceholder>
<OnPlatform <OnPlatform x:TypeArguments="ImageSource">
x:TypeArguments="ImageSource" <On Platform="iOS, Android" Value="noimage" />
iOS="noimage" <On Platform="UWP, WinRT, WinPhone" Value="Assets/noimage.png" />
Android="noimage" </OnPlatform>
WinPhone="Assets/noimage.png"/>
</ffimageloading:CachedImage.ErrorPlaceholder> </ffimageloading:CachedImage.ErrorPlaceholder>
</ffimageloading:CachedImage> </ffimageloading:CachedImage>
<!-- NAME --> <!-- NAME -->

20
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/ProductTemplate.xaml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ContentView <ContentView
xmlns="http://xamarin.com/schemas/2014/forms" xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
@ -76,18 +76,16 @@
Source="{Binding PictureUri}" Source="{Binding PictureUri}"
Aspect="AspectFill"> Aspect="AspectFill">
<ffimageloading:CachedImage.LoadingPlaceholder> <ffimageloading:CachedImage.LoadingPlaceholder>
<OnPlatform <OnPlatform x:TypeArguments="ImageSource">
x:TypeArguments="ImageSource" <On Platform="iOS, Android" Value="default_product" />
iOS="default_product" <On Platform="UWP, WinRT, WinPhone" Value="Assets/default_product.png" />
Android="default_product" </OnPlatform>
WinPhone="Assets/default_product.png"/>
</ffimageloading:CachedImage.LoadingPlaceholder> </ffimageloading:CachedImage.LoadingPlaceholder>
<ffimageloading:CachedImage.ErrorPlaceholder> <ffimageloading:CachedImage.ErrorPlaceholder>
<OnPlatform <OnPlatform x:TypeArguments="ImageSource">
x:TypeArguments="ImageSource" <On Platform="iOS, Android" Value="noimage" />
iOS="noimage" <On Platform="UWP, WinRT, WinPhone" Value="Assets/noimage.png" />
Android="noimage" </OnPlatform>
WinPhone="Assets/noimage.png"/>
</ffimageloading:CachedImage.ErrorPlaceholder> </ffimageloading:CachedImage.ErrorPlaceholder>
</ffimageloading:CachedImage> </ffimageloading:CachedImage>
<Grid <Grid