diff options
author | Jason Smith <jason.smith@xamarin.com> | 2016-04-26 15:35:52 -0400 |
---|---|---|
committer | Jason Smith <jason.smith@xamarin.com> | 2016-04-26 15:35:52 -0400 |
commit | 409e10528495238a680c1bf3867a71f758b0d452 (patch) | |
tree | 0cb19f682b0b192ebad3dc0c77cfe32974abe09c /Xamarin.Forms.Platform.UAP | |
parent | 9ae4ea3c82444561353eb77bf746f96cdbfb4583 (diff) | |
download | xamarin-forms-409e10528495238a680c1bf3867a71f758b0d452.tar.gz xamarin-forms-409e10528495238a680c1bf3867a71f758b0d452.tar.bz2 xamarin-forms-409e10528495238a680c1bf3867a71f758b0d452.zip |
Carousel clean (#135)
CarouselView moving to preview repo
Diffstat (limited to 'Xamarin.Forms.Platform.UAP')
-rw-r--r-- | Xamarin.Forms.Platform.UAP/Properties/AssemblyInfo.cs | 1 | ||||
-rw-r--r-- | Xamarin.Forms.Platform.UAP/Resources.xaml | 42 | ||||
-rw-r--r-- | Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj | 9 |
3 files changed, 23 insertions, 29 deletions
diff --git a/Xamarin.Forms.Platform.UAP/Properties/AssemblyInfo.cs b/Xamarin.Forms.Platform.UAP/Properties/AssemblyInfo.cs index 01702c9d..83c6dfb7 100644 --- a/Xamarin.Forms.Platform.UAP/Properties/AssemblyInfo.cs +++ b/Xamarin.Forms.Platform.UAP/Properties/AssemblyInfo.cs @@ -18,7 +18,6 @@ using Xamarin.Forms.Platform.UWP; [assembly: ExportRenderer(typeof(Label), typeof(LabelRenderer))] [assembly: ExportRenderer(typeof(Button), typeof(ButtonRenderer))] [assembly: ExportRenderer(typeof(ListView), typeof(ListViewRenderer))] -[assembly: ExportRenderer(typeof(CarouselView), typeof(CarouselViewRenderer))] [assembly: ExportRenderer(typeof(ScrollView), typeof(ScrollViewRenderer))] [assembly: ExportRenderer(typeof(ProgressBar), typeof(ProgressBarRenderer))] [assembly: ExportRenderer(typeof(Slider), typeof(SliderRenderer))] diff --git a/Xamarin.Forms.Platform.UAP/Resources.xaml b/Xamarin.Forms.Platform.UAP/Resources.xaml index b66958bf..7a11fe4f 100644 --- a/Xamarin.Forms.Platform.UAP/Resources.xaml +++ b/Xamarin.Forms.Platform.UAP/Resources.xaml @@ -37,30 +37,26 @@ </Style> <Style x:Key="ActionSheetStyle" TargetType="ContentDialog" /> - <Style x:Key="ActionSheetList" TargetType="ListView"> - <Setter Property="SelectionMode" Value="None" /> - <Setter Property="ItemContainerStyle"> - <Setter.Value> - <Style TargetType="ListViewItem"> - <Setter Property="Margin" Value="0" /> - <Setter Property="HorizontalContentAlignment" Value="Stretch" /> - </Style> - </Setter.Value> - </Setter> - <Setter Property="ItemTemplate"> - <Setter.Value> - <DataTemplate> - <TextBlock Text="{Binding}" HorizontalAlignment="Stretch" VerticalAlignment="Center" Style="{ThemeResource SubtitleTextBlockStyle}" /> - </DataTemplate> - </Setter.Value> - </Setter> - </Style> - - <DataTemplate x:Key="ItemTemplate"> - <uwp:ItemControl HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" /> - </DataTemplate> + <Style x:Key="ActionSheetList" TargetType="ListView"> + <Setter Property="SelectionMode" Value="None" /> + <Setter Property="ItemContainerStyle"> + <Setter.Value> + <Style TargetType="ListViewItem"> + <Setter Property="Margin" Value="0" /> + <Setter Property="HorizontalContentAlignment" Value="Stretch" /> + </Style> + </Setter.Value> + </Setter> + <Setter Property="ItemTemplate"> + <Setter.Value> + <DataTemplate> + <TextBlock Text="{Binding}" HorizontalAlignment="Stretch" VerticalAlignment="Center" Style="{ThemeResource SubtitleTextBlockStyle}" /> + </DataTemplate> + </Setter.Value> + </Setter> + </Style> - <ControlTemplate TargetType="ContentDialog" x:Key="MyContentDialogControlTemplate"> + <ControlTemplate TargetType="ContentDialog" x:Key="MyContentDialogControlTemplate"> <Border x:Name="Container"> <Grid x:Name="LayoutRoot"> <Grid.RowDefinitions> diff --git a/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj b/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj index bccb702e..c992f826 100644 --- a/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj +++ b/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj @@ -27,7 +27,8 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn></NoWarn> + <NoWarn> + </NoWarn> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> @@ -38,7 +39,8 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn></NoWarn> + <NoWarn> + </NoWarn> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'"> <PlatformTarget>ARM</PlatformTarget> @@ -129,9 +131,6 @@ <Compile Include="..\Xamarin.Forms.Platform.WinRT\AlignmentExtensions.cs"> <Link>AlignmentExtensions.cs</Link> </Compile> - <Compile Include="..\Xamarin.Forms.Platform.WinRT\CarouselViewRenderer.cs"> - <Link>CarouselViewRenderer.cs</Link> - </Compile> <Compile Include="..\Xamarin.Forms.Platform.WinRT\FormsTextBox.cs"> <Link>FormsTextBox.cs</Link> </Compile> |