Develop

src/app/(app)/_layout.tsx

@@ -4,7 +4,6 @@ import { NovuProvider } from '@novu/react-native';
 import Countly from 'countly-sdk-react-native-bridge';
 import * as NavigationBar from 'expo-navigation-bar';
 import { Redirect, SplashScreen, Tabs } from 'expo-router';
-import { CloudAlert, Contact, ListTree, Map, Megaphone, Menu, Navigation, Notebook, Settings } from 'lucide-react-native';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ActivityIndicator, type ColorValue, Platform, StyleSheet, useWindowDimensions } from 'react-native';
@@ -17,6 +16,7 @@ import { FocusAwareStatusBar, View } from '@/components/ui';
 import { Button, ButtonText } from '@/components/ui/button';
 import { Drawer, DrawerBackdrop, DrawerBody, DrawerContent, DrawerFooter, DrawerHeader } from '@/components/ui/drawer';
 import { Icon } from '@/components/ui/icon';
+import { CloudAlert, Contact, ListTree, Map, Megaphone, Menu, Navigation, Notebook, Settings } from '@/components/ui/lucide-icons';
 import { Pressable } from '@/components/ui/pressable';
 import { Text } from '@/components/ui/text';
 import { useAnalytics } from '@/hooks/use-analytics';

src/app/(app)/settings.tsx

@@ -11,6 +11,7 @@ import { KeepAliveItem } from '@/components/settings/keep-alive-item';
 import { LanguageItem } from '@/components/settings/language-item';
 import { LoginInfoBottomSheet } from '@/components/settings/login-info-bottom-sheet';
 import { ModernNotificationSoundsItem } from '@/components/settings/modern-notification-sounds-item';
+import { RealtimeGeolocationItem } from '@/components/settings/realtime-geolocation-item';
 import { ServerUrlBottomSheet } from '@/components/settings/server-url-bottom-sheet';
 import { ThemeItem } from '@/components/settings/theme-item';
 import { ToggleItem } from '@/components/settings/toggle-item';
