diff --git a/TODO.md b/TODO.md
index 196d11c..14e4d75 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,12 +1,6 @@
# TODO's
-* USAR FONTE LOCAL
-* RENDERIZAR IMAGEM DO PDF NO CARD
-* NOVO HEADER PRA LEITURA DO PDF ✅
-* INPUT NO HEADER - PROCURAR OCORRENCIAS NO
-PDF E RENDERIZAR UM MODAL COM BOTÕES QUE QUANDO CLICADOS LEVAM
-ONDE O QUE VOCE PROCUROU FOI ENCONTRADO.
* AUTENTICACAO
-* CI/CD
-
-### OBS: FONTES JÁ INSTALADAS NO PROJETO /assets/fonts
\ No newline at end of file
+* SPLASH SCREEN COM SKIA
+* ÍCONE DO APP
+* CI/CD
\ No newline at end of file
diff --git a/TORUN.md b/TORUN.md
index e4cfcb7..f9804c6 100644
--- a/TORUN.md
+++ b/TORUN.md
@@ -2,5 +2,4 @@
- npm i
- npx expo prebuild --platform android
-- npx expo run:android
-* usar android:largeHeap=true no xml \
\ No newline at end of file
+- npx expo run:android
\ No newline at end of file
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index d44c7d7..99b18fa 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
-
- handlePress()}>
- {getConfig("chipsIsActive") && (
-
+ handlePress()}>
+ {getConfig("chipsIsActive") && (
+
{title.length >= 20 ? `${title.slice(0, 20)}...` : title}
diff --git a/src/components/Card/Action/styles.ts b/src/components/Card/Action/styles.ts
index ff5cec9..8b8fa07 100644
--- a/src/components/Card/Action/styles.ts
+++ b/src/components/Card/Action/styles.ts
@@ -1,25 +1,17 @@
import styled from "styled-components/native";
-import { ImageBackground, TouchableOpacity } from "react-native";
-
-export const Container = styled(ImageBackground).attrs(({ theme }) => ({
- imageStyle: {
- borderRadius: theme.SIZES.size_6,
- }
-}))`
- width: 90px;
- height: 90px;
-`;
+import { TouchableOpacity } from "react-native";
export const TEste = styled.View`
border-radius: 6px;
`
-export const Clickable = styled(TouchableOpacity).attrs(() => ({
+export const Container= styled(TouchableOpacity).attrs(() => ({
activeOpacity: 0.8,
}))`
width: 90px;
height: 90px;
border-radius: ${({ theme }) => theme.SIZES.size_6}px;
+ background-color: ${({ theme }) => theme.COLORS.GREY_900};
flex-direction: row;
align-items: flex-end;
justify-content: flex-end;
diff --git a/src/components/Card/User/index.tsx b/src/components/Card/User/index.tsx
new file mode 100644
index 0000000..41b621b
--- /dev/null
+++ b/src/components/Card/User/index.tsx
@@ -0,0 +1,63 @@
+import {
+ Canvas,
+ LinearGradient,
+ RoundedRect,
+ vec,
+ useFont,
+ Text,
+} from "@shopify/react-native-skia";
+import { ActivityIndicator, Dimensions } from "react-native";
+import ReadexPro from "../../../assets/fonts/ReadexPro-Regular.ttf";
+import { useAsyncStore } from "@storage/MMKV/versaofudida";
+
+const width = Dimensions.get("window").width - 48;
+const height = 160;
+
+interface Props {
+ name: string;
+}
+
+export function CardUser({ name }: Props): JSX.Element | null {
+ const fontTitle = useFont(ReadexPro, 20);
+ const fontNormal = useFont(ReadexPro, 10);
+
+ if (fontTitle === null || fontNormal === null) {
+ return
+
+
+
+ );
+}
diff --git a/src/components/Card/User/styles.ts b/src/components/Card/User/styles.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/components/Carousel/afterDivider/index.tsx b/src/components/Carousel/afterDivider/index.tsx
index 2ac7c71..1dd311d 100644
--- a/src/components/Carousel/afterDivider/index.tsx
+++ b/src/components/Carousel/afterDivider/index.tsx
@@ -3,24 +3,22 @@ import { Dimensions, FlatList } from "react-native";
import { Container, Separator } from "./styles";
import { Empty } from "../Empty";
import { Book } from "@storage/MMKV/default";
-import { useMMKVStore } from "@storage/MMKV";
+import { useAsyncStore } from "@storage/MMKV/versaofudida";
interface Props {
filterQuery: string;
}
const CarouselAfterDivider = ({ filterQuery }: Props) => {
- const { getBookData } = useMMKVStore()
- const data: Book[] = [
- ...getBookData('allBooks') as Book[] || [],
- ];
+ const { getBookData } = useAsyncStore();
+ const data: Book[] = [...((getBookData("allBooks") as Book[]) || [])];
const filteredData =
filterQuery.length === 0
? data
: data.filter((item) =>
- item.title?.toLowerCase().includes(filterQuery.toLowerCase())
- );
+ item.title?.toLowerCase().includes(filterQuery.toLowerCase())
+ );
return (
@@ -29,7 +27,14 @@ const CarouselAfterDivider = ({ filterQuery }: Props) => {
data={filteredData}
renderItem={({ item, index }) => (
-
+
)}
numColumns={3}
@@ -42,9 +47,11 @@ const CarouselAfterDivider = ({ filterQuery }: Props) => {
}}
keyExtractor={(item) => item.id + "#"}
showsVerticalScrollIndicator={false}
- ListEmptyComponent={
- Parece que não há livros
- }
+ ListEmptyComponent={
+
+ Parece que não há livros
+
+ }
/>
);
diff --git a/src/components/Carousel/index.tsx b/src/components/Carousel/index.tsx
index 40dc6c2..9231850 100644
--- a/src/components/Carousel/index.tsx
+++ b/src/components/Carousel/index.tsx
@@ -3,14 +3,14 @@ import React, { useState } from "react";
import { FlatList } from "react-native";
import { Container } from "./styles";
import { Book } from "@storage/MMKV/default";
-import { useMMKVStore } from "@storage/MMKV";
+import { useAsyncStore } from "@storage/MMKV/versaofudida";
const ITEM_WIDTH = 200;
const ITEM_SPACING = 20;
const Carousel = () => {
const [currentIndex, setCurrentIndex] = useState(0);
- const { getBookData } = useMMKVStore();
+ const { getBookData } = useAsyncStore();
const hasRecent = getBookData("lastBooksRead") as Book[];
const data: Book[] = [...((getBookData("lastBooksRead") as Book[]) || [])];
diff --git a/src/components/LoadIndicator/index.tsx b/src/components/LoadIndicator/index.tsx
new file mode 100644
index 0000000..871bc5d
--- /dev/null
+++ b/src/components/LoadIndicator/index.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { View, ActivityIndicator } from 'react-native';
+
+import { styles } from './styles';
+
+export function LoadIndicator() {
+ return (
+
+
+ );
+}
\ No newline at end of file
diff --git a/src/components/LoadIndicator/styles.ts b/src/components/LoadIndicator/styles.ts
new file mode 100644
index 0000000..e0baea5
--- /dev/null
+++ b/src/components/LoadIndicator/styles.ts
@@ -0,0 +1,9 @@
+import { StyleSheet } from "react-native";
+
+export const styles = StyleSheet.create({
+ container: {
+ flex: 1,
+ justifyContent: "center",
+ alignItems: "center",
+ },
+});
diff --git a/src/components/Loading/styles.ts b/src/components/Loading/styles.ts
index 3092d54..e3175e4 100644
--- a/src/components/Loading/styles.ts
+++ b/src/components/Loading/styles.ts
@@ -8,6 +8,6 @@ export const Container = styled.View`
`;
export const LoadingIndicator = styled.ActivityIndicator.attrs(({ theme }) => ({
- color: theme.COLORS.PRIMARY,
+ color: '#F4EFEF',
size: 64,
}))``;
diff --git a/src/routes/app.routes.tsx b/src/routes/app.routes.tsx
index 68a91e9..9019c9c 100644
--- a/src/routes/app.routes.tsx
+++ b/src/routes/app.routes.tsx
@@ -1,11 +1,12 @@
import { createNativeStackNavigator } from "@react-navigation/native-stack";
import { Home } from "@screens/Home";
import { Settings } from "@screens/Settings";
-import { Account } from "@screens/Account";
+import { Login } from "@screens/Login";
import { SearchBarBehavior } from "@screens/SearchBar";
import { ChipsConfig } from "@screens/Chips";
import { Books } from "@screens/Book";
import { Register } from "@screens/Register";
+import { Account } from "@screens/Account";
const { Navigator, Screen } = createNativeStackNavigator();
@@ -21,10 +22,9 @@ export function AppRoutes() {
>
-
-
- Log-in, you're disconnected.
-
- log-in
-
- Don't have an account?
-
-
-}
\ No newline at end of file
+import { Button } from "@components/Button";
+import { AccordionGroup, Container } from "./styles";
+import { Header } from "@components/Header";
+import { useNavigation } from "@react-navigation/native";
+import { useConfigStore } from "@storage/settings";
+import { CardUser } from "@components/Card/User";
+import { Accordion } from "@components/Accordion";
+import { RightIcon, WarningIcon } from "@components/Icon";
+import { ButtonIcon } from "@components/Button/Icon";
+import { Book } from "@storage/MMKV/default";
+import { useAsyncStore } from "@storage/MMKV/versaofudida";
+
+export function Account() {
+ const { getConfig, resetAllConfig } = useConfigStore();
+ const { getBookData } = useAsyncStore();
+ const navigation = useNavigation();
+ const name = getConfig("account").name.split(" ")[0];
+ const userId: number = getConfig("account").id;
+
+ const books: Book[] = [...(getBookData("allBooks") as Book[])];
+
+ function deleteAccount() {
+ fetch(`https://webapisenac.azurewebsites.net/usuario/${userId}`, {
+ method: "DELETE",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ })
+ .then((response) => {
+ if (response.ok) {
+ // Account deleted successfully
+ console.log("Account deleted");
+ navigation.navigate("Home");
+ setTimeout(() => resetAllConfig(), 120);
+ } else {
+ throw new Error("Failed to delete account");
+ }
+ })
+ .catch((error) => {
+ // An error occurred
+ console.error("Error deleting account:", error);
+ });
+ }
+
+ function logOut() {
+ navigation.navigate("Home");
+ setTimeout(() => resetAllConfig(), 120);
+ }
+
+ return (
+
+
+
+ deleteAccount()}>
+ Deletar conta
+
+
+
+
+ Log-out
+
+
+
+ );
+}
diff --git a/src/screens/Account/styles.ts b/src/screens/Account/styles.ts
index 02ac861..0280a10 100644
--- a/src/screens/Account/styles.ts
+++ b/src/screens/Account/styles.ts
@@ -1,31 +1,16 @@
-import { Dimensions } from "react-native";
-import styled from "styled-components/native";
-
-export const Container = styled.View`
- height: ${() => Dimensions.get("window").height}px;
- background-color: ${({ theme }) => theme.COLORS.WHITE};
- align-items: center;
- background-color: ${({ theme }) => theme.COLORS.NEUTRAL_900};
- width: ${() => Dimensions.get("window").width}px
-`;
-
-export const LoginForm = styled.View`
- width: 300px;
- padding: 4px;
- gap: 24px;
- margin-top: 48px;
- padding-left: ${({ theme }) => theme.SIZES.size_24}px;
- padding-right: ${({ theme }) => theme.SIZES.size_24}px;
-`;
-
-export const Title = styled.Text`
- font-family: ${({ theme }) => theme.FONT.REGULAR};
- font-size: ${({ theme }) => theme.FONT_SIZE.SM}px;
- color: ${({ theme }) => theme.COLORS.GREY_500};
-`;
-
-export const Label = styled.Text`
- font-family: ${({ theme }) => theme.FONT.REGULAR};
- font-size: ${({ theme }) => theme.FONT_SIZE.XSM}px;
- color: ${({ theme }) => theme.COLORS.GREY_200};
-`;
\ No newline at end of file
+import { Dimensions } from "react-native";
+import styled from "styled-components/native";
+
+export const Container = styled.View`
+ flex-direction: column;
+ gap: 48px;
+ height: ${() => Dimensions.get("window").height}px;
+ background-color: ${({ theme }) => theme.COLORS.WHITE};
+ align-items: center;
+ background-color: ${({ theme }) => theme.COLORS.NEUTRAL_900};
+ width: ${() => Dimensions.get("window").width}px;
+`;
+
+export const AccordionGroup = styled.View`
+ gap: 16px;
+`;
diff --git a/src/screens/Book/index.tsx b/src/screens/Book/index.tsx
index 4f96348..e69de29 100644
--- a/src/screens/Book/index.tsx
+++ b/src/screens/Book/index.tsx
@@ -1,64 +0,0 @@
-import { Container } from "./styles";
-import { useRoute } from "@react-navigation/native";
-import { Book } from "@storage/MMKV/default";
-import Pdf from "react-native-pdf";
-import { SafeAreaView, StatusBar, useWindowDimensions } from "react-native";
-import { useMMKVStore } from "@storage/MMKV";
-import { useEffect, useRef } from "react";
-import { HeaderReader } from "@components/Header/Reader";
-
-export function Books() {
- const { setBookProperty } = useMMKVStore();
- const route = useRoute();
- const { id, title, uri, inPage } = route.params as Book;
-
- const { width, height } = useWindowDimensions();
-
- const pdfRef = useRef(null); // create a ref to the PDF component
-
- useEffect(() => {
- setTimeout(() => {
- pdfRef.current?.setPage(inPage as number);
- pdfRef.current?.state
- }, 50);
- }, []);
-
- return (
-
-
- {
- console.log(error);
- }}
- ref={pdfRef}
- onLoadComplete={(numberOfPages, filePath) => {
- setBookProperty(id, "allBooks", "totalPages", numberOfPages);
- setBookProperty(id, "lastBooksRead", "totalPages", numberOfPages);
- }}
- onPageChanged={(page, numberOfPages) => {
- setBookProperty(id, "allBooks", "inPage", page);
- setBookProperty(
- id,
- "allBooks",
- "totalRead",
- (page / numberOfPages) * 100
- );
- setBookProperty(id, "lastBooksRead", "inPage", page);
- setBookProperty(
- id,
- "lastBooksRead",
- "totalRead",
- (page / numberOfPages) * 100
- );
- }}
- style={{ flex: 1, width, height }}
- />
-
-
- );
-}
diff --git a/src/screens/Home/index.tsx b/src/screens/Home/index.tsx
index 398441e..20f3e6f 100644
--- a/src/screens/Home/index.tsx
+++ b/src/screens/Home/index.tsx
@@ -7,40 +7,48 @@ import { CarouselHeader } from "./Header";
import { Divider } from "@components/Divider";
import CarouselAfterDivider from "@components/Carousel/afterDivider";
import { InputText } from "@components/Input";
-import { useState } from "react";
+import { useEffect, useState } from "react";
import { useNavigation } from "@react-navigation/native";
-import { useMMKVStore } from "@storage/MMKV";
import { Book } from "@storage/MMKV/default";
import { useConfigStore } from "@storage/settings";
+import * as Network from "expo-network";
+import { useAsyncStore } from "@storage/MMKV/versaofudida";
export function Home() {
- const { getBookData } = useMMKVStore();
- const { getConfig } = useConfigStore()
+ const { getBookData } = useAsyncStore();
+ const { getConfig } = useConfigStore();
const [searchQuery, setSearchQuery] = useState("");
const navigation = useNavigation();
+ const [isConnected, setIsConnected] = useState(false);
+ const isLogged =
+ getConfig("account")?.isAuthenticated === undefined
+ ? false
+ : getConfig("account")?.isAuthenticated;
const hasRecent = getBookData("lastBooksRead") as Book[];
- //useMemo(async () => {
- // if (getBookData("permissionToReadExternal")) {
- // const allbooks = await updateBooks([
- // ...(getBookData("allBooks") as Book[]),
- // ]);
- //const lasbooks = await updateBooks([
- // ...(getBookData("lastBooksRead") as Book[]),
- //]);
- //setBookData("allBooks", allbooks);
- //setBookData("lastBooksRead", lasbooks);
+ function checkNetwork() {
+ Network.getNetworkStateAsync().then((network) => {
+ setIsConnected(network.isConnected as boolean);
+ });
+ }
- //console.log("asdasdasdasdsadasd");
- // }
- // }, []);
+ useEffect(() => {
+ checkNetwork();
+ }, [Network.getNetworkStateAsync().then((network) => network.isConnected)]);
return (
- Você está conectado.
- { getConfig('searchIsActive') &&
+ Você está conectado.
+
+ {getConfig("searchIsActive") && (
+ navigation.navigate("Settings")} />
{hasRecent.length > 0 &&
+
+
+ onLogIn()}>
+ log-in
+
+ Don't have an account?
+
+
+ ) : (
+ ();
+ const { setConfig } = useConfigStore();
- const onSubmit = (data: RegisterFormData) => {
- console.log(data);
+ const onSubmit = async () => {
+ try {
+ const response = await fetch(
+ "https://webapisenac.azurewebsites.net/usuario/cadastrar",
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({
+ nome: name,
+ email,
+ senha: password,
+ }),
+ }
+ );
+
+ if (response.ok) {
+ const responseData = await response.json();
+ console.log("Account created", responseData);
+ setConfig("account", {
+ id: responseData.id ?? 0,
+ name: responseData.nome,
+ email: responseData.email,
+ isAuthenticated: true,
+ password: responseData.senha,
+ token: responseData.token ?? "",
+ });
+ navigation.navigate("Login");
+ } else {
+ console.log("Error creating account");
+ }
+ } catch (error) {
+ console.log(error);
+ console.log("Error creating account");
+ }
};
return (
- voltar
+ Voltar
REGISTER
Create an account.
- (
- This field is required. }
- (
- This field is required. }
- (
- This field is required. }
-
+ onSubmit()}>
Register
diff --git a/src/screens/Register/styles.ts b/src/screens/Register/styles.ts
index 7cefba1..a051287 100644
--- a/src/screens/Register/styles.ts
+++ b/src/screens/Register/styles.ts
@@ -27,5 +27,5 @@ export const Title = styled.Text`
export const Label = styled.Text`
font-family: ${({ theme }) => theme.FONT.REGULAR};
font-size: ${({ theme }) => theme.FONT_SIZE.XSM}px;
- color: ${({ theme }) => theme.COLORS.ERROR};
+ color: ${({ theme }) => theme.COLORS.GREY_500};
`;
\ No newline at end of file
diff --git a/src/screens/Settings/index.tsx b/src/screens/Settings/index.tsx
index 64098af..00697a2 100644
--- a/src/screens/Settings/index.tsx
+++ b/src/screens/Settings/index.tsx
@@ -4,16 +4,16 @@ import { Header } from "@components/Header";
import { useNavigation } from "@react-navigation/native";
import { Accordion } from "@components/Accordion";
import { RightIcon } from "@components/Icon";
-import { useMMKVStore } from "@storage/MMKV/index";
+
import {
readBooksInDirectory,
requestExternalStoragePermission,
} from "@utils/fs.storage";
+import { useAsyncStore } from "@storage/MMKV/versaofudida";
export function Settings() {
const navigation = useNavigation();
- const { setPermissionToReadExternal, setBookData, getBookData } =
- useMMKVStore();
+ const { setPermissionToReadExternal, setBookData } = useAsyncStore();
async function handleReadBooks() {
const permission = await requestExternalStoragePermission();
@@ -36,17 +36,10 @@ export function Settings() {
Account Control
- navigation.navigate("Account")}
- >
+ navigation.navigate("Login")}>
Account
- navigation.navigate("Account")}>
- Payments & plans
-
Component Behaviour Control
@@ -66,14 +59,7 @@ export function Settings() {
General
- console.log(getBookData("allBooks"))}
- >
- ChangeLog
-
- handleReadBooks()}>
+ handleReadBooks()} variant="first">
Local documents
diff --git a/src/storage/MMKV/index.ts b/src/storage/MMKV/index.ts
index 3689fa2..e69de29 100644
--- a/src/storage/MMKV/index.ts
+++ b/src/storage/MMKV/index.ts
@@ -1,96 +0,0 @@
-import { MMKV } from "react-native-mmkv";
-import { create } from "zustand";
-import { persist, StateStorage } from "zustand/middleware";
-import { BookData, Book } from "./default";
-import { defaultBookData, BOOK_KEY } from "./default";
-import { Storage } from "./default";
-
-export const persistStorage = new MMKV({ id: `${BOOK_KEY}` });
-
-const zustandMMKVStorage: StateStorage = {
- setItem: (name, value) => {
- return persistStorage.set(name, value);
- },
- getItem: (name) => {
- const value = persistStorage.getString(name);
- return value ?? null;
- },
- removeItem: (name) => {
- return persistStorage.delete(name);
- },
-};
-
-export const useMMKVStore = create(
- persist(
- (set, get) => ({
- databook: { ...defaultBookData },
- setBookData: (
- property: Exclude<
- keyof BookData,
- "currentlyReading" | "permissionToReadExternal"
- >,
- value: Book[]
- ) => {
- set({
- databook: { ...get().databook, [property]: value },
- });
- },
- setRecentBook(value) {
- const currentLastBooksRead = get().databook.lastBooksRead;
- if (currentLastBooksRead.some(book => book.id === value.id)) {
- // If the book already exists in the lastBooksRead array, don't add it again
- return;
- }
- const updatedLastBooksRead = [value, ...currentLastBooksRead];
- if (updatedLastBooksRead.length >= 6) {
- updatedLastBooksRead.pop();
- }
- const updatedData = {
- ...get().databook,
- lastBooksRead: updatedLastBooksRead,
- };
- set({ databook: updatedData });
- },
- setBookProperty: (id, property, property2, value) => {
- const index = get().databook[property].findIndex(
- (book) => book.id === id
- );
- if (index === -1) return; // if the book with the given ID is not found, do nothing
- const newData = [...get().databook[property]];
- newData[index] = { ...newData[index], [property2]: value };
- const updatedData = { ...get().databook, [property]: newData };
- set({ databook: updatedData });
- },
- setCurrentlyReading: (value: Book) => {
- const updatedData = { ...get().databook, currentlyReading: value };
- set({ databook: updatedData });
- },
- setPermissionToReadExternal: (value: boolean) => {
- const updatedData = {
- ...get().databook,
- permissionToReadExternal: value,
- };
- set({ databook: updatedData });
- },
- getBookData: (property: keyof BookData) => get().databook[property],
- getProp: (
- id: string,
- property: Exclude<
- keyof BookData,
- "currentlyReading" | "permissionToReadExternal"
- >
- ) => {
- const index = get().databook[property].findIndex(
- (book) => book.id === id
- );
- return get().databook[property][index];
- },
- }),
- {
- name: `${BOOK_KEY}`,
- getStorage: () => zustandMMKVStorage,
- serialize: (state) => JSON.stringify(state),
- deserialize: (state) => JSON.parse(state),
- }
- )
-);
diff --git a/src/storage/MMKV/versaofudida.ts b/src/storage/MMKV/versaofudida.ts
new file mode 100644
index 0000000..9a38766
--- /dev/null
+++ b/src/storage/MMKV/versaofudida.ts
@@ -0,0 +1,93 @@
+import AsyncStorage from "@react-native-async-storage/async-storage";
+import { create } from "zustand";
+import { StateStorage, persist } from "zustand/middleware";
+import { BOOK_KEY, Book, BookData, defaultBookData } from "./default";
+import { Storage } from "./default";
+
+const zustandAsyncStorage: StateStorage = {
+ setItem: async (name, value) => {
+ await AsyncStorage.setItem(name, value);
+ },
+ getItem: async (name) => {
+ const value = await AsyncStorage.getItem(name);
+ return value ?? null;
+ },
+ removeItem: async (name) => {
+ await AsyncStorage.removeItem(name);
+ },
+};
+
+export const useAsyncStore = create(
+ persist(
+ (set, get) => ({
+ databook: { ...defaultBookData },
+ setBookData: (
+ property: Exclude<
+ keyof BookData,
+ "currentlyReading" | "permissionToReadExternal"
+ >,
+ value: Book[]
+ ) => {
+ set({
+ databook: { ...get().databook, [property]: value },
+ });
+ },
+ setRecentBook(value) {
+ const currentLastBooksRead = get().databook.lastBooksRead;
+ if (currentLastBooksRead.some((book) => book.id === value.id)) {
+ // If the book already exists in the lastBooksRead array, don't add it again
+ return;
+ }
+ const updatedLastBooksRead = [value, ...currentLastBooksRead];
+ if (updatedLastBooksRead.length >= 6) {
+ updatedLastBooksRead.pop();
+ }
+ const updatedData = {
+ ...get().databook,
+ lastBooksRead: updatedLastBooksRead,
+ };
+ set({ databook: updatedData });
+ },
+ setBookProperty: (id, property, property2, value) => {
+ const index = get().databook[property].findIndex(
+ (book) => book.id === id
+ );
+ if (index === -1) return; // if the book with the given ID is not found, do nothing
+ const newData = [...get().databook[property]];
+ newData[index] = { ...newData[index], [property2]: value };
+ const updatedData = { ...get().databook, [property]: newData };
+ set({ databook: updatedData });
+ },
+ setCurrentlyReading: (value: Book) => {
+ const updatedData = { ...get().databook, currentlyReading: value };
+ set({ databook: updatedData });
+ },
+ setPermissionToReadExternal: (value: boolean) => {
+ const updatedData = {
+ ...get().databook,
+ permissionToReadExternal: value,
+ };
+ set({ databook: updatedData });
+ },
+ getBookData: (property: keyof BookData) => get().databook[property],
+ getProp: (
+ id: string,
+ property: Exclude<
+ keyof BookData,
+ "currentlyReading" | "permissionToReadExternal"
+ >
+ ) => {
+ const index = get().databook[property].findIndex(
+ (book) => book.id === id
+ );
+ return get().databook[property][index];
+ },
+ }),
+ {
+ name: `${BOOK_KEY}`,
+ getStorage: () => zustandAsyncStorage,
+ serialize: (state) => JSON.stringify(state),
+ deserialize: (state) => JSON.parse(state),
+ }
+ )
+);
diff --git a/src/storage/settings/default.ts b/src/storage/settings/default.ts
index 98533f2..80d7cc4 100644
--- a/src/storage/settings/default.ts
+++ b/src/storage/settings/default.ts
@@ -7,8 +7,10 @@ export const defaultConfig: config = {
chipsColorIsActive: false,
colorStateComplete: `#22C55E`,
colorStateIncomplete: `#D9D9D9`,
- auth: {
- isActive: false,
+ account: {
+ id: 0,
+ token: "",
+ isAuthenticated: false,
password: "",
email: "",
name: "",
@@ -24,8 +26,10 @@ export interface config {
chipsColorIsActive: boolean;
colorStateComplete: string;
colorStateIncomplete: string;
- auth: {
- isActive: boolean;
+ account: {
+ token?: string;
+ id?: number;
+ isAuthenticated: boolean;
password: string;
email: string;
name: string;
diff --git a/src/storage/settings/index.ts b/src/storage/settings/index.ts
index 819a6ba..09fd27d 100644
--- a/src/storage/settings/index.ts
+++ b/src/storage/settings/index.ts
@@ -7,6 +7,7 @@ interface ConfigStore {
setConfig: (property: keyof config, value: any) => void;
getConfig: (property: keyof config) => any;
resetConfig: (property: keyof config) => void;
+ resetAllConfig: () => void;
}
const CONFIG_KEY = "READER:configs";
@@ -46,10 +47,16 @@ export const useConfigStore = create((set, get) => {
});
}
+ async function resetAllConfig() {
+ await AsyncStorage.setItem(CONFIG_KEY, JSON.stringify(defaultConfig));
+ set({ config: defaultConfig });
+ }
+
return {
config,
getConfig,
setConfig,
resetConfig,
+ resetAllConfig
};
});
diff --git a/src/utils/fs.storage.ts b/src/utils/fs.storage.ts
index 57848d9..91cff06 100644
--- a/src/utils/fs.storage.ts
+++ b/src/utils/fs.storage.ts
@@ -1,7 +1,6 @@
import { Book } from "@storage/MMKV/default";
import { getInfoAsync, StorageAccessFramework as SAF } from "expo-file-system";
import { customAlphabet } from "nanoid/non-secure";
-import PdfThumbnail from "react-native-pdf-thumbnail";
const nanoid = "abcdefghijklmnopqrstuvwxyz0123456789";
const generateId = customAlphabet(nanoid, 8);
@@ -34,8 +33,6 @@ export async function readBooksInDirectory() {
const name = decoded?.split(".").shift() as string;
const extension = decoded?.split(".").pop();
- const { uri } = await PdfThumbnail.generate(fileUri, 0);
-
return {
extension,
uri: fileUri,
@@ -44,7 +41,6 @@ export async function readBooksInDirectory() {
id: generateId(),
inPage: 0,
totalPages: 0,
- image: uri,
};
})
);
@@ -56,7 +52,7 @@ export async function updateBooks(books: Book[]): Promise {
const updated = await readBooksInDirectory();
const buffer = books.map((book) => {
- const index = updated.findIndex((item) => item.size === book.size);
+ const index = updated.findIndex((item: { size: number | undefined; }) => item.size === book.size);
if (index !== -1) {
return {
...updated[index],