@umituz/react-native-settings 5.4.9 → 5.4.11

package/src/domains/notifications/infrastructure/services/NotificationService.ts

@@ -1,14 +1,15 @@
 /**
- * NotificationService
+ * Notification Service
  *
  * Simple facade for offline notification system.
  * Works in ALL apps - offline, online, hybrid - no backend required.
+ * Refactored to extend BaseService.
  *
  * @module NotificationService
  */
 
 import { NotificationManager } from './NotificationManager';
-import { isDev } from '../../../../utils/devUtils';
+import { BaseService } from '../../../../core/base/BaseService';
 
 export * from './types';
 
@@ -16,26 +17,22 @@ export * from './types';
  * Notification service singleton
  * Provides simple access to notification manager
  */
-export class NotificationService {
+export class NotificationService extends BaseService {
+  protected serviceName = 'NotificationService';
   private static instance: NotificationService | null = null;
   private isConfigured = false;
 
   readonly notifications = new NotificationManager();
 
   private constructor() {
+    super();
     // Configuration deferred to first use
   }
 
   private ensureConfigured() {
     if (!this.isConfigured) {
-      try {
-        NotificationManager.configure();
-        this.isConfigured = true;
-      } catch (error) {
-        if (isDev()) {
-          console.error('[NotificationService] Failed to configure NotificationManager:', error);
-        }
-      }
+      NotificationManager.configure();
+      this.isConfigured = true;
     }
   }
 
@@ -51,7 +48,10 @@ export class NotificationService {
    */
   async requestPermissions(): Promise<boolean> {
     this.ensureConfigured();
-    return await this.notifications.requestPermissions();
+    const result = await this.execute('requestPermissions', async () => {
+      return await this.notifications.requestPermissions();
+    });
+    return result.success ? result.data : false;
   }
 
   /**
@@ -59,7 +59,10 @@ export class NotificationService {
    */
   async hasPermissions(): Promise<boolean> {
     this.ensureConfigured();
-    return await this.notifications.hasPermissions();
+    const result = await this.execute('hasPermissions', async () => {
+      return await this.notifications.hasPermissions();
+    });
+    return result.success ? result.data : false;
   }
 }
 

package/src/domains/rating/application/services/RatingService.ts

@@ -1,10 +1,14 @@
 /**
  * Rating Service
- * Core business logic for app rating system
+ *
+ * Core business logic for app rating system.
+ * Refactored to extend BaseService for consistent error handling.
+ *
+ * @module RatingService
  */
 
 import type { RatingConfig, RatingState } from "../../domain/entities/RatingConfig";
-import { isDev } from "../../../../utils/devUtils";
+import { BaseService } from "../../../../core/base/BaseService";
 import {
   getEventCount,
   incrementEventCount,
@@ -35,112 +39,144 @@ function toISOString(date: Date = new Date()): string {
 }
 
 /**
- * Track an event occurrence
+ * Rating Service Class
  */
-export async function trackEvent(eventType: string): Promise<void> {
-  try {
-    await incrementEventCount(eventType);
-  } catch (error) {
-    if (isDev()) {
-      console.error('[RatingService] Failed to track event:', eventType, error);
-    }
+export class RatingService extends BaseService {
+  protected serviceName = "RatingService";
+
+  /**
+   * Track an event occurrence
+   */
+  async trackEvent(eventType: string): Promise<void> {
+    await this.execute("trackEvent", async () => {
+      await incrementEventCount(eventType);
+    });
   }
-}
 
-/**
- * Check if prompt should be shown based on criteria
- */
-export async function shouldShowPrompt(config: RatingConfig): Promise<boolean> {
-  try {
-    const hasRated = await getHasRated();
-    if (hasRated) {
-      return false;
-    }
+  /**
+   * Check if prompt should be shown based on criteria
+   */
+  async shouldShowPrompt(config: RatingConfig): Promise<boolean> {
+    const result = await this.execute("shouldShowPrompt", async () => {
+      const hasRated = await getHasRated();
+      if (hasRated) return false;
 
-    const dismissed = await getDismissed();
-    if (dismissed) {
-      return false;
-    }
+      const dismissed = await getDismissed();
+      if (dismissed) return false;
 
-    const eventCount = await getEventCount(config.eventType);
-    const minCount = config.minEventCount ?? 3;
+      const eventCount = await getEventCount(config.eventType);
+      const minCount = config.minEventCount ?? 3;
 
-    if (eventCount < minCount) {
-      return false;
-    }
+      if (eventCount < minCount) return false;
 
-    const lastPromptDate = await getLastPromptDate(config.eventType);
+      const lastPromptDate = await getLastPromptDate(config.eventType);
 
-    if (lastPromptDate) {
-      const cooldownDays = config.cooldownDays ?? 90;
-      const daysSinceLastPrompt = daysBetween(lastPromptDate, new Date());
+      if (lastPromptDate) {
+        const cooldownDays = config.cooldownDays ?? 90;
+        const daysSinceLastPrompt = daysBetween(lastPromptDate, new Date());
 
-      if (daysSinceLastPrompt < cooldownDays) {
-        return false;
+        if (daysSinceLastPrompt < cooldownDays) {
+          return false;
+        }
       }
-    }
 
-    return true;
-  } catch (error) {
-    return false;
+      return true;
+    });
+
+    return result.success ? result.data : false;
+  }
+
+  /**
+   * Mark that prompt was shown to user
+   */
+  async markPromptShown(eventType: string): Promise<void> {
+    await this.execute("markPromptShown", async () => {
+      await setLastPromptDate(eventType, toISOString());
+    });
+  }
+
+  /**
+   * Mark that user has rated the app
+   */
+  async markRated(): Promise<void> {
+    await this.execute("markRated", async () => {
+      await setHasRated(true);
+    });
+  }
+
+  /**
+   * Mark that user permanently dismissed the prompt
+   */
+  async markDismissed(): Promise<void> {
+    await this.execute("markDismissed", async () => {
+      await setDismissed(true);
+    });
+  }
+
+  /**
+   * Get current rating state for event type
+   */
+  async getState(eventType: string): Promise<RatingState> {
+    return getRatingState(eventType);
+  }
+
+  /**
+   * Reset rating data (for testing or specific event type)
+   */
+  async reset(eventType?: string): Promise<void> {
+    await this.execute("reset", async () => {
+      await resetStorage(eventType);
+    });
   }
 }
 
 /**
- * Mark that prompt was shown to user
+ * Singleton instance
  */
-export async function markPromptShown(eventType: string): Promise<void> {
-  try {
-    await setLastPromptDate(eventType, toISOString());
-  } catch (error) {
-    if (isDev()) {
-      console.error('[RatingService] Failed to mark prompt shown:', eventType, error);
-    }
-  }
-}
+let ratingServiceInstance: RatingService | null = null;
 
 /**
- * Mark that user has rated the app
+ * Get rating service singleton instance
  */
-export async function markRated(): Promise<void> {
-  try {
-    await setHasRated(true);
-  } catch (error) {
-    if (isDev()) {
-      console.error('[RatingService] Failed to mark as rated:', error);
-    }
+export function getRatingService(): RatingService {
+  if (!ratingServiceInstance) {
+    ratingServiceInstance = new RatingService();
   }
+  return ratingServiceInstance;
 }
 
 /**
- * Mark that user permanently dismissed the prompt
+ * Default export for backward compatibility
  */
-export async function markDismissed(): Promise<void> {
-  try {
-    await setDismissed(true);
-  } catch (error) {
-    if (isDev()) {
-      console.error('[RatingService] Failed to mark as dismissed:', error);
-    }
-  }
-}
+export const ratingService = getRatingService();
 
 /**
- * Get current rating state for event type
+ * Static convenience functions that delegate to singleton
  */
+export async function trackEvent(eventType: string): Promise<void> {
+  await ratingService.trackEvent(eventType);
+}
+
+export async function shouldShowPrompt(config: RatingConfig): Promise<boolean> {
+  return await ratingService.shouldShowPrompt(config);
+}
+
+export async function markPromptShown(eventType: string): Promise<void> {
+  await ratingService.markPromptShown(eventType);
+}
+
+export async function markRated(): Promise<void> {
+  await ratingService.markRated();
+}
+
+export async function markDismissed(): Promise<void> {
+  await ratingService.markDismissed();
+}
+
 export async function getState(eventType: string): Promise<RatingState> {
-  return getRatingState(eventType);
+  return await ratingService.getState(eventType);
 }
 
-/**
- * Reset rating data (for testing or specific event type)
- */
 export async function reset(eventType?: string): Promise<void> {
-  try {
-    await resetStorage(eventType);
-  } catch (error) {
-    if (isDev()) {
-      console.error('[RatingService] Failed to reset:', eventType, error);
-    }
-  }
+  await ratingService.reset(eventType);
 }

package/src/domains/rating/index.ts

@@ -34,11 +34,11 @@ export { StarRating } from './presentation/components/StarRating';
 export type { StarRatingProps } from './presentation/components/StarRating';
 
 // =============================================================================
-// PRESENTATION LAYER - Components (App Store Rating)
+// PRESENTATION LAYER - Screens
 // =============================================================================
 
-export { RatingPromptModal } from './presentation/components/RatingPromptModal';
-export type { RatingPromptModalProps } from './presentation/components/RatingPromptModal';
+export { RatingPromptScreen } from './presentation/screens/RatingPromptScreen';
+export type { RatingPromptScreenProps, RatingPromptScreenParams } from './presentation/screens/RatingPromptScreen';
 
 // =============================================================================
 // PRESENTATION LAYER - Hooks (App Store Rating)

package/src/domains/rating/presentation/hooks/useAppRating.tsx

@@ -4,7 +4,7 @@
  * Lazy loads expo-store-review to reduce bundle size
  */
 
-import React, { useState, useCallback, useMemo } from "react";
+import React, { useCallback, useMemo } from "react";
 import type {
   RatingConfig,
   UseAppRatingResult,
@@ -12,14 +12,14 @@ import type {
 } from "../../domain/entities/RatingConfig";
 import { DEFAULT_RATING_CONFIG } from "../../domain/entities/RatingConfig";
 import * as RatingService from "../../application/services/RatingService";
-import { RatingPromptModal } from "../components/RatingPromptModal";
+import { useAppNavigation } from "@umituz/react-native-design-system/molecules";
 import { isDev } from "../../../../utils/devUtils";
 
 /**
- * App rating hook with 2-step prompt flow
+ * App rating hook with navigation-based prompt flow
  */
 export function useAppRating(config: RatingConfig): UseAppRatingResult {
-  const [isVisible, setIsVisible] = useState(false);
+  const navigation = useAppNavigation();
 
   const mergedConfig = useMemo<RatingConfig>(() => ({
     ...DEFAULT_RATING_CONFIG,
@@ -35,13 +35,48 @@ export function useAppRating(config: RatingConfig): UseAppRatingResult {
   }, [mergedConfig]);
 
   const showPrompt = useCallback(async (): Promise<void> => {
-    setIsVisible(true);
     await RatingService.markPromptShown(mergedConfig.eventType);
 
+    navigation.push('RatingPrompt' as never, {
+      appName: mergedConfig.appName,
+      translations: mergedConfig.translations,
+      onPositive: async () => {
+        await RatingService.markRated();
+
+        try {
+          // Lazy load expo-store-review
+          const StoreReview = await import('expo-store-review');
+          const isAvailable = await StoreReview.isAvailableAsync();
+
+          if (isAvailable) {
+            await StoreReview.requestReview();
+          }
+        } catch (error) {
+          if (isDev()) {
+            console.error('[useAppRating] Failed to request review:', error);
+          }
+        }
+
+        if (mergedConfig.onPositiveFeedback) {
+          await mergedConfig.onPositiveFeedback();
+        }
+      },
+      onNegative: async () => {
+        if (mergedConfig.onNegativeFeedback) {
+          await mergedConfig.onNegativeFeedback();
+        }
+      },
+      onLater: async () => {
+        if (mergedConfig.onPromptDismissed) {
+          await mergedConfig.onPromptDismissed();
+        }
+      },
+    });
+
     if (mergedConfig.onPromptShown) {
       await mergedConfig.onPromptShown();
     }
-  }, [mergedConfig]);
+  }, [mergedConfig, navigation]);
 
   const checkAndShow = useCallback(async (): Promise<boolean> => {
     const should = await shouldShow();
@@ -62,62 +97,6 @@ export function useAppRating(config: RatingConfig): UseAppRatingResult {
     return RatingService.getState(mergedConfig.eventType);
   }, [mergedConfig.eventType]);
 
-  const handlePositive = useCallback(async () => {
-    setIsVisible(false);
-    await RatingService.markRated();
-
-    try {
-      // Lazy load expo-store-review
-      const StoreReview = await import('expo-store-review');
-      const isAvailable = await StoreReview.isAvailableAsync();
-
-      if (isAvailable) {
-        await StoreReview.requestReview();
-      }
-    } catch (error) {
-      if (isDev()) {
-        console.error('[useAppRating] Failed to request review:', error);
-      }
-    }
-
-    if (mergedConfig.onPositiveFeedback) {
-      await mergedConfig.onPositiveFeedback();
-    }
-  }, [mergedConfig]);
-
-  const handleNegative = useCallback(async () => {
-    setIsVisible(false);
-
-    if (mergedConfig.onNegativeFeedback) {
-      await mergedConfig.onNegativeFeedback();
-    }
-  }, [mergedConfig]);
-
-  const handleLater = useCallback(() => {
-    setIsVisible(false);
-  }, []);
-
-  const handleDismiss = useCallback(async () => {
-    setIsVisible(false);
-    await RatingService.markDismissed();
-
-    if (mergedConfig.onPromptDismissed) {
-      await mergedConfig.onPromptDismissed();
-    }
-  }, [mergedConfig]);
-
-  const modal = (
-    <RatingPromptModal
-      visible={isVisible}
-      onPositive={handlePositive}
-      onNegative={handleNegative}
-      onLater={handleLater}
-      onDismiss={handleDismiss}
-      translations={mergedConfig.translations}
-      appName={mergedConfig.appName}
-    />
-  );
-
   return {
     trackEvent,
     checkAndShow,
@@ -125,7 +104,5 @@ export function useAppRating(config: RatingConfig): UseAppRatingResult {
     showPrompt,
     reset,
     getState,
-    isVisible,
-    modal,
-  } as UseAppRatingResult & { modal: React.ReactNode };
+  } as UseAppRatingResult;
 }

package/src/domains/rating/presentation/screens/RatingPromptScreen.tsx

@@ -0,0 +1,162 @@
+/**
+ * Rating Prompt Screen
+ *
+ * Full screen for app rating prompt.
+ * Replaces modal approach with native navigation.
+ */
+
+import React from 'react';
+import { View, StyleSheet, ScrollView } from 'react-native';
+import { ScreenLayout } from '@umituz/react-native-design-system/layouts';
+import { AtomicText, AtomicButton, AtomicIcon } from '@umituz/react-native-design-system/atoms';
+import { NavigationHeader, useAppNavigation } from '@umituz/react-native-design-system/molecules';
+import { useAppDesignTokens } from '@umituz/react-native-design-system/theme';
+import type { RatingTranslations } from '../../domain/entities/RatingConfig';
+
+export interface RatingPromptScreenParams {
+  appName?: string;
+  translations?: RatingTranslations;
+  onPositive?: () => void;
+  onNegative?: () => void;
+  onLater?: () => void;
+  [key: string]: unknown;
+}
+
+export interface RatingPromptScreenProps {
+  route: {
+    params: RatingPromptScreenParams;
+  };
+}
+
+export const RatingPromptScreen: React.FC<RatingPromptScreenProps> = ({ route }) => {
+  const navigation = useAppNavigation();
+  const tokens = useAppDesignTokens();
+  const styles = getStyles(tokens);
+  const { appName = 'this app', translations, onPositive, onNegative, onLater } = route.params;
+
+  const defaultTranslations: RatingTranslations = {
+    title: translations?.title ?? 'Enjoying the app?',
+    message:
+      translations?.message ??
+      `If you love using ${appName}, would you mind taking a moment to rate it?`,
+    positiveButton: translations?.positiveButton ?? 'Yes, I love it!',
+    negativeButton: translations?.negativeButton ?? 'Not really',
+    laterButton: translations?.laterButton ?? 'Maybe later',
+  };
+
+  const handlePositive = async () => {
+    try {
+      // Lazy load expo-store-review
+      const StoreReview = await import('expo-store-review');
+      const isAvailable = await StoreReview.isAvailableAsync();
+
+      if (isAvailable) {
+        await StoreReview.requestReview();
+      }
+    } catch (error) {
+      console.error('[RatingPromptScreen] Failed to request review:', error);
+    }
+
+    if (onPositive) {
+      onPositive();
+    }
+    navigation.goBack();
+  };
+
+  const handleNegative = () => {
+    if (onNegative) {
+      onNegative();
+    }
+    navigation.goBack();
+  };
+
+  const handleLater = () => {
+    if (onLater) {
+      onLater();
+    }
+    navigation.goBack();
+  };
+
+  return (
+    <ScreenLayout
+      scrollable={true}
+      edges={['top', 'bottom', 'left', 'right']}
+      hideScrollIndicator={false}
+    >
+      <NavigationHeader title="" />
+      <ScrollView
+        style={styles.scrollView}
+        contentContainerStyle={styles.scrollContent}
+      >
+        <View style={styles.iconContainer}>
+          <AtomicIcon name="star" size="xxl" color="primary" />
+        </View>
+
+        <AtomicText style={styles.title}>{defaultTranslations.title}</AtomicText>
+
+        <AtomicText style={styles.message}>{defaultTranslations.message}</AtomicText>
+
+        <View style={styles.buttonContainer}>
+          <AtomicButton
+            variant="primary"
+            onPress={handlePositive}
+            style={styles.button}
+          >
+            {defaultTranslations.positiveButton}
+          </AtomicButton>
+
+          <AtomicButton
+            variant="outline"
+            onPress={handleNegative}
+            style={styles.button}
+          >
+            {defaultTranslations.negativeButton}
+          </AtomicButton>
+
+          <AtomicButton
+            variant="text"
+            onPress={handleLater}
+            style={styles.button}
+          >
+            {defaultTranslations.laterButton}
+          </AtomicButton>
+        </View>
+      </ScrollView>
+    </ScreenLayout>
+  );
+};
+
+const getStyles = (_tokens: ReturnType<typeof useAppDesignTokens>) =>
+  StyleSheet.create({
+    scrollView: {
+      flex: 1,
+    },
+    scrollContent: {
+      padding: 20,
+      alignItems: 'center',
+      justifyContent: 'center',
+      minHeight: '100%',
+    },
+    iconContainer: {
+      marginBottom: 24,
+    },
+    title: {
+      fontSize: 24,
+      fontWeight: '700',
+      textAlign: 'center',
+      marginBottom: 16,
+    },
+    message: {
+      fontSize: 16,
+      textAlign: 'center',
+      marginBottom: 32,
+      lineHeight: 24,
+    },
+    buttonContainer: {
+      width: '100%',
+      gap: 12,
+    },
+    button: {
+      width: '100%',
+    },
+  });

package/src/index.ts

@@ -8,6 +8,18 @@
  *   import { useSettings, SettingsScreen, AppearanceScreen, SettingsItemCard, DisclaimerSetting } from '@umituz/react-native-settings';
  */
 
+// =============================================================================
+// CORE LAYER - Base Classes & Patterns
+// =============================================================================
+
+export * from './core';
+
+// =============================================================================
+// PRESENTATION LAYER - Generic Components
+// =============================================================================
+
+export * from './presentation/components';
+
 // =============================================================================
 // DOMAIN LAYER - Repository Interfaces
 // =============================================================================