Merge branch 'master' into add-contact-page

Author: golf1052

Signal-Windows/Controls/Conversation.xaml.cs

@@ -223,6 +223,8 @@ private async void TextBox_KeyDown(object sender, KeyRoutedEventArgs e)
 
         private void ScrollToBottom()
         {
+            if (ConversationItemsControl.Items.Count == 0)
+                return;
             var lastMsg = ConversationItemsControl.Items[ConversationItemsControl.Items.Count - 1] as SignalMessageContainer;
             Debug.WriteLine($"scroll to {lastMsg}");
             ConversationItemsControl.ScrollIntoView(lastMsg);

Signal-Windows/Signal-Windows.csproj

@@ -141,9 +141,6 @@
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\AddContactListElement.xaml.cs">
-      <DependentUpon>AddContactListElement.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Controls\IdentityKeyChangeMessage.xaml.cs">
       <DependentUpon>IdentityKeyChangeMessage.xaml</DependentUpon>
     </Compile>
@@ -178,7 +175,6 @@
       <DependentUpon>20170825082857_m2.cs</DependentUpon>
     </Compile>
     <Compile Include="Migrations\SignalDB\SignalDBContextModelSnapshot.cs" />
-    <Compile Include="Models\PhoneContact.cs" />
     <Compile Include="Models\SignalEarlyReceipt.cs" />
     <Compile Include="Models\SignalIdentity.cs" />
     <Compile Include="Models\SignalAttachment.cs" />
@@ -247,10 +243,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Page Include="Controls\AddContactListElement.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Controls\IdentityKeyChangeMessage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

Signal-Windows/ViewModels/AddContactPageViewModel.cs

@@ -42,7 +42,7 @@ public string ContactNumber
             get { return _ContactNumber; }
             set { _ContactNumber = value; RaisePropertyChanged(nameof(ContactNumber)); }
         }
-
+        
         public AddContactPageViewModel()
         {
             Contacts = new ObservableCollection<PhoneContact>();
@@ -281,4 +281,4 @@ private string ParsePhoneNumber(string number)
             return phoneNumberUtil.Format(phoneNumber, PhoneNumberFormat.E164);
         }
     }
-}
+}

Signal-Windows/Views/AddContactPage.xaml

@@ -5,8 +5,6 @@
     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:viewmodels="using:Signal_Windows.ViewModels"
-    xmlns:controls="using:Signal_Windows.Controls"
     mc:Ignorable="d"
     DataContext="{Binding AddContactPageInstance, Source={StaticResource Locator}}">
 
@@ -33,4 +31,4 @@
             </ListView.ItemTemplate>
         </ListView>
     </Grid>
-</Page>
+</Page>

Signal-Windows/Views/AddContactPage.xaml.cs

@@ -66,4 +66,4 @@ private void ContactNumberTextBox_TextChanged(object sender, TextChangedEventArg
             Vm.ContactNumberTextBox_TextChanged(sender, e);
         }
     }
-}
+}

Signal-Windows/Views/MainPage.xaml.cs

@@ -156,8 +156,8 @@ public void ReselectTop()
         private void AddContactButton_Click(object sender, RoutedEventArgs e)
         {
             App.ViewModels.AddContactPageInstance.MainPageVM = Vm;
-            //App.ViewModels.AddContactPageInstance.ContactName = "";
-            //App.ViewModels.AddContactPageInstance.ContactNumber = "";
+            App.ViewModels.AddContactPageInstance.ContactName = "";
+            App.ViewModels.AddContactPageInstance.ContactNumber = "";
             Frame.Navigate(typeof(AddContactPage));
         }
     }