diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-04-21 15:43:03 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-04-21 15:43:03 -0400 |
| commit | 0dd0a4ac4343df036a1f16cbde070c524405bd21 (patch) | |
| tree | 292a30ce0228560720214645805deb4b89f2eeae /src/screens/chat/ChatScreen.tsx | |
| parent | 5c438df5f6787cdc6c393873a98590cc827667b9 (diff) | |
| parent | 4e8e1c0d58424e6b63cfb8470fc0a73c0e6b102b (diff) | |
Merge branch 'master' into hotfix-linting-fixup
# Conflicts:
# .eslintrc.js
# src/components/notifications/Notification.tsx
# src/screens/onboarding/legacy/SocialMedia.tsx
# src/screens/onboarding/legacy/WaitlistSuccessScreen.tsx
# src/screens/profile/CategorySelection.tsx
Diffstat (limited to 'src/screens/chat/ChatScreen.tsx')
| -rw-r--r-- | src/screens/chat/ChatScreen.tsx | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/src/screens/chat/ChatScreen.tsx b/src/screens/chat/ChatScreen.tsx index 656c1c47..57f2232e 100644 --- a/src/screens/chat/ChatScreen.tsx +++ b/src/screens/chat/ChatScreen.tsx @@ -16,7 +16,9 @@ import {ChatContext} from '../../App'; import { ChatHeader, ChatInput, + DateHeader, MessageAvatar, + MessageFooter, TabsGradient, TypingIndicator, } from '../../components'; @@ -37,6 +39,9 @@ const ChatScreen: React.FC<ChatScreenProps> = () => { const {setTopInset} = useAttachmentPickerContext(); const insets = useSafeAreaInsets(); const chatTheme: DeepPartial<Theme> = { + colors: { + accent_blue: '#6EE7E7', + }, messageList: { container: { backgroundColor: 'white', @@ -70,6 +75,24 @@ const ChatScreen: React.FC<ChatScreenProps> = () => { flexDirection: 'row', }, content: { + deletedContainer: {}, + deletedContainerInner: { + borderColor: 'transparent', + borderBottomLeftRadius: 10, + borderTopLeftRadius: 10, + borderBottomRightRadius: 10, + borderTopRightRadius: 10, + }, + deletedMetaText: { + paddingHorizontal: 10, + }, + deletedText: { + em: { + fontSize: 15, + fontStyle: 'italic', + fontWeight: '400', + }, + }, metaContainer: { marginLeft: 5, }, @@ -123,6 +146,10 @@ const ChatScreen: React.FC<ChatScreenProps> = () => { copyMessage, deleteMessage, ]} + InlineDateSeparator={DateHeader} + StickyHeader={() => null} + ScrollToBottomButton={() => null} + MessageFooter={MessageFooter} TypingIndicator={TypingIndicator} myMessageTheme={loggedInUsersMessageTheme} MessageAvatar={MessageAvatar}> |