- Fixed the MVVM Light and Coding4fun reference issues.

- Used proper nuget packages for c4f and PhoneFlipMenu - Updated the splashscreen and marketplacebackground images. - Updated the icons - Set the FlurryAPIKey to be read in from a file. - Project now needs a FlurryConfig.xml file in the Domainr7 folder, it's structure should be like this: <?xml version="1.0" encoding="utf-8"?> <Flurry> <ApiKey>APIKEYGOESHERE20</ApiKey> </Flurry>
domainr · Apr 24, 2012 · 5a3db25 · 5a3db25
1 parent 934c4fe
commit 5a3db25
Show file tree

Hide file tree

Showing 23 changed files with 53 additions and 14 deletions.
diff --git a/Domainr7/App.xaml.cs b/Domainr7/App.xaml.cs
@@ -7,6 +7,10 @@
 using Microsoft.Phone.Shell;
 using Microsoft.Phone.Net.NetworkInformation;
 using Domainr7.Model;
+using System.Windows.Resources;
+using System.IO;
+using System.Xml.Linq;
+using System.Linq;
 
 namespace Domainr7
 {
@@ -46,6 +50,8 @@ public static bool IsNetworkAvailable
             }
         }
 
+        private static string FlurryApiKey { get; set; }
+
         // Easy access to the root frame
         public PhoneApplicationFrame RootFrame
         {
@@ -65,6 +71,8 @@ public App()
             // Phone-specific initialization
             InitializePhoneApplication();
 
+            SetFlurryApiKey();
+
             // Show graphics profiling information while debugging.
             if (System.Diagnostics.Debugger.IsAttached)
             {
@@ -87,18 +95,47 @@ public App()
 
         }
 
+        private void SetFlurryApiKey()
+        {
+            StreamResourceInfo sri = Application.GetResourceStream(new Uri("FlurryConfig.xml", UriKind.Relative));
+            if (sri == null)
+            {
+                FlurryApiKey = "NoKeyFound";
+            }
+            else
+            {
+                try
+                {
+                    XDocument doc = XDocument.Load(sri.Stream);
+                    string key = doc.Descendants("ApiKey").FirstOrDefault().Value;
+                    if (string.IsNullOrEmpty(key))
+                    {
+                        FlurryApiKey = "NoKeyFound";
+                    }
+                    else
+                    {
+                        FlurryApiKey = key;
+                    }
+                }
+                catch
+                {
+                    FlurryApiKey = "NoKeyFound";
+                }
+            }
+        }
+
         // Code to execute when the application is launching (eg, from Start)
         // This code will not execute when the application is reactivated
         private void Application_Launching(object sender, LaunchingEventArgs e)
         {
-            FlurryWP7SDK.Api.StartSession(Constants.FlurryAPIKey);
+            FlurryWP7SDK.Api.StartSession(FlurryApiKey);
         }
 
         // Code to execute when the application is activated (brought to foreground)
         // This code will not execute when the application is first launched
         private void Application_Activated(object sender, ActivatedEventArgs e)
         {
-            FlurryWP7SDK.Api.StartSession(Constants.FlurryAPIKey);
+            FlurryWP7SDK.Api.StartSession(FlurryApiKey);
         }
 
         // Code to execute when the application is deactivated (sent to background)

diff --git a/Domainr7/ApplicationIcon.png b/Domainr7/ApplicationIcon.png
diff --git a/Domainr7/BackgroundIcon.png b/Domainr7/BackgroundIcon.png
diff --git a/Domainr7/Domainr7.csproj b/Domainr7/Domainr7.csproj
@@ -48,12 +48,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Coding4Fun.Phone.Controls, Version=1.5.5.0, Culture=neutral, processorArchitecture=MSIL" />
-    <Reference Include="Coding4Fun.Phone.Controls.Toolkit">
-      <HintPath>..\packages\coding4fun\Coding4Fun.Phone.Controls.Toolkit.dll</HintPath>
+    <Reference Include="Coding4Fun.Phone.Controls, Version=1.5.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Coding4Fun.Phone.Controls.Complete.1.5.6\lib\sl4-windowsphone71\Coding4Fun.Phone.Controls.dll</HintPath>
     </Reference>
-    <Reference Include="Coding4Fun.Phone.Site.Controls">
-      <HintPath>..\packages\coding4fun\Coding4Fun.Phone.Site.Controls.dll</HintPath>
+    <Reference Include="Coding4Fun.Phone.Controls.Toolkit, Version=1.5.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Coding4Fun.Phone.Controls.Complete.1.5.6\lib\sl4-windowsphone71\Coding4Fun.Phone.Controls.Toolkit.dll</HintPath>
     </Reference>
     <Reference Include="DomainrSharp.WindowsPhone, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -73,8 +74,8 @@
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.4.5.3\lib\sl4-windowsphone71\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="PhoneFlipMenuControl">
-      <HintPath>..\packages\PhoneFlipMenu\PhoneFlipMenuControl.dll</HintPath>
+    <Reference Include="PhoneFlipMenuControl, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\PhoneFlipMenu.1.0.0\lib\sl4-wp71\PhoneFlipMenuControl.dll</HintPath>
     </Reference>
     <Reference Include="ReactiveUI.Blend_WP7">
       <HintPath>..\packages\reactiveui-xaml.2.5.2.0\lib\SL3-WP\ReactiveUI.Blend_WP7.dll</HintPath>
@@ -106,6 +107,7 @@
     <Reference Include="System.Windows.Interactivity, Version=3.8.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Xml" />
     <Reference Include="mscorlib.extensions" />
+    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml.XPath, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\ScottIsAFool.WindowsPhone.1.0.7.0\lib\System.Xml.XPath.dll</HintPath>
     </Reference>
@@ -173,6 +175,7 @@
     <Content Include="Content\About\Data.xml">
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="FlurryConfig.xml" />
     <Content Include="Icons\appbar.share.rest.png" />
     <Content Include="Images\clearboxicon.png" />
     <Content Include="SplashScreenImage.jpg">

diff --git a/Domainr7/Model/Constants.cs b/Domainr7/Model/Constants.cs
@@ -17,8 +17,6 @@ public static class Constants
         public const string AvailabilityMaybe = "maybe";
         public const string AvailabilityTLD = "tld";
         public const string AvailabilityAvailable = "available";
-        public const string AvailabilityUnavailable = "unavailable";
-
-        public const string FlurryAPIKey = "1GNRE5L1JTM96K6DCWQX";
+        public const string AvailabilityUnavailable = "unavailable";        
     }
 }