@@ -130,6 +131,7 @@ export default function Settings() {
               <LanguageItem />
               <KeepAliveItem />
               <ModernNotificationSoundsItem />
+              <RealtimeGeolocationItem />
               <BackgroundGeolocationItem />
               <BluetoothDeviceItem />
             </VStack>

src/app/call/new/index.tsx

@@ -2,7 +2,6 @@ import { zodResolver } from '@hookform/resolvers/zod';
 import axios from 'axios';
 import * as Location from 'expo-location';
 import { router, Stack } from 'expo-router';
-import { ChevronDownIcon, PlusIcon, SearchIcon } from 'lucide-react-native';
 import { useColorScheme } from 'nativewind';
 import React, { useEffect, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
@@ -26,6 +25,7 @@ import { Card } from '@/components/ui/card';
 import { FocusAwareStatusBar } from '@/components/ui/focus-aware-status-bar';
 import { FormControl, FormControlError, FormControlLabel, FormControlLabelText } from '@/components/ui/form-control';
 import { Input, InputField } from '@/components/ui/input';
+import { ChevronDownIcon, PlusIcon, SearchIcon } from '@/components/ui/lucide-icons';
 import { Select, SelectBackdrop, SelectContent, SelectIcon, SelectInput, SelectItem, SelectPortal, SelectTrigger } from '@/components/ui/select';
 import { Text } from '@/components/ui/text';
 import { Textarea, TextareaInput } from '@/components/ui/textarea';

src/app/login/login-form.tsx

@@ -1,6 +1,4 @@
 import { zodResolver } from '@hookform/resolvers/zod';
-import { AlertTriangle, EyeIcon, EyeOffIcon, Globe, ShieldCheck } from 'lucide-react-native';
-import { ChevronDownIcon } from 'lucide-react-native';
 import { useColorScheme } from 'nativewind';
 import React, { useState } from 'react';
 import type { SubmitHandler } from 'react-hook-form';
@@ -14,6 +12,8 @@ import { View } from '@/components/ui';
 import { Button, ButtonSpinner, ButtonText } from '@/components/ui/button';
 import { FormControl, FormControlError, FormControlErrorIcon, FormControlErrorText, FormControlLabel, FormControlLabelText } from '@/components/ui/form-control';
 import { Input, InputField, InputIcon, InputSlot } from '@/components/ui/input';
+import { AlertTriangle, EyeIcon, EyeOffIcon, Globe, ShieldCheck } from '@/components/ui/lucide-icons';
+import { ChevronDownIcon } from '@/components/ui/lucide-icons';
 import { Select, SelectBackdrop, SelectContent, SelectDragIndicator, SelectDragIndicatorWrapper, SelectIcon, SelectInput, SelectItem, SelectPortal, SelectTrigger } from '@/components/ui/select';
 import { Text } from '@/components/ui/text';
 import colors from '@/constants/colors';

src/app/login/sso.tsx

@@ -1,7 +1,6 @@
 import { zodResolver } from '@hookform/resolvers/zod';
 import * as Linking from 'expo-linking';
 import { useRouter } from 'expo-router';
-import { AlertTriangle, ArrowLeft, ShieldCheck } from 'lucide-react-native';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
@@ -13,6 +12,7 @@ import { FocusAwareStatusBar, View } from '@/components/ui';
 import { Button, ButtonSpinner, ButtonText } from '@/components/ui/button';
 import { FormControl, FormControlError, FormControlErrorIcon, FormControlErrorText, FormControlLabel, FormControlLabelText } from '@/components/ui/form-control';
 import { Input, InputField, InputSlot } from '@/components/ui/input';
+import { AlertTriangle, ArrowLeft, ShieldCheck } from '@/components/ui/lucide-icons';
 import { Modal, ModalBackdrop, ModalBody, ModalContent, ModalFooter, ModalHeader } from '@/components/ui/modal';
 import { Text } from '@/components/ui/text';
 import colors from '@/constants/colors';

src/components/calls/call-notes-modal.tsx

@@ -1,10 +1,10 @@
-import { SearchIcon, X } from 'lucide-react-native';
 import { useColorScheme } from 'nativewind';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { FlatList, Keyboard, Modal, SafeAreaView, StyleSheet, TouchableOpacity, View } from 'react-native';
 import { KeyboardAvoidingView } from 'react-native-keyboard-controller';
 
+import { SearchIcon, X } from '@/components/ui/lucide-icons';
 import { useAnalytics } from '@/hooks/use-analytics';
 import { useAuthStore } from '@/lib/auth';
 import { logger } from '@/lib/logging';

src/components/calls/dispatch-selection-modal.tsx

@@ -1,4 +1,3 @@
-import { CheckIcon, SearchIcon, UsersIcon, X } from 'lucide-react-native';
 import { useColorScheme } from 'nativewind';
 import React, { useCallback, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -11,6 +10,7 @@ import { Button, ButtonText } from '@/components/ui/button';
 import { Card } from '@/components/ui/card';
 import { HStack } from '@/components/ui/hstack';
 import { Input, InputField } from '@/components/ui/input';
+import { CheckIcon, SearchIcon, UsersIcon, X } from '@/components/ui/lucide-icons';
 import { Text } from '@/components/ui/text';
 import { VStack } from '@/components/ui/vstack';
 import { type DispatchSelection, useDispatchStore } from '@/stores/dispatch/store';

src/components/common/loading.tsx

@@ -1,8 +1,9 @@
-import { Box, Loader2 } from 'lucide-react-native';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { View } from 'react-native';
 
+import { Box, Loader2 } from '@/components/ui/lucide-icons';
+
 import { HStack } from '../ui/hstack';
 import { Spinner } from '../ui/spinner';
 import { Text } from '../ui/text';

src/components/contacts/contact-card.tsx

@@ -1,8 +1,8 @@
-import { BuildingIcon, MailIcon, PhoneIcon, StarIcon, UserIcon } from 'lucide-react-native';
 import React from 'react';
 import { Pressable, Text, View } from 'react-native';
 
 import { Avatar, AvatarImage } from '@/components/ui/avatar';
+import { BuildingIcon, MailIcon, PhoneIcon, StarIcon, UserIcon } from '@/components/ui/lucide-icons';
 import { type ContactResultData, ContactType } from '@/models/v4/contacts/contactResultData';
 
 interface ContactCardProps {

src/components/contacts/contact-details-sheet.tsx

@@ -1,3 +1,8 @@
+import React, { useCallback, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Linking, Platform, ScrollView, useWindowDimensions, View } from 'react-native';
+
+import { Avatar, AvatarImage } from '@/components/ui/avatar';
 import {
   BuildingIcon,
   CalendarIcon,
@@ -15,12 +20,7 @@ import {
   TrashIcon,
   UserIcon,
   X,
-} from 'lucide-react-native';
-import React, { useCallback, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Linking, Platform, ScrollView, useWindowDimensions, View } from 'react-native';
-
-import { Avatar, AvatarImage } from '@/components/ui/avatar';
+} from '@/components/ui/lucide-icons';
 import { useAnalytics } from '@/hooks/use-analytics';
 import { logger } from '@/lib/logging';
 import { ContactType } from '@/models/v4/contacts/contactResultData';

src/components/notes/note-details-sheet.tsx

@@ -1,9 +1,9 @@
-import { Calendar, Tag, X } from 'lucide-react-native';
 import React, { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { StyleSheet } from 'react-native';
 
 import { HtmlRenderer } from '@/components/ui/html-renderer';
+import { Calendar, Tag, X } from '@/components/ui/lucide-icons';
 import { useAnalytics } from '@/hooks/use-analytics';
 import { formatDateForDisplay, parseDateISOString } from '@/lib/utils';
 import { useNotesStore } from '@/stores/notes/store';

src/components/notifications/NotificationButton.tsx

@@ -1,5 +1,6 @@
 import { useCounts } from '@novu/react-native';
 import { BellIcon } from 'lucide-react-native';
+import { useColorScheme } from 'nativewind';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -11,6 +12,7 @@ interface NotificationButtonProps {
 
 export const NotificationButton = ({ onPress }: NotificationButtonProps) => {
   const { t } = useTranslation();
+  const { colorScheme } = useColorScheme();
   const { counts, isLoading } = useCounts({
     filters: [
       {
@@ -24,7 +26,7 @@ export const NotificationButton = ({ onPress }: NotificationButtonProps) => {
   return (
     <Pressable onPress={onPress} className="mr-2 p-2" testID="notification-button" accessibilityRole="button" accessibilityLabel={t('notifications.open')}>
       <View className="relative">
-        <BellIcon size={24} className="text-primary-500 dark:text-primary-400" strokeWidth={2} />
+        <BellIcon size={24} color={colorScheme === 'dark' ? '#d1d5db' : '#374151'} strokeWidth={2} />
 
         {counts?.[0]?.count && counts?.[0]?.count > 0 ? (
           <View className="absolute -right-2 -top-2 flex size-5 items-center justify-center rounded-full bg-red-500">