dotnet · 4brunu · Nov 2, 2021 · Nov 2, 2021
diff --git a/config.json b/config.json
@@ -34,6 +34,14 @@
         "nugetId": "Xamarin.AndroidX.Activity",
         "dependencyOnly": false
       },
+      {
+        "groupId": "androidx.activity",
+        "artifactId": "activity-compose",
+        "version": "1.3.0",
+        "nugetVersion": "1.3.0.0",
+        "nugetId": "Xamarin.AndroidX.Activity.Compose",
+        "dependencyOnly": false
+      },
       {
         "groupId": "androidx.activity",
         "artifactId": "activity-ktx",
@@ -346,6 +354,30 @@
         "nugetId": "Xamarin.AndroidX.Compose.UI.Text",
         "dependencyOnly": false
       },
+      {
+        "groupId": "androidx.compose.ui",
+        "artifactId": "ui-tooling",
+        "version": "1.0.0",
+        "nugetVersion": "1.0.0",
+        "nugetId": "Xamarin.AndroidX.Compose.UI.Tooling",
+        "dependencyOnly": false
+      },
+      {
+        "groupId": "androidx.compose.ui",
+        "artifactId": "ui-tooling-preview",
+        "version": "1.0.0",
+        "nugetVersion": "1.0.0",
+        "nugetId": "Xamarin.AndroidX.Compose.UI.Tooling.Preview",
+        "dependencyOnly": false
+      },
+      {
+        "groupId": "androidx.compose.ui",
+        "artifactId": "ui-tooling-data",
+        "version": "1.0.0",
+        "nugetVersion": "1.0.0",
+        "nugetId": "Xamarin.AndroidX.Compose.UI.Tooling.Data",
+        "dependencyOnly": false
+      },
       {
         "groupId": "androidx.compose.ui",
         "artifactId": "ui-unit",
@@ -1330,6 +1362,14 @@
         "nugetId": "Xamarin.AndroidX.Work.Work.Runtime.Ktx",
         "dependencyOnly": false
       },
+      {
+        "groupId": "com.google.accompanist",
+        "artifactId": "accompanist-appcompat-theme",
+        "version": "0.15.0",
+        "nugetVersion": "0.15.0.0",
+        "nugetId": "Xamarin.Google.Accompanist.AppCompat.Theme",
+        "dependencyOnly": false
+      },
       {
         "groupId": "com.google.android.material",
         "artifactId": "material",
@@ -1338,6 +1378,14 @@
         "nugetId": "Xamarin.Google.Android.Material",
         "dependencyOnly": false
       },
+      {
+        "groupId": "com.google.android.material",
+        "artifactId": "compose-theme-adapter",
+        "version": "1.0.0",
+        "nugetVersion": "1.0.0.0",
+        "nugetId": "Xamarin.Google.Android.Material.Compose.Theme.Adapter",
+        "dependencyOnly": false
+      },
       {
         "groupId": "com.google.auto.value",
         "artifactId": "auto-value-annotations",

diff --git a/mappings/dependencies.json b/mappings/dependencies.json
@@ -104,6 +104,16 @@
         "Xamarin.Kotlin.StdLib"
       ]
     },
+    {
+      "id": "Xamarin.AndroidX.Activity.Compose",
+      "dependencies": [
+        "Xamarin.AndroidX.Compose.Runtime",
+        "Xamarin.AndroidX.Compose.Runtime.Saveable",
+        "Xamarin.AndroidX.Activity.Ktx",
+        "Xamarin.AndroidX.Compose.UI",
+        "Xamarin.Kotlin.StdLib"
+      ]
+    },
     {
       "id": "Xamarin.AndroidX.Core.Core.Ktx",
       "dependencies": [
@@ -473,6 +483,15 @@
         "Xamarin.AndroidX.CustomView"
       ]
     },
