Remove all duplicate converters that have moved to UwCore

haefele · Nov 3, 2016 · ac8b419 · ac8b419
1 parent 6f35b08
commit ac8b419
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 170 deletions.
diff --git a/src/CTime2/CTime2.csproj b/src/CTime2/CTime2.csproj
@@ -109,12 +109,7 @@
     <Compile Include="Controls\SettingsItem.cs" />
     <Compile Include="Controls\StampButton.cs" />
     <Compile Include="Controls\UserImage.cs" />
-    <Compile Include="Converter\BooleanNegationConverter.cs" />
-    <Compile Include="Converter\BooleanToNullableBooleanConverter.cs" />
-    <Compile Include="Converter\BooleanToObjectConverter .cs" />
     <Compile Include="Converter\ByteArrayToImageSourceConverter.cs" />
-    <Compile Include="Converter\FormatStringConverter.cs" />
-    <Compile Include="Converter\NullToVisibilityConverter.cs" />
     <Compile Include="Converter\ThicknessToDoubleConverter.cs" />
     <Compile Include="Converter\TimeStateToBrushConverter.cs" />
     <Compile Include="CTimeStartupAction.cs" />

diff --git a/src/CTime2/Converter/BooleanNegationConverter.cs b/src/CTime2/Converter/BooleanNegationConverter.cs
diff --git a/src/CTime2/Converter/BooleanToNullableBooleanConverter.cs b/src/CTime2/Converter/BooleanToNullableBooleanConverter.cs
diff --git a/src/CTime2/Converter/BooleanToObjectConverter .cs b/src/CTime2/Converter/BooleanToObjectConverter .cs
diff --git a/src/CTime2/Converter/FormatStringConverter.cs b/src/CTime2/Converter/FormatStringConverter.cs
diff --git a/src/CTime2/Converter/NullToVisibilityConverter.cs b/src/CTime2/Converter/NullToVisibilityConverter.cs
diff --git a/src/CTime2/Themes/generic.xaml b/src/CTime2/Themes/generic.xaml
@@ -2,7 +2,8 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:CTime2.Controls"
-    xmlns:converter="using:CTime2.Converter">
+    xmlns:converter="using:CTime2.Converter"
+    xmlns:uwCoreConverter="using:UwCore.Converter">
 
     <Style TargetType="controls:StampButton">
         <Setter Property="Height" Value="40" />
@@ -67,7 +68,7 @@
                 <ControlTemplate TargetType="controls:SettingsGroup">
                     <Grid>
                         <Grid.Resources>
-                            <converter:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
+                            <uwCoreConverter:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
                         </Grid.Resources>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
@@ -112,7 +113,7 @@
                 <ControlTemplate TargetType="controls:SettingsItem">
                     <Grid Background="{TemplateBinding Background}">
                         <Grid.Resources>
-                            <converter:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
+                            <uwCoreConverter:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
                         </Grid.Resources>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />

diff --git a/src/CTime2/Views/AttendanceList/AttendanceListView.xaml b/src/CTime2/Views/AttendanceList/AttendanceListView.xaml
@@ -4,14 +4,14 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:CTime2.Views.AttendanceList"
-    xmlns:converter="using:CTime2.Converter"
     xmlns:controls="using:CTime2.Controls" 
     xmlns:windowsStateTriggers="using:WindowsStateTriggers" 
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:behaviors="using:UwCore.Behaviors"
     xmlns:core="using:Microsoft.Xaml.Interactions.Core"
     xmlns:data="using:CTime2.Core.Data"
     xmlns:ctimeBehaviors="using:CTime2.Behaviors"
+    xmlns:uwCoreConverter="using:UwCore.Converter"
 
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -22,11 +22,11 @@
                               Source="{x:Bind ViewModel.Users, Mode=OneWay}"
                               IsSourceGrouped="True"
                               ItemsPath="Users" />
-        <converter:BooleanToObjectConverter x:Key="BooleanToAttendingStringConverter"
+        <uwCoreConverter:BooleanToObjectConverter x:Key="BooleanToAttendingStringConverter"
                                             x:Uid="BooleanToAttendingStringConverter"
                                             TrueValue="~Anwesend"
                                             FalseValue="~Abwesend" />
-        <converter:BooleanToObjectConverter x:Key="BooleanToAttendingBrushConverter" 
+        <uwCoreConverter:BooleanToObjectConverter x:Key="BooleanToAttendingBrushConverter" 
                                             TrueValue="{StaticResource CTimeGreen}" 
                                             FalseValue="{StaticResource CTimeRed}" />
     </Page.Resources>

diff --git a/src/CTime2/Views/AttendanceList/AttendingUserDetailsView.xaml b/src/CTime2/Views/AttendanceList/AttendingUserDetailsView.xaml
@@ -3,7 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:CTime2.Controls"
-    xmlns:converter="using:CTime2.Converter"
+    xmlns:uwCoreConverter="using:UwCore.Converter"
 
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -12,7 +12,7 @@
     MaxWidth="320"
     MaxHeight="346">
     <Page.Resources>
-        <converter:BooleanToObjectConverter x:Key="BooleanToAttendingBrushConverter"
+        <uwCoreConverter:BooleanToObjectConverter x:Key="BooleanToAttendingBrushConverter"
                                             TrueValue="{StaticResource CTimeGreen}"
                                             FalseValue="{StaticResource CTimeRed}" />
     </Page.Resources>

diff --git a/src/CTime2/Views/Statistics/StatisticsView.xaml b/src/CTime2/Views/Statistics/StatisticsView.xaml
@@ -2,18 +2,18 @@
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:local="using:CTime2.Views.Statistics"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
       xmlns:core="using:Microsoft.Xaml.Interactions.Core"
       xmlns:uwCoreConverter="using:UwCore.Converter"
-      xmlns:converter="using:CTime2.Converter"
       xmlns:uwp="using:FontAwesome.UWP"
+
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d"
-      DataContextChanged="StatisticsView_OnDataContextChanged"
-      >
+
+      DataContextChanged="StatisticsView_OnDataContextChanged">
     <Page.Resources>
-        <converter:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
+        <uwCoreConverter:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
     </Page.Resources>
 
     <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">

diff --git a/src/CTime2/Views/YourTimes/YourTimesView.xaml b/src/CTime2/Views/YourTimes/YourTimesView.xaml
@@ -4,9 +4,9 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:CTime2.Views.YourTimes"
-    xmlns:converter="using:CTime2.Converter"
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:core="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:uwCoreConverter="using:UwCore.Converter"
 
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -17,9 +17,9 @@
                               Source="{x:Bind ViewModel.Times, Mode=OneWay}"
                               IsSourceGrouped="True"
                               ItemsPath="Times" />
-        <converter:FormatStringConverter x:Key="DateTimeToDayNumberConverter" FormatString="ddd dd. MMMM" />
+        <uwCoreConverter:FormatStringConverter x:Key="DateTimeToDayNumberConverter" FormatString="ddd dd. MMMM" />
 
-        <converter:FormatStringConverter x:Key="DateTimeToStringConverter" FormatString="t" PlaceholderString="?" />
+        <uwCoreConverter:FormatStringConverter x:Key="DateTimeToStringConverter" FormatString="t" PlaceholderString="?" />
         <Style x:Key="DefaultListViewHeaderItemStyle" 
                TargetType="ListViewHeaderItem">
             <Setter Property="HorizontalContentAlignment" Value="Stretch" />