From 133c4fbe80bb74d3c3a37a67528ff4fc60f52f2c Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Mon, 23 Aug 2021 11:45:02 -0700 Subject: [PATCH 1/2] Merge pull request #4786 from Expensify/version-BUILD-90bff756970fbe02c864012d8d9a1dab368a7692 (cherry picked from commit 346a122894499de57e9280d141beaada05da53b9) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 1f161ccc89f5..f900b7d2ad45 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -150,8 +150,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001008604 - versionName "1.0.86-4" + versionCode 1001008607 + versionName "1.0.86-7" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 00509d0f53d9..3437ea26bd2b 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.86.4 + 1.0.86.7 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index aed2abe05513..e30aca83ea14 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.86.4 + 1.0.86.7 diff --git a/package-lock.json b/package-lock.json index 467533202e21..4877605ba3c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.0.86-4", + "version": "1.0.86-7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 5818b26999bf..9de93fceda60 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.0.86-4", + "version": "1.0.86-7", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", From edb8f91ed7d0a0fa59b4f14a9b0b25fda9e0aa41 Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Mon, 23 Aug 2021 13:54:11 +0200 Subject: [PATCH 2/2] Merge pull request #4774 from parasharrajat/newmarker Fix: marker is not clickable on android (cherry picked from commit 5502f86670a727208618ecc612d2a0a369f5cc57) --- .../MarkerBadgeContainerPropTypes.js | 11 +++++++ .../MarkerBadgeContainer/index.android.js | 17 ++++++++++ .../MarkerBadge/MarkerBadgeContainer/index.js | 15 +++++++++ .../{MarkerBadge.js => MarkerBadge/index.js} | 32 +++++++++---------- src/styles/styles.js | 15 +++++++++ 5 files changed, 74 insertions(+), 16 deletions(-) create mode 100644 src/pages/home/report/MarkerBadge/MarkerBadgeContainer/MarkerBadgeContainerPropTypes.js create mode 100644 src/pages/home/report/MarkerBadge/MarkerBadgeContainer/index.android.js create mode 100644 src/pages/home/report/MarkerBadge/MarkerBadgeContainer/index.js rename src/pages/home/report/{MarkerBadge.js => MarkerBadge/index.js} (84%) diff --git a/src/pages/home/report/MarkerBadge/MarkerBadgeContainer/MarkerBadgeContainerPropTypes.js b/src/pages/home/report/MarkerBadge/MarkerBadgeContainer/MarkerBadgeContainerPropTypes.js new file mode 100644 index 000000000000..af0f22208457 --- /dev/null +++ b/src/pages/home/report/MarkerBadge/MarkerBadgeContainer/MarkerBadgeContainerPropTypes.js @@ -0,0 +1,11 @@ +import PropTypes from 'prop-types'; + +const propTypes = { + /** Styles to be assigned to Container */ + containerStyles: PropTypes.arrayOf(PropTypes.object).isRequired, + + /** Rendered child component */ + children: PropTypes.element.isRequired, +}; + +export default propTypes; diff --git a/src/pages/home/report/MarkerBadge/MarkerBadgeContainer/index.android.js b/src/pages/home/report/MarkerBadge/MarkerBadgeContainer/index.android.js new file mode 100644 index 000000000000..f00302b14384 --- /dev/null +++ b/src/pages/home/report/MarkerBadge/MarkerBadgeContainer/index.android.js @@ -0,0 +1,17 @@ +import React from 'react'; +import {View, Animated} from 'react-native'; +import styles from '../../../../../styles/styles'; +import propTypes from './MarkerBadgeContainerPropTypes'; + +const MarkerBadgeContainer = props => ( + + + {props.children} + + +); + +MarkerBadgeContainer.propTypes = propTypes; +MarkerBadgeContainer.displayName = 'MarkerBadgeContainer'; + +export default MarkerBadgeContainer; diff --git a/src/pages/home/report/MarkerBadge/MarkerBadgeContainer/index.js b/src/pages/home/report/MarkerBadge/MarkerBadgeContainer/index.js new file mode 100644 index 000000000000..4b4972fd4a30 --- /dev/null +++ b/src/pages/home/report/MarkerBadge/MarkerBadgeContainer/index.js @@ -0,0 +1,15 @@ +import React from 'react'; +import {Animated} from 'react-native'; +import styles from '../../../../../styles/styles'; +import propTypes from './MarkerBadgeContainerPropTypes'; + +const MarkerBadgeContainer = props => ( + + {props.children} + +); + +MarkerBadgeContainer.propTypes = propTypes; +MarkerBadgeContainer.displayName = 'MarkerBadgeContainer'; + +export default MarkerBadgeContainer; diff --git a/src/pages/home/report/MarkerBadge.js b/src/pages/home/report/MarkerBadge/index.js similarity index 84% rename from src/pages/home/report/MarkerBadge.js rename to src/pages/home/report/MarkerBadge/index.js index f060f305dd05..eb8680d402eb 100644 --- a/src/pages/home/report/MarkerBadge.js +++ b/src/pages/home/report/MarkerBadge/index.js @@ -1,15 +1,14 @@ import React, {PureComponent} from 'react'; import {Animated, Text, View} from 'react-native'; import PropTypes from 'prop-types'; -import styles from '../../../styles/styles'; -import Button from '../../../components/Button'; -import Icon from '../../../components/Icon'; -import {Close, DownArrow} from '../../../components/Icon/Expensicons'; -import themeColors from '../../../styles/themes/default'; -import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize'; +import styles from '../../../../styles/styles'; +import Button from '../../../../components/Button'; +import Icon from '../../../../components/Icon'; +import {Close, DownArrow} from '../../../../components/Icon/Expensicons'; +import themeColors from '../../../../styles/themes/default'; +import withLocalize, {withLocalizePropTypes} from '../../../../components/withLocalize'; +import MarkerBadgeContainer from './MarkerBadgeContainer'; -const MARKER_NOT_ACTIVE_TRANSLATE_Y = -30; -const MARKER_ACTIVE_TRANSLATE_Y = 10; const propTypes = { /** Count of new messages to show in the badge */ count: PropTypes.number, @@ -25,12 +24,17 @@ const propTypes = { ...withLocalizePropTypes, }; + const defaultProps = { count: 0, active: false, onClose: () => {}, onClick: () => {}, }; + +const MARKER_NOT_ACTIVE_TRANSLATE_Y = -30; +const MARKER_ACTIVE_TRANSLATE_Y = 10; + class MarkerBadge extends PureComponent { constructor(props) { super(props); @@ -65,12 +69,8 @@ class MarkerBadge extends PureComponent { render() { return ( - - + + - - + + ); } } diff --git a/src/styles/styles.js b/src/styles/styles.js index 8905981ddb73..e3899df840dc 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -2002,6 +2002,21 @@ const styles = { ...visibility('hidden'), }, + reportMarkerBadgeWrapperAndroid: { + left: 0, + width: '100%', + alignItems: 'center', + position: 'absolute', + top: 0, + zIndex: 100, + ...visibility('hidden'), + }, + + reportMarkerBadgeSubWrapperAndroid: { + left: '50%', + width: 'auto', + }, + reportMarkerBadge: { left: '-50%', ...visibility('visible'),