Skip to content
Permalink
Browse files

feat: Improve the settings menu and add easy access via the top bar (#…

…1144)

* Improve the settings menu and add easy access via the top bar

* change the size of the icons and  change margin between the 2 buttons

* refactor: renaming, fixed size, added params

* refactor: remove custom size, update icons

* refactor: showMenuItem > showInMainMenu

* refactor: rename showInMainMenu = showAddWebAppDialog

* fix snapshots

Co-authored-by: Alexey Kosinski <36693645+AlexeyKosinski@users.noreply.github.com>
  • Loading branch information
2 people authored and sirpy committed Jan 10, 2020
1 parent bdd3915 commit 08331a433f18e89c9d7cb30dc0ccc6e53a4190d5
BIN +3.44 KB (110%) src/assets/fonts/gooddollar.eot 100755 → 100644
Binary file not shown.
10 src/assets/fonts/gooddollar.svg 100755 → 100644
@@ -1,7 +1,7 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Copyright (C) 2019 by original authors @ fontello.com</metadata>
<metadata>Copyright (C) 2020 by original authors @ fontello.com</metadata>
<defs>
<font id="gooddollar" horiz-adv-x="1000" >
<font-face font-family="gooddollar" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
@@ -126,7 +126,13 @@

<glyph glyph-name="goodmarket" unicode="&#xe83d;" d="M1147 677c-3-29-27-53-59-53-32 0-59 27-59 59 0 18-12 29-29 29s-30-11-30-29c0-32-26-59-58-59s-59 27-59 59c0 18-12 29-30 29s-29-11-29-29c0-32-27-59-59-59s-59 27-59 59c0 18-12 29-29 29s-30-11-30-29c0-32-26-59-58-59-30 0-56 24-59 53l41 68 29 47h506l44-74 27-41z m-577-373v261c36 45 100 53 147 18 6-6 12-12 18-18 41 50 115 56 165 12 6-3 9-9 12-12 35 47 100 53 147 21 5-6 11-12 17-18v-261h-138v167c-3 15-15 24-29 24h-168c-15 0-27-9-29-24v-167h-142z m200 147h109v-144h-109v144z m436 232c0 6-3 12-6 18 0 0 0 3 0 3l-83 132c-5 9-14 15-26 15h-538c-9 0-21-6-27-15l-82-132c0 0 0-3 0-3-3-6-6-12-6-18 0-47 26-88 71-109v-294c3-15 14-23 29-23h565c14 0 26 8 29 23v294c47 21 74 62 74 109m-1015-748c-9-9-17-17-32-23s-30-9-47-9c-18 0-33 3-47 12s-24 20-33 35c-5 15-11 32-11 53v18c0 32 8 56 23 73 15 18 35 27 65 27 23 0 41-6 56-18 14-12 20-29 23-50h-35c-3 26-18 38-44 38-18 0-30-6-38-17s-12-30-12-53v-15c0-24 6-41 15-53 8-12 23-18 41-18 17 0 32 3 38 12v41h-44v27h79v-80z m30 53c0 15 3 30 8 41 6 12 15 21 27 30 12 6 23 9 38 9 21 0 38-6 50-21s21-32 21-53l0-9c0-14-3-29-9-41s-15-21-27-29-23-9-38-9c-20 0-38 6-53 20-9 15-17 36-17 62l0 0z m35-3c0-14 3-29 9-38 6-9 14-15 26-15s21 6 27 15 9 24 9 41c0 15-3 30-9 39s-15 14-27 14c-12 0-20-6-26-14-6-9-9-24-9-42z m132 3c0 15 3 30 9 41 6 12 15 21 27 30 11 6 23 9 38 9 20 0 38-6 50-21s20-32 20-53l0-9c0-14-3-29-8-41s-15-21-27-29-23-9-38-9c-21 0-38 6-53 20-12 15-18 36-18 62l0 0z m36-3c0-14 3-29 8-38 6-9 15-15 27-15s20 6 26 15 9 24 9 41c0 15-3 30-9 39s-14 14-26 14c-12 0-21-6-27-14-5-9-8-24-8-42z m132 3c0 24 6 44 18 59 11 15 26 21 44 21 17 0 29-6 41-18v79h35v-220h-32l-3 14c-12-11-24-17-41-17-18 0-33 6-44 20s-18 36-18 62z m35-3c0-14 3-29 9-38 6-9 15-15 27-15 14 0 23 6 32 18v68c-6 11-18 17-32 17-12 0-21-6-27-14-6-6-9-18-9-36z m188 133l62-159 59 159h47v-209h-35v67l3 92-62-159h-26l-62 162 3-92v-70h-36v209h47z m300-209c-2 3-2 9-2 14-12-11-24-17-42-17-14 0-29 6-38 15s-15 20-15 32c0 18 6 29 18 38 12 9 29 15 53 15h21v9c0 9-3 14-6 20-6 6-12 6-21 6-9 0-15-3-20-6-6-3-9-8-9-14h-36c0 8 3 17 9 23 6 9 15 15 24 18 9 3 20 6 32 6 18 0 32-6 44-15 12-9 18-21 18-38v-71c0-15 3-26 6-32v-3h-36z m-38 26c6 0 15 3 21 6 6 3 12 9 15 15v29h-18c-12 0-24-3-30-6s-8-11-8-17c0-6 3-12 6-15 0-12 5-12 14-12z m186 97c-6 0-9 0-15 0-15 0-27-5-33-17v-106h-35v156h33l0-18c8 15 20 21 35 21 6 0 9 0 12-3l3-33z m73-56l-15-14v-53h-35v220h35v-126l12 15 44 47h41l-58-65 64-91h-41l-47 67z m168-70c-24 0-41 6-53 20-15 15-21 33-21 56v3c0 15 3 30 9 42 6 11 15 20 26 29s24 9 36 9c20 0 38-6 50-21 12-15 17-32 17-56v-15h-103c0-11 6-23 12-29 9-9 18-12 30-12 14 0 29 6 38 21l18-18c-6-9-15-17-24-20-12-6-24-9-35-9z m-3 132c-9 0-18-3-24-9-6-5-9-14-12-29h68v3c0 12-3 21-9 26-6 6-14 9-23 9z m135 65v-38h27v-27h-27v-85c0-6 0-9 3-12 3-3 6-3 12-3 3 0 9 0 12 0v-29c-9-3-15-3-24-3-26 0-41 15-41 44v88h-27v27h27v38h38z" horiz-adv-x="1647" />

