Merge branch 'LNReader:master' into master

Palloxin · Nov 26, 2024 · 57102dd · 57102dd
2 parents 195e70f + 4bcd22b
commit 57102dd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/src/hooks/persisted/useNovel.ts b/src/hooks/persisted/useNovel.ts
@@ -164,7 +164,7 @@ export const useNovel = (novelPath: string, pluginId: string) => {
         pages[pageIndex],
       ).then(chapters => setChapters(chapters));
     }
-  }, [novel, pageIndex]);
+  }, [novel, pageIndex, sort, novelSettings]);
 
   const sortAndFilterChapters = async (sort?: string, filter?: string) => {
     if (novel) {

diff --git a/src/screens/novel/components/EditInfoModal.tsx b/src/screens/novel/components/EditInfoModal.tsx
@@ -49,13 +49,7 @@ const EditInfoModal = ({
     });
   };
 
-  const status = [
-    NovelStatus.Ongoing,
-    NovelStatus.OnHiatus,
-    NovelStatus.Completed,
-    NovelStatus.Unknown,
-    NovelStatus.Cancelled,
-  ];
+  const status = Object.values(NovelStatus);
 
   return (
     <Portal>
@@ -93,7 +87,9 @@ const EditInfoModal = ({
                 <Pressable
                   style={{
                     backgroundColor:
-                      novel.status === item ? theme.rippleColor : 'transparent',
+                      novelInfo.status === item
+                        ? theme.rippleColor
+                        : 'transparent',
                     paddingVertical: 6,
                     paddingHorizontal: 12,
                   }}
@@ -105,7 +101,7 @@ const EditInfoModal = ({
                   <Text
                     style={{
                       color:
-                        novel.status === item
+                        novelInfo.status === item
                           ? theme.primary
                           : theme.onSurfaceVariant,
                     }}
@@ -190,10 +186,10 @@ const EditInfoModal = ({
 
         {novelInfo.genres !== undefined && novelInfo.genres !== '' ? (
           <FlatList
-            contentContainerStyle={{ marginVertical: 8 }}
+            style={{ marginVertical: 8 }}
             horizontal
             data={novelInfo.genres?.split(',')}
-            keyExtractor={(item, index) => 'novelTag' + index}
+            keyExtractor={(_, index) => 'novelTag' + index}
             renderItem={({ item }) => (
               <GenreChip theme={theme} onPress={() => removeTag(item)}>
                 {item}
@@ -256,15 +252,15 @@ const GenreChip = ({
     <Text
       style={{
         fontSize: 12,
-        color: theme.onSurfaceVariant,
+        color: theme.onSecondaryContainer,
         textTransform: 'capitalize',
       }}
     >
       {children}
     </Text>
     <MaterialCommunityIcons
       name="close"
-      color={theme.primary}
+      color={theme.onSecondaryContainer}
       size={18}
       onPress={onPress}
       style={{ marginLeft: 4 }}

diff --git a/src/screens/novel/components/Tracker/TrackSheet.tsx b/src/screens/novel/components/Tracker/TrackSheet.tsx
@@ -89,7 +89,10 @@ const TrackSheet = ({ bottomSheetRef, novel, theme }: Props) => {
 
   return (
     <>
-      <BottomSheet bottomSheetRef={bottomSheetRef} snapPoints={[130, 200]}>
+      <BottomSheet
+        bottomSheetRef={bottomSheetRef}
+        snapPoints={trackedNovel ? [180] : [130]}
+      >
         <View
           style={[
             styles.contentContainer,