Skip to content

Add support for Round Icon #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jamesmontemagno wants to merge 3 commits into from
Closed

Add support for Round Icon #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d65b47
Add support for Round Icon
jamesmontemagno Jan 4, 2017
9be2cde
Finalize Round Icon by adding to the 9 different attributes
jamesmontemagno Jan 4, 2017
5e4b778
Add to IntentFilter
jamesmontemagno Jan 4, 2017
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
3 changes: 3 additions & 0 deletions src/Mono.Android/Android.App/IntentFilterAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ public IntentFilterAttribute (string[] actions)
#if ANDROID_23
// This does not exist on https://developer.android.com/guide/topics/manifest/intent-filter-element.html but on http://developer.android.com/intl/ja/training/app-links/index.html ! (bug #35595)
public bool AutoVerify {get; set;}
#endif
#if ANDROID_25
public string RoundIcon {get; set;}
#endif
}
}
3 changes: 3 additions & 0 deletions src/Mono.Android/Android.App/PermissionAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ public PermissionAttribute ()
public string Name {get; set;}
public string PermissionGroup {get; set;}
public Protection ProtectionLevel {get; set;}
#if ANDROID_25
public string RoundIcon {get; set;}
#endif
}
}

3 changes: 3 additions & 0 deletions src/Mono.Android/Android.App/PermissionGroupAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ public PermissionGroupAttribute ()
public string Icon {get; set;}
public string Label {get; set;}
public string Name {get; set;}
#if ANDROID_25
public string RoundIcon {get; set;}
#endif
}
}

3 changes: 3 additions & 0 deletions src/Mono.Android/Android.App/PermissionTreeAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ public PermissionTreeAttribute ()
public string Icon {get; set;}
public string Label {get; set;}
public string Name {get; set;}
#if ANDROID_25
public string RoundIcon {get; set;}
#endif
}
}

