Switch to use Google Play Services and Support library v4 from the co…

…mponent store
garuma · Dec 5, 2013 · 4bbfe2d · 4bbfe2d
1 parent 0a75a87
commit 4bbfe2d
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 97 deletions.
diff --git a/Moyeu.sln b/Moyeu.sln
@@ -3,9 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moyeu", "Moyeu\Moyeu.csproj", "{12143BA7-FFC5-4E11-8B31-89A96247F504}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MobileHtmlAgilityPack", "MobileHtmlAgilityPack\MobileHtmlAgilityPack.csproj", "{87DC26FB-DB8B-4FC0-BE60-EFC12A8B935F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MobileHtmlAgilityPack", "MobileHtmlAgilityPack\MobileHtmlAgilityPack.csproj", "{D91DC8A9-454E-4CB9-96BE-19652A67D0A4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GooglePlayServices", "GooglePlayServices\GooglePlayServices.csproj", "{2DDFEFA4-4944-42A7-971E-A2F751BA6036}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamSvg", "xamsvg\XamSvg.csproj", "{B70EDB4C-A85E-45BE-A180-5B0462020C6F}"
 EndProject
@@ -19,18 +17,14 @@ Global
 		{12143BA7-FFC5-4E11-8B31-89A96247F504}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{12143BA7-FFC5-4E11-8B31-89A96247F504}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{12143BA7-FFC5-4E11-8B31-89A96247F504}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2DDFEFA4-4944-42A7-971E-A2F751BA6036}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2DDFEFA4-4944-42A7-971E-A2F751BA6036}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DDFEFA4-4944-42A7-971E-A2F751BA6036}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2DDFEFA4-4944-42A7-971E-A2F751BA6036}.Release|Any CPU.Build.0 = Release|Any CPU
