Skip to content

Commit 0c8c26c

Browse files
committed
Shrink conversations list and fix on mobile
Now it resizes correctly on mobile
1 parent 50bad71 commit 0c8c26c

File tree

3 files changed

+24
-11
lines changed

3 files changed

+24
-11
lines changed

Signal-Windows/Controls/ConversationListElement.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
88
mc:Ignorable="d"
99
d:DesignHeight="96"
10-
d:DesignWidth="480">
10+
d:DesignWidth="320">
1111
<Grid>
1212
<Grid.ColumnDefinitions>
1313
<ColumnDefinition Width="Auto" />
@@ -24,10 +24,10 @@
2424
<ColumnDefinition Width="*"/>
2525
<ColumnDefinition Width="Auto"/>
2626
</Grid.ColumnDefinitions>
27-
<TextBlock Grid.Column="0" Name="ConversationDisplayName" FontSize="24" FontWeight="SemiLight" Text="Sanders Lauture"/>
28-
<TextBlock x:Name="LastActiveTextBlock" Grid.Column="1" Text="11:11p" FontSize="11" Foreground="#999999"/>
27+
<TextBlock Grid.Column="0" Name="ConversationDisplayName" FontSize="15" FontWeight="SemiLight" Text="Sanders Lauture" TextTrimming="CharacterEllipsis"/>
28+
<TextBlock x:Name="LastActiveTextBlock" Grid.Column="1" Text="11:11p" FontSize="11" Foreground="#999999" TextTrimming="CharacterEllipsis"/>
2929
</Grid>
30-
<TextBlock Text="{x:Bind LastMessage, Mode=OneWay}" FontSize="20"/>
30+
<TextBlock Text="{x:Bind LastMessage, Mode=OneWay}" FontSize="12"/>
3131
</StackPanel>
3232
</Grid>
3333
</UserControl>

Signal-Windows/Views/MainPage.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</ResourceDictionary.ThemeDictionaries>
2525
</ResourceDictionary>
2626
</Page.Resources>
27-
<SplitView Name="MainPanel" CompactPaneLength="0" OpenPaneLength="480">
27+
<SplitView Name="MainPanel" CompactPaneLength="0" OpenPaneLength="320" DisplayMode="CompactInline">
2828
<SplitView.Pane>
2929
<Grid x:Name="ContactsGrid">
3030
<Grid.RowDefinitions>

Signal-Windows/Views/MainPage.xaml.cs

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public void SwitchToStyle(PageStyle newStyle)
4343
{
4444
if (newStyle == PageStyle.Narrow)
4545
{
46-
ContactsGrid.Width = ActualWidth;
4746
if (Vm.SelectedThread != null)
4847
{
4948
Utils.EnableBackButton(Vm.BackButton_Click);
@@ -60,7 +59,24 @@ public void SwitchToStyle(PageStyle newStyle)
6059
{
6160
Utils.DisableBackButton(Vm.BackButton_Click);
6261
MainPanel.IsPaneOpen = false;
63-
MainPanel.CompactPaneLength = ContactsGrid.Width = 480;
62+
MainPanel.CompactPaneLength = ContactsGrid.Width = 320;
63+
}
64+
UpdateStyle(newStyle);
65+
}
66+
67+
private void UpdateStyle(PageStyle currentStyle)
68+
{
69+
if (currentStyle == PageStyle.Narrow)
70+
{
71+
ContactsGrid.Width = ActualWidth;
72+
if (Vm.SelectedThread == null)
73+
{
74+
MainPanel.OpenPaneLength = ActualWidth;
75+
}
76+
}
77+
else if (currentStyle == PageStyle.Wide)
78+
{
79+
MainPanel.CompactPaneLength = MainPanel.OpenPaneLength = ContactsGrid.Width = 320;
6480
}
6581
}
6682

@@ -83,10 +99,7 @@ private void Frame_SizeChanged(object sender, SizeChangedEventArgs e)
8399
{
84100
SwitchToStyle(newStyle);
85101
}
86-
if (newStyle == PageStyle.Narrow)
87-
{
88-
ContactsGrid.Width = ActualWidth;
89-
}
102+
UpdateStyle(newStyle);
90103
}
91104

92105
public MainPageViewModel Vm

0 commit comments

Comments
 (0)