6 changes: 6 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Mono.Android/ActivityAttribute.Partial.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ partial class ActivityAttribute {
bool _Immersive;
bool _ResizeableActivity;
bool _SupportsPictureInPicture;
string _RoundIcon;

static ManifestDocumentElement<ActivityAttribute> mapping = new ManifestDocumentElement<ActivityAttribute> ("activity") {
{
Expand Down Expand Up @@ -147,6 +148,11 @@ partial class ActivityAttribute {
"resizeableActivity",
self => self._ResizeableActivity,
(self, value) => self._ResizeableActivity = (bool) value
}, {
"RoundIcon",
"roundIcon",
self => self._RoundIcon,
(self, value) => self._RoundIcon = (string) value
}, {
"SupportsPictureInPicture",
"supportsPictureInPicture",
Expand Down
6 changes: 6 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Mono.Android/ApplicationAttribute.Partial.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ partial class ApplicationAttribute {
bool _VMSafeMode;
bool _ResizeableActivity;
ICustomAttributeProvider provider;
string _RoundIcon;

static ManifestDocumentElement<ApplicationAttribute> mapping = new ManifestDocumentElement<ApplicationAttribute> ("application") {
{
Expand Down Expand Up @@ -180,6 +181,11 @@ partial class ApplicationAttribute {
"restrictedAccountType",
self => self._RestrictedAccountType,
(self, value) => self._RestrictedAccountType = (string) value
}, {
"RoundIcon",
"roundIcon",
self => self._RoundIcon,
(self, value) => self._RoundIcon = (string) value
}, {
"SupportsRtl",
"supportsRtl",
Expand Down
9 changes: 8 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Mono.Android/BroadcastReceiverAttribute.Partial.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
namespace Android.Content {

partial class BroadcastReceiverAttribute {

string _RoundIcon;

static ManifestDocumentElement<BroadcastReceiverAttribute> mapping = new ManifestDocumentElement<BroadcastReceiverAttribute> ("receiver") {
{
Expand Down Expand Up @@ -53,7 +55,12 @@ partial class BroadcastReceiverAttribute {
"process",
self => self.Process,
(self, value) => self.Process = (string) value
},
}, {
"RoundIcon",
"roundIcon",
self => self._RoundIcon,
(self, value) => self._RoundIcon = (string) value
},
};


Expand Down
7 changes: 7 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Mono.Android/ContentProviderAttribute.Partial.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ namespace Android.Content {

partial class ContentProviderAttribute {

string _RoundIcon;

static ManifestDocumentElement<ContentProviderAttribute> mapping = new ManifestDocumentElement<ContentProviderAttribute> ("provider") {
{
"Authorities",
Expand Down Expand Up @@ -78,6 +80,11 @@ partial class ContentProviderAttribute {
"readPermission",
self => self.ReadPermission,
(self, value) => self.ReadPermission = (string) value
}, {
"RoundIcon",
"roundIcon",
self => self._RoundIcon,
(self, value) => self._RoundIcon = (string) value
}, {
"Syncable",
"syncable",
Expand Down
7 changes: 7 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Mono.Android/InstrumentationAttribute.Partial.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
namespace Android.App {

partial class InstrumentationAttribute {

string _RoundIcon;

static ManifestDocumentElement<InstrumentationAttribute> mapping = new ManifestDocumentElement<InstrumentationAttribute> ("instrumentation") {
{
Expand Down Expand Up @@ -38,6 +40,11 @@ partial class InstrumentationAttribute {
"name",
self => self.Name,
(self, value) => self.Name = (string) value
}, {
"RoundIcon",
"roundIcon",
self => self._RoundIcon,
(self, value) => self._RoundIcon = (string) value
}, {
"TargetPackage",
"targetPackage",
Expand Down
2 changes: 2 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Mono.Android/IntentFilterAttribute.Partial.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ namespace Android.App {

partial class IntentFilterAttribute {
bool _AutoVerify;
string _RoundIcon;

static readonly Dictionary<string, string> attributeMappings = new Dictionary<string, string> () {
{ "Icon", "icon" },
Expand Down Expand Up @@ -48,6 +49,7 @@ partial class IntentFilterAttribute {
{ "DataPorts", (self, value) => self.DataPorts = ToStringArray (value) },
{ "DataSchemes", (self, value) => self.DataSchemes = ToStringArray (value) },
{ "AutoVerify", (self, value) => self._AutoVerify = (bool) value },
{ "RoundIcon", (self, value) => self._RoundIcon = (string) value },
};

static string[] ToStringArray (object value)
Expand Down
9 changes: 8 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionAttribute.Partial.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ namespace Android.App {

partial class PermissionAttribute {

string _RoundIcon;

static ManifestDocumentElement<PermissionAttribute> mapping = new ManifestDocumentElement<PermissionAttribute> ("permission") {
{
"Description",
Expand Down Expand Up @@ -48,7 +50,12 @@ partial class PermissionAttribute {
"protectionLevel",
self => self.ProtectionLevel,
(self, value) => self.ProtectionLevel = (Protection) value
},
}, {
"RoundIcon",
"roundIcon",
self => self._RoundIcon,
(self, value) => self._RoundIcon = (string) value
},
};

ICollection<string> specified;
Expand Down
9 changes: 8 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionGroupAttribute.Partial.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
namespace Android.App {

partial class PermissionGroupAttribute {

string _RoundIcon;

static ManifestDocumentElement<PermissionGroupAttribute> mapping = new ManifestDocumentElement<PermissionGroupAttribute> ("permission") {
{
Expand All @@ -38,7 +40,12 @@ partial class PermissionGroupAttribute {
"name",
self => self.Name,
(self, value) => self.Name = (string) value
},
}, {
"RoundIcon",
"roundIcon",
self => self._RoundIcon,
(self, value) => self._RoundIcon = (string) value
},
};

ICollection<string> specified;
Expand Down
9 changes: 8 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionTreeAttribute.Partial.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
namespace Android.App {

partial class PermissionTreeAttribute {

string _RoundIcon;

static ManifestDocumentElement<PermissionTreeAttribute> mapping = new ManifestDocumentElement<PermissionTreeAttribute> ("permission") {
{
Expand All @@ -33,7 +35,12 @@ partial class PermissionTreeAttribute {
"name",
self => self.Name,
(self, value) => self.Name = (string) value
},
}, {
"RoundIcon",
"roundIcon",
self => self._RoundIcon,
(self, value) => self._RoundIcon = (string) value
},
};

ICollection<string> specified;
Expand Down
8 changes: 7 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Mono.Android/ServiceAttribute.Partial.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ namespace Android.App {
partial class ServiceAttribute {

bool _IsolatedProcess;
string _RoundIcon;

static ManifestDocumentElement<ServiceAttribute> mapping = new ManifestDocumentElement<ServiceAttribute> ("service") {
{
Expand Down Expand Up @@ -60,7 +61,12 @@ partial class ServiceAttribute {
"process",
self => self.Process,
(self, value) => self.Process = (string) value
},
}, {
"RoundIcon",
"roundIcon",
self => self._RoundIcon,
(self, value) => self._RoundIcon = (string) value
},
};

ICollection<string> specified;
Expand Down
5 changes: 5 additions & 0 deletions src/Xamarin.Android.NamingCustomAttributes/Android.App/ActivityAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ public ActivityAttribute ()
public string Process {get; set;}
#if ANDROID_24
public bool ResizeableActivity {get;set;}
#endif
#if ANDROID_25
public string RoundIcon {get;set;}
#endif
#if ANDROID_24
public bool SupportsPictureInPicture {get;set;}
#endif
public ScreenOrientation ScreenOrientation {get; set;}
Expand Down
3 changes: 3 additions & 0 deletions src/Xamarin.Android.NamingCustomAttributes/Android.App/ApplicationAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ public ApplicationAttribute ()
#if ANDROID_18
public string RestrictedAccountType {get; set;}
#endif
#if ANDROID_25
public string RoundIcon {get; set;}
#endif
#if ANDROID_17
public bool SupportsRtl {get; set;}
#endif
Expand Down
3 changes: 3 additions & 0 deletions src/Xamarin.Android.NamingCustomAttributes/Android.App/InstrumentationAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ public InstrumentationAttribute ()
public string Icon {get; set;}
public string Label {get; set;}
public string Name {get; set;}
#if ANDROID_25
public string RoundIcon {get; set;}
#endif
public string TargetPackage {get; set;}
}
}
Expand Down
3 changes: 3 additions & 0 deletions src/Xamarin.Android.NamingCustomAttributes/Android.App/ServiceAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,8 @@ public ServiceAttribute ()
public string Label {get; set;}
public string Permission {get; set;}
public string Process {get; set;}
#if ANDROID_25
public string RoundIcon {get; set;}
#endif
}
}
3 changes: 3 additions & 0 deletions src/Xamarin.Android.NamingCustomAttributes/Android.Content/BroadcastReceiverAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,8 @@ public BroadcastReceiverAttribute ()
public string Name {get; set;}
public string Permission {get; set;}
public string Process {get; set;}
#if ANDROID_25
public string RoundIcon {get; set;}
#endif
}
}
3 changes: 3 additions & 0 deletions src/Xamarin.Android.NamingCustomAttributes/Android.Content/ContentProviderAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ public ContentProviderAttribute (string[] authorities)
public string Permission {get; set;}
public string Process {get; set;}
public string ReadPermission {get; set;}
#if ANDROID_25
public string RoundIcon {get; set;}
#endif
public bool Syncable {get; set;}
public string WritePermission {get; set;}
}
Expand Down