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

Would adding View helps #472 ?

Browse Source
This commit is contained in:
xmflsct
2022-12-05 22:11:45 +01:00
parent 5338720106
commit c4f825e087
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/screens/Compose.tsx
View File

@ -257,13 +257,17 @@ const ScreenCompose: React.FC<RootStackScreenProps<'Screen-Compose'>> = ({
() => ( () => (
<HeaderRight <HeaderRight
type='text' type='text'
content={ content={t(
params?.type `heading.right.button.${
? params.type === 'conversation' && params.visibility === 'direct' (params?.type &&
? t(`heading.right.button.${params.type}`) (params.type === 'conversation'
: t('heading.right.button.default') ? params.visibility === 'direct'
: t('heading.right.button.default') ? params.type
} : 'default'
: params.type)) ||
'default'
}`
)}
onPress={() => { onPress={() => {
composeDispatch({ type: 'posting', payload: true }) composeDispatch({ type: 'posting', payload: true })

4
src/screens/Compose/Root/Footer.tsx
View File

@ -13,13 +13,13 @@ const ComposeRootFooter: React.FC<Props> = ({ accessibleRefAttachments }) => {
const { composeState } = useContext(ComposeContext) const { composeState } = useContext(ComposeContext)
return ( return (
<> <View>
{composeState.attachments.uploads.length ? ( {composeState.attachments.uploads.length ? (
<ComposeAttachments accessibleRefAttachments={accessibleRefAttachments} /> <ComposeAttachments accessibleRefAttachments={accessibleRefAttachments} />
) : null} ) : null}
{composeState.poll.active ? <ComposePoll /> : null} {composeState.poll.active ? <ComposePoll /> : null}
{composeState.replyToStatus ? <ComposeReply /> : null} {composeState.replyToStatus ? <ComposeReply /> : null}
</> </View>
) )
} }

9
src/screens/Compose/Root/Header.tsx
View File

@ -11,13 +11,10 @@ import ComposeTextInput from './Header/TextInput'
const ComposeRootHeader: React.FC = () => { const ComposeRootHeader: React.FC = () => {
const { composeState } = useContext(ComposeContext) const { composeState } = useContext(ComposeContext)
const instanceActive = useSelector(getInstanceActive) const instanceActive = useSelector(getInstanceActive)
const localInstances = useSelector( const localInstances = useSelector(getInstances, (prev, next) => prev.length === next.length)
getInstances,
(prev, next) => prev.length === next.length
)
return ( return (
<> <View>
{instanceActive !== -1 && localInstances.length > 1 ? ( {instanceActive !== -1 && localInstances.length > 1 ? (
<View style={styles.postingAs}> <View style={styles.postingAs}>
<ComposePostingAs /> <ComposePostingAs />
@ -25,7 +22,7 @@ const ComposeRootHeader: React.FC = () => {
) : null} ) : null}
{composeState.spoiler.active ? <ComposeSpoilerInput /> : null} {composeState.spoiler.active ? <ComposeSpoilerInput /> : null}
<ComposeTextInput /> <ComposeTextInput />
</> </View>
) )
} }

4
src/screens/Compose/Root/Header/TextInput.tsx
View File

@ -28,11 +28,9 @@ const ComposeTextInput: React.FC = () => {
<PasteInput <PasteInput
keyboardAppearance={mode} keyboardAppearance={mode}
style={{ style={{
...StyleConstants.FontStyle.M,
marginTop: StyleConstants.Spacing.S, marginTop: StyleConstants.Spacing.S,
paddingBottom: StyleConstants.Spacing.M, paddingBottom: StyleConstants.Spacing.M,
marginLeft: StyleConstants.Spacing.Global.PagePadding, marginHorizontal: StyleConstants.Spacing.Global.PagePadding,
marginRight: StyleConstants.Spacing.Global.PagePadding,
color: colors.primaryDefault, color: colors.primaryDefault,
borderBottomColor: colors.border, borderBottomColor: colors.border,
fontSize: adaptedFontsize, fontSize: adaptedFontsize,