@umituz/react-native-settings 4.23.85 → 4.23.87

package/src/infrastructure/utils/validation/textValidators.ts

@@ -0,0 +1,118 @@
+/**
+ * Text Validators
+ * Validation functions for text-based inputs
+ */
+
+import type { ValidationResult, TextValidationOptions } from "./core";
+
+/**
+ * Validates a text field based on provided options
+ */
+export const validateTextField = (
+  value: string,
+  options: TextValidationOptions = {}
+): ValidationResult => {
+  const {
+    minLength,
+    maxLength,
+    required = false,
+    pattern,
+    customValidator,
+  } = options;
+
+  // Check required
+  if (required && !value.trim()) {
+    return { isValid: false, error: "This field is required" };
+  }
+
+  // Skip other validations if empty and not required
+  if (!value.trim() && !required) {
+    return { isValid: true };
+  }
+
+  // Check min length
+  if (minLength && value.length < minLength) {
+    return { isValid: false, error: `Minimum length is ${minLength} characters` };
+  }
+
+  // Check max length
+  if (maxLength && value.length > maxLength) {
+    return { isValid: false, error: `Maximum length is ${maxLength} characters` };
+  }
+
+  // Check pattern
+  if (pattern && !pattern.test(value)) {
+    return { isValid: false, error: "Invalid format" };
+  }
+
+  // Custom validator
+  if (customValidator) {
+    const customError = customValidator(value);
+    if (customError) {
+      return { isValid: false, error: customError };
+    }
+  }
+
+  return { isValid: true };
+};
+
+/**
+ * Validates an email address
+ */
+export const validateEmail = (
+  email: string,
+  options: { required?: boolean; allowEmpty?: boolean } = {}
+): ValidationResult => {
+  const { required = false, allowEmpty = false } = options;
+
+  // Check if empty
+  if (!email.trim()) {
+    if (required && !allowEmpty) {
+      return { isValid: false, error: "Email is required" };
+    }
+    return { isValid: true };
+  }
+
+  // Email regex pattern
+  const emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+  if (!emailPattern.test(email)) {
+    return { isValid: false, error: "Invalid email address" };
+  }
+
+  return { isValid: true };
+};
+
+/**
+ * Validates a URL
+ */
+export const validateUrl = (url: string): ValidationResult => {
+  if (!url.trim()) {
+    return { isValid: true };
+  }
+
+  try {
+    new URL(url);
+    return { isValid: true };
+  } catch {
+    return { isValid: false, error: "Invalid URL" };
+  }
+};
+
+/**
+ * Validates a phone number (basic validation)
+ */
+export const validatePhoneNumber = (phone: string): ValidationResult => {
+  if (!phone.trim()) {
+    return { isValid: true };
+  }
+
+  // Remove all non-digit characters
+  const digitsOnly = phone.replace(/\D/g, "");
+
+  // Check if length is reasonable (10-15 digits)
+  if (digitsOnly.length < 10 || digitsOnly.length > 15) {
+    return { isValid: false, error: "Invalid phone number" };
+  }
+
+  return { isValid: true };
+};

package/src/presentation/hooks/useSettingsScreenConfig.ts

@@ -6,29 +6,14 @@
  * Apps pass subscription config from subscription package.
  */
 
-import { useMemo, useCallback } from "react";
-import { Linking } from "react-native";
-import {
-  useAuth,
-  useAccountManagement,
-  useAuthModalStore,
-  useUserProfile,
-} from "@umituz/react-native-auth";
-import { AlertService } from "@umituz/react-native-design-system";
+import { useMemo } from "react";
+import { useAuth, useUserProfile } from "@umituz/react-native-auth";
 import { useLocalization } from "../../domains/localization";
-import {
-  createAppearanceConfig,
-  createLanguageConfig,
-  createNotificationsConfig,
-  createAboutConfig,
-  createLegalConfig,
-  createFeedbackConfig,
-  createRatingConfig,
-  createFAQConfig,
-  createSubscriptionConfig,
-} from "../utils/config-creators";
 import { createUserProfileDisplay } from "../utils/userProfileUtils";
 import { createAccountConfig } from "../utils/accountConfigUtils";
