@oxyhq/services 6.9.33 → 6.9.34

package/lib/module/ui/screens/FileManagementScreen.js

@@ -23,9 +23,7 @@ import { useFileStore, useFiles, useUploading as useUploadingStore, useUploadAgg
 import Header from "../components/Header.js";
 import JustifiedPhotoGrid from "../components/photogrid/JustifiedPhotoGrid.js";
 import { GroupedSection } from "../components/index.js";
-import { useThemeStyles } from "../hooks/useThemeStyles.js";
-import { useColorScheme } from "../hooks/useColorScheme.js";
-import { normalizeTheme } from "../utils/themeUtils.js";
+import { useTheme } from '@oxyhq/bloom/theme';
 import { useOxy } from "../context/OxyContext.js";
 import { useI18n } from "../hooks/useI18n.js";
 import { useUploadFile } from "../hooks/mutations/useAccountMutations.js";
@@ -298,20 +296,13 @@ const FileManagementScreen = ({
   const getSafeDownloadUrlCallback = useCallback((file, variant = 'thumb') => {
     return getSafeDownloadUrl(file, variant, (fileId, variant) => oxyServices.getFileDownloadUrl(fileId, variant));
   }, [oxyServices]);
-
-  // Use centralized theme styles hook for consistency
-  const colorScheme = useColorScheme();
-  const normalizedTheme = normalizeTheme(theme);
-  const baseThemeStyles = useThemeStyles(normalizedTheme, colorScheme);
+  const bloomTheme = useTheme();
+  const {
+    colors
+  } = bloomTheme;
   // FileManagementScreen uses a slightly different light background
-  const themeStyles = useMemo(() => ({
-    ...baseThemeStyles,
-    backgroundColor: baseThemeStyles.isDarkTheme ? baseThemeStyles.backgroundColor : '#f2f2f2'
-  }), [baseThemeStyles]);
-
-  // Extract commonly used theme variables
-  const backgroundColor = themeStyles.backgroundColor;
-  const borderColor = themeStyles.borderColor;
+  const backgroundColor = bloomTheme.isDark ? colors.background : '#f2f2f2';
+  const borderColor = colors.border;
   const targetUserId = userId || user?.id;
   const storeSetUploading = useFileStore(s => s.setUploading);
   const storeSetUploadProgress = useFileStore(s => s.setUploadProgress);
@@ -1112,7 +1103,7 @@ const FileManagementScreen = ({
         marginRight: (index + 1) % itemsPerRow === 0 ? 0 : 4,
         ...(selectMode && selectedIds.has(photo.id) ? {
           borderWidth: 2,
-          borderColor: themeStyles.primaryColor
+          borderColor: colors.primary
         } : {})
       }],
       onPress: () => handleFileOpen(photo),
@@ -1136,12 +1127,12 @@ const FileManagementScreen = ({
           children: /*#__PURE__*/_jsx(Ionicons, {
             name: selectedIds.has(photo.id) ? 'checkmark-circle' : 'ellipse-outline',
             size: 20,
-            color: selectedIds.has(photo.id) ? themeStyles.primaryColor : themeStyles.textColor
+            color: selectedIds.has(photo.id) ? colors.primary : colors.text
           })
         })]
       })
     }, photo.id);
-  }, [oxyServices, safeContainerWidth, selectMode, selectedIds, themeStyles.primaryColor, themeStyles.textColor]);
+  }, [oxyServices, safeContainerWidth, selectMode, selectedIds, colors.primary, colors.text]);
   const renderJustifiedPhotoItem = useCallback((photo, width, height, isLast) => {
     const downloadUrl = getSafeDownloadUrlCallback(photo, 'thumb');
     return /*#__PURE__*/_jsx(TouchableOpacity, {
@@ -1150,7 +1141,7 @@ const FileManagementScreen = ({
         height,
         ...(selectMode && selectedIds.has(photo.id) ? {
           borderWidth: 2,
-          borderColor: themeStyles.primaryColor
+          borderColor: colors.primary
         } : {}),
         ...(selectMode && multiSelect && selectedIds.size > 0 && !selectedIds.has(photo.id) ? {
           opacity: 0.4
@@ -1177,12 +1168,12 @@ const FileManagementScreen = ({
           children: /*#__PURE__*/_jsx(Ionicons, {
             name: selectedIds.has(photo.id) ? 'checkmark-circle' : 'ellipse-outline',
             size: 20,
-            color: selectedIds.has(photo.id) ? themeStyles.primaryColor : themeStyles.textColor
+            color: selectedIds.has(photo.id) ? colors.primary : colors.text
           })
         })]
       })
     }, photo.id);
-  }, [oxyServices, selectMode, selectedIds, multiSelect, themeStyles.primaryColor, themeStyles.textColor]);
+  }, [oxyServices, selectMode, selectedIds, multiSelect, colors.primary, colors.text]);
 
   // Run initial load once per targetUserId change to avoid accidental loops
   const lastLoadedFor = useRef(undefined);
