Merge branch 'develop' into release/08.11

bitmark-inc · Nov 8, 2024 · 77ddd1e · 77ddd1e
2 parents 52b1c88 + 9d6ffd1
commit 77ddd1e
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 12 deletions.
diff --git a/lib/model/additional_data/additional_data.dart b/lib/model/additional_data/additional_data.dart
@@ -131,7 +131,7 @@ class AdditionalData {
             homeIndex: homeIndex,
             linkText: linkText,
           );
-        case NotificationType.daily:
+        case NotificationType.dailyArtworkReminders:
           final subType = json['notification_sub_type'];
           final dailyType = DailyNotificationType.fromString(subType ?? '');
           if (dailyType == null) {

diff --git a/lib/model/additional_data/daily_notification_data.dart b/lib/model/additional_data/daily_notification_data.dart
@@ -73,7 +73,6 @@ class DailyNotificationData extends AdditionalData {
       case DailyNotificationType.viewDaily:
       case DailyNotificationType.revisitDaily:
         await _navigationService.navigatePath(AppRouter.dailyWorkPage);
-        dailyWorkKey.currentState?.trackInterest();
       case DailyNotificationType.viewDailySeries:
         final artwork = dailyToken!.artwork;
         if (artwork == null) {

diff --git a/lib/screen/dailies_work/dailies_work_page.dart b/lib/screen/dailies_work/dailies_work_page.dart
@@ -110,6 +110,10 @@ class DailyWorkPageState extends State<DailyWorkPage>
     _stopTrackingLiked();
   }
 
+  void didTapDaily() {
+    trackInterest();
+  }
+
   void trackInterest() {
     if (_trackingDailyLiked) {
       return;
@@ -260,6 +264,7 @@ class DailyWorkPageState extends State<DailyWorkPage>
                   .addEvent(MetricEventName.dailyView, data: {
                 MetricParameter.tokenId: current.assetTokens.first.id,
               }));
+              trackInterest();
             }
           }
           return true;

diff --git a/lib/screen/home/home_navigation_page.dart b/lib/screen/home/home_navigation_page.dart
@@ -133,6 +133,7 @@ class HomeNavigationPageState extends State<HomeNavigationPage>
         // otherwise pause daily work
         if (index == HomeNavigatorTab.daily.index) {
           dailyWorkKey.currentState?.resumeDailyWork();
+          dailyWorkKey.currentState?.trackInterest();
         } else {
           dailyWorkKey.currentState?.pauseDailyWork();
         }

diff --git a/lib/service/announcement/announcement_service.dart b/lib/service/announcement/announcement_service.dart
@@ -111,6 +111,7 @@ class AnnouncementServiceImpl implements AnnouncementService {
     await _saveAnnouncement(announcement.markAsRead());
   }
 
+  /// unread and in-app enabled announcements
   List<AnnouncementLocal> _getAnnouncementsToShow() {
     _queue.removeWhere((element) => element.read || !element.inAppEnabled);
     if (_queue.isEmpty) {

diff --git a/lib/service/customer_support_service.dart b/lib/service/customer_support_service.dart
@@ -101,6 +101,7 @@ class CustomerSupportServiceImpl extends CustomerSupportService {
 
   bool _isProcessingDraftMessages = false;
 
+  /// will add this after backend support
   static const _supportChatNotificationTypes = [];
 
   Future<List<Issue>> _getIssues() async {

diff --git a/lib/service/user_interactivity_service.dart b/lib/service/user_interactivity_service.dart
@@ -1,9 +1,10 @@
 import 'dart:async';
-import 'dart:math';
+import 'dart:math' as math;
 
 import 'package:autonomy_flutter/model/dailies.dart';
 import 'package:autonomy_flutter/service/configuration_service.dart';
 import 'package:autonomy_flutter/service/metric_client_service.dart';
+import 'package:autonomy_flutter/util/log.dart';
 import 'package:autonomy_flutter/util/metric_helper.dart';
 import 'package:autonomy_flutter/util/ui_helper.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -28,11 +29,11 @@ class UserInteractivityServiceImpl implements UserInteractivityService {
     };
     unawaited(
         _metricClientService.addEvent(MetricEventName.dailyLiked, data: data));
-
-    await _likeDailyWorkActionResponse();
+    log.info('Liked daily work: ${dailyToken.tokenID}');
+    await _countDailyLiked();
   }
 
-  Future<void> _likeDailyWorkActionResponse() async {
+  Future<void> _countDailyLiked() async {
     final isNotificationEnabled = OneSignal.Notifications.permission;
     if (!isNotificationEnabled) {
       final likedCount = _configurationService.getDailyLikedCount();
@@ -81,6 +82,6 @@ enum EnableNotificationPromptType {
 
   static EnableNotificationPromptType getRandomType() {
     const values = EnableNotificationPromptType.values;
-    return values[Random().nextInt(values.length)];
+    return values[math.Random().nextInt(values.length)];
   }
 }
diff --git a/lib/util/notification_type.dart b/lib/util/notification_type.dart
@@ -30,7 +30,7 @@ enum NotificationType {
   exhibitionSaleClosing,
   navigate,
   general,
-  daily,
+  dailyArtworkReminders,
   ;
 
   // toString method
@@ -67,8 +67,8 @@ enum NotificationType {
         return 'navigate';
       case NotificationType.general:
         return 'general';
-      case NotificationType.daily:
-        return 'daily';
+      case NotificationType.dailyArtworkReminders:
+        return 'daily_artwork_reminders';
     }
   }
 
@@ -103,8 +103,8 @@ enum NotificationType {
         return NotificationType.exhibitionSaleClosing;
       case 'navigate':
         return NotificationType.navigate;
-      case 'daily':
-        return NotificationType.daily;
+      case 'daily_artwork_reminders':
+        return NotificationType.dailyArtworkReminders;
       default:
         return NotificationType.general;
     }