From c1c535426e7df867b535969b976cbb8b626e4ce8 Mon Sep 17 00:00:00 2001
From: Jakob Hermann Preusker <jakohe@outlook.de>
Date: Sun, 3 Jun 2018 10:10:12 +0200
Subject: [PATCH 01/12] UI Improvements on Add contact page

---
 Signal-Windows/Views/AddContactPage.xaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Signal-Windows/Views/AddContactPage.xaml b/Signal-Windows/Views/AddContactPage.xaml
index f594b25..79b2e4e 100644
--- a/Signal-Windows/Views/AddContactPage.xaml
+++ b/Signal-Windows/Views/AddContactPage.xaml
@@ -31,13 +31,14 @@
         </Grid.RowDefinitions>
 
         <StackPanel HorizontalAlignment="Center" Width="328">
-            <TextBlock Text="Add a manual contact" HorizontalAlignment="Center" Margin="0,16,0,0"/>
+            <TextBlock Text="Add contact manually" HorizontalAlignment="Center" Margin="0,16,0,0"/>
             <TextBlock Text="Name"/>
             <TextBox x:Name="ContactNameTextBox" Text="{x:Bind Vm.ContactName, Mode=TwoWay}" IsEnabled="{x:Bind Vm.UIEnabled, Mode=OneWay}" Margin="0,4,0,0" TextChanged="ContactNameTextBox_TextChanged" InputScope="PersonalFullName" />
             <TextBlock Text="Number" Margin="0,16,0,0" />
             <TextBox x:Name="ContactNumberTextBox" Text="{x:Bind Vm.ContactNumber, Mode=TwoWay}" IsEnabled="{x:Bind Vm.UIEnabled, Mode=OneWay}" Margin="0,4,0,0" TextChanged="ContactNumberTextBox_TextChanged" InputScope="TelephoneNumber" />
-            <Button x:Name="AddButton" Content="Add" IsEnabled="{x:Bind Vm.AddEnabled, Mode=OneWay}" HorizontalAlignment="Stretch" Margin="0,16" Click="AddButton_Click" />
-            <AutoSuggestBox x:Name="searchBox" VerticalAlignment="Stretch" QueryIcon="Find" TextChanged="searchBox_TextChanged" IsEnabled="{x:Bind Vm.UIEnabled, Mode=OneWay}"/>
+            <Button x:Name="AddButton" Content="Add" IsEnabled="{x:Bind Vm.AddEnabled, Mode=OneWay}" HorizontalAlignment="Stretch" Margin="0,16,0,6" Click="AddButton_Click" />
+            <MenuFlyoutSeparator/>
+            <AutoSuggestBox x:Name="searchBox" VerticalAlignment="Stretch" QueryIcon="Find" TextChanged="searchBox_TextChanged" IsEnabled="{x:Bind Vm.UIEnabled, Mode=OneWay}" Margin="0,6,0,0"/>
         </StackPanel>
         <Grid Grid.Row="1" Visibility="{x:Bind Vm.ContactsVisible, Mode=OneWay}">
             <toolbox:PullToRefreshListView x:Name="ContactsList" ItemClick="ContactsList_ItemClick" ItemsSource="{x:Bind Vm.Contacts, Mode=OneWay}" IsItemClickEnabled="True" HorizontalAlignment="Center" IsEnabled="{x:Bind Vm.UIEnabled, Mode=OneWay}"

From 6240b42459503f409e982fc1faff63989306e062 Mon Sep 17 00:00:00 2001
From: Jakob Hermann Preusker <jakohe@outlook.de>
Date: Sun, 3 Jun 2018 10:11:29 +0200
Subject: [PATCH 02/12] UI improvements on AdvancedSettingsPage

---
 .../Views/AdvancedSettingsPage.xaml           | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/Signal-Windows/Views/AdvancedSettingsPage.xaml b/Signal-Windows/Views/AdvancedSettingsPage.xaml
