redesigned the contact edit screen

rawbenny · Feb 28, 2014 · 0253c1a · 0253c1a
1 parent 22b1c88
commit 0253c1a
Show file tree

Hide file tree

Showing 11 changed files with 108 additions and 368 deletions.
diff --git a/App.xaml b/App.xaml
@@ -14,9 +14,6 @@
 
             <Presenters:PhoneConverter x:Key="phoneConverter" />
 
-            <ObjectDataProvider  x:Key="stateNames"
-                                 MethodName="GetNames"
-                                 ObjectType="{x:Type Model:States}" />
 
         </ResourceDictionary>
 

diff --git a/ContactManager.csproj b/ContactManager.csproj
@@ -123,10 +123,8 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Model\Address.cs" />
     <Compile Include="Model\Contact.cs" />
     <Compile Include="Model\ContactRepository.cs" />
-    <Compile Include="Model\States.cs" />
     <Compile Include="Notifier.cs" />
     <Compile Include="Presenters\ApplicationPresenter.cs" />
     <Compile Include="Presenters\ContactListPresenter.cs" />

diff --git a/Model/Address.cs b/Model/Address.cs
diff --git a/Model/Contact.cs b/Model/Contact.cs
@@ -5,18 +5,16 @@ namespace ContactManager.Model
     [Serializable]
     public class Contact : Notifier
     {
-        private Address _address = new Address();
+        private string _name;
+        private int _age;
+        private string _address;
         private string _cellPhone;
-        private string _firstName;
-        private string _homePhone;
+        private string _homePhone;        
         private Guid _id = Guid.Empty;
         private string _imagePath;
-        private string _jobTitle;
-        private string _lastName;
-        private string _officePhone;
-        private string _organization;
-        private string _primaryEmail;
-        private string _secondaryEmail;
+        private string _studentId;        
+        private string _grade;
+        private string _email;
 
         public Guid Id
         {
@@ -38,58 +36,50 @@ public string ImagePath
             }
         }
 
-        public string FirstName
+        public string Name
         {
-            get { return _firstName; }
+            get { return _name; }
             set
             {
-                _firstName = value;
-                OnPropertyChanged("FirstName");
-                OnPropertyChanged("LookupName");
-            }
-        }
+                _name = value;
+                OnPropertyChanged("Name");
 
-        public string LastName
-        {
-            get { return _lastName; }
-            set
-            {
-                _lastName = value;
-                OnPropertyChanged("LastName");
-                OnPropertyChanged("LookupName");
             }
         }
 
-        public string Organization
+        public int Age
         {
-            get { return _organization; }
+
+            get { return _age; }
             set
             {
-                _organization = value;
-                OnPropertyChanged("Organization");
+                _age = value;
+                OnPropertyChanged("Age");
             }
         }
 
-        public string JobTitle
+        public string Grade
         {
-            get { return _jobTitle; }
+            get { return _grade; }
             set
             {
-                _jobTitle = value;
-                OnPropertyChanged("JobTitle");
+                _grade = value;
+                OnPropertyChanged("Grade");
             }
         }
 
-        public string OfficePhone
+        public string StudentId
         {
-            get { return _officePhone; }
+            get { return _studentId; }
             set
             {
-                _officePhone = value;
-                OnPropertyChanged("OfficePhone");
+                _studentId = value;
+                OnPropertyChanged("StudentId");
             }
         }
 
+
+
         public string CellPhone
         {
             get { return _cellPhone; }
@@ -110,27 +100,18 @@ public string HomePhone
             }
         }
 
-        public string PrimaryEmail
+        public string Email
         {
-            get { return _primaryEmail; }
+            get { return _email; }
             set
             {
-                _primaryEmail = value;
-                OnPropertyChanged("PrimaryEmail");
+                _email = value;
+                OnPropertyChanged("Email");
             }
         }
 
-        public string SecondaryEmail
-        {
-            get { return _secondaryEmail; }
-            set
-            {
-                _secondaryEmail = value;
-                OnPropertyChanged("SecondaryEmail");
-            }
-        }
 
-        public Address Address
+        public string Address
         {
             get { return _address; }
             set
@@ -140,20 +121,22 @@ public Address Address
             }
         }
 
-        public string LookupName
-        {
-            get { return string.Format("{0}, {1}", _lastName, _firstName); }
-        }
-
         public override string ToString()
         {
-            return LookupName;
+            return Name;
         }
 
         public override bool Equals(object obj)
         {
             Contact other = obj as Contact;
             return other != null && other.Id == Id;
         }
+        public override int GetHashCode()
+        {
+            int hash = 17;
+            // hash += CellPhone.GetHashCode();
+            //hash += HomePhone.GetHashCode();
+            return hash;
+        }
     }
 }
diff --git a/Model/ContactRepository.cs b/Model/ContactRepository.cs
@@ -38,12 +38,12 @@ public void Delete(Contact contact)
             Serialize();
         }
 
-        public List<Contact> FindByLookup(string lookupName)
+        public List<Contact> FindByLookup(string keyword)
         {
             IEnumerable<Contact> found =
                 from c in _contactStore
-                where c.LookupName.StartsWith(
-                    lookupName,
+                where c.Name.StartsWith(
+                    keyword,
                     StringComparison.OrdinalIgnoreCase
                     )
                 select c;

diff --git a/Model/States.cs b/Model/States.cs
diff --git a/Presenters/ApplicationPresenter.cs b/Presenters/ApplicationPresenter.cs
@@ -79,7 +79,7 @@ public void SaveContact(Contact contact)
 
             StatusText = string.Format(
                 "Contact '{0}' was saved.",
-                contact.LookupName
+                contact.Name
                 );
         }
 
@@ -92,7 +92,7 @@ public void DeleteContact(Contact contact)
 
             StatusText = string.Format(
                 "Contact '{0}' was deleted.",
-                contact.LookupName
+                contact.Name
                 );
         }
 

diff --git a/Presenters/EditContactPresenter.cs b/Presenters/EditContactPresenter.cs
@@ -12,7 +12,7 @@ public EditContactPresenter(
             ApplicationPresenter applicationPresenter, 
             EditContactView view,
             Contact contact)
-            : base(view, "Contact.LookupName")
+            : base(view, "Contact.Name")
         {
             _applicationPresenter = applicationPresenter;
             _contact = contact;