@@ -1200,13 +1191,13 @@ const FileManagementScreen = ({
     const isVideo = file.contentType.startsWith('video/');
     const isAudio = file.contentType.startsWith('audio/');
     const hasPreview = isImage || isPDF || isVideo;
-    const borderColor = themeStyles.borderColor;
+    const borderColor = colors.border;
     return /*#__PURE__*/_jsxs(View, {
       style: [fileManagementStyles.fileItem, {
-        backgroundColor: themeStyles.secondaryBackgroundColor,
+        backgroundColor: colors.backgroundSecondary,
         borderColor
       }, selectMode && selectedIds.has(file.id) && {
-        borderColor: themeStyles.primaryColor,
+        borderColor: colors.primary,
         borderWidth: 2
       }],
       children: [/*#__PURE__*/_jsxs(TouchableOpacity, {
@@ -1233,10 +1224,10 @@ const FileManagementScreen = ({
               children: [/*#__PURE__*/_jsx(Ionicons, {
                 name: "document",
                 size: 32,
-                color: themeStyles.primaryColor
+                color: colors.primary
               }), /*#__PURE__*/_jsx(Text, {
                 style: [fileManagementStyles.pdfLabel, {
-                  color: themeStyles.primaryColor
+                  color: colors.primary
                 }],
                 children: "PDF"
               })]
@@ -1269,14 +1260,14 @@ const FileManagementScreen = ({
               children: /*#__PURE__*/_jsx(Ionicons, {
                 name: getFileIcon(file.contentType),
                 size: 32,
-                color: themeStyles.primaryColor
+                color: colors.primary
               })
             }), selectMode && /*#__PURE__*/_jsx(View, {
               style: fileManagementStyles.selectionBadge,
               children: /*#__PURE__*/_jsx(Ionicons, {
                 name: selectedIds.has(file.id) ? 'checkmark-circle' : 'ellipse-outline',
                 size: 22,
-                color: selectedIds.has(file.id) ? themeStyles.primaryColor : themeStyles.textColor
+                color: selectedIds.has(file.id) ? colors.primary : colors.text
               })
             })]
           }) : /*#__PURE__*/_jsx(View, {
@@ -1284,25 +1275,25 @@ const FileManagementScreen = ({
             children: /*#__PURE__*/_jsx(Ionicons, {
               name: getFileIcon(file.contentType),
               size: 32,
-              color: themeStyles.primaryColor
+              color: colors.primary
             })
           })
         }), /*#__PURE__*/_jsxs(View, {
           style: fileManagementStyles.fileInfo,
           children: [/*#__PURE__*/_jsx(Text, {
             style: [fileManagementStyles.fileName, {
-              color: themeStyles.textColor
+              color: colors.text
             }],
             numberOfLines: 1,
             children: file.filename
           }), /*#__PURE__*/_jsxs(Text, {
             style: [fileManagementStyles.fileDetails, {
-              color: themeStyles.isDarkTheme ? '#BBBBBB' : '#666666'
+              color: bloomTheme.isDark ? '#BBBBBB' : '#666666'
             }],
             children: [formatFileSize(file.length), " \u2022 ", new Date(file.uploadDate).toLocaleDateString()]
           }), file.metadata?.description && /*#__PURE__*/_jsx(Text, {
             style: [fileManagementStyles.fileDescription, {
-              color: themeStyles.isDarkTheme ? '#AAAAAA' : '#888888'
+              color: bloomTheme.isDark ? '#AAAAAA' : '#888888'
             }],
             numberOfLines: 2,
             children: file.metadata.description
@@ -1312,27 +1303,27 @@ const FileManagementScreen = ({
         style: fileManagementStyles.fileActions,
         children: [hasPreview && /*#__PURE__*/_jsx(TouchableOpacity, {
           style: [fileManagementStyles.actionButton, {
-            backgroundColor: themeStyles.isDarkTheme ? '#333333' : '#F0F0F0'
+            backgroundColor: bloomTheme.isDark ? '#333333' : '#F0F0F0'
           }],
           onPress: () => handleFileOpen(file),
           children: /*#__PURE__*/_jsx(Ionicons, {
             name: "eye",
             size: 20,
-            color: themeStyles.primaryColor
+            color: colors.primary
           })
         }), /*#__PURE__*/_jsx(TouchableOpacity, {
           style: [fileManagementStyles.actionButton, {
-            backgroundColor: themeStyles.isDarkTheme ? '#333333' : '#F0F0F0'
+            backgroundColor: bloomTheme.isDark ? '#333333' : '#F0F0F0'
           }],
           onPress: () => handleFileDownload(file.id, file.filename),
           children: /*#__PURE__*/_jsx(Ionicons, {
             name: "download",
             size: 20,
-            color: themeStyles.primaryColor
+            color: colors.primary
           })
         }), /*#__PURE__*/_jsx(TouchableOpacity, {
           style: [fileManagementStyles.actionButton, {
-            backgroundColor: themeStyles.isDarkTheme ? '#400000' : '#FFEBEE'
+            backgroundColor: bloomTheme.isDark ? '#400000' : '#FFEBEE'
           }],
           onPress: () => {
             handleFileDelete(file.id, file.filename);
@@ -1340,11 +1331,11 @@ const FileManagementScreen = ({
           disabled: deleting === file.id,
           children: deleting === file.id ? /*#__PURE__*/_jsx(ActivityIndicator, {
             size: "small",
-            color: themeStyles.dangerColor
+            color: colors.error
           }) : /*#__PURE__*/_jsx(Ionicons, {
             name: "trash",
             size: 20,
-            color: themeStyles.dangerColor
+            color: colors.error
           })
         })]
       })]
@@ -1452,7 +1443,7 @@ const FileManagementScreen = ({
             children: /*#__PURE__*/_jsx(Ionicons, {
               name: "document",
               size: 20,
-              color: themeStyles.primaryColor
+              color: colors.primary
             })
           });
         }
@@ -1461,7 +1452,7 @@ const FileManagementScreen = ({
         id: file.id,
         customIcon: customIcon,
         icon: !hasPreview ? getFileIcon(file.contentType) : undefined,
-        iconColor: themeStyles.primaryColor,
+        iconColor: colors.primary,
         title: file.filename,
         subtitle: `${formatFileSize(file.length)} • ${new Date(file.uploadDate).toLocaleDateString()}`,
         theme: theme,
@@ -1491,50 +1482,50 @@ const FileManagementScreen = ({
           style: fileManagementStyles.groupedActions,
           children: [(isImage || isVideo || file.contentType.includes('pdf')) && /*#__PURE__*/_jsx(TouchableOpacity, {
             style: [fileManagementStyles.groupedActionBtn, {
-              backgroundColor: themeStyles.isDarkTheme ? '#333333' : '#F0F0F0'
+              backgroundColor: bloomTheme.isDark ? '#333333' : '#F0F0F0'
             }],
             onPress: () => handleFileOpen(file),
             children: /*#__PURE__*/_jsx(Ionicons, {
               name: "eye",
               size: 18,
-              color: themeStyles.primaryColor
+              color: colors.primary
             })
           }), /*#__PURE__*/_jsx(TouchableOpacity, {
             style: [fileManagementStyles.groupedActionBtn, {
-              backgroundColor: themeStyles.isDarkTheme ? '#333333' : '#F0F0F0'
+              backgroundColor: bloomTheme.isDark ? '#333333' : '#F0F0F0'
             }],
             onPress: () => handleFileDownload(file.id, file.filename),
             children: /*#__PURE__*/_jsx(Ionicons, {
               name: "download",
               size: 18,
-              color: themeStyles.primaryColor
+              color: colors.primary
             })
           }), /*#__PURE__*/_jsx(TouchableOpacity, {
             style: [fileManagementStyles.groupedActionBtn, {
-              backgroundColor: themeStyles.isDarkTheme ? '#400000' : '#FFEBEE'
+              backgroundColor: bloomTheme.isDark ? '#400000' : '#FFEBEE'
             }],
             onPress: () => handleFileDelete(file.id, file.filename),
             disabled: deleting === file.id,
             children: deleting === file.id ? /*#__PURE__*/_jsx(ActivityIndicator, {
               size: "small",
-              color: themeStyles.dangerColor
+              color: colors.error
             }) : /*#__PURE__*/_jsx(Ionicons, {
               name: "trash",
               size: 18,
-              color: themeStyles.dangerColor
+              color: colors.error
             })
           })]
         }) : undefined,
         customContentBelow: file.metadata?.description ? /*#__PURE__*/_jsx(Text, {
           style: [fileManagementStyles.groupedDescription, {
-            color: themeStyles.isDarkTheme ? '#AAAAAA' : '#666666'
+            color: bloomTheme.isDark ? '#AAAAAA' : '#666666'
           }],
           numberOfLines: 2,
           children: file.metadata.description
         }) : undefined
       };
     });
-  }, [filteredFiles, theme, themeStyles, deleting, handleFileDownload, handleFileDelete, handleFileOpen, getSafeDownloadUrlCallback, selectMode, selectedIds]);
+  }, [filteredFiles, theme, deleting, handleFileDownload, handleFileDelete, handleFileOpen, getSafeDownloadUrlCallback, selectMode, selectedIds]);
 
   // Scroll to selected file after selection
   useEffect(() => {
@@ -1663,20 +1654,20 @@ const FileManagementScreen = ({
         children: [/*#__PURE__*/_jsx(Ionicons, {
           name: "images-outline",
           size: 64,
-          color: themeStyles.isDarkTheme ? '#666666' : '#CCCCCC'
+          color: bloomTheme.isDark ? '#666666' : '#CCCCCC'
         }), /*#__PURE__*/_jsx(Text, {
           style: [fileManagementStyles.emptyStateTitle, {
-            color: themeStyles.textColor
+            color: colors.text
           }],
           children: t('fileManagement.emptyPhotos.title')
         }), /*#__PURE__*/_jsxs(Text, {
           style: [fileManagementStyles.emptyStateDescription, {
-            color: themeStyles.isDarkTheme ? '#BBBBBB' : '#666666'
+            color: bloomTheme.isDark ? '#BBBBBB' : '#666666'
           }],
           children: [" ", user?.id === targetUserId ? t('fileManagement.emptyPhotos.ownDescription') : t('fileManagement.emptyPhotos.otherDescription'), " "]
         }), user?.id === targetUserId && /*#__PURE__*/_jsx(TouchableOpacity, {
           style: [fileManagementStyles.emptyStateButton, {
-            backgroundColor: themeStyles.primaryColor
+            backgroundColor: colors.primary
           }],
           onPress: handleFileUpload,
           disabled: uploading || isPickingDocument,
@@ -1706,7 +1697,7 @@ const FileManagementScreen = ({
       refreshControl: /*#__PURE__*/_jsx(RefreshControl, {
         refreshing: refreshing,
         onRefresh: () => loadFiles('refresh'),
-        tintColor: themeStyles.primaryColor
+        tintColor: colors.primary
       }),
       showsVerticalScrollIndicator: false,
       onScroll: ({
@@ -1727,10 +1718,10 @@ const FileManagementScreen = ({
         style: fileManagementStyles.dimensionsLoadingIndicator,
         children: [/*#__PURE__*/_jsx(ActivityIndicator, {
           size: "small",
-          color: themeStyles.primaryColor
+          color: colors.primary
         }), /*#__PURE__*/_jsx(Text, {
           style: [fileManagementStyles.dimensionsLoadingText, {
-            color: themeStyles.isDarkTheme ? '#BBBBBB' : '#666666'
+            color: bloomTheme.isDark ? '#BBBBBB' : '#666666'
           }],
           children: t('fileManagement.loadingPhotoLayout')
         })]
@@ -1741,11 +1732,11 @@ const FileManagementScreen = ({
         createJustifiedRows: createJustifiedRows,
         renderJustifiedPhotoItem: renderJustifiedPhotoItem,
         renderSimplePhotoItem: renderPhotoItem,
-        textColor: themeStyles.textColor,
+        textColor: colors.text,
         containerWidth: safeContainerWidth
       })]
     });
-  }, [filteredFiles, themeStyles, user?.id, targetUserId, uploading, handleFileUpload, refreshing, loadFiles, loadingDimensions, photoDimensions, loadPhotoDimensions, createJustifiedRows, renderJustifiedPhotoItem, renderPhotoItem, safeContainerWidth]);
+  }, [filteredFiles, colors, user?.id, targetUserId, uploading, handleFileUpload, refreshing, loadFiles, loadingDimensions, photoDimensions, loadPhotoDimensions, createJustifiedRows, renderJustifiedPhotoItem, renderPhotoItem, safeContainerWidth]);
 
   // Inline justified grid removed (moved to components/photogrid/JustifiedPhotoGrid.tsx)
 
@@ -1754,20 +1745,20 @@ const FileManagementScreen = ({
     children: [/*#__PURE__*/_jsx(Ionicons, {
       name: "folder-open-outline",
       size: 64,
-      color: themeStyles.isDarkTheme ? '#666666' : '#CCCCCC'
+      color: bloomTheme.isDark ? '#666666' : '#CCCCCC'
     }), /*#__PURE__*/_jsx(Text, {
       style: [fileManagementStyles.emptyStateTitle, {
-        color: themeStyles.textColor
+        color: colors.text
       }],
       children: t('fileManagement.emptyFiles.title')
     }), /*#__PURE__*/_jsx(Text, {
       style: [fileManagementStyles.emptyStateDescription, {
-        color: themeStyles.isDarkTheme ? '#BBBBBB' : '#666666'
+        color: bloomTheme.isDark ? '#BBBBBB' : '#666666'
       }],
       children: user?.id === targetUserId ? t('fileManagement.emptyFiles.ownDescription') : t('fileManagement.emptyFiles.otherDescription')
     }), user?.id === targetUserId && /*#__PURE__*/_jsx(TouchableOpacity, {
       style: [fileManagementStyles.emptyStateButton, {
-        backgroundColor: themeStyles.primaryColor
+        backgroundColor: colors.primary
       }],
       onPress: handleFileUpload,
       disabled: uploading || isPickingDocument,
@@ -1826,7 +1817,7 @@ const FileManagementScreen = ({
           width,
           height,
           borderRadius,
-          backgroundColor: themeStyles.isDarkTheme ? '#1E1E1E' : '#F5F5F5',
+          backgroundColor: bloomTheme.isDark ? '#1E1E1E' : '#F5F5F5',
           overflow: 'hidden',
           position: 'relative'
         }, style],
@@ -1837,7 +1828,7 @@ const FileManagementScreen = ({
             left: 0,
             right: 0,
             bottom: 0,
-            backgroundColor: themeStyles.isDarkTheme ? '#1E1E1E' : '#F5F5F5'
+            backgroundColor: bloomTheme.isDark ? '#1E1E1E' : '#F5F5F5'
           }
         }), /*#__PURE__*/_jsx(Animated.View, {
           style: {
@@ -1854,8 +1845,8 @@ const FileManagementScreen = ({
             style: {
               width: skeletonContainerWidth,
               height: '100%',
-              backgroundColor: themeStyles.isDarkTheme ? 'rgba(255, 255, 255, 0.08)' : 'rgba(255, 255, 255, 0.8)',
-              shadowColor: themeStyles.isDarkTheme ? '#000' : '#FFF',
+              backgroundColor: bloomTheme.isDark ? 'rgba(255, 255, 255, 0.08)' : 'rgba(255, 255, 255, 0.8)',
+              shadowColor: bloomTheme.isDark ? '#000' : '#FFF',
               shadowOffset: {
                 width: 0,
                 height: 0
@@ -1877,9 +1868,9 @@ const FileManagementScreen = ({
         alignItems: 'center',
         paddingHorizontal: 16,
         paddingVertical: 12,
-        backgroundColor: themeStyles.isDarkTheme ? '#121212' : '#FFFFFF',
+        backgroundColor: bloomTheme.isDark ? '#121212' : '#FFFFFF',
         borderBottomWidth: StyleSheet.hairlineWidth,
-        borderBottomColor: themeStyles.borderColor
+        borderBottomColor: colors.border
       }],
       children: [/*#__PURE__*/_jsx(SkeletonBox, {
         width: 44,
@@ -1912,7 +1903,7 @@ const FileManagementScreen = ({
       }],
       children: [/*#__PURE__*/_jsxs(View, {
         style: [fileManagementStyles.header, {
-          borderBottomColor: themeStyles.borderColor,
+          borderBottomColor: colors.border,
           borderBottomWidth: StyleSheet.hairlineWidth
         }],
         children: [/*#__PURE__*/_jsx(SkeletonBox, {
@@ -1951,7 +1942,7 @@ const FileManagementScreen = ({
         })]
       }), /*#__PURE__*/_jsx(View, {
         style: [fileManagementStyles.searchContainer, {
-          backgroundColor: themeStyles.colors.card
+          backgroundColor: colors.card
         }],
         children: /*#__PURE__*/_jsx(SkeletonBox, {
           width: "100%",
@@ -1960,7 +1951,7 @@ const FileManagementScreen = ({
         })
       }), /*#__PURE__*/_jsx(View, {
         style: [fileManagementStyles.statsContainer, {
-          backgroundColor: themeStyles.colors.card
+          backgroundColor: colors.card
         }],
         children: [1, 2, 3].map(i => /*#__PURE__*/_jsxs(View, {
           style: fileManagementStyles.statItem,
@@ -1983,7 +1974,7 @@ const FileManagementScreen = ({
         showsVerticalScrollIndicator: false,
         children: /*#__PURE__*/_jsx(View, {
           style: {
-            backgroundColor: themeStyles.colors.card,
+            backgroundColor: colors.card,
             borderRadius: 18,
             overflow: 'hidden',
             marginTop: 8
@@ -2011,7 +2002,6 @@ const FileManagementScreen = ({
         onClose: handleCloseFile,
         onDownload: handleFileDownload,
         onDelete: handleFileDelete,
-        themeStyles: themeStyles,
         isOwner: user?.id === targetUserId
       }), /*#__PURE__*/_jsx(FileDetailsModal, {
         visible: showFileDetails,
@@ -2019,7 +2009,6 @@ const FileManagementScreen = ({
         onClose: () => setShowFileDetails(false),
         onDownload: handleFileDownload,
         onDelete: handleFileDelete,
-        themeStyles: themeStyles,
         isOwner: user?.id === targetUserId
       })]
     });
@@ -2045,7 +2034,6 @@ const FileManagementScreen = ({
         onConfirm: handleConfirmUpload,
         onCancel: handleCancelUpload,
         onRemoveFile: removePendingFile,
-        themeStyles: themeStyles,
         inline: true
       })]
     });
@@ -2123,48 +2111,48 @@ const FileManagementScreen = ({
         style: fileManagementStyles.viewModeScroll,
         children: /*#__PURE__*/_jsxs(View, {
           style: [fileManagementStyles.viewModeToggle, {
-            backgroundColor: themeStyles.colors.card
+            backgroundColor: colors.card
           }],
           children: [/*#__PURE__*/_jsx(AnimatedButton, {
             isSelected: viewMode === 'all',
             onPress: () => setViewMode('all'),
             icon: viewMode === 'all' ? 'folder' : 'folder-outline',
-            primaryColor: themeStyles.primaryColor,
-            textColor: themeStyles.textColor,
+            primaryColor: colors.primary,
+            textColor: colors.text,
             style: fileManagementStyles.viewModeButton
           }), /*#__PURE__*/_jsx(AnimatedButton, {
             isSelected: viewMode === 'photos',
             onPress: () => setViewMode('photos'),
             icon: viewMode === 'photos' ? 'image-multiple' : 'image-multiple-outline',
-            primaryColor: themeStyles.primaryColor,
-            textColor: themeStyles.textColor,
+            primaryColor: colors.primary,
+            textColor: colors.text,
             style: fileManagementStyles.viewModeButton
           }), /*#__PURE__*/_jsx(AnimatedButton, {
             isSelected: viewMode === 'videos',
             onPress: () => setViewMode('videos'),
             icon: viewMode === 'videos' ? 'video' : 'video-outline',
-            primaryColor: themeStyles.primaryColor,
-            textColor: themeStyles.textColor,
+            primaryColor: colors.primary,
+            textColor: colors.text,
             style: fileManagementStyles.viewModeButton
           }), /*#__PURE__*/_jsx(AnimatedButton, {
             isSelected: viewMode === 'documents',
             onPress: () => setViewMode('documents'),
             icon: viewMode === 'documents' ? 'file-document' : 'file-document-outline',
-            primaryColor: themeStyles.primaryColor,
-            textColor: themeStyles.textColor,
+            primaryColor: colors.primary,
+            textColor: colors.text,
             style: fileManagementStyles.viewModeButton
           }), /*#__PURE__*/_jsx(AnimatedButton, {
             isSelected: viewMode === 'audio',
             onPress: () => setViewMode('audio'),
             icon: viewMode === 'audio' ? 'music-note' : 'music-note-outline',
-            primaryColor: themeStyles.primaryColor,
-            textColor: themeStyles.textColor,
+            primaryColor: colors.primary,
+            textColor: colors.text,
             style: fileManagementStyles.viewModeButton
           })]
         })
       }), /*#__PURE__*/_jsxs(TouchableOpacity, {
         style: [fileManagementStyles.sortButton, {
-          backgroundColor: themeStyles.colors.card
+          backgroundColor: colors.card
         }],
         onPress: () => {
           // Cycle through sort options: date -> size -> name -> type -> date
@@ -2180,15 +2168,15 @@ const FileManagementScreen = ({
         children: [/*#__PURE__*/_jsx(MaterialCommunityIcons, {
           name: sortBy === 'date' ? 'calendar' : sortBy === 'size' ? 'sort-numeric-variant' : sortBy === 'name' ? 'sort-alphabetical-variant' : 'file-document-outline',
           size: 16,
-          color: themeStyles.textColor
+          color: colors.text
         }), /*#__PURE__*/_jsx(MaterialCommunityIcons, {
           name: sortOrder === 'asc' ? 'arrow-up' : 'arrow-down',
           size: 14,
-          color: themeStyles.colors.secondaryText
+          color: colors.textSecondary
         })]
       }), user?.id === targetUserId && (!selectMode || selectMode && allowUploadInSelectMode) && /*#__PURE__*/_jsx(TouchableOpacity, {
         style: [fileManagementStyles.uploadButton, {
-          backgroundColor: themeStyles.primaryColor
+          backgroundColor: colors.primary
         }],
         onPress: handleFileUpload,
         disabled: uploading || isPickingDocument,
@@ -2212,18 +2200,18 @@ const FileManagementScreen = ({
       })]
     }), files.length > 0 && (viewMode === 'all' || files.some(f => f.contentType.startsWith('image/'))) && /*#__PURE__*/_jsxs(View, {
       style: [fileManagementStyles.searchContainer, {
-        backgroundColor: themeStyles.colors.card
+        backgroundColor: colors.card
       }],
       children: [/*#__PURE__*/_jsx(Ionicons, {
         name: "search",
         size: 22,
-        color: themeStyles.colors.icon
+        color: colors.icon
       }), /*#__PURE__*/_jsx(TextInput, {
         style: [fileManagementStyles.searchInput, {
-          color: themeStyles.textColor
+          color: colors.text
         }],
         placeholder: viewMode === 'photos' ? t('fileManagement.searchPhotos') : t('fileManagement.searchFiles'),
-        placeholderTextColor: themeStyles.colors.secondaryText,
+        placeholderTextColor: colors.textSecondary,
         value: searchQuery,
         onChangeText: setSearchQuery
       }), searchQuery.length > 0 && /*#__PURE__*/_jsx(TouchableOpacity, {
@@ -2232,23 +2220,23 @@ const FileManagementScreen = ({
         children: /*#__PURE__*/_jsx(Ionicons, {
           name: "close-circle",
           size: 22,
-          color: themeStyles.colors.icon
+          color: colors.icon
         })
       })]
     }), files.length > 0 && /*#__PURE__*/_jsxs(View, {
       style: [fileManagementStyles.statsContainer, {
-        backgroundColor: themeStyles.colors.card
+        backgroundColor: colors.card
       }],
       children: [/*#__PURE__*/_jsxs(View, {
         style: fileManagementStyles.statItem,
         children: [/*#__PURE__*/_jsx(Text, {
           style: [fileManagementStyles.statValue, {
-            color: themeStyles.textColor
+            color: colors.text
           }],
           children: filteredFiles.length
         }), /*#__PURE__*/_jsx(Text, {
           style: [fileManagementStyles.statLabel, {
-            color: themeStyles.colors.secondaryText
+            color: colors.textSecondary
           }],
           children: searchQuery.length > 0 ? t('fileManagement.found') : filteredFiles.length === 1 ? viewMode === 'photos' ? t('fileManagement.photo') : t('fileManagement.file') : viewMode === 'photos' ? t('fileManagement.photos_stat') : t('fileManagement.files')
         })]
@@ -2256,12 +2244,12 @@ const FileManagementScreen = ({
         style: fileManagementStyles.statItem,
         children: [/*#__PURE__*/_jsx(Text, {
           style: [fileManagementStyles.statValue, {
-            color: themeStyles.textColor
+            color: colors.text
           }],
           children: formatFileSize(filteredFiles.reduce((total, file) => total + file.length, 0))
         }), /*#__PURE__*/_jsx(Text, {
           style: [fileManagementStyles.statLabel, {
-            color: themeStyles.colors.secondaryText
+            color: colors.textSecondary
           }],
           children: searchQuery.length > 0 ? t('fileManagement.size') : t('fileManagement.totalSize')
         })]
@@ -2269,12 +2257,12 @@ const FileManagementScreen = ({
         style: fileManagementStyles.statItem,
         children: [/*#__PURE__*/_jsx(Text, {
           style: [fileManagementStyles.statValue, {
-            color: themeStyles.textColor
+            color: colors.text
           }],
           children: files.length
         }), /*#__PURE__*/_jsx(Text, {
           style: [fileManagementStyles.statLabel, {
-            color: themeStyles.colors.secondaryText
+            color: colors.textSecondary
           }],
           children: t('fileManagement.total')
         })]
@@ -2286,7 +2274,7 @@ const FileManagementScreen = ({
       refreshControl: /*#__PURE__*/_jsx(RefreshControl, {
         refreshing: refreshing,
         onRefresh: () => loadFiles('refresh'),
-        tintColor: themeStyles.primaryColor
+        tintColor: colors.primary
       }),
       onScroll: ({
         nativeEvent
@@ -2307,22 +2295,22 @@ const FileManagementScreen = ({
         children: [/*#__PURE__*/_jsx(Ionicons, {
           name: "search",
           size: 64,
-          color: themeStyles.isDarkTheme ? '#666666' : '#CCCCCC'
+          color: bloomTheme.isDark ? '#666666' : '#CCCCCC'
         }), /*#__PURE__*/_jsx(Text, {
           style: [fileManagementStyles.emptyStateTitle, {
-            color: themeStyles.textColor
+            color: colors.text
           }],
           children: t('fileManagement.noResults.title')
         }), /*#__PURE__*/_jsx(Text, {
           style: [fileManagementStyles.emptyStateDescription, {
-            color: themeStyles.isDarkTheme ? '#BBBBBB' : '#666666'
+            color: bloomTheme.isDark ? '#BBBBBB' : '#666666'
           }],
           children: t('fileManagement.noResults.description', {
             query: searchQuery
           })
         }), /*#__PURE__*/_jsxs(TouchableOpacity, {
           style: [fileManagementStyles.emptyStateButton, {
-            backgroundColor: themeStyles.primaryColor
+            backgroundColor: colors.primary
           }],
           onPress: () => setSearchQuery(''),
           children: [/*#__PURE__*/_jsx(Ionicons, {
@@ -2341,10 +2329,10 @@ const FileManagementScreen = ({
           style: fileManagementStyles.loadingMoreBar,
           children: [/*#__PURE__*/_jsx(ActivityIndicator, {
             size: "small",
-            color: themeStyles.primaryColor
+            color: colors.primary
           }), /*#__PURE__*/_jsx(Text, {
             style: [fileManagementStyles.loadingMoreText, {
-              color: themeStyles.textColor
+              color: colors.text
             }],
             children: t('fileManagement.loadingMore')
           })]
@@ -2356,7 +2344,6 @@ const FileManagementScreen = ({
       onClose: () => setShowFileDetails(false),
       onDownload: handleFileDownload,
       onDelete: handleFileDelete,
-      themeStyles: themeStyles,
       isOwner: user?.id === targetUserId
     }), !selectMode && uploading && /*#__PURE__*/_jsx(View, {
       style: [fileManagementStyles.uploadBannerContainer, {
@@ -2364,34 +2351,34 @@ const FileManagementScreen = ({
       }],
       children: /*#__PURE__*/_jsxs(View, {
         style: [fileManagementStyles.uploadBanner, {
-          backgroundColor: themeStyles.isDarkTheme ? '#222831EE' : '#FFFFFFEE',
-          borderColor: themeStyles.borderColor
+          backgroundColor: bloomTheme.isDark ? '#222831EE' : '#FFFFFFEE',
+          borderColor: colors.border
         }],
         children: [/*#__PURE__*/_jsx(Ionicons, {
           name: "cloud-upload",
           size: 18,
-          color: themeStyles.primaryColor
+          color: colors.primary
         }), /*#__PURE__*/_jsxs(View, {
           style: fileManagementStyles.uploadBannerContent,
           children: [/*#__PURE__*/_jsxs(Text, {
             style: [fileManagementStyles.uploadBannerText, {
-              color: themeStyles.textColor
+              color: colors.text
             }],
             children: [t('fileManagement.uploading'), uploadProgress ? ` ${uploadProgress.current}/${uploadProgress.total}` : '...']
           }), uploadProgress && uploadProgress.total > 0 && /*#__PURE__*/_jsx(View, {
             style: [fileManagementStyles.uploadProgressBarContainer, {
-              backgroundColor: themeStyles.isDarkTheme ? 'rgba(255,255,255,0.1)' : 'rgba(0,0,0,0.1)'
+              backgroundColor: bloomTheme.isDark ? 'rgba(255,255,255,0.1)' : 'rgba(0,0,0,0.1)'
             }],
             children: /*#__PURE__*/_jsx(View, {
               style: [fileManagementStyles.uploadProgressBar, {
                 width: `${uploadProgress.current / uploadProgress.total * 100}%`,
-                backgroundColor: themeStyles.primaryColor
+                backgroundColor: colors.primary
               }]
             })
           })]
         }), /*#__PURE__*/_jsx(ActivityIndicator, {
           size: "small",
-          color: themeStyles.primaryColor
+          color: colors.primary
         })]
       })
     })]