Skip to content

Commit 088ede0

Browse files
committed
Use the new PresenceViewerCore package to get the presence webview resources.
1 parent 5dadc84 commit 088ede0

File tree

7 files changed

+13
-180
lines changed

7 files changed

+13
-180
lines changed

DittoPresenceViewer/DittoPresenceViewer.cs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,18 @@ public class DittoPresenceViewer : ContentView, IDisposable
99
{
1010
private readonly WebView _webView;
1111
private DittoPresenceObserver? _observer;
12-
12+
private readonly JsonSerializerOptions _presenceSerializerOptionsOptions;
13+
1314
public DittoPresenceViewer()
1415
{
16+
_presenceSerializerOptionsOptions = new JsonSerializerOptions()
17+
{
18+
IncludeFields = true,
19+
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
20+
};
21+
_presenceSerializerOptionsOptions.Converters.Add(new ByteArrayToIntArrayConverter());
22+
_presenceSerializerOptionsOptions.Converters.Add(new StringToEnumConverter<DittoConnectionType>());
23+
1524
_webView = new WebView
1625
{
1726
HorizontalOptions = LayoutOptions.Fill,
@@ -61,19 +70,10 @@ private static void OnDittoChanged(BindableObject source, object o, object n)
6170

6271
private static void OnDittoPresenceChange(DittoPresenceViewer presenceViewer, DittoPresenceGraph presence)
6372
{
64-
var options = new JsonSerializerOptions()
65-
{
66-
IncludeFields = true,
67-
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
68-
};
69-
70-
options.Converters.Add(new ByteArrayToIntArrayConverter());
71-
options.Converters.Add(new StringToEnumConverter<DittoConnectionType>());
72-
var presenceGraphJSON = JsonSerializer.Serialize(presence, options)
73+
var presenceGraphJson = JsonSerializer.Serialize(presence, presenceViewer._presenceSerializerOptionsOptions)
7374
.Replace("\"isDittoCloudConnected\"", "\"isConnectedToDittoCloud\""); //INFO: hack. This property should be named isConnectedToDittoCloud to work with Presence Viewer, like in other SDKs
7475

75-
var b64String = Convert.ToBase64String(Encoding.UTF8.GetBytes(presenceGraphJSON));
76-
76+
var b64String = Convert.ToBase64String(Encoding.UTF8.GetBytes(presenceGraphJson));
7777

7878
MainThread.BeginInvokeOnMainThread(async () =>
7979
{
@@ -89,6 +89,5 @@ private static void OnDittoPresenceChange(DittoPresenceViewer presenceViewer, Di
8989

9090
var result = presenceViewer._webView.EvaluateJavaScriptAsync($"Presence.updateNetwork('{b64String}');");
9191
});
92-
9392
}
9493
}

DittoPresenceViewer/DittoPresenceViewer.csproj

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,9 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36+
<PackageReference Include="DittoPresenceViewerCore" Version="1.0.0-pre.1" />
3637
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
3738
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
3839
<PackageReference Include="Ditto" Version="4.7.1" />
3940
</ItemGroup>
40-
<!-- Resources - Packaging -->
41-
<ItemGroup>
42-
<None Include="DittoTools.PresenceViewer.targets" Pack="True" PackagePath="buildTransitive\" />
43-
</ItemGroup>
44-
<ItemGroup>
45-
<None Include="Resources\Presence\**" Pack="True" PackagePath="buildTransitive\Resources\Presence\" />
46-
</ItemGroup>
47-
<ItemGroup>
48-
<!-- For direct reference -->
49-
<MauiAsset Include="Resources\Presence\**">
50-
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
51-
</MauiAsset>
52-
</ItemGroup>
5341
</Project>

DittoPresenceViewer/DittoTools.PresenceViewer.targets

Lines changed: 0 additions & 7 deletions
This file was deleted.

DittoPresenceViewer/Resources/Presence/index.html

Lines changed: 0 additions & 13 deletions
This file was deleted.

DittoPresenceViewer/Resources/Presence/main.css

Lines changed: 0 additions & 101 deletions
This file was deleted.

DittoPresenceViewer/Resources/Presence/main.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

DittoPresenceViewer/Resources/Presence/main.js.LICENSE.txt

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)