mirror of https://github.com/tooot-app/app
Basic announcement done
This commit is contained in:
parent
e00ec84c7c
commit
eeee40b49a
|
@ -34,18 +34,21 @@ declare namespace Mastodon {
|
||||||
type Announcement = {
|
type Announcement = {
|
||||||
// Base
|
// Base
|
||||||
id: string
|
id: string
|
||||||
text: string
|
content: string
|
||||||
published: boolean
|
|
||||||
all_day: boolean
|
all_day: boolean
|
||||||
created_at: string
|
published_at: string
|
||||||
updated_at: string
|
updated_at: string
|
||||||
read: boolean
|
read: boolean
|
||||||
reactions: AnnouncementReaction[]
|
|
||||||
|
|
||||||
// Others
|
// Others
|
||||||
scheduled_at?: string
|
scheduled_at?: string
|
||||||
starts_at?: string
|
starts_at?: string
|
||||||
ends_at?: string
|
ends_at?: string
|
||||||
|
reactions?: AnnouncementReaction[]
|
||||||
|
mentions?: Mention[]
|
||||||
|
statuses?: Status[]
|
||||||
|
tags?: Tag[]
|
||||||
|
emojis?: Emoji[]
|
||||||
}
|
}
|
||||||
|
|
||||||
type AnnouncementReaction = {
|
type AnnouncementReaction = {
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
import 'react-native-gesture-handler'
|
import 'react-native-gesture-handler'
|
||||||
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs'
|
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs'
|
||||||
import { NavigationContainer } from '@react-navigation/native'
|
import {
|
||||||
|
NavigationContainer,
|
||||||
|
NavigationContainerRef
|
||||||
|
} from '@react-navigation/native'
|
||||||
import { enableScreens } from 'react-native-screens'
|
import { enableScreens } from 'react-native-screens'
|
||||||
|
|
||||||
import React, { useEffect } from 'react'
|
import React, { useEffect, useRef } from 'react'
|
||||||
import { StatusBar } from 'react-native'
|
import { StatusBar } from 'react-native'
|
||||||
import Toast from 'react-native-toast-message'
|
import Toast from 'react-native-toast-message'
|
||||||
import { Feather } from '@expo/vector-icons'
|
import { Feather } from '@expo/vector-icons'
|
||||||
|
@ -23,6 +26,9 @@ import {
|
||||||
getLocalUrl,
|
getLocalUrl,
|
||||||
updateLocalAccountPreferences
|
updateLocalAccountPreferences
|
||||||
} from '@utils/slices/instancesSlice'
|
} from '@utils/slices/instancesSlice'
|
||||||
|
import { useQuery } from 'react-query'
|
||||||
|
import { announcementFetch } from './utils/fetches/announcementsFetch'
|
||||||
|
import client from './api/client'
|
||||||
|
|
||||||
enableScreens()
|
enableScreens()
|
||||||
const Tab = createBottomTabNavigator<RootStackParamList>()
|
const Tab = createBottomTabNavigator<RootStackParamList>()
|
||||||
|
@ -67,10 +73,29 @@ export const Index: React.FC<Props> = ({ localCorrupt }) => {
|
||||||
}
|
}
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
|
const navigationRef = useRef<NavigationContainerRef>(null)
|
||||||
|
useEffect(() => {
|
||||||
|
client({
|
||||||
|
method: 'get',
|
||||||
|
instance: 'local',
|
||||||
|
url: `announcements`
|
||||||
|
})
|
||||||
|
.then(({ body }: { body?: Mastodon.Announcement[] }) => {
|
||||||
|
if (body?.filter(announcement => !announcement.read).length) {
|
||||||
|
navigationRef.current?.navigate('Screen-Shared-Announcements')
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(() => {})
|
||||||
|
}, [])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<StatusBar barStyle={barStyle[mode]} />
|
<StatusBar barStyle={barStyle[mode]} />
|
||||||
<NavigationContainer theme={themes[mode]} key={i18n.language}>
|
<NavigationContainer
|
||||||
|
ref={navigationRef}
|
||||||
|
theme={themes[mode]}
|
||||||
|
key={i18n.language}
|
||||||
|
>
|
||||||
<Tab.Navigator
|
<Tab.Navigator
|
||||||
initialRouteName={localInstance ? 'Screen-Local' : 'Screen-Public'}
|
initialRouteName={localInstance ? 'Screen-Local' : 'Screen-Public'}
|
||||||
screenOptions={({ route }) => ({
|
screenOptions={({ route }) => ({
|
||||||
|
|
|
@ -0,0 +1,277 @@
|
||||||
|
import { useBottomTabBarHeight } from '@react-navigation/bottom-tabs'
|
||||||
|
import client from '@root/api/client'
|
||||||
|
import { ButtonRow } from '@root/components/Button'
|
||||||
|
import ParseContent from '@root/components/ParseContent'
|
||||||
|
import { announcementFetch } from '@root/utils/fetches/announcementsFetch'
|
||||||
|
import { StyleConstants } from '@root/utils/styles/constants'
|
||||||
|
import { useTheme } from '@root/utils/styles/ThemeManager'
|
||||||
|
import { BlurView } from 'expo-blur'
|
||||||
|
import React, { useCallback, useEffect, useRef, useState } from 'react'
|
||||||
|
import {
|
||||||
|
Dimensions,
|
||||||
|
Image,
|
||||||
|
Pressable,
|
||||||
|
StyleSheet,
|
||||||
|
Text,
|
||||||
|
TextInput,
|
||||||
|
View
|
||||||
|
} from 'react-native'
|
||||||
|
import { FlatList, ScrollView } from 'react-native-gesture-handler'
|
||||||
|
import { SafeAreaView } from 'react-native-safe-area-context'
|
||||||
|
import { useMutation, useQuery } from 'react-query'
|
||||||
|
|
||||||
|
const fireMutation = async ({
|
||||||
|
announcementId,
|
||||||
|
type,
|
||||||
|
name,
|
||||||
|
me
|
||||||
|
}: {
|
||||||
|
announcementId: Mastodon.Announcement['id']
|
||||||
|
type: 'reaction' | 'dismiss'
|
||||||
|
name?: Mastodon.AnnouncementReaction['name']
|
||||||
|
me?: boolean
|
||||||
|
}) => {
|
||||||
|
switch (type) {
|
||||||
|
case 'reaction':
|
||||||
|
return client({
|
||||||
|
method: me ? 'delete' : 'put',
|
||||||
|
instance: 'local',
|
||||||
|
url: `announcements/${announcementId}/reactions/${name}`
|
||||||
|
})
|
||||||
|
case 'dismiss':
|
||||||
|
return client({
|
||||||
|
method: 'post',
|
||||||
|
instance: 'local',
|
||||||
|
url: `announcements/${announcementId}/dismiss`
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const ScreenSharedAnnouncements: React.FC = ({ navigation }) => {
|
||||||
|
const { mode, theme } = useTheme()
|
||||||
|
const bottomTabBarHeight = useBottomTabBarHeight()
|
||||||
|
const [index, setIndex] = useState(0)
|
||||||
|
const invisibleTextInputRef = useRef<TextInput>(null)
|
||||||
|
|
||||||
|
const queryKey = ['Announcements']
|
||||||
|
const { data, refetch } = useQuery(queryKey, announcementFetch, {
|
||||||
|
select: announcements =>
|
||||||
|
announcements.filter(announcement => !announcement.read)
|
||||||
|
})
|
||||||
|
const { mutate } = useMutation(fireMutation, {
|
||||||
|
onSettled: () => {
|
||||||
|
refetch()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (data?.length === 0) {
|
||||||
|
navigation.goBack()
|
||||||
|
}
|
||||||
|
}, [data])
|
||||||
|
|
||||||
|
const renderItem = useCallback(
|
||||||
|
({ item, index }: { item: Mastodon.Announcement; index: number }) => (
|
||||||
|
<View key={index} style={styles.announcementContainer}>
|
||||||
|
<Pressable
|
||||||
|
style={styles.pressable}
|
||||||
|
onPress={() => navigation.goBack()}
|
||||||
|
/>
|
||||||
|
<View
|
||||||
|
style={[
|
||||||
|
styles.announcement,
|
||||||
|
{
|
||||||
|
borderColor: theme.primary,
|
||||||
|
backgroundColor: theme.background
|
||||||
|
}
|
||||||
|
]}
|
||||||
|
>
|
||||||
|
<ScrollView style={styles.scrollView} showsVerticalScrollIndicator>
|
||||||
|
<ParseContent
|
||||||
|
content={item.content}
|
||||||
|
size='M'
|
||||||
|
emojis={item.emojis}
|
||||||
|
mentions={item.mentions}
|
||||||
|
numberOfLines={999}
|
||||||
|
/>
|
||||||
|
</ScrollView>
|
||||||
|
{item.reactions?.length ? (
|
||||||
|
<View style={styles.reactions}>
|
||||||
|
{item.reactions?.map(reaction => (
|
||||||
|
<Pressable
|
||||||
|
key={reaction.name}
|
||||||
|
style={[styles.reaction, { borderColor: theme.primary }]}
|
||||||
|
onPress={() =>
|
||||||
|
mutate({
|
||||||
|
announcementId: item.id,
|
||||||
|
type: 'reaction',
|
||||||
|
name: reaction.name,
|
||||||
|
me: reaction.me
|
||||||
|
})
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{reaction.url ? (
|
||||||
|
<Image
|
||||||
|
source={{ uri: reaction.url }}
|
||||||
|
style={[styles.reactionImage]}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<Text style={[styles.reactionText]}>{reaction.name}</Text>
|
||||||
|
)}
|
||||||
|
{reaction.count ? (
|
||||||
|
<Text
|
||||||
|
style={[styles.reactionCount, { color: theme.primary }]}
|
||||||
|
>
|
||||||
|
{reaction.count}
|
||||||
|
</Text>
|
||||||
|
) : null}
|
||||||
|
</Pressable>
|
||||||
|
))}
|
||||||
|
{/* <Pressable
|
||||||
|
style={[styles.reaction, { borderColor: theme.primary }]}
|
||||||
|
onPress={() => invisibleTextInputRef.current?.focus()}
|
||||||
|
>
|
||||||
|
<Feather
|
||||||
|
name='plus'
|
||||||
|
size={StyleConstants.Font.Size.M}
|
||||||
|
color={theme.primary}
|
||||||
|
/>
|
||||||
|
</Pressable> */}
|
||||||
|
</View>
|
||||||
|
) : null}
|
||||||
|
<ButtonRow
|
||||||
|
text='标记已读'
|
||||||
|
onPress={() => mutate({ type: 'dismiss', announcementId: item.id })}
|
||||||
|
style={styles.button}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
),
|
||||||
|
[]
|
||||||
|
)
|
||||||
|
|
||||||
|
const onMomentumScrollEnd = useCallback(
|
||||||
|
({
|
||||||
|
nativeEvent: {
|
||||||
|
contentOffset: { x },
|
||||||
|
layoutMeasurement: { width }
|
||||||
|
}
|
||||||
|
}) => {
|
||||||
|
setIndex(Math.floor(x / width))
|
||||||
|
},
|
||||||
|
[]
|
||||||
|
)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<SafeAreaView style={styles.base}>
|
||||||
|
<TextInput
|
||||||
|
style={styles.invisibleTextInput}
|
||||||
|
ref={invisibleTextInputRef}
|
||||||
|
keyboardType='ascii-capable'
|
||||||
|
/>
|
||||||
|
<BlurView
|
||||||
|
intensity={90}
|
||||||
|
tint={mode}
|
||||||
|
style={{ ...StyleSheet.absoluteFillObject }}
|
||||||
|
/>
|
||||||
|
<View style={[styles.header, { height: bottomTabBarHeight }]}>
|
||||||
|
<Text style={[styles.headerText, { color: theme.primary }]}>公告</Text>
|
||||||
|
</View>
|
||||||
|
<FlatList
|
||||||
|
horizontal
|
||||||
|
data={data}
|
||||||
|
pagingEnabled
|
||||||
|
renderItem={renderItem}
|
||||||
|
showsHorizontalScrollIndicator={false}
|
||||||
|
onMomentumScrollEnd={onMomentumScrollEnd}
|
||||||
|
/>
|
||||||
|
<View style={[styles.indicators, { height: bottomTabBarHeight }]}>
|
||||||
|
{data && data.length > 1 ? (
|
||||||
|
<>
|
||||||
|
{data.map((d, i) => (
|
||||||
|
<View
|
||||||
|
key={i}
|
||||||
|
style={[
|
||||||
|
styles.indicator,
|
||||||
|
{
|
||||||
|
borderColor: theme.primary,
|
||||||
|
backgroundColor: i === index ? theme.primary : undefined,
|
||||||
|
marginLeft: i === data.length ? 0 : StyleConstants.Spacing.S
|
||||||
|
}
|
||||||
|
]}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</>
|
||||||
|
) : null}
|
||||||
|
</View>
|
||||||
|
</SafeAreaView>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const styles = StyleSheet.create({
|
||||||
|
base: {
|
||||||
|
flex: 1
|
||||||
|
},
|
||||||
|
invisibleTextInput: { ...StyleSheet.absoluteFillObject },
|
||||||
|
header: {
|
||||||
|
justifyContent: 'center',
|
||||||
|
alignItems: 'center'
|
||||||
|
},
|
||||||
|
headerText: {
|
||||||
|
fontSize: StyleConstants.Font.Size.M * 1.5,
|
||||||
|
fontWeight: StyleConstants.Font.Weight.Bold
|
||||||
|
},
|
||||||
|
announcementContainer: {
|
||||||
|
width: Dimensions.get('screen').width,
|
||||||
|
padding: StyleConstants.Spacing.Global.PagePadding,
|
||||||
|
justifyContent: 'center'
|
||||||
|
},
|
||||||
|
pressable: { ...StyleSheet.absoluteFillObject },
|
||||||
|
announcement: {
|
||||||
|
flexShrink: 1,
|
||||||
|
padding: StyleConstants.Spacing.Global.PagePadding,
|
||||||
|
marginTop: StyleConstants.Spacing.Global.PagePadding,
|
||||||
|
borderWidth: 1,
|
||||||
|
borderRadius: 6
|
||||||
|
},
|
||||||
|
scrollView: {
|
||||||
|
marginBottom: StyleConstants.Spacing.Global.PagePadding / 2
|
||||||
|
},
|
||||||
|
reactions: { flexDirection: 'row', flexWrap: 'wrap' },
|
||||||
|
reaction: {
|
||||||
|
borderWidth: StyleSheet.hairlineWidth,
|
||||||
|
padding: StyleConstants.Spacing.Global.PagePadding / 2,
|
||||||
|
marginTop: StyleConstants.Spacing.Global.PagePadding / 2,
|
||||||
|
marginBottom: StyleConstants.Spacing.Global.PagePadding / 2,
|
||||||
|
marginRight: StyleConstants.Spacing.M,
|
||||||
|
borderRadius: 6,
|
||||||
|
flexDirection: 'row'
|
||||||
|
},
|
||||||
|
reactionImage: {
|
||||||
|
width: StyleConstants.Font.LineHeight.M + 3,
|
||||||
|
height: StyleConstants.Font.LineHeight.M
|
||||||
|
},
|
||||||
|
reactionText: {
|
||||||
|
fontSize: StyleConstants.Font.Size.M
|
||||||
|
},
|
||||||
|
reactionCount: {
|
||||||
|
fontSize: StyleConstants.Font.Size.S,
|
||||||
|
marginLeft: StyleConstants.Spacing.S
|
||||||
|
},
|
||||||
|
button: {
|
||||||
|
marginTop: StyleConstants.Spacing.Global.PagePadding / 2
|
||||||
|
},
|
||||||
|
indicators: {
|
||||||
|
flexDirection: 'row',
|
||||||
|
justifyContent: 'center',
|
||||||
|
alignItems: 'center'
|
||||||
|
},
|
||||||
|
indicator: {
|
||||||
|
width: StyleConstants.Spacing.S,
|
||||||
|
height: StyleConstants.Spacing.S,
|
||||||
|
borderRadius: StyleConstants.Spacing.S,
|
||||||
|
borderWidth: 1
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
export default ScreenSharedAnnouncements
|
|
@ -1,13 +1,13 @@
|
||||||
import React from 'react'
|
import { HeaderLeft } from '@root/components/Header'
|
||||||
|
|
||||||
import ScreenSharedAccount from '@screens/Shared/Account'
|
import ScreenSharedAccount from '@screens/Shared/Account'
|
||||||
|
import ScreenSharedAnnouncements from '@screens/Shared/Announcement'
|
||||||
import ScreenSharedHashtag from '@screens/Shared/Hashtag'
|
import ScreenSharedHashtag from '@screens/Shared/Hashtag'
|
||||||
import ScreenSharedToot from '@screens/Shared/Toot'
|
import ScreenSharedToot from '@screens/Shared/Toot'
|
||||||
import Compose from '@screens/Shared/Compose'
|
import Compose from '@screens/Shared/Compose'
|
||||||
import ComposeEditAttachment from '@screens/Shared/Compose/EditAttachment'
|
import ComposeEditAttachment from '@screens/Shared/Compose/EditAttachment'
|
||||||
import ScreenSharedSearch from '@screens/Shared/Search'
|
import ScreenSharedSearch from '@screens/Shared/Search'
|
||||||
|
import React from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
import { HeaderLeft } from '@root/components/Header'
|
|
||||||
|
|
||||||
const sharedScreens = (Stack: any) => {
|
const sharedScreens = (Stack: any) => {
|
||||||
const { t } = useTranslation()
|
const { t } = useTranslation()
|
||||||
|
@ -78,6 +78,15 @@ const sharedScreens = (Stack: any) => {
|
||||||
options={{
|
options={{
|
||||||
stackPresentation: 'modal'
|
stackPresentation: 'modal'
|
||||||
}}
|
}}
|
||||||
|
/>,
|
||||||
|
<Stack.Screen
|
||||||
|
key='Screen-Shared-Announcements'
|
||||||
|
name='Screen-Shared-Announcements'
|
||||||
|
component={ScreenSharedAnnouncements}
|
||||||
|
options={{
|
||||||
|
stackPresentation: 'transparentModal',
|
||||||
|
stackAnimation: 'fade'
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
import client from '@api/client'
|
||||||
|
|
||||||
|
export const announcementFetch = async (): Promise<Mastodon.Announcement[]> => {
|
||||||
|
const res = await client({
|
||||||
|
method: 'get',
|
||||||
|
instance: 'local',
|
||||||
|
url: `announcements`
|
||||||
|
})
|
||||||
|
return Promise.resolve(res.body)
|
||||||
|
}
|
|
@ -0,0 +1,6 @@
|
||||||
|
import { LayoutAnimation } from 'react-native'
|
||||||
|
|
||||||
|
const layoutAnimation = () =>
|
||||||
|
LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut)
|
||||||
|
|
||||||
|
export default layoutAnimation
|
Loading…
Reference in New Issue