Merge branch 'master' of https://bitbucket.org/vitalyster/juick-windowsphone

1 files changed, 4 insertions, 4 deletions

diff --git a/Juick/ThreadView.xaml b/Juick/ThreadView.xaml
index 7de5533..efab81a 100644
--- a/Juick/ThreadView.xaml
+++ b/Juick/ThreadView.xaml
@@ -6,7 +6,7 @@
     xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"

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

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

-    xmlns:controls="clr-namespace:Juick.Controls"

+    xmlns:controls="clr-namespace:Juick.Controls" xmlns:bindings="clr-namespace:Juick.Classes"

     FontFamily="{StaticResource PhoneFontFamilyNormal}"

     FontSize="{StaticResource PhoneFontSizeNormal}"

     Foreground="{StaticResource PhoneForegroundBrush}"

@@ -23,7 +23,7 @@
 

         <!--TitlePanel contains the name of the application and page title-->

         <StackPanel x:Name="TitlePanel" Grid.Row="0" Margin="12,17,0,28">

-            <TextBlock x:Name="ApplicationTitle" Text="JUICK" Style="{StaticResource PhoneTextNormalStyle}"/>

+            <TextBlock x:Name="ApplicationTitle" Text="{Binding Caption}" Style="{StaticResource PhoneTextNormalStyle}"/>

         </StackPanel>

 

         <!--ContentPanel - place additional content here-->

@@ -48,7 +48,7 @@
                                     <RowDefinition Height="Auto" />

                                     <!-- RowDefinition Height="Auto" / -->

                                 </Grid.RowDefinitions>

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

+                                <Image bindings:LowProfileImageLoader.UriSource="{Binding AvatarUri}" 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"

@@ -61,7 +61,7 @@
                                        Margin="5,0,5,5" VerticalAlignment="Top"

                                        TextWrapping="Wrap" HorizontalAlignment="Left"

                                        IsReadOnly="True" Text="{Binding MessageText}" />

-                                <Image Source="{Binding Attachment}" Grid.Row="2" Grid.Column="0" Margin="3" Grid.ColumnSpan="2" />

+                                <Image bindings:LowProfileImageLoader.UriSource="{Binding Attachment}" Grid.Row="2" Grid.Column="0" Margin="3" Grid.ColumnSpan="2" />

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

                                        Foreground="{StaticResource PhoneForegroundBrush}"                                       

                                        Style="{StaticResource PhoneTextAccentStyle}"