martin/databag
1
0
Fork 0
mirror of https://github.com/balzack/databag.git synced 2025-02-14 12:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing carousel dismiss for android

Browse Source
This commit is contained in:
Roland Osborne 2022-10-17 12:10:29 -07:00
parent 72b8970067
commit 04a533835f
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/mobile/src/session/conversation/topicItem/TopicItem.jsx
View File

@ -22,9 +22,9 @@ export function TopicItem({ item, focused, focus }) {
const renderAsset = (asset) => { const renderAsset = (asset) => {
return ( return (
<TouchableOpacity style={styles.frame} activeOpacity={1} onPress={actions.hideCarousel}> <View style={styles.frame}>
{ asset.item.image && ( { asset.item.image && (
<ImageAsset topicId={item.topicId} asset={asset.item.image} /> <ImageAsset topicId={item.topicId} asset={asset.item.image} dismiss={actions.hideCarousel} />
)} )}
{ asset.item.video && ( { asset.item.video && (
<VideoAsset topicId={item.topicId} asset={asset.item.video} /> <VideoAsset topicId={item.topicId} asset={asset.item.video} />
@ -33,7 +33,7 @@ export function TopicItem({ item, focused, focus }) {
<AudioAsset topicId={item.topicId} asset={asset.item.audio} active={state.activeId == asset.dataIndex} <AudioAsset topicId={item.topicId} asset={asset.item.audio} active={state.activeId == asset.dataIndex}
setActive={() => actions.setActive(asset.dataIndex)} /> setActive={() => actions.setActive(asset.dataIndex)} />
)} )}
</TouchableOpacity> </View>
) )
} }

8
app/mobile/src/session/conversation/topicItem/imageAsset/ImageAsset.jsx
View File

@ -1,13 +1,15 @@
import { Image } from 'react-native'; import { Image, TouchableOpacity } from 'react-native';
import { useImageAsset } from './useImageAsset.hook'; import { useImageAsset } from './useImageAsset.hook';
import { styles } from './ImageAsset.styled'; import { styles } from './ImageAsset.styled';
import Colors from 'constants/Colors'; import Colors from 'constants/Colors';
export function ImageAsset({ topicId, asset }) { export function ImageAsset({ topicId, asset, dismiss }) {
const { state, actions } = useImageAsset(topicId, asset); const { state, actions } = useImageAsset(topicId, asset);
return ( return (
<Image source={{ uri: state.url }} style={{ borderRadius: 4, width: state.imageWidth, height: state.imageHeight }} resizeMode={'cover'} /> <TouchableOpacity onPress={dismiss}>
<Image source={{ uri: state.url }} style={{ borderRadius: 4, width: state.imageWidth, height: state.imageHeight }} resizeMode={'cover'} />
</TouchableOpacity>
); );
} }