Work in progress

bettiolo · Feb 18, 2012 · ba221a0 · ba221a0
1 parent 81d3220
commit ba221a0
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 29 deletions.
diff --git a/src/PassFruit.Client.InMemoryRepository/PassFruit.Client.InMemoryRepository.csproj b/src/PassFruit.Client.InMemoryRepository/PassFruit.Client.InMemoryRepository.csproj
@@ -50,7 +50,7 @@
     </ProjectReference>
     <ProjectReference Include="..\PassFruit\PassFruit.csproj">
       <Project>{02D15B96-AD18-466A-88D7-454652E8347A}</Project>
-      <Name>PassFruit %28PassFruit\PassFruit%29</Name>
+      <Name>PassFruit</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />

diff --git a/src/PassFruit.Tests.FakeData/PassFruit.Tests.FakeData.csproj b/src/PassFruit.Tests.FakeData/PassFruit.Tests.FakeData.csproj
@@ -3,15 +3,15 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{67DFF456-D3B0-4F62-BDC7-D0154C46C662}</ProjectGuid>
+    <ProjectGuid>{6140384A-8A30-4916-BAC5-6AD1E0FC5049}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PassFruit.Tests.FakeData</RootNamespace>
     <AssemblyName>PassFruit.Tests.FakeData</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Profile2</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,11 +33,11 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Serialization" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FakeDataGenerator.cs" />
@@ -50,10 +50,10 @@
     </ProjectReference>
     <ProjectReference Include="..\PassFruit\PassFruit.csproj">
       <Project>{02D15B96-AD18-466A-88D7-454652E8347A}</Project>
-      <Name>PassFruit %28PassFruit\PassFruit%29</Name>
+      <Name>PassFruit</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/src/PassFruit.Tests.FakeData/Properties/AssemblyInfo.cs b/src/PassFruit.Tests.FakeData/Properties/AssemblyInfo.cs
@@ -14,14 +14,6 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("cd417a95-c321-4cbb-bec5-531585e941b6")]
-
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version

