Skip to content
Commits on Source (2)
Hide whitespace changes
Inline Side-by-side
__tests__/activity/components/__snapshots__/Activity.js.snap
View file @ 1fbb2def
......@@ -134,7 +134,7 @@ exports[`Activity component renders correctly 1`] = `
"alignSelf": "flex-end",
"position": "absolute",
"right": 10,
"top": 20,
"top": 6,
}
}
>
......@@ -229,139 +229,139 @@ exports[`Activity component renders correctly 1`] = `
</ForwardRef(Text)>
</TouchableOpacity>
</OwnerBlock>
<ForwardRef(View)>
<ForwardRef(View)
style={
Object {
"padding": 8,
}
<ForwardRef(View)
style={
Object {
"padding": 8,
}
>
<ExplicitText
entity={
ActivityModel {
"attachment_guid": false,
"blurb": false,
"comments:count": undefined,
"container_guid": "activityguid0",
"custom_data": false,
"custom_type": false,
"description": "Congratulations! ",
"edited": "",
"getThumbSource": [Function],
"guid": "activityguid0",
"is_visible": true,
"mature": false,
"mature_visibility": false,
"message": "Message",
"ownerObj": UserModel {
"getAvatarSource": [Function],
"guid": "824853017709780997",
"subtype": false,
"time_created": "1522036284",
"type": "user",
},
"owner_guid": "824853017709780997",
"parent_guid": "838106762591510528",
"paywall": undefined,
"perma_url": false,
"pinned": undefined,
"rowKey": "something0",
"shouldBeBlured": [MockFunction] {
"calls": Array [
Array [],
],
"results": Array [
Object {
"type": "return",
"value": undefined,
},
],
},
"thumbnail_src": false,
"thumbs:down:count": undefined,
"thumbs:down:user_guids": undefined,
"thumbs:up:count": undefined,
"thumbs:up:user_guids": undefined,
"title": "TITLE",
"type": "activity",
"wire_totals": Object {
"tokens": 1000000000000000000,
},
}
}
>
<ExplicitText
entity={
ActivityModel {
"attachment_guid": false,
"blurb": false,
"comments:count": undefined,
"container_guid": "activityguid0",
"custom_data": false,
"custom_type": false,
"description": "Congratulations! ",
"edited": "",
"getThumbSource": [Function],
"guid": "activityguid0",
"is_visible": true,
"mature": false,
"mature_visibility": false,
"message": "Message",
"ownerObj": UserModel {
"getAvatarSource": [Function],
"guid": "824853017709780997",
"subtype": false,
"time_created": "1522036284",
"type": "user",
},
"owner_guid": "824853017709780997",
"parent_guid": "838106762591510528",
"paywall": undefined,
"perma_url": false,
"pinned": undefined,
"rowKey": "something0",
"shouldBeBlured": [MockFunction] {
"calls": Array [
Array [],
],
"results": Array [
Object {
"type": "return",
"value": undefined,
},
],
},
"thumbnail_src": false,
"thumbs:down:count": undefined,
"thumbs:down:user_guids": undefined,
"thumbs:up:count": undefined,
"thumbs:up:user_guids": undefined,
"title": "TITLE",
"type": "activity",
"wire_totals": Object {
"tokens": 1000000000000000000,
},
}
navigation={
Object {
"navigate": [MockFunction],
"push": [MockFunction],
}
}
navigation={
Object {
"navigate": [MockFunction],
"push": [MockFunction],
}
style={
Object {
"fontFamily": "Roboto",
}
}
style={
Object {
"fontFamily": "Roboto",
}
/>
<Translate
entity={
ActivityModel {
"attachment_guid": false,
"blurb": false,
"comments:count": undefined,
"container_guid": "activityguid0",
"custom_data": false,
"custom_type": false,
"description": "Congratulations! ",
"edited": "",
"getThumbSource": [Function],
"guid": "activityguid0",
"is_visible": true,
"mature": false,
"mature_visibility": false,
"message": "Message",
"ownerObj": UserModel {
"getAvatarSource": [Function],
"guid": "824853017709780997",
"subtype": false,
"time_created": "1522036284",
"type": "user",
},
"owner_guid": "824853017709780997",
"parent_guid": "838106762591510528",
"paywall": undefined,
"perma_url": false,
"pinned": undefined,
"rowKey": "something0",
"shouldBeBlured": [MockFunction] {
"calls": Array [
Array [],
],
"results": Array [
Object {
"type": "return",
"value": undefined,
},
],
},
"thumbnail_src": false,
"thumbs:down:count": undefined,
"thumbs:down:user_guids": undefined,
"thumbs:up:count": undefined,
"thumbs:up:user_guids": undefined,
"title": "TITLE",
"type": "activity",
"wire_totals": Object {
"tokens": 1000000000000000000,
},
}
}
/>
<Translate
entity={
ActivityModel {
"attachment_guid": false,
"blurb": false,
"comments:count": undefined,
"container_guid": "activityguid0",
"custom_data": false,
"custom_type": false,
"description": "Congratulations! ",
"edited": "",
"getThumbSource": [Function],
"guid": "activityguid0",
"is_visible": true,
"mature": false,
"mature_visibility": false,
"message": "Message",
"ownerObj": UserModel {
"getAvatarSource": [Function],
"guid": "824853017709780997",
"subtype": false,
"time_created": "1522036284",
"type": "user",
},
"owner_guid": "824853017709780997",
"parent_guid": "838106762591510528",
"paywall": undefined,
"perma_url": false,
"pinned": undefined,
"rowKey": "something0",
"shouldBeBlured": [MockFunction] {
"calls": Array [
Array [],
],
"results": Array [
Object {
"type": "return",
"value": undefined,
},
],
},
"thumbnail_src": false,
"thumbs:down:count": undefined,
"thumbs:down:user_guids": undefined,
"thumbs:up:count": undefined,
"thumbs:up:user_guids": undefined,
"title": "TITLE",
"type": "activity",
"wire_totals": Object {
"tokens": 1000000000000000000,
},
}
style={
Object {
"fontFamily": "Roboto",
}
}
style={
Object {
"fontFamily": "Roboto",
}
/>
</ForwardRef(View)>
}
/>
</ForwardRef(View)>
<ForwardRef(View)>
<MediaView
entity={
ActivityModel {
......@@ -421,7 +421,11 @@ exports[`Activity component renders correctly 1`] = `
"push": [MockFunction],
}
}
style={Object {}}
style={
Object {
"flex": 1,
}
}
width={750}
/>
</ForwardRef(View)>
......
__tests__/activity/components/actions/__snapshots__/RemindAction.js.snap
View file @ 1fbb2def
......@@ -12,6 +12,7 @@ exports[`Thumb action component renders correctly 1`] = `
"flexDirection": "row",
"justifyContent": "center",
},
null,
]
}
testID="Remind activity button"
......
src/newsfeed/activity/Activity.js
View file @ 1fbb2def
......@@ -84,10 +84,11 @@ export default class Activity extends Component {
<View style={[styles.container, this.props.isReminded ? null : CommonStyle.hairLineBottom]} onLayout={this.props.onLayout}>
<Pinned entity={this.props.entity}/>
{ this.showOwner() }
<View>
{ lock }
{ message }
<View>
{ this.showRemind() }
<MediaView
ref={o => {this.mediaView = o}}
entity={ entity }
......@@ -269,7 +270,7 @@ const styles = StyleSheet.create({
padding: 0
},
media: {
//flex: 1,
flex: 1,
},
timestamp: {
fontSize: 11,
......@@ -282,7 +283,7 @@ const styles = StyleSheet.create({
alignSelf: 'flex-end',
position: 'absolute',
right: 10,
top: 20
top: 6
},
boostTagContainer: {
flexDirection: 'row',
......
src/newsfeed/activity/actions/RemindAction.js
View file @ 1fbb2def
......@@ -38,7 +38,7 @@ export default class RemindAction extends PureComponent {
*/
render() {
return (
<TouchableOpacityCustom style={[CommonStyle.flexContainer, CommonStyle.rowJustifyCenter]} onPress={this.remind} {...testID('Remind activity button')}>
<TouchableOpacityCustom style={[CommonStyle.flexContainer, CommonStyle.rowJustifyCenter, this.props.vertical === true ? styles.verticalTouchable : null]} onPress={this.remind} {...testID('Remind activity button')}>
<Icon color={this.props.entity['reminds'] > 0 ? 'rgb(70, 144, 214)' : 'rgb(96, 125, 139)'} name='repeat' size={this.props.size} />
<Counter count={this.props.entity['reminds']} size={this.props.size * 0.75} />
</TouchableOpacityCustom>
......@@ -65,6 +65,10 @@ const styles = StyleSheet.create({
},
modalHeader: {
padding: 5
},
verticalTouchable: {
flexDirection: 'column',
alignItems: 'center',
}
});
......