index 7047690..221c8cd 100644
--- a/Signal-Windows/Views/AdvancedSettingsPage.xaml
+++ b/Signal-Windows/Views/AdvancedSettingsPage.xaml
@@ -1,24 +1,24 @@
-<Page
-    x:Class="Signal_Windows.Views.AdvancedSettingsPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Signal_Windows.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-    DataContext="{Binding AdvancedSettingsPageInstance, Source={StaticResource Locator}}">
-
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="1*"/>
-            <RowDefinition Height="8*"/>
-        </Grid.RowDefinitions>
-        <TextBlock Text="Advanced" HorizontalAlignment="Center" VerticalAlignment="Center" Style="{StaticResource TitleTextBlockStyle}"/>
-        <StackPanel Grid.Row="1" Margin="32,0,0,0">
-            <Button x:Name="ExportDebugLogButton" Content="Export debug log" Click="ExportDebugLogButton_Click"/>
-            <Button x:Name="SyncButton" Content="Request contact and group sync" Margin="0,8,0,0" Click="SyncButton_Click"/>
-            <Button x:Name="TestCrashButton" Content="Intentionally crash the app to test its debug log export" Click="TestCrashButton_Click"/>
-        </StackPanel>
-    </Grid>
-</Page>
+<Page
+    x:Class="Signal_Windows.Views.AdvancedSettingsPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Signal_Windows.Views"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+    DataContext="{Binding AdvancedSettingsPageInstance, Source={StaticResource Locator}}">
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="8*"/>
+        </Grid.RowDefinitions>
+        <TextBlock Text="Advanced" HorizontalAlignment="Center" VerticalAlignment="Center" Style="{StaticResource TitleTextBlockStyle}"/>
+        <StackPanel Grid.Row="1" Margin="32,0,0,0" HorizontalAlignment="Center">
+            <Button x:Name="ExportDebugLogButton" Content="Export debug log" Click="ExportDebugLogButton_Click" HorizontalAlignment="Stretch"/>
+            <Button x:Name="SyncButton" Content="Request contact and group sync" Margin="0,8,0,0" Click="SyncButton_Click" HorizontalAlignment="Stretch"/>
+            <Button x:Name="TestCrashButton" Content="Intentionally crash the app to test its debug log export" Click="TestCrashButton_Click" HorizontalAlignment="Stretch"/>
+        </StackPanel>
+    </Grid>
+</Page>

From ff3ef8435c9a17a167a3a00f963599b7de39b17c Mon Sep 17 00:00:00 2001
From: Jakob Hermann Preusker <jakohe@outlook.de>
Date: Sun, 3 Jun 2018 10:13:37 +0200
Subject: [PATCH 03/12] Another UI improvement on AdvancedSettingsPage

---
 Signal-Windows/Views/AdvancedSettingsPage.xaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Signal-Windows/Views/AdvancedSettingsPage.xaml b/Signal-Windows/Views/AdvancedSettingsPage.xaml
index 221c8cd..468643b 100644
--- a/Signal-Windows/Views/AdvancedSettingsPage.xaml
+++ b/Signal-Windows/Views/AdvancedSettingsPage.xaml
@@ -15,10 +15,10 @@
             <RowDefinition Height="8*"/>
         </Grid.RowDefinitions>
         <TextBlock Text="Advanced" HorizontalAlignment="Center" VerticalAlignment="Center" Style="{StaticResource TitleTextBlockStyle}"/>
-        <StackPanel Grid.Row="1" Margin="32,0,0,0" HorizontalAlignment="Center">
-            <Button x:Name="ExportDebugLogButton" Content="Export debug log" Click="ExportDebugLogButton_Click" HorizontalAlignment="Stretch"/>
-            <Button x:Name="SyncButton" Content="Request contact and group sync" Margin="0,8,0,0" Click="SyncButton_Click" HorizontalAlignment="Stretch"/>
-            <Button x:Name="TestCrashButton" Content="Intentionally crash the app to test its debug log export" Click="TestCrashButton_Click" HorizontalAlignment="Stretch"/>
+        <StackPanel Grid.Row="1" Margin="32,0,0,0" HorizontalAlignment="Left">
+            <HyperlinkButton x:Name="ExportDebugLogButton" Content="Export debug log" Click="ExportDebugLogButton_Click" HorizontalAlignment="Stretch" HorizontalContentAlignment="Left"/>
+            <HyperlinkButton x:Name="SyncButton" Content="Request contact and group sync" Margin="0,8,0,0" Click="SyncButton_Click" HorizontalAlignment="Stretch" HorizontalContentAlignment="Left"/>
+            <HyperlinkButton x:Name="TestCrashButton" Content="Intentionally crash the app to test its debug log export" Click="TestCrashButton_Click" HorizontalAlignment="Stretch" HorizontalContentAlignment="Left"/>
         </StackPanel>
     </Grid>
 </Page>