+    {
+      "id": "Xamarin.Google.Accompanist.AppCompat.Theme",
+      "dependencies": [
+        "Xamarin.AndroidX.AppCompat",
+        "Xamarin.AndroidX.Core.Core.Ktx",
+        "Xamarin.Google.Android.Material",
+        "Xamarin.Kotlin.StdLib.Jdk8"
+      ]
+    },
     {
       "id": "Xamarin.Google.Android.Material",
       "dependencies": [
@@ -492,6 +511,17 @@
         "Xamarin.AndroidX.ViewPager2"
       ]
     },
+    {
+      "id": "Xamarin.Google.Android.Material.Compose.Theme.Adapter",
+      "dependencies": [
+        "Xamarin.AndroidX.AppCompat",
+        "Xamarin.AndroidX.Core.Core.Ktx",
+        "Xamarin.AndroidX.Compose.Material",
+        "Xamarin.AndroidX.Compose.Runtime",
+        "Xamarin.Google.Android.Material",
+        "Xamarin.Kotlin.StdLib.Jdk8"
+      ]
+    },
     {
       "id": "Xamarin.AndroidX.Car.Cluster",
       "dependencies": [
@@ -595,6 +625,36 @@
         "Xamarin.KotlinX.Coroutines.Core"
       ]
     },
