From 1e47229c1edfbac3c2796706250678913e39c098 Mon Sep 17 00:00:00 2001 From: jpobst Date: Mon, 5 Jul 2021 06:05:58 +0000 Subject: [PATCH 01/11] Weekly stable updates --- config.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/config.json b/config.json index e7b9b3fa..4128a8d2 100644 --- a/config.json +++ b/config.json @@ -260,16 +260,16 @@ { "groupId": "androidx.core", "artifactId": "core", - "version": "1.5.0", - "nugetVersion": "1.5.0", + "version": "1.6.0", + "nugetVersion": "1.6.0", "nugetId": "Xamarin.AndroidX.Core", "dependencyOnly": false }, { "groupId": "androidx.core", "artifactId": "core-ktx", - "version": "1.5.0", - "nugetVersion": "1.5.0", + "version": "1.6.0", + "nugetVersion": "1.6.0", "nugetId": "Xamarin.AndroidX.Core.Core.Ktx", "dependencyOnly": false }, @@ -308,32 +308,32 @@ { "groupId": "androidx.databinding", "artifactId": "databinding-adapters", - "version": "4.2.1", - "nugetVersion": "4.2.1", + "version": "4.2.2", + "nugetVersion": "4.2.2", "nugetId": "Xamarin.AndroidX.DataBinding.DataBindingAdapters", "dependencyOnly": false }, { "groupId": "androidx.databinding", "artifactId": "databinding-common", - "version": "4.2.1", - "nugetVersion": "4.2.1", + "version": "4.2.2", + "nugetVersion": "4.2.2", "nugetId": "Xamarin.AndroidX.DataBinding.DataBindingCommon", "dependencyOnly": false }, { "groupId": "androidx.databinding", "artifactId": "databinding-runtime", - "version": "4.2.1", - "nugetVersion": "4.2.1", + "version": "4.2.2", + "nugetVersion": "4.2.2", "nugetId": "Xamarin.AndroidX.DataBinding.DataBindingRuntime", "dependencyOnly": false }, { "groupId": "androidx.databinding", "artifactId": "viewbinding", - "version": "4.2.1", - "nugetVersion": "4.2.1", + "version": "4.2.2", + "nugetVersion": "4.2.2", "nugetId": "Xamarin.AndroidX.DataBinding.ViewBinding", "dependencyOnly": false }, @@ -1108,8 +1108,8 @@ { "groupId": "com.google.android.material", "artifactId": "material", - "version": "1.3.0", - "nugetVersion": "1.3.0.1", + "version": "1.4.0", + "nugetVersion": "1.4.0", "nugetId": "Xamarin.Google.Android.Material", "dependencyOnly": false }, From b5574347524654bf4989ce88e8111189c157dc48 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 7 Jul 2021 13:44:21 +0200 Subject: [PATCH 02/11] window version bmp --- config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 4128a8d2..0bb26c13 100644 --- a/config.json +++ b/config.json @@ -1076,8 +1076,8 @@ { "groupId": "androidx.window", "artifactId": "window", - "version": "1.0.0-alpha08", - "nugetVersion": "1.0.0.0-alpha08", + "version": "1.0.0-alpha09", + "nugetVersion": "1.0.0.0-alpha09", "nugetId": "Xamarin.AndroidX.Window", "dependencyOnly": false }, From f736206f3360612d49e82161e976f9a90287484a Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 7 Jul 2021 13:44:37 +0200 Subject: [PATCH 03/11] androidx.core fixes --- .../core/Transforms/EnumMethods.xml | 53 ++++++++++++++++++- .../core/Transforms/Metadata.Namespaces.xml | 8 ++- .../core/Transforms/Metadata.xml | 9 ++-- ...terial.Navigation.NavigationBarItemView.cs | 28 ++++++++++ 4 files changed, 93 insertions(+), 5 deletions(-) create mode 100644 source/com.google.android.material/material/Additions/Google.Android.Material.Navigation.NavigationBarItemView.cs diff --git a/source/androidx.core/core/Transforms/EnumMethods.xml b/source/androidx.core/core/Transforms/EnumMethods.xml index 720486a3..35313ba3 100644 --- a/source/androidx.core/core/Transforms/EnumMethods.xml +++ b/source/androidx.core/core/Transforms/EnumMethods.xml @@ -18,12 +18,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/source/androidx.core/core/Transforms/Metadata.Namespaces.xml b/source/androidx.core/core/Transforms/Metadata.Namespaces.xml index f88469f1..3f1c6e6b 100644 --- a/source/androidx.core/core/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.core/core/Transforms/Metadata.Namespaces.xml @@ -44,5 +44,11 @@ > AndroidX.Core.Location - + + AndroidX.Core.Telephony + + \ No newline at end of file diff --git a/source/androidx.core/core/Transforms/Metadata.xml b/source/androidx.core/core/Transforms/Metadata.xml index d2082f3f..d2f9927f 100644 --- a/source/androidx.core/core/Transforms/Metadata.xml +++ b/source/androidx.core/core/Transforms/Metadata.xml @@ -35,16 +35,18 @@ Android.Views.ScrollAxis + + \ No newline at end of file diff --git a/source/com.google.android.material/material/Additions/Google.Android.Material.Navigation.NavigationBarItemView.cs b/source/com.google.android.material/material/Additions/Google.Android.Material.Navigation.NavigationBarItemView.cs new file mode 100644 index 00000000..df2d7203 --- /dev/null +++ b/source/com.google.android.material/material/Additions/Google.Android.Material.Navigation.NavigationBarItemView.cs @@ -0,0 +1,28 @@ +using Android.Runtime; +using Java.Interop; +using Java.Lang; + +namespace Google.Android.Material.Navigation +{ + + // Metadata.xml XPath class reference: path="/api/package[@name='com.google.android.material.navigation']/class[@name='NavigationBarItemView']" + //[global::Android.Runtime.Register("com/google/android/material/navigation/NavigationBarItemView", DoNotGenerateAcw = true)] + public abstract partial class NavigationBarItemView //: global::Android.Widget.FrameLayout, global::AndroidX.AppCompat.View.Menu.IMenuViewItemView + { + // Metadata.xml XPath method reference: path="/api/package[@name='com.google.android.material.navigation']/class[@name='NavigationBarItemView']/method[@name='setEnabled' and count(parameter)=1 and parameter[1][@type='boolean']]" + [Register("setEnabled", "(Z)V", "")] + public unsafe void SetEnabled(bool p0) + { + const string __id = "setEnabled.(Z)V"; + try + { + JniArgumentValue* __args = stackalloc JniArgumentValue[1]; + __args[0] = new JniArgumentValue(p0); + _members.InstanceMethods.InvokeNonvirtualVoidMethod(__id, this, __args); + } + finally + { + } + } + } +} \ No newline at end of file From 97518710d47ef5eb95fb8bf0fc301946a222fb8b Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 7 Jul 2021 13:44:48 +0200 Subject: [PATCH 04/11] androidx.appcompat fixes --- .../appcompat/Transforms/Metadata.xml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/source/androidx.appcompat/appcompat/Transforms/Metadata.xml b/source/androidx.appcompat/appcompat/Transforms/Metadata.xml index 4518e243..5953de09 100644 --- a/source/androidx.appcompat/appcompat/Transforms/Metadata.xml +++ b/source/androidx.appcompat/appcompat/Transforms/Metadata.xml @@ -223,17 +223,4 @@ Android.Content.PM.ConfigChanges Java.Lang.Object - - - - \ No newline at end of file From d5135388bf8e271d88ce45ef13b66c94f34dd933 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 7 Jul 2021 13:45:01 +0200 Subject: [PATCH 05/11] androidx.fragment fixes --- .../fragment/Transforms/EnumMethods.xml | 6 +++++ .../fragment/Transforms/Metadata.xml | 26 +------------------ 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/source/androidx.fragment/fragment/Transforms/EnumMethods.xml b/source/androidx.fragment/fragment/Transforms/EnumMethods.xml index 991eec69..5c92bcdf 100644 --- a/source/androidx.fragment/fragment/Transforms/EnumMethods.xml +++ b/source/androidx.fragment/fragment/Transforms/EnumMethods.xml @@ -15,4 +15,10 @@ + + + + + + \ No newline at end of file diff --git a/source/androidx.fragment/fragment/Transforms/Metadata.xml b/source/androidx.fragment/fragment/Transforms/Metadata.xml index f9c3cfac..14eafe70 100644 --- a/source/androidx.fragment/fragment/Transforms/Metadata.xml +++ b/source/androidx.fragment/fragment/Transforms/Metadata.xml @@ -1,30 +1,6 @@  Java.Lang.Object - - - public - - - - - - public - - - - public - + \ No newline at end of file From 30923b183f6fc908a33a905b27296cd3515a8588 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 7 Jul 2021 13:45:20 +0200 Subject: [PATCH 06/11] material fixes --- .../Transforms/Metadata.Namespaces.xml | 6 +++++ .../material/Transforms/Metadata.xml | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/source/com.google.android.material/material/Transforms/Metadata.Namespaces.xml b/source/com.google.android.material/material/Transforms/Metadata.Namespaces.xml index 6984d8a1..30333e7c 100644 --- a/source/com.google.android.material/material/Transforms/Metadata.Namespaces.xml +++ b/source/com.google.android.material/material/Transforms/Metadata.Namespaces.xml @@ -110,5 +110,11 @@ > Google.Android.Material.TimePicker + + Google.Android.Material.NavigationRail + \ No newline at end of file diff --git a/source/com.google.android.material/material/Transforms/Metadata.xml b/source/com.google.android.material/material/Transforms/Metadata.xml index 405bac3a..c10770e9 100644 --- a/source/com.google.android.material/material/Transforms/Metadata.xml +++ b/source/com.google.android.material/material/Transforms/Metadata.xml @@ -188,6 +188,29 @@ AndroidX.RecyclerView.Widget.RecyclerView.ViewHolder + + + + Google.Android.Material.Navigation.NavigationBarMenuView + + From 333633104b6eba1ba4ab2a0318ab1757fdd315e4 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 7 Jul 2021 13:45:28 +0200 Subject: [PATCH 07/11] mappings --- mappings/androidx-assemblies.csv | 10 +++++----- mappings/androidx-mapping.csv | 14 +++++++------- mappings/dependencies.json | 5 +++++ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/mappings/androidx-assemblies.csv b/mappings/androidx-assemblies.csv index f37e995b..784f3a5a 100644 --- a/mappings/androidx-assemblies.csv +++ b/mappings/androidx-assemblies.csv @@ -20,11 +20,11 @@ Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,Xamarin.Android. Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,13.0.0.4 Xamarin.Android.Support.AsyncLayoutInflater,Xamarin.AndroidX.AsyncLayoutInflater,Xamarin.Android.Support.AsyncLayoutInflater,Xamarin.AndroidX.AsyncLayoutInflater,1.0.0.7 Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,1.1.0.7 -Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,1.5.0 +Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,1.6.0 Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.ConstraintLayout,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.ConstraintLayout,2.0.4.2 -Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingAdapters,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingAdapters,4.2.1 -Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,4.2.1 -Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.ViewBinding,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.ViewBinding,4.2.1 +Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingAdapters,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingAdapters,4.2.2 +Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,4.2.2 +Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.ViewBinding,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.ViewBinding,4.2.2 Xamarin.Android.Support.Constraint.Layout.Solver,Xamarin.AndroidX.ConstraintLayout.Solver,Xamarin.Android.Support.Constraint.Layout.Solver,Xamarin.AndroidX.ConstraintLayout.Solver,2.0.4.2 Xamarin.Android.Support.CoordinaterLayout,Xamarin.AndroidX.CoordinatorLayout,Xamarin.Android.Support.CoordinaterLayout,Xamarin.AndroidX.CoordinatorLayout,1.1.0.7 Xamarin.Android.Support.Core.UI,Xamarin.AndroidX.Legacy.Support.Core.UI,Xamarin.Android.Support.Core.UI,Xamarin.AndroidX.Legacy.Support.Core.UI,1.0.0.8 @@ -34,7 +34,7 @@ Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,Xamarin.Android.Supp Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,1.1.0.6 Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava,2.2.10.1 Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,1.1.0 -Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,1.3.0.1 +Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,1.4.0 Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,1.5.10 Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,1.0.1.7 Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,1.1.1.2 diff --git a/mappings/androidx-mapping.csv b/mappings/androidx-mapping.csv index 16d0abf4..b221828f 100644 --- a/mappings/androidx-mapping.csv +++ b/mappings/androidx-mapping.csv @@ -2737,12 +2737,12 @@ Android.Support.Design.Widget,BottomSheetDialog,Google.Android.Material.BottomSh Android.Support.Design.Widget,BottomNavigationView,Google.Android.Material.BottomNavigation,BottomNavigationView,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.widget,BottomNavigationView,com.google.android.material.bottomnavigation,BottomNavigationView, Android.Support.Design.Widget,BottomNavigationView.IOnNavigationItemReselectedListener,Google.Android.Material.BottomNavigation,BottomNavigationView.IOnNavigationItemReselectedListener,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.widget,BottomNavigationView.OnNavigationItemReselectedListener,com.google.android.material.bottomnavigation,BottomNavigationView.OnNavigationItemReselectedListener, Android.Support.Design.Widget,BottomNavigationView.IOnNavigationItemReselectedListenerInvoker,Google.Android.Material.BottomNavigation,BottomNavigationView.IOnNavigationItemReselectedListenerInvoker,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.widget,BottomNavigationView.OnNavigationItemReselectedListener,com.google.android.material.bottomnavigation,BottomNavigationView.OnNavigationItemReselectedListener, -Android.Support.Design.Widget,BottomNavigationView.NavigationItemReselectedEventArgs,Google.Android.Material.BottomNavigation,BottomNavigationView.NavigationItemReselectedEventArgs,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,,,,, -Android.Support.Design.Widget,BottomNavigationView.IOnNavigationItemReselectedListenerImplementor,Google.Android.Material.BottomNavigation,BottomNavigationView.IOnNavigationItemReselectedListenerImplementor,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,mono.android.support.design.widget,BottomNavigationView_OnNavigationItemReselectedListenerImplementor,mono.com.google.android.material.bottomnavigation,BottomNavigationView_OnNavigationItemReselectedListenerImplementor,WARNING: Unable to find a Java mapping, so took a guess. +,,,,,,,,,,WARNING: Unable to find AndroidX type for .NET type Android.Support.Design.Widget.BottomNavigationView.NavigationItemReselectedEventArgs. +,,,,,,,,,,WARNING: Unable to find AndroidX type for .NET type Android.Support.Design.Widget.BottomNavigationView.IOnNavigationItemReselectedListenerImplementor. Android.Support.Design.Widget,BottomNavigationView.IOnNavigationItemSelectedListener,Google.Android.Material.BottomNavigation,BottomNavigationView.IOnNavigationItemSelectedListener,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.widget,BottomNavigationView.OnNavigationItemSelectedListener,com.google.android.material.bottomnavigation,BottomNavigationView.OnNavigationItemSelectedListener, Android.Support.Design.Widget,BottomNavigationView.IOnNavigationItemSelectedListenerInvoker,Google.Android.Material.BottomNavigation,BottomNavigationView.IOnNavigationItemSelectedListenerInvoker,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.widget,BottomNavigationView.OnNavigationItemSelectedListener,com.google.android.material.bottomnavigation,BottomNavigationView.OnNavigationItemSelectedListener, -Android.Support.Design.Widget,BottomNavigationView.NavigationItemSelectedEventArgs,Google.Android.Material.BottomNavigation,BottomNavigationView.NavigationItemSelectedEventArgs,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,,,,, -Android.Support.Design.Widget,BottomNavigationView.IOnNavigationItemSelectedListenerImplementor,Google.Android.Material.BottomNavigation,BottomNavigationView.IOnNavigationItemSelectedListenerImplementor,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,mono.android.support.design.widget,BottomNavigationView_OnNavigationItemSelectedListenerImplementor,mono.com.google.android.material.bottomnavigation,BottomNavigationView_OnNavigationItemSelectedListenerImplementor,WARNING: Unable to find a Java mapping, so took a guess. +,,,,,,,,,,WARNING: Unable to find AndroidX type for .NET type Android.Support.Design.Widget.BottomNavigationView.NavigationItemSelectedEventArgs. +,,,,,,,,,,WARNING: Unable to find AndroidX type for .NET type Android.Support.Design.Widget.BottomNavigationView.IOnNavigationItemSelectedListenerImplementor. ,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type com.google.android.material.bottomnavigation.BottomNavigationView.SavedState. ,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type com.google.android.material.internal.DrawableUtils. Android.Support.Design.Widget,BottomSheetDialogFragment,Google.Android.Material.BottomSheet,BottomSheetDialogFragment,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.widget,BottomSheetDialogFragment,com.google.android.material.bottomsheet,BottomSheetDialogFragment, @@ -2769,19 +2769,19 @@ Android.Support.Design.Internal,FlowLayout,Google.Android.Material.Internal,Flow Android.Support.Design.Internal,ViewUtils,Google.Android.Material.Internal,ViewUtils,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,ViewUtils,com.google.android.material.internal,ViewUtils, Android.Support.Design.Internal,IExperimental,Google.Android.Material.Internal,IExperimental,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,Experimental,com.google.android.material.internal,Experimental, Android.Support.Design.Internal,IExperimentalInvoker,Google.Android.Material.Internal,IExperimentalInvoker,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,Experimental,com.google.android.material.internal,Experimental, -Android.Support.Design.Internal,BottomNavigationPresenter,Google.Android.Material.BottomNavigation,BottomNavigationPresenter,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,BottomNavigationPresenter,com.google.android.material.bottomnavigation,BottomNavigationPresenter, +,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type com.google.android.material.bottomnavigation.BottomNavigationPresenter. ,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type com.google.android.material.bottomnavigation.BottomNavigationPresenter.SavedState. Android.Support.Design.Internal,ThemeEnforcement,Google.Android.Material.Internal,ThemeEnforcement,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,ThemeEnforcement,com.google.android.material.internal,ThemeEnforcement, Android.Support.Design.Internal,ExperimentalAttribute,Kotlin,ExperimentalAttribute,Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,,,,, -Android.Support.Design.Internal,ExperimentalAttribute,Google.Android.Material.Internal,ExperimentalAttribute,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,,,,, Android.Support.Design.Internal,ExperimentalAttribute,AndroidX.Annotations.Experimental,ExperimentalAttribute,Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,,,,, +Android.Support.Design.Internal,ExperimentalAttribute,Google.Android.Material.Internal,ExperimentalAttribute,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,,,,, Android.Support.Design.Internal,ExperimentalAttribute,ReactiveX.Annotations,ExperimentalAttribute,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava,,,,, Android.Support.Design.Internal,NavigationMenuView,Google.Android.Material.Internal,NavigationMenuView,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,NavigationMenuView,com.google.android.material.internal,NavigationMenuView, Android.Support.Design.Internal,ScrimInsetsFrameLayout,Google.Android.Material.Internal,ScrimInsetsFrameLayout,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,ScrimInsetsFrameLayout,com.google.android.material.internal,ScrimInsetsFrameLayout, Android.Support.Design.Internal,ForegroundLinearLayout,Google.Android.Material.Internal,ForegroundLinearLayout,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,ForegroundLinearLayout,com.google.android.material.internal,ForegroundLinearLayout, Android.Support.Design.Internal,ParcelableSparseArray,Google.Android.Material.Internal,ParcelableSparseArray,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,ParcelableSparseArray,com.google.android.material.internal,ParcelableSparseArray, Android.Support.Design.Internal,TextScale,Google.Android.Material.Internal,TextScale,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,TextScale,com.google.android.material.internal,TextScale, -Android.Support.Design.Internal,BottomNavigationMenu,Google.Android.Material.BottomNavigation,BottomNavigationMenu,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,BottomNavigationMenu,com.google.android.material.bottomnavigation,BottomNavigationMenu, +,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type com.google.android.material.bottomnavigation.BottomNavigationMenu. Android.Support.Design.Internal,NavigationMenu,Google.Android.Material.Internal,NavigationMenu,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,NavigationMenu,com.google.android.material.internal,NavigationMenu, Android.Support.Design.Internal,BottomNavigationMenuView,Google.Android.Material.BottomNavigation,BottomNavigationMenuView,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,BottomNavigationMenuView,com.google.android.material.bottomnavigation,BottomNavigationMenuView, Android.Support.Constraints.Solver,ArrayLinkedVariables,AndroidX.ConstraintLayout.Solver,ArrayLinkedVariables,Xamarin.Android.Support.Constraint.Layout.Solver,Xamarin.AndroidX.ConstraintLayout.Solver,android.support.constraint.solver,ArrayLinkedVariables,androidx.constraintlayout.solver,ArrayLinkedVariables, diff --git a/mappings/dependencies.json b/mappings/dependencies.json index 063da1e6..23a575ac 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -20,6 +20,7 @@ { "id": "Xamarin.AndroidX.Core", "dependencies": [ + "Xamarin.AndroidX.Annotation.Experimental", "Xamarin.AndroidX.Annotation", "Xamarin.AndroidX.Lifecycle.Runtime", "Xamarin.AndroidX.VersionedParcelable" @@ -764,6 +765,10 @@ "id": "Xamarin.AndroidX.MultiDex", "dependencies": [] }, + { + "id": "Xamarin.AndroidX.Migration.Tool", + "dependencies": [] + }, { "id": "Xamarin.AndroidX.Navigation.Common", "dependencies": [ From 7fa1bca7cfc827664462f38964110bd2f7abb798 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 9 Jul 2021 10:13:34 +0200 Subject: [PATCH 08/11] Additions (wrappers) for OnNestedScrollAccepted and OnStartNestedScroll --- mappings/dependencies.json | 4 -- ...AppCompat.Widget.ActionBarOverlayLayout.cs | 24 +++++++ ...traintLayout.Motion.Widget.MotionLayout.cs | 25 ++++++++ ...rdinatorLayout.Widget.CoordinatorLayout.cs | 25 ++++++++ ...roidX.Core.View.INestedScrollingParent2.cs | 25 ++++++++ ...X.Core.View.NestedScrollingParentHelper.cs | 34 ++++++++++ .../AndroidX.Core.View.ViewParentCompat.cs | 63 +++++++++++++++++++ .../AndroidX.Core.Widget.NestedScrollView.cs | 34 ++++++++++ ...RefreshLayout.Widget.SwipeRefreshLayout.cs | 25 ++++++++ 9 files changed, 255 insertions(+), 4 deletions(-) create mode 100644 source/androidx.appcompat/appcompat/Additions/AndroidX.AppCompat.Widget.ActionBarOverlayLayout.cs create mode 100644 source/androidx.constraintlayout/constraintlayout/Additions/AndroidX.ConstraintLayout.Motion.Widget.MotionLayout.cs create mode 100644 source/androidx.coordinatorlayout/coordinatorlayout/Additions/AndroidX.CoordinatorLayout.Widget.CoordinatorLayout.cs create mode 100644 source/androidx.core/core/Additions/AndroidX.Core.View.INestedScrollingParent2.cs create mode 100644 source/androidx.core/core/Additions/AndroidX.Core.View.NestedScrollingParentHelper.cs create mode 100644 source/androidx.core/core/Additions/AndroidX.Core.View.ViewParentCompat.cs create mode 100644 source/androidx.core/core/Additions/AndroidX.Core.Widget.NestedScrollView.cs create mode 100644 source/androidx.swiperefreshlayout/swiperefreshlayout/Additions/AndroidX.SwipeRefreshLayout.Widget.SwipeRefreshLayout.cs diff --git a/mappings/dependencies.json b/mappings/dependencies.json index 23a575ac..f5736f7b 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -765,10 +765,6 @@ "id": "Xamarin.AndroidX.MultiDex", "dependencies": [] }, - { - "id": "Xamarin.AndroidX.Migration.Tool", - "dependencies": [] - }, { "id": "Xamarin.AndroidX.Navigation.Common", "dependencies": [ diff --git a/source/androidx.appcompat/appcompat/Additions/AndroidX.AppCompat.Widget.ActionBarOverlayLayout.cs b/source/androidx.appcompat/appcompat/Additions/AndroidX.AppCompat.Widget.ActionBarOverlayLayout.cs new file mode 100644 index 00000000..756ce9e5 --- /dev/null +++ b/source/androidx.appcompat/appcompat/Additions/AndroidX.AppCompat.Widget.ActionBarOverlayLayout.cs @@ -0,0 +1,24 @@ +using System; + +namespace AndroidX.AppCompat.Widget +{ + public partial class ActionBarOverlayLayout + { + public virtual void OnNestedScrollAccepted(Android.Views.View child, Android.Views.View target, int axes, int @type) + { + Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes; + + OnNestedScrollAccepted(child, target, scroll_axes, @type); + + return; + } + + public virtual bool OnStartNestedScroll(Android.Views.View child, Android.Views.View target, int axes, int @type) + { + Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes; + + return OnStartNestedScroll(child, target, scroll_axes, @type); + } + } +} + diff --git a/source/androidx.constraintlayout/constraintlayout/Additions/AndroidX.ConstraintLayout.Motion.Widget.MotionLayout.cs b/source/androidx.constraintlayout/constraintlayout/Additions/AndroidX.ConstraintLayout.Motion.Widget.MotionLayout.cs new file mode 100644 index 00000000..bc60b5cb --- /dev/null +++ b/source/androidx.constraintlayout/constraintlayout/Additions/AndroidX.ConstraintLayout.Motion.Widget.MotionLayout.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; + +namespace AndroidX.ConstraintLayout.Motion.Widget +{ + public partial class MotionLayout + { + public virtual void OnNestedScrollAccepted (Android.Views.View child, Android.Views.View target, int axes, int @type) + { + Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes; + + OnNestedScrollAccepted (child, target, scroll_axes, @type); + + return; + } + + public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes, int @type) + { + Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes; + + return OnStartNestedScroll (child, target, scroll_axes, @type); + } + } +} diff --git a/source/androidx.coordinatorlayout/coordinatorlayout/Additions/AndroidX.CoordinatorLayout.Widget.CoordinatorLayout.cs b/source/androidx.coordinatorlayout/coordinatorlayout/Additions/AndroidX.CoordinatorLayout.Widget.CoordinatorLayout.cs new file mode 100644 index 00000000..d8a393fd --- /dev/null +++ b/source/androidx.coordinatorlayout/coordinatorlayout/Additions/AndroidX.CoordinatorLayout.Widget.CoordinatorLayout.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; + +namespace AndroidX.CoordinatorLayout.Widget +{ + public partial class CoordinatorLayout + { + public virtual void OnNestedScrollAccepted (Android.Views.View child, Android.Views.View target, int nestedScrollAxes, int @type) + { + Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) nestedScrollAxes; + + OnNestedScrollAccepted (child, target, scroll_axes, @type); + + return; + } + + public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes, int @type) + { + Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes; + + return OnStartNestedScroll (child, target, scroll_axes, @type); + } + } +} diff --git a/source/androidx.core/core/Additions/AndroidX.Core.View.INestedScrollingParent2.cs b/source/androidx.core/core/Additions/AndroidX.Core.View.INestedScrollingParent2.cs new file mode 100644 index 00000000..6eb896c8 --- /dev/null +++ b/source/androidx.core/core/Additions/AndroidX.Core.View.INestedScrollingParent2.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; + +namespace AndroidX.Core.View +{ + public partial interface INestedScrollingParent2 + { + public virtual void OnNestedScrollAccepted (Android.Views.View child, Android.Views.View target, int axis, int @type) + { + Android.Views.ScrollAxis scroll_axis = (Android.Views.ScrollAxis) axis; + + OnNestedScrollAccepted(child, target, scroll_axis, @type); + + return; + } + + public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axis, int @type) + { + Android.Views.ScrollAxis scroll_axis = (Android.Views.ScrollAxis) axis; + + return OnStartNestedScroll(child, target, scroll_axis, @type); + } + } +} diff --git a/source/androidx.core/core/Additions/AndroidX.Core.View.NestedScrollingParentHelper.cs b/source/androidx.core/core/Additions/AndroidX.Core.View.NestedScrollingParentHelper.cs new file mode 100644 index 00000000..693efb81 --- /dev/null +++ b/source/androidx.core/core/Additions/AndroidX.Core.View.NestedScrollingParentHelper.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; + +namespace AndroidX.Core.View +{ + public partial class NestedScrollingParentHelper + { + public virtual void OnNestedScrollAccepted (Android.Views.View child, Android.Views.View target, int axis, int @type) + { + Android.Views.ScrollAxis scroll_axis = (Android.Views.ScrollAxis) axis; + + OnNestedScrollAccepted(child, target, scroll_axis, @type); + + return; + } + + public virtual void OnNestedScrollAccepted(Android.Views.View child, Android.Views.View target, int axes) + { + Android.Views.ScrollAxis scroll_axis = (Android.Views.ScrollAxis) axes; + + OnNestedScrollAccepted(child, target, scroll_axis); + + return; + } + + //public bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes, int @type) + //{ + // Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes; + + // return OnStartNestedScroll(child, target, scroll_axes, @type); + //} + } +} diff --git a/source/androidx.core/core/Additions/AndroidX.Core.View.ViewParentCompat.cs b/source/androidx.core/core/Additions/AndroidX.Core.View.ViewParentCompat.cs new file mode 100644 index 00000000..3d88af20 --- /dev/null +++ b/source/androidx.core/core/Additions/AndroidX.Core.View.ViewParentCompat.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; + +namespace AndroidX.Core.View +{ + public sealed partial class ViewParentCompat + { + public static void OnNestedScrollAccepted(Android.Views.IViewParent parent, Android.Views.View child, Android.Views.View target, int nestedScrollAxes) + { + Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis)nestedScrollAxes; + + OnNestedScrollAccepted(parent, child, target, scroll_axes); + + return; + } + + public static void OnNestedScrollAccepted(Android.Views.IViewParent parent, Android.Views.View child, Android.Views.View target, int nestedScrollAxes, int type) + { + Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis)nestedScrollAxes; + + OnNestedScrollAccepted(parent, child, target, scroll_axes, @type); + + return; + + } + + public static bool OnStartNestedScroll(Android.Views.IViewParent parent, Android.Views.View child, Android.Views.View target, int nestedScrollAxes) + { + Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis)nestedScrollAxes; + + return OnStartNestedScroll(parent, child, target, scroll_axes); + + } + + public static bool OnStartNestedScroll(Android.Views.IViewParent parent, Android.Views.View child, Android.Views.View target, int nestedScrollAxes, int type) + { + Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis)nestedScrollAxes; + + return OnStartNestedScroll(parent, child, target, scroll_axes); + + } + + + /* + public void OnNestedScrollAccepted (Android.Views.View child, Android.Views.View target, int axis, int @type) + { + Android.Views.ScrollAxis scroll_axis = (Android.Views.ScrollAxis) axis; + + OnNestedScrollAccepted(child, target, scroll_axis, @type); + + return; + } + + public bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axis, int @type) + { + Android.Views.ScrollAxis scroll_axis = (Android.Views.ScrollAxis) axis; + + return OnStartNestedScroll(child, target, scroll_axis, @type); + } + */ + } +} diff --git a/source/androidx.core/core/Additions/AndroidX.Core.Widget.NestedScrollView.cs b/source/androidx.core/core/Additions/AndroidX.Core.Widget.NestedScrollView.cs new file mode 100644 index 00000000..f52cc7e9 --- /dev/null +++ b/source/androidx.core/core/Additions/AndroidX.Core.Widget.NestedScrollView.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; + +namespace AndroidX.Core.Widget +{ + public partial class NestedScrollView + { + public virtual void OnNestedScrollAccepted (Android.Views.View child, Android.Views.View target, int axes, int @type) + { + Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes; + + OnNestedScrollAccepted(child, target, scroll_axes, @type); + + return; + } + + public override void OnNestedScrollAccepted(Android.Views.View child, Android.Views.View target, Android.Views.ScrollAxis axes) + { + OnStartNestedScroll(child, target, axes); + + return; + } + + public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes, int @type) + { + Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes; + + return OnStartNestedScroll(child, target, scroll_axes, @type); + } + + + } +} diff --git a/source/androidx.swiperefreshlayout/swiperefreshlayout/Additions/AndroidX.SwipeRefreshLayout.Widget.SwipeRefreshLayout.cs b/source/androidx.swiperefreshlayout/swiperefreshlayout/Additions/AndroidX.SwipeRefreshLayout.Widget.SwipeRefreshLayout.cs new file mode 100644 index 00000000..fd29ef57 --- /dev/null +++ b/source/androidx.swiperefreshlayout/swiperefreshlayout/Additions/AndroidX.SwipeRefreshLayout.Widget.SwipeRefreshLayout.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; + +namespace AndroidX.SwipeRefreshLayout.Widget +{ + public partial class SwipeRefreshLayout + { + public virtual void OnNestedScrollAccepted (Android.Views.View child, Android.Views.View target, int axes, int @type) + { + Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes; + + OnNestedScrollAccepted (child, target, scroll_axes, @type); + + return; + } + + public virtual bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes, int @type) + { + Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes; + + return OnStartNestedScroll (child, target, scroll_axes, @type); + } + } +} From d084ed092b95dbf662c4400c40d87677f89aea7d Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 9 Jul 2021 11:12:38 +0200 Subject: [PATCH 09/11] removed types surfaced --- .../fragment/Transforms/Metadata.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/source/androidx.fragment/fragment/Transforms/Metadata.xml b/source/androidx.fragment/fragment/Transforms/Metadata.xml index 14eafe70..7423f634 100644 --- a/source/androidx.fragment/fragment/Transforms/Metadata.xml +++ b/source/androidx.fragment/fragment/Transforms/Metadata.xml @@ -2,5 +2,18 @@ Java.Lang.Object + + public + + + public + + \ No newline at end of file From a33fb739a8f3cb74b3284964fe787168b95ddd30 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 9 Jul 2021 11:13:13 +0200 Subject: [PATCH 10/11] improvements for loading spell checking error log file --- utilities.cake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/utilities.cake b/utilities.cake index 77c50317..b75b9001 100644 --- a/utilities.cake +++ b/utilities.cake @@ -366,7 +366,7 @@ Task ("read-analysis-files") ( () => { - string[] files = new[] + List files = new List { "./output/spell-errors.txt", "./output/changelog.md", @@ -375,6 +375,12 @@ Task ("read-analysis-files") "./output/missing_dotnet_type.csv", "./output/missing_java_type.csv", }; + + if ( ! FileExists("./output/spell-errors.txt") ) + { + files.Remove("./output/spell-errors.txt"); + } + string process = "code"; string process_args = $"-n {string.Join(" ", files)}"; IEnumerable redirectedStandardOutput; From f0ead285a55c785757a7435da2d48c032937505d Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 9 Jul 2021 18:37:58 +0200 Subject: [PATCH 11/11] comments removal --- ...dX.Core.View.NestedScrollingParentHelper.cs | 6 ------ .../AndroidX.Core.View.ViewParentCompat.cs | 18 ------------------ 2 files changed, 24 deletions(-) diff --git a/source/androidx.core/core/Additions/AndroidX.Core.View.NestedScrollingParentHelper.cs b/source/androidx.core/core/Additions/AndroidX.Core.View.NestedScrollingParentHelper.cs index 693efb81..8c326c4a 100644 --- a/source/androidx.core/core/Additions/AndroidX.Core.View.NestedScrollingParentHelper.cs +++ b/source/androidx.core/core/Additions/AndroidX.Core.View.NestedScrollingParentHelper.cs @@ -24,11 +24,5 @@ namespace AndroidX.Core.View return; } - //public bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axes, int @type) - //{ - // Android.Views.ScrollAxis scroll_axes = (Android.Views.ScrollAxis) axes; - - // return OnStartNestedScroll(child, target, scroll_axes, @type); - //} } } diff --git a/source/androidx.core/core/Additions/AndroidX.Core.View.ViewParentCompat.cs b/source/androidx.core/core/Additions/AndroidX.Core.View.ViewParentCompat.cs index 3d88af20..138a26d7 100644 --- a/source/androidx.core/core/Additions/AndroidX.Core.View.ViewParentCompat.cs +++ b/source/androidx.core/core/Additions/AndroidX.Core.View.ViewParentCompat.cs @@ -41,23 +41,5 @@ namespace AndroidX.Core.View } - - /* - public void OnNestedScrollAccepted (Android.Views.View child, Android.Views.View target, int axis, int @type) - { - Android.Views.ScrollAxis scroll_axis = (Android.Views.ScrollAxis) axis; - - OnNestedScrollAccepted(child, target, scroll_axis, @type); - - return; - } - - public bool OnStartNestedScroll (Android.Views.View child, Android.Views.View target, int axis, int @type) - { - Android.Views.ScrollAxis scroll_axis = (Android.Views.ScrollAxis) axis; - - return OnStartNestedScroll(child, target, scroll_axis, @type); - } - */ } }