From ea6ce2d6879c0fd6fb2893b03fad138ab52bdaff Mon Sep 17 00:00:00 2001
From: SmashinFries <smashinfries1@gmail.com>
Date: Sun, 31 Oct 2021 03:13:46 -0500
Subject: [PATCH 01/18] added studios

---
 Components/contentcomp.js | 75 +++++++++++++++++++++++++++++++++++----
 1 file changed, 68 insertions(+), 7 deletions(-)

diff --git a/Components/contentcomp.js b/Components/contentcomp.js
index f6e36f9..1748e52 100644
--- a/Components/contentcomp.js
+++ b/Components/contentcomp.js
@@ -1,6 +1,6 @@
 // React
 import React, { useEffect, useState } from 'react';
-import { View, ScrollView, useWindowDimensions, Pressable, FlatList, Linking, ToastAndroid, Alert, ImageBackground } from 'react-native';
+import { View, ScrollView, useWindowDimensions, Pressable, FlatList, Linking, ToastAndroid, Alert, ActivityIndicator } from 'react-native';
 // UI
 import { Chip, Text, Avatar, Image, Icon, Button, Overlay } from 'react-native-elements';
 // Navigation
@@ -12,7 +12,7 @@ import Video from 'react-native-video';
 import YoutubeIframe from 'react-native-youtube-iframe';
 import FastImage from 'react-native-fast-image';
 // Data
-import { getOverview } from '../Data Handler/getdata';
+import { getOverview, getStudio } from '../Data Handler/getdata';
 import { copyText } from '../Screens/character';
 import { updateFavorite, updateProgress, updateScore, updateStatus } from '../Data Handler/updatedata';
 import Markdown from 'react-native-markdown-display';
@@ -32,6 +32,62 @@ export const SectionInfo = ({header, info, style=null}) => {
     );
 }
 
+export const Studio = ({route}) => {
+    const { id, token, routeName, name } = route.params;
+    const [data, setData] = useState([]);
+    const [page, setPage] = useState({});
+    const [refresh, setRefresh] = useState(false);
+    const [loading, setLoading] = useState(true);
+    const { colors } = useTheme();
+    
+    useEffect(() => {
+        let mounted = true;
+        getStudio(id, token, 1).then(studio => {
+            if(mounted) {
+                setData(studio.media.nodes);
+                setPage(studio.media.pageInfo);
+                setLoading(false);
+            }
+        });
+        return () => {mounted = false};
+    },[]);
+
+    const onRefresh = async() => {
+        setRefresh(true);
+        const studio = await getStudio(id, token, 1);
+        setData(studio.media.nodes);
+        setPage(studio.media.pageInfo);
+        setRefresh(false);
+    }
+
+    const fetchMore = async() => {
+        if (page.hasNextPage === true) {
+            const newData = await getStudio(id, token, page.currentPage + 1);
+            setData([...data, ...newData.media.nodes]);
+            setPage(newData.media.pageInfo);
+        }
+    }
+
+    if (loading) return <View style={{flex:1, justifyContent:'center'}}><ActivityIndicator size='large' color={colors.primary} /></View>
+
+    return(
+        <View style={{flex:1}}>
+            <FlatList
+                data={data}
+                renderItem={({item}) => <_ContentTile item={item} routeName={routeName} token={token} isSearch={true} />}
+                keyExtractor={(item, index) => index.toString()}
+                onEndReached={fetchMore}
+                onEndReachedThreshold={0.4}
+                refreshing={refresh}
+                onRefresh={onRefresh}
+                numColumns={2}
+                columnWrapperStyle={{marginVertical:5}}
+                contentContainerStyle={{paddingVertical:10}}
+            />
+        </View>
+    );
+}
+
 export const OverView = ({route}) => {
     const {data, auth, id, tags, lang, routeName} = route.params;
     const [status, setStatus] = useState((data.mediaListEntry !== null) ? data.mediaListEntry.status : 'Not Added');
@@ -138,6 +194,10 @@ export const OverView = ({route}) => {
         );
     }
 
