@quintype/native-components 2.19.6 → 2.19.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -2,6 +2,34 @@
2
2
 
3
3
  All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
4
4
 
5
+ ### [2.19.11](https://github.com/quintype/native-components/compare/v2.19.9...v2.19.11) (2022-01-24)
6
+
7
+
8
+ ### Bug Fixes
9
+
10
+ * **story-cards:** Adds missing translations, fixes text overflow issue by adding multiline ([#179](https://github.com/quintype/native-components/issues/179)) ([93ab137](https://github.com/quintype/native-components/commit/93ab1372fad312b653e5d6d6992d625d217c9455))
11
+
12
+ ### [2.19.10](https://github.com/quintype/native-components/compare/v2.19.9...v2.19.10) (2022-01-24)
13
+
14
+
15
+ ### Bug Fixes
16
+
17
+ * **story-cards:** Adds missing translations, fixes text overflow issue by adding multiline ([#179](https://github.com/quintype/native-components/issues/179)) ([93ab137](https://github.com/quintype/native-components/commit/93ab1372fad312b653e5d6d6992d625d217c9455))
18
+
19
+ ### [2.19.9](https://github.com/quintype/native-components/compare/v2.19.8...v2.19.9) (2022-01-13)
20
+
21
+ ### [2.19.8](https://github.com/quintype/native-components/compare/v2.19.7...v2.19.8) (2022-01-10)
22
+
23
+ ### [2.19.7](https://github.com/quintype/native-components/compare/v2.19.0...v2.19.7) (2022-01-07)
24
+
25
+
26
+ ### Bug Fixes
27
+
28
+ * **AlsoRead:** Changed dark-mode color for the text :hammer: ([#170](https://github.com/quintype/native-components/issues/170)) ([67f1e61](https://github.com/quintype/native-components/commit/67f1e61fd4b76ea6fa65f565006214981d0bb8a8))
29
+ * **AlsoRead:** Fixed card height :hammer: ([#174](https://github.com/quintype/native-components/issues/174)) ([6ce7a60](https://github.com/quintype/native-components/commit/6ce7a6078ec699f0f3df74d8136fc64070921caa))
30
+ * **Navigator:** Fixed Section title text overflow :hammer: ([#176](https://github.com/quintype/native-components/issues/176)) ([249672b](https://github.com/quintype/native-components/commit/249672b44f6559190e930fc78a11d83a8e94c009))
31
+ * **old-UI:** Fixes all padding/image-aspect-ratio inconsistencies 🔨 ([#169](https://github.com/quintype/native-components/issues/169)) ([f3b8850](https://github.com/quintype/native-components/commit/f3b88507c02985ff83aadd266e0dbd04438fd441))
32
+
5
33
  ### [2.19.6](https://github.com/quintype/native-components/compare/v2.19.5...v2.19.6) (2021-12-30)
6
34
 
7
35
  ### [2.19.5](https://github.com/quintype/native-components/compare/v2.19.3...v2.19.5) (2021-12-29)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@quintype/native-components",
3
- "version": "2.19.6",
3
+ "version": "2.19.11",
4
4
  "description": "",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -1,18 +1,17 @@
1
- import { throttle } from 'lodash';
2
- import PropTypes from 'prop-types';
3
- import React from 'react';
4
- import { TouchableOpacity } from 'react-native';
1
+ import { throttle } from "lodash";
2
+ import PropTypes from "prop-types";
3
+ import React from "react";
4
+ import { TouchableOpacity } from "react-native";
5
+ import { COMP_GENERAL_CONSTANTS } from "../../constants/component-constants/general-constants/constants";
5
6
 
6
- export const ActionText = ({
7
- onPress, endPoint, children, actionTextID, disablePress,
8
- }) => {
7
+ export const ActionText = ({ onPress, endPoint, children, disablePress }) => {
9
8
  const handleTagPress = () => onPress(endPoint);
10
9
  const throttledOnpress = throttle(handleTagPress, 1000);
11
10
 
12
11
  return (
13
12
  <TouchableOpacity
14
13
  onPress={throttledOnpress}
15
- testID={actionTextID}
14
+ testID={COMP_GENERAL_CONSTANTS.actionTextTouch}
16
15
  disabled={disablePress}
17
16
  >
18
17
  {children}
@@ -25,5 +24,4 @@ ActionText.propTypes = {
25
24
  endPoint: PropTypes.object,
26
25
  disablePress: PropTypes.bool,
27
26
  children: PropTypes.any,
28
- actionTextID: PropTypes.string,
29
27
  };
@@ -4,22 +4,19 @@ import 'react-native';
4
4
  import { mockContext } from '../../utils';
5
5
  import { Text } from '../Text';
6
6
  import { ActionText } from './ActionText';
7
+ import { COMP_GENERAL_CONSTANTS } from '../../constants/component-constants';
7
8
 
8
9
  describe('Test Action Text :', () => {
9
10
  test('should render properly :', () => {
10
11
  const throttle = jest.fn();
11
12
  const { getByTestId } = render(
12
13
  mockContext(
13
- <ActionText
14
- onPress={throttle}
15
- endPoint={{ slug: '/sample-data' }}
16
- actionTextID="actionText"
17
- >
14
+ <ActionText onPress={throttle} endPoint={{ slug: '/sample-data' }}>
18
15
  <Text testID="sampleText">Sample Data</Text>
19
16
  </ActionText>,
20
17
  ),
21
18
  );
22
- const element = getByTestId('actionText');
19
+ const element = getByTestId(COMP_GENERAL_CONSTANTS.actionTextTouch);
23
20
  expect(element.props.children).toBeDefined();
24
21
  });
25
22
 
@@ -27,17 +24,13 @@ describe('Test Action Text :', () => {
27
24
  const throttle = await jest.fn();
28
25
  const { getByTestId } = render(
29
26
  mockContext(
30
- <ActionText
31
- onPress={throttle}
32
- endPoint={{ slug: '/sample-data' }}
33
- actionTextID="actionText"
34
- >
27
+ <ActionText onPress={throttle} endPoint={{ slug: '/sample-data' }}>
35
28
  <Text testID="sampleText">Sample Data</Text>
36
29
  </ActionText>,
37
30
  ),
38
31
  );
39
32
 
40
- const element = getByTestId('actionText');
33
+ const element = getByTestId(COMP_GENERAL_CONSTANTS.actionTextTouch);
41
34
  fireEvent(element, 'press');
42
35
  expect(throttle).toHaveBeenCalled();
43
36
  });
@@ -3,6 +3,7 @@ import React from 'react';
3
3
  import 'react-native';
4
4
  import { mockContext } from '../../utils';
5
5
  import { AuthorRow } from './index';
6
+ import { COMP_CONTENT_CONSTANTS } from '../../constants/component-constants';
6
7
 
7
8
  const data = [
8
9
  {
@@ -26,15 +27,9 @@ const data = [
26
27
  describe('Test Author Row :', () => {
27
28
  test('should render Author name properly', () => {
28
29
  const { getByTestId } = render(
29
- mockContext(
30
- <AuthorRow
31
- authors={data}
32
- authorNameTestID="authorName"
33
- cdn="gumlet.assettype.com"
34
- />,
35
- ),
30
+ mockContext(<AuthorRow authors={data} cdn="gumlet.assettype.com" />),
36
31
  );
37
- const element = getByTestId('authorName');
32
+ const element = getByTestId(COMP_CONTENT_CONSTANTS.authorName);
38
33
  expect(element.props.children).toBe('Raghavendra Vaidya');
39
34
  });
40
35
 
@@ -49,7 +44,7 @@ describe('Test Author Row :', () => {
49
44
  />,
50
45
  ),
51
46
  );
52
- const element = getByTestId('authorImage');
47
+ const element = getByTestId(COMP_CONTENT_CONSTANTS.authorImage);
53
48
  expect(element.props.children).toBeDefined();
54
49
  });
55
50
  });
@@ -1,26 +1,24 @@
1
- import PropTypes from 'prop-types';
2
- import React, { useContext } from 'react';
3
- import { View } from 'react-native';
4
- import Icon from 'react-native-vector-icons/FontAwesome';
5
- import { ResponsiveImage, Text } from '../index';
6
- import { ActionText } from '../ActionText/ActionText';
1
+ import PropTypes from "prop-types";
2
+ import React, { useContext } from "react";
3
+ import { View } from "react-native";
4
+ import Icon from "react-native-vector-icons/FontAwesome";
5
+ import { ResponsiveImage, Text } from "../index";
6
+ import { ActionText } from "../ActionText/ActionText";
7
7
 
8
- import { authorRowStyleSheet } from './styles';
9
- import { AppTheme } from '../../utils';
8
+ import { authorRowStyleSheet } from "./styles";
9
+ import { AppTheme } from "../../utils";
10
+ import { COMP_CONTENT_CONSTANTS } from "../../constants/component-constants/content-constants/constants";
10
11
 
11
12
  export const AuthorRow = ({
12
13
  authors,
13
14
  onPress,
14
15
  cdn,
15
- authorImageTestID,
16
- actionTextID,
17
16
  authorFallBackTestID,
18
- authorNameTestID,
19
17
  readtime,
20
18
  disablePress,
21
19
  }) => {
22
20
  const { theme } = useContext(AppTheme);
23
- const { COLORS ,translate} = theme;
21
+ const { COLORS, translate } = theme;
24
22
  const styles = authorRowStyleSheet(theme);
25
23
 
26
24
  return (
@@ -31,11 +29,14 @@ export const AuthorRow = ({
31
29
  }
32
30
  return (
33
31
  <View style={styles.container} key={author.id}>
34
- <View style={styles.imageBlock} testID={authorImageTestID}>
35
- {author?.['avatar-s3-key'] ? (
32
+ <View
33
+ style={styles.imageBlock}
34
+ testID={COMP_CONTENT_CONSTANTS.authorImage}
35
+ >
36
+ {author?.["avatar-s3-key"] ? (
36
37
  <ResponsiveImage
37
38
  source={{
38
- uri: `${cdn}/${author?.['avatar-s3-key']}`,
39
+ uri: `${cdn}/${author?.["avatar-s3-key"]}`,
39
40
  }}
40
41
  style={styles.avatarImage}
41
42
  imageWidth={50}
@@ -55,11 +56,13 @@ export const AuthorRow = ({
55
56
  <ActionText
56
57
  onPress={onPress}
57
58
  endPoint={author}
58
- testID={actionTextID}
59
59
  disablePress={disablePress}
60
60
  >
61
61
  <View style={styles.descriptionBlock}>
62
- <Text style={styles.authorStyle} testID={authorNameTestID}>
62
+ <Text
63
+ style={styles.authorStyle}
64
+ testID={COMP_CONTENT_CONSTANTS.authorName}
65
+ >
63
66
  {author.name}
64
67
  </Text>
65
68
  </View>
@@ -69,7 +72,9 @@ export const AuthorRow = ({
69
72
  })}
70
73
  {readtime ? (
71
74
  <View style={styles.readtimeComponent}>
72
- <Text style={styles.readtime}>{`| ${readtime} ${translate("min read")}`}</Text>
75
+ <Text style={styles.readtime}>{`| ${readtime} ${translate(
76
+ "min read"
77
+ )}`}</Text>
73
78
  </View>
74
79
  ) : null}
75
80
  </View>
@@ -82,8 +87,5 @@ AuthorRow.propTypes = {
82
87
  cdn: PropTypes.string.isRequired,
83
88
  disablePress: PropTypes.bool,
84
89
  authorFallBackTestID: PropTypes.string,
85
- authorImageTestID: PropTypes.string,
86
- authorNameTestID: PropTypes.string,
87
- actionTextID: PropTypes.string,
88
90
  readtime: PropTypes.number,
89
91
  };
@@ -1,14 +1,15 @@
1
- import PropTypes from 'prop-types';
2
- import React, { useContext } from 'react';
1
+ import PropTypes from "prop-types";
2
+ import React, { useContext } from "react";
3
3
  import {
4
- StyleSheet, TouchableOpacity,
4
+ StyleSheet,
5
+ TouchableOpacity,
5
6
  View,
6
-
7
7
  ViewPropTypes,
8
- } from 'react-native';
9
- import { AppTheme } from '../../utils';
10
- import { Text } from '../Text';
11
- import { styles } from './styles';
8
+ } from "react-native";
9
+ import { AppTheme } from "../../utils";
10
+ import { Text } from "../Text";
11
+ import { styles } from "./styles";
12
+ import { COMP_GENERAL_CONSTANTS } from "../../constants/component-constants/general-constants/constants";
12
13
 
13
14
  export const Button = (props) => {
14
15
  const { icon, text, onPress } = props;
@@ -21,7 +22,10 @@ export const Button = (props) => {
21
22
 
22
23
  return (
23
24
  <View>
24
- <TouchableOpacity onPress={onPress}>
25
+ <TouchableOpacity
26
+ onPress={onPress}
27
+ testID={COMP_GENERAL_CONSTANTS.buttonTouch}
28
+ >
25
29
  <View style={btnStyle}>
26
30
  <Text style={textStyle}>{text}</Text>
27
31
  {icon}
@@ -23,7 +23,7 @@ export const CustomSwitch = ({
23
23
  };
24
24
 
25
25
  return (
26
- <View style={styles.container}>
26
+ <View style={styles.container} testID={COMP_GENERAL_CONSTANTS.customSwitch}>
27
27
  <View style={styles.textContainer}>
28
28
  {!iconName ? null : (
29
29
  <View style={styles.iconStyle}>
@@ -40,7 +40,6 @@ export const CustomSwitch = ({
40
40
  onValueChange={handleToggle}
41
41
  value={isEnabled}
42
42
  disabled={isSwitchDisabled}
43
- testID={COMP_GENERAL_CONSTANTS.customSwitch}
44
43
  />
45
44
  </View>
46
45
  );
@@ -1,14 +1,15 @@
1
- import PropTypes from 'prop-types';
2
- import React, { useContext } from 'react';
1
+ import PropTypes from "prop-types";
2
+ import React, { useContext } from "react";
3
3
  import {
4
4
  StyleSheet,
5
5
  TouchableOpacity,
6
6
  View,
7
7
  ViewPropTypes,
8
- } from 'react-native';
8
+ } from "react-native";
9
9
 
10
- import { headerStyles } from './styles';
11
- import { AppTheme } from '../../utils';
10
+ import { headerStyles } from "./styles";
11
+ import { AppTheme } from "../../utils";
12
+ import { COMP_GENERAL_CONSTANTS } from "../../constants/component-constants";
12
13
 
13
14
  export const Header = (props) => {
14
15
  const { theme } = useContext(AppTheme);
@@ -19,11 +20,15 @@ export const Header = (props) => {
19
20
  props.logoComponentStyle,
20
21
  ]);
21
22
  return (
22
- <View testID={props.testID} style={headerStyle}>
23
+ <View style={headerStyle}>
23
24
  <View>
24
25
  {props.leftComponent && props.leftComponent}
25
26
  {props.logoComponent && (
26
- <TouchableOpacity style={logoComponentStyle} onPress={props.onPress}>
27
+ <TouchableOpacity
28
+ style={logoComponentStyle}
29
+ onPress={props.onPress}
30
+ testID={COMP_GENERAL_CONSTANTS.headerLogoTouch}
31
+ >
27
32
  {props.logoComponent}
28
33
  </TouchableOpacity>
29
34
  )}
@@ -34,7 +39,7 @@ export const Header = (props) => {
34
39
  };
35
40
 
36
41
  Header.defaultProps = {
37
- onPress: () => { },
42
+ onPress: () => {},
38
43
  };
39
44
 
40
45
  Header.propTypes = {
@@ -43,7 +48,6 @@ Header.propTypes = {
43
48
  logoComponent: PropTypes.element,
44
49
  style: ViewPropTypes.style,
45
50
  logoComponentStyle: PropTypes.object,
46
- testID: PropTypes.string,
47
51
  onPress: PropTypes.func,
48
52
  noBorder: PropTypes.bool,
49
53
  };
@@ -10,7 +10,7 @@ import {
10
10
  AppTheme,
11
11
  getImageMetadata,
12
12
  getImageSlug,
13
- getTimeInFormat,
13
+ getTimeForStoryCards,
14
14
  } from '../../utils';
15
15
  import { getStoryHeadline } from '../../utils/story';
16
16
  import { ResponsiveImage, Text } from '../index';
@@ -96,21 +96,19 @@ export const PrimaryStoryCard = (props) => {
96
96
  </Text>
97
97
  <View style={styles.storyTypeContainer}>{showStoryType()}</View>
98
98
  </ResponsiveImage>
99
-
100
- <View style={styles.authorBlockContainer}>
101
- <Text
102
- style={autorStyle}
103
- testID={COMP_GENERAL_CONSTANTS.primaryStoryAuthor}
104
- >
105
- {authorName}
106
- </Text>
107
- <Text
108
- style={autorStyle}
109
- testID={COMP_GENERAL_CONSTANTS.primaryStoryPubishedAt}
110
- >
111
- {getTimeInFormat(story['published-at'], DATE_FORMAT, locale)}
112
- </Text>
113
- </View>
99
+ <Text
100
+ style={autorStyle}
101
+ numberOfLines={2}
102
+ // TODO: Add corrected testID here
103
+ >
104
+ {authorName +
105
+ getTimeForStoryCards(
106
+ story["published-at"],
107
+ DATE_FORMAT,
108
+ locale,
109
+ translate
110
+ )}
111
+ </Text>
114
112
  <Text
115
113
  primary
116
114
  numberOfLines={3}
@@ -3,15 +3,11 @@ export const storyStyles = (COLORS = {}, FONT_SIZE = {}, DARK_MODE = {}) => ({
3
3
  backgroundColor: COLORS.BRAND_WHITE,
4
4
  marginTop: 12,
5
5
  },
6
- authorBlockContainer: {
7
- alignItems: 'center',
8
- flexDirection: 'row',
9
- paddingVertical: 8,
10
- },
11
6
  autorText: {
12
7
  color: COLORS?.BRAND_6,
13
8
  fontSize: FONT_SIZE.h5,
14
9
  lineHeight: FONT_SIZE.h5 * 1.3,
10
+ paddingVertical: 8,
15
11
  },
16
12
  divider: {
17
13
  backgroundColor: COLORS.BRAND_6,
@@ -1,8 +1,8 @@
1
- import { get, throttle } from 'lodash';
2
- import PropTypes from 'prop-types';
3
- import React, { useContext, memo } from 'react';
4
- import { StyleSheet, TouchableOpacity, View } from 'react-native';
5
- import Icon from 'react-native-vector-icons/FontAwesome';
1
+ import { get, throttle } from "lodash";
2
+ import PropTypes from "prop-types";
3
+ import React, { useContext, memo } from "react";
4
+ import { StyleSheet, TouchableOpacity, View } from "react-native";
5
+ import Icon from "react-native-vector-icons/FontAwesome";
6
6
  import {
7
7
  AppTheme,
8
8
  getImageMetadata,
@@ -12,15 +12,12 @@ import {
12
12
  import { getStoryHeadline } from "../../utils/story";
13
13
  import { ResponsiveImage, Text } from "../index";
14
14
  import { storyStyles } from "./styles";
15
-
16
-
15
+ import { COMP_GENERAL_CONSTANTS } from "../../constants/component-constants/general-constants/constants";
17
16
 
18
17
  const PrimaryStoryCardNewBase = (props) => {
19
18
  const { story = {} } = props;
20
19
  const { theme } = useContext(AppTheme);
21
- const {
22
- COLORS, FONT_SIZE, locale, DARK_MODE,
23
- } = theme || {};
20
+ const { COLORS, FONT_SIZE, locale, DARK_MODE } = theme || {};
24
21
 
25
22
  const translate = get(theme, ["translate"], (word) => word);
26
23
 
@@ -40,7 +37,7 @@ const PrimaryStoryCardNewBase = (props) => {
40
37
 
41
38
  const DATE_FORMAT = "d MMM, yyyy";
42
39
  const readTime = story["read-time"]
43
- ? `${story["read-time"]} ${translate("min read")}`
40
+ ? `${story["read-time"]} ${translate("min read")} · `
44
41
  : "";
45
42
 
46
43
  const throttledOnpress = throttle(props.onPress, 1000);
@@ -58,14 +55,14 @@ const PrimaryStoryCardNewBase = (props) => {
58
55
  </View>
59
56
  );
60
57
  const showStoryType = () => {
61
- switch (story['story-template']) {
62
- case 'text':
58
+ switch (story["story-template"]) {
59
+ case "text":
63
60
  return null;
64
- case 'photo':
65
- return showIcon('photo');
66
- case 'video':
67
- return showIcon('play');
68
- case 'live-blog':
61
+ case "photo":
62
+ return showIcon("photo");
63
+ case "video":
64
+ return showIcon("play");
65
+ case "live-blog":
69
66
  return showLiveBlogIcon();
70
67
  default:
71
68
  null;
@@ -74,7 +71,7 @@ const PrimaryStoryCardNewBase = (props) => {
74
71
 
75
72
  return (
76
73
  <TouchableOpacity
77
- testID="primaryStoryCardView"
74
+ testID={COMP_GENERAL_CONSTANTS.primaryStoryCard}
78
75
  onPress={throttledOnpress}
79
76
  activeOpacity={0.8}
80
77
  style={containerStyle}
@@ -94,18 +91,23 @@ const PrimaryStoryCardNewBase = (props) => {
94
91
  numberOfLines={3}
95
92
  ellipsizeMode="tail"
96
93
  style={headlineStyle}
97
- testID="primaryStoryCardHeadline"
94
+ testID={COMP_GENERAL_CONSTANTS.primaryStoryHeadline}
98
95
  >
99
96
  {getStoryHeadline(story)}
100
97
  </Text>
101
- <View style={styles.timestampContainer}>
102
- {readTime ? (
103
- <Text style={timestampStyle}>{`${readTime} · `}</Text>
104
- ) : null}
105
- <Text style={timestampStyle} testID="primaryStoryCardDate">
106
- {getTimeForStoryCards(story["published-at"], DATE_FORMAT, locale)}
107
- </Text>
108
- </View>
98
+ <Text
99
+ style={timestampStyle}
100
+ numberOfLines={2}
101
+ // TODO: Add corrected testID here
102
+ >
103
+ {readTime +
104
+ getTimeForStoryCards(
105
+ story["published-at"],
106
+ DATE_FORMAT,
107
+ locale,
108
+ translate
109
+ )}
110
+ </Text>
109
111
  </View>
110
112
  <View style={styles.icon}>{props.iconComponent}</View>
111
113
  </View>
@@ -12,16 +12,12 @@ export const storyStyles = (COLORS = {}, FONT_SIZE = {}) => ({
12
12
  flexShrink: 1,
13
13
  flex: 1,
14
14
  },
15
- timestampContainer: {
16
- alignItems: 'center',
17
- flexDirection: 'row',
18
- marginTop: 4,
19
- },
20
15
  timestamp: {
21
16
  color: COLORS?.BRAND_BLACK,
22
17
  fontSize: FONT_SIZE.h5,
23
18
  lineHeight: FONT_SIZE.h5 * 1.2,
24
19
  opacity: 0.6,
20
+ marginTop: 4,
25
21
  },
26
22
  headline: {
27
23
  fontSize: FONT_SIZE.title,
@@ -1,22 +1,37 @@
1
- import React, { useContext } from 'react';
1
+ import React, { useContext } from "react";
2
2
  import {
3
- StyleSheet, View, TouchableOpacity, ViewPropTypes,
4
- } from 'react-native';
5
- import PropTypes from 'prop-types';
6
- import { radioButtonStyles } from './styles';
7
- import { AppTheme } from '../../utils';
3
+ StyleSheet,
4
+ View,
5
+ TouchableOpacity,
6
+ ViewPropTypes,
7
+ } from "react-native";
8
+ import PropTypes from "prop-types";
9
+ import { radioButtonStyles } from "./styles";
10
+ import { AppTheme } from "../../utils";
11
+
12
+ import { COMP_GENERAL_CONSTANTS } from "../../constants/component-constants";
8
13
 
9
14
  export const RadioButton = ({
10
- onPress, isChecked, circleStyle, checkedCircleStyle,
15
+ onPress,
16
+ isChecked,
17
+ circleStyle,
18
+ checkedCircleStyle,
11
19
  }) => {
12
20
  const { theme } = useContext(AppTheme);
13
21
  const styles = radioButtonStyles(theme);
14
22
  const circleBorderStyle = StyleSheet.flatten([styles.circle, circleStyle]);
15
- const checkedStyle = StyleSheet.flatten([styles.checkedCircle, checkedCircleStyle]);
23
+ const checkedStyle = StyleSheet.flatten([
24
+ styles.checkedCircle,
25
+ checkedCircleStyle,
26
+ ]);
16
27
 
17
28
  return (
18
29
  <View>
19
- <TouchableOpacity style={circleBorderStyle} onPress={onPress}>
30
+ <TouchableOpacity
31
+ style={circleBorderStyle}
32
+ onPress={onPress}
33
+ testID={COMP_GENERAL_CONSTANTS.radioButtonTouch}
34
+ >
20
35
  {isChecked && <View style={checkedStyle} />}
21
36
  </TouchableOpacity>
22
37
  </View>
@@ -15,7 +15,7 @@ import {
15
15
  AppTheme,
16
16
  getImageMetadata,
17
17
  getImageSlug,
18
- getTimeInFormat,
18
+ getTimeForStoryCards,
19
19
  } from '../../utils';
20
20
  import { getStoryHeadline } from '../../utils/story';
21
21
  import { ResponsiveImage, Text } from '../index';
@@ -116,20 +116,19 @@ export const SecondaryStoryCard = (props) => {
116
116
  {getStoryHeadline(story)?.trim()}
117
117
  </Text>
118
118
  <View style={styles.authorAndIconContainer}>
119
- <View style={authorTextContainerStyle}>
120
- <Text
121
- style={authorTextStyle}
122
- testID={COMP_GENERAL_CONSTANTS.secondaryStoryAuthor}
123
- >
124
- {authorName}
125
- </Text>
126
- <Text
127
- style={authorTextStyle}
128
- testID={COMP_GENERAL_CONSTANTS.secondaryStoryPubishedAt}
129
- >
130
- {getTimeInFormat(story['published-at'], DATE_FORMAT, locale)}
131
- </Text>
132
- </View>
119
+ <Text
120
+ style={authorTextStyle}
121
+ numberOfLines={2}
122
+ // TODO: Add corrected testID here
123
+ >
124
+ {authorName +
125
+ getTimeForStoryCards(
126
+ story["published-at"],
127
+ DATE_FORMAT,
128
+ locale,
129
+ translate
130
+ )}
131
+ </Text>
133
132
  <View style={iconStyles}>{props.iconComponent}</View>
134
133
  </View>
135
134
  </View>
@@ -22,10 +22,7 @@ export const secStoryCardStyles = ({ COLORS, FONT_SIZE, DARK_MODE }) => StyleShe
22
22
  lineHeight: FONT_SIZE.h6 * 1.3,
23
23
  opacity: 0.5,
24
24
  fontWeight: '500',
25
- },
26
- authorTextContainer: {
27
- alignItems: 'center',
28
- flexDirection: 'row',
25
+ paddingTop: 8,
29
26
  },
30
27
  headline: {
31
28
  color: COLORS.BRAND_BLACK,
@@ -8,8 +8,8 @@ import {
8
8
  View,
9
9
  TextStyle,
10
10
  TouchableOpacityProps,
11
- } from 'react-native';
12
- import Icon from 'react-native-vector-icons/FontAwesome';
11
+ } from "react-native";
12
+ import Icon from "react-native-vector-icons/FontAwesome";
13
13
  import {
14
14
  AppTheme,
15
15
  getImageMetadata,
@@ -19,6 +19,7 @@ import {
19
19
  import { getStoryHeadline } from "../../utils/story";
20
20
  import { ResponsiveImage, Text } from "../index";
21
21
  import { storyStyles } from "./styles";
22
+ import { COMP_GENERAL_CONSTANTS } from "../../constants/component-constants/general-constants/constants";
22
23
 
23
24
  const SecondaryStoryCardNewBase = (props) => {
24
25
  const { story = {} } = props;
@@ -43,7 +44,7 @@ const SecondaryStoryCardNewBase = (props) => {
43
44
 
44
45
  const DATE_FORMAT = "d MMM, yyyy";
45
46
  const readTime = story["read-time"]
46
- ? `${story["read-time"]} ${translate("min read")}`
47
+ ? `${story["read-time"]} ${translate("min read")} · `
47
48
  : "";
48
49
 
49
50
  const throttledOnpress = throttle(props.onPress, 1000);
@@ -62,14 +63,14 @@ const SecondaryStoryCardNewBase = (props) => {
62
63
  );
63
64
 
64
65
  const showStoryType = () => {
65
- switch (story['story-template']) {
66
- case 'text':
66
+ switch (story["story-template"]) {
67
+ case "text":
67
68
  return null;
68
- case 'photo':
69
- return showIcon('photo');
70
- case 'video':
71
- return showIcon('play');
72
- case 'live-blog':
69
+ case "photo":
70
+ return showIcon("photo");
71
+ case "video":
72
+ return showIcon("play");
73
+ case "live-blog":
73
74
  return showLiveBlogIcon();
74
75
  default:
75
76
  null;
@@ -78,7 +79,7 @@ const SecondaryStoryCardNewBase = (props) => {
78
79
 
79
80
  return (
80
81
  <TouchableOpacity
81
- testID={props.collectionTestID}
82
+ testID={COMP_GENERAL_CONSTANTS.secondaryStoryCard}
82
83
  onPress={throttledOnpress}
83
84
  activeOpacity={0.8}
84
85
  style={containerStyle}
@@ -97,18 +98,23 @@ const SecondaryStoryCardNewBase = (props) => {
97
98
  numberOfLines={2}
98
99
  ellipsizeMode="tail"
99
100
  style={headlineStyle}
100
- testID="secondaryStoryCardHeadline"
101
+ testID={COMP_GENERAL_CONSTANTS.secondaryStoryHeadline}
101
102
  >
102
103
  {getStoryHeadline(story)?.trim()}
103
104
  </Text>
104
- <View style={styles.timestampContainer}>
105
- {readTime ? (
106
- <Text style={timestampStyle}>{`${readTime} · `}</Text>
107
- ) : null}
108
- <Text style={timestampStyle} testID="secondaryStoryCardDate">
109
- {getTimeForStoryCards(story["published-at"], DATE_FORMAT, locale)}
110
- </Text>
111
- </View>
105
+ <Text
106
+ style={timestampStyle}
107
+ numberOfLines={2}
108
+ // TODO: Add corrected testID here
109
+ >
110
+ {readTime +
111
+ getTimeForStoryCards(
112
+ story["published-at"],
113
+ DATE_FORMAT,
114
+ locale,
115
+ translate
116
+ )}
117
+ </Text>
112
118
  </View>
113
119
  <View style={styles.icon}>{props.iconComponent}</View>
114
120
  </TouchableOpacity>
@@ -18,10 +18,6 @@ export const storyStyles = ({ COLORS, FONT_SIZE }) => StyleSheet.create({
18
18
  fontSize: FONT_SIZE.h5,
19
19
  lineHeight: FONT_SIZE.h5 * 1.2,
20
20
  opacity: 0.6,
21
- },
22
- timestampContainer: {
23
- alignItems: 'center',
24
- flexDirection: 'row',
25
21
  marginTop: 4,
26
22
  },
27
23
  headline: {
@@ -1,27 +1,28 @@
1
- import React, { useContext, memo } from 'react';
2
- import { TouchableOpacity } from 'react-native';
3
- import PropTypes from 'prop-types';
4
- import Icon from 'react-native-vector-icons/Ionicons';
5
- import Share from 'react-native-share';
6
- import { AppTheme } from '../../utils';
7
- import { shareButtonStyles } from './styles';
8
- import { getStoryHeadline } from '../../utils/story';
1
+ import React, { useContext, memo } from "react";
2
+ import { TouchableOpacity } from "react-native";
3
+ import PropTypes from "prop-types";
4
+ import Icon from "react-native-vector-icons/Ionicons";
5
+ import Share from "react-native-share";
6
+ import { AppTheme } from "../../utils";
7
+ import { shareButtonStyles } from "./styles";
8
+ import { getStoryHeadline } from "../../utils/story";
9
+ import { COMP_GENERAL_CONSTANTS } from "../../constants/component-constants";
9
10
 
10
11
  const ShareButtonBase = (props) => {
11
12
  const { theme } = useContext(AppTheme);
12
13
  const styles = shareButtonStyles(theme);
13
- const { story, type = 'story', slug } = props;
14
+ const { story, type = "story", slug } = props;
14
15
 
15
16
  const getShareURL = () => {
16
17
  const { url } = story || {};
17
18
  switch (type) {
18
- case 'story':
19
+ case "story":
19
20
  return url;
20
- case 'card':
21
+ case "card":
21
22
  return `${url}${slug}`;
22
- case 'image':
23
+ case "image":
23
24
  return `${url}${slug}`;
24
- case 'attachment':
25
+ case "attachment":
25
26
  return slug;
26
27
  default:
27
28
  return url || slug;
@@ -43,7 +44,10 @@ const ShareButtonBase = (props) => {
43
44
  }
44
45
 
45
46
  return (
46
- <TouchableOpacity onPress={share}>
47
+ <TouchableOpacity
48
+ onPress={share}
49
+ testID={COMP_GENERAL_CONSTANTS.shareButtonTouch}
50
+ >
47
51
  <Icon style={styles.iconStyle} name="share-social-outline" size={20} />
48
52
  </TouchableOpacity>
49
53
  );
@@ -91,7 +91,7 @@ export const StoryHeader = (props) => {
91
91
  }}
92
92
  />
93
93
  <HTML
94
- html={imgAttribution}
94
+ html={attri}
95
95
  textSelectable={CAN_COPY_TEXT}
96
96
  key={Math.random()}
97
97
  baseFontStyle={styles.attributionStyle}
@@ -37,7 +37,7 @@ export const storyHeaderStyles = (COLORS) => StyleSheet.create({
37
37
  },
38
38
  captionContainerStyle: {
39
39
  paddingHorizontal: 5,
40
- flexDirection: 'row',
40
+ flexDirection: 'column',
41
41
  flexWrap: 'wrap',
42
42
  marginTop: 10,
43
43
  },
@@ -28,7 +28,7 @@ export const StoryImage = ({
28
28
  if (!card['image-attribution']) return null;
29
29
  return (
30
30
  <Text style={styles.attributionText}>
31
- {` | ${card['image-attribution']}`}
31
+ {` | ${stripHTML(card['image-attribution'])}`}
32
32
  </Text>
33
33
  );
34
34
  };
@@ -1,7 +1,9 @@
1
1
  export const COMP_CONTENT_CONSTANTS = {
2
- storyTitle: 'COMP_STORY_TITLE',
3
- storySubTitle: 'COMP_STORY_SUBTITLE',
4
- sectionName: 'COMP_STORY_SECTION_NAME',
5
- publishedDate: 'COMP_STORY_PUBLISHED_DATE',
6
- relatedStoriesLabel: 'COMP_STORY_RELATEDSTORIES_LABEL',
2
+ storyTitle: "COMP_STORY_TITLE",
3
+ storySubTitle: "COMP_STORY_SUBTITLE",
4
+ sectionName: "COMP_STORY_SECTION_NAME",
5
+ publishedDate: "COMP_STORY_PUBLISHED_DATE",
6
+ relatedStoriesLabel: "COMP_STORY_RELATEDSTORIES_LABEL",
7
+ authorName: "COMP_STORY_AUTHOR_NAME",
8
+ authorImage: "COMP_STORY_AUTHOR_IMAGE",
7
9
  };
@@ -14,4 +14,11 @@ export const COMP_GENERAL_CONSTANTS = {
14
14
  backNavigatorText: "COMP_GENERAL_BACK_NAVIGATOR_TEXT",
15
15
  backNavigatorTouch: "COMP_GENERAL_BACK_NAVIGATOR_TOUCH",
16
16
  customSwitch: "COMP_GENERAL_CUSTOM_SWITCH",
17
+ primaryStoryReadTime: "COMP_GENERAL_PRIMARY_STORY_READTIME",
18
+ secondaryStoryReadTime: "COMP_GENERAL_SECONDARY_STORY_READTIME",
19
+ actionTextTouch: "COMP_GENERAL_ACTION_TEXT_TOUCH",
20
+ buttonTouch: "COMP_GENERAL_BUTTON_TOUCH",
21
+ headerLogoTouch: "COMP_GENERAL_HEADER_LOGO_TOUCH",
22
+ radioButtonTouch: "COMP_GENERAL_RADIO",
23
+ shareButtonTouch: "COMP_GENERAL_SHARE",
17
24
  };
@@ -15,14 +15,14 @@ export function getTimeInFormat(date, format, localTime) {
15
15
  return '';
16
16
  }
17
17
 
18
- export const getTimeForStoryCards = (date, format, localTime) => {
18
+ export const getTimeForStoryCards = (date, format, localTime, translate) => {
19
19
  if (date) {
20
20
  const currentDate = new Date();
21
21
  const dateToFormat = new Date(date);
22
22
  const locale = dateFNSlocale[localTime];
23
23
  const distanceInMinutes = differenceInMinutes(currentDate, dateToFormat);
24
24
  if (distanceInMinutes <= 1440) {
25
- return `published ${formatDistanceToNow(dateToFormat, { locale })} ago`;
25
+ return `${translate("published")} ${formatDistanceToNow(dateToFormat, { locale })} ${translate("ago")}`;
26
26
  }
27
27
  return dateFormat(dateToFormat, format, { locale });
28
28
  }