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

feat: improve general UI and UX #56

Merged
merged 6 commits into from
Dec 8, 2020
Merged

feat: improve general UI and UX #56

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d201940
fix(home): display the pinned article only if pinned is selected
mheob Dec 8, 2020
82c1cbb
feat(settings): add a link to write an email to the convertion team
mheob Dec 8, 2020
c7cd603
feat(article): increase the body text and line height a bit
mheob Dec 8, 2020
0365e7f
fix(article): hide unneeded navigation of post slideshow
mheob Dec 8, 2020
62969d1
Merge branch 'release/v1' into 49-ui--ux-modifications
mheob Dec 8, 2020
c9623ec
feat(article): remove DETAILS buttons and link complete preview
mheob Dec 8, 2020
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
Prev Previous commit
feat(article): remove DETAILS buttons and link complete preview
  • Loading branch information
@mheob
mheob committed Dec 8, 2020
commit c9623ec6261730ebfe042ecd7dd26e32b1ccc66e
46 changes: 20 additions & 26 deletions src/components/Articles/ArticlePreview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { Ionicons } from '@expo/vector-icons'

import LogoRound from '@components/UI/LogoRound'
import Text from '@components/UI/Text'
import Button from '@components/UI/Button'
import Touchable from '@components/UI/Touchable'
import { HomeStackParamList } from '@navigations/HomeNavigator'
import { CategoriesStackParamList } from '@navigations/CategoriesNavigator'
Expand All @@ -28,32 +27,28 @@ const ArticlePreview: React.FC<Props> = ({ article, hasImage = true, ignoreSpons
const isPinned = () => !!(article.acf?.pinned && !ignoreSponsored)

const defaultArticle = (
<View style={styles.articleContainer}>
{hasImage && (
<View style={styles.imageColumn}>
{article.featured_media ? (
<Image style={styles.image as ImageStyle} source={{ uri: article.featured_image_thumb }} />
) : (
<View style={styles.image as ViewStyle} testID="no-image">
<LogoRound />
</View>
)}
</View>
)}
<View style={styles.textColumn}>
<HTML baseFontStyle={styles.title} html={article.title.rendered} />
<View style={styles.dateContainer}>
<Ionicons name="ios-clock" size={12} color={colors.accentColor} />
<Text style={styles.date}>{getLocaleLongDate(new Date(article.date_gmt))}</Text>
<Touchable onPress={() => navigation.navigate('ArticleScreen', { postId: article.id })}>
<View style={styles.articleContainer} testID="default-article">
{hasImage && (
<View style={styles.imageColumn}>
{article.featured_media ? (
<Image style={styles.image as ImageStyle} source={{ uri: article.featured_image_thumb }} />
) : (
<View style={styles.image as ViewStyle} testID="no-image">
<LogoRound />
</View>
)}
</View>
)}
<View style={styles.textColumn}>
<HTML baseFontStyle={styles.title} html={article.title.rendered} />
<View style={styles.dateContainer}>
<Ionicons name="ios-clock" size={12} color={colors.accentColor} />
<Text style={styles.date}>{getLocaleLongDate(new Date(article.date_gmt))}</Text>
</View>
</View>
<Button
textStyle={{ fontSize: 12 }}
title="Details"
onPress={() => navigation.navigate('ArticleScreen', { postId: article.id })}
testID="button"
/>
</View>
</View>
</Touchable>
)

const sponsoredArticle = (
Expand Down Expand Up @@ -106,7 +101,6 @@ const styles = StyleSheet.create<Styles>({
justifyContent: 'flex-end',
},
articleContainer: {
alignItems: 'center',
flexDirection: 'row',
padding: 15,
},
Expand Down
9 changes: 2 additions & 7 deletions src/components/Articles/__tests__/ArticlePreview.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { act, fireEvent, render } from '@testing-library/react-native'
import { render } from '@testing-library/react-native'

import ArticlePreview from '../ArticlePreview'
import { article, articlePinned, articleWithoutFeatured, articleWithoutSponsored } from '@__mocks__/article'
Expand Down Expand Up @@ -34,11 +34,6 @@ describe('<ArticleList />', () => {

it('should call the navigate function once', () => {
const { getByTestId } = render(<ArticlePreview article={articleWithoutSponsored} />)

act(() => {
fireEvent.press(getByTestId('button'))
})

expect(mockedNavigate).toHaveBeenCalledTimes(1)
expect(getByTestId('default-article').children).toHaveLength(2)
})
})
Loading