diff --git a/src/PassFruit.Ui.Wp.sln b/src/PassFruit.Ui.Wp.sln
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PassFruit.Client.InMemoryRe
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PassFruit", "PassFruit\PassFruit.csproj", "{02D15B96-AD18-466A-88D7-454652E8347A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PassFruit.Tests.FakeData", "PassFruit.Tests.FakeData\PassFruit.Tests.FakeData.csproj", "{6140384A-8A30-4916-BAC5-6AD1E0FC5049}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,6 +41,10 @@ Global
 		{02D15B96-AD18-466A-88D7-454652E8347A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{02D15B96-AD18-466A-88D7-454652E8347A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{02D15B96-AD18-466A-88D7-454652E8347A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6140384A-8A30-4916-BAC5-6AD1E0FC5049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6140384A-8A30-4916-BAC5-6AD1E0FC5049}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6140384A-8A30-4916-BAC5-6AD1E0FC5049}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6140384A-8A30-4916-BAC5-6AD1E0FC5049}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/PassFruit.Ui.Wp/MainPageViewModel.cs b/src/PassFruit.Ui.Wp/MainPageViewModel.cs
@@ -7,6 +7,7 @@
 using Caliburn.Micro;
 using IsolatedStorageExtensions;
 using PassFruit.Contracts;
+using PassFruit.Tests.FakeData;
 using PassFruit.Ui.Wp.Views;
 using PassFruit.Ui.Wp.Views.Controls;
 

diff --git a/src/PassFruit.Ui.Wp/PassFruit.Ui.Wp.csproj b/src/PassFruit.Ui.Wp/PassFruit.Ui.Wp.csproj
@@ -187,6 +187,10 @@
       <Project>{3971F9F7-3A79-401D-93F6-5B50A10D15C2}</Project>
       <Name>PassFruit.Contracts</Name>
     </ProjectReference>
+    <ProjectReference Include="..\PassFruit.Tests.FakeData\PassFruit.Tests.FakeData.csproj">
+      <Project>{6140384A-8A30-4916-BAC5-6AD1E0FC5049}</Project>
+      <Name>PassFruit.Tests.FakeData</Name>
+    </ProjectReference>
     <ProjectReference Include="..\PassFruit\PassFruit.csproj">
       <Project>{02D15B96-AD18-466A-88D7-454652E8347A}</Project>
       <Name>PassFruit</Name>

diff --git a/src/PassFruit.Ui.Wp/Views/AccountDetailsPageViewModel.cs b/src/PassFruit.Ui.Wp/Views/AccountDetailsPageViewModel.cs
@@ -68,15 +68,15 @@ public class AccountDetailsPageViewModel : Screen {
 
         public Visibility IsUserNameEnabled {
             get {
-                return _account is IAccountHasUserName
+                return _account is IAccountWithUserName
                     ? Visibility.Visible
                     : Visibility.Collapsed;
             }
         }
 
         public Visibility IsEmailEnabled {
             get {
-                return _account is IAccountHasEmail
+                return _account is IAccountWithEmail
                     ? Visibility.Visible
                     : Visibility.Collapsed;
             }
@@ -92,13 +92,13 @@ public class AccountDetailsPageViewModel : Screen {
 
         public string Email {
             get {
-                var accountWithEmail = _account as IAccountHasEmail;
+                var accountWithEmail = _account as IAccountWithEmail;
                 return accountWithEmail != null 
                     ? accountWithEmail.Email 
                     : "";
             }
             set {
-                var accountWithEmail = _account as IAccountHasEmail;
+                var accountWithEmail = _account as IAccountWithEmail;
                 if (accountWithEmail == null) return;
 
                 accountWithEmail.Email = value;
@@ -109,13 +109,13 @@ public class AccountDetailsPageViewModel : Screen {
 
         public string UserName {
             get {
-                var accountWithUserName = _account as IAccountHasUserName;
+                var accountWithUserName = _account as IAccountWithUserName;
                 return accountWithUserName != null
                     ? accountWithUserName.UserName
                     : "";
             }
             set {
-                var accountWithUserName = _account as IAccountHasUserName;
+                var accountWithUserName = _account as IAccountWithUserName;
                 if (accountWithUserName == null) return;
 
                 accountWithUserName.UserName = value;

diff --git a/src/PassFruit.Ui.Wp/Views/AccountProviderSelectPageViewModel.cs b/src/PassFruit.Ui.Wp/Views/AccountProviderSelectPageViewModel.cs
@@ -34,11 +34,11 @@ public class AccountProviderSelectPageViewModel : Screen {
         public void AccountSelected(AccountProviderViewModel accountProvider) {
 
             var repository = Init.GetRepository();
-            repository.Accounts.Add(accountProvider.AccountProvider.);
+            //repository.Accounts.Add(accountProvider.AccountProvider);
 
-            _navigationService.UriFor<AccountDetailsPageViewModel>()
-                .WithParam(x => x.AccountId, )
-                .Navigate();
+            //_navigationService.UriFor<AccountDetailsPageViewModel>()
+            //    .WithParam(x => x.AccountId, )
+            //    .Navigate();
         }
 
     }

diff --git a/src/PassFruit.Ui.Wp/Views/Controls/AccountProviderViewModel.cs b/src/PassFruit.Ui.Wp/Views/Controls/AccountProviderViewModel.cs
@@ -16,7 +16,7 @@ namespace PassFruit.Ui.Wp.Views.Controls {
 
     public class AccountProviderViewModel : PropertyChangedBase {
 
-        public IAccountProvider AccountProvider { get; private set; };
+        public IAccountProvider AccountProvider { get; private set; }
 
         public AccountProviderViewModel(IAccountProvider accountProvider) {
             AccountProvider = accountProvider;