Skip to content

Commit eb7b4f4

Browse files
b4teLb4teL
committed
show hidden files + update notifo sdk + add code for new sdk
1 parent 2458d1a commit eb7b4f4

File tree

13 files changed

+174
-139
lines changed

13 files changed

+174
-139
lines changed

‎sample/Sample.Android/Resources/Resource.designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sample/Sample.Android/Sample.Android.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<Version>5.0.1</Version>
8686
</PackageReference>
8787
<PackageReference Include="Xamarin.Firebase.Common">
88-
<Version>119.5.0</Version>
88+
<Version>120.0.0.5</Version>
8989
</PackageReference>
9090
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
9191
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />

‎sample/Sample.iOS.Shared/NotificationHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace Sample.iOS.Shared
1212
{
1313
public class NotificationHandler : INotificationHandler
1414
{
15-
public void OnBuildNotification(UNMutableNotificationContent content, NotificationDto notification)
15+
public void OnBuildNotification(UNMutableNotificationContent content, UserNotificationDto notification)
1616
{
1717
content.Sound = UNNotificationSound.GetSound("announcement.caf");
1818
}

‎sample/Sample.iOS.Shared/Sample.iOS.Shared.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
</ProjectReference>
5151
</ItemGroup>
5252
<ItemGroup>
53-
<PackageReference Include="Notifo.SDK" Version="1.0.0-beta7" />
53+
<PackageReference Include="Notifo.SDK" Version="1.2.0" />
5454
</ItemGroup>
5555
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
5656
</Project>

‎sample/SampleNotificationServiceExtension/SampleNotificationServiceExtension.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,16 @@
8787
</MtouchVerbosity>
8888
</PropertyGroup>
8989
<ItemGroup>
90+
<Reference Include="Notifo.SDK, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
91+
<HintPath>..\..\packages\Notifo.SDK.1.2.0\lib\netstandard2.1\Notifo.SDK.dll</HintPath>
92+
</Reference>
9093
<Reference Include="System" />
9194
<Reference Include="System.Xml" />
9295
<Reference Include="System.Core" />
9396
<Reference Include="Xamarin.iOS" />
9497
<Reference Include="Newtonsoft.Json">
9598
<HintPath>..\..\packages\Newtonsoft.Json.12.0.3\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
9699
</Reference>
97-
<Reference Include="Notifo.SDK">
98-
<HintPath>..\..\packages\Notifo.SDK.1.0.0-beta7\lib\netstandard2.1\Notifo.SDK.dll</HintPath>
99-
</Reference>
100100
</ItemGroup>
101101
<ItemGroup>
102102
<Folder Include="Resources\" />

‎sample/SampleNotificationServiceExtension/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="xamarinios10" />
4-
<package id="Notifo.SDK" version="1.0.0-beta7" targetFramework="xamarinios10" />
4+
<package id="Notifo.SDK" version="1.2.0" targetFramework="xamarinios10" />
55
<package id="System.ComponentModel.Annotations" version="5.0.0" targetFramework="xamarinios10" />
66
</packages>

‎sdk/Notifo.SDK.FirebasePlugin/Notifo.SDK.FirebasePlugin.csproj

Lines changed: 64 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,67 @@
11
<Project Sdk="MSBuild.Sdk.Extras/3.0.22">
22

3-
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;xamarinios10;monoandroid12.0;</TargetFrameworks>
5-
<LangVersion>8.0</LangVersion>
6-
<Nullable>enable</Nullable>
7-
<RootNamespace>Notifo.SDK.FirebasePlugin</RootNamespace>
8-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
9-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10-
<AssemblyName>Notifo.Xamarin.FirebasePlugin</AssemblyName>
11-
<RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
12-
<RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
13-
</PropertyGroup>
14-
15-
<ItemGroup>
16-
<None Include="logo-squared.png" Pack="true" PackagePath="\" />
17-
</ItemGroup>
18-
19-
<ItemGroup>
20-
<Compile Remove="**\*.netstandard.cs" />
21-
<Compile Remove="**\*.android.cs" />
22-
<Compile Remove="**\*.ios.cs" />
23-
</ItemGroup>
24-
25-
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
26-
<Compile Include="**\*.netstandard.cs" />
27-
</ItemGroup>
28-
29-
<ItemGroup Condition=" $(TargetFramework.StartsWith('xamarinios')) ">
30-
<Compile Include="**\*.ios.cs" />
31-
<PackageReference Include="Xamarin.Firebase.iOS.CloudMessaging" Version="8.10.0" />
32-
<PackageReference Include="Xamarin.Firebase.iOS.Installations" Version="8.10.0" />
33-
<PackageReference Include="Xamarin.Firebase.iOS.Core" Version="8.10.0" />
34-
<PackageReference Include="Xamarin.Firebase.iOS.InstanceID" Version="4.8.0" />
35-
</ItemGroup>
36-
37-
<ItemGroup Condition=" $(TargetFramework.StartsWith('monoandroid')) ">
38-
<Compile Include="**\*.android.cs" />
39-
</ItemGroup>
40-
41-
<ItemGroup>
42-
<PackageReference Include="Notifo.SDK" Version="1.0.0" />
43-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
44-
<PackageReference Include="Xamarin.Firebase.iOS.CloudMessaging" Version="8.10.0.1" />
45-
<PackageReference Include="Xamarin.Firebase.iOS.Core" Version="8.10.0.1" />
46-
<PackageReference Include="Xamarin.Firebase.iOS.Installations" Version="8.10.0.1" />
47-
</ItemGroup>
48-
49-
<ItemGroup>
50-
<ProjectReference Include="..\Notifo.SDK\Notifo.SDK.Core.csproj" />
51-
</ItemGroup>
52-
53-
<ItemGroup Condition="'$(TargetFramework)' == 'monoandroid12.0'">
54-
<PackageReference Include="Xamarin.Firebase.Common">
55-
<Version>120.0.0.5</Version>
56-
</PackageReference>
57-
<PackageReference Include="Xamarin.Firebase.Messaging">
58-
<Version>122.0.0.5</Version>
59-
</PackageReference>
60-
</ItemGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks>netstandard2.1;xamarinios10;monoandroid12.0;</TargetFrameworks>
5+
<LangVersion>8.0</LangVersion>
6+
<Nullable>enable</Nullable>
7+
<RootNamespace>Notifo.SDK.FirebasePlugin</RootNamespace>
8+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
9+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10+
<AssemblyName>Notifo.Xamarin.FirebasePlugin</AssemblyName>
11+
<RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
12+
<RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<None Include="logo-squared.png" Pack="true" PackagePath="\" />
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<Compile Remove="**\*.netstandard.cs" />
21+
<Compile Remove="**\*.android.cs" />
22+
<Compile Remove="**\*.ios.cs" />
23+
</ItemGroup>
24+
25+
<ItemGroup Condition=" $(TargetFramework.StartsWith('monoandroid')) ">
26+
<None Include="**\*.netstandard.cs" />
27+
<Compile Include="**\*.android.cs" />
28+
<None Include="**\*.ios.cs" />
29+
</ItemGroup>
30+
31+
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
32+
<Compile Include="**\*.netstandard.cs" />
33+
<None Include="**\*.android.cs" />
34+
<None Include="**\*.ios.cs" />
35+
</ItemGroup>
36+
37+
<ItemGroup Condition=" $(TargetFramework.StartsWith('xamarinios')) ">
38+
<None Include="**\*.netstandard.cs" />
39+
<None Include="**\*.android.cs" />
40+
<Compile Include="**\*.ios.cs" />
41+
<PackageReference Include="Xamarin.Firebase.iOS.CloudMessaging" Version="8.10.0" />
42+
<PackageReference Include="Xamarin.Firebase.iOS.Installations" Version="8.10.0" />
43+
<PackageReference Include="Xamarin.Firebase.iOS.Core" Version="8.10.0" />
44+
<PackageReference Include="Xamarin.Firebase.iOS.InstanceID" Version="4.8.0" />
45+
</ItemGroup>
46+
47+
<ItemGroup>
48+
<PackageReference Include="Notifo.SDK" Version="1.2.0" />
49+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
50+
<PackageReference Include="Xamarin.Firebase.iOS.CloudMessaging" Version="8.10.0.1" />
51+
<PackageReference Include="Xamarin.Firebase.iOS.Core" Version="8.10.0.1" />
52+
<PackageReference Include="Xamarin.Firebase.iOS.Installations" Version="8.10.0.1" />
53+
</ItemGroup>
54+
55+
<ItemGroup>
56+
<ProjectReference Include="..\Notifo.SDK\Notifo.SDK.Core.csproj" />
57+
</ItemGroup>
58+
59+
<ItemGroup Condition="'$(TargetFramework)' == 'monoandroid12.0'">
60+
<PackageReference Include="Xamarin.Firebase.Common">
61+
<Version>120.0.0.5</Version>
62+
</PackageReference>
63+
<PackageReference Include="Xamarin.Firebase.Messaging">
64+
<Version>122.0.0.5</Version>
65+
</PackageReference>
66+
</ItemGroup>
6167
</Project>

‎sdk/Notifo.SDK.FirebasePlugin/NotifoFirebasePlugin.android.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Android.App;
99
using Android.Content;
1010
using Plugin.FirebasePushNotification;
11+
using Notifo.SDK;
1112

1213
namespace Notifo.SDK.FirebasePlugin
1314
{

‎sdk/Notifo.SDK.FirebasePlugin/NotifoFirebasePlugin.ios.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using Notifo.SDK.Resources;
1212
using Plugin.FirebasePushNotification;
1313
using Serilog;
14+
using Notifo.SDK;
1415
using UserNotifications;
1516

1617
namespace Notifo.SDK.FirebasePlugin

‎sdk/Notifo.SDK.FirebasePlugin/PluginEventsProvider.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
using System;
99
using System.Collections.Generic;
10-
using Notifo.SDK;
1110
using Notifo.SDK.Extensions;
1211
using Notifo.SDK.PushEventProvider;
1312
using Plugin.FirebasePushNotification;
@@ -17,9 +16,9 @@ namespace Notifo.SDK.FirebasePlugin
1716
internal class PluginEventsProvider : IPushEventsProvider
1817
{
1918
public event EventHandler<TokenRefreshEventArgs>? OnTokenRefresh;
20-
public event EventHandler<NotificationEventArgs>? OnNotificationReceived;
21-
public event EventHandler<NotificationEventArgs>? OnNotificationOpened;
22-
public event EventHandler<NotificationErrorEventArgs> OnError;
19+
public event EventHandler<Notifo.SDK.NotificationEventArgs>? OnNotificationReceived;
20+
public event EventHandler<Notifo.SDK.NotificationEventArgs>? OnNotificationOpened;
21+
public event EventHandler<Notifo.SDK.NotificationErrorEventArgs> OnError;
2322

2423
public PluginEventsProvider()
2524
{
@@ -62,7 +61,7 @@ private void FirebasePushNotification_OnNotificationOpened(object source, Fireba
6261
return;
6362
}
6463

65-
var args =
64+
var args =
6665
new NotificationEventArgs(
6766
new UserNotificationDto().FromDictionary(new Dictionary<string, object>(e.Data)));
6867

0 commit comments

Comments
 (0)