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.

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 Promo colors on login screen for native devices #6185

Merged
merged 4 commits into from
Nov 4, 2021
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
16 changes: 16 additions & 0 deletions src/components/SVGImage/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import React from 'react';
import {Image} from 'react-native';
import {getWidthAndHeightStyle} from '../../styles/styles';
import propTypes from './propTypes';

const SVGImage = ({width, height, src}) => (
<Image
style={getWidthAndHeightStyle(width, height)}
source={src}
/>
);

SVGImage.propTypes = propTypes;
SVGImage.displayName = 'SVGImage';

export default SVGImage;
16 changes: 16 additions & 0 deletions src/components/SVGImage/index.native.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import React from 'react';
import {SvgCssUri} from 'react-native-svg';
import propTypes from './propTypes';

const SVGImage = ({width, height, src}) => (
<SvgCssUri
width={width}
height={height}
uri={src}
/>
);

SVGImage.propTypes = propTypes;
SVGImage.displayName = 'SVGImage';

export default SVGImage;
14 changes: 14 additions & 0 deletions src/components/SVGImage/propTypes.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import PropTypes from 'prop-types';

const propTypes = {
/** The asset to render. */
src: PropTypes.string.isRequired,

/** The width of the image. */
width: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,

/** The height of the image. */
height: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
};

export default propTypes;
28 changes: 15 additions & 13 deletions src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import {View} from 'react-native';
import PropTypes from 'prop-types';
import _ from 'underscore';
import styles from '../../../styles/styles';
import SVGImage from '../../../components/SVGImage';
import styles, {getBackgroundColorStyle, getLoginPagePromoStyle} from '../../../styles/styles';
import ExpensifyCashLogo from '../../../components/ExpensifyCashLogo';
import Text from '../../../components/Text';
import variables from '../../../styles/variables';
Expand All @@ -26,12 +26,11 @@ const propTypes = {
...withLocalizePropTypes,
};

const backgroundStyles = [styles.backgroundBlue, styles.backgroundGreen, styles.backgroundOrange, styles.backgroundPink];
const backgroundStyle = backgroundStyles[_.random(0, 3)];
const backgroundStyle = getLoginPagePromoStyle();

const SignInPageLayoutWide = props => (
<View style={[styles.flex1, styles.signInPageInner]}>
<View style={[styles.flex1, styles.flexRow, styles.dFlex, styles.flexGrow1]}>
<View style={[styles.flex1, styles.flexRow, styles.flexGrow1]}>
<View style={[styles.signInPageWideLeftContainer, styles.dFlex, styles.flexColumn, styles.ph6]}>
<View style={[
styles.flex1,
Expand All @@ -50,9 +49,9 @@ const SignInPageLayoutWide = props => (
/>
</View>
{props.shouldShowWelcomeText && (
<Text style={[styles.mv5, styles.textLabel, styles.h3]}>
{props.welcomeText}
</Text>
<Text style={[styles.mv5, styles.textLabel, styles.h3]}>
{props.welcomeText}
</Text>
)}
<View>
{props.children}
Expand All @@ -65,13 +64,16 @@ const SignInPageLayoutWide = props => (
</View>
<View style={[
styles.flexGrow1,
styles.dFlex,
styles.flexRow,
styles.background100,
backgroundStyle,
getBackgroundColorStyle(backgroundStyle.backgroundColor),
props.isMediumScreenWidth && styles.alignItemsCenter,
]}
/>
>
<SVGImage
width="100%"
height="100%"
src={backgroundStyle.backgroundImageUri}
/>
</View>
</View>
</View>
);
Expand Down
53 changes: 29 additions & 24 deletions src/styles/styles.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import _ from 'underscore';
import fontFamily from './fontFamily';
import addOutlineWidth from './addOutlineWidth';
import themeColors from './themes/default';
Expand Down Expand Up @@ -174,30 +175,6 @@ const styles = {
textTransform: 'uppercase',
},

background100: {
backgroundSize: '100% 100%',
},

backgroundGreen: {
backgroundColor: colors.green,
backgroundImage: `url(${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_green.svg)`,
},

backgroundOrange: {
backgroundColor: colors.orange,
backgroundImage: `url(${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_orange.svg)`,
},

backgroundPink: {
backgroundColor: colors.pink,
backgroundImage: `url(${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_pink.svg)`,
},

backgroundBlue: {
backgroundColor: colors.blue,
backgroundImage: `url(${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_blue.svg)`,
},

colorReversed: {
color: themeColors.textReversed,
},
Expand Down Expand Up @@ -2462,6 +2439,33 @@ function getEmojiPickerStyle(isSmallScreenWidth) {
};
}

/**
* Get the random promo color and image for Login page
*
* @return {Object}
*/
function getLoginPagePromoStyle() {
const promos = [
{
backgroundColor: colors.green,
backgroundImageUri: `${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_green.svg`,
},
{
backgroundColor: colors.orange,
backgroundImageUri: `${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_orange.svg`,
},
{
backgroundColor: colors.pink,
backgroundImageUri: `${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_pink.svg`,
},
{
backgroundColor: colors.blue,
backgroundImageUri: `${CONST.CLOUDFRONT_URL}/images/homepage/brand-stories/freeplan_blue.svg`,
},
];
return promos[_.random(0, 3)];
}

export default styles;
export {
getSafeAreaPadding,
Expand All @@ -2483,4 +2487,5 @@ export {
getModalPaddingStyles,
getFontFamilyMonospace,
getEmojiPickerStyle,
getLoginPagePromoStyle,
};