+    const navStudio = () => {
+        navigation.push('Studio', {id:data.studios.nodes[0].id, token:auth, routeName:routeName, name:data.studios.nodes[0].name});
+    }
+
     return(
         <View>
             <ScrollView showsVerticalScrollIndicator={false}>
@@ -172,7 +232,6 @@ export const OverView = ({route}) => {
                         {(data.duration !== null) ? <SectionInfo header='LENGTH' info={(data.duration < 60) ? `${data.duration} min` : `${(data.duration / 60).toFixed(1)} hrs`} /> : null}
                         {(data.source !== null) ? <SectionInfo header='SOURCE' info={data.source.replaceAll('_', ' ').toLowerCase()} style={{ textTransform:'capitalize', textAlign: 'center', color: colors.text }} /> : null}
                         <SectionInfo header='DATE' info={`${(data.startDate.month !== null) ? data.startDate.month : '?'}/${ (data.startDate.day !== null) ? data.startDate.day : '?'}/${(data.startDate.year !== null) ? data.startDate.year : '?'} - ${`${(data.endDate.year !== null) ? `${data.endDate.month}/${data.endDate.day}/${data.endDate.year}` : 'Present'}`}`} />
-                        {(data.studios.edges.length > 0) ? <SectionInfo header='STUDIO' info={data.studios.edges[0].node.name} /> : null}
                         {(data.title.english !== null) ? <SectionInfo header='ENGLISH TITLE' info={data.title.english} /> : (data.title.english === null && syn.length > 0) ? <SectionInfo header='SYNONYMS' info={syn} /> : null}
                     </View>
                 </ScrollView>
@@ -193,6 +252,8 @@ export const OverView = ({route}) => {
                     <Text h3 style={{ color: colors.text, paddingLeft:5 }}>Staff</Text>
                     <FlatList data={data.staff.edges} horizontal={true} showsHorizontalScrollIndicator={false} renderItem={_staff} contentContainerStyle={{marginLeft:5}} /> 
                 </View>
+                {(data.studios.nodes.length > 0) ? <Text h3 style={{ color: colors.text, paddingLeft:5 }}>Studio</Text> : null}
+                {(data.studios.nodes.length > 0) ? <Button title={data.studios.nodes[0].name} onPress={navStudio} titleStyle={{fontWeight:'bold'}} buttonStyle={{borderRadius:8, backgroundColor:colors.primary}} containerStyle={{marginHorizontal:5}} /> : null}
                 {(data.trailer !== null) ?
                 <View>
                     <Text h3 style={{ color: colors.text, paddingLeft:5 }}>Trailer</Text>
@@ -212,7 +273,7 @@ export const OverView = ({route}) => {
     );
 }
 
-export const CharacterItem = ({ item, lang, routeName }) => {
+export const CharacterItem = ({ item, auth, lang, routeName }) => {
     const [liked, setLiked] = useState(false);
     const navigation = useNavigation();
 
@@ -228,10 +289,10 @@ export const CharacterItem = ({ item, lang, routeName }) => {
     }, []);
 
     const handleLike = async() => {
-        if (liked === true) {
+        if (liked === true && typeof auth === 'string') {
             updateFavorite(auth, item.node.id);
             setLiked(false);
-        } else if (liked === false) {
+        } else if (liked === false && typeof auth === 'string') {
             updateFavorite(auth, item.node.id);
             setLiked(true);
         }
@@ -283,7 +344,7 @@ export const Characters = ({route}) => {
             numColumns={2}
             columnWrapperStyle={{paddingBottom:5}}
             windowSize={3}
-            renderItem={({item}) => (<CharacterItem item={item} lang={lang} routeName={routeName}/>) }
+            renderItem={({item}) => (<CharacterItem item={item} auth={auth} lang={lang} routeName={routeName}/>) }
             style={{flex:1, paddingBottom: 10, paddingTop: 10 }}
             keyExtractor={(item, index) => index.toString()}
             contentContainerStyle={{ alignSelf: 'center', paddingBottom:20 }}

From 1a3cdcdc91c1b50528785484421d5b8483598eea Mon Sep 17 00:00:00 2001
From: SmashinFries <smashinfries1@gmail.com>
Date: Sun, 31 Oct 2021 03:14:01 -0500
Subject: [PATCH 02/18] studio query

---
 Queries/query.js | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/Queries/query.js b/Queries/query.js
index 8ee697d..441460b 100644
--- a/Queries/query.js
+++ b/Queries/query.js
@@ -131,6 +131,10 @@ statistics {
 }
 `;
 
+const STUDIO_FRAG = `
+
+`;
+
 export const HPQUERY = `
 query ($id: Int, $origin: CountryCode, $onList: Boolean, $isAdult: Boolean, $page: Int, $perPage: Int, $format: MediaFormat, $sort: [MediaSort], $search: String, $format_in: [MediaFormat], $format_not_in: [MediaFormat], $tag_in: [String], $tag_not_in: [String], $genre_in: [String], $genre_not_in: [String], $season: MediaSeason, $seasonYear: Int, $type: MediaType) {
   Page (page: $page, perPage: $perPage) {
@@ -156,6 +160,12 @@ query ($id: Int, $page: Int, $perPage: Int) {
     volumes
     source(version:3)
     ${LIST_FRAG}
+    studios (isMain:true) {
+      nodes {
+        id
+        name
+      }
+    }
     recommendations {
       edges {
         node {
@@ -200,14 +210,6 @@ query ($id: Int, $page: Int, $perPage: Int) {
       site
       url
     }
-    studios (isMain: true) {
-      edges {
-        node {
-          id
-          name
-        }
-      }
-    }
     trailer {
       thumbnail
       id
@@ -278,6 +280,25 @@ query ($id: Int, $page: Int, $perPage: Int) {
 }
 `;
 
+export const STUDIO = `
+query ($id: Int, $page: Int, $perPage: Int) {
+  Studio (id:$id) {
+    id
+    name
+    isAnimationStudio
+    media (page:$page, perPage:$perPage, sort:POPULARITY_DESC) {
+      pageInfo {
+        ${PAGE_FRAG}
+      }
+      nodes {
+        ${BASICS_FRAG}
+        ${LIST_FRAG}
+      }
+    }
+  }
+}
+`;
+
 export const LISTS = `
 query ($userId:Int, $page:Int, $perPage:Int, $status:MediaListStatus, $type:MediaType, $sort:[MediaListSort]) {
   Page (page:$page, perPage:$perPage) {

From b17be3b4458fa0feb778e4dfb6a3ddc68b1ac02a Mon Sep 17 00:00:00 2001
From: SmashinFries <smashinfries1@gmail.com>
Date: Sun, 31 Oct 2021 03:14:45 -0500
Subject: [PATCH 03/18] corrected navigation

---
 Components/customtile.js | 44 +++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/Components/customtile.js b/Components/customtile.js
index a25774e..14f3ac5 100644
--- a/Components/customtile.js
+++ b/Components/customtile.js
@@ -109,6 +109,12 @@ export const _ContentTile = ({ item, routeName, token, isSearch, isNode=false, s
         );
     }
 
+    const getLocation = () => {
+        (routeName.name !== 'Info') ?
+            navigation.push((routeName.name === 'SearchPage') ? 'InfoSearch' : 'InfoHome', { screen: 'Info', params: { id: entry.id, title: { romaji: entry.title.romaji, native: entry.title.native, english: entry.title.english } }, })
+        : navigation.push('Info', { id: entry.id, title: { romaji: entry.title.romaji, native: entry.title.native, english: entry.title.english } });
+    }
+
     useEffect(() => {
         let mounted = true;
         fetchLang().then((lang) => {
@@ -122,33 +128,29 @@ export const _ContentTile = ({ item, routeName, token, isSearch, isNode=false, s
     return (
         <View style={{ flex: 1, backgroundColor: colors.background, paddingHorizontal: 10, maxHeight: size[1] + 50, maxWidth: size[0], borderRadius: 8 }}>
             <Pressable style={{ height: size[1], width: size[0] - 20, borderRadius: 8 }}
-                onPress={() => {
-                    (routeName.name !== 'Info') ?
-                        navigation.push((routeName.name === 'SearchPage') ? 'InfoSearch' : 'InfoHome', { screen: 'Info', params: { id: entry.id, title: { romaji: entry.title.romaji, native: entry.title.native, english: entry.title.english } }, })
-                        : navigation.push('Info', { id: entry.id, title: { romaji: entry.title.romaji, native: entry.title.native, english: entry.title.english } });
-                }}
+                onPress={getLocation}
                 onLongPress={() => (typeof token === 'string') ? setVisible(true) : null}
             >
                 <Image source={{ uri: entry.coverImage.extraLarge }} resizeMode='cover' style={{ borderRadius: 8, height: size[1], width: size[0] - 20 }} blurRadius={(status !== null) ? 3 : 0} />
             </Pressable>
             <Text style={{ color: colors.text, fontSize: 16, textAlign: 'center' }} numberOfLines={2}>{(lang !== 'Native') ? entry.title.romaji : entry.title.native}</Text>
-                {((status !== null) && typeof token === 'string') ? 
-                    <Pressable 
-                        onLongPress={() => setVisible(true)} 
-                        onPress={() => { navigation.push((routeName.name === 'SearchPage') ? 'InfoSearch' : 'InfoHome', { screen: 'Info', params: { id: entry.id, title: { romaji: entry.title.romaji, native: entry.title.native, english: entry.title.english } }, }); }} 
-                        style={{ position: 'absolute', top: 0, left: 10, height: size[1], width: size[0] -20, borderRadius: 8, backgroundColor: (status !== null) ? 'rgba(0,0,0,.6)' : 'rgba(0,0,0,0)', justifyContent: 'center'}}
-                    >
-                        <Text style={{ color: '#FFF', textAlign: 'center', fontWeight: 'bold', fontSize: 16 }}>{status}</Text>
-                    </Pressable>
+            {((status !== null) && typeof token === 'string') ?
+                <Pressable
+                    onLongPress={() => setVisible(true)}
+                    onPress={getLocation}
+                    style={{ position: 'absolute', top: 0, left: 10, height: size[1], width: size[0] - 20, borderRadius: 8, backgroundColor: (status !== null) ? 'rgba(0,0,0,.6)' : 'rgba(0,0,0,0)', justifyContent: 'center' }}
+                >
+                    <Text style={{ color: '#FFF', textAlign: 'center', fontWeight: 'bold', fontSize: 16 }}>{status}</Text>
+                </Pressable>
                 : null}
-                {(typeof score === 'number') ? <Badge value={`${score}%`}
-                    containerStyle={{ alignSelf: 'flex-end', position: 'absolute', elevation: 25, top: -5, right: 4 }}
-                    badgeStyle={{ borderColor: 'rgba(0,0,0,0)', transform: [{ scale: 1.20 }] }}
-                    status={(score >= 75) ? 'success'
-                        : (score < 75 && score >= 65) ? 'warning'
-                            : (score < 65) ? 'error' : undefined
-                    }
-                /> : null}
+            {(typeof score === 'number') ? <Badge value={`${score}%`}
+                containerStyle={{ alignSelf: 'flex-end', position: 'absolute', elevation: 25, top: -5, right: 4 }}
+                badgeStyle={{ borderColor: 'rgba(0,0,0,0)', transform: [{ scale: 1.20 }] }}
+                status={(score >= 75) ? 'success'
+                    : (score < 75 && score >= 65) ? 'warning'
+                        : (score < 65) ? 'error' : undefined
+                }
+            /> : null}
             <Action />
         </View>
     );

From a5c9d9a685cf57f71694619f5a5a8d16ca1f35b6 Mon Sep 17 00:00:00 2001
From: SmashinFries <smashinfries1@gmail.com>
Date: Sun, 31 Oct 2021 03:15:16 -0500
Subject: [PATCH 04/18] added getStudio function

---
 Data Handler/getdata.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Data Handler/getdata.js b/Data Handler/getdata.js
index 64c8a12..3510e03 100644
--- a/Data Handler/getdata.js	
+++ b/Data Handler/getdata.js	
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { ACTIVITY, AIRING_NOTIFICATION, AUTH_USER_QUERY, CHARACTERS, CLEAR_NOTIFICATIONS, FILTER_QUERY, FOLLOWING_QUERY, HPQUERY, ITEMQUERY, LISTS, NOTIFICATION_Q, REVIEWS, USER_NOTIF_CHECK, USER_QUERY, USER_SEARCH, VA_QUERY } from '../Queries/query';
+import { ACTIVITY, AIRING_NOTIFICATION, AUTH_USER_QUERY, CHARACTERS, CLEAR_NOTIFICATIONS, FILTER_QUERY, FOLLOWING_QUERY, HPQUERY, ITEMQUERY, LISTS, NOTIFICATION_Q, REVIEWS, STUDIO, USER_NOTIF_CHECK, USER_QUERY, USER_SEARCH, VA_QUERY } from '../Queries/query';
 import { cacheA, cacheM, cacheN, cacheS, cacheFilter } from '../Queries/query';
 import { getNSFW } from '../Storages/storagehooks';
 import { filterContent } from './updatedata';
@@ -324,6 +324,17 @@ export const getFollowing = async(userId, token=undefined, page=1, perPage=10) =
     }
 }
 
+export const getStudio = async(id, token, page=1, perPage=20) => {
+    try {
+        const data = await axios.post(url, {query: STUDIO, variables:{id:id, page:page, perPage:perPage}},
+            (typeof token !== 'string') ? {headers: {'Content-Type': 'application/json', 'Accept': 'application/json'}} : {headers: {'Authorization': 'Bearer ' + token, 'Content-Type': 'application/json', 'Accept': 'application/json'}});
+        const studio = await data.data.data.Studio;
+        return studio;
+    } catch (error) {
+        console.error(error);
+    }
+}
+
 export const fetchAiringNotification = async(token=undefined, type=undefined, perPage=5, page=1) => {
     try {
         const data = await axios.post(url, {query: AIRING_NOTIFICATION, variables:{type:type, page:page, perPage:perPage}},

From c2ab2b0642ceb363e29071ab4bfcb55cd5c27b0e Mon Sep 17 00:00:00 2001
From: SmashinFries <smashinfries1@gmail.com>
Date: Sun, 31 Oct 2021 03:15:37 -0500
Subject: [PATCH 05/18] adjusted image size

---
 Screens/character.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Screens/character.js b/Screens/character.js
index afcf424..67b19b6 100644
--- a/Screens/character.js
+++ b/Screens/character.js
@@ -58,9 +58,9 @@ export const Character = ({route}) => {
         const language = (lang === 'Native' && item.name.native !== null) ? item.name.native : item.name.userPreferred;
         return(
             <View style={{ paddingTop: 5, paddingRight: 10}}>
-                <Image source={{ uri: item.image.large }} onPress={() => {navigation.push((routeName === 'Info') ? 'VA' : (routeName === 'UserPage') ? 'UserVA' : 'SearchStaff', {id:item.id, role:undefined, routeName:routeName})}} style={{ resizeMode: 'cover', width: 150, height: 200, borderRadius: 8 }}
+                <Image source={{ uri: item.image.large }} onPress={() => {navigation.push((routeName === 'Info') ? 'VA' : (routeName === 'UserPage') ? 'UserVA' : 'SearchStaff', {id:item.id, role:undefined, routeName:routeName})}} style={{ resizeMode: 'cover', width: 125, height: 190, borderRadius: 8 }}
                 />
-                <View style={{ backgroundColor: 'rgba(0,0,0,.6)', justifyContent:'center', position: 'absolute', width: 150, height: 40, bottom:0, borderBottomLeftRadius: 8, borderBottomRightRadius: 8 }}>
+                <View style={{ backgroundColor: 'rgba(0,0,0,.6)', justifyContent:'center', position: 'absolute', width: 125, height: 40, bottom:0, borderBottomLeftRadius: 8, borderBottomRightRadius: 8 }}>
                     <Text style={{ color: '#FFF', textAlign: 'center' }} numberOfLines={1}>{language}</Text>
                     <Text style={{ color: '#FFF', textAlign: 'center' }} numberOfLines={1}>{item.languageV2}</Text>
                 </View>

From 876a99dc5fd44eadbc7a68385aba4155d9276245 Mon Sep 17 00:00:00 2001
From: SmashinFries <smashinfries1@gmail.com>
Date: Sun, 31 Oct 2021 03:23:34 -0500
Subject: [PATCH 06/18] added studio stack

---
 Screens/infopage.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Screens/infopage.js b/Screens/infopage.js
index ce9c290..7911268 100644
--- a/Screens/infopage.js
+++ b/Screens/infopage.js
@@ -11,7 +11,7 @@ import { useTheme, useRoute } from '@react-navigation/native';
 import { Character } from './character';
 import { VA_Page } from './voiceactor';
 import { _ContentTile } from '../Components/customtile';
-import { OverView, Watch, Characters, Recommendation, Reviews, ReviewPage } from '../Components/contentcomp';
+import { OverView, Watch, Characters, Recommendation, Reviews, ReviewPage, Studio } from '../Components/contentcomp';
 import { OtherUser } from './otheruser';
 import { FocusAwareStatusBar } from '../Utils/dataprocess';
 // Data
@@ -98,6 +98,7 @@ export const InfoNav = () => {
             <Stack.Screen name='Review' component={ReviewPage} />
             <Stack.Screen name='Character' component={Character} options={{title:'Character'}} />
             <Stack.Screen name='VA' component={VA_Page} options={{title:'Staff'}}/>
+            <Stack.Screen name='Studio' component={Studio} options={({ route }) => ({ title: route.params.name })}/>
             <Stack.Screen name='UserRev' component={OtherUser} options={{title:'User'}} />
         </Stack.Navigator>
     );

From a62b19e96fe6f74a16af8e0115bc4205038faef6 Mon Sep 17 00:00:00 2001
From: SmashinFries <smashinfries1@gmail.com>
Date: Mon, 1 Nov 2021 23:54:29 -0500
Subject: [PATCH 07/18] added entry removal

---
 Components/contentcomp.js | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/Components/contentcomp.js b/Components/contentcomp.js
index 1748e52..f11cedc 100644
--- a/Components/contentcomp.js
+++ b/Components/contentcomp.js
@@ -14,11 +14,10 @@ import FastImage from 'react-native-fast-image';
 // Data
 import { getOverview, getStudio } from '../Data Handler/getdata';
 import { copyText } from '../Screens/character';
-import { updateFavorite, updateProgress, updateScore, updateStatus } from '../Data Handler/updatedata';
+import { deleteEntry, updateFavorite, updateProgress, updateScore, updateStatus } from '../Data Handler/updatedata';
 import Markdown from 'react-native-markdown-display';
 import { md, rules } from '../Utils/markdown';
 
-const types = ['Current', 'Planning', 'Completed', 'Repeating', 'Dropped', 'Paused'];
 const scoring = Array.from({ length: (10 - 0) / .1 + 1}, (_, i) => (i * .1).toFixed(1).replace(/\.0/g, '')).reverse();
 
 export const SectionInfo = ({header, info, style=null}) => {
@@ -90,12 +89,14 @@ export const Studio = ({route}) => {
 
 export const OverView = ({route}) => {
     const {data, auth, id, tags, lang, routeName} = route.params;
+    const types = ['Current', 'Planning', 'Completed', 'Repeating', 'Dropped', 'Paused', ... (data.mediaListEntry !== null) ? ['Remove'] : []];
     const [status, setStatus] = useState((data.mediaListEntry !== null) ? data.mediaListEntry.status : 'Not Added');
     const [progress, setProgress] = useState((data.mediaListEntry !== null) ? data.mediaListEntry.progress : '0');
     const [score, setScore] = useState((data.mediaListEntry !== null) ? data.mediaListEntry.score : '0');
     const [statusVis, setStatusVis] = useState(false);
     const [progressVis, setProgressVis] = useState(false);
     const [scoreVis, setScoreVis] = useState(false);
+    const [entryID, setEntryID] = useState((data.mediaListEntry !== null) ? data.mediaListEntry.id : null);
 
     const { colors } = useTheme();
     const { width, height } = useWindowDimensions();
@@ -105,12 +106,29 @@ export const OverView = ({route}) => {
     syn.toString();
 
     const updateContent = async(item) => {
-        const newItem = await updateStatus(auth, id, item.toUpperCase()); 
-        setStatus(item); 
-        ToastAndroid.show(`Updated to ${item}!`, ToastAndroid.SHORT); 
-        setStatusVis(false);
+        if (item === 'Remove') {
+            const removed = deleteEntry(auth, entryID);
+            setStatus('Not Added');
+            setStatusVis(false);
+        } else {
+            const newItem = await updateStatus(auth, id, item.toUpperCase()); 
+            setEntryID(newItem.id);
+            setStatus(item); 
+            setStatusVis(false);
+        }
+        
     }
     const StatusOverlay = () => {
+        if (status === 'Not Added') {
+            const index = types.indexOf('Remove');
+            if (index > -1) {
+                types.splice(index, 1);
+            }
+        } else {
+            if (types.indexOf('Remove') < 0) {
+                types.push('Remove');
+            }
+        }
         return(
             <Overlay isVisible={statusVis} onBackdropPress={() => setStatusVis(false)} overlayStyle={{backgroundColor:colors.card, width:width/2}}>
                 <View >

From 9955fef5a2e7000f9c9f266e2fabe14419033398 Mon Sep 17 00:00:00 2001
From: SmashinFries <smashinfries1@gmail.com>
Date: Mon, 1 Nov 2021 23:55:31 -0500
Subject: [PATCH 08/18] added stat conditional

---
 Components/customtile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Components/customtile.js b/Components/customtile.js
index 14f3ac5..f62739b 100644
--- a/Components/customtile.js
+++ b/Components/customtile.js
@@ -82,7 +82,7 @@ export const _ContentTile = ({ item, routeName, token, isSearch, isNode=false, s
                 containerStyle: normalContainer,
                 titleStyle: normalText,
             },
-            (isSearch === true) ?
+            (isSearch === true && stat !== null) ?
             {
                 title: 'Delete',
                 onPress: () => {deleteItem();},

From 58b1559f05d3bbade744825fd70e5faa20c4f3f4 Mon Sep 17 00:00:00 2001
From: SmashinFries <smashinfries1@gmail.com>
Date: Mon, 1 Nov 2021 23:56:41 -0500
Subject: [PATCH 09/18] adjusted tag title

---
 Components/usercomp.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Components/usercomp.js b/Components/usercomp.js
index 1dd7cf5..a7a954f 100644
--- a/Components/usercomp.js
+++ b/Components/usercomp.js
@@ -163,7 +163,7 @@ export const Statistics = ({route}) => {
     const ShowTagStats = ({data}) => {
         const colorCut = colors.primary.slice(0, -2);
         return(
-            data.tags.map((tags, index) => 
+            data.tags.map((tags, index) => (index <= 10) ? 
             <View key={index} style={{flex:1, alignItems:'center'}}>
                 {(index === 0) ? <Icon name='crown' containerStyle={{position:'absolute', elevation:5, top:-27, right:0, transform:[{ rotate:'25deg'}]}} size={40} type='foundation' color='#ffd500' /> : null}
                 {(index === 0) ? <View style={{flex:1, width:width-100, height:70, alignItems:'center', marginBottom:10, borderRadius:200, backgroundColor:`${colorCut}.5)`}}>
@@ -171,7 +171,7 @@ export const Statistics = ({route}) => {
                 </View> : null}
                 {(index !== 0) ? <NumberDisplay key={index} title={tags.tag.name} number={`${tags.count}`} /> : null}
             </View>
-            )
+            : null)
         );
     }
 
@@ -250,7 +250,7 @@ export const Statistics = ({route}) => {
                 <NumberDisplay title='Volumes Read' number={data.volumesRead} />
                 <Text h3 style={{color:colors.text}}>Statuses</Text>
                 <PieChart data={statuses} absolute={true} backgroundColor={colors.background} chartConfig={chartConfig} width={width} height={200} accessor={'count'} />
-                <Text h3 style={{color:colors.text}}>Top Ten Tags</Text>
+                <Text h3 style={{color:colors.text}}>Top 10 Tags</Text>
                 <ShowTagStats data={data} />
                 {/* {data.tags.map((tags, index) => <NumberDisplay key={index} title={tags.tag.name} number={`${tags.count}`} />)} */}
                 <Text h3 style={{color:colors.text, marginTop:10}}>Top 5 Staff</Text>

From c84c981998de45a8fda3c039c1b287935fd92d98 Mon Sep 17 00:00:00 2001
From: SmashinFries <smashinfries1@gmail.com>
Date: Mon, 1 Nov 2021 23:57:07 -0500
Subject: [PATCH 10/18] fixed data filter

---
 Data Handler/getdata.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Data Handler/getdata.js b/Data Handler/getdata.js
index 3510e03..eab385b 100644
--- a/Data Handler/getdata.js	
+++ b/Data Handler/getdata.js	
@@ -49,7 +49,7 @@ export const getSeason = async (page=1, isAdult=undefined, token=undefined, onLi
                 (typeof token !== 'string') ? {headers: {'Content-Type': 'application/json', 'Accept': 'application/json'}} : {headers: {'Authorization': 'Bearer ' + token, 'Content-Type': 'application/json', 'Accept': 'application/json'}} );
             const media = await data.data.data.Page.media;
             const pages = await data.data.data.Page.pageInfo;
-            const newContent = await filterContent(media, cacheA.Season.content, 'ANIME');
+            const newContent = await filterContent(media, 'ANIME', cacheA.Season.content);
             cacheA.Season.content = await [...cacheA.Season.content, ...newContent]; 
             cacheA.Season.Page = await pages;
             return cacheA.Season.content;
@@ -66,7 +66,7 @@ export const getNextSeason = async (page=1, isAdult=undefined, token=undefined,
             (typeof token !== 'string') ? {headers: {'Content-Type': 'application/json', 'Accept': 'application/json'}} : {headers: {'Authorization': 'Bearer ' + token, 'Content-Type': 'application/json', 'Accept': 'application/json'}});
             const media = await data.data.data.Page.media;
             const pages = await data.data.data.Page.pageInfo;
-            const newContent = await filterContent(media, cacheA.NextSeason.content, 'ANIME');
+            const newContent = await filterContent(media, 'ANIME', cacheA.NextSeason.content);
             cacheA.NextSeason.content = await [...cacheA.NextSeason.content, ...newContent];
             cacheA.NextSeason.Page = await pages;
             return cacheA.NextSeason.content;
@@ -86,15 +86,15 @@ export const getTrend = async (type, page=1, format=undefined, isAdult=undefined
             const media = await data.data.data.Page.media;
             const pages = await data.data.data.Page.pageInfo;
             if (type === "ANIME") {
-                const newContent = await filterContent(media, cacheA.Trending.content, type);
+                const newContent = await filterContent(media, type, cacheA.Trending.content);
                 cacheA.Trending.content = [...cacheA.Trending.content, ...newContent]; cacheA.Trending.Page = pages; return cacheA.Trending.content;
             }
             if (type === "MANGA" && format !== "NOVEL") {
-                const newContent = await filterContent(media, cacheM.Trending.content, type);
+                const newContent = await filterContent(media, type, cacheM.Trending.content,);
                 cacheM.Trending.content = [...cacheM.Trending.content, ...newContent]; cacheM.Trending.Page = pages; return cacheM.Trending.content;
             }
             if (format === "NOVEL") {
-                const newContent = await filterContent(media, cacheN.Trending.content, 'NOVEL');
+                const newContent = await filterContent(media, 'NOVEL', cacheN.Trending.content,);
                 cacheN.Trending.content = [...cacheN.Trending.content, ...newContent]; cacheN.Trending.Page = pages; return cacheN.Trending.content;
             }
         }
@@ -113,15 +113,15 @@ export const getPopular = async (type, page=1, format=undefined, isAdult=undefin
             const media = await data.data.data.Page.media;
             const pages = await data.data.data.Page.pageInfo;
             if (type === "ANIME") {
-                const newContent = await filterContent(media, cacheA.Popular.content, type);
+                const newContent = await filterContent(media, type, cacheA.Popular.content);
                 cacheA.Popular.content = [...cacheA.Popular.content, ...newContent]; cacheA.Popular.Page = pages; return cacheA.Popular.content;
             }
             if (type === "MANGA" && format !== "NOVEL") {
-                const newContent = await filterContent(media, cacheM.Popular.content, type);
+                const newContent = await filterContent(media, type, cacheM.Popular.content);
                 cacheM.Popular.content = [...cacheM.Popular.content, ...newContent]; cacheM.Popular.Page = pages; return cacheM.Popular.content;
             }
             if (format === "NOVEL") {
-                const newContent = await filterContent(media, cacheN.Popular.content, 'NOVEL');
+                const newContent = await filterContent(media, 'NOVEL', cacheN.Popular.content, );
                 cacheN.Popular.content = [...cacheN.Popular.content, ...newContent]; cacheN.Popular.Page = pages; return cacheN.Popular.content;
             }
         }
@@ -140,15 +140,15 @@ export const getTop = async(type, page=1, format=undefined, isAdult=undefined, t
             const media = await data.data.data.Page.media;
             const pages = await data.data.data.Page.pageInfo;
             if (type === "ANIME") {
-                const newContent = await filterContent(media, cacheA.Top.content, type);
+                const newContent = await filterContent(media, type, cacheA.Top.content);
                 cacheA.Top.content = [...cacheA.Top.content, ...newContent]; cacheA.Top.Page = pages; return cacheA.Top.content;
             }
             if (type === "MANGA" && format !== "NOVEL") {
-                const newContent = await filterContent(media, cacheM.Top.content, type);
+                const newContent = await filterContent(media, type, cacheM.Top.content);
                 cacheM.Top.content = [...cacheM.Top.content, ...newContent]; cacheM.Top.Page = pages; return cacheM.Top.content;
             }
             if (format === "NOVEL") {
-                const newContent = await filterContent(media, cacheN.Top.content, 'NOVEL');
+                const newContent = await filterContent(media, 'NOVEL', cacheN.Top.content);
                 cacheN.Top.content = [...cacheN.Top.content, ...newContent]; cacheN.Top.Page = pages; return cacheN.Top.content;
             }
         }

From 23747998f259bf04bf0a8dad7cfa4f60a9c06d3e Mon Sep 17 00:00:00 2001
From: SmashinFries <smashinfries1@gmail.com>
Date: Mon, 1 Nov 2021 23:58:06 -0500
Subject: [PATCH 11/18] added new content condition

---
 Data Handler/updatedata.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Data Handler/updatedata.js b/Data Handler/updatedata.js
index 019d48d..7668f35 100644
--- a/Data Handler/updatedata.js	
+++ b/Data Handler/updatedata.js	
@@ -117,7 +117,7 @@ export const deleteActivity = async(token, id) => {
     }
 }
 
-export const filterContent = async(data, currentData, type, isList=false) => {
+export const filterContent = async(data, type, currentData=null, isList=false) => {
     let count = 0;
     let newData = [];
 
@@ -129,9 +129,10 @@ export const filterContent = async(data, currentData, type, isList=false) => {
                 newData.push(data[i]);
             }
         }
-        const uniqueNovels = newData.filter(i => currentData.every(j => ((isList === true) ? i.media.id : i.id) !== ((isList === true) ? j.media.id : j.id)));
+        const uniqueNovels = (currentData !== null) ? newData.filter(i => currentData.every(j => ((isList === true) ? i.media.id : i.id) !== ((isList === true) ? j.media.id : j.id))) : newData;
         newData = uniqueNovels;
     }
+
     filterFun();
     return(newData);
 }
\ No newline at end of file

From eb6f3aa244dbe59105e0d0958dfaf5419114b2dd Mon Sep 17 00:00:00 2001
From: SmashinFries <smashinfries1@gmail.com>
Date: Mon, 1 Nov 2021 23:58:42 -0500
Subject: [PATCH 12/18] added stats tag category

---
 Queries/query.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Queries/query.js b/Queries/query.js
index 441460b..e4e6d58 100644
--- a/Queries/query.js
+++ b/Queries/query.js
@@ -58,6 +58,7 @@ statistics {
       count
       tag {
         id
+        category
         description
         name
       }
@@ -106,6 +107,7 @@ statistics {
     tags (limit:10, sort:COUNT_DESC) {
       count
       tag {
+        category
         id
         description
         name
@@ -131,10 +133,6 @@ statistics {
 }
 `;
 
-const STUDIO_FRAG = `
-
-`;
-
 export const HPQUERY = `
 query ($id: Int, $origin: CountryCode, $onList: Boolean, $isAdult: Boolean, $page: Int, $perPage: Int, $format: MediaFormat, $sort: [MediaSort], $search: String, $format_in: [MediaFormat], $format_not_in: [MediaFormat], $tag_in: [String], $tag_not_in: [String], $genre_in: [String], $genre_not_in: [String], $season: MediaSeason, $seasonYear: Int, $type: MediaType) {
   Page (page: $page, perPage: $perPage) {

From b43ac1e41e73438c8bd63c51420c8c04e22e7aed Mon Sep 17 00:00:00 2001
From: SmashinFries <smashinfries1@gmail.com>
Date: Mon, 1 Nov 2021 23:59:49 -0500
Subject: [PATCH 13/18] group conditional

---
 Notifications/notifications.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Notifications/notifications.js b/Notifications/notifications.js
index 2059471..22d51a8 100644
--- a/Notifications/notifications.js
+++ b/Notifications/notifications.js
@@ -27,7 +27,7 @@ const setNotifs = async(unreadNum, data, latest) => {
         });
     }
     await PushNotification.getDeliveredNotifications((notifs) => {
-        if (notifs.length <= unreadNum) {
+        if (notifs.length <= unreadNum && notifs.length > 1) {
             PushNotification.localNotification({
                 channelId:'UserNotification',
                 group:'Notif',
@@ -49,8 +49,7 @@ const sendNotification = async() => {
             const unreadNum = Number(notifData.Viewer.unreadNotificationCount);
             const latest = notifData.Page.notifications[0].id;
             if (typeof lastNotif === 'string') {
-                console.log(lastNotif);
-                if (unreadNum > 0 && latest !== Number(lastNotif)) {
+                if (unreadNum === 0 && latest === Number(lastNotif)) {
                     await setNotifs(unreadNum, notifData.Page.notifications, latest);
                 } else if (unreadNum === 0 && latest !== Number(lastNotif)) {
                     await AsyncStorage.setItem('@LASTNOTIF', `${latest}`)

From c6ad0a6b4a5fa1b50e9729ebaa408beef22d5996 Mon Sep 17 00:00:00 2001
From: SmashinFries <smashinfries1@gmail.com>
Date: Tue, 2 Nov 2021 00:00:52 -0500
Subject: [PATCH 14/18] changed loading color

---
 Screens/infopage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Screens/infopage.js b/Screens/infopage.js
index 7911268..2ce5c45 100644
--- a/Screens/infopage.js
+++ b/Screens/infopage.js
@@ -72,7 +72,7 @@ const InfoTabs = ({route}) => {
         return () => {mounted = false};
     }, []);
 
-    if (loading) return <View style={{flex:1, justifyContent:'center'}}><ActivityIndicator size='large' color='#00ff00' /></View>
+    if (loading) return <View style={{flex:1, justifyContent:'center'}}><ActivityIndicator size='large' color={colors.primary} /></View>
 
     return(
         <View style={{ flex:1 }}>

From 585819957b498f4d40b0d3620bad778263059ae3 Mon Sep 17 00:00:00 2001
From: SmashinFries <smashinfries1@gmail.com>
Date: Tue, 2 Nov 2021 00:01:19 -0500
Subject: [PATCH 15/18] adjusted filter function

---
 Screens/lists.js | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/Screens/lists.js b/Screens/lists.js
index 12afdd7..9a50465 100644
--- a/Screens/lists.js
+++ b/Screens/lists.js
@@ -20,7 +20,7 @@ import { getToken } from '../Storages/getstorage';
 
 const Stack = createStackNavigator();
 const LISTS = ['Current', 'Planning', 'Completed', 'Repeating', 'Dropped', 'Paused'];
-const TYPES = ["Anime", "Manga", "Novel"];
+const TYPES = [{name: "Anime", icon:'movie'}, {name: "Manga", icon:'photo-album'}, {name: "Novel", icon:'book'}];
 const SORTS = ['Updated', 'Score', 'Progress', 'Started', 'Added', 'Title', 'Popularity'];
 const elevation = 8;
 
@@ -177,7 +177,7 @@ export const UserList = ({userID=null, isSearch=false}) => {
     const [isSortVisible, setSortVisible] = useState(false);
     const [userId, setUserId] = useState(userID);
     const [list, setList] = useState(LISTS[0]);
-    const [type, setType] = useState(TYPES[0]);
+    const [type, setType] = useState(TYPES[0].name);
     const [sort, setSort] = useState(SORTS[0]);
     const [loading, setLoading] = useState(true);
     const [token, setToken] = useState(false);
@@ -195,7 +195,12 @@ export const UserList = ({userID=null, isSearch=false}) => {
         const id = (userId !== 0) ? userId : await AsyncStorage.getItem('@UserID');
         if (typeof token === 'string' || userID !== null) {
             const info = await getLists(Number(id), page, list.toUpperCase(), typeFixed, sortFixed);
-            return({id:Number(id), data:info.mediaList, page:info.pageInfo});
+            if (typeM.toUpperCase() === 'NOVEL') {
+                const filterData = await filterContent(info.mediaList, 'NOVEL', null, true);
+                return({id:Number(id), data:filterData, page:info.pageInfo});
+            } else {
+                return({id:Number(id), data:info.mediaList, page:info.pageInfo});
+            }
         } else {
             return({id:Number(id), data:false});
         }
@@ -251,7 +256,7 @@ export const UserList = ({userID=null, isSearch=false}) => {
         return(
             <Overlay isVisible={isListVisible} onBackdropPress={() => setListVisible(false)} overlayStyle={{backgroundColor:colors.card, width:width/2, borderRadius:8}} backdropStyle={{backgroundColor:'rgba(0,0,0,.3)'}} >
                 {LISTS.map((item, index) => 
-                    (item !== list) ? <Button key={index} title={item} titleStyle={{color:colors.primary, fontSize:20, fontWeight:'bold'}} type='clear' onPress={() => onPress(item)} /> : null
+                    (item !== list) ? <Button key={index} title={item} titleStyle={{color:colors.primary, fontSize:20}} type='clear' onPress={() => onPress(item)} /> : null
                 )}
             </Overlay>
         );
@@ -275,7 +280,7 @@ export const UserList = ({userID=null, isSearch=false}) => {
         return(
             <Overlay isVisible={isTypeVisible} onBackdropPress={() => setTypeVisible(false)} overlayStyle={{backgroundColor:colors.card, borderRadius:8, width:width/2}} backdropStyle={{backgroundColor:'rgba(0,0,0,.3)'}} >
                 {TYPES.map((item, index) => 
-                    (item !== list) ? <Button key={index} title={item} titleStyle={{color:colors.primary, fontSize:20, fontWeight:'bold'}} type='clear' onPress={() => onPress(item)} /> : null
+                    (item.name !== list) ? <Button key={index} buttonStyle={{height:50}} icon={{name:item.icon, type:'material', color:colors.primary, containerStyle:{justifyContent:'flex-start'}}} title={item.name} titleStyle={{color:colors.primary, fontSize:20 }} type='clear' onPress={() => onPress(item.name)} /> : null
                 )}
             </Overlay>
         );
@@ -299,7 +304,7 @@ export const UserList = ({userID=null, isSearch=false}) => {
         return(
             <Overlay isVisible={isSortVisible} onBackdropPress={() => setSortVisible(false)} overlayStyle={{backgroundColor:colors.card, borderRadius:8, width:width/2}} backdropStyle={{backgroundColor:'rgba(0,0,0,.3)'}} >
                 {SORTS.map((item, index) => 
-                    (item !== list) ? <Button key={index} title={item} titleStyle={{color:colors.primary, fontSize:20, fontWeight:'bold'}} type='clear' onPress={() => onPress(item)} /> : null
+                    (item !== list) ? <Button key={index} title={item} titleStyle={{color:colors.primary, fontSize:20 }} type='clear' onPress={() => onPress(item)} /> : null
                 )}
             </Overlay>
         );
@@ -324,11 +329,11 @@ export const UserList = ({userID=null, isSearch=false}) => {
         if (typeof token === 'string' || userID !== null) {
             const info = await getLists(Number(id), 1, list.toUpperCase(), typeFixed, sortFixed);
             if (typeM.toUpperCase() === 'NOVEL') {
-                const novelData = await filterContent(info.mediaList, data, 'NOVEL');
+                const novelData = await filterContent(info.mediaList, 'NOVEL', null, true);
                 setData(novelData);
                 setPage(info.pageInfo);
             } else if (typeM.toUpperCase() === 'MANGA') {
-                const mangaData = await filterContent(info.mediaList, data, 'MANGA');
+                const mangaData = await filterContent(info.mediaList, 'MANGA', null, true);
                 setData(mangaData);
                 setPage(info.pageInfo);
             } else {
@@ -349,8 +354,8 @@ export const UserList = ({userID=null, isSearch=false}) => {
         if (page.hasNextPage === true) {
             const sortFixed = fixSort(sort);
             const typeFixed = (type === 'Novel' || type === 'NOVEL') ? 'MANGA' : type.toUpperCase();
-            const info = await getLists(userId, page.currentPage + 1, list.toUpperCase(), typeFixed, sortFixed, 25);
-            const newData = await filterContent(info.mediaList, data, type.toUpperCase());
+            const info = await getLists(userId, page.currentPage + 1, list.toUpperCase(), typeFixed, sortFixed, 30);
+            const newData = await filterContent(info.mediaList, type.toUpperCase(), data, true);
             setData([...data, ...newData]);
             setPage(info.pageInfo);
         }
@@ -364,10 +369,11 @@ export const UserList = ({userID=null, isSearch=false}) => {
             <View style={{flex:1}}>
                 <FlatList 
                 data={data} 
-                renderItem={({item}) => <RenderItem item={item} status={list} sort={sort} token={token} isSearch={isSearch} isAuthUser={(typeof token === 'string') ? true : false} />}
+                renderItem={({item}) => <RenderItem item={item} status={list} sort={sort} token={token} isSearch={isSearch} isAuthUser={(userID === null) ? true : false} />}
                 keyExtractor={(item, index) => index.toString()}
                 numColumns={2}
                 ListHeaderComponent={listHeader}
+                ListEmptyComponent={() => <View style={{flex:1, justifyContent:'center'}}><Text style={{textAlign:'center', fontSize:35, fontWeight:'bold', color:colors.text}}>{`No content yet!${'\n'}(◕︵◕)`}</Text></View>}
                 onEndReached={fetchMore}
                 onEndReachedThreshold={.4}
                 onRefresh={onRefresh}

From d55584f54a63315f3462f89754e6c2974b863913 Mon Sep 17 00:00:00 2001
From: SmashinFries <smashinfries1@gmail.com>
Date: Tue, 2 Nov 2021 00:01:52 -0500
Subject: [PATCH 16/18] wait for search on refresh

---
 Screens/search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Screens/search.js b/Screens/search.js
index b97125e..cf9bb24 100644
--- a/Screens/search.js
+++ b/Screens/search.js
@@ -275,7 +275,7 @@ const SearchPage = React.memo(() => {
         setAdult(nsfw);
         setFilter(filtering);
         setData([]);
-        fetchSearch();
+        await fetchSearch();
         setRefresh(false);
     }
 

From bb599173fafcd244825b04789562fe74b380d699 Mon Sep 17 00:00:00 2001
From: SmashinFries <smashinfries1@gmail.com>
Date: Tue, 2 Nov 2021 00:02:30 -0500
Subject: [PATCH 17/18] adjusted theme selection styling

---
 Screens/settings.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Screens/settings.js b/Screens/settings.js
index 27d3022..5e51364 100644
--- a/Screens/settings.js
+++ b/Screens/settings.js
@@ -22,7 +22,7 @@ const Stack = createStackNavigator();
 export const ThemeContext = React.createContext({theme: {theme: 'Light', object:LightTheme, title:'Default'}, setTheme: () => {}});
 const android = RNFetchBlob.android;
 let dirs = RNFetchBlob.fs.dirs
-export const VERSION = 'v1.2-beta';
+export const VERSION = 'v1.2.5-beta';
 
 export const downloadUpdate = (link) => {
     Vibration.vibrate(100);
@@ -222,23 +222,25 @@ const Settings = () => {
                     <Divider color={colors.border} style={{width:width, marginBottom:5}} orientation='horizontal' width={1} />
                     <ScrollView showsVerticalScrollIndicator={false}>
                         <Text h3 style={{color:colors.text}}>Light</Text>
-                        <Divider color={colors.text} style={{width:width-180, marginBottom:5}} orientation='horizontal' width={1} />
+                        <Divider color={colors.primary} style={{width:width-180, marginBottom:5}} orientation='horizontal' width={1} />
                         {
                             themes.map((item, i) => ( (item.object.dark === false) ?
                                 <ListItem key={i} containerStyle={{backgroundColor:colors.card}} onPress={() => storeTheme(item)}>
-                                    <ListItem.Content>
-                                        <ListItem.Title style={{color:colors.text}}>{item.title}</ListItem.Title>
+                                    <ListItem.Content style={{flex:1, flexDirection:'row', justifyContent:'flex-start', alignItems:'flex-start'}}>
+                                        <ListItem.Title style={{color:colors.text, justifyContent:'flex-start'}}>{item.title}</ListItem.Title>
+                                        {(item.title === theme.title && theme.object.dark === false) ? <Icon name='check' color={colors.primary} size={25} containerStyle={{marginHorizontal:5}} /> : null}
                                     </ListItem.Content>
                                 </ListItem>
                             : null))
                         }
                         <Text h3 style={{color:colors.text}}>Dark</Text>
-                        <Divider color={colors.text} style={{width:width-180, marginBottom:5}} orientation='horizontal' width={1} />
+                        <Divider color={colors.primary} style={{width:width-180, marginBottom:5}} orientation='horizontal' width={1} />
                         {
                             themes.map((item, i) => ( (item.object.dark === true) ?
                                 <ListItem key={i} containerStyle={{backgroundColor:colors.card}} onPress={() => storeTheme(item)}>
-                                    <ListItem.Content>
+                                    <ListItem.Content style={{flex:1, flexDirection:'row', justifyContent:'flex-start', alignItems:'flex-start'}}>
                                         <ListItem.Title style={{color:colors.text}}>{item.title}</ListItem.Title>
+                                        {(item.title === theme.title && theme.object.dark === true) ? <Icon name='check' color={colors.primary} size={25} containerStyle={{marginHorizontal:5}} /> : null}
                                     </ListItem.Content>
                                 </ListItem>
                             : null))
@@ -314,6 +316,7 @@ const Settings = () => {
                     </ListItem>
                 ))
             }
+            <Text style={{textAlign:'left', color:colors.border, paddingLeft:10}}>Created by smashinfries</Text>
             {(visTheme === true) ? <ShowTheme /> : null}
             {(visLang === true) ? <ShowLang /> : null}
             {(visAbout === true) ? <ShowChangelog /> : null}

From 520b7b38a048030b1c292c3ef4ac1f2068187a02 Mon Sep 17 00:00:00 2001
From: SmashinFries <smashinfries1@gmail.com>
Date: Tue, 2 Nov 2021 00:02:55 -0500
Subject: [PATCH 18/18] set latest notif id

---
 Screens/userinfo.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Screens/userinfo.js b/Screens/userinfo.js
index 44cee83..25192ed 100644
--- a/Screens/userinfo.js
+++ b/Screens/userinfo.js
@@ -20,6 +20,7 @@ import { ActivityPage, Favorites, Following, Statistics } from '../Components/us
 import { getToken, storeToken } from '../Storages/getstorage';
 import { checkUserID } from '../Storages/storagehooks';
 import { textDecider, FocusAwareStatusBar } from '../Utils/dataprocess';
+import AsyncStorage from '@react-native-async-storage/async-storage';
 import PushNotification from 'react-native-push-notification';
 
 const Tabs = createMaterialTopTabNavigator();
@@ -68,6 +69,7 @@ const NotificationsTab = ({route}) => {
     const cleanseNotif = async() => {
         try {
             if (unread > 0) {
+                await AsyncStorage.setItem('@LASTNOTIF', `${notifData[0].id}`);
                 const clear = await clearNotifications(login);
                 navigation.setOptions({tabBarBadge: null})
                 return clear;