@umituz/react-native-settings 5.4.9 → 5.4.10

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,113 @@ 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
- */
-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);
-    }
+  /**
+   * 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
- */
-export async function markRated(): Promise<void> {
-  try {
-    await setHasRated(true);
-  } catch (error) {
-    if (isDev()) {
-      console.error('[RatingService] Failed to mark as rated:', error);
-    }
+  /**
+   * 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
- */
-export async function markDismissed(): Promise<void> {
-  try {
-    await setDismissed(true);
-  } catch (error) {
-    if (isDev()) {
-      console.error('[RatingService] Failed to mark as dismissed:', error);
-    }
+  /**
+   * 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);
+    });
   }
 }
 
 /**
- * Get current rating state for event type
+ * Singleton instance
  */
-export async function getState(eventType: string): Promise<RatingState> {
-  return getRatingState(eventType);
-}
+let ratingServiceInstance: RatingService | null = null;
 
 /**
- * Reset rating data (for testing or specific event type)
+ * Get rating service singleton instance
  */
-export async function reset(eventType?: string): Promise<void> {
-  try {
-    await resetStorage(eventType);
-  } catch (error) {
-    if (isDev()) {
-      console.error('[RatingService] Failed to reset:', eventType, error);
-    }
+export function getRatingService(): RatingService {
+  if (!ratingServiceInstance) {
+    ratingServiceInstance = new RatingService();
   }
+  return ratingServiceInstance;
 }
+
+/**
+ * Default export for backward compatibility
+ */
+export const ratingService = getRatingService();

package/src/domains/rating/index.ts

@@ -37,8 +37,8 @@ export type { StarRatingProps } from './presentation/components/StarRating';
 // PRESENTATION LAYER - Components (App Store Rating)
 // =============================================================================
 
-export { RatingPromptModal } from './presentation/components/RatingPromptModal';
-export type { RatingPromptModalProps } from './presentation/components/RatingPromptModal';
+export { useRatingPromptModal } from './presentation/hooks/useRatingPromptModal';
+export type { RatingPromptOptions } from './presentation/hooks/useRatingPromptModal';
 
 // =============================================================================
 // PRESENTATION LAYER - Hooks (App Store Rating)

package/src/domains/rating/presentation/hooks/useRatingPromptModal.ts

@@ -0,0 +1,122 @@
+/**
+ * useRatingPromptModal Hook
+ *
+ * Refactored to use GenericModal and ModalConfig.
+ * Replaces old RatingPromptModal component.
+ *
+ * @example
+ * ```ts
+ * const { RatingPrompt, showRatingPrompt } = useRatingPromptModal();
+ *
+ * return (
+ *   <>
+ *     <Button onPress={() => showRatingPrompt({ onPositive: ... })} />
+ *     <RatingPrompt />
+ *   </>
+ * );
+ * ```
+ */
+
+import { useCallback } from 'react';
+import { GenericModal } from '../../../../presentation/components/GenericModal';
+import { useModalState } from '../../../../core/patterns/Modal/useModalState';
+import type { ModalConfig } from '../../../../core/patterns/Modal/ModalConfig';
+import type { RatingTranslations } from '../../domain/entities/RatingConfig';
+
+export interface RatingPromptOptions {
+  /**
+   * Callback when user clicks positive (loves the app)
+   */
+  onPositive: () => void | Promise<void>;
+
+  /**
+   * Callback when user clicks negative (doesn't love the app)
+   */
+  onNegative: () => void | Promise<void>;
+
+  /**
+   * Callback when user clicks later
+   */
+  onLater: () => void | Promise<void>;
+
+  /**
+   * App name for message
+   */
+  appName?: string;
+
+  /**
+   * Custom translations
+   */
+  translations?: RatingTranslations;
+
+  /**
+   * Custom modal configuration
+   */
+  config?: Partial<ModalConfig>;
+}
+
+/**
+ * Rating prompt modal hook
+ */
+export function useRatingPromptModal() {
+  const modal = useModalState();
+
+  const showRatingPrompt = useCallback((options: RatingPromptOptions) => {
+    const {
+      onPositive,
+      onNegative,
+      onLater,
+      appName = 'this app',
+      translations,
+      config: customConfig,
+    } = options;
+
+    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 modalConfig: ModalConfig = {
+      title: defaultTranslations.title,
+      message: defaultTranslations.message,
+      icon: 'star',
+      iconColor: 'primary',
+      actions: [
+        {
+          label: defaultTranslations.positiveButton,
+          onPress: onPositive,
+          variant: 'primary',
+        },
+        {
+          label: defaultTranslations.negativeButton,
+          onPress: onNegative,
+          variant: 'outline',
+        },
+        {
+          label: defaultTranslations.laterButton,
+          onPress: onLater,
+          variant: 'text',
+        },
+      ],
+      dismissible: true,
+      ...customConfig,
+    };
+
+    modal.show(modalConfig);
+  }, [modal]);
+
+  const RatingPrompt = useCallback(() => {
+    return <GenericModal state={modal} testID="rating-prompt-modal" />;
+  }, [modal]);
+
+  return {
+    RatingPrompt,
+    showRatingPrompt,
+    modal,
+  };
+}

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
 // =============================================================================

package/src/infrastructure/services/SettingsService.ts

@@ -1,37 +1,47 @@
 /**
  * Settings Service
  *
- * Orchestrates settings operations using SettingsRepository
+ * Orchestrates settings operations using SettingsRepository.
+ * Refactored to extend BaseService for consistent error handling.
  */
 
 import { SettingsRepository } from '../repositories/SettingsRepository';
+import { BaseService } from '../../core/base/BaseService';
 import type { UserSettings, SettingsResult } from '../../application/ports/ISettingsRepository';
 
-export class SettingsService {
-    private repository: SettingsRepository;
-
-    constructor() {
-        this.repository = new SettingsRepository();
-    }
-
-    async getSettings(userId: string): Promise<SettingsResult<UserSettings>> {
-        return this.repository.getSettings(userId);
-    }
-
-    async saveSettings(settings: UserSettings): Promise<SettingsResult<void>> {
-        return this.repository.saveSettings(settings);
-    }
-
-    async resetSettings(userId: string): Promise<SettingsResult<void>> {
-        return this.repository.deleteSettings(userId);
-    }
+export class SettingsService extends BaseService {
+  protected serviceName = 'SettingsService';
+  private repository: SettingsRepository;
+
+  constructor() {
+    super();
+    this.repository = new SettingsRepository();
+  }
+
+  async getSettings(userId: string): Promise<SettingsResult<UserSettings>> {
+    return this.execute('getSettings', async () => {
+      return await this.repository.getSettings(userId);
+    });
+  }
+
+  async saveSettings(settings: UserSettings): Promise<SettingsResult<void>> {
+    return this.execute('saveSettings', async () => {
+      return await this.repository.saveSettings(settings);
+    });
+  }
+
+  async resetSettings(userId: string): Promise<SettingsResult<void>> {
+    return this.execute('resetSettings', async () => {
+      return await this.repository.deleteSettings(userId);
+    });
+  }
 }
 
 let settingsServiceInstance: SettingsService | null = null;
 
 export function getSettingsService(): SettingsService {
-    if (!settingsServiceInstance) {
-        settingsServiceInstance = new SettingsService();
-    }
-    return settingsServiceInstance;
+  if (!settingsServiceInstance) {
+    settingsServiceInstance = new SettingsService();
+  }
+  return settingsServiceInstance;
 }

package/src/presentation/components/GenericModal.tsx

@@ -0,0 +1,212 @@
+/**
+ * GenericModal Component
+ *
+ * Universal modal component that works with ModalConfig.
+ * Replaces all custom modal implementations.
+ *
+ * @example
+ * ```ts
+ * const modal = useModalState();
+ *
+ * return (
+ *   <>
+ *     <Button onPress={() => modal.show(ModalPresets.confirm(...))} />
+ *     <GenericModal state={modal} />
+ *   </>
+ * );
+ * ```
+ */
+
+import React, { useMemo } from 'react';
+import { View, StyleSheet, TouchableOpacity } from 'react-native';
+import { BaseModal } from '@umituz/react-native-design-system/molecules';
+import { AtomicText, AtomicButton, AtomicIcon } from '@umituz/react-native-design-system/atoms';
+import { useAppDesignTokens } from '@umituz/react-native-design-system/theme';
+import { useResponsive } from '@umituz/react-native-design-system/responsive';
+import type { ModalConfig, ModalState } from '../../core/patterns/Modal/ModalConfig';
+
+export interface GenericModalProps {
+  /**
+   * Modal state from useModalState hook
+   */
+  state: ModalState;
+
+  /**
+   * Custom container style
+   */
+  containerStyle?: object;
+
+  /**
+   * Test ID for E2E testing
+   */
+  testID?: string;
+}
+
+export const GenericModal: React.FC<GenericModalProps> = ({
+  state,
+  containerStyle,
+  testID = 'generic-modal',
+}) => {
+  const tokens = useAppDesignTokens();
+  const responsive = useResponsive();
+  const { visible, config } = state;
+
+  const styles = useMemo(() => getStyles(tokens), [tokens]);
+
+  if (!config) {
+    return null;
+  }
+
+  const {
+    title,
+    subtitle,
+    message,
+    icon,
+    iconColor,
+    header,
+    body,
+    footer,
+    actions = [],
+    dismissible = true,
+    closeOnBackdropPress = true,
+    closeOnBackPress = true,
+    maxWidth,
+  } = config;
+
+  const handleDismiss = () => {
+    if (dismissible) {
+      state.hide();
+    }
+  };
+
+  const modalWidth = maxWidth ?? responsive.maxContentWidth * 0.9;
+
+  return (
+    <BaseModal
+      visible={visible}
+      onClose={handleDismiss}
+      closeOnBackdropPress={closeOnBackdropPress}
+      closeOnBackPress={closeOnBackPress}
+    >
+      <View
+        style={[
+          styles.container,
+          {
+            backgroundColor: tokens.colors.surface,
+            borderRadius: tokens.borders.radius.xl,
+            padding: tokens.spacing.lg,
+            maxWidth: modalWidth,
+            width: '90%',
+          },
+          containerStyle,
+        ]}
+        testID={testID}
+      >
+        {/* Custom Header */}
+        {header ? (
+          header
+        ) : (
+          <>
+            {/* Icon */}
+            {icon && (
+              <View style={styles.iconContainer}>
+                <AtomicIcon
+                  name={icon}
+                  size="xl"
+                  color={iconColor || 'primary'}
+                />
+              </View>
+            )}
+
+            {/* Title and Subtitle */}
+            {title && (
+              <AtomicText
+                type="headlineMedium"
+                color="onSurface"
+                style={[styles.title, { marginBottom: subtitle ? tokens.spacing.xs : tokens.spacing.md }]}
+              >
+                {title}
+              </AtomicText>
+            )}
+
+            {subtitle && (
+              <AtomicText
+                type="bodyMedium"
+                color="onSurfaceVariant"
+                style={[styles.subtitle, { marginBottom: tokens.spacing.md }]}
+              >
+                {subtitle}
+              </AtomicText>
+            )}
+          </>
+        )}
+
+        {/* Custom Body or Message */}
+        {body ? (
+          body
+        ) : message && (
+          <AtomicText
+            type="bodyMedium"
+            color="onSurfaceVariant"
+            style={[styles.message, { marginBottom: actions.length > 0 ? tokens.spacing.lg : 0 }]}
+          >
+            {message}
+          </AtomicText>
+        )}
+
+        {/* Custom Footer or Actions */}
+        {footer ? (
+          footer
+        ) : actions.length > 0 && (
+          <View style={[styles.buttonContainer, { gap: tokens.spacing.sm }]}>
+            {actions.map((action, index) => (
+              <AtomicButton
+                key={index}
+                variant={action.variant || 'primary'}
+                onPress={async () => {
+                  await action.onPress();
+                  if (dismissible) {
+                    state.hide();
+                  }
+                }}
+                disabled={action.disabled}
+                loading={action.loading}
+                style={styles.button}
+                testID={action.testID}
+              >
+                {action.label}
+              </AtomicButton>
+            ))}
+          </View>
+        )}
+      </View>
+    </BaseModal>
+  );
+};
+
+const getStyles = (_tokens: ReturnType<typeof useAppDesignTokens>) =>
+  StyleSheet.create({
+    container: {
+      alignItems: 'center',
+    },
+    iconContainer: {
+      marginBottom: 16,
+    },
+    title: {
+      textAlign: 'center',
+    },
+    subtitle: {
+      textAlign: 'center',
+    },
+    message: {
+      textAlign: 'center',
+      lineHeight: 24,
+    },
+    buttonContainer: {
+      width: '100%',
+      marginTop: 16,
+    },
+    button: {
+      width: '100%',
+    },
+  });