forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
move files around (#5576)
authored by
Samuel Newman
and committed by
GitHub
13c9c79a
40596683
+19
-19
src/screens/Messages/Conversation/ChatDisabled.tsx
src/screens/Messages/components/ChatDisabled.tsx
src/screens/Messages/Conversation/ChatDisabled.tsx
src/screens/Messages/components/ChatDisabled.tsx
+1
-1
src/screens/Messages/Conversation/MessageInput.tsx
src/screens/Messages/components/MessageInput.tsx
+1
-1
src/screens/Messages/Conversation/MessageInput.tsx
src/screens/Messages/components/MessageInput.tsx
···
18
18
19
19
import {HITSLOP_10, MAX_DM_GRAPHEME_LENGTH} from '#/lib/constants'
20
20
import {useHaptics} from '#/lib/haptics'
21
+
import {isIOS} from '#/platform/detection'
21
22
import {
22
23
useMessageDraft,
23
24
useSaveMessageDraft,
24
25
} from '#/state/messages/message-drafts'
25
-
import {isIOS} from 'platform/detection'
26
26
import {EmojiPickerPosition} from '#/view/com/composer/text-input/web/EmojiPicker.web'
27
27
import * as Toast from '#/view/com/util/Toast'
28
28
import {atoms as a, useTheme} from '#/alf'
+2
-2
src/screens/Messages/Conversation/MessageInput.web.tsx
src/screens/Messages/components/MessageInput.web.tsx
+2
-2
src/screens/Messages/Conversation/MessageInput.web.tsx
src/screens/Messages/components/MessageInput.web.tsx
···
5
5
import Graphemer from 'graphemer'
6
6
import TextareaAutosize from 'react-textarea-autosize'
7
7
8
+
import {isSafari, isTouchDevice} from '#/lib/browser'
8
9
import {MAX_DM_GRAPHEME_LENGTH} from '#/lib/constants'
10
+
import {useWebMediaQueries} from '#/lib/hooks/useWebMediaQueries'
9
11
import {
10
12
useMessageDraft,
11
13
useSaveMessageDraft,
12
14
} from '#/state/messages/message-drafts'
13
-
import {isSafari, isTouchDevice} from 'lib/browser'
14
-
import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries'
15
15
import {textInputWebEmitter} from '#/view/com/composer/text-input/textInputWebEmitter'
16
16
import {
17
17
Emoji,
src/screens/Messages/Conversation/MessageInputEmbed.tsx
src/screens/Messages/components/MessageInputEmbed.tsx
src/screens/Messages/Conversation/MessageInputEmbed.tsx
src/screens/Messages/components/MessageInputEmbed.tsx
src/screens/Messages/Conversation/MessageListError.tsx
src/screens/Messages/components/MessageListError.tsx
src/screens/Messages/Conversation/MessageListError.tsx
src/screens/Messages/components/MessageListError.tsx
+7
-7
src/screens/Messages/Conversation/MessagesList.tsx
src/screens/Messages/components/MessagesList.tsx
+7
-7
src/screens/Messages/Conversation/MessagesList.tsx
src/screens/Messages/components/MessagesList.tsx
···
15
15
import {useSafeAreaInsets} from 'react-native-safe-area-context'
16
16
import {AppBskyEmbedRecord, AppBskyRichtextFacet, RichText} from '@atproto/api'
17
17
18
+
import {clamp} from '#/lib/numbers'
19
+
import {ScrollProvider} from '#/lib/ScrollContext'
18
20
import {shortenLinks, stripInvalidMentions} from '#/lib/strings/rich-text-manip'
19
21
import {
20
22
convertBskyAppUrlIfNeeded,
···
22
24
} from '#/lib/strings/url-helpers'
23
25
import {logger} from '#/logger'
24
26
import {isNative} from '#/platform/detection'
27
+
import {isWeb} from '#/platform/detection'
25
28
import {isConvoActive, useConvoActive} from '#/state/messages/convo'
26
29
import {ConvoItem, ConvoStatus} from '#/state/messages/convo/types'
27
30
import {useGetPost} from '#/state/queries/post'
28
31
import {useAgent} from '#/state/session'
29
-
import {clamp} from 'lib/numbers'
30
-
import {ScrollProvider} from 'lib/ScrollContext'
31
-
import {isWeb} from 'platform/detection'
32
32
import {
33
33
EmojiPicker,
34
34
EmojiPickerState,
35
35
} from '#/view/com/composer/text-input/web/EmojiPicker.web'
36
-
import {List} from 'view/com/util/List'
37
-
import {ChatDisabled} from '#/screens/Messages/Conversation/ChatDisabled'
38
-
import {MessageInput} from '#/screens/Messages/Conversation/MessageInput'
39
-
import {MessageListError} from '#/screens/Messages/Conversation/MessageListError'
36
+
import {List} from '#/view/com/util/List'
37
+
import {ChatDisabled} from '#/screens/Messages/components/ChatDisabled'
38
+
import {MessageInput} from '#/screens/Messages/components/MessageInput'
39
+
import {MessageListError} from '#/screens/Messages/components/MessageListError'
40
40
import {ChatEmptyPill} from '#/components/dms/ChatEmptyPill'
41
41
import {MessageItem} from '#/components/dms/MessageItem'
42
42
import {NewMessagesPill} from '#/components/dms/NewMessagesPill'
+7
-7
src/screens/Messages/Conversation/index.tsx
src/screens/Messages/Conversation.tsx
+7
-7
src/screens/Messages/Conversation/index.tsx
src/screens/Messages/Conversation.tsx
···
8
8
import {NativeStackScreenProps} from '@react-navigation/native-stack'
9
9
10
10
import {CommonNavigatorParams} from '#/lib/routes/types'
11
+
import {isWeb} from '#/platform/detection'
12
+
import {useProfileShadow} from '#/state/cache/profile-shadow'
13
+
import {ConvoProvider, isConvoActive, useConvo} from '#/state/messages/convo'
14
+
import {ConvoStatus} from '#/state/messages/convo/types'
11
15
import {useCurrentConvoId} from '#/state/messages/current-convo-id'
12
16
import {useModerationOpts} from '#/state/preferences/moderation-opts'
13
17
import {useProfileQuery} from '#/state/queries/profile'
14
-
import {isWeb} from 'platform/detection'
15
-
import {useProfileShadow} from 'state/cache/profile-shadow'
16
-
import {ConvoProvider, isConvoActive, useConvo} from 'state/messages/convo'
17
-
import {ConvoStatus} from 'state/messages/convo/types'
18
-
import {useSetMinimalShellMode} from 'state/shell'
19
-
import {CenteredView} from 'view/com/util/Views'
20
-
import {MessagesList} from '#/screens/Messages/Conversation/MessagesList'
18
+
import {useSetMinimalShellMode} from '#/state/shell'
19
+
import {CenteredView} from '#/view/com/util/Views'
20
+
import {MessagesList} from '#/screens/Messages/components/MessagesList'
21
21
import {atoms as a, useBreakpoints, useTheme} from '#/alf'
22
22
import {MessagesListBlockedFooter} from '#/components/dms/MessagesListBlockedFooter'
23
23
import {MessagesListHeader} from '#/components/dms/MessagesListHeader'
src/screens/Messages/List/ChatListItem.tsx
src/screens/Messages/components/ChatListItem.tsx
src/screens/Messages/List/ChatListItem.tsx
src/screens/Messages/components/ChatListItem.tsx
+1
-1
src/screens/Messages/List/index.tsx
src/screens/Messages/ChatList.tsx
+1
-1
src/screens/Messages/List/index.tsx
src/screens/Messages/ChatList.tsx
···
33
33
import {ListFooter} from '#/components/Lists'
34
34
import {Loader} from '#/components/Loader'
35
35
import {Text} from '#/components/Typography'
36
-
import {ChatListItem} from './ChatListItem'
36
+
import {ChatListItem} from './components/ChatListItem'
37
37
38
38
type Props = NativeStackScreenProps<MessagesTabNavigatorParams, 'Messages'>
39
39