Skip to content

Commit 1799820

Browse files
mikephammikepham
committed
Merge pull request #46 from nativecode-dev/development
Development
2 parents 4873be3 + 7c1fd2a commit 1799820

34 files changed

+1012
-460
lines changed

‎src/Demo/Demo.Droid/Demo.Droid.csproj

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
1515
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
1616
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
17-
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
17+
<TargetFrameworkVersion>v5.1</TargetFrameworkVersion>
1818
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
19-
<NuGetPackageImportStamp>e08ce7ee</NuGetPackageImportStamp>
19+
<NuGetPackageImportStamp>7efdbe4c</NuGetPackageImportStamp>
2020
</PropertyGroup>
2121
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2222
<DebugSymbols>true</DebugSymbols>
@@ -50,41 +50,37 @@
5050
</PropertyGroup>
5151
<ItemGroup>
5252
<Reference Include="FormsViewGroup">
53-
<HintPath>..\..\packages\Xamarin.Forms.1.4.3.6376\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
53+
<HintPath>..\..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
5454
</Reference>
5555
<Reference Include="Mono.Android" />
5656
<Reference Include="mscorlib" />
5757
<Reference Include="System" />
5858
<Reference Include="System.Core" />
5959
<Reference Include="System.Xml.Linq" />
6060
<Reference Include="System.Xml" />
61-
<Reference Include="Xamarin.Android.Support.Design, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
62-
<HintPath>..\..\packages\Xamarin.Android.Support.Design.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.Design.dll</HintPath>
63-
<Private>True</Private>
61+
<Reference Include="Xamarin.Android.Support.Design">
62+
<HintPath>..\..\packages\Xamarin.Android.Support.Design.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.Design.dll</HintPath>
6463
</Reference>
65-
<Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
66-
<HintPath>..\..\packages\Xamarin.Android.Support.v4.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
67-
<Private>True</Private>
64+
<Reference Include="Xamarin.Android.Support.v4">
65+
<HintPath>..\..\packages\Xamarin.Android.Support.v4.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
6866
</Reference>
69-
<Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
70-
<HintPath>..\..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
71-
<Private>True</Private>
67+
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
68+
<HintPath>..\..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
7269
</Reference>
73-
<Reference Include="Xamarin.Android.Support.v7.CardView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
74-
<HintPath>..\..\packages\Xamarin.Android.Support.v7.CardView.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath>
75-
<Private>True</Private>
70+
<Reference Include="Xamarin.Android.Support.v7.CardView">
71+
<HintPath>..\..\packages\Xamarin.Android.Support.v7.CardView.22.2.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath>
7672
</Reference>
7773
<Reference Include="Xamarin.Forms.Core">
78-
<HintPath>..\..\packages\Xamarin.Forms.1.4.3.6376\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
74+
<HintPath>..\..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
7975
</Reference>
8076
<Reference Include="Xamarin.Forms.Platform">
81-
<HintPath>..\..\packages\Xamarin.Forms.1.4.3.6376\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
77+
<HintPath>..\..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
8278
</Reference>
8379
<Reference Include="Xamarin.Forms.Platform.Android">
84-
<HintPath>..\..\packages\Xamarin.Forms.1.4.3.6376\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
80+
<HintPath>..\..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
8581
</Reference>
8682
<Reference Include="Xamarin.Forms.Xaml">
87-
<HintPath>..\..\packages\Xamarin.Forms.1.4.3.6376\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
83+
<HintPath>..\..\packages\Xamarin.Forms.1.5.0.6446\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
8884
</Reference>
8985
</ItemGroup>
9086
<ItemGroup>
@@ -131,11 +127,11 @@
131127
<AndroidResource Include="Resources\drawable-xxhdpi\ic_search.png" />
132128
</ItemGroup>
133129
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
134-
<Import Project="..\..\packages\Xamarin.Forms.1.4.3.6376\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.1.4.3.6376\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
130+
<Import Project="..\..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
135131
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
136132
<PropertyGroup>
137133
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
138134
</PropertyGroup>
139-
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.1.4.3.6376\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.1.4.3.6376\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
135+
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.1.5.0.6446\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
140136
</Target>
141137
</Project>

‎src/Demo/Demo.Droid/MainActivity.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
using Xamarin.Forms;
1111

12-
[Activity(ConfigurationChanges = AppConfig, MainLauncher = true, Theme = CompatThemeLightDarkActionBar)]
12+
[Activity(ConfigurationChanges = AppConfig, MainLauncher = true, Theme = "@style/Theme.AppCompat.NoActionBar")]
1313
public class MainActivity : AppCompatFormsApplicationActivity
1414
{
1515
private const ConfigChanges AppConfig = ConfigChanges.Orientation | ConfigChanges.ScreenSize;
@@ -21,7 +21,7 @@ protected override void OnCreate(Bundle savedInstanceState)
2121
base.OnCreate(savedInstanceState);
2222

2323
Forms.Init(this, savedInstanceState);
24-
FormsAppCompat.EnableAll();
24+
FormsAppCompat.Init();
2525

2626
this.LoadApplication(new App());
2727
}

‎src/Demo/Demo.Droid/Properties/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Demo.Droid" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.nativecode.appcompat.demo" android:versionCode="1" android:versionName="1.0">
33
<uses-sdk android:minSdkVersion="16" />
44
<application android:label="AppCompat Demo" android:icon="@drawable/launcher" />
55
</manifest>

0 commit comments

Comments
 (0)