Annotate attributes with resource category hint for the IDE

The code completion experience can be improved if the editor knew which string properties typically come from resources so a completion suggestion can be provided that is filtered to the type of resource the property should be pointing to (i.e. `@(string)` vs `@(drawable)`). Fixes dotnet#2862
kzu · Mar 22, 2019 · ba158e9 · ba158e9
1 parent 58137da
commit ba158e9
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 0 deletions.
diff --git a/src/Xamarin.Android.NamingCustomAttributes/Android.App/ActivityAttribute.cs b/src/Xamarin.Android.NamingCustomAttributes/Android.App/ActivityAttribute.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 
 using Android.Content.PM;
 using Android.Views;
@@ -52,7 +53,9 @@ public ActivityAttribute ()
 #if ANDROID_11
 		public bool                   HardwareAccelerated     {get; set;}
 #endif
+		[Category("@drawable;@mipmap")]
 		public string                 Icon                    {get; set;}
+		[Category("@string")]
 		public string                 Label                   {get; set;}
 		public LaunchMode             LaunchMode              {get; set;}
 #if ANDROID_23
@@ -99,6 +102,7 @@ public ActivityAttribute ()
 		public WindowRotationAnimation      RotationAnimation    {get; set;}
 #endif
 #if ANDROID_25
+		[Category("@drawable;@mipmap")]
 		public string                 RoundIcon               {get; set;}
 #endif
 #if ANDROID_23
@@ -120,6 +124,7 @@ public ActivityAttribute ()
 #endif
 		public bool                   StateNotNeeded          {get; set;}
 		public string                 TaskAffinity            {get; set;}
+		[Category("@style")]
 		public string                 Theme                   {get; set;}
 #if ANDROID_27
 		public bool                   TurnScreenOn            {get; set;}

diff --git a/src/Xamarin.Android.NamingCustomAttributes/Android.App/ApplicationAttribute.cs b/src/Xamarin.Android.NamingCustomAttributes/Android.App/ApplicationAttribute.cs
@@ -30,6 +30,7 @@ public ApplicationAttribute ()
 		public string                 Banner                  {get; set;}
 #endif
 		public bool                   Debuggable              {get; set;}
+		[Category("@string")]
 		public string                 Description             {get; set;}
 #if ANDROID_24
 		public bool                   DirectBootAware         {get; set;}
@@ -46,13 +47,16 @@ public ApplicationAttribute ()
 		public bool                   HardwareAccelerated     {get; set;}
 #endif
 		public bool                   HasCode                 {get; set;}
+		[Category("@drawable;@mipmap")]
 		public string                 Icon                    {get; set;}
 		public bool                   KillAfterRestore        {get; set;}
 #if ANDROID_11
 		public bool                   LargeHeap               {get; set;}
 #endif
+		[Category("@string")]
 		public string                 Label                   {get; set;}
 #if ANDROID_11
+		[Category("@drawable;@mipmap")]
 		public string                 Logo                    {get; set;}
 #endif
 		public Type                   ManageSpaceActivity     {get; set;}
@@ -70,12 +74,14 @@ public ApplicationAttribute ()
 		public string                 RestrictedAccountType   {get; set;}
 #endif
 #if ANDROID_25
+		[Category("@drawable;@mipmap")]
 		public string                 RoundIcon               {get; set;}
 #endif
 #if ANDROID_17
 		public bool                   SupportsRtl             {get; set;}
 #endif
 		public string                 TaskAffinity            {get; set;}
+		[Category("@style")]
 		public string                 Theme                   {get; set;}
 #if ANDROID_14
 		public UiOptions              UiOptions               {get; set;}

diff --git a/src/Xamarin.Android.NamingCustomAttributes/Android.App/InstrumentationAttribute.cs b/src/Xamarin.Android.NamingCustomAttributes/Android.App/InstrumentationAttribute.cs
@@ -14,10 +14,13 @@ public InstrumentationAttribute ()
 
 		public bool                   FunctionalTest  {get; set;}
 		public bool                   HandleProfiling {get; set;}
+		[Category("@drawable;@mipmap")]
 		public string                 Icon            {get; set;}
+		[Category("@string")]
 		public string                 Label           {get; set;}
 		public string                 Name            {get; set;}
 #if ANDROID_25
+		[Category("@drawable;@mipmap")]
 		public string                 RoundIcon               {get; set;}
 #endif
 		public string                 TargetPackage   {get; set;}

diff --git a/src/Xamarin.Android.NamingCustomAttributes/Android.App/ServiceAttribute.cs b/src/Xamarin.Android.NamingCustomAttributes/Android.App/ServiceAttribute.cs
@@ -22,14 +22,17 @@ public ServiceAttribute ()
 #endif
 		public bool                   Enabled                 {get; set;}
 		public bool                   Exported                {get; set;}
+		[Category("@drawable;@mipmap")]
 		public string                 Icon                    {get; set;}
 #if ANDROID_16
 		public bool                   IsolatedProcess         {get; set;}
 #endif
+		[Category("@string")]
 		public string                 Label                   {get; set;}
 		public string                 Permission              {get; set;}
 		public string                 Process                 {get; set;}
 #if ANDROID_25
+		[Category("@drawable;@mipmap")]
 		public string                 RoundIcon               {get; set;}
 #endif
 	}

diff --git a/src/Xamarin.Android.NamingCustomAttributes/Android.Content/BroadcastReceiverAttribute.cs b/src/Xamarin.Android.NamingCustomAttributes/Android.Content/BroadcastReceiverAttribute.cs
@@ -15,13 +15,17 @@ public BroadcastReceiverAttribute ()
 		public bool                   DirectBootAware         {get; set;}
 		public bool                   Enabled                 {get; set;}
 		public bool                   Exported                {get; set;}
+		[Category("@string")]
 		public string                 Description             {get; set;}
+		[Category("@drawable;@mipmap")]
 		public string                 Icon                    {get; set;}
+		[Category("@string")]
 		public string                 Label                   {get; set;}
 		public string                 Name                    {get; set;}
 		public string                 Permission              {get; set;}
 		public string                 Process                 {get; set;}
 #if ANDROID_25
+		[Category("@drawable;@mipmap")]
 		public string                 RoundIcon               {get; set;}
 #endif
 	}

diff --git a/src/Xamarin.Android.NamingCustomAttributes/Android.Content/ContentProviderAttribute.cs b/src/Xamarin.Android.NamingCustomAttributes/Android.Content/ContentProviderAttribute.cs
@@ -24,15 +24,18 @@ public ContentProviderAttribute (string[] authorities)
 		public bool                   Enabled                 {get; set;}
 		public bool                   Exported                {get; set;}
 		public bool                   GrantUriPermissions     {get; set;}
+		[Category("@drawable;@mipmap")]
 		public string                 Icon                    {get; set;}
 		public int                    InitOrder               {get; set;}
+		[Category("@string")]
 		public string                 Label                   {get; set;}
 		public bool                   MultiProcess            {get; set;}
 		public string                 Name                    {get; set;}
 		public string                 Permission              {get; set;}
 		public string                 Process                 {get; set;}
 		public string                 ReadPermission          {get; set;}
 #if ANDROID_25
+		[Category("@drawable;@mipmap")]
 		public string                 RoundIcon               {get; set;}
 #endif
 		public bool                   Syncable                {get; set;}