octo/tooot
1
0
Fork 0
mirror of https://github.com/tooot-app/app synced 2025-06-05 22:19:13 +02:00
Code Issues Projects Releases Wiki Activity

Fixed #51

Browse Source
This commit is contained in:
Zhiyuan Zheng
2021-03-14 01:35:38 +01:00
parent 5fe6cd59f9
commit b21f1b5a0e
5 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/Timeline/Notifications.tsx
View File

@ -17,6 +17,7 @@ import { uniqBy } from 'lodash'
import React, { useCallback } from 'react'
import { Pressable, StyleSheet, View } from 'react-native'
import { useSelector } from 'react-redux'
import TimelineFullConversation from './Shared/FullConversation'
export interface Props {
notification: Mastodon.Notification
@ -52,7 +53,15 @@ const TimelineNotifications: React.FC<Props> = ({
return (
<Pressable
style={[styles.notificationView, { backgroundColor: theme.background }]}
style={[
styles.notificationView,
{
backgroundColor: theme.background,
paddingBottom: notification.status
? 0
: StyleConstants.Spacing.Global.PagePadding
}
]}
onPress={onPress}
>
{notification.type !== 'mention' ? (
@ -112,6 +121,7 @@ const TimelineNotifications: React.FC<Props> = ({
{notification.status.card && (
<TimelineCard card={notification.status.card} />
)}
<TimelineFullConversation status={notification.status} />
</View>
) : null}
</View>
@ -144,8 +154,7 @@ const TimelineNotifications: React.FC<Props> = ({
const styles = StyleSheet.create({
notificationView: {
padding: StyleConstants.Spacing.Global.PagePadding,
paddingBottom: 0
padding: StyleConstants.Spacing.Global.PagePadding
},
header: {
flex: 1,