Avatars support + broken clickable urls

1 files changed, 39 insertions, 19 deletions

diff --git a/Juick/MainPage.xaml b/Juick/MainPage.xaml
index 3d7245c..84e7bd7 100644
--- a/Juick/MainPage.xaml
+++ b/Juick/MainPage.xaml
@@ -6,14 +6,19 @@
     xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"

     xmlns:controls="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls"

     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

-    mc:Ignorable="d" d:DesignWidth="480" d:DesignHeight="728" 

+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:bindings="clr-namespace:Juick.Classes"

+    xmlns:Juick="clr-namespace:Juick" mc:Ignorable="d" d:DesignWidth="480" d:DesignHeight="728" 

     d:DataContext="{d:DesignData SampleData/MainViewModelSampleData.xaml}"

     FontFamily="{StaticResource PhoneFontFamilyNormal}"

     FontSize="{StaticResource PhoneFontSizeNormal}"

     Foreground="{StaticResource PhoneForegroundBrush}"

     SupportedOrientations="Portrait"  Orientation="Portrait"

     shell:SystemTray.IsVisible="False">

+    <FrameworkElement.Resources>

+        <ResourceDictionary>

+            <bindings:RichTextConverter x:Key="inlineConverter" />

+        </ResourceDictionary>

+    </FrameworkElement.Resources>

 

     <!--LayoutRoot is the root grid where all page content is placed-->

     <Grid x:Name="LayoutRoot" Background="Transparent">

@@ -26,10 +31,15 @@
             <controls:PanoramaItem x:Name="MainPanoramaItem" Header="My feed" Margin="0, -40, 0, 0">

                 <!--Double line list with image placeholder and text wrapping-->

                 <ListBox Margin="0,0,-12,0" ItemsSource="{Binding MyFeed}" SelectionChanged="ListBoxSelectionChanged">

+                    <ListBox.ItemContainerStyle>

+                        <Style TargetType="ListBoxItem">

+                            <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>

+                        </Style>

+                    </ListBox.ItemContainerStyle>

                     <ListBox.ItemTemplate>

                         <DataTemplate>

-                            <Grid >

-                                

+                            <Border BorderBrush="{StaticResource PhoneForegroundBrush}" BorderThickness="0 0 0 1">

+                            <Grid >                                

                                 <Grid.ColumnDefinitions>

                                     <ColumnDefinition Width="Auto" />

                                     <ColumnDefinition Width="*" />

@@ -39,24 +49,28 @@
                                     <RowDefinition Height="Auto" />

                                     <RowDefinition Height="Auto" /> 

                                 </Grid.RowDefinitions>

-                                <TextBlock Text="{Binding Username}" Grid.Row="0" Grid.Column="1"

+                                    <Image Source="{Binding UserAvatar}" Grid.Row="0" Grid.Column="0" Margin="3" />

+                                    <TextBlock Text="{Binding Username}" Grid.Row="0" Grid.Column="1"

                                        Margin="5,0,5,5" VerticalAlignment="Top"

                                        HorizontalAlignment="Left"

                                        FontFamily="{StaticResource PhoneFontFamilySemiLight}" 

                                        FontSize="{StaticResource PhoneFontSizeLarge}"

                                        Style="{StaticResource PhoneTextAccentStyle}" />

-                                <TextBlock Text="{Binding MessageText}" Grid.Row="1" Grid.Column="1"

+                                    <!--  Juick:MainPage.InlineList="{Binding MessageText, Converter={StaticResource inlineConverter}}" -->

+                                    <TextBlock Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"

+                                       Text="{Binding MessageText}"                                    

                                        Foreground="{StaticResource PhoneForegroundBrush}"                                       

                                        Style="{StaticResource PhoneTextNormalStyle}"                                       

                                        Margin="5,0,5,5" VerticalAlignment="Top"

                                        TextWrapping="Wrap" HorizontalAlignment="Left"/>

-                                <TextBlock Text="{Binding Status}" Grid.Row="2" Grid.Column="1"

+                                    <TextBlock Text="{Binding Status}" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"

                                        Foreground="{StaticResource PhoneForegroundBrush}"                                       

                                        Style="{StaticResource PhoneTextAccentStyle}" 

                                        FontSize="{StaticResource PhoneFontSizeSmall}"

                                        Margin="5,0,5,5" VerticalAlignment="Top"

                                        TextWrapping="Wrap" HorizontalAlignment="Left"/>

-                            </Grid>                            

+                            </Grid>

+                            </Border>

                         </DataTemplate>

                     </ListBox.ItemTemplate>

                 </ListBox>

@@ -64,8 +78,14 @@
             <controls:PanoramaItem x:Name="LastPanoramaItem" Header="Last" Margin="0, -40, 0, 0">

                 <!--Double line list with image placeholder and text wrapping-->

                 <ListBox Margin="0,0,-12,0" ItemsSource="{Binding Last}" SelectionChanged="LastBoxSelectionChanged">

