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

Make thread view page navbar color design consistent #339

Merged
merged 4 commits into from
Jan 12, 2024
Merged

Make thread view page navbar color design consistent #339

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
24d206d
Fixed category search failing every 2nd keyboard input in FindScreen
Sebastian-Webster Jan 12, 2024
912c856
Fixed search page showing no results when there are results
Sebastian-Webster Jan 12, 2024
14205b5
Fixed search page showing loading spinner when nothing is loading
Sebastian-Webster Jan 12, 2024
8e20769
Made thread view page color design consistent
Sebastian-Webster Jan 12, 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
51 changes: 24 additions & 27 deletions screens/FindScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,21 +201,14 @@ const FindScreen = ({navigation}) => {
}
axios.post(url, toSend, {signal: abortControllerRef.current.signal}).then((response) => {
const result = response.data;
const {message, status, data} = result;
const {data} = result;
const {items, noMoreItems} = data;

if (status !== 'SUCCESS') {
setErrorOccured(message)
setLoadingOne(false)
setNoResults(false)
console.error(message)
} else {
console.log(data)
layoutUsersFound(data)
console.log('Search complete.')
setNoResults(false)
//persistLogin({...data[0]}, message, status);
}
setLoadingOne(false)

layoutUsersFound(items)

if (noMoreItems) setNoResults(true)
}).catch(error => {
if (error instanceof CanceledError) {
console.warn('Cancelled intentionally')
Expand All @@ -230,6 +223,7 @@ const FindScreen = ({navigation}) => {
console.log('Empty search')
setNoResults(false)
setChangeSectionsOne([])
setLoadingOne(false)
}
}

Expand Down Expand Up @@ -285,7 +279,7 @@ const FindScreen = ({navigation}) => {
const url = serverUrl + '/tempRoute/searchpagesearchcategories'
const toSend = {
val,
lastCategoryId: categoriesReducer.categories.length ? categoriesReducer.categories[categoriesReducer.categories.length - 1].categoryId : undefined
lastCategoryId: clear ? undefined : categoriesReducer.categories.length ? categoriesReducer.categories[categoriesReducer.categories.length - 1].categoryId : undefined
}
axios.post(url, toSend, {signal: abortControllerRef.current.signal}).then((response) => {
const result = response.data;
Expand All @@ -308,6 +302,7 @@ const FindScreen = ({navigation}) => {
} else {
console.log('Empty category search')
dispatchCategories({type: 'resetCategories'})
dispatchCategories({type: 'stopLoad'})
}
}
}
Expand Down Expand Up @@ -408,28 +403,28 @@ const FindScreen = ({navigation}) => {
</>
)}
</TouchableWithoutFeedback>
{filterFormatSearch == "Users" && (
{filterFormatSearch == "Users" ? (
<FlatList
data={changeSectionsOne}
keyExtractor={(item, index) => item + index}
renderItem={({ item, index }) => <UserItem name={item.name} displayName={item.displayName} followers={item.followers} following={item.following} totalLikes={item.totalLikes} profileKey={item.profileKey} badges={item.badges} index={index} pubId={item.pubId} bio={item.bio} privateAccount={item.privateAccount} colors={colors} navigation={navigation}/>}
ListFooterComponent={
<>
{noResults == true && (
{noResults === true ? (
<View style={{marginTop: 20}}>
<Text style={{fontSize: 16, fontWeight: 'bold', color: colors.tertiary, textAlign: 'center'}}>{changeSectionsOne.length > 0 ? 'No more results' : 'No results found'}</Text>
<Text style={{fontSize: 20, fontWeight: 'bold', color: colors.errorColor, textAlign: 'center'}}>{changeSectionsOne.length > 0 ? 'No more results' : 'No results'}</Text>
</View>
)}
{errorOccured !== null && (
) : null}
{errorOccured !== null ? (
<View style={{marginTop: 20}}>
<Text style={{fontSize: 20, fontWeight: 'bold', color: colors.errorColor, textAlign: 'center'}}>{errorOccured}</Text>
</View>
)}
{loadingOne == true && (
) : null}
{loadingOne == true ? (
<View style={{marginTop: 20}}>
<ActivityIndicator size="large" color={colors.brand} />
</View>
)}
) : null}
</>
}
keyboardDismissMode="on-drag"
Expand All @@ -446,9 +441,10 @@ const FindScreen = ({navigation}) => {
onContentSizeChange={(contentWidth, contentHeight) => {
userListHeight.current = contentHeight;
}}
extraData={noResults}
/>
)}
{filterFormatSearch == "Categories" && (
) : null}
{filterFormatSearch == "Categories" ? (
<FlatList
data={categoriesReducer.categories}
keyExtractor={(item) => item.categoryId}
Expand Down Expand Up @@ -493,13 +489,14 @@ const FindScreen = ({navigation}) => {
}
}
}}
extraData={noResults}
/>
)}
{filterFormatSearch == "Images" && (
) : null}
{filterFormatSearch == "Images" ? (
<View style={{alignSelf: 'center', textAlign: 'center'}}>
<SubTitle style={{alignSelf: 'center', textAlign: 'center', color: colors.tertiary}}>This feature is not out yet...</SubTitle>
</View>
)}
) : null}
</>
:
<View style={{flex: 1, justifyContent: 'center', marginHorizontal: '2%'}}>
Expand Down
2 changes: 1 addition & 1 deletion screens/ThreadViewPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ const ThreadViewPage = ({navigation, route}) => {
return(
<>
<StatusBar style={colors.StatusBarColor}/>
<TopNavBar screenName={(postReducer.posts.length > 0 ? (postReducer.posts[0].creatorDisplayName || postReducer.posts[0].creatorName) : 'Finding') + "'s thread"}/>
<TopNavBar extraStyles={{backgroundColor: dark ? colors.darkest : colors.greyish}} screenName={(postReducer.posts.length > 0 ? (postReducer.posts[0].creatorDisplayName || postReducer.posts[0].creatorName) : 'Finding') + "'s thread"}/>
<KeyboardAvoidingScrollView>
<StyledContainer style={{width: '100%', backgroundColor: dark ? colors.darkest : colors.greyish, alignItems: 'center', paddingBottom: 2, paddingTop: 0}}>
<TouchableOpacity onPress={navigateToCategoryViewPage}>
Expand Down