Adjust sample app to comply with latest changes/renames

Thomas Galliker · Thomas Galliker · commit 99a0bf274071 · 2025-06-12T14:09:35.000+02:00
diff --git a/Samples/MauiSampleApp/Platforms/Android/Notifications/NotificationChannelSamples.cs b/Samples/MauiSampleApp/Platforms/Android/Notifications/NotificationChannelSamples.cs
@@ -23,26 +23,44 @@ public static IEnumerable<NotificationChannelRequest> GetAll()
             {
                 ChannelId = "test_channel_1",
                 ChannelName = "Test Channel 1",
-                Description = "Description for test channel 1",
+                Description = "Low priority test channel",
                 LockscreenVisibility = NotificationVisibility.Public,
-                Importance = NotificationImportance.High,
+                Importance = NotificationImportance.Low,
             };
 
             yield return new NotificationChannelRequest
             {
                 ChannelId = "test_channel_2",
                 ChannelName = "Test Channel 2",
-                Description = "Description for test channel 2",
-                Group = NotificationChannelGroupSamples.TestGroup1.GroupId,
+                Description = "Default priority test channel",
                 LockscreenVisibility = NotificationVisibility.Public,
-                Importance = NotificationImportance.High,
+                Importance = NotificationImportance.Default,
             };
 
             yield return new NotificationChannelRequest
             {
                 ChannelId = "test_channel_3",
                 ChannelName = "Test Channel 3",
-                Description = "Description for test channel 3",
+                Description = "High priority test channel",
+                LockscreenVisibility = NotificationVisibility.Public,
+                Importance = NotificationImportance.High,
+            };
+
+            yield return new NotificationChannelRequest
+            {
+                ChannelId = "test_channel_4",
+                ChannelName = "Test Channel 4",
+                Description = "Test channel assigned to group 1",
+                Group = NotificationChannelGroupSamples.TestGroup1.GroupId,
+                LockscreenVisibility = NotificationVisibility.Public,
+                Importance = NotificationImportance.High,
+            };
+
+            yield return new NotificationChannelRequest
+            {
+                ChannelId = "test_channel_5",
+                ChannelName = "Test Channel 5",
+                Description = "Test channel assigned to group 1",
                 Group = NotificationChannelGroupSamples.TestGroup1.GroupId,
                 LockscreenVisibility = NotificationVisibility.Public,
                 Importance = NotificationImportance.High,
diff --git a/Samples/MauiSampleApp/Platforms/Android/Resources/drawable/ic_radiobox_checked.png b/Samples/MauiSampleApp/Platforms/Android/Resources/drawable/ic_radiobox_checked.png
diff --git a/Samples/MauiSampleApp/Platforms/Android/Resources/drawable/ic_radiobox_unchecked.png b/Samples/MauiSampleApp/Platforms/Android/Resources/drawable/ic_radiobox_unchecked.png
diff --git a/Samples/MauiSampleApp/Platforms/Android/Resources/values/colors.xml b/Samples/MauiSampleApp/Platforms/Android/Resources/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorPrimary">#FDA612</color>
-    <color name="colorPrimaryDark">#F6820C</color>
-    <color name="colorAccent">#F6820C</color>
+    <color name="colorPrimaryDark">#FDA612</color>
+    <color name="colorAccent">#FDA612</color>
     <color name="ic_default_notification_color">#FF00FF</color>
 </resources>
diff --git a/Samples/MauiSampleApp/ViewModels/MainViewModel.cs b/Samples/MauiSampleApp/ViewModels/MainViewModel.cs
@@ -746,7 +746,7 @@ private async Task SubscribeToTopicAsync()
             try
             {
                 var topic = this.Topic;
-                this.firebasePushNotification.SubscribeTopic(topic);
+                await this.firebasePushNotification.SubscribeTopicAsync(topic);
                 this.UpdateSubscribedTopics();
                 this.Topic = null;
             }
@@ -761,7 +761,7 @@ private async Task UnsubscribeFromTopicAsync(string topic)
         {
             try
             {
-                this.firebasePushNotification.UnsubscribeTopic(topic);
+                await this.firebasePushNotification.UnsubscribeTopicAsync(topic);
                 this.UpdateSubscribedTopics();
             }
             catch (Exception ex)
@@ -780,7 +780,7 @@ private async Task UnsubscribeAllTopicsAsync()
         {
             try
             {
-                this.firebasePushNotification.UnsubscribeAllTopics();
+                await this.firebasePushNotification.UnsubscribeAllTopicsAsync();
                 this.UpdateSubscribedTopics();
             }
             catch (Exception ex)
diff --git a/Samples/MauiSampleApp/ViewModels/NotificationCategorySamples.cs b/Samples/MauiSampleApp/ViewModels/NotificationCategorySamples.cs
@@ -23,16 +23,16 @@ public static IEnumerable<NotificationCategory> GetAll()
             });
             yield return new NotificationCategory("contract", new[]
             {
-                new NotificationAction("Accept", "Accept", NotificationActionType.Default, "accept"),
-                new NotificationAction("Reject", "Reject", NotificationActionType.Default, "reject")
+                new NotificationAction("Accept", "Accept", NotificationActionType.Default, "ic_radiobox_checked"),
+                new NotificationAction("Reject", "Reject", NotificationActionType.Default, "ic_radiobox_unchecked")
             });
             yield return new NotificationCategory("dismiss",new []
             {
-                new NotificationAction("dismiss","Dismiss", NotificationActionType.Default),
+                new NotificationAction("dismiss","Dismiss", NotificationActionType.Destructive),
             });
             yield return new NotificationCategory("navigate", new []
             {
-                new NotificationAction("dismiss", "Dismiss", NotificationActionType.Default),
+                new NotificationAction("dismiss", "Dismiss", NotificationActionType.Destructive),
                 new NotificationAction("navigate", "Navigate To", NotificationActionType.Foreground)
             });
         }