From e9e4fb8859ed31f784dd27c3013fa027f3517684 Mon Sep 17 00:00:00 2001
From: Jakob Hermann Preusker <jakohe@outlook.de>
Date: Sun, 3 Jun 2018 10:24:07 +0200
Subject: [PATCH 04/12] Added ReorderGridAnimation to GlobalSettingsPage

UI change on NotificationSettingsPage
---
 Signal-Windows/Views/GlobalSettingsPage.xaml       | 3 ++-
 Signal-Windows/Views/NotificationSettingsPage.xaml | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Signal-Windows/Views/GlobalSettingsPage.xaml b/Signal-Windows/Views/GlobalSettingsPage.xaml
index e7796a5..fb722d7 100644
--- a/Signal-Windows/Views/GlobalSettingsPage.xaml
+++ b/Signal-Windows/Views/GlobalSettingsPage.xaml
@@ -5,6 +5,7 @@
     xmlns:local="using:Signal_Windows.Views"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
     mc:Ignorable="d"
     DataContext="{Binding GlobalSettingsPageInstance, Source={StaticResource Locator}}">
 
@@ -29,7 +30,7 @@
             </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
         <TextBlock Text="Settings" Style="{StaticResource HeaderTextBlockStyle}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-        <VariableSizedWrapGrid x:Name="WrapGrid" HorizontalAlignment="Left" MaximumRowsOrColumns="1" VerticalAlignment="Top" Orientation="Horizontal" ItemWidth="250" ItemHeight="80" Grid.Row="1" Margin="32,0,32,0">
+        <VariableSizedWrapGrid x:Name="WrapGrid" HorizontalAlignment="Left" MaximumRowsOrColumns="1" VerticalAlignment="Top" Orientation="Horizontal" ItemWidth="250" ItemHeight="80" Grid.Row="1" Margin="32,0,32,0" animations:ReorderGridAnimation.Duration="300">
             <Button x:Name="NotificationsButton" Background="{x:Null}" Width="250" HorizontalContentAlignment="Left" Click="NotificationsButton_Click">
                 <StackPanel Orientation="Horizontal">
                     <FontIcon Glyph="&#xEA8F;" FontSize="36"/>
diff --git a/Signal-Windows/Views/NotificationSettingsPage.xaml b/Signal-Windows/Views/NotificationSettingsPage.xaml
index 811a8f3..4d6a952 100644
--- a/Signal-Windows/Views/NotificationSettingsPage.xaml
+++ b/Signal-Windows/Views/NotificationSettingsPage.xaml
@@ -22,10 +22,10 @@
                     <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
                 <StackPanel>
-                    <TextBlock Text="Show" Style="{StaticResource BodyTextBlockStyle}" Margin="0,0,0,6"/>
+                    <TextBlock Text="Show..." Style="{StaticResource BaseTextBlockStyle}" Margin="0,0,0,6"/>
                     <RadioButton Content="Name and message" Tag="{x:Bind Vm.NameAndMessageTag}" Margin="0,6" IsChecked="{x:Bind Vm.NameAndMessageChecked, Mode=TwoWay}" Checked="ShowNotificationText_Checked"/>
                     <RadioButton Content="Name only" Tag="{x:Bind Vm.NameOnlyTag}" Margin="0,6" IsChecked="{x:Bind Vm.NameOnlyChecked, Mode=TwoWay}" Checked="ShowNotificationText_Checked"/>
-                    <RadioButton Content="No name or message" Tag="{x:Bind Vm.NoNameOrMessageTag}" Margin="0,6" IsChecked="{x:Bind Vm.NoNameOrMessageChecked, Mode=TwoWay}" Checked="ShowNotificationText_Checked"/>
+                    <RadioButton Content="No name or message" Tag="{x:Bind Vm.NoNameOrMessageTag}" Margin="0,6" IsChecked="{x:Bind Vm.NoNameOrMessageChecked, Mode=TwoWay}" Checked="ShowNotificationText_Checked"/><!--Does this mean that no notif will be shown?-->
                 </StackPanel>
                 <HyperlinkButton Grid.Row="1" Margin="0,16,0,0" NavigateUri="ms-settings:notifications" Content="More notification settings"/>
             </Grid>

From 2e9bc886e334d1ac167700e2da230232fd820093 Mon Sep 17 00:00:00 2001
From: Jakob Hermann Preusker <jakohe@outlook.de>
Date: Sun, 3 Jun 2018 10:26:03 +0200
Subject: [PATCH 05/12] UI fix NotificationSettingsPage

