Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

…mponent store
  • Loading branch information...
commit 4bbfe2d139d733614866a5d68f11d7aeca527fc8 1 parent 0a75a87
@garuma authored
View
16 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}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GooglePlayServices", "GooglePlayServices\GooglePlayServices.csproj", "{2DDFEFA4-4944-42A7-971E-A2F751BA6036}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MobileHtmlAgilityPack", "MobileHtmlAgilityPack\MobileHtmlAgilityPack.csproj", "{D91DC8A9-454E-4CB9-96BE-19652A67D0A4}"
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
View
13 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)
View
4 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 ();
},
View
26 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>
View
2  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 {
View
101 Moyeu/Resources/Resource.designer.cs
@@ -243,76 +243,70 @@ public partial class Drawable
public const int drawer_shadow = 2130837529;
// aapt resource value: 0x7f02001a
- public const int fire = 2130837530;
+ public const int flash_bar_background = 2130837530;
// aapt resource value: 0x7f02001b
- public const int flash_bar_background = 2130837531;
+ public const int ic_action_mylocation = 2130837531;
// aapt resource value: 0x7f02001c
- public const int ic_action_mylocation = 2130837532;
+ public const int ic_action_refresh = 2130837532;
// aapt resource value: 0x7f02001d
- public const int ic_action_refresh = 2130837533;
+ public const int ic_action_search = 2130837533;
// aapt resource value: 0x7f02001e
- public const int ic_action_search = 2130837534;
+ public const int ic_drawer = 2130837534;
// aapt resource value: 0x7f02001f
- public const int ic_drawer = 2130837535;
+ public const int ic_drawer_map = 2130837535;
// aapt resource value: 0x7f020020
- public const int ic_drawer_map = 2130837536;
+ public const int ic_drawer_rentals = 2130837536;
// aapt resource value: 0x7f020021
- public const int ic_drawer_rentals = 2130837537;
+ public const int ic_drawer_star = 2130837537;
// aapt resource value: 0x7f020022
- public const int ic_drawer_star = 2130837538;
+ public const int ic_plusone_medium_off_client = 2130837538;
// aapt resource value: 0x7f020023
- public const int ic_plusone_medium_off_client = 2130837539;
+ public const int ic_plusone_small_off_client = 2130837539;
// aapt resource value: 0x7f020024
- public const int ic_plusone_small_off_client = 2130837540;
+ public const int ic_plusone_standard_off_client = 2130837540;
// aapt resource value: 0x7f020025
- public const int ic_plusone_standard_off_client = 2130837541;
+ public const int ic_plusone_tall_off_client = 2130837541;
// aapt resource value: 0x7f020026
- public const int ic_plusone_tall_off_client = 2130837542;
+ public const int Icon = 2130837542;
// aapt resource value: 0x7f020027
- public const int Icon = 2130837543;
+ public const int info_pane_btn_bg = 2130837543;
// aapt resource value: 0x7f020028
- public const int info_pane_btn_bg = 2130837544;
+ public const int info_pane_header_bg = 2130837544;
// aapt resource value: 0x7f020029
- public const int info_pane_header_bg = 2130837545;
+ public const int info_pane_underline = 2130837545;
// aapt resource value: 0x7f02002a
- public const int info_pane_underline = 2130837546;
+ public const int pane_item_bg = 2130837546;
// aapt resource value: 0x7f02002b
- public const int pane_item_bg = 2130837547;
+ public const int pane_item_bg_normal = 2130837547;
// aapt resource value: 0x7f02002c
- public const int pane_item_bg_normal = 2130837548;
+ public const int pane_item_bg_selected = 2130837548;
// aapt resource value: 0x7f02002d
- public const int pane_item_bg_selected = 2130837549;
+ public const int pattern = 2130837549;
// aapt resource value: 0x7f02002e
- public const int pattern = 2130837550;
+ public const int texture_pattern = 2130837550;
// aapt resource value: 0x7f02002f
- public const int station_lock = 2130837551;
-
- // aapt resource value: 0x7f020030
- public const int texture_pattern = 2130837552;
-
- // aapt resource value: 0x7f020031
- public const int time_cell_bg = 2130837553;
+ public const int time_cell_bg = 2130837551;
static Drawable()
{
@@ -480,14 +474,14 @@ public partial class Id
// aapt resource value: 0x7f08003f
public const int map = 2131230783;
- // aapt resource value: 0x7f080057
- public const int menu_mylocation = 2131230807;
+ // aapt resource value: 0x7f08004b
+ public const int menu_mylocation = 2131230795;
- // aapt resource value: 0x7f080059
- public const int menu_refresh = 2131230809;
+ // aapt resource value: 0x7f08004d
+ public const int menu_refresh = 2131230797;
- // aapt resource value: 0x7f080058
- public const int menu_search = 2131230808;
+ // aapt resource value: 0x7f08004c
+ public const int menu_search = 2131230796;
// aapt resource value: 0x7f080000
public const int none = 2131230720;
@@ -519,27 +513,6 @@ public partial class Id
// aapt resource value: 0x7f080002
public const int satellite = 2131230722;
- // aapt resource value: 0x7f08004d
- public const int space1 = 2131230797;
-
- // aapt resource value: 0x7f08004f
- public const int space2 = 2131230799;
-
- // aapt resource value: 0x7f080051
- public const int space3 = 2131230801;
-
- // aapt resource value: 0x7f080053
- public const int space4 = 2131230803;
-
- // aapt resource value: 0x7f08004b
- public const int space5 = 2131230795;
-
- // aapt resource value: 0x7f080055
- public const int space6 = 2131230805;
-
- // aapt resource value: 0x7f080056
- public const int space7 = 2131230806;
-
// aapt resource value: 0x7f080023
public const int stationLock = 2131230755;
@@ -561,15 +534,6 @@ public partial class Id
// aapt resource value: 0x7f080024
public const int textView1 = 2131230756;
- // aapt resource value: 0x7f080050
- public const int textView10 = 2131230800;
-
- // aapt resource value: 0x7f080052
- public const int textView11 = 2131230802;
-
- // aapt resource value: 0x7f080054
- public const int textView12 = 2131230804;
-
// aapt resource value: 0x7f080017
public const int textView2 = 2131230743;
@@ -582,12 +546,6 @@ public partial class Id
// aapt resource value: 0x7f080035
public const int textView7 = 2131230773;
- // aapt resource value: 0x7f08004c
- public const int textView8 = 2131230796;
-
- // aapt resource value: 0x7f08004e
- public const int textView9 = 2131230798;
-
// aapt resource value: 0x7f08000f
public const int titleText = 2131230735;
@@ -653,9 +611,6 @@ public partial class Layout
// aapt resource value: 0x7f030008
public const int RentalItem = 2130903048;
- // aapt resource value: 0x7f030009
- public const int TestLayout = 2130903049;
-
static Layout()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
Please sign in to comment.
Something went wrong with that request. Please try again.