Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/settings design #484

Merged
merged 10 commits into from
Aug 29, 2018
Merged

Fix/settings design #484

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e4b3ec8
[ui] Settings Screen: Design changes to List and Button
prameetc Aug 20, 2018
43f7782
[ui] Updated design of arrows and buttons to match design
prameetc Aug 20, 2018
920460b
Updated Global Header Title Style
prameetc Aug 21, 2018
0c0b77f
[ui] Design changes to Settings Main Screen and Profile
prameetc Aug 22, 2018
391068b
[ui] Updated Tests
prameetc Aug 22, 2018
0d4f373
[ui] Updated Styles for Settings Screen
prameetc Aug 22, 2018
5dba7df
[ui] Updated Tests
prameetc Aug 22, 2018
92f3580
[profile] Fixed UI.
seland Aug 29, 2018
f066e26
[tests] Updated snapshots.
seland Aug 29, 2018
2d36377
Merge branch 'develop' into fix/settings-design
seland Aug 29, 2018
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
22 changes: 12 additions & 10 deletions __tests__/src/components/common/__snapshots__/ScreenTitle.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ShallowWrapper {
style={
Object {
"alignItems": "flex-start",
"height": 52,
"height": 40,
}
}
>
Expand All @@ -35,7 +35,7 @@ ShallowWrapper {
Object {
"color": "#58595B",
"fontFamily": "Roboto",
"fontSize": 22,
"fontSize": 27,
"fontWeight": "900",
"letterSpacing": 0,
"lineHeight": 30,
Expand All @@ -46,6 +46,7 @@ ShallowWrapper {
</Text>
</View>,
"style": Object {
"marginBottom": 8,
"marginHorizontal": 20,
},
},
Expand All @@ -63,7 +64,7 @@ ShallowWrapper {
Object {
"color": "#58595B",
"fontFamily": "Roboto",
"fontSize": 22,
"fontSize": 27,
"fontWeight": "900",
"letterSpacing": 0,
"lineHeight": 30,
Expand All @@ -74,7 +75,7 @@ ShallowWrapper {
</Text>,
"style": Object {
"alignItems": "flex-start",
"height": 52,
"height": 40,
},
},
"ref": null,
Expand All @@ -90,7 +91,7 @@ ShallowWrapper {
"style": Object {
"color": "#58595B",
"fontFamily": "Roboto",
"fontSize": 22,
"fontSize": 27,
"fontWeight": "900",
"letterSpacing": 0,
"lineHeight": 30,
Expand All @@ -114,7 +115,7 @@ ShallowWrapper {
style={
Object {
"alignItems": "flex-start",
"height": 52,
"height": 40,
}
}
>
Expand All @@ -126,7 +127,7 @@ ShallowWrapper {
Object {
"color": "#58595B",
"fontFamily": "Roboto",
"fontSize": 22,
"fontSize": 27,
"fontWeight": "900",
"letterSpacing": 0,
"lineHeight": 30,
Expand All @@ -137,6 +138,7 @@ ShallowWrapper {
</Text>
</View>,
"style": Object {
"marginBottom": 8,
"marginHorizontal": 20,
},
},
Expand All @@ -154,7 +156,7 @@ ShallowWrapper {
Object {
"color": "#58595B",
"fontFamily": "Roboto",
"fontSize": 22,
"fontSize": 27,
"fontWeight": "900",
"letterSpacing": 0,
"lineHeight": 30,
Expand All @@ -165,7 +167,7 @@ ShallowWrapper {
</Text>,
"style": Object {
"alignItems": "flex-start",
"height": 52,
"height": 40,
},
},
"ref": null,
Expand All @@ -181,7 +183,7 @@ ShallowWrapper {
"style": Object {
"color": "#58595B",
"fontFamily": "Roboto",
"fontSize": 22,
"fontSize": 27,
"fontWeight": "900",
"letterSpacing": 0,
"lineHeight": 30,
Expand Down
194 changes: 56 additions & 138 deletions __tests__/src/screens/Settings/ProfileScreen/Profile/__snapshots__/index.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,16 +147,6 @@ ShallowWrapper {
}
}
/>
<Button
enabled={true}
onPress={[Function]}
style={
Object {
"marginTop": 13,
}
}
title="Share Identity Key"
/>
</View>,
],
"style": Object {
Expand Down Expand Up @@ -312,75 +302,44 @@ ShallowWrapper {
"key": undefined,
"nodeType": "class",
"props": Object {
"children": Array [
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Object {
"color": undefined,
"fontSize": 13,
"textAlign": "center",
}
}
/>,
<Button
enabled={true}
onPress={[Function]}
style={
Object {
"marginTop": 13,
}
"children": <Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Object {
"color": undefined,
"fontSize": 13,
"textAlign": "center",
}
title="Share Identity Key"
/>,
],
}
/>,
"style": Object {
"marginLeft": 40,
"marginRight": 40,
"marginTop": 10,
},
},
"ref": null,
"rendered": Array [
Object {
"instance": null,
"key": undefined,
"nodeType": "class",
"props": Object {
"accessible": true,
"allowFontScaling": true,
"children": undefined,
"ellipsizeMode": "tail",
"style": Object {
"color": undefined,
"fontSize": 13,
"textAlign": "center",
},
},
"ref": null,
"rendered": null,
"type": [Function],
},
Object {
"instance": null,
"key": undefined,
"nodeType": "function",
"props": Object {
"children": undefined,
"enabled": true,
"onPress": [Function],
"style": Object {
"marginTop": 13,
},
"title": "Share Identity Key",
"rendered": Object {
"instance": null,
"key": undefined,
"nodeType": "class",
"props": Object {
"accessible": true,
"allowFontScaling": true,
"children": undefined,
"ellipsizeMode": "tail",
"style": Object {
"color": undefined,
"fontSize": 13,
"textAlign": "center",
},
"ref": null,
"rendered": null,
"type": [Function],
},
],
"ref": null,
"rendered": null,
"type": [Function],
},
"type": [Function],
},
],
Expand Down Expand Up @@ -474,16 +433,6 @@ ShallowWrapper {
}
}
/>
<Button
enabled={true}
onPress={[Function]}
style={
Object {
"marginTop": 13,
}
}
title="Share Identity Key"
/>
</View>,
],
"style": Object {
Expand Down Expand Up @@ -639,75 +588,44 @@ ShallowWrapper {
"key": undefined,
"nodeType": "class",
"props": Object {
"children": Array [
<Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Object {
"color": undefined,
"fontSize": 13,
"textAlign": "center",
}
}
/>,
<Button
enabled={true}
onPress={[Function]}
style={
Object {
"marginTop": 13,
}
"children": <Text
accessible={true}
allowFontScaling={true}
ellipsizeMode="tail"
style={
Object {
"color": undefined,
"fontSize": 13,
"textAlign": "center",
}
title="Share Identity Key"
/>,
],
}
/>,
"style": Object {
"marginLeft": 40,
"marginRight": 40,
"marginTop": 10,
},
},
"ref": null,
"rendered": Array [
Object {
"instance": null,
"key": undefined,
"nodeType": "class",
"props": Object {
"accessible": true,
"allowFontScaling": true,
"children": undefined,
"ellipsizeMode": "tail",
"style": Object {
"color": undefined,
"fontSize": 13,
"textAlign": "center",
},
},
"ref": null,
"rendered": null,
"type": [Function],
},
Object {
"instance": null,
"key": undefined,
"nodeType": "function",
"props": Object {
"children": undefined,
"enabled": true,
"onPress": [Function],
"style": Object {
"marginTop": 13,
},
"title": "Share Identity Key",
"rendered": Object {
"instance": null,
"key": undefined,
"nodeType": "class",
"props": Object {
"accessible": true,
"allowFontScaling": true,
"children": undefined,
"ellipsizeMode": "tail",
"style": Object {
"color": undefined,
"fontSize": 13,
"textAlign": "center",
},
"ref": null,
"rendered": null,
"type": [Function],
},
],
"ref": null,
"rendered": null,
"type": [Function],
},
"type": [Function],
},
],
Expand Down
Loading