---
 Signal-Windows/Views/NotificationSettingsPage.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Signal-Windows/Views/NotificationSettingsPage.xaml b/Signal-Windows/Views/NotificationSettingsPage.xaml
index 4d6a952..dbda851 100644
--- a/Signal-Windows/Views/NotificationSettingsPage.xaml
+++ b/Signal-Windows/Views/NotificationSettingsPage.xaml
@@ -22,12 +22,12 @@
                     <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
                 <StackPanel>
-                    <TextBlock Text="Show..." Style="{StaticResource BaseTextBlockStyle}" Margin="0,0,0,6"/>
+                    <TextBlock Text="Show..." Style="{StaticResource BodyTextBlockStyle}" Margin="0,0,0,6"/>
                     <RadioButton Content="Name and message" Tag="{x:Bind Vm.NameAndMessageTag}" Margin="0,6" IsChecked="{x:Bind Vm.NameAndMessageChecked, Mode=TwoWay}" Checked="ShowNotificationText_Checked"/>
                     <RadioButton Content="Name only" Tag="{x:Bind Vm.NameOnlyTag}" Margin="0,6" IsChecked="{x:Bind Vm.NameOnlyChecked, Mode=TwoWay}" Checked="ShowNotificationText_Checked"/>
                     <RadioButton Content="No name or message" Tag="{x:Bind Vm.NoNameOrMessageTag}" Margin="0,6" IsChecked="{x:Bind Vm.NoNameOrMessageChecked, Mode=TwoWay}" Checked="ShowNotificationText_Checked"/><!--Does this mean that no notif will be shown?-->
                 </StackPanel>
-                <HyperlinkButton Grid.Row="1" Margin="0,16,0,0" NavigateUri="ms-settings:notifications" Content="More notification settings"/>
+                <HyperlinkButton Grid.Row="1" Margin="0,12,0,0" NavigateUri="ms-settings:notifications" Content="More notification settings"/>
             </Grid>
         </ScrollViewer>
         <StackPanel Grid.Row="1">

From e5fad7e716f2f3a04314bb25cf9b2fead1dd855a Mon Sep 17 00:00:00 2001
From: Jakob Hermann Preusker <jakohe@outlook.de>
Date: Sun, 3 Jun 2018 10:27:44 +0200
Subject: [PATCH 06/12] UI improvement RegisterFinalizationPage

---
 Signal-Windows/Views/RegisterFinalizationPage.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Signal-Windows/Views/RegisterFinalizationPage.xaml b/Signal-Windows/Views/RegisterFinalizationPage.xaml
index 72d50af..63f9880 100644
--- a/Signal-Windows/Views/RegisterFinalizationPage.xaml
+++ b/Signal-Windows/Views/RegisterFinalizationPage.xaml
@@ -43,7 +43,7 @@
         <TextBlock x:Name="TitleTextBlock" Grid.Row="0" Foreground="White" FontSize="34" HorizontalAlignment="Center" FontWeight="Light" Text="Connect with Signal" VerticalAlignment="Center"/>
         <StackPanel Grid.Row="1">
             <TextBlock Foreground="White" HorizontalAlignment="Center" Text="Enter your SMS verification code" FontSize="24" FontWeight="SemiLight"/>
-            <TextBox Width="200" Text="{x:Bind Vm.VerificationCode, Mode=TwoWay}" IsEnabled="{x:Bind Vm.UIEnabled, Mode=OneWay}" Margin="0,16,0,0" InputScope="Number"/>
+            <TextBox Width="200" BorderThickness="0,0,0,2" Text="{x:Bind Vm.VerificationCode, Mode=TwoWay}" IsEnabled="{x:Bind Vm.UIEnabled, Mode=OneWay}" Margin="0,16,0,0" InputScope="Number"/>
             <Button Background="White" Foreground="#2190EA" HorizontalAlignment="Center" Width="200" Margin="20 20 20 20" Click="FinishButton_Click" IsEnabled="{x:Bind Vm.UIEnabled, Mode=OneWay}" Content="Finish Registration"/>
         </StackPanel>
     </Grid>

From 424928ce047a29baa7f4cbbd46dc5b1848c1237e Mon Sep 17 00:00:00 2001
From: Jakob Hermann Preusker <jakohe@outlook.de>
Date: Sun, 3 Jun 2018 10:33:19 +0200
Subject: [PATCH 07/12] UI improvements RegisterPage

