@umituz/react-native-notifications 1.5.10 → 1.5.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umituz/react-native-notifications",
-  "version": "1.5.10",
+  "version": "1.5.12",
   "description": "Offline-first local notifications system for React Native apps using expo-notifications",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/domains/reminders/infrastructure/hooks/useReminderActions.ts

@@ -6,55 +6,19 @@
 import { useCallback } from 'react';
 import { useRemindersStore } from '../storage/RemindersStore';
 import { NotificationScheduler } from '../../../../infrastructure/services/NotificationScheduler';
-import type { Reminder, CreateReminderInput, UpdateReminderInput, NotificationTrigger } from '../../../../infrastructure/services/types';
+import { generateReminderId } from '../../../../infrastructure/utils/idGenerator';
+import { buildTrigger } from '../../../../infrastructure/utils/triggerBuilder';
+import type { Reminder, CreateReminderInput, UpdateReminderInput } from '../../../../infrastructure/services/types';
 
 const scheduler = new NotificationScheduler();
 
-const generateId = (): string => {
-  return `reminder_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
-};
-
-const buildTrigger = (reminder: Reminder): NotificationTrigger => {
-  switch (reminder.frequency) {
-    case 'once':
-      const date = new Date();
-      date.setHours(reminder.hour, reminder.minute, 0, 0);
-      if (date <= new Date()) {
-        date.setDate(date.getDate() + 1);
-      }
-      return { type: 'date', date };
-
-    case 'daily':
-      return { type: 'daily', hour: reminder.hour, minute: reminder.minute };
-
-    case 'weekly':
-      return {
-        type: 'weekly',
-        weekday: reminder.weekday || 2,
-        hour: reminder.hour,
-        minute: reminder.minute,
-      };
-
-    case 'monthly':
-      return {
-        type: 'monthly',
-        day: reminder.dayOfMonth || 1,
-        hour: reminder.hour,
-        minute: reminder.minute,
-      };
-
-    default:
-      return { type: 'daily', hour: reminder.hour, minute: reminder.minute };
-  }
-};
-
 export const useReminderActions = () => {
   const { addReminder, updateReminder, deleteReminder, toggleReminder } = useRemindersStore();
 
   const createReminder = useCallback(async (input: CreateReminderInput): Promise<Reminder> => {
     const now = new Date().toISOString();
     const reminder: Reminder = {
-      id: generateId(),
+      id: generateReminderId(),
       ...input,
       enabled: true,
       createdAt: now,

package/src/domains/reminders/infrastructure/storage/RemindersStore.ts

@@ -4,37 +4,83 @@
  */
 
 import { createStore } from '@umituz/react-native-storage';
-import AsyncStorage from '@react-native-async-storage/async-storage';
 import type { Reminder, QuietHoursConfig, NotificationPreferences } from '../../../../infrastructure/services/types';
 
-const STORAGE_KEYS = {
-  REMINDERS: '@notifications:reminders',
-  PREFERENCES: '@notifications:preferences',
-  QUIET_HOURS: '@notifications:quiet_hours',
-} as const;
-
 // ============================================================================
-// STORE INTERFACE
+// REMINDERS STORE
 // ============================================================================
 
 interface RemindersState {
   reminders: Reminder[];
+}
+
+interface RemindersActions {
+  addReminder: (reminder: Reminder) => void;
+  updateReminder: (id: string, updates: Partial<Reminder>) => void;
+  deleteReminder: (id: string) => void;
+  toggleReminder: (id: string) => void;
+  resetReminders: () => void;
+}
+
+const DEFAULT_REMINDERS_STATE: RemindersState = {
+  reminders: [],
+};
+
+export const useRemindersStore = createStore<RemindersState, RemindersActions>({
+  name: 'reminders-store',
+  initialState: DEFAULT_REMINDERS_STATE,
+  persist: true,
+  actions: (set, get) => ({
+    addReminder: (reminder: Reminder) => {
+      const { reminders } = get();
+      set({ reminders: [...reminders, reminder] });
+    },
+
+    updateReminder: (id: string, updates: Partial<Reminder>) => {
+      const { reminders } = get();
+      set({
+        reminders: reminders.map(r =>
+          r.id === id ? { ...r, ...updates, updatedAt: new Date().toISOString() } : r
+        ),
+      });
+    },
+
+    deleteReminder: (id: string) => {
+      const { reminders } = get();
+      set({ reminders: reminders.filter(r => r.id !== id) });
+    },
+
+    toggleReminder: (id: string) => {
+      const { reminders } = get();
+      set({
+        reminders: reminders.map(r =>
+          r.id === id ? { ...r, enabled: !r.enabled, updatedAt: new Date().toISOString() } : r
+        ),
+      });
+    },
+
+    resetReminders: () => {
+      set({ reminders: [] });
+    },
+  }),
+});
+
+// ============================================================================
+// PREFERENCES STORE
+// ============================================================================
+
+interface PreferencesState {
   preferences: NotificationPreferences;
   isLoading: boolean;
   isInitialized: boolean;
 }
 
-interface RemindersActions {
+interface PreferencesActions {
   initialize: () => Promise<void>;
-  loadReminders: () => Promise<void>;
-  addReminder: (reminder: Reminder) => Promise<void>;
-  updateReminder: (id: string, updates: Partial<Reminder>) => Promise<void>;
-  deleteReminder: (id: string) => Promise<void>;
-  toggleReminder: (id: string) => Promise<void>;
   loadPreferences: () => Promise<void>;
-  updatePreferences: (updates: Partial<NotificationPreferences>) => Promise<void>;
-  updateQuietHours: (quietHours: QuietHoursConfig) => Promise<void>;
-  reset: () => Promise<void>;
+  updatePreferences: (updates: Partial<NotificationPreferences>) => void;
+  updateQuietHours: (quietHours: QuietHoursConfig) => void;
+  reset: () => void;
 }
 
 // ============================================================================
@@ -54,124 +100,63 @@ const DEFAULT_PREFERENCES: NotificationPreferences = {
   },
 };
 
-const initialRemindersState: RemindersState = {
-  reminders: [],
+const initialPreferencesState: PreferencesState = {
   preferences: DEFAULT_PREFERENCES,
   isLoading: true,
   isInitialized: false,
 };
 
-// ============================================================================
-// STORE IMPLEMENTATION
-// ============================================================================
-
-export const useRemindersStore = createStore<RemindersState, RemindersActions>({
-  name: 'reminders-store',
-  initialState: initialRemindersState,
-  persist: false, // Manual persistence via AsyncStorage
+export const usePreferencesStore = createStore<PreferencesState, PreferencesActions>({
+  name: 'preferences-store',
+  initialState: initialPreferencesState,
+  persist: true,
   actions: (set, get) => ({
     initialize: async () => {
-      try {
-        const [remindersData, preferencesData] = await Promise.all([
-          AsyncStorage.getItem(STORAGE_KEYS.REMINDERS),
-          AsyncStorage.getItem(STORAGE_KEYS.PREFERENCES)
-        ]);
-
-        const reminders = remindersData ? JSON.parse(remindersData) : [];
-        let preferences = DEFAULT_PREFERENCES;
-
-        if (preferencesData) {
-          const parsed = JSON.parse(preferencesData);
-          preferences = { ...DEFAULT_PREFERENCES, ...parsed };
-        }
-
-        set({ reminders, preferences, isLoading: false, isInitialized: true });
-      } catch {
-        set({ reminders: [], preferences: DEFAULT_PREFERENCES, isLoading: false, isInitialized: true });
-      }
-    },
-
-    loadReminders: async () => {
-      try {
-        const data = await AsyncStorage.getItem(STORAGE_KEYS.REMINDERS);
-        const reminders = data ? JSON.parse(data) : [];
-        set({ reminders });
-      } catch {
-        set({ reminders: [] });
-      }
-    },
-
-    addReminder: async (reminder: Reminder) => {
-      const { reminders } = get();
-      const updated = [...reminders, reminder];
-      set({ reminders: updated });
-      await AsyncStorage.setItem(STORAGE_KEYS.REMINDERS, JSON.stringify(updated));
-    },
-
-    updateReminder: async (id: string, updates: Partial<Reminder>) => {
-      const { reminders } = get();
-      const updated = reminders.map(r =>
-        r.id === id ? { ...r, ...updates, updatedAt: new Date().toISOString() } : r
-      );
-      set({ reminders: updated });
-      await AsyncStorage.setItem(STORAGE_KEYS.REMINDERS, JSON.stringify(updated));
-    },
-
-    deleteReminder: async (id: string) => {
-      const { reminders } = get();
-      const updated = reminders.filter(r => r.id !== id);
-      set({ reminders: updated });
-      await AsyncStorage.setItem(STORAGE_KEYS.REMINDERS, JSON.stringify(updated));
-    },
-
-    toggleReminder: async (id: string) => {
-      const { reminders } = get();
-      const updated = reminders.map(r =>
-        r.id === id ? { ...r, enabled: !r.enabled, updatedAt: new Date().toISOString() } : r
-      );
-      set({ reminders: updated });
-      await AsyncStorage.setItem(STORAGE_KEYS.REMINDERS, JSON.stringify(updated));
+      set({ isLoading: false, isInitialized: true });
     },
 
     loadPreferences: async () => {
-      try {
-        const data = await AsyncStorage.getItem(STORAGE_KEYS.PREFERENCES);
-        const preferences = data ? { ...DEFAULT_PREFERENCES, ...JSON.parse(data) } : DEFAULT_PREFERENCES;
-        set({ preferences });
-      } catch {
-        set({ preferences: DEFAULT_PREFERENCES });
-      }
+      // Data loaded automatically by persist
     },
 
-    updatePreferences: async (updates: Partial<NotificationPreferences>) => {
+    updatePreferences: (updates: Partial<NotificationPreferences>) => {
       const { preferences } = get();
-      const updated = { ...preferences, ...updates };
-      set({ preferences: updated });
-      await AsyncStorage.setItem(STORAGE_KEYS.PREFERENCES, JSON.stringify(updated));
+      set({ preferences: { ...preferences, ...updates } });
     },
 
-    updateQuietHours: async (quietHours: QuietHoursConfig) => {
+    updateQuietHours: (quietHours: QuietHoursConfig) => {
       const { preferences } = get();
-      const updated = { ...preferences, quietHours };
-      set({ preferences: updated });
-      await AsyncStorage.setItem(STORAGE_KEYS.PREFERENCES, JSON.stringify(updated));
+      set({ preferences: { ...preferences, quietHours } });
     },
 
-    reset: async () => {
-      set({ reminders: [], preferences: DEFAULT_PREFERENCES });
-      await AsyncStorage.multiRemove([STORAGE_KEYS.REMINDERS, STORAGE_KEYS.PREFERENCES]);
+    reset: () => {
+      set({ preferences: DEFAULT_PREFERENCES });
     },
   }),
 });
 
 // ============================================================================
-// SELECTOR HOOKS
+// SELECTOR HOOKS - REMINDERS
 // ============================================================================
 
 export const useReminders = () => useRemindersStore(state => state.reminders);
 export const useEnabledReminders = () => useRemindersStore(state => state.reminders.filter(r => r.enabled));
 export const useReminderById = (id: string) => useRemindersStore(state => state.reminders.find(r => r.id === id));
-export const useNotificationPreferences = () => useRemindersStore(state => state.preferences);
-export const useQuietHours = () => useRemindersStore(state => state.preferences.quietHours);
-export const useRemindersLoading = () => useRemindersStore(state => state.isLoading);
-export const useRemindersInitialized = () => useRemindersStore(state => state.isInitialized);
+
+// ============================================================================
+// SELECTOR HOOKS - PREFERENCES
+// ============================================================================
+
+export const useNotificationPreferences = () => usePreferencesStore(state => state.preferences);
+export const useQuietHours = () => usePreferencesStore(state => state.preferences.quietHours);
+export const useRemindersLoading = () => usePreferencesStore(state => state.isLoading);
+export const useRemindersInitialized = () => usePreferencesStore(state => state.isInitialized);
+
+// ============================================================================
+// LEGACY EXPORTS - DEPRECATED
+// ============================================================================
+
+/**
+ * @deprecated Use specific store hooks instead
+ */
+export const useRemindersStoreLegacy = useRemindersStore;

package/src/domains/reminders/presentation/screens/ReminderListScreen.tsx

@@ -30,13 +30,8 @@ export const ReminderListScreen: React.FC<ReminderListScreenProps> = ({
 
   const reminders = useReminders();
   const isLoading = useRemindersLoading();
-  const { loadReminders } = useRemindersStore();
   const { toggleReminderEnabled, removeReminder } = useReminderActions();
 
-  useEffect(() => {
-    loadReminders();
-  }, [loadReminders]);
-
   const handleToggle = useCallback(async (id: string) => {
     await toggleReminderEnabled(id);
   }, [toggleReminderEnabled]);

package/src/index.ts

@@ -58,6 +58,7 @@ export { NotificationManager } from './infrastructure/services/NotificationManag
 export { useNotificationsStore, useNotifications } from './infrastructure/storage/NotificationsStore';
 export {
   useRemindersStore,
+  usePreferencesStore,
   useReminders,
   useEnabledReminders,
   useReminderById,
@@ -117,5 +118,22 @@ export type { FormButtonProps } from './domains/reminders/presentation/component
 export { QuietHoursCard } from './domains/quietHours/presentation/components/QuietHoursCard';
 export type { QuietHoursCardProps } from './domains/quietHours/presentation/components/QuietHoursCard';
 
+export { RemindersNavRow } from './presentation/components/RemindersNavRow';
+export type { RemindersNavRowProps } from './presentation/components/RemindersNavRow';
+
 export { SettingRow } from './presentation/components/SettingRow';
 export type { SettingRowProps } from './presentation/components/SettingRow';
+
+// ============================================================================
+// UTILS
+// ============================================================================
+
+export { generateId, generateReminderId } from './infrastructure/utils/idGenerator';
+export { buildTrigger } from './infrastructure/utils/triggerBuilder';
+
+// ============================================================================
+// HOOKS - UTILS
+// ============================================================================
+
+export { useTimePicker } from './presentation/hooks/useTimePicker';
+export type { PickerMode, UseTimePickerParams, TimePickerHandlers } from './presentation/hooks/useTimePicker';

package/src/infrastructure/hooks/useNotificationSettings.ts

@@ -1,45 +1,41 @@
-import { useState, useEffect } from 'react';
-import AsyncStorage from '@react-native-async-storage/async-storage';
-
-const STORAGE_KEY = 'notifications_enabled';
-
 /**
  * Simple notification settings hook
- * Manages a single toggle for enabling/disabling notifications
+ * @deprecated Use usePreferencesStore and useNotificationPreferences instead
  */
-export const useNotificationSettings = () => {
-  const [notificationsEnabled, setNotificationsEnabled] = useState(true);
-  const [isLoading, setIsLoading] = useState(true);
 
-  useEffect(() => {
-    const loadSettings = async () => {
-      try {
-        const value = await AsyncStorage.getItem(STORAGE_KEY);
-        if (value !== null) {
-          setNotificationsEnabled(value === 'true');
-        }
-      } catch (error) {
-        // Silent failure - use default value
-      } finally {
-        setIsLoading(false);
-      }
-    };
+import { createStore } from '@umituz/react-native-storage';
 
-    loadSettings();
-  }, []);
+interface NotificationSettingsState {
+  notificationsEnabled: boolean;
+  isLoading: boolean;
+}
 
-  const toggleNotifications = async (value: boolean) => {
-    setNotificationsEnabled(value);
-    try {
-      await AsyncStorage.setItem(STORAGE_KEY, value.toString());
-    } catch (error) {
-      // Silent failure
-    }
-  };
+interface NotificationSettingsActions {
+  setNotificationsEnabled: (value: boolean) => void;
+}
+
+const useNotificationSettingsStore = createStore<NotificationSettingsState, NotificationSettingsActions>({
+  name: 'notification-settings-store',
+  initialState: {
+    notificationsEnabled: true,
+    isLoading: true,
+  },
+  persist: true,
+  actions: (set) => ({
+    setNotificationsEnabled: (value: boolean) => set({ notificationsEnabled: value }),
+  }),
+});
+
+/**
+ * @deprecated Use usePreferencesStore and useNotificationPreferences from RemindersStore instead
+ */
+export const useNotificationSettings = () => {
+  const store = useNotificationSettingsStore();
+  const { notificationsEnabled, isLoading, setNotificationsEnabled } = store;
 
   return {
     notificationsEnabled,
-    setNotificationsEnabled: toggleNotifications,
+    setNotificationsEnabled,
     isLoading,
   };
 };

package/src/infrastructure/services/NotificationManager.ts

@@ -12,32 +12,7 @@ import { NotificationPermissions } from './NotificationPermissions';
 import { NotificationScheduler } from './NotificationScheduler';
 import { NotificationBadgeManager } from './NotificationBadgeManager';
 import { devLog, devError } from '../utils/dev';
-
-export type NotificationTrigger =
-  | { type: 'date'; date: Date }
-  | { type: 'daily'; hour: number; minute: number }
-  | { type: 'weekly'; weekday: number; hour: number; minute: number }
-  | { type: 'monthly'; day: number; hour: number; minute: number };
-
-export interface ScheduleNotificationOptions {
-  title: string;
-  body: string;
-  data?: Record<string, any>;
-  trigger: NotificationTrigger;
-  sound?: boolean | string;
-  badge?: number;
-  categoryIdentifier?: string;
-}
-
-export interface ScheduledNotification {
-  identifier: string;
-  content: {
-    title: string;
-    body: string;
-    data: Record<string, any>;
-  };
-  trigger: any;
-}
+import type { NotificationTrigger, ScheduleNotificationOptions, ScheduledNotification } from './types';
 
 export class NotificationManager {
   private permissions: NotificationPermissions;

package/src/infrastructure/services/NotificationScheduler.ts

@@ -1,5 +1,5 @@
 import * as Notifications from 'expo-notifications';
-import type { NotificationTrigger, ScheduleNotificationOptions, ScheduledNotification } from './NotificationManager';
+import type { NotificationTrigger, ScheduleNotificationOptions, ScheduledNotification } from './types';
 
 export class NotificationScheduler {
   async scheduleNotification(options: ScheduleNotificationOptions): Promise<string> {

package/src/infrastructure/services/types.ts

@@ -3,6 +3,8 @@
  * Uses expo-notifications for local device notifications
  */
 
+import * as Notifications from 'expo-notifications';
+
 // ============================================================================
 // NOTIFICATION CHANNEL TYPES
 // ============================================================================
@@ -44,7 +46,7 @@ export interface ScheduledNotification {
     body: string;
     data: Record<string, unknown>;
   };
-  trigger: unknown;
+  trigger: Notifications.NotificationTrigger;
 }
 
 // ============================================================================

package/src/infrastructure/utils/idGenerator.ts

@@ -0,0 +1,14 @@
+/**
+ * ID Generator Utility
+ * Generates unique IDs for entities
+ */
+
+export const generateId = (prefix: string = 'id'): string => {
+  const timestamp = Date.now();
+  const random = Math.random().toString(36).substring(2, 11);
+  return `${prefix}_${timestamp}_${random}`;
+};
+
+export const generateReminderId = (): string => {
+  return generateId('reminder');
+};

package/src/infrastructure/utils/triggerBuilder.ts

@@ -0,0 +1,45 @@
+/**
+ * Trigger Builder Utility
+ * Builds notification triggers from reminder data
+ */
+
+import type { NotificationTrigger, Reminder } from '../services/types';
+
+export const buildTrigger = (reminder: Reminder): NotificationTrigger => {
+  const { frequency, hour, minute, weekday, dayOfMonth } = reminder;
+
+  switch (frequency) {
+    case 'once': {
+      const date = new Date();
+      date.setHours(hour, minute, 0, 0);
+
+      if (date <= new Date()) {
+        date.setDate(date.getDate() + 1);
+      }
+
+      return { type: 'date', date };
+    }
+
+    case 'daily':
+      return { type: 'daily', hour, minute };
+
+    case 'weekly':
+      return {
+        type: 'weekly',
+        weekday: weekday || 1,
+        hour,
+        minute,
+      };
+
+    case 'monthly':
+      return {
+        type: 'monthly',
+        day: dayOfMonth || 1,
+        hour,
+        minute,
+      };
+
+    default:
+      return { type: 'daily', hour, minute };
+  }
+};

package/src/presentation/hooks/useNotificationSettingsUI.ts

@@ -4,13 +4,14 @@
  */
 
 import { useEffect, useCallback } from 'react';
-import { useNotificationPreferences, useQuietHours, useRemindersStore } from '../../domains/reminders/infrastructure/storage/RemindersStore';
+import { useNotificationPreferences, useQuietHours, usePreferencesStore, useRemindersLoading } from '../../domains/reminders/infrastructure/storage/RemindersStore';
 import { notificationService } from '../../infrastructure/services/NotificationService';
 
 export const useNotificationSettingsUI = () => {
     const preferences = useNotificationPreferences();
     const quietHours = useQuietHours();
-    const { initialize, updatePreferences, updateQuietHours, isLoading } = useRemindersStore();
+    const { initialize, updatePreferences, updateQuietHours } = usePreferencesStore();
+    const isLoading = useRemindersLoading();
 
     useEffect(() => {
         initialize();