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

Initial CameraX bindings #182

Open
wants to merge 3 commits into
base: AndroidX
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 31 additions & 3 deletions config.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{
"groupId" : "androidx.annotation",
"artifactId" : "annotation",
"version" : "1.0.2",
"version" : "1.1.0",
"nugetId" : "Xamarin.AndroidX.Annotation",
"dependencyOnly" : false
}
Expand Down Expand Up @@ -67,10 +67,24 @@
,{
"groupId" : "androidx.core",
"artifactId" : "core",
"version" : "1.0.1",
"version" : "1.1.0-rc02",
"nugetId" : "Xamarin.AndroidX.Core",
"dependencyOnly" : false
}
,{
"groupId" : "androidx.camera",
"artifactId" : "camera-camera2",
"version" : "1.0.0-alpha03",
"nugetId" : "Xamarin.AndroidX.Camera.Camera2",
"dependencyOnly" : false
}
,{
"groupId" : "androidx.camera",
"artifactId" : "camera-core",
"version" : "1.0.0-alpha03",
"nugetId" : "Xamarin.AndroidX.Camera.Core",
"dependencyOnly" : false
}
,{
"groupId" : "androidx.cardview",
"artifactId" : "cardview",
Expand All @@ -85,6 +99,13 @@
"nugetId" : "Xamarin.AndroidX.Collection",
"dependencyOnly" : false
}
,{
"groupId" : "androidx.concurrent",
"artifactId" : "concurrent-futures",
"version" : "1.0.0-alpha03",
"nugetId" : "Xamarin.AndroidX.Concurrent.Futures",
"dependencyOnly" : false
}
,{
"groupId" : "androidx.constraintlayout",
"artifactId" : "constraintlayout",
Expand Down Expand Up @@ -487,7 +508,7 @@
,{
"groupId" : "androidx.versionedparcelable",
"artifactId" : "versionedparcelable",
"version" : "1.0.0",
"version" : "1.1.0-rc01",
"nugetId" : "Xamarin.AndroidX.VersionedParcelable",
"dependencyOnly" : false
}
Expand Down Expand Up @@ -548,6 +569,13 @@
"nugetId" : "Xamarin.Google.Guava.ListenableFuture",
"nugetVersion" : "1.0",
"dependencyOnly" : true
},
{
"groupId" : "com.google.auto.value",
"artifactId" : "auto-value-annotations",
"version" : "1.6.5",
"nugetId" : "Xamarin.Google.AutoValue.Annotations",
"dependencyOnly" : true
}
]
}]
12 changes: 6 additions & 6 deletions source/AndroidXProject.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -83,23 +83,23 @@
}

<ItemGroup>
<Folder Include="Additions\" />
<Folder Include="Jars\" />
<Folder Include="Transforms\" />
<Folder Include="additions\" />
<Folder Include="jars\" />
<Folder Include="transforms\" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\source\AssemblyInfo.cs" />
<Compile Include="..\..\source\@(Model.MavenGroupId)\@(Model.Name)\additions\*.cs">
<Link>Additions/%(RecursiveDir)/%(Filename)%(Extension)</Link>
<Link>additions/%(RecursiveDir)/%(Filename)%(Extension)</Link>
</Compile>
</ItemGroup>

<ItemGroup>
<TransformFile Include="..\..\source\Metadata.common.xml" >
<Link>Transforms/Metadata.common.xml</Link>
<Link>transforms/Metadata.common.xml</Link>
</TransformFile>
<TransformFile Include="..\..\source\@(Model.MavenGroupId)\@(Model.Name)\transforms\*.xml">
<Link>Transforms/%(RecursiveDir)/%(Filename)%(Extension)</Link>
<Link>transforms/%(RecursiveDir)/%(Filename)%(Extension)</Link>
</TransformFile>
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,4 +225,5 @@
</add-node>
-->
<attr path="/api/package[@name='androidx.appcompat.widget']/class[@name='ActivityChooserModel.ActivityResolveInfo']/method[@name='compareTo' and count(parameter)=1 and parameter[1][@type='androidx.appcompat.widget.ActivityChooserModel.ActivityResolveInfo']]/parameter[1]" name="managedType">Java.Lang.Object</attr>
<remove-node path="/api/package/class/implements[@name='androidx.core.internal.view.SupportMenuItem']" />
</metadata>
3 changes: 3 additions & 0 deletions source/androidx.camera/camera-camera2/transforms/Metadata.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<metadata>
<remove-node path="/api/package/class/implements[@name='androidx.camera.core.ConfigProvider']" />
</metadata>
5 changes: 5 additions & 0 deletions source/androidx.camera/camera-core/transforms/Metadata.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<metadata>
<remove-node path="/api/package[@name='androidx.camera.core']/class/implements[@name='androidx.camera.core.ThreadConfig']" />
<remove-node path="/api/package[@name='androidx.camera.core']/class/implements[@name='androidx.camera.core.UseCaseConfig.Builder']" />
<remove-node path="/api/package[@name='androidx.camera.core']/class/implements[@name='androidx.camera.core.TargetConfig.Builder']" />
</metadata>
2 changes: 2 additions & 0 deletions source/androidx.core/core/transforms/Metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,6 @@
</method>
</add-node>
<attr path="/api/package[@name='androidx.core.view']/interface[@name='NestedScrollingParent']/method[@name='onNestedScrollAccepted' and count(parameter)=3 and parameter[1][@type='android.view.View'] and parameter[2][@type='android.view.View'] and parameter[3][@type='int']]/parameter[3]" name="managedType">Android.Views.ScrollAxis</attr>

<remove-node path="/api/package[@name='androidx.core.content.pm']/class[@name='ShortcutInfoCompatSaver.NoopImpl']" />
</metadata>
2 changes: 1 addition & 1 deletion source/androidx.fragment/fragment/additions/Additions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ namespace AndroidX.Fragment.App
{
public partial class FragmentActivity
{
public override AndroidX.Lifecycle.Lifecycle Lifecycle => base.Lifecycle;
//public override AndroidX.Lifecycle.Lifecycle Lifecycle => base.Lifecycle;
}
}