diff --git a/Domainr7/Properties/WMAppManifest.xml b/Domainr7/Properties/WMAppManifest.xml
@@ -16,7 +16,7 @@
         <TemplateType5>
           <BackgroundImageURI IsRelative="true" IsResource="false">BackgroundIcon.png</BackgroundImageURI>
           <Count>0</Count>
-          <Title>Domainr</Title>
+          <Title></Title>
         </TemplateType5>
       </PrimaryToken>
     </Tokens>

diff --git a/Domainr7/SplashScreenImage.jpg b/Domainr7/SplashScreenImage.jpg
diff --git a/Domainr7/packages.config b/Domainr7/packages.config
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Coding4Fun.Phone.Controls.Complete" version="1.5.6" />
   <package id="DomainrSharp" version="1.0.1" />
   <package id="Newtonsoft.Json" version="4.5.3" />
+  <package id="PhoneFlipMenu" version="1.0.0" />
   <package id="reactiveui-core" version="2.5.2.0" />
   <package id="reactiveui-xaml" version="2.5.2.0" />
   <package id="Rx_Experimental-Main" version="1.1.11111" />

diff --git a/Marketplace/Icon.pdn b/Marketplace/Icon.pdn
diff --git a/Marketplace/MarketplaceBackground.pdn b/Marketplace/MarketplaceBackground.pdn
diff --git a/Marketplace/SplashScreenImage.pdn b/Marketplace/SplashScreenImage.pdn
diff --git a/Marketplace/en/Logo173.png b/Marketplace/en/Logo173.png
diff --git a/Marketplace/en/Logo200.png b/Marketplace/en/Logo200.png
diff --git a/Marketplace/en/Logo62.png b/Marketplace/en/Logo62.png
diff --git a/Marketplace/en/Logo99.png b/Marketplace/en/Logo99.png
diff --git a/Marketplace/en/MarketplaceBackground.png b/Marketplace/en/MarketplaceBackground.png
diff --git a/...s/Coding4Fun.Phone.Controls.Complete.1.5.6/Coding4Fun.Phone.Controls.Complete.1.5.6.nupkg b/...s/Coding4Fun.Phone.Controls.Complete.1.5.6/Coding4Fun.Phone.Controls.Complete.1.5.6.nupkg
diff --git a/...fun/Coding4Fun.Phone.Controls.Toolkit.dll → ...e71/Coding4Fun.Phone.Controls.Toolkit.dll b/...fun/Coding4Fun.Phone.Controls.Toolkit.dll → ...e71/Coding4Fun.Phone.Controls.Toolkit.dll
diff --git a/.../coding4fun/Coding4Fun.Phone.Controls.dll → ...dowsphone71/Coding4Fun.Phone.Controls.dll b/.../coding4fun/Coding4Fun.Phone.Controls.dll → ...dowsphone71/Coding4Fun.Phone.Controls.dll
diff --git a/packages/PhoneFlipMenu.1.0.0/PhoneFlipMenu.1.0.0.nupkg b/packages/PhoneFlipMenu.1.0.0/PhoneFlipMenu.1.0.0.nupkg
diff --git a/...es/PhoneFlipMenu/PhoneFlipMenuControl.dll → ...0.0/lib/sl4-wp71/PhoneFlipMenuControl.dll b/...es/PhoneFlipMenu/PhoneFlipMenuControl.dll → ...0.0/lib/sl4-wp71/PhoneFlipMenuControl.dll
diff --git a/packages/coding4fun/Coding4Fun.Phone.Site.Controls.dll b/packages/coding4fun/Coding4Fun.Phone.Site.Controls.dll
diff --git a/packages/coding4fun/[Content_Types].xml b/packages/coding4fun/[Content_Types].xml