---
 Signal-Windows/Views/RegisterPage.xaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Signal-Windows/Views/RegisterPage.xaml b/Signal-Windows/Views/RegisterPage.xaml
index fcdde9c..7f945be 100644
--- a/Signal-Windows/Views/RegisterPage.xaml
+++ b/Signal-Windows/Views/RegisterPage.xaml
@@ -51,13 +51,14 @@
                         <ColumnDefinition Width="10"/>
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" Text="+" Foreground="White" FontSize="20"/>
-                    <TextBox Grid.Column="1" Text="{x:Bind Vm.PhonePrefix, Mode=TwoWay}" MinWidth="32" InputScope="TelephoneCountryCode"/>
+                    <Border Background="{ThemeResource TextBoxBorderThemeBrush}" Opacity="0.65"/>
+                    <TextBlock Grid.Column="0" Text="+" Foreground="White" FontSize="20" HorizontalAlignment="Center"/>
+                    <TextBox Grid.Column="1" BorderThickness="0,2,2,2" Text="{x:Bind Vm.PhonePrefix, Mode=TwoWay}" MinWidth="32" InputScope="TelephoneCountryCode"/>
                     <TextBox Grid.Column="3" Text="{x:Bind Vm.PhoneSuffix, Mode=TwoWay}" PlaceholderText="Phone number" InputScope="TelephoneNumber"/>
                 </Grid>
             </StackPanel>
             <TextBlock x:Name="VerifyTextBlock" Text="Verify your phone number to connect with Signal." FontSize="20" Foreground="White" HorizontalAlignment="Center" Margin="0,16,0,0" TextAlignment="Center" TextWrapping="Wrap"/>
-            <Button x:Name="RegisterButton" Background="White" Foreground="#2190EA" HorizontalAlignment="Center" Content="Register" Click="RegisterButton_Click" Margin="0,16,0,0" Width="256"/>
+            <Button x:Name="RegisterButton" Background="White" Foreground="#2190EA" HorizontalAlignment="Center" Content="Register" Click="RegisterButton_Click" Margin="0,16,0,0" Width="300"/>
         </StackPanel>
     </Grid>
 </Page>
\ No newline at end of file

From 0bc8d9ab35cfb18b96ded8c8727b004bd1d671a7 Mon Sep 17 00:00:00 2001
From: Jakob Hermann Preusker <jakohe@outlook.de>
Date: Sun, 3 Jun 2018 10:36:32 +0200
Subject: [PATCH 08/12] UI imprvements StartPage

---
 Signal-Windows/Views/StartPage.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Signal-Windows/Views/StartPage.xaml b/Signal-Windows/Views/StartPage.xaml
index 65f8e97..bf23043 100644
--- a/Signal-Windows/Views/StartPage.xaml
+++ b/Signal-Windows/Views/StartPage.xaml
@@ -39,8 +39,8 @@
         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
             <Image Source="ms-appx:///Assets/logo-idea-2.png" Width="256"/>
             <TextBlock x:Name="TitleTextBlock" Text="Welcome to Signal for Windows" Foreground="White" FontSize="24" FontWeight="Light" HorizontalAlignment="Center" Margin="0,50,0,0"/>
-            <Button x:Name="RegisterButton" HorizontalAlignment="Center" Foreground="#2190EA" Background="White" Content="Register a new Signal account" Margin="0,50,0,0" Click="RegisterButton_Click"/>
-            <Button x:Name="LinkButton" HorizontalAlignment="Center" Foreground="#2190EA" Background="White" Content="Link to an existing Signal account" Margin="0,20,0,0" Click="LinkButton_Click"/>
+            <Button x:Name="RegisterButton" Width="320" HorizontalAlignment="Center" Foreground="#2190EA" Background="White" Content="Register a new Signal account" Margin="0,50,0,0" Click="RegisterButton_Click"/>
+            <Button x:Name="LinkButton" HorizontalAlignment="Center" Width="320" Foreground="#2190EA" Background="White" Content="Link to an existing Signal account" Margin="0,20,0,0" Click="LinkButton_Click"/>
         </StackPanel>
     </Grid>
 </Page>
\ No newline at end of file

From 6ad09ea99806aa66e2638a3b344c49c63527dc7e Mon Sep 17 00:00:00 2001
From: Jakob Hermann Preusker <jakohe@outlook.de>
Date: Sun, 3 Jun 2018 10:55:15 +0200
Subject: [PATCH 09/12] Improved UI of MainPage

