Commit afc91300 authored by Erwan Croze's avatar Erwan Croze 👋🏻

Fix Chat View, and disable contacts view

parent dac4e4e1
......@@ -40,7 +40,7 @@ namespace Linphone.Controls {
public TextBoxChatBubble() {
InitializeComponent();
SendMessage.IsEnabled = true;
SendMessage.IsEnabled = false;
}
public void Reset() {
......
......@@ -103,7 +103,6 @@ namespace Linphone.Model {
using (IsolatedStorageFileStream file = store.OpenFile(fileName, FileMode.Open, FileAccess.Read)) {
data = new byte[file.Length];
file.Read(data, 0, data.Length);
}
}
......@@ -229,5 +228,14 @@ namespace Linphone.Model {
}
return uri;
}
public static void DisplayErrorDialog(string txt) {
var dialog = new Windows.UI.Popups.MessageDialog(txt);
dialog.Commands.Add(new Windows.UI.Popups.UICommand("Ok") { Id = 0 });
dialog.DefaultCommandIndex = 0;
dialog.ShowAsync();
}
}
}
......@@ -82,7 +82,7 @@ namespace Linphone.Views {
//ContactManager cm = ContactManager.Instance;
//cm.ContactFound += cm_ContactFound;
MessageBox.TextChanged += MessageBox_TextChanged;
NewChat.Visibility = Visibility.Collapsed;
......
......@@ -273,7 +273,7 @@
</Grid>
</AppBarButton.Content>
</AppBarButton>
<AppBarButton Icon="Contact" Label="Contacts" Click="contacts_Click"/>
<!-- <AppBarButton Icon="Contact" Label="Contacts" Click="contacts_Click"/> -->
<AppBarButton Label="Chat" Click="chat_Click">
<AppBarButton.Content>
<Grid>
......
......@@ -20,21 +20,22 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="15"/>
<ColumnDefinition Width="27.4"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Ellipse Width="32" Height="32" VerticalAlignment="Center" Grid.RowSpan="2" Margin="0,2,10,0">
<Ellipse Width="32" Height="32" VerticalAlignment="Center" Grid.RowSpan="2" Margin="0,11,10.4,9" Grid.ColumnSpan="2">
<Ellipse.Fill>
<ImageBrush ImageSource="/Assets/avatar.png"/>
</Ellipse.Fill>
</Ellipse>
<TextBlock Grid.Column="1" Padding="0,5,0,0"
Text="{Binding DisplayedName}"
Style="{StaticResource ListItemHeaderStyle}"/>
<TextBlock Grid.Column="1" Padding="0,0,0,5"
Grid.Row="1" Style="{StaticResource ListItemStyle}" Foreground="{Binding IsMissed, Converter={StaticResource BoolToAccentBrushConverter}}">
Style="{StaticResource ListItemHeaderStyle}" Grid.ColumnSpan="2" Margin="27,0,-0.4,0.6"/>
<TextBlock Grid.Column="2" Padding="0,0,0,5"
Grid.Row="1" Style="{StaticResource ListItemStyle}" Foreground="{Binding IsMissed, Converter={StaticResource BoolToAccentBrushConverter}}" Height="22" Margin="0.6,0,-0.4,0" VerticalAlignment="Bottom">
<Run Text="{Binding StatusText}"></Run>
<Run Text=","></Run>
<Run Text="{Binding DetailsText}"></Run>
......@@ -68,7 +69,7 @@
<Grid x:Name="ContentPanel" Grid.Row="1">
<Pivot>
<PivotItem Header="All" x:Uid="HistoryAll">
<PivotItem x:Uid="HistoryAll" Header="">
<ListView x:Name="Calls"
Margin="-12,0,-12,0"
ItemsSource="{Binding}"
......@@ -79,7 +80,7 @@
</ListView>
</PivotItem>
<PivotItem Header="Missed" x:Uid="HistoryMissedTitle">
<PivotItem x:Uid="HistoryMissedTitle">
<ListView x:Name="MissedCalls"
Margin="-12,0,-12,0"
ItemsSource="{Binding}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment