Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit ceeebd1

Browse files
RedthRedth
committed
Merge branch 'master' into v26.0.0
# Conflicts: # build.cake # support-compat/source/Transforms/Metadata.xml
2 parents 27be9a5 + bb628b9 commit ceeebd1

File tree

10 files changed

+76
-40
lines changed

10 files changed

+76
-40
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ obj/
44
packages/
55
externals/
66
output/
7+
docs/
78

89
*.xam
910
*.DS_Store

‎build.cake‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ var BUILD_CONFIG = Argument ("config", "Release");
2020
var NUGET_VERSION = "26.0.0-beta1";
2121
var COMPONENT_VERSION = "26.0.0.0";
2222
var AAR_VERSION = "26.0.0";
23+
var DOC_VERSION = "2017-08-22";
2324

2425
var SUPPORT_PKG_NAME = "com.android.support";
2526

@@ -527,7 +528,7 @@ Task ("droiddocs").Does(() =>
527528
{
528529
EnsureDirectoryExists("./output");
529530

530-
var compressedDocsFile = "./output/docs-" + AAR_VERSION + ".zip";
531+
var compressedDocsFile = "./output/docs-" + DOC_VERSION + ".zip";
531532

532533
if (!FileExists(compressedDocsFile)) {
533534
if (IsRunningOnWindows ())

‎design/source/Additions/Additions.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
namespace Android.Support.Design.Internal
55
{
66

7-
//public partial class NavigationMenuItemView
8-
//{
9-
// public void SetEnabled (bool enabled)
10-
// {
11-
// Enabled = enabled;
12-
// }
13-
//}
14-
15-
//public partial class BottomNavigationItemView
16-
//{
17-
// public void SetEnabled (bool enabled)
18-
// {
19-
// Enabled = enabled;
20-
// }
21-
//}
7+
public partial class NavigationMenuItemView
8+
{
9+
public void SetEnabled (bool enabled)
10+
{
11+
Enabled = enabled;
12+
}
13+
}
14+
15+
public partial class BottomNavigationItemView
16+
{
17+
public void SetEnabled (bool enabled)
18+
{
19+
Enabled = enabled;
20+
}
21+
}
2222

2323
}
2424

‎design/source/Design.csproj‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,6 @@
5959
</TransformFile>
6060
</ItemGroup>
6161
<ItemGroup>
62-
<ProjectReference Include="..\..\v7-recyclerview\source\V7-RecyclerView.csproj">
63-
<Project>{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}</Project>
64-
<Name>V7-RecyclerView</Name>
65-
</ProjectReference>
66-
<ProjectReference Include="..\..\v7-appcompat\source\V7-AppCompat.csproj">
67-
<Project>{B4ED245B-BBD8-4549-9990-476A36AAD381}</Project>
68-
<Name>V7-AppCompat</Name>
69-
</ProjectReference>
7062
<ProjectReference Include="..\..\support-compat\source\Compat.csproj">
7163
<Project>{CA4194B2-8B2D-4C37-8790-C79C5803357A}</Project>
7264
<Name>Compat</Name>
@@ -87,6 +79,18 @@
8779
<Project>{BD8BB4A9-5ACD-47FB-923C-0DC858E1A42D}</Project>
8880
<Name>Media-Compat</Name>
8981
</ProjectReference>
82+
<ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
83+
<Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
84+
<Name>Annotations</Name>
85+
</ProjectReference>
86+
<ProjectReference Include="..\..\appcompat-v7\source\V7-AppCompat.csproj">
87+
<Project>{B4ED245B-BBD8-4549-9990-476A36AAD381}</Project>
88+
<Name>V7-AppCompat</Name>
89+
</ProjectReference>
90+
<ProjectReference Include="..\..\recyclerview-v7\source\V7-RecyclerView.csproj">
91+
<Project>{514ED7A8-0F25-4F61-B7B3-A4A652FD7192}</Project>
92+
<Name>V7-RecyclerView</Name>
93+
</ProjectReference>
9094
</ItemGroup>
9195
<ItemGroup>
9296
<None Include="packages.config" />

‎support-compat/source/Compat.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,11 @@
7474
<Link>support-compat.aar</Link>
7575
</LibraryProjectZip>
7676
</ItemGroup>
77+
<ItemGroup>
78+
<ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
79+
<Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
80+
<Name>Annotations</Name>
81+
</ProjectReference>
82+
</ItemGroup>
7783
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
7884
</Project>

‎support-compat/source/Transforms/Metadata.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,5 @@
5555
<remove-node path="/api/package[@name='android.support.v4.graphics']/class[@name='TypefaceCompatApi26Impl']" />
5656

5757
<!-- The generator binds both CharSequence and java.lang.String as System.String types so if we have overloads which only differ in java by CharSequence and String, we'll end up with duplicate .net binding overloads, so we remove the extra bindings -->
58-
<remove-node path="/api/package[@name='android.support.v4.text']/class[@name='BidiFormatter']/method[@name='unicodeWrap' and count(parameter)=1 and parameter[1][@type='java.lang.CharSequence']]" />
59-
<remove-node path="/api/package[@name='android.support.v4.text']/class[@name='BidiFormatter']/method[@name='unicodeWrap' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='boolean']]" />
60-
<remove-node path="/api/package[@name='android.support.v4.text']/class[@name='BidiFormatter']/method[@name='unicodeWrap' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='android.support.v4.text.TextDirectionHeuristicCompat']]" />
61-
<remove-node path="/api/package[@name='android.support.v4.text']/class[@name='BidiFormatter']/method[@name='unicodeWrap' and count(parameter)=3 and parameter[1][@type='java.lang.String'] and parameter[2][@type='android.support.v4.text.TextDirectionHeuristicCompat'] and parameter[3][@type='boolean']]" />
58+
<remove-node path="/api/package[@name='android.support.v4.text']/class[@name='BidiFormatter']/method[@name='unicodeWrap' and parameter[1][@type='java.lang.String']]" />
6259
</metadata>

‎tests/AndroidSupport.Tests/AndroidSupport.Tests.csproj‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,14 @@
116116
<Reference Include="Xamarin.Android.Support.Design">
117117
<HintPath>..\..\output\Xamarin.Android.Support.Design.dll</HintPath>
118118
</Reference>
119-
<Reference Include="xunit.runner.utility.netstandard15">
120-
<HintPath>..\packages\xunit.runner.utility.2.2.0\lib\netstandard1.5\xunit.runner.utility.netstandard15.dll</HintPath>
119+
<Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
120+
<HintPath>..\..\output\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
121+
</Reference>
122+
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
123+
<HintPath>..\..\output\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
121124
</Reference>
122-
<Reference Include="xunit.runner.devices">
123-
<HintPath>..\packages\xunit.runner.devices.2.2.0\lib\MonoAndroid\xunit.runner.devices.dll</HintPath>
125+
<Reference Include="Xamarin.Android.Support.v7.CardView">
126+
<HintPath>..\..\output\Xamarin.Android.Support.v7.CardView.dll</HintPath>
124127
</Reference>
125128
<Reference Include="xunit.abstractions">
126129
<HintPath>..\packages\xunit.abstractions.2.0.1\lib\netstandard1.0\xunit.abstractions.dll</HintPath>
@@ -134,14 +137,20 @@
134137
<Reference Include="xunit.execution.dotnet">
135138
<HintPath>..\packages\xunit.extensibility.execution.2.2.0\lib\netstandard1.1\xunit.execution.dotnet.dll</HintPath>
136139
</Reference>
137-
<Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
138-
<HintPath>..\..\output\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
140+
<Reference Include="xunit.runner.utility.netstandard15">
141+
<HintPath>..\packages\xunit.runner.utility.2.2.0\lib\netstandard1.5\xunit.runner.utility.netstandard15.dll</HintPath>
139142
</Reference>
140-
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
141-
<HintPath>..\..\output\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
143+
<Reference Include="Xamarin.Android.Support.v7.RecyclerView">
144+
<HintPath>..\..\output\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
142145
</Reference>
143-
<Reference Include="Xamarin.Android.Support.v7.CardView">
144-
<HintPath>..\..\output\Xamarin.Android.Support.v7.CardView.dll</HintPath>
146+
<Reference Include="Xamarin.Android.Support.v7.MediaRouter">
147+
<HintPath>..\..\output\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
148+
</Reference>
149+
<Reference Include="Xamarin.Android.Support.Vector.Drawable">
150+
<HintPath>..\..\output\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
151+
</Reference>
152+
<Reference Include="Xamarin.Android.Support.InstantVideo">
153+
<HintPath>..\..\output\Xamarin.Android.Support.InstantVideo.dll</HintPath>
145154
</Reference>
146155
</ItemGroup>
147156
<ItemGroup>
@@ -155,7 +164,6 @@
155164
<None Include="Properties\AndroidManifest.xml" />
156165
<None Include="Assets\AboutAssets.txt" />
157166
<None Include="packages.config" />
158-
<None Include="MainActivity.cs.txt" />
159167
</ItemGroup>
160168
<ItemGroup>
161169
<AndroidResource Include="Resources\layout\Main.axml" />

‎tests/AndroidSupport.Tests/Tests.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,23 @@ public async Task Bugzilla_51180_ToBundle_Compat_Does_Not_Fail()
3939
Assert.NotNull(bundleOrig);
4040
Assert.NotNull(bundleCompat);
4141
}
42+
43+
[Fact]
44+
public void Support_Design_Internal_Classes_Exist()
45+
{
46+
var ctx = MainActivity.TestParentActivity;
47+
var a = new Android.Support.Design.Internal.BottomNavigationItemView(ctx);
48+
var b = new Android.Support.Design.Internal.BottomNavigationMenu(ctx);
49+
var c = new Android.Support.Design.Internal.BottomNavigationMenuView(ctx);
50+
var d = new Android.Support.Design.Internal.SnackbarContentLayout(ctx);
51+
}
52+
53+
[Fact]
54+
public void Support_Design_Classes_Exist()
55+
{
56+
var ctx = MainActivity.TestParentActivity;
57+
var e = new Android.Support.Design.Widget.BottomSheetDialog(ctx);
58+
var f = new Android.Support.Design.Widget.BottomSheetDialogFragment();
59+
}
4260
}
4361
}

‎tests/AndroidSupport.Tests/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<package id="System.Reflection" version="4.1.0" targetFramework="monoandroid70" />
2727
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="monoandroid70" />
2828
<package id="System.Reflection.Primitives" version="4.0.1" targetFramework="monoandroid70" />
29+
<package id="System.Reflection.TypeExtensions" version="4.1.0" targetFramework="monoandroid70" />
2930
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="monoandroid70" />
3031
<package id="System.Runtime" version="4.1.0" targetFramework="monoandroid70" />
3132
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="monoandroid70" />
@@ -51,5 +52,5 @@
5152
<package id="xunit.core" version="2.2.0" targetFramework="monoandroid70" />
5253
<package id="xunit.extensibility.core" version="2.2.0" targetFramework="monoandroid70" />
5354
<package id="xunit.extensibility.execution" version="2.2.0" targetFramework="monoandroid70" />
54-
<package id="xunit.runner.console" version="2.2.0" targetFramework="monoandroid70" developmentDependency="true" />
55+
<package id="xunit.runner.utility" version="2.2.0" targetFramework="monoandroid70" />
5556
</packages>

‎util/droiddocs.exe‎

3.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)