+    {
+      "id": "Xamarin.AndroidX.Compose.UI.Tooling",
+      "dependencies": [
+        "Xamarin.AndroidX.Annotation",
+        "Xamarin.AndroidX.Compose.Material",
+        "Xamarin.AndroidX.Compose.Runtime",
+        "Xamarin.AndroidX.Compose.UI",
+        "Xamarin.AndroidX.Compose.UI.Tooling.Preview",
+        "Xamarin.AndroidX.Compose.UI.Tooling.Data",
+        "Xamarin.AndroidX.Activity.Compose",
+        "Xamarin.Kotlin.StdLib"
+      ]
+    },
+    {
+      "id": "Xamarin.AndroidX.Compose.UI.Tooling.Preview",
+      "dependencies": [
+        "Xamarin.AndroidX.Annotation",
+        "Xamarin.AndroidX.Compose.Runtime",
+        "Xamarin.Kotlin.StdLib"
+      ]
+    },
+    {
+      "id": "Xamarin.AndroidX.Compose.UI.Tooling.Data",
+      "dependencies": [
+        "Xamarin.AndroidX.Annotation",
+        "Xamarin.AndroidX.Compose.Runtime",
+        "Xamarin.AndroidX.Compose.UI",
+        "Xamarin.Kotlin.StdLib",
+      ]
+    },
     {
       "id": "Xamarin.Kotlin.StdLib.Common",
       "dependencies": []

diff --git a/source/androidx.activity/activity-compose/Additions/Additions.cs b/source/androidx.activity/activity-compose/Additions/Additions.cs
@@ -0,0 +1,4 @@
+using System;
+using Android.Views;
+using Android.Widget;
+using Android.Graphics;
diff --git a/source/androidx.activity/activity-compose/Transforms/EnumFields.xml b/source/androidx.activity/activity-compose/Transforms/EnumFields.xml
@@ -0,0 +1,2 @@
+<enum-field-mappings>
+</enum-field-mappings>
diff --git a/source/androidx.activity/activity-compose/Transforms/EnumMethods.xml b/source/androidx.activity/activity-compose/Transforms/EnumMethods.xml
@@ -0,0 +1,2 @@
+<enum-method-mappings>
+</enum-method-mappings>
diff --git a/source/androidx.activity/activity-compose/Transforms/Metadata.Namespaces.xml b/source/androidx.activity/activity-compose/Transforms/Metadata.Namespaces.xml
@@ -0,0 +1,5 @@
+<metadata>
+
+    <remove-node path="/api/package" />
+
+</metadata>
diff --git a/source/androidx.activity/activity-compose/Transforms/Metadata.ParameterNames.xml b/source/androidx.activity/activity-compose/Transforms/Metadata.ParameterNames.xml
@@ -0,0 +1,2 @@
+<metadata>
+</metadata>
diff --git a/source/androidx.activity/activity-compose/Transforms/Metadata.xml b/source/androidx.activity/activity-compose/Transforms/Metadata.xml
@@ -0,0 +1,3 @@
+<metadata>
+
+</metadata>
diff --git a/source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.Namespaces.xml
@@ -1,5 +1,7 @@
 <metadata>
 
+    <remove-node path="/api/package" />
+
     <!--
     <attr 
         path="/api/package[@name='androidx.compose']" 

diff --git a/source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.Namespaces.xml
@@ -1,4 +1,7 @@
 <metadata>
+
+    <remove-node path="/api/package" />
+
     <!--
     <attr 
         path="/api/package[@name='androidx.compose']" 

diff --git a/source/androidx.compose.ui/ui-tooling/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-tooling/Transforms/Metadata.Namespaces.xml
@@ -1,5 +1,7 @@
 <metadata>
 
+    <remove-node path="/api/package" />
+
     <!--
     <attr 
         path="/api/package[@name='androidx.compose']" 

diff --git a/source/com.google.accompanist/accompanist-appcompat-theme/Additions/Additions.cs b/source/com.google.accompanist/accompanist-appcompat-theme/Additions/Additions.cs
@@ -0,0 +1,4 @@
+using System;
+using Android.Views;
+using Android.Widget;
+using Android.Graphics;
diff --git a/source/com.google.accompanist/accompanist-appcompat-theme/Transforms/EnumFields.xml b/source/com.google.accompanist/accompanist-appcompat-theme/Transforms/EnumFields.xml
@@ -0,0 +1,2 @@
+<enum-field-mappings>
+</enum-field-mappings>
diff --git a/source/com.google.accompanist/accompanist-appcompat-theme/Transforms/EnumMethods.xml b/source/com.google.accompanist/accompanist-appcompat-theme/Transforms/EnumMethods.xml
@@ -0,0 +1,2 @@
+<enum-method-mappings>
+</enum-method-mappings>
diff --git a/source/com.google.accompanist/accompanist-appcompat-theme/Transforms/Metadata.Namespaces.xml b/source/com.google.accompanist/accompanist-appcompat-theme/Transforms/Metadata.Namespaces.xml
@@ -0,0 +1,5 @@
+<metadata>
+
+    <remove-node path="/api/package" />
+
+</metadata>
diff --git a/...com.google.accompanist/accompanist-appcompat-theme/Transforms/Metadata.ParameterNames.xml b/...com.google.accompanist/accompanist-appcompat-theme/Transforms/Metadata.ParameterNames.xml
@@ -0,0 +1,2 @@
+<metadata>
+</metadata>
diff --git a/source/com.google.accompanist/accompanist-appcompat-theme/Transforms/Metadata.xml b/source/com.google.accompanist/accompanist-appcompat-theme/Transforms/Metadata.xml
@@ -0,0 +1,3 @@
+<metadata>
+
+</metadata>
diff --git a/source/com.google.android.material/compose-theme-adapter/Additions/Additions.cs b/source/com.google.android.material/compose-theme-adapter/Additions/Additions.cs
@@ -0,0 +1,4 @@
+using System;
+using Android.Views;
+using Android.Widget;
+using Android.Graphics;
diff --git a/source/com.google.android.material/compose-theme-adapter/Transforms/EnumFields.xml b/source/com.google.android.material/compose-theme-adapter/Transforms/EnumFields.xml
@@ -0,0 +1,2 @@
+<enum-field-mappings>
+</enum-field-mappings>
diff --git a/source/com.google.android.material/compose-theme-adapter/Transforms/EnumMethods.xml b/source/com.google.android.material/compose-theme-adapter/Transforms/EnumMethods.xml
@@ -0,0 +1,2 @@
+<enum-method-mappings>
+</enum-method-mappings>
diff --git a/source/com.google.android.material/compose-theme-adapter/Transforms/Metadata.Namespaces.xml b/source/com.google.android.material/compose-theme-adapter/Transforms/Metadata.Namespaces.xml
@@ -0,0 +1,5 @@
+<metadata>
+
+    <remove-node path="/api/package" />
+
+</metadata>
diff --git a/.../com.google.android.material/compose-theme-adapter/Transforms/Metadata.ParameterNames.xml b/.../com.google.android.material/compose-theme-adapter/Transforms/Metadata.ParameterNames.xml
@@ -0,0 +1,2 @@
+<metadata>
+</metadata>
diff --git a/source/com.google.android.material/compose-theme-adapter/Transforms/Metadata.xml b/source/com.google.android.material/compose-theme-adapter/Transforms/Metadata.xml
@@ -0,0 +1,3 @@
+<metadata>
+
+</metadata>
diff --git a/source/migration/BuildTasks/Xamarin.AndroidX.Migration.props b/source/migration/BuildTasks/Xamarin.AndroidX.Migration.props
@@ -183,6 +183,7 @@
     <!-- all the AndroidX maven artifacts (groupId.artifactId) -->
     <ItemGroup>
         <_AndroidXMavenArtifact Include="androidx.activity.activity" />
+        <_AndroidXMavenArtifact Include="androidx.activity.activity-compose" />
         <_AndroidXMavenArtifact Include="androidx.activity.activity-ktx" />
         <_AndroidXMavenArtifact Include="androidx.ads.ads-identifier" />
         <_AndroidXMavenArtifact Include="androidx.ads.ads-identifier-common" />
@@ -222,6 +223,9 @@
         <_AndroidXMavenArtifact Include="androidx.compose.ui.ui-geometry" />
         <_AndroidXMavenArtifact Include="androidx.compose.ui.ui-graphics" />
         <_AndroidXMavenArtifact Include="androidx.compose.ui.ui-text" />
+        <_AndroidXMavenArtifact Include="androidx.compose.ui.ui-tooling" />
+        <_AndroidXMavenArtifact Include="androidx.compose.ui:ui-tooling-preview" />
+        <_AndroidXMavenArtifact Include="androidx.compose.ui:ui-tooling-data" />
         <_AndroidXMavenArtifact Include="androidx.compose.ui.ui-unit" />
         <_AndroidXMavenArtifact Include="androidx.compose.ui.ui-util" />
         <_AndroidXMavenArtifact Include="androidx.compose.ui.ui-viewbinding" />
@@ -345,8 +349,10 @@
         <_AndroidXMavenArtifact Include="androidx.window.window-java" />
         <_AndroidXMavenArtifact Include="androidx.work.work-runtime" />
         <_AndroidXMavenArtifact Include="androidx.work.work-runtime-ktx" />
+        <_AndroidXMavenArtifact Include="com.google.accompanist.accompanist-appcompat-theme" />
         <_AndroidXMavenArtifact Include="com.google.android.gms.play-services-basement" />
         <_AndroidXMavenArtifact Include="com.google.android.gms.play-services-wearable" />
+        <_AndroidXMavenArtifact Include="com.google.android.material.compose-theme-adapter" />
         <_AndroidXMavenArtifact Include="com.google.android.material.material" />
         <_AndroidXMavenArtifact Include="com.google.auto.value.auto-value-annotations" />
         <_AndroidXMavenArtifact Include="com.google.code.gson.gson" />

diff --git a/utilities.cake b/utilities.cake
@@ -182,6 +182,12 @@ Task ("spell-check")
                 "MaterialIcons",
                 "Saveable",
                 "Util",
+                "Accompanist",
+                "Compose",
+                "Data",
+                "Preview",
+                "Theme",
+                "Tooling",
                 "ProfileInstaller",
                 "Kotlin",
                 "StdLib",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<enum-method-mappings>
		</enum-method-mappings>