Improved template for calendar items

xdumaine · Mar 25, 2013 · d311740 · d311740
1 parent 7d746ed
commit d311740
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 7 deletions.
diff --git a/Avocado/Common/GenericConverters.cs b/Avocado/Common/GenericConverters.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Windows.UI;
+using Windows.UI.Xaml;
 using Windows.UI.Xaml.Data;
 using Windows.UI.Xaml.Media;
 
@@ -28,4 +29,22 @@ public object ConvertBack(object value, Type targetType, object parameter, strin
         }
     }
 
+    class NullOrEmptyToVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value == null || string.IsNullOrEmpty((string)value))
+            {
+                return Visibility.Collapsed;
+            }
+            return Visibility.Visible;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+
 }
diff --git a/Avocado/ViewModels/CalendarItem.cs b/Avocado/ViewModels/CalendarItem.cs
@@ -132,6 +132,23 @@ public List<string> Attending
             }
         }
 
+        public string DateString
+        {
+            get
+            {
+                var dateString = string.Empty;
+                if (StartDate != null)
+                {
+                    dateString += StartDate.ToString("MMM d") + StartDate.ToString(" @ h:mmt").ToLower();
+                    if (EndDateTime != null)
+                    {
+                        dateString += " - " + EndDateTime.ToString("h:mmt").ToLower();
+                    }
+                }
+                return dateString;
+            }
+        }
+
 
         public ObservableCollection<Reminder> Reminders;
 

diff --git a/Avocado/Views/Partial/Templates.xaml b/Avocado/Views/Partial/Templates.xaml
@@ -8,8 +8,9 @@
     <common:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"></common:BooleanToVisibilityConverter>
     <common:InverseBooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter"></common:InverseBooleanToVisibilityConverter>
     <common:BooleanToStringConverter x:Key="BooleanToStringConverter"></common:BooleanToStringConverter>
+    <common:NullOrEmptyToVisibilityConverter x:Key="NullOrEmptyToVisibilityConverter"></common:NullOrEmptyToVisibilityConverter>
 
-        <DataTemplate x:Key="Activity">
+    <DataTemplate x:Key="Activity">
         <Grid>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="80"/>
@@ -73,12 +74,19 @@
     </DataTemplate>
 
     <DataTemplate x:Key="CalendarItem">
-        <Grid>
-            <Grid.ColumnDefinitions>
-            </Grid.ColumnDefinitions>
-            <StackPanel>
-                <TextBlock Text="{Binding Title}"></TextBlock>
-                <TextBlock Text="{Binding Description}"></TextBlock>
+        <Grid Margin="10,0,10,10">
+            <Grid.RowDefinitions>
+                <RowDefinition/>
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="{Binding DateString}"  FontSize="20"/>
+                <TextBlock Text="{Binding Title}"  FontSize="20" TextWrapping="Wrap" Margin="10,0,0,0"/>
+            </StackPanel>
+            <StackPanel Grid.Row="1" Orientation="Horizontal">
+                <TextBlock Text="{Binding Location}"/>
+                <TextBlock Text=" - " Visibility="{Binding Path=Description, Converter={StaticResource NullOrEmptyToVisibilityConverter}}"/>
+                <TextBlock Text="{Binding Description}" TextWrapping="Wrap" Margin="10,0,0,0"/>
             </StackPanel>
         </Grid>
     </DataTemplate>