diff --git a/apps/mobile/src/components/drawer/DrawerLibraryManager.tsx b/apps/mobile/src/components/drawer/DrawerLibraryManager.tsx index 62c08d11a..112de0b9d 100644 --- a/apps/mobile/src/components/drawer/DrawerLibraryManager.tsx +++ b/apps/mobile/src/components/drawer/DrawerLibraryManager.tsx @@ -1,18 +1,18 @@ import { useDrawerStatus } from '@react-navigation/drawer'; import { useNavigation } from '@react-navigation/native'; +import { useClientContext } from '@sd/client'; import { MotiView } from 'moti'; import { CaretRight, CloudArrowDown, Gear, Lock, Plus } from 'phosphor-react-native'; import { useEffect, useRef, useState } from 'react'; import { Alert, Pressable, Text, View } from 'react-native'; -import { useClientContext } from '@sd/client'; import { tw, twStyle } from '~/lib/tailwind'; import { currentLibraryStore } from '~/utils/nav'; import { AnimatedHeight } from '../animation/layout'; import { ModalRef } from '../layout/Modal'; import CreateLibraryModal from '../modal/CreateLibraryModal'; -import { Divider } from '../primitive/Divider'; import ImportModalLibrary from '../modal/ImportLibraryModal'; +import { Divider } from '../primitive/Divider'; const DrawerLibraryManager = () => { const [dropdownClosed, setDropdownClosed] = useState(true); @@ -24,7 +24,6 @@ const DrawerLibraryManager = () => { }, [isDrawerOpen]); const { library: currentLibrary, libraries } = useClientContext(); - const navigation = useNavigation(); const modalRef = useRef(null); @@ -58,7 +57,6 @@ const DrawerLibraryManager = () => { > {/* Libraries */} {libraries.data?.map((library) => { - // console.log('library', library); return ( = ({ )} /> - + {location.name ?? ''} diff --git a/apps/mobile/src/components/explorer/FileThumb.tsx b/apps/mobile/src/components/explorer/FileThumb.tsx index 897cc19d4..ffc51417a 100644 --- a/apps/mobile/src/components/explorer/FileThumb.tsx +++ b/apps/mobile/src/components/explorer/FileThumb.tsx @@ -1,16 +1,15 @@ import { DocumentDirectoryPath } from '@dr.pogodin/react-native-fs'; import { getIcon } from '@sd/assets/util'; +import { + ThumbKey, + getExplorerItemData, + getItemLocation, + isDarkTheme, + type ExplorerItem +} from '@sd/client'; import { Image } from 'expo-image'; import { useEffect, useLayoutEffect, useMemo, useState, type PropsWithChildren } from 'react'; import { View } from 'react-native'; -import { - getExplorerItemData, - getItemFilePath, - getItemLocation, - isDarkTheme, - ThumbKey, - type ExplorerItem -} from '@sd/client'; import { flattenThumbnailKey, useExplorerStore } from '~/stores/explorerStore'; import { tw } from '../../lib/tailwind'; @@ -71,7 +70,6 @@ type FileThumbProps = { export default function FileThumb({ size = 1, ...props }: FileThumbProps) { const itemData = useExplorerItemData(props.data); const locationData = getItemLocation(props.data); - const filePath = getItemFilePath(props.data); const [src, setSrc] = useState(null); const [thumbType, setThumbType] = useState(ThumbType.Icon); @@ -132,7 +130,6 @@ export default function FileThumb({ size = 1, ...props }: FileThumbProps) { break; } }, [itemData, thumbType]); - return ( {(() => { diff --git a/apps/mobile/src/components/search/filters/Kind.tsx b/apps/mobile/src/components/search/filters/Kind.tsx index 17b666253..a951270b2 100644 --- a/apps/mobile/src/components/search/filters/Kind.tsx +++ b/apps/mobile/src/components/search/filters/Kind.tsx @@ -1,12 +1,11 @@ import { IconTypes } from '@sd/assets/util'; +import { ObjectKind } from '@sd/client'; import { MotiView } from 'moti'; import { memo, useCallback, useMemo } from 'react'; import { FlatList, Pressable, Text, View } from 'react-native'; import { LinearTransition } from 'react-native-reanimated'; -import { ObjectKind } from '@sd/client'; import { Icon } from '~/components/icons/Icon'; import Card from '~/components/layout/Card'; -import Fade from '~/components/layout/Fade'; import SectionTitle from '~/components/layout/SectionTitle'; import VirtualizedListWrapper from '~/components/layout/VirtualizedListWrapper'; import { tw, twStyle } from '~/lib/tailwind'; @@ -40,12 +39,11 @@ const Kind = () => { sub="What kind of objects should be searched?" /> - } - contentContainerStyle={tw`pl-6`} + contentContainerStyle={tw`px-6`} numColumns={kinds && Math.ceil(Number(kinds.length) / 2)} key={kinds ? 'kindsSearch' : '_'} scrollEnabled={false} @@ -56,7 +54,6 @@ const Kind = () => { style={tw`flex-row`} /> - ); diff --git a/apps/mobile/src/screens/settings/Settings.tsx b/apps/mobile/src/screens/settings/Settings.tsx index 900b6696f..0e3357517 100644 --- a/apps/mobile/src/screens/settings/Settings.tsx +++ b/apps/mobile/src/screens/settings/Settings.tsx @@ -153,7 +153,7 @@ export default function SettingsScreen({ navigation }: SettingsStackScreenProps< const debugState = useDebugState(); return ( - + )} + scrollEnabled={false} renderSectionHeader={renderSectionHeader} ListFooterComponent={} showsVerticalScrollIndicator={false} diff --git a/apps/mobile/src/screens/settings/client/LibrarySettings.tsx b/apps/mobile/src/screens/settings/client/LibrarySettings.tsx index f4a5d0812..99adaa819 100644 --- a/apps/mobile/src/screens/settings/client/LibrarySettings.tsx +++ b/apps/mobile/src/screens/settings/client/LibrarySettings.tsx @@ -1,9 +1,8 @@ +import { LibraryConfigWrapped, useBridgeQuery, useLibraryContext } from '@sd/client'; import { DotsThreeOutlineVertical, Pen, Trash } from 'phosphor-react-native'; import React, { useEffect, useRef } from 'react'; import { Animated, FlatList, Pressable, Text, View } from 'react-native'; import { Swipeable } from 'react-native-gesture-handler'; -import { LibraryConfigWrapped, useBridgeQuery } from '@sd/client'; -import Fade from '~/components/layout/Fade'; import { ModalRef } from '~/components/layout/Modal'; import ScreenContainer from '~/components/layout/ScreenContainer'; import DeleteLibraryModal from '~/components/modal/confirmModals/DeleteLibraryModal'; @@ -14,10 +13,12 @@ import { SettingsStackScreenProps } from '~/navigation/tabs/SettingsStack'; function LibraryItem({ library, index, - navigation + navigation, + current }: { library: LibraryConfigWrapped; index: number; + current: boolean; navigation: SettingsStackScreenProps<'LibrarySettings'>['navigation']; }) { const renderRightActions = ( @@ -63,8 +64,15 @@ function LibraryItem({ > + {library.config.name} - {library.uuid} + {current && ( + + Current + + )} + + {library.uuid} swipeRef.current?.openRight()}> ) => { const libraryList = useBridgeQuery(['library.list']); const libraries = libraryList.data; + const { library } = useLibraryContext(); useEffect(() => { navigation.setOptions({ @@ -101,22 +110,19 @@ const LibrarySettingsScreen = ({ navigation }: SettingsStackScreenProps<'Library return ( - item.uuid} renderItem={({ item, index }) => ( - + )} /> - ); }; diff --git a/apps/mobile/src/screens/settings/info/About.tsx b/apps/mobile/src/screens/settings/info/About.tsx index 71550e2e9..445dfe577 100644 --- a/apps/mobile/src/screens/settings/info/About.tsx +++ b/apps/mobile/src/screens/settings/info/About.tsx @@ -1,8 +1,8 @@ +import { useBridgeQuery } from '@sd/client'; import { Image } from 'expo-image'; import { Globe } from 'phosphor-react-native'; import React from 'react'; import { Linking, Platform, Text, View } from 'react-native'; -import { useBridgeQuery } from '@sd/client'; import { DiscordIcon, GitHubIcon } from '~/components/icons/Brands'; import ScreenContainer from '~/components/layout/ScreenContainer'; import { Button } from '~/components/primitive/Button'; @@ -98,7 +98,7 @@ const AboutScreen = () => { diff --git a/apps/mobile/src/screens/settings/library/CloudSettings/Library.tsx b/apps/mobile/src/screens/settings/library/CloudSettings/Library.tsx index 5bd825da2..876007b1f 100644 --- a/apps/mobile/src/screens/settings/library/CloudSettings/Library.tsx +++ b/apps/mobile/src/screens/settings/library/CloudSettings/Library.tsx @@ -41,7 +41,7 @@ const Library = ({ cloudLibrary }: LibraryProps) => {