---
 Signal-Windows/Views/MainPage.xaml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Signal-Windows/Views/MainPage.xaml b/Signal-Windows/Views/MainPage.xaml
index 210e2b1..58bc7e6 100644
--- a/Signal-Windows/Views/MainPage.xaml
+++ b/Signal-Windows/Views/MainPage.xaml
@@ -32,19 +32,20 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
-                <Grid Grid.Row="0">
+                <Grid Grid.Row="0" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    <TextBlock HorizontalAlignment="Center" Grid.Column="0" Text="Signal" FontSize="34" FontWeight="Light" Margin="0,16" Foreground="{ThemeResource ApplicationPageBackgroundThemeBrush}"/>
-                    <Button Grid.Column="1" x:Name="AddContactButton" Background="{x:Null}" Click="AddContactButton_Click">
-                        <SymbolIcon Symbol="AddFriend" Foreground="{ThemeResource ApplicationPageBackgroundThemeBrush}" />
-                    </Button>
-                    <Button Grid.Column="2" x:Name="GlobalSettingsButton" Background="{x:Null}" Click="GlobalSettingsButton_Click">
-                        <SymbolIcon Symbol="Setting" Foreground="{ThemeResource ApplicationPageBackgroundThemeBrush}" />
-                    </Button>
+                    <TextBlock Grid.Column="0" Text="Signal" FontSize="34" FontWeight="Light" Margin="6,16" Foreground="White" HorizontalAlignment="Center"/>
+                    <StackPanel Orientation="Horizontal" Grid.Column="1">
+                        <Button x:Name="AddContactButton" Background="{x:Null}" Click="AddContactButton_Click">
+                            <SymbolIcon Symbol="AddFriend" Foreground="White" />
+                        </Button>
+                        <Button x:Name="GlobalSettingsButton" Background="{x:Null}" Click="GlobalSettingsButton_Click">
+                            <SymbolIcon Symbol="Setting" Foreground="White" />
+                        </Button>
+                    </StackPanel>
                 </Grid>
                 <AutoSuggestBox Grid.Row="1" Margin="16"/>
                 <ListView Grid.Row="2" Name="ContactsList" ItemsSource="{x:Bind Vm.Conversations, Mode=TwoWay}" SelectionMode="Single" SelectionChanged="Vm.ConversationsList_SelectionChanged" SelectedItem="{x:Bind Vm.SelectedConversation, Mode=TwoWay}">

From 178fd06590d2040f07c83dabaeb6b7de84d1ead1 Mon Sep 17 00:00:00 2001
From: Jakob Hermann Preusker <jakohe@outlook.de>
Date: Sun, 3 Jun 2018 11:06:39 +0200
Subject: [PATCH 10/12] UI changes (improvements?) to MainPage and the Welcome
 control

---
 Signal-Windows/Controls/Welcome.xaml | 5 ++++-
 Signal-Windows/Views/MainPage.xaml   | 6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Signal-Windows/Controls/Welcome.xaml b/Signal-Windows/Controls/Welcome.xaml
index 784fc7b..b3def56 100644
--- a/Signal-Windows/Controls/Welcome.xaml
+++ b/Signal-Windows/Controls/Welcome.xaml
@@ -10,6 +10,9 @@
     d:DesignWidth="400">
 
     <Grid>
-        <Image Source="ms-appx:///Assets/logo-idea-2.png" Width="256"/>
+        <StackPanel Orientation="Vertical">
+            <Image Source="ms-appx:///Assets/logo-idea-2.png" Width="256"/>
+            <TextBlock Text="Choose a contact to start chatting" Grid.Row="1" HorizontalAlignment="Center" Style="{StaticResource TitleTextBlockStyle}" Foreground="White" Margin="0,12,0,0"/>
+        </StackPanel>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/Signal-Windows/Views/MainPage.xaml b/Signal-Windows/Views/MainPage.xaml
index 58bc7e6..624e34e 100644
--- a/Signal-Windows/Views/MainPage.xaml
+++ b/Signal-Windows/Views/MainPage.xaml
@@ -32,7 +32,9 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
-                <Grid Grid.Row="0" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+                <Border Grid.Row="0" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"/>
+                <Border Grid.Row="0" Background="Black" Opacity="0.25"/>
+                <Grid Grid.Row="0">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="Auto" />
@@ -68,7 +70,7 @@
             </Grid>
         </SplitView.Pane>
         <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-            <controls:Welcome Grid.Row="0" Visibility="{x:Bind Vm.WelcomeVisibility, Mode=OneWay}" />