<glyph glyph-name="privacy-policy" unicode="&#xe89e;" d="M883 391h-766a385 385 0 0 0 766 0m-756-139h746a385 385 0 0 0-746 0m873 98a509 509 0 0 1-120 325 491 491 0 0 1-380 175 500 500 0 1 1 500-500" horiz-adv-x="1000" />
<glyph glyph-name="support2" unicode="&#xe83e;" d="M854 476c-8 17-17 34-25 54 11 26 17 57 17 86 0 122-100 222-223 222-123 0-223-100-223-222 0-123 100-223 223-223 26 0 54 5 77 14 20-6 40-14 57-23 29-14 57-26 89-31 11 0 20 3 28 11 29 23 9 60-20 112m-34-55c-14 3-26 9-34 15-26 14-54 25-83 28-6 0-11 0-14-3-20-8-40-11-60-11-92 0-163 74-163 163 0 91 74 163 163 163 91 0 163-75 163-163 0-23-6-46-15-66-11-23 3-49 29-100 3-6 8-17 14-26m-540-100c-8-5-23-11-34-14 6 11 11 20 14 29 26 48 40 77 29 100-9 20-15 42-15 65 0 55 26 106 72 135 3 25 8 48 17 71-89-31-146-114-146-209 0-28 6-57 17-85-5-17-14-37-25-55-26-51-46-88-20-114 8-6 17-11 28-11l0 0c32 5 60 14 89 31 17 9 37 17 57 23 26-9 51-14 77-14 54 0 106 20 149 57-26 3-49 11-72 20-23-12-48-20-77-20-20 0-40 3-60 11-23 15-51 3-100-20m-149-348c0 8-2 17-8 20s-17 8-34 14-29 12-40 17c-18 12-29 26-29 46 0 17 6 29 20 40 14 11 31 17 51 17 15 0 26-3 38-8s20-12 25-23c6-9 9-20 9-32h-34c0 12-3 20-9 26-6 6-17 9-29 9-11 0-20-3-25-9s-9-11-9-20c0-9 3-14 12-20 5-6 17-9 34-14 17-6 28-12 37-17 9-6 17-15 20-20 6-9 6-18 6-29 0-17-6-31-20-40-15-11-32-14-52-14-14 0-28 3-40 8-11 6-23 15-28 23s-12 20-12 34h35c0-11 2-20 11-25s17-9 31-9c12 0 23 3 29 9 9 3 11 11 11 17z m155-37c-9-12-23-17-43-17-17 0-29 5-37 14s-12 23-12 43v97h35v-97c0-20 8-29 22-29 18 0 29 6 35 17v109h34v-152h-34l0 15z m200 60c0-23-6-43-17-57-12-15-26-20-43-20-17 0-29 5-40 17v-72h-35v209h32l0-14c8 11 23 17 40 17 17 0 31-6 43-20 14-15 20-35 20-60l0 0z m-35 3c0 14-2 25-8 37s-14 14-26 14c-14 0-23-6-28-17v-69c5-11 17-17 31-17 11 0 20 6 26 14 3 6 5 20 5 38z m195-3c0-23-6-43-17-57-12-15-26-20-43-20-17 0-29 5-40 17v-72h-32v209h32l0-14c8 11 23 17 40 17 17 0 31-6 43-20 11-15 17-35 17-60l0 0z m-35 3c0 14-2 25-8 37s-14 14-26 14c-14 0-23-6-28-17v-69c5-11 17-17 31-17 11 0 20 6 26 14 3 6 5 20 5 38z m58 0c0 14 2 28 8 40 6 11 14 20 26 28 11 6 23 9 37 9 20 0 37-6 49-20s20-32 20-52l0-8c0-15-3-29-9-40s-14-20-26-29-23-8-37-8c-20 0-37 5-51 20-12 17-17 34-17 60l0 0z m34-3c0-15 3-29 8-37 6-9 15-15 26-15s20 6 26 15 8 22 8 40c0 14-2 28-8 37s-14 14-26 14c-11 0-20-6-26-14-5-9-8-23-8-40z m214 45c-6 0-8 0-14 0-14 0-26-5-32-17v-103h-34v152h32l0-17c8 14 20 20 34 20 6 0 8 0 11-3l3-32z m69 69v-37h25v-26h-25v-83c0-5 0-8 3-11 2-3 5-3 11-3 3 0 9 0 11 0v-26c-8-3-14-3-22-3-26 0-40 15-40 43v86h-26v26h26v37h37z" horiz-adv-x="1029" />

