octo/tooot
octo
/
tooot
mirror of https://github.com/tooot-app/app
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed Android's svg spans full width

This commit is contained in:
xmflsct 2023-01-15 19:59:48 +01:00
parent 9a289489fa
commit 86c3e91439
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/Timeline/Default.tsx
View File

@ -36,6 +36,7 @@ export interface Props {
disableDetails?: boolean disableDetails?: boolean
disableOnPress?: boolean disableOnPress?: boolean
isConversation?: boolean isConversation?: boolean
noBackground?: boolean
} }
// When the poll is long // When the poll is long
@ -45,7 +46,8 @@ const TimelineDefault: React.FC<Props> = ({
highlighted = false, highlighted = false,
disableDetails = false, disableDetails = false,
disableOnPress = false, disableOnPress = false,
isConversation = false isConversation = false,
noBackground = false
}) => { }) => {
const status = item.reblog ? item.reblog : item const status = item.reblog ? item.reblog : item
const rawContent = useRef<string[]>([]) const rawContent = useRef<string[]>([])
@ -77,7 +79,7 @@ const TimelineDefault: React.FC<Props> = ({
padding: disableDetails padding: disableDetails
? StyleConstants.Spacing.Global.PagePadding / 1.5 ? StyleConstants.Spacing.Global.PagePadding / 1.5
: StyleConstants.Spacing.Global.PagePadding, : StyleConstants.Spacing.Global.PagePadding,
backgroundColor: colors.backgroundDefault, backgroundColor: noBackground ? undefined : colors.backgroundDefault,
paddingBottom: disableDetails ? StyleConstants.Spacing.Global.PagePadding / 1.5 : 0 paddingBottom: disableDetails ? StyleConstants.Spacing.Global.PagePadding / 1.5 : 0
} }
const main = () => ( const main = () => (

13
src/screens/Tabs/Shared/Toot.tsx
View File

@ -310,12 +310,6 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
} }
}) => setHeights({ ...heights, [index]: height })} }) => setHeights({ ...heights, [index]: height })}
> >
<TimelineDefault
item={item}
queryKey={item._remote ? queryKey.remote : queryKey.local}
highlighted={toot.id === item.id || item.id === 'cached'}
isConversation={toot.id !== item.id && item.id !== 'cached'}
/>
{curr > 1 || next > 1 {curr > 1 || next > 1
? [...new Array(curr)].map((_, i) => { ? [...new Array(curr)].map((_, i) => {
if (i > MAX_LEVEL) return null if (i > MAX_LEVEL) return null
@ -399,6 +393,13 @@ const TabSharedToot: React.FC<TabSharedStackScreenProps<'Tab-Shared-Toot'>> = ({
} }
}) })
: null} : null}
<TimelineDefault
item={item}
queryKey={item._remote ? queryKey.remote : queryKey.local}
highlighted={toot.id === item.id || item.id === 'cached'}
isConversation={toot.id !== item.id && item.id !== 'cached'}
noBackground
/>
{/* <CustomText {/* <CustomText
children={query.data?.pages[0].body[index - 1]?._level} children={query.data?.pages[0].body[index - 1]?._level}
style={{ position: 'absolute', top: 4, left: 4, color: colors.red }} style={{ position: 'absolute', top: 4, left: 4, color: colors.red }}