+            <controls:Welcome Grid.Row="0" Visibility="{x:Bind Vm.WelcomeVisibility, Mode=OneWay}" VerticalAlignment="Center"/>
             <controls:Conversation Grid.Row="0" Visibility="{x:Bind Vm.ThreadVisibility, Mode=OneWay}" x:Name="ConversationControl" />
         </Grid>
     </SplitView>

From 5fde90d3589763ff703efc8c6e11178d01908a63 Mon Sep 17 00:00:00 2001
From: Jakob Hermann Preusker <jakohe@outlook.de>
Date: Sun, 3 Jun 2018 11:37:32 +0200
Subject: [PATCH 11/12] =?UTF-8?q?Send=20bar=20disabled=20state=20doesn?=
 =?UTF-8?q?=C3=84t=20look=20strange=20anymore=20-=20fix=20Issue=20#110?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Signal-Windows/Controls/Conversation.xaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Signal-Windows/Controls/Conversation.xaml b/Signal-Windows/Controls/Conversation.xaml
index ed0dc1f..8c8b23f 100644
--- a/Signal-Windows/Controls/Conversation.xaml
+++ b/Signal-Windows/Controls/Conversation.xaml
@@ -77,7 +77,8 @@
                 </Setter.Value>
             </Setter>
         </Style>
-        <DataTemplate x:Key="NormalMessageTemplate" x:DataType="models:SignalMessage">
+        <DataTemplate x:Key="NormalMessageTemplate">
+            <!--x:DataType="models:SignalMessage"-->
             <local:Message x:Name="ListBoxItemContent" />
         </DataTemplate>
         <DataTemplate x:Key="UnreadMarkerTemplate">
@@ -132,7 +133,7 @@
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <TextBox Grid.Column="0" Name="InputTextBox" VerticalAlignment="Center" KeyDown="TextBox_KeyDown" PlaceholderText="Type a message" BorderBrush="{x:Null}" BorderThickness="0" TextWrapping="Wrap" TextChanged="InputTextBox_TextChanged" InputScope="Chat" Visibility="{x:Bind SendMessageVisible, Mode=OneWay}"/>
+            <TextBox Grid.Column="0" Name="InputTextBox" VerticalAlignment="Center" KeyDown="TextBox_KeyDown" PlaceholderText="Type a message" BorderBrush="{x:Null}" BorderThickness="0" TextWrapping="Wrap" TextChanged="InputTextBox_TextChanged" InputScope="Chat" Visibility="{x:Bind SendMessageVisible, Mode=OneWay}" Padding="10,15,6,15"/>
             <Button x:Name="SendMessageButton" Grid.Column="1" Click="SendMessageButton_Click" IsEnabled="{x:Bind SendButtonEnabled, Mode=OneWay}" Background="{x:Bind SendButtonBackground}" VerticalAlignment="Bottom" Width="50" VerticalContentAlignment="Stretch" MinHeight="50" Visibility="{x:Bind SendMessageVisible, Mode=OneWay}">
                 <SymbolIcon Symbol="Send"/>
             </Button>

From 8242da733a1f6069a0e79e41eb82bc76738a16d4 Mon Sep 17 00:00:00 2001
From: Jakob Hermann Preusker <jakohe@outlook.de>
Date: Sun, 3 Jun 2018 13:12:46 +0200
Subject: [PATCH 12/12] fixed a ui failure made by me

---
 Signal-Windows/Controls/Conversation.xaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Signal-Windows/Controls/Conversation.xaml b/Signal-Windows/Controls/Conversation.xaml
index 8c8b23f..c380265 100644
--- a/Signal-Windows/Controls/Conversation.xaml
+++ b/Signal-Windows/Controls/Conversation.xaml
@@ -77,8 +77,7 @@
                 </Setter.Value>
             </Setter>
         </Style>
-        <DataTemplate x:Key="NormalMessageTemplate">
-            <!--x:DataType="models:SignalMessage"-->
+        <DataTemplate x:Key="NormalMessageTemplate" x:DataType="models:SignalMessage">
             <local:Message x:Name="ListBoxItemContent" />
         </DataTemplate>
         <DataTemplate x:Key="UnreadMarkerTemplate">