<glyph glyph-name="invite2" unicode="&#xe83f;" d="M159-121h-35v209h35v-209z m73 156l0-17c12 14 27 20 45 20 32 0 50-17 50-56v-103h-33v100c0 9-3 18-6 21-3 6-11 6-20 6-15 0-24-6-33-18v-109h-35v156h32z m186-109l32 112h35l-53-159h-29l-53 156h35l33-109z m91 151c0 5 3 8 6 14s9 6 14 6 12-3 15-6 6-9 6-14c0-6-3-9-6-12-3-3-9-6-15-6s-11 3-14 6c-3 3-6 6-6 12z m38-198h-35v156h35v-156z m80 195v-39h26v-26h-26v-86c0-5 0-8 2-11 3-3 6-3 12-3 3 0 9 0 12 0v-27c-6-3-12-3-21-3-26 0-41 15-41 44v89h-26v26h26v39h36z m123-195c-23 0-41 6-53 21-15 15-20 32-20 56v3c0 14 2 29 8 41 6 12 15 21 27 29s23 9 35 9c21 0 38-6 50-20 12-15 18-33 18-56v-15h-103c0-12 6-24 12-29s17-12 29-12c15 0 29 6 38 20l18-17c-6-9-15-18-24-21-11-9-20-9-35-9z m-3 133c-9 0-18-3-23-9s-9-15-12-30h67v3c0 12-2 21-8 27-6 6-15 9-24 9z m-43 244c0 123-100 223-223 223-124 0-224-100-224-223 0-18 15-32 33-32l0 0c17 0 32 14 32 32 0 85 70 156 156 156 85 0 156-71 156-156 0-18 14-32 35-32 21 0 35 14 35 32m-64 409c0 85-71 156-156 156-86 0-156-71-156-156 0-86 70-156 156-156 85 0 156 70 156 156m-68 0c0-50-41-88-91-88-50 0-89 41-89 91 0 50 42 88 89 88 50 0 91-41 91-91m-297-124c0 18-15 33-33 33h-67v64c0 18-15 33-33 33-17 0-32-15-32-33v-64h-65c-17 0-32-15-32-33 0 0 0 0 0 0 0-17 15-32 32-32 0 0 0 0 0 0h65v-65c0-17 15-32 32-32 0 0 0 0 0 0 18 0 33 15 33 32 0 0 0 0 0 0v65h65c20 0 35 15 35 32l0 0" horiz-adv-x="824" />

