Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions app/containers/MediaCallHeader/MediaCallHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const styles = StyleSheet.create({
justifyContent: 'space-between',
alignItems: 'center',
paddingHorizontal: 12,
paddingBottom: 12,
borderBottomWidth: StyleSheet.hairlineWidth
}
});
Expand All @@ -27,16 +28,17 @@ const MediaCallHeader = () => {

const defaultHeaderStyle = {
backgroundColor: colors.surfaceNeutral,
paddingTop: insets.top + 12,
paddingBottom: 12
paddingTop: insets.top
};

if (!call) {
return <View style={defaultHeaderStyle} testID='media-call-header-empty' />;
}

return (
<View style={[styles.header, { ...defaultHeaderStyle, borderBottomColor: colors.strokeLight }]} testID='media-call-header'>
<View
style={[styles.header, { ...defaultHeaderStyle, borderBottomColor: colors.strokeLight, paddingTop: insets.top + 12 }]}
testID='media-call-header'>
<Collapse />
<Content />
<EndCall />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ exports[`Story Snapshots: ActiveCall should match snapshot 1`] = `
"borderBottomWidth": 0.5,
"flexDirection": "row",
"justifyContent": "space-between",
"paddingBottom": 12,
"paddingHorizontal": 12,
},
{
"backgroundColor": "#E4E7EA",
"borderBottomColor": "#CBCED1",
"paddingBottom": 12,
"paddingTop": 12,
},
]
Expand Down Expand Up @@ -158,8 +158,8 @@ exports[`Story Snapshots: ActiveCall should match snapshot 1`] = `
style={
{
"alignItems": "flex-start",
"flex": 1,
"flexDirection": "column",
"flexGrow": 1,
"justifyContent": "space-evenly",
}
}
Expand Down Expand Up @@ -228,7 +228,7 @@ exports[`Story Snapshots: ActiveCall should match snapshot 1`] = `
Bob Burnquist
<Text>
-
16117:18:53
16140:16:32
</Text>
</Text>
</View>
Expand Down Expand Up @@ -362,12 +362,12 @@ exports[`Story Snapshots: Collapsed should match snapshot 1`] = `
"borderBottomWidth": 0.5,
"flexDirection": "row",
"justifyContent": "space-between",
"paddingBottom": 12,
"paddingHorizontal": 12,
},
{
"backgroundColor": "#E4E7EA",
"borderBottomColor": "#CBCED1",
"paddingBottom": 12,
"paddingTop": 12,
},
]
Expand Down Expand Up @@ -504,8 +504,8 @@ exports[`Story Snapshots: Collapsed should match snapshot 1`] = `
style={
{
"alignItems": "flex-start",
"flex": 1,
"flexDirection": "column",
"flexGrow": 1,
"justifyContent": "space-evenly",
}
}
Expand Down Expand Up @@ -574,7 +574,7 @@ exports[`Story Snapshots: Collapsed should match snapshot 1`] = `
Bob Burnquist
<Text>
-
16117:18:53
16140:16:32
</Text>
</Text>
</View>
Expand Down Expand Up @@ -708,12 +708,12 @@ exports[`Story Snapshots: ConnectingCall should match snapshot 1`] = `
"borderBottomWidth": 0.5,
"flexDirection": "row",
"justifyContent": "space-between",
"paddingBottom": 12,
"paddingHorizontal": 12,
},
{
"backgroundColor": "#E4E7EA",
"borderBottomColor": "#CBCED1",
"paddingBottom": 12,
"paddingTop": 12,
},
]
Expand Down Expand Up @@ -850,8 +850,8 @@ exports[`Story Snapshots: ConnectingCall should match snapshot 1`] = `
style={
{
"alignItems": "flex-start",
"flex": 1,
"flexDirection": "column",
"flexGrow": 1,
"justifyContent": "space-evenly",
}
}
Expand Down Expand Up @@ -1050,12 +1050,12 @@ exports[`Story Snapshots: Focused should match snapshot 1`] = `
"borderBottomWidth": 0.5,
"flexDirection": "row",
"justifyContent": "space-between",
"paddingBottom": 12,
"paddingHorizontal": 12,
},
{
"backgroundColor": "#E4E7EA",
"borderBottomColor": "#CBCED1",
"paddingBottom": 12,
"paddingTop": 12,
},
]
Expand Down Expand Up @@ -1192,8 +1192,8 @@ exports[`Story Snapshots: Focused should match snapshot 1`] = `
style={
{
"alignItems": "flex-start",
"flex": 1,
"flexDirection": "column",
"flexGrow": 1,
"justifyContent": "space-evenly",
}
}
Expand Down Expand Up @@ -1262,7 +1262,7 @@ exports[`Story Snapshots: Focused should match snapshot 1`] = `
Bob Burnquist
<Text>
-
16117:18:53
16140:16:32
</Text>
</Text>
</View>
Expand Down Expand Up @@ -1392,8 +1392,7 @@ exports[`Story Snapshots: NoCall should match snapshot 1`] = `
style={
{
"backgroundColor": "#E4E7EA",
"paddingBottom": 12,
"paddingTop": 12,
"paddingTop": 0,
}
}
testID="media-call-header-empty"
Expand All @@ -1417,12 +1416,12 @@ exports[`Story Snapshots: WithRemoteHeld should match snapshot 1`] = `
"borderBottomWidth": 0.5,
"flexDirection": "row",
"justifyContent": "space-between",
"paddingBottom": 12,
"paddingHorizontal": 12,
},
{
"backgroundColor": "#E4E7EA",
"borderBottomColor": "#CBCED1",
"paddingBottom": 12,
"paddingTop": 12,
},
]
Expand Down Expand Up @@ -1559,8 +1558,8 @@ exports[`Story Snapshots: WithRemoteHeld should match snapshot 1`] = `
style={
{
"alignItems": "flex-start",
"flex": 1,
"flexDirection": "column",
"flexGrow": 1,
"justifyContent": "space-evenly",
}
}
Expand Down Expand Up @@ -1629,7 +1628,7 @@ exports[`Story Snapshots: WithRemoteHeld should match snapshot 1`] = `
Bob Burnquist
<Text>
-
16117:18:53
16140:16:32
</Text>
</Text>
</View>
Expand Down Expand Up @@ -1763,12 +1762,12 @@ exports[`Story Snapshots: WithRemoteMuted should match snapshot 1`] = `
"borderBottomWidth": 0.5,
"flexDirection": "row",
"justifyContent": "space-between",
"paddingBottom": 12,
"paddingHorizontal": 12,
},
{
"backgroundColor": "#E4E7EA",
"borderBottomColor": "#CBCED1",
"paddingBottom": 12,
"paddingTop": 12,
},
]
Expand Down Expand Up @@ -1905,8 +1904,8 @@ exports[`Story Snapshots: WithRemoteMuted should match snapshot 1`] = `
style={
{
"alignItems": "flex-start",
"flex": 1,
"flexDirection": "column",
"flexGrow": 1,
"justifyContent": "space-evenly",
}
}
Expand Down Expand Up @@ -1975,7 +1974,7 @@ exports[`Story Snapshots: WithRemoteMuted should match snapshot 1`] = `
Bob Burnquist
<Text>
-
16117:18:53
16140:16:32
</Text>
</Text>
</View>
Expand Down
2 changes: 1 addition & 1 deletion app/containers/MediaCallHeader/components/Content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const styles = StyleSheet.create({
paddingHorizontal: 4
},
container: {
flex: 1,
flexGrow: 1,
flexDirection: 'column',
justifyContent: 'space-evenly',
alignItems: 'flex-start'
Expand Down
7 changes: 5 additions & 2 deletions app/containers/MediaCallHeader/components/Subtitle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import I18n from '../../../i18n';
import sharedStyles from '../../../views/Styles';

const styles = StyleSheet.create({
headerTitle: {
headerSubtitle: {
...sharedStyles.textRegular,
fontSize: 12,
lineHeight: 16
Expand Down Expand Up @@ -42,7 +42,10 @@ const Subtitle = () => {
}

return (
<Text style={[styles.headerTitle, { color: colors.fontSecondaryInfo }]} testID='call-view-header-subtitle' numberOfLines={1}>
<Text
style={[styles.headerSubtitle, { color: colors.fontSecondaryInfo }]}
testID='call-view-header-subtitle'
numberOfLines={1}>
{subtitle}
</Text>
);
Expand Down
Loading