+import { useAuthHandlers } from "../utils/useAuthHandlers";
+import { translateFAQData } from "../utils/faqTranslator";
+import { useSettingsConfigFactory } from "../utils/settingsConfigFactory";
 import type { SettingsConfig } from "../screens/types";
 import type { FeedbackFormData } from "../utils/config-creators";
 import type { AppInfo, FAQData, UserProfileDisplay, AdditionalScreen } from "../navigation/types";
@@ -80,54 +65,31 @@ export const useSettingsScreenConfig = (
   } = features;
 
   const { t } = useLocalization();
-  const { user, loading, isAuthReady, signOut } = useAuth();
-  const { deleteAccount } = useAccountManagement();
+  const { user, loading, isAuthReady } = useAuth();
   const userProfileData = useUserProfile({});
-  const { showAuthModal } = useAuthModalStore();
 
-  const handleRatePress = useCallback(async () => {
-    const url = appInfo.appStoreUrl;
-    if (url && (await Linking.canOpenURL(url))) {
-      await Linking.openURL(url);
-    }
-  }, [appInfo.appStoreUrl]);
+  // Use centralized auth handlers
+  const { handleRatePress, handleSignOut, handleDeleteAccount, handleSignIn } =
+    useAuthHandlers(appInfo);
 
-  const handleSignOut = useCallback(async () => {
-    try {
-      await signOut();
-    } catch {
-      AlertService.createErrorAlert(t("common.error"), t("auth.errors.unknownError"));
-    }
-  }, [signOut, t]);
-
-  const handleDeleteAccount = useCallback(async () => {
-    try {
-      await deleteAccount();
-    } catch {
-      AlertService.createErrorAlert(t("common.error"), t("settings.account.deleteError"));
-    }
-  }, [deleteAccount, t]);
-
-  const handleSignIn = useCallback(() => {
-    showAuthModal(() => {}, "login");
-  }, [showAuthModal]);
-
-  const settingsConfig = useMemo((): SettingsConfig => ({
-    appearance: showAppearance ? createAppearanceConfig(t) : false,
-    language: showLanguage ? createLanguageConfig(t) : false,
-    notifications: showNotifications ? createNotificationsConfig(t) : false,
-    feedback: showFeedback ? createFeedbackConfig(t, onFeedbackSubmit) : false,
-    about: showAbout ? createAboutConfig(t) : false,
-    legal: showLegal ? createLegalConfig(t) : false,
-    faqs: showFaqs ? createFAQConfig(t) : false,
-    rating: showRating ? createRatingConfig(t, handleRatePress, appInfo.appStoreUrl || "") : false,
-    subscription: createSubscriptionConfig(t, isPremium, "SubscriptionDetail"),
-    disclaimer: false,
-  }), [
-    t, onFeedbackSubmit, handleRatePress, appInfo.appStoreUrl, isPremium,
-    showAppearance, showLanguage, showNotifications, showFeedback,
-    showAbout, showLegal, showFaqs, showRating,
-  ]);
+  // Use settings config factory
+  const settingsConfig = useSettingsConfigFactory({
+    t,
+    onFeedbackSubmit,
+    handleRatePress,
+    appStoreUrl: appInfo.appStoreUrl || "",
+    isPremium,
+    features: {
+      notifications: showNotifications,
+      appearance: showAppearance,
+      language: showLanguage,
+      feedback: showFeedback,
+      rating: showRating,
+      faqs: showFaqs,
+      about: showAbout,
+      legal: showLegal,
+    },
+  });
 
   const userProfile = useMemo(() => createUserProfileDisplay({
     profileData: userProfileData,
@@ -147,20 +109,11 @@ export const useSettingsScreenConfig = (
     t,
   }), [user, userProfileData, handleSignIn, handleSignOut, handleDeleteAccount, t]);
 
-  const translatedFaqData = useMemo((): FAQData | undefined => {
-    if (!faqData) return undefined;
-    return {
-      categories: faqData.categories.map((category) => ({
-        id: category.id,
-        title: t(category.title),
-        items: category.items.map((item) => ({
-          id: item.id,
-          question: t(item.question, { appName: appInfo.name }),
-          answer: t(item.answer, { appName: appInfo.name }),
-        })),
-      })),
-    };
-  }, [faqData, t, appInfo.name]);
+  // Use centralized FAQ translation
+  const translatedFaqData = useMemo(() =>
+    translateFAQData(faqData, t, appInfo),
+    [faqData, t, appInfo]
+  );
 
   return {
     settingsConfig,

package/src/presentation/navigation/SettingsStackNavigator.tsx

@@ -7,20 +7,10 @@
 
 import React from "react";
 import {
-  useAppDesignTokens,
   StackNavigator,
-  type StackScreen,
   type StackNavigatorConfig,
 } from "@umituz/react-native-design-system";
-import { useLocalization, LanguageSelectionScreen } from "../../domains/localization";
-import { NotificationSettingsScreen } from "../../domains/notifications";
-import { AccountScreen } from "@umituz/react-native-auth";
-import { SettingsScreen } from "../screens/SettingsScreen";
-import { AppearanceScreen } from "../screens/AppearanceScreen";
-import { FAQScreen } from "../../domains/faqs";
-import { AboutScreen } from "../../domains/about";
-import { LegalScreen } from "../../domains/legal";
-import { GamificationScreen } from "../../domains/gamification";
+import { useLocalization } from "../../domains/localization";
 import { useNavigationHandlers, useSettingsScreens } from "./hooks";
 import {
   createNotificationTranslations,
@@ -33,20 +23,7 @@ export const SettingsStackNavigator: React.FC<SettingsStackNavigatorProps> = (pr
   const {
     appInfo,
     legalUrls,
-    faqData,
-    config = {},
-    showUserProfile = false,
-    userProfile,
-    accountConfig,
-    additionalScreens = [],
-    devSettings,
-    customSections = [],
-    showHeader = true,
-    showCloseButton = false,
-    onClose,
-    gamificationConfig,
   } = props;
-  const tokens = useAppDesignTokens();
   const { t } = useLocalization();
   const { handlePrivacyPress, handleTermsPress, handleEulaPress, aboutConfig } =
     useNavigationHandlers(appInfo, legalUrls);

package/src/presentation/navigation/hooks/useSettingsScreens.ts

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
 import type { StackScreen } from "@umituz/react-native-design-system";
 import { LanguageSelectionScreen } from "../../../domains/localization";
 import { NotificationSettingsScreen } from "../../../domains/notifications";

package/src/presentation/utils/config-creators/base-configs.ts

@@ -1,6 +1,7 @@
 /**
  * Base Settings Config Creators
  * Standard settings: appearance, language, notifications, about, legal
+ * Refactored to use configFactory pattern for consistency
  */
 
 import type {
@@ -11,6 +12,7 @@ import type {
   LegalConfig,
 } from "../../screens/types";
 import type { TranslationFunction } from "./types";
+import { createBaseConfig, createConfigWithExtensions } from "../../../infrastructure/utils/configFactory";
 
 /**
  * Create appearance configuration
@@ -18,14 +20,15 @@ import type { TranslationFunction } from "./types";
 export const createAppearanceConfig = (
   t: TranslationFunction,
   routeOrOnPress?: string | (() => void),
-): AppearanceConfig => ({
-  enabled: true,
-  title: t("settings.appearance.title"),
-  description: t("settings.appearance.description"),
-  icon: "color-palette-outline",
-  route: typeof routeOrOnPress === "string" ? routeOrOnPress : undefined,
-  onPress: typeof routeOrOnPress === "function" ? routeOrOnPress : undefined,
-});
+): AppearanceConfig => {
+  return createBaseConfig<AppearanceConfig>({
+    t,
+    titleKey: "settings.appearance.title",
+    descriptionKey: "settings.appearance.description",
+    icon: "color-palette-outline",
+    routeOrOnPress,
+  });
+};
 
 /**
  * Create language configuration
@@ -33,14 +36,15 @@ export const createAppearanceConfig = (
 export const createLanguageConfig = (
   t: TranslationFunction,
   routeOrOnPress?: string | (() => void),
-): LanguageConfig => ({
-  enabled: true,
-  title: t("settings.language.title"),
-  description: t("settings.language.description"),
-  icon: "globe-outline",
-  route: typeof routeOrOnPress === "string" ? routeOrOnPress : undefined,
-  onPress: typeof routeOrOnPress === "function" ? routeOrOnPress : undefined,
-});
+): LanguageConfig => {
+  return createBaseConfig<LanguageConfig>({
+    t,
+    titleKey: "settings.language.title",
+    descriptionKey: "settings.language.description",
+    icon: "globe-outline",
+    routeOrOnPress,
+  });
+};
 
 /**
  * Create notifications configuration
@@ -48,16 +52,22 @@ export const createLanguageConfig = (
 export const createNotificationsConfig = (
   t: TranslationFunction,
   routeOrOnPress?: string | (() => void),
-): NotificationsConfig => ({
-  enabled: true,
-  showToggle: false,
-  route: typeof routeOrOnPress === "string" ? routeOrOnPress : "Notifications",
-  onPress: typeof routeOrOnPress === "function" ? routeOrOnPress : undefined,
-  title: t("settings.notifications.title"),
-  description: t("settings.notifications.description"),
-  sectionTitle: t("settings.notifications.sectionTitle"),
-  icon: "notifications-outline",
-});
+): NotificationsConfig => {
+  return createConfigWithExtensions<NotificationsConfig>(
+    {
+      t,
+      titleKey: "settings.notifications.title",
+      descriptionKey: "settings.notifications.description",
+      icon: "notifications-outline",
+      routeOrOnPress,
+      defaultRoute: "Notifications",
+    },
+    {
+      showToggle: false,
+      sectionTitle: t("settings.notifications.sectionTitle"),
+    }
+  );
+};
 
 /**
  * Create about configuration
@@ -65,14 +75,15 @@ export const createNotificationsConfig = (
 export const createAboutConfig = (
   t: TranslationFunction,
   routeOrOnPress?: string | (() => void),
-): AboutConfig => ({
-  enabled: true,
-  title: t("settings.about.title"),
-  description: t("settings.about.description"),
-  icon: "information-circle-outline",
-  route: typeof routeOrOnPress === "string" ? routeOrOnPress : undefined,
-  onPress: typeof routeOrOnPress === "function" ? routeOrOnPress : undefined,
-});
+): AboutConfig => {
+  return createBaseConfig<AboutConfig>({
+    t,
+    titleKey: "settings.about.title",
+    descriptionKey: "settings.about.description",
+    icon: "information-circle-outline",
+    routeOrOnPress,
+  });
+};
 
 /**
  * Create legal configuration
@@ -80,11 +91,12 @@ export const createAboutConfig = (
 export const createLegalConfig = (
   t: TranslationFunction,
   routeOrOnPress?: string | (() => void),
-): LegalConfig => ({
-  enabled: true,
-  title: t("settings.legal.title"),
-  description: t("settings.legal.description"),
-  icon: "document-text-outline",
-  route: typeof routeOrOnPress === "string" ? routeOrOnPress : undefined,
-  onPress: typeof routeOrOnPress === "function" ? routeOrOnPress : undefined,
-});
+): LegalConfig => {
+  return createBaseConfig<LegalConfig>({
+    t,
+    titleKey: "settings.legal.title",
+    descriptionKey: "settings.legal.description",
+    icon: "document-text-outline",
+    routeOrOnPress,
+  });
+};

package/src/presentation/utils/faqTranslator.ts

@@ -0,0 +1,31 @@
+/**
+ * FAQ Translation Utility
+ * Handles translation of FAQ data
+ */
+
+import type { TranslationFunction } from "./config-creators/types";
+import type { FAQData } from "../navigation/types";
+import type { AppInfo } from "../navigation/types";
+
+/**
+ * Translates FAQ data using the provided translation function
+ */
+export const translateFAQData = (
+  faqData: FAQData | undefined,
+  t: TranslationFunction,
+  _appInfo: AppInfo
+): FAQData | undefined => {
+  if (!faqData) return undefined;
+
+  return {
+    categories: faqData.categories.map((category) => ({
+      id: category.id,
+      title: t(category.title),
+      items: category.items.map((item) => ({
+        id: item.id,
+        question: t(item.question),
+        answer: t(item.answer),
+      })),
+    })),
+  };
+};

package/src/presentation/utils/index.ts

@@ -1,5 +1,10 @@
 /**
- * Settings Utilities
+ * Presentation Utilities
  */
 
 export * from "./config-creators";
+export * from "./userProfileUtils";
+export * from "./accountConfigUtils";
+export * from "./faqTranslator";
+export * from "./settingsConfigFactory";
+export * from "./useAuthHandlers";

package/src/presentation/utils/screenFactory.ts

@@ -36,7 +36,7 @@ export function createStackScreen(
 /**
  * Create a screen with props
  */
-export function createScreenWithProps<P extends Record<string, unknown>>(
+export function createScreenWithProps<P>(
   name: string,
   component: React.ComponentType<P>,
   props: P,

package/src/presentation/utils/settingsConfigFactory.ts

@@ -0,0 +1,89 @@
+/**
+ * Settings Config Factory Utility
+ * Creates settings configuration based on feature flags
+ */
+
+import { useMemo } from "react";
+import type { TranslationFunction, FeedbackFormData } from "./config-creators/types";
+import type { SettingsConfig } from "../screens/types";
+import {
+  createAppearanceConfig,
+  createLanguageConfig,
+  createNotificationsConfig,
+  createAboutConfig,
+  createLegalConfig,
+  createFeedbackConfig,
+  createRatingConfig,
+  createFAQConfig,
+  createSubscriptionConfig,
+} from "./config-creators";
+
+export interface SettingsConfigFactoryParams {
+  t: TranslationFunction;
+  onFeedbackSubmit: (data: FeedbackFormData) => Promise<void>;
+  handleRatePress: () => void;
+  appStoreUrl: string;
+  isPremium: boolean;
+  features: {
+    notifications: boolean;
+    appearance: boolean;
+    language: boolean;
+    feedback: boolean;
+    rating: boolean;
+    faqs: boolean;
+    about: boolean;
+    legal: boolean;
+  };
+}
+
+/**
+ * Creates settings configuration based on enabled features
+ */
+export const createSettingsConfig = (
+  params: SettingsConfigFactoryParams
+): SettingsConfig => {
+  const {
+    t,
+    onFeedbackSubmit,
+    handleRatePress,
+    appStoreUrl,
+    isPremium,
+    features,
+  } = params;
+
+  return {
+    appearance: features.appearance ? createAppearanceConfig(t) : false,
+    language: features.language ? createLanguageConfig(t) : false,
+    notifications: features.notifications ? createNotificationsConfig(t) : false,
+    feedback: features.feedback ? createFeedbackConfig(t, onFeedbackSubmit) : false,
+    about: features.about ? createAboutConfig(t) : false,
+    legal: features.legal ? createLegalConfig(t) : false,
+    faqs: features.faqs ? createFAQConfig(t) : false,
+    rating: features.rating ? createRatingConfig(t, handleRatePress, appStoreUrl) : false,
+    subscription: createSubscriptionConfig(t, isPremium, "SubscriptionDetail"),
+    disclaimer: false,
+  };
+};
+
+/**
+ * Hook for creating settings config with memoization
+ */
+export const useSettingsConfigFactory = (
+  params: SettingsConfigFactoryParams
+): SettingsConfig => {
+  return useMemo(() => createSettingsConfig(params), [
+    params.t,
+    params.onFeedbackSubmit,
+    params.handleRatePress,
+    params.appStoreUrl,
+    params.isPremium,
+    params.features.appearance,
+    params.features.language,
+    params.features.notifications,
+    params.features.feedback,
+    params.features.about,
+    params.features.legal,
+    params.features.faqs,
+    params.features.rating,
+  ]);
+};