<glyph glyph-name="icons---add-icon" unicode="&#xe882;" d="M705 351v0a45 45 0 0 1-44 45l-118 0 0 118a45 45 0 0 1-44 44 44 44 0 0 1-45-44v0l0 0 0-118-118 0a44 44 0 0 1-45-44v0a45 45 0 0 1 45-45l118 0 0-117a45 45 0 1 1 89-1v0l0 118 118 0a44 44 0 0 1 45 44m112-2a317 317 0 1 0-317 318 318 318 0 0 0 317-318m93 0a410 410 0 1 1-410-410 410 410 0 0 1 410 410" horiz-adv-x="1000" />

<glyph glyph-name="privacy-policy" unicode="&#xe883;" d="M813 384h-626a315 315 0 0 0 626 0m-618-114h610a315 315 0 0 0-610 0m714 80a416 416 0 0 1-98 266 401 401 0 0 1-311 143 409 409 0 1 1 409-409" horiz-adv-x="1000" />

<glyph glyph-name="terms-of-use" unicode="&#xe89f;" d="M160 64a46 46 0 0 1 46-45h92a46 46 0 0 1 0 91h-92a46 46 0 0 1-46-46m0 184a46 46 0 0 1 46-46h183a46 46 0 0 1 0 91h-183a46 46 0 0 1-46-45m0 183a46 46 0 0 1 46-46h321a46 46 0 0 1 0 92h-321a46 46 0 0 1-46-46m0 183a46 46 0 0 1 46-46h321a46 46 0 0 1 0 92h-321a46 46 0 0 1-46-46m474-671h-538v814h538z m96-47v907a47 47 0 0 1-48 47h-191c-89-1-138 0-251 0h-192a47 47 0 0 1-48-46v-907a47 47 0 0 1 48-47h634a47 47 0 0 1 48 47" horiz-adv-x="730" />
</font>
BIN +3.44 KB (110%) src/assets/fonts/gooddollar.ttf 100755 → 100644
Binary file not shown.
BIN +1.84 KB (110%) src/assets/fonts/gooddollar.woff 100755 → 100644
Binary file not shown.
BIN +1.51 KB (110%) src/assets/fonts/gooddollar.woff2 100755 → 100644
Binary file not shown.
@@ -108,7 +108,9 @@ const TabsView = React.memo((props: TabViewProps) => {
navigation.navigate('Rewards')
}
}