diff --git a/Samples/MauiSampleApp/Views/ItemTemplates/SubscribedTopicItemTemplate.xaml b/Samples/MauiSampleApp/Views/ItemTemplates/SubscribedTopicItemTemplate.xaml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentView
+    x:Class="MauiSampleApp.Views.ItemTemplates.SubscribedTopicItemTemplate"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:vm="clr-namespace:MauiSampleApp.ViewModels"
-    x:Class="MauiSampleApp.Views.ItemTemplates.SubscribedTopicItemTemplate"
     x:DataType="vm:SubscribedTopicViewModel">
 
-    <Grid
-        Padding="4"
-        ColumnDefinitions="*, Auto"
-        ColumnSpacing="4">
+    <Grid ColumnDefinitions="*, Auto" ColumnSpacing="4">
         <Label
             Grid.Column="0"
             FontFamily="{StaticResource FontFamily.Monospace.Regular}"
diff --git a/Samples/MauiSampleApp/Views/MainPage.xaml b/Samples/MauiSampleApp/Views/MainPage.xaml
@@ -267,20 +267,28 @@
                     VerticalOptions="Start" />
                 <VerticalStackLayout
                     BindableLayout.ItemTemplate="{StaticResource SubscribedTopicItemTemplate}"
-                    BindableLayout.ItemsSource="{Binding SubscribedTopics}" />
+                    BindableLayout.ItemsSource="{Binding SubscribedTopics}"
+                    Spacing="4" />
+
+                <Grid
+                    ColumnDefinitions="*,Auto"
+                    ColumnSpacing="4">
+                    <Entry
+                        Grid.Column="0"
+                        FontFamily="{StaticResource FontFamily.Monospace.Regular}"
+                        IsSpellCheckEnabled="False"
+                        IsTextPredictionEnabled="False"
+                        Keyboard="Url"
+                        Placeholder="New topic name"
+                        Text="{Binding Topic}" />
+                    <Button
+                        Grid.Column="1"
+                        Command="{Binding SubscribeToTopicCommand}"
+                        Text="Subscribe"
+                        HorizontalOptions="Fill"
+                        VerticalOptions="Start" />
+                </Grid>
 
