Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix android thumbs #2121

Merged
merged 4 commits into from
Feb 23, 2024
Merged

Fix android thumbs #2121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dedbb3c
replace react-native-fs with an active fork
utkubakir Feb 22, 2024
dd97214
time sink
utkubakir Feb 22, 2024
0e22b6f
fix
utkubakir Feb 23, 2024
c4d76f3
Merge branch 'main' into fix-android-thumbs
utkubakir Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/mobile/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"format": "prettier --write ."
},
"dependencies": {
"@dr.pogodin/react-native-fs": "^2.24.1",
"@gorhom/bottom-sheet": "^4.4.7",
"@hookform/resolvers": "^3.1.0",
"@oscartbeaumont-sd/rspc-client": "=0.0.0-main-dc31e5b2",
Expand Down Expand Up @@ -54,7 +55,6 @@
"react-native-circular-progress": "^1.3.9",
"react-native-document-picker": "^9.0.1",
"react-native-file-viewer": "^2.1.5",
"react-native-fs": "^2.20.0",
"react-native-gesture-handler": "~2.14.1",
"react-native-linear-gradient": "^2.8.3",
"react-native-popup-menu": "^0.16.1",
Expand Down
8 changes: 5 additions & 3 deletions apps/mobile/src/components/explorer/FileThumb.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { DocumentDirectoryPath } from '@dr.pogodin/react-native-fs';
import { getIcon } from '@sd/assets/util';
import { useEffect, useLayoutEffect, useMemo, useState, type PropsWithChildren } from 'react';
import { Image, View } from 'react-native';
import { DocumentDirectoryPath } from 'react-native-fs';
import {
getExplorerItemData,
getItemFilePath,
Expand All @@ -13,10 +13,12 @@ import { flattenThumbnailKey, useExplorerStore } from '~/stores/explorerStore';

import { tw } from '../../lib/tailwind';

export const getThumbnailUrlByThumbKey = (thumbKey: string[]) =>
`${DocumentDirectoryPath}/thumbnails/${thumbKey
// NOTE: `file://` is required for Android to load local files!
export const getThumbnailUrlByThumbKey = (thumbKey: string[]) => {
return `file://${DocumentDirectoryPath}/thumbnails/${thumbKey
.map((i) => encodeURIComponent(i))
.join('/')}.webp`;
};

const FileThumbWrapper = ({ children, size = 1 }: PropsWithChildren<{ size: number }>) => (
<View style={[tw`items-center justify-center`, { width: 80 * size, height: 80 * size }]}>
Expand Down
2 changes: 1 addition & 1 deletion apps/mobile/src/components/modal/ImportModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as RNFS from '@dr.pogodin/react-native-fs';
import { forwardRef, useCallback } from 'react';
import { Alert, Platform, Text, View } from 'react-native';
import DocumentPicker from 'react-native-document-picker';
import RNFS from 'react-native-fs';
import { useLibraryMutation, useRspcLibraryContext } from '@sd/client';
import { Modal, ModalRef } from '~/components/layout/Modal';
import { Button } from '~/components/primitive/Button';
Expand Down
11 changes: 4 additions & 7 deletions apps/mobile/src/components/overview/Categories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,7 @@ const Categories = ({ kinds }: Props) => {
break;
}
return (
<KindItem
kind={kind}
name={name}
icon={icon}
items={count}
/>
<KindItem kind={kind} name={name} icon={icon} items={count} />
);
}}
/>
Expand Down Expand Up @@ -76,7 +71,9 @@ const KindItem = ({ name, icon, items }: KindItemProps) => {
//TODO: implement
}}
>
<View style={twStyle('mr-10 shrink-0 flex-row items-center', 'gap-2 rounded-lg text-sm')}>
<View
style={twStyle('mr-10 shrink-0 flex-row items-center', 'gap-2 rounded-lg text-sm')}
>
<Icon name={icon} size={40} style={tw`mr-3 h-12 w-12`} />
<View>
<Text style={tw`text-sm font-medium text-ink`}>{name}</Text>
Expand Down
10 changes: 8 additions & 2 deletions apps/mobile/src/components/overview/OverviewStats.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as RNFS from '@dr.pogodin/react-native-fs';
import { AlphaRSPCError } from '@oscartbeaumont-sd/rspc-client/v2';
import { UseQueryResult } from '@tanstack/react-query';
import { useEffect, useState } from 'react';
import { Text, View } from 'react-native';
import RNFS from 'react-native-fs';
import { ClassInput } from 'twrnc/dist/esm/types';
import { byteSize, Statistics, StatisticsResponse, useLibraryContext } from '@sd/client';
import useCounter from '~/hooks/useCounter';
Expand Down Expand Up @@ -60,7 +60,13 @@ const OverviewStats = ({ stats }: Props) => {

// For Demo purposes as we probably wanna save this to database
// Sets Total Capacity and Free Space of the device
const [sizeInfo, setSizeInfo] = useState<RNFS.FSInfoResult>({ freeSpace: 0, totalSpace: 0 });
const [sizeInfo, setSizeInfo] = useState<RNFS.FSInfoResultT>({
freeSpace: 0,
totalSpace: 0,
// external storage (android only) - may not be reliable
freeSpaceEx: 0,
totalSpaceEx: 0
});

useEffect(() => {
const getFSInfo = async () => {
Expand Down
Loading
Loading