const goToSupport = () => {
navigation.navigate('Support')
}
const goToMarketplace = () => {
if (isIOS) {
const src = `${config.marketUrl}?jwt=${marketToken}&nofooter=true`
@@ -126,12 +128,20 @@ const TabsView = React.memo((props: TabViewProps) => {
</TouchableOpacity>
)}
<Appbar.Content />
<TouchableOpacity onPress={goToRewards}>
<Icon name="invite2" size={36} color="white" />
</TouchableOpacity>
<Appbar.Content />
{config.market && (
<TouchableOpacity onPress={goToMarketplace} style={styles.marketIconBackground}>
<Icon name="goodmarket" size={36} color="white" />
</TouchableOpacity>
)}
<Appbar.Content />
<TouchableOpacity onPress={goToSupport} style={styles.feedback}>
<Icon name="support2" size={36} color="white" />
</TouchableOpacity>
<Appbar.Content />
<TouchableOpacity onPress={toggleMenu}>
<Icon name="settings" size={20} color="white" style={styles.menuStyle} testID="burger_button" />
</TouchableOpacity>
@@ -148,7 +158,9 @@ const styles = ({ theme }) => ({
borderRadius: '50%',
paddingVertical: 20,
paddingHorizontal: 7,
marginRight: 14,
},
feedback: {
marginRight: 5,
},
rewardsStyle: {
marginLeft: 10,
@@ -203,6 +203,193 @@ exports[`AppNavigation matches snapshot 1`] = `
}
/>
</div>
<div
className="css-view-1dbjc4n"
data-focusable={true}
onKeyDown={[Function]}
onKeyUp={[Function]}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
onResponderTerminate={[Function]}
onResponderTerminationRequest={[Function]}
onStartShouldSetResponder={[Function]}
style={
Object {
"MozTransitionProperty": "opacity",
"MozUserSelect": "none",
"WebkitTransitionDuration": "0.15s",
"WebkitTransitionProperty": "opacity",
"WebkitUserSelect": "none",
"cursor": "pointer",
"msTouchAction": "manipulation",
"msUserSelect": "none",
"touchAction": "manipulation",
"transitionDuration": "0.15s",
"transitionProperty": "opacity",
"userSelect": "none",
}
}
tabIndex="0"
>
<div
className="css-text-901oao"
dir="auto"
style={
Object {
"color": "rgba(255,255,255,1.00)",
"fontFamily": "gooddollar",
"fontSize": "36px",
"fontStyle": "normal",
"fontWeight": "normal",
}
}
>
</div>
</div>
<div
className="css-view-1dbjc4n"
data-focusable={true}
onKeyDown={[Function]}
onKeyUp={[Function]}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
onResponderTerminate={[Function]}
onResponderTerminationRequest={[Function]}
onStartShouldSetResponder={[Function]}
style={
Object {
"WebkitBoxFlex": 1,
"WebkitFlexBasis": "0%",
"WebkitFlexGrow": 1,
"WebkitFlexShrink": 1,
"cursor": "pointer",
"flexBasis": "0%",
"flexGrow": 1,
"flexShrink": 1,
"marginLeft": "8px",
"msFlexNegative": 1,
"msFlexPositive": 1,
"msFlexPreferredSize": "0%",
"msTouchAction": "manipulation",
"paddingLeft": "12px",
"paddingRight": "12px",
"touchAction": "manipulation",
}
}
tabIndex="0"
>
<h1
className="css-reset-4rbku5 css-text-901oao css-textOneLine-bfa6kz"
dir="auto"
role="heading"
style={
Object {
"color": "rgba(255,255,255,1.00)",
"direction": "ltr",
"fontFamily": "Roboto-Medium, Roboto, \\"Helvetica Neue\\", Helvetica, Arial, sans-serif",
"fontSize": "20px",
"textAlign": "left",
}
}
/>
</div>
<div
className="css-view-1dbjc4n"
data-focusable={true}
onKeyDown={[Function]}
onKeyUp={[Function]}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
onResponderTerminate={[Function]}
onResponderTerminationRequest={[Function]}
onStartShouldSetResponder={[Function]}
style={
Object {
"WebkitBoxFlex": 1,
"WebkitFlexBasis": "0%",
"WebkitFlexGrow": 1,
"WebkitFlexShrink": 1,
"cursor": "pointer",
"flexBasis": "0%",
"flexGrow": 1,
"flexShrink": 1,
"marginLeft": "8px",
"msFlexNegative": 1,
"msFlexPositive": 1,
"msFlexPreferredSize": "0%",
"msTouchAction": "manipulation",
"paddingLeft": "12px",
"paddingRight": "12px",
"touchAction": "manipulation",
}
}
tabIndex="0"
>
<h1
className="css-reset-4rbku5 css-text-901oao css-textOneLine-bfa6kz"
dir="auto"
role="heading"
style={
Object {
"color": "rgba(255,255,255,1.00)",
"direction": "ltr",
"fontFamily": "Roboto-Medium, Roboto, \\"Helvetica Neue\\", Helvetica, Arial, sans-serif",
"fontSize": "20px",
"textAlign": "left",
}
}
/>
</div>
<div
className="css-view-1dbjc4n"
data-focusable={true}
onKeyDown={[Function]}
onKeyUp={[Function]}
onResponderGrant={[Function]}
onResponderMove={[Function]}
onResponderRelease={[Function]}
onResponderTerminate={[Function]}
onResponderTerminationRequest={[Function]}
onStartShouldSetResponder={[Function]}
style={
Object {
"MozTransitionProperty": "opacity",
"MozUserSelect": "none",
"WebkitTransitionDuration": "0.15s",
"WebkitTransitionProperty": "opacity",
"WebkitUserSelect": "none",
"cursor": "pointer",
"marginRight": "5px",
"msTouchAction": "manipulation",
"msUserSelect": "none",
"touchAction": "manipulation",
"transitionDuration": "0.15s",
"transitionProperty": "opacity",
"userSelect": "none",
}
}
tabIndex="0"
>
<div
className="css-text-901oao"
dir="auto"
style={
Object {
"color": "rgba(255,255,255,1.00)",
"fontFamily": "gooddollar",
"fontSize": "36px",
"fontStyle": "normal",
"fontWeight": "normal",
}
}
>
</div>
</div>
<div
className="css-view-1dbjc4n"
data-focusable={true}

0 comments on commit 08331a4

Please sign in to comment.
You can’t perform that action at this time.