-                <Entry
-                    FontFamily="{StaticResource FontFamily.Monospace.Regular}"
-                    IsSpellCheckEnabled="False"
-                    IsTextPredictionEnabled="False"
-                    Keyboard="Url"
-                    Placeholder="New topic name"
-                    Text="{Binding Topic}" />
-                <Button
-                    Command="{Binding SubscribeToTopicCommand}"
-                    Text="Subscribe to topic"
-                    HorizontalOptions="Fill"
-                    VerticalOptions="Start" />
                 <Button
                     Command="{Binding UnsubscribeAllTopicsCommand}"
                     LineBreakMode="MiddleTruncation"

Original file line number	Diff line number	Diff line change
`@@ -746,7 +746,7 @@ private async Task SubscribeToTopicAsync()`
`746`	`746`	`try`
`747`	`747`	`{`
`748`	`748`	`var topic = this.Topic;`
`749`		`- this.firebasePushNotification.SubscribeTopic(topic);`
	`749`	`+ await this.firebasePushNotification.SubscribeTopicAsync(topic);`
`750`	`750`	`this.UpdateSubscribedTopics();`
`751`	`751`	`this.Topic = null;`
`752`	`752`	`}`
`@@ -761,7 +761,7 @@ private async Task UnsubscribeFromTopicAsync(string topic)`
`761`	`761`	`{`
`762`	`762`	`try`
`763`	`763`	`{`
`764`		`- this.firebasePushNotification.UnsubscribeTopic(topic);`
	`764`	`+ await this.firebasePushNotification.UnsubscribeTopicAsync(topic);`
`765`	`765`	`this.UpdateSubscribedTopics();`
`766`	`766`	`}`
`767`	`767`	`catch (Exception ex)`
`@@ -780,7 +780,7 @@ private async Task UnsubscribeAllTopicsAsync()`
`780`	`780`	`{`
`781`	`781`	`try`
`782`	`782`	`{`
`783`		`- this.firebasePushNotification.UnsubscribeAllTopics();`
	`783`	`+ await this.firebasePushNotification.UnsubscribeAllTopicsAsync();`
`784`	`784`	`this.UpdateSubscribedTopics();`
`785`	`785`	`}`
`786`	`786`	`catch (Exception ex)`
Original file line number	Diff line number	Diff line change
`@@ -23,16 +23,16 @@ public static IEnumerable<NotificationCategory> GetAll()`
`23`	`23`	`});`
`24`	`24`	`yield return new NotificationCategory("contract", new[]`
`25`	`25`	`{`
`26`		`- new NotificationAction("Accept", "Accept", NotificationActionType.Default, "accept"),`
`27`		`- new NotificationAction("Reject", "Reject", NotificationActionType.Default, "reject")`
	`26`	`+ new NotificationAction("Accept", "Accept", NotificationActionType.Default, "ic_radiobox_checked"),`
	`27`	`+ new NotificationAction("Reject", "Reject", NotificationActionType.Default, "ic_radiobox_unchecked")`
`28`	`28`	`});`
`29`	`29`	`yield return new NotificationCategory("dismiss",new []`
`30`	`30`	`{`
`31`		`- new NotificationAction("dismiss","Dismiss", NotificationActionType.Default),`
	`31`	`+ new NotificationAction("dismiss","Dismiss", NotificationActionType.Destructive),`
`32`	`32`	`});`
`33`	`33`	`yield return new NotificationCategory("navigate", new []`
`34`	`34`	`{`
`35`		`- new NotificationAction("dismiss", "Dismiss", NotificationActionType.Default),`
	`35`	`+ new NotificationAction("dismiss", "Dismiss", NotificationActionType.Destructive),`
`36`	`36`	`new NotificationAction("navigate", "Navigate To", NotificationActionType.Foreground)`
`37`	`37`	`});`
`38`	`38`	`}`