Merge pull request #121 from akaMrNagar/dev

akaMrNagar · web-flow · commit 81e0f7b25a71 · 2025-05-19T02:29:30.000+05:30
Bug fixes
diff --git a/android/app/src/main/java/com/mindful/android/receivers/alarm/NotificationBatchReceiver.kt b/android/app/src/main/java/com/mindful/android/receivers/alarm/NotificationBatchReceiver.kt
@@ -180,7 +180,6 @@ class NotificationBatchReceiver : BroadcastReceiver() {
                             .setLargeIcon(appIcon)
                             .setContentTitle(appName)
                             .setGroup(packageName)
-                            .setGroupSummary(false)
                             .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_SUMMARY)
                             .setStyle(messagingStyle)
                             .setAutoCancel(true)
diff --git a/android/app/src/main/java/com/mindful/android/services/accessibility/TrackingManager.kt b/android/app/src/main/java/com/mindful/android/services/accessibility/TrackingManager.kt
@@ -25,8 +25,8 @@ class TrackingManager(
     @WorkerThread
     fun onNewEvent(packageName: String) {
         if (lastActiveApp != packageName && packageName != SYSTEM_UI_PACKAGE) {
-            lastActiveApp = packageName
             debouncer.submit {
+                lastActiveApp = packageName
                 broadcastEvent(ACTION_NEW_APP_LAUNCHED)
             }
         }
diff --git a/android/app/src/main/java/com/mindful/android/utils/DateTimeUtils.kt b/android/app/src/main/java/com/mindful/android/utils/DateTimeUtils.kt
@@ -80,21 +80,21 @@ object DateTimeUtils {
      */
     fun todayCalToTod(): Int {
         val calendar = Calendar.getInstance()
-        return calendar.get(Calendar.HOUR_OF_DAY) * 60 + calendar.get(Calendar.MINUTE)
+        return (calendar.get(Calendar.HOUR_OF_DAY) * 60) + calendar.get(Calendar.MINUTE)
     }
 
     /**
      * Calculated the difference between time now and future tod minutes.
      *
-     * @param futureTotalMinutes The total minutes from Time Of Day dart object.
+     * @param futureTod The total minutes from Time Of Day dart object.
      * @return The difference in MS. If the difference is negative then return 0
      */
-    fun todDifferenceFromNow(futureTotalMinutes: Int): Long {
+    fun todDifferenceFromNow(futureTod: Int): Long {
         val now = System.currentTimeMillis()
-        val futureCal = todToTodayCal(futureTotalMinutes)
+        val futureCal = todToTodayCal(futureTod)
 
         // If the future time already passed today, move to tomorrow
-        if (futureCal.timeInMillis <= now) {
+        if (futureTod < todayCalToTod()) {
             futureCal.add(Calendar.DAY_OF_YEAR, 1)
         }
 
@@ -103,7 +103,7 @@ object DateTimeUtils {
     }
 
     /**
-     * Checks if current system time is outside the star and end Time Of Day
+     * Checks if current system time is outside the start and end Time Of Day
      *
      * @param startTod The start TOD in minutes
      * @param endTod   The end TOD in minutes
@@ -117,7 +117,7 @@ object DateTimeUtils {
             // now=3 is between end=2 start=5 then outside
             nowTod in endTod until startTod
         }
-        // Sane day
+        // Same day
         else {
             // now=3 is not between start=2 end=5 then outside
             nowTod !in startTod until endTod
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -455,6 +455,7 @@
     "daily_label": "Daily",
     "search_notifications_sheet_info": "Easily find past notifications by searching through their title or content. Helps you quickly locate important alerts.",
     "search_notifications_hint": "Search notifications...",
+    "search_notifications_empty_list_hint": "No notifications found matching your search.",
     "@----------------------------- APPS DASHBOARD SCREEN -----------------------------": {},
     "app_info_none_warning": "Couldn't find the app for the given package. Returning to the home screen.",
     "emergency_fab_button": "Emergency",
diff --git a/lib/l10n/generated/app_localizations.dart b/lib/l10n/generated/app_localizations.dart
@@ -2121,6 +2121,12 @@ abstract class AppLocalizations {
   /// **'Search notifications...'**
   String get search_notifications_hint;
 
+  /// No description provided for @search_notifications_empty_list_hint.
+  ///
+  /// In en, this message translates to:
+  /// **'No notifications found matching your search.'**
+  String get search_notifications_empty_list_hint;
+
   /// No description provided for @app_info_none_warning.
   ///
   /// In en, this message translates to:
diff --git a/lib/l10n/generated/app_localizations_en.dart b/lib/l10n/generated/app_localizations_en.dart
@@ -1095,6 +1095,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get search_notifications_hint => 'Search notifications...';
 
+  @override
+  String get search_notifications_empty_list_hint => 'No notifications found matching your search.';
+
   @override
   String get app_info_none_warning => 'Couldn\'t find the app for the given package. Returning to the home screen.';
 
diff --git a/lib/l10n/generated/app_localizations_ja.dart b/lib/l10n/generated/app_localizations_ja.dart
@@ -1095,6 +1095,9 @@ class AppLocalizationsJa extends AppLocalizations {
   @override
   String get search_notifications_hint => 'Search notifications...';
 
+  @override
+  String get search_notifications_empty_list_hint => 'No notifications found matching your search.';
+
   @override
   String get app_info_none_warning => 'Couldn\'t find the app for the given package. Returning to the home screen.';
 
diff --git a/lib/l10n/generated/app_localizations_tr.dart b/lib/l10n/generated/app_localizations_tr.dart
@@ -1095,6 +1095,9 @@ class AppLocalizationsTr extends AppLocalizations {
   @override
   String get search_notifications_hint => 'Search notifications...';
 
+  @override
+  String get search_notifications_empty_list_hint => 'No notifications found matching your search.';
+
   @override
   String get app_info_none_warning => 'Verilen paket için uygulama bulunamadı. Ana ekrana dönülüyor.';
 
diff --git a/lib/l10n/generated/app_localizations_zh.dart b/lib/l10n/generated/app_localizations_zh.dart
@@ -1095,6 +1095,9 @@ class AppLocalizationsZh extends AppLocalizations {
   @override
   String get search_notifications_hint => 'Search notifications...';
 
+  @override
+  String get search_notifications_empty_list_hint => 'No notifications found matching your search.';
+
   @override
   String get app_info_none_warning => '无法找到给定包名的应用程序。返回主屏幕。';
 
diff --git a/lib/providers/restrictions/bedtime_provider.dart b/lib/providers/restrictions/bedtime_provider.dart
@@ -11,6 +11,7 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:mindful/core/database/adapters/time_of_day_adapter.dart';
 import 'package:mindful/core/database/app_database.dart';
+import 'package:mindful/core/extensions/ext_date_time.dart';
 import 'package:mindful/core/services/drift_db_service.dart';
 import 'package:mindful/core/services/method_channel_service.dart';
 import 'package:mindful/core/utils/default_models_utils.dart';
@@ -22,6 +23,12 @@ final bedtimeScheduleProvider =
 );
 
 class BedtimeScheduleNotifier extends StateNotifier<BedtimeSchedule> {
+  /// Returns `TRUE` if the time now is between the bedtime schedule otherwise `FALSE`.
+  bool get isBetweenSchedule => DateTime.now().isBetweenTod(
+        state.scheduleStartTime,
+        state.scheduleEndTime,
+      );
+
   BedtimeScheduleNotifier() : super(defaultBedtimeScheduleModel) {
     _init();
   }
diff --git a/lib/ui/screens/home/bedtime/tab_bedtime.dart b/lib/ui/screens/home/bedtime/tab_bedtime.dart
@@ -63,7 +63,11 @@ class TabBedtime extends ConsumerWidget {
             .select((v) => v.isInvincibleModeOn && v.includeBedtimeSchedule)) &&
         !ref.read(parentalControlsProvider.notifier).isBetweenInvincibleWindow;
 
-    if (isInvincibleRestricted && state.isScheduleOn) {
+    /// If time now is between bedtime schedule
+    final isBetweenSchedule =
+        ref.read(bedtimeScheduleProvider.notifier).isBetweenSchedule;
+
+    if (isInvincibleRestricted && state.isScheduleOn && isBetweenSchedule) {
       context.showSnackAlert(context.locale.invincible_mode_snack_alert);
       return;
     }
diff --git a/lib/ui/screens/notifications/notifications_timeline/search_notification_button.dart b/lib/ui/screens/notifications/notifications_timeline/search_notification_button.dart
@@ -14,10 +14,12 @@ import 'package:flutter_animate/flutter_animate.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:mindful/core/extensions/ext_build_context.dart';
 import 'package:mindful/core/extensions/ext_num.dart';
+import 'package:mindful/core/extensions/ext_widget.dart';
 import 'package:mindful/providers/apps/apps_info_provider.dart';
 import 'package:mindful/providers/notifications/searched_notification_provider.dart';
 import 'package:mindful/ui/common/application_icon.dart';
 import 'package:mindful/ui/common/content_section_header.dart';
+import 'package:mindful/ui/common/empty_list_indicator.dart';
 import 'package:mindful/ui/common/search_bar.dart';
 import 'package:mindful/ui/common/sliver_implicitly_animated_list.dart';
 import 'package:mindful/ui/common/sliver_shimmer_list.dart';
@@ -88,25 +90,30 @@ class _SearchNotificationStateSheet
         SliverAnimatedSwitcher(
           duration: 500.ms,
           child: notifications.hasValue && appInfo.hasValue
-              ? SliverImplicitlyAnimatedList(
-                  items: notifications.value!,
-                  keyBuilder: (e) => "${e.packageName}: ${e.timeStamp}",
-                  itemBuilder: (context, i, notification, position) {
-                    return appInfo.value!.containsKey(notification.packageName)
-                        ? NotificationTile(
-                            position: position,
-                            color: Theme.of(context)
-                                .colorScheme
-                                .surfaceContainerHigh,
-                            leading: ApplicationIcon(
-                              appInfo:
-                                  appInfo.value![notification.packageName]!,
-                            ),
-                            notification: notification,
-                          )
-                        : 0.vBox;
-                  },
-                )
+              ? notifications.value!.isEmpty
+                  ? EmptyListIndicator(
+                      info: context.locale.search_notifications_empty_list_hint,
+                    ).sliver
+                  : SliverImplicitlyAnimatedList(
+                      items: notifications.value!,
+                      keyBuilder: (e) => "${e.packageName}: ${e.timeStamp}",
+                      itemBuilder: (context, i, notification, position) {
+                        return appInfo.value!
+                                .containsKey(notification.packageName)
+                            ? NotificationTile(
+                                position: position,
+                                color: Theme.of(context)
+                                    .colorScheme
+                                    .surfaceContainerHigh,
+                                leading: ApplicationIcon(
+                                  appInfo:
+                                      appInfo.value![notification.packageName]!,
+                                ),
+                                notification: notification,
+                              )
+                            : 0.vBox;
+                      },
+                    )
               : const SliverShimmerList(
                   includeLeading: true,
                   includeSubtitle: true,
diff --git a/lib/ui/screens/restriction_groups/restriction_group_card.dart b/lib/ui/screens/restriction_groups/restriction_group_card.dart
@@ -16,6 +16,7 @@ import 'package:mindful/ui/common/rounded_container.dart';
 import 'package:mindful/ui/common/styled_text.dart';
 import 'package:mindful/ui/common/time_text_short.dart';
 import 'package:mindful/ui/screens/restriction_groups/create_update_group_screen.dart';
+import 'package:skeletonizer/skeletonizer.dart';
 
 class RestrictionGroupCard extends ConsumerWidget {
   const RestrictionGroupCard({
@@ -30,17 +31,17 @@ class RestrictionGroupCard extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final groupedAppsInfo = ref
-            .watch(appsInfoProvider.select((v) => v.value?.values
-                .where((e) => group.distractingApps.contains(e.packageName))))
-            ?.toList() ??
-        [];
-
-    final installedDistractingApps = groupedAppsInfo.map((e) => e.packageName);
+        .watch(appsInfoProvider.select((v) => v.value?.values
+            .where((e) => group.distractingApps.contains(e.packageName))))
+        ?.toList();
+    final installedDistractingApps = groupedAppsInfo?.map((e) => e.packageName);
 
     final timeSpent = ref.watch(
           todaysAppsUsageProvider.select(
             (v) => v.value?.entries
-                .where((e) => installedDistractingApps.contains(e.key))
+                .where(
+                  (e) => installedDistractingApps?.contains(e.key) ?? false,
+                )
                 .fold<int>(
                   0,
                   (t, e) => (t + e.value.screenTime),
@@ -155,22 +156,29 @@ class RestrictionGroupCard extends ConsumerWidget {
             child: Container(
               height: 40,
               color: Theme.of(context).colorScheme.surfaceContainerHigh,
-              child: ListView.builder(
-                padding: const EdgeInsets.symmetric(horizontal: 6),
-                physics: const BouncingScrollPhysics(),
-                scrollDirection: Axis.horizontal,
-                itemCount: groupedAppsInfo.length,
-                itemBuilder: (context, index) {
-                  final app = groupedAppsInfo[index];
-
-                  return Padding(
-                    padding: const EdgeInsets.only(right: 4),
-                    child: ApplicationIcon(
-                      appInfo: app,
-                      size: 14,
-                    ),
-                  );
-                },
+              child: Skeletonizer.zone(
+                enableSwitchAnimation: true,
+                enabled: groupedAppsInfo == null,
+                child: ListView.builder(
+                  padding: const EdgeInsets.symmetric(horizontal: 6),
+                  physics: const BouncingScrollPhysics(),
+                  scrollDirection: Axis.horizontal,
+                  itemCount:
+                      groupedAppsInfo?.length ?? group.distractingApps.length,
+                  itemBuilder: (context, index) {
+                    final appInfo = groupedAppsInfo?.elementAtOrNull(index);
+
+                    return Padding(
+                      padding: const EdgeInsets.only(right: 4),
+                      child: appInfo == null
+                          ? const Bone.icon(size: 28)
+                          : ApplicationIcon(
+                              appInfo: appInfo,
+                              size: 14,
+                            ),
+                    );
+                  },
+                ),
               ),
             ),
           ),
diff --git a/lib/ui/screens/restriction_groups/restriction_groups_screen.dart b/lib/ui/screens/restriction_groups/restriction_groups_screen.dart
@@ -10,6 +10,7 @@
 
 import 'package:fluentui_system_icons/fluentui_system_icons.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_animate/flutter_animate.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:mindful/core/extensions/ext_build_context.dart';
 import 'package:mindful/core/extensions/ext_num.dart';
@@ -23,6 +24,7 @@ import 'package:mindful/ui/common/styled_text.dart';
 import 'package:mindful/ui/screens/restriction_groups/create_update_group_screen.dart';
 import 'package:mindful/ui/screens/restriction_groups/restriction_group_card.dart';
 import 'package:mindful/ui/screens/restriction_groups/sample_restriction_group.dart';
+import 'package:sliver_tools/sliver_tools.dart';
 
 class RestrictionGroupsScreen extends ConsumerWidget {
   const RestrictionGroupsScreen({super.key});
@@ -56,15 +58,18 @@ class RestrictionGroupsScreen extends ConsumerWidget {
 
               16.vSliverBox,
 
-              groups.isEmpty
-                  ? const SampleRestrictionGroup().sliver
-                  : SliverList.builder(
-                      itemCount: groups.length,
-                      itemBuilder: (context, index) => RestrictionGroupCard(
-                        group: groups[index],
-                        position: getItemPositionInList(index, groups.length),
+              SliverAnimatedSwitcher(
+                duration: 250.ms,
+                child: groups.isEmpty
+                    ? const SampleRestrictionGroup().sliver
+                    : SliverList.builder(
+                        itemCount: groups.length,
+                        itemBuilder: (context, index) => RestrictionGroupCard(
+                          group: groups[index],
+                          position: getItemPositionInList(index, groups.length),
+                        ),
                       ),
-                    ),
+              ),
 
               const SliverTabsBottomPadding(),
             ],

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ class TrackingManager(`
`25`	`25`	`@WorkerThread`
`26`	`26`	`fun onNewEvent(packageName: String) {`
`27`	`27`	`if (lastActiveApp != packageName && packageName != SYSTEM_UI_PACKAGE) {`
`28`		`- lastActiveApp = packageName`
`29`	`28`	`debouncer.submit {`
	`29`	`+ lastActiveApp = packageName`
`30`	`30`	`broadcastEvent(ACTION_NEW_APP_LAUNCHED)`
`31`	`31`	`}`
`32`	`32`	`}`