-		{87DC26FB-DB8B-4FC0-BE60-EFC12A8B935F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87DC26FB-DB8B-4FC0-BE60-EFC12A8B935F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87DC26FB-DB8B-4FC0-BE60-EFC12A8B935F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87DC26FB-DB8B-4FC0-BE60-EFC12A8B935F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B70EDB4C-A85E-45BE-A180-5B0462020C6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B70EDB4C-A85E-45BE-A180-5B0462020C6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B70EDB4C-A85E-45BE-A180-5B0462020C6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B70EDB4C-A85E-45BE-A180-5B0462020C6F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D91DC8A9-454E-4CB9-96BE-19652A67D0A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D91DC8A9-454E-4CB9-96BE-19652A67D0A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D91DC8A9-454E-4CB9-96BE-19652A67D0A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D91DC8A9-454E-4CB9-96BE-19652A67D0A4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Moyeu\Moyeu.csproj

diff --git a/Moyeu/HubwayMapFragment.cs b/Moyeu/HubwayMapFragment.cs
@@ -25,7 +25,7 @@
 
 namespace Moyeu
 {
-	public class HubwayMapFragment : Android.Support.V4.App.Fragment, ViewTreeObserver.IOnGlobalLayoutListener, IMoyeuSection
+	public class HubwayMapFragment: Android.Support.V4.App.Fragment, ViewTreeObserver.IOnGlobalLayoutListener, IMoyeuSection
 	{
 		Dictionary<int, Marker> existingMarkers = new Dictionary<int, Marker> ();
 		Marker locationPin;
@@ -53,7 +53,7 @@ public HubwayMapFragment (Context context)
 			MapsInitializer.Initialize (context);
 			this.pinFactory = new PinFactory (context);
 			this.favManager = FavoriteManager.Obtain (context);
-			SetHasOptionsMenu (true);
+			HasOptionsMenu = true;
 		}
 
 		public string Name {
@@ -107,11 +107,16 @@ public override View OnCreateView (LayoutInflater inflater, ViewGroup container,
 			mapFragment = view.FindViewById<MapView> (Resource.Id.map);
 			mapFragment.OnCreate (savedInstanceState);
 			lastUpdateText = view.FindViewById<TextView> (Resource.Id.UpdateTimeText);
+			SetupInfoPane (view);
+			flashBar = new FlashBarController (view);
+			return view;
+		}
+
+		void SetupInfoPane (View view)
+		{
 			pane = view.FindViewById<InfoPane> (Resource.Id.infoPane);
 			pane.StateChanged += HandlePaneStateChanged;
 			view.ViewTreeObserver.AddOnGlobalLayoutListener (this);
-			flashBar = new FlashBarController (view);
-			return view;
 		}
 
 		public override void OnViewCreated (View view, Bundle savedInstanceState)

diff --git a/Moyeu/MainActivity.cs b/Moyeu/MainActivity.cs
@@ -68,13 +68,13 @@ protected override void OnCreate (Bundle bundle)
 			                                              Resource.String.close_drawer) {
 				OpenCallback = () => {
 					ActionBar.Title = Title;
-					currentFragment.SetHasOptionsMenu (false);
+					currentFragment.HasOptionsMenu = false;
 					InvalidateOptionsMenu ();
 				},
 				CloseCallback = () => {
 					if (currentFragment != null) {
 						ActionBar.Title = ((IMoyeuSection)currentFragment).Title;
-						currentFragment.SetHasOptionsMenu (true);
+						currentFragment.HasOptionsMenu = true;
 					}
 					InvalidateOptionsMenu ();
 				},

diff --git a/Moyeu/Moyeu.csproj b/Moyeu/Moyeu.csproj
@@ -17,6 +17,7 @@
     <AssemblyName>Moyeu</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
+    <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -43,7 +44,12 @@
     <Reference Include="Mono.Android" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Net.Http" />
-    <Reference Include="Mono.Android.Support.v4" />
+    <Reference Include="GooglePlayServicesLib">
+      <HintPath>..\Components\googleplayservices-13.0\lib\android\GooglePlayServicesLib.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Android.Support.v4">
+      <HintPath>..\Components\xamandroidsupportv4-18-4.18.1\lib\android\Xamarin.Android.Support.v4.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
@@ -155,13 +161,9 @@
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
   <ItemGroup>
     <ProjectReference Include="..\MobileHtmlAgilityPack\MobileHtmlAgilityPack.csproj">
-      <Project>{87DC26FB-DB8B-4FC0-BE60-EFC12A8B935F}</Project>
+      <Project>{D91DC8A9-454E-4CB9-96BE-19652A67D0A4}</Project>
       <Name>MobileHtmlAgilityPack</Name>
     </ProjectReference>
-    <ProjectReference Include="..\GooglePlayServices\GooglePlayServices.csproj">
-      <Project>{2DDFEFA4-4944-42A7-971E-A2F751BA6036}</Project>
-      <Name>GooglePlayServices</Name>
-    </ProjectReference>
     <ProjectReference Include="..\xamsvg\XamSvg.csproj">
       <Project>{B70EDB4C-A85E-45BE-A180-5B0462020C6F}</Project>
       <Name>XamSvg</Name>
@@ -180,4 +182,16 @@
     <Folder Include="Resources\animator\" />
     <Folder Include="Resources\drawable-xxhdpi\" />
   </ItemGroup>
+  <ItemGroup>
+    <XamarinComponentReference Include="googleplayservices">
+      <InstallationInProgress>True</InstallationInProgress>
+      <Version>13.0</Version>
+      <Visible>False</Visible>
+    </XamarinComponentReference>
+    <XamarinComponentReference Include="xamandroidsupportv4-18">
+      <InstallationInProgress>True</InstallationInProgress>
+      <Version>4.18.1</Version>
+      <Visible>False</Visible>
+    </XamarinComponentReference>
+  </ItemGroup>
 </Project>
diff --git a/Moyeu/RentalFragment.cs b/Moyeu/RentalFragment.cs
@@ -37,7 +37,7 @@ public class RentalFragment : Android.Support.V4.App.ListFragment, IMoyeuSection
 
 		public RentalFragment (Context context)
 		{
-			SetHasOptionsMenu (true);
+			HasOptionsMenu = true;
 		}
 
 		public string Name {

diff --git a/Moyeu/Resources/Resource.designer.cs b/Moyeu/Resources/Resource.designer.cs