+                    <ListBox.ItemContainerStyle>

+                        <Style TargetType="ListBoxItem">

+                            <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>

+                        </Style>

+                    </ListBox.ItemContainerStyle>

                     <ListBox.ItemTemplate>

                         <DataTemplate>

+                            <Border BorderBrush="{StaticResource PhoneForegroundBrush}" BorderThickness="0 0 0 1">

                             <Grid>

                                 <Grid.ColumnDefinitions>

                                     <ColumnDefinition Width="Auto" />

@@ -76,26 +96,26 @@
                                     <RowDefinition Height="Auto" />

                                     <RowDefinition Height="Auto" />

                                 </Grid.RowDefinitions>

-                                <Image Source="{Binding UserAvatar}" Grid.Row="0" Grid.Column="0" />

-                                <TextBlock Text="{Binding Username}" Grid.Row="0" Grid.Column="1"

+                                    <Image Source="{Binding UserAvatar}" Grid.Row="0" Grid.Column="0" Margin="3" />

+                                    <TextBlock Text="{Binding Username}" Grid.Row="0" Grid.Column="1"

                                        Margin="5,0,5,5" VerticalAlignment="Top"

                                        HorizontalAlignment="Left"

                                        FontFamily="{StaticResource PhoneFontFamilySemiLight}" 

                                        FontSize="{StaticResource PhoneFontSizeLarge}"

                                        Style="{StaticResource PhoneTextAccentStyle}" />

-                                <TextBlock Text="{Binding MessageText}" Grid.Row="1" Grid.Column="1"

+                                <TextBlock Text="{Binding MessageText}" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"

                                        Foreground="{StaticResource PhoneForegroundBrush}"                                       

                                        Style="{StaticResource PhoneTextNormalStyle}"                                       

                                        Margin="5,0,5,5" VerticalAlignment="Top"

                                        TextWrapping="Wrap" HorizontalAlignment="Left"/>

-                                <TextBlock Text="{Binding Status}" Grid.Row="2" Grid.Column="1"

+                                    <TextBlock Text="{Binding Status}" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"

                                        Foreground="{StaticResource PhoneForegroundBrush}"                                       

                                        Style="{StaticResource PhoneTextAccentStyle}" 

                                        FontSize="{StaticResource PhoneFontSizeSmall}"

                                        Margin="5,0,5,5" VerticalAlignment="Top"

                                        TextWrapping="Wrap" HorizontalAlignment="Left"/>

                             </Grid>

-

+                            </Border>

                         </DataTemplate>

                     </ListBox.ItemTemplate>

                 </ListBox>

@@ -104,14 +124,14 @@
     </Grid>

     <phone:PhoneApplicationPage.ApplicationBar>

         <shell:ApplicationBar IsVisible="True" IsMenuEnabled="True">

-            <shell:ApplicationBarIconButton IconUri="/Images/appbar_button0.png" Text="New message" Click="ApplicationBarIconButton_Click_1"/>

-            <shell:ApplicationBarIconButton IconUri="/Images/appbar_button1.png" Text="Refresh" Click="ApplicationBarIconButton_Click" />

-            <shell:ApplicationBarIconButton IconUri="/Images/appbar_button2.png" Text="Sign out" Click="ApplicationBarMenuItem_Click" />

+            <shell:ApplicationBarIconButton IconUri="/Images/appbar_button0.png" Text="New message" Click="ApplicationBarIconButtonClick1"/>

+            <shell:ApplicationBarIconButton IconUri="/Images/appbar_button1.png" Text="Refresh" Click="ApplicationBarIconButtonClick" />

+            <shell:ApplicationBarIconButton IconUri="/Images/appbar_button2.png" Text="Sign out" Click="ApplicationBarMenuItemClick" />

 

             <shell:ApplicationBar.MenuItems>

-                <shell:ApplicationBarMenuItem Text="New message" Click="ApplicationBarIconButton_Click_1"/>

-                <shell:ApplicationBarMenuItem Text="Refresh" Click="ApplicationBarIconButton_Click"/>

-                <shell:ApplicationBarMenuItem Text="Sign out" Click="ApplicationBarMenuItem_Click" />

+                <shell:ApplicationBarMenuItem Text="New message" Click="ApplicationBarIconButtonClick1"/>

+                <shell:ApplicationBarMenuItem Text="Refresh" Click="ApplicationBarIconButtonClick"/>

+                <shell:ApplicationBarMenuItem Text="Sign out" Click="ApplicationBarMenuItemClick" />

             </shell:ApplicationBar.MenuItems>

         </shell:ApplicationBar>

     </phone:PhoneApplicationPage.ApplicationBar>