Skip to content

Commit 1f163e6

Browse files
committed
Revert a few things
1 parent dc1763e commit 1f163e6

File tree

5 files changed

+16
-6
lines changed

5 files changed

+16
-6
lines changed

Signal-Windows/Signal-Windows.csproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@
141141
<Compile Include="App.xaml.cs">
142142
<DependentUpon>App.xaml</DependentUpon>
143143
</Compile>
144+
<Compile Include="Controls\AddContactListElement.xaml.cs">
145+
<DependentUpon>AddContactListElement.xaml</DependentUpon>
146+
</Compile>
144147
<Compile Include="Controls\IdentityKeyChangeMessage.xaml.cs">
145148
<DependentUpon>IdentityKeyChangeMessage.xaml</DependentUpon>
146149
</Compile>
@@ -175,6 +178,7 @@
175178
<DependentUpon>20170825082857_m2.cs</DependentUpon>
176179
</Compile>
177180
<Compile Include="Migrations\SignalDB\SignalDBContextModelSnapshot.cs" />
181+
<Compile Include="Models\PhoneContact.cs" />
178182
<Compile Include="Models\SignalEarlyReceipt.cs" />
179183
<Compile Include="Models\SignalIdentity.cs" />
180184
<Compile Include="Models\SignalAttachment.cs" />
@@ -243,6 +247,10 @@
243247
<Generator>MSBuild:Compile</Generator>
244248
<SubType>Designer</SubType>
245249
</ApplicationDefinition>
250+
<Page Include="Controls\AddContactListElement.xaml">
251+
<SubType>Designer</SubType>
252+
<Generator>MSBuild:Compile</Generator>
253+
</Page>
246254
<Page Include="Controls\IdentityKeyChangeMessage.xaml">
247255
<SubType>Designer</SubType>
248256
<Generator>MSBuild:Compile</Generator>

Signal-Windows/ViewModels/AddContactPageViewModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public string ContactNumber
4242
get { return _ContactNumber; }
4343
set { _ContactNumber = value; RaisePropertyChanged(nameof(ContactNumber)); }
4444
}
45-
45+
4646
public AddContactPageViewModel()
4747
{
4848
Contacts = new ObservableCollection<PhoneContact>();
@@ -281,4 +281,4 @@ private string ParsePhoneNumber(string number)
281281
return phoneNumberUtil.Format(phoneNumber, PhoneNumberFormat.E164);
282282
}
283283
}
284-
}
284+
}

Signal-Windows/Views/AddContactPage.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
xmlns:local="using:Signal_Windows.Views"
66
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
77
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8+
xmlns:viewmodels="using:Signal_Windows.ViewModels"
9+
xmlns:controls="using:Signal_Windows.Controls"
810
mc:Ignorable="d"
911
DataContext="{Binding AddContactPageInstance, Source={StaticResource Locator}}">
1012

@@ -31,4 +33,4 @@
3133
</ListView.ItemTemplate>
3234
</ListView>
3335
</Grid>
34-
</Page>
36+
</Page>

Signal-Windows/Views/AddContactPage.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ private void ContactNumberTextBox_TextChanged(object sender, TextChangedEventArg
6666
Vm.ContactNumberTextBox_TextChanged(sender, e);
6767
}
6868
}
69-
}
69+
}

Signal-Windows/Views/MainPage.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ public void ReselectTop()
156156
private void AddContactButton_Click(object sender, RoutedEventArgs e)
157157
{
158158
App.ViewModels.AddContactPageInstance.MainPageVM = Vm;
159-
App.ViewModels.AddContactPageInstance.ContactName = "";
160-
App.ViewModels.AddContactPageInstance.ContactNumber = "";
159+
//App.ViewModels.AddContactPageInstance.ContactName = "";
160+
//App.ViewModels.AddContactPageInstance.ContactNumber = "";
161161
Frame.Navigate(typeof(AddContactPage));
162162
}
163163
}

0 commit comments

Comments
 (0)