Commit 3ae8c9f3 authored by Mark Harding's avatar Mark Harding

Merge branch 'fix/nsfw-full-screen-post' into 'release/4.2.1'

Fix nsfw full screen post view

See merge request !759
parents a517ef10 af6a5b95
......@@ -28,6 +28,7 @@ import CommentList from '../../../comments/CommentList';
import CommentsStore from '../../../comments/CommentsStore';
import { ScrollView } from 'react-native-gesture-handler';
import isIphoneX from '../../../common/helpers/isIphoneX';
import ExplicitOverlay from '../../../common/components/explicit/ExplicitOverlay';
const FONT_THRESHOLD = 300;
......@@ -58,7 +59,13 @@ const ActivityFullScreen = observer((props: PropsType) => {
const navigation = useNavigation();
const hasMedia = entity.hasMedia();
const hasRemind = !!entity.remind_object;
const showText = (!!entity.text || entity.title) && !store.isEditing;
const overlay = entity.shouldBeBlured() ? (
<ExplicitOverlay
entity={entity}
closeContainerStyle={{ paddingTop: insets.top }}
/>
) : null;
const showText = (!!entity.text || !!entity.title) && !store.isEditing;
const isShortText =
!hasMedia && !hasRemind && entity.text.length < FONT_THRESHOLD;
......@@ -220,6 +227,7 @@ const ActivityFullScreen = observer((props: PropsType) => {
onPressComment={onPressComment}
/>
</View>
{overlay}
<BottomOptionPopup
height={window.height * 0.85}
title={bottomStore.title}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment