Skip to content
This repository was archived by the owner on Dec 3, 2021. It is now read-only.

Commit e8421b2

Browse files
committed
Update for XE16
1 parent cebcf30 commit e8421b2

File tree

7 files changed

+15
-18
lines changed

7 files changed

+15
-18
lines changed

Libs/glass-progress-bar-master/GlassProgressBar/GlassProgressBar.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>10.0.0</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
86
<ProjectGuid>{B89D7882-FB37-468F-89DC-ED3652D01B1B}</ProjectGuid>
97
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
108
<OutputType>Library</OutputType>
@@ -15,7 +13,7 @@
1513
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
1614
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
1715
<AssemblyName>GlassProgressBar</AssemblyName>
18-
<TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
1917
</PropertyGroup>
2018
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2119
<DebugSymbols>true</DebugSymbols>

Libs/glass-progress-bar-master/GlassProgressBar/Resources/Resource.designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

PTVGlass/NearMeActivity.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public async void NearbyDepartures(Location location)
7070
// show error card
7171
var errorCard = new Card(this);
7272
errorCard.SetText (e.ToString());
73-
SetContentView (errorCard.ToView ());
73+
SetContentView (errorCard.View);
7474

7575
return;
7676
}
@@ -125,7 +125,7 @@ public async void NearbyDepartures(Location location)
125125
{
126126
var noDeparturesCard = new Card(this);
127127
noDeparturesCard.SetText(Resource.String.no_upcoming_departures);
128-
SetContentView(noDeparturesCard.ToView());
128+
SetContentView(noDeparturesCard.View);
129129
return;
130130
}
131131

PTVGlass/PTVGlass.csproj

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>10.0.0</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
86
<ProjectGuid>{234AF26C-9689-41B6-BE64-4BEBAC398CAA}</ProjectGuid>
97
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
108
<OutputType>Library</OutputType>
@@ -17,7 +15,7 @@
1715
<AndroidResgenClass>Resource</AndroidResgenClass>
1816
<AssemblyName>PTVGlass</AssemblyName>
1917
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
20-
<TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v4.4</TargetFrameworkVersion>
2119
</PropertyGroup>
2220
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2321
<DebugSymbols>true</DebugSymbols>
@@ -51,14 +49,14 @@
5149
<Reference Include="System.Xml" />
5250
<Reference Include="System.Core" />
5351
<Reference Include="Mono.Android" />
54-
<Reference Include="GoogleGlassBindings">
55-
<HintPath>..\Components\googleglass-1.1\lib\android\GoogleGlassBindings.dll</HintPath>
56-
</Reference>
5752
<Reference Include="Newtonsoft.Json">
5853
<HintPath>..\Components\json.net-4.5.11\lib\android\Newtonsoft.Json.dll</HintPath>
5954
</Reference>
6055
<Reference Include="System.Net" />
6156
<Reference Include="System.Net.Http" />
57+
<Reference Include="GoogleGlassBindings">
58+
<HintPath>..\Components\googleglass-1.6\lib\android\GoogleGlassBindings.dll</HintPath>
59+
</Reference>
6260
</ItemGroup>
6361
<ItemGroup>
6462
<Compile Include="Resources\Resource.designer.cs" />
@@ -100,10 +98,6 @@
10098
</ItemGroup>
10199
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
102100
<ItemGroup>
103-
<XamarinComponentReference Include="googleglass">
104-
<Version>1.1</Version>
105-
<Visible>False</Visible>
106-
</XamarinComponentReference>
107101
<XamarinComponentReference Include="json.net">
108102
<Version>4.5.11</Version>
109103
<Visible>False</Visible>
@@ -112,6 +106,10 @@
112106
<Version>1.2.1</Version>
113107
<Visible>False</Visible>
114108
</XamarinComponentReference>
109+
<XamarinComponentReference Include="googleglass">
110+
<Version>1.6</Version>
111+
<Visible>False</Visible>
112+
</XamarinComponentReference>
115113
</ItemGroup>
116114
<ItemGroup>
117115
<ProjectReference Include="..\Libs\glass-progress-bar-master\GlassProgressBar\GlassProgressBar.csproj">

PTVGlass/Properties/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
<application android:label="PTVGlass" android:icon="@drawable/icon"></application>
55
<uses-permission android:name="android.permission.INTERNET" />
66
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
7+
<uses-permission android:name="com.google.android.glass.permission.DEVELOPMENT" />
78
</manifest>

PTVGlass/Resources/Resource.designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

PTVGlass/TrainDepartureActivity.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected override async void OnCreate (Bundle bundle)
4444
// show error card
4545
var errorCard = new Card(this);
4646
errorCard.SetText (e.ToString());
47-
SetContentView (errorCard.ToView ());
47+
SetContentView (errorCard.View);
4848

4949
return;
5050
}

0 commit comments

Comments
 (0)