@quintype/native-components 2.20.0-fix-rtl-issues.0 → 2.20.1-temp-fast-image-constraint.0

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.
Files changed (34) hide show
  1. package/CHANGELOG.md +46 -0
  2. package/package.json +2 -2
  3. package/src/Icons/ClockIcon/index.js +9 -5
  4. package/src/components/ActionText/ActionText.js +7 -9
  5. package/src/components/ActionText/ActionText.test.js +5 -12
  6. package/src/components/AlsoRead/index.js +1 -1
  7. package/src/components/AlsoRead/styles.js +2 -0
  8. package/src/components/AuthorRow/AuthorRow.test.js +4 -9
  9. package/src/components/AuthorRow/index.js +23 -21
  10. package/src/components/BackNavigator/styles.js +2 -0
  11. package/src/components/Button/index.js +13 -9
  12. package/src/components/CustomSwitch/index.js +16 -10
  13. package/src/components/Header/index.js +13 -9
  14. package/src/components/PrimaryStoryCard/index.js +46 -21
  15. package/src/components/PrimaryStoryCard/styles.js +29 -5
  16. package/src/components/PrimaryStoryCardNew/index.js +64 -26
  17. package/src/components/PrimaryStoryCardNew/styles.js +29 -5
  18. package/src/components/RadioButton/index.js +24 -9
  19. package/src/components/SecondaryStoryCard/index.js +48 -19
  20. package/src/components/SecondaryStoryCard/styles.js +29 -4
  21. package/src/components/SecondaryStoryCardNew/index.js +68 -26
  22. package/src/components/SecondaryStoryCardNew/styles.js +28 -4
  23. package/src/components/ShareButton/index.js +18 -14
  24. package/src/components/StoryHeader/index.js +9 -11
  25. package/src/components/StoryHeader/styles.js +1 -1
  26. package/src/components/StoryImage/index.js +1 -1
  27. package/src/components/StoryText/index.js +3 -1
  28. package/src/components/Table/index.js +1 -1
  29. package/src/components/Table/styles.js +5 -2
  30. package/src/components/TextQandA/styles.js +3 -3
  31. package/src/constants/component-constants/content-constants/constants.js +7 -5
  32. package/src/constants/component-constants/general-constants/constants.js +22 -14
  33. package/src/constants/renderHTML.js +10 -0
  34. package/src/utils/timeUtils.js +2 -2
package/CHANGELOG.md CHANGED
@@ -2,6 +2,52 @@
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
+
33
+ ### [2.19.6](https://github.com/quintype/native-components/compare/v2.19.5...v2.19.6) (2021-12-30)
34
+
35
+ ### [2.19.5](https://github.com/quintype/native-components/compare/v2.19.3...v2.19.5) (2021-12-29)
36
+
37
+
38
+ ### Bug Fixes
39
+
40
+ * **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))
41
+
42
+ ### [2.19.3](https://github.com/quintype/native-components/compare/v2.18.4...v2.19.3) (2021-10-28)
43
+
44
+
45
+ ### Bug Fixes
46
+
47
+ * **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))
48
+ * **AlsoRead:** Fixed card height :hammer: ([#174](https://github.com/quintype/native-components/issues/174)) ([6ce7a60](https://github.com/quintype/native-components/commit/6ce7a6078ec699f0f3df74d8136fc64070921caa))
49
+ * **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))
50
+
5
51
  ### [2.19.2](https://github.com/quintype/native-components/compare/v2.19.1...v2.19.2) (2021-10-19)
6
52
 
7
53
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@quintype/native-components",
3
- "version": "2.20.0-fix-rtl-issues.0",
3
+ "version": "2.20.1-temp-fast-image-constraint.0",
4
4
  "description": "",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -17,7 +17,7 @@
17
17
  "prop-types": "15.7.2",
18
18
  "quintype-js": "1.2.1",
19
19
  "react-htmltext": "^0.40.2",
20
- "react-native-fast-image": "8.3.2",
20
+ "react-native-fast-image": "8.2.0",
21
21
  "react-native-image-pan-zoom": "^2.1.12",
22
22
  "react-native-lightbox": "0.8.1",
23
23
  "react-native-pdf": "^5.1.4",
@@ -1,11 +1,15 @@
1
- import React from 'react';
1
+ import React, { useContext } from 'react';
2
2
  import Svg, { Path } from 'react-native-svg';
3
+ import { AppTheme } from "../../utils/context";
3
4
 
4
- export const ClockIcon = (props) => (
5
- <Svg width={24} height={24} {...props}>
5
+ export const ClockIcon = (props) => {
6
+ const { theme } = useContext(AppTheme);
7
+ const { COLORS } = theme;
8
+ const color = COLORS.BRAND_BLACK;
9
+ return <Svg width={24} height={24} {...props}>
6
10
  <Path
7
- fill="#333"
11
+ fill={color}
8
12
  d="M12 4.25c1.396 0 2.687.349 3.875 1.047a7.831 7.831 0 012.828 2.828A7.513 7.513 0 0119.75 12a7.513 7.513 0 01-1.047 3.875 7.831 7.831 0 01-2.828 2.828A7.513 7.513 0 0112 19.75a7.513 7.513 0 01-3.875-1.047 7.831 7.831 0 01-2.828-2.828A7.513 7.513 0 014.25 12c0-1.396.349-2.687 1.047-3.875a7.831 7.831 0 012.828-2.828A7.513 7.513 0 0112 4.25zM18.75 12a6.58 6.58 0 00-.906-3.39 6.72 6.72 0 00-2.469-2.454 6.641 6.641 0 00-3.39-.906 6.558 6.558 0 00-3.376.906 6.72 6.72 0 00-2.453 2.469 6.641 6.641 0 00-.906 3.39c0 1.22.302 2.344.906 3.376a6.72 6.72 0 002.469 2.453 6.641 6.641 0 003.39.906 6.558 6.558 0 003.376-.906 6.72 6.72 0 002.453-2.469A6.613 6.613 0 0018.75 12zm-4.656 2.75l-2.532-1.844a.307.307 0 01-.156-.281v-5c0-.104.037-.193.11-.266a.362.362 0 01.265-.109h.438c.104 0 .192.036.265.11.073.072.11.16.11.265v4.563l2.218 1.625a.33.33 0 01.141.234.349.349 0 01-.038.202l-.29.439a.342.342 0 01-.25.14.389.389 0 01-.281-.078z"
9
13
  />
10
14
  </Svg>
11
- );
15
+ }
@@ -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
  });
@@ -58,7 +58,7 @@ export const AlsoRead = (props) => {
58
58
  {getImageComponent()}
59
59
  <View style={styles.alsoReadContentWrapper}>
60
60
  <Text style={styles.alsoReadText}>{translate("Also Read")}</Text>
61
- <Text primary numberOfLines={3} style={styles.alsoReadText}>
61
+ <Text primary numberOfLines={2} style={styles.alsoReadTitle}>
62
62
  {text}
63
63
  </Text>
64
64
  </View>
@@ -13,10 +13,12 @@ export const alsoReadStyles = (COLORS, FONT_SIZE, DARK_MODE) => StyleSheet.creat
13
13
  },
14
14
  alsoReadText: {
15
15
  fontSize: FONT_SIZE.h2,
16
+ fontWeight: 'bold',
16
17
  color: DARK_MODE ? COLORS.BRAND_BLACK : COLORS.BRAND_1,
17
18
  },
18
19
  alsoReadTitle: {
19
20
  fontSize: FONT_SIZE.h2,
21
+ color: DARK_MODE ? COLORS.BRAND_BLACK : COLORS.BRAND_1,
20
22
  },
21
23
  fallBackImageWrapper: {
22
24
  backgroundColor: COLORS.BRAND_WHITE,
@@ -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
  };
@@ -6,6 +6,7 @@ export const backNavigatorStyles = (appThemeContext) => {
6
6
  container: {
7
7
  flexDirection: 'row',
8
8
  justifyContent: 'flex-start',
9
+ marginRight: 20,
9
10
  alignItems: 'center',
10
11
  backgroundColor: DARK_MODE ? COLORS.MONO6 : COLORS.BRAND_WHITE,
11
12
  },
@@ -29,6 +30,7 @@ export const backNavigatorStyles = (appThemeContext) => {
29
30
  text: {
30
31
  marginLeft: 10,
31
32
  opacity: 0.9,
33
+ flexShrink: 1,
32
34
  },
33
35
  });
34
36
  };
@@ -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}
@@ -1,23 +1,29 @@
1
- import React, { useContext, useState } from 'react';
2
- import { Switch, View } from 'react-native';
3
- import PropTypes from 'prop-types';
4
- import Icon from 'react-native-vector-icons/FontAwesome';
5
- import { Text } from '../Text';
6
- import { AppTheme } from '../../utils';
7
- import { customSwitchStyles } from './styles';
1
+ import React, { useContext, useState } from "react";
2
+ import { Switch, View } from "react-native";
3
+ import PropTypes from "prop-types";
4
+ import Icon from "react-native-vector-icons/FontAwesome";
5
+ import { Text } from "../Text";
6
+ import { AppTheme } from "../../utils";
7
+ import { customSwitchStyles } from "./styles";
8
+ import { COMP_GENERAL_CONSTANTS } from "../../constants/component-constants/general-constants/constants";
8
9
 
9
10
  export const CustomSwitch = ({
10
- label = '', callback, isEnabled = true, iconSize = 20, iconName, isSwitchDisabled = false,
11
+ label = "",
12
+ callback,
13
+ isEnabled = true,
14
+ iconSize = 20,
15
+ iconName,
16
+ isSwitchDisabled = false,
11
17
  }) => {
12
18
  const { theme } = useContext(AppTheme);
13
19
  const { COLORS } = theme;
14
20
  const styles = customSwitchStyles();
15
21
  const handleToggle = () => {
16
- typeof callback === 'function' && callback(!isEnabled);
22
+ typeof callback === "function" && callback(!isEnabled);
17
23
  };
18
24
 
19
25
  return (
20
- <View style={styles.container}>
26
+ <View style={styles.container} testID={COMP_GENERAL_CONSTANTS.customSwitch}>
21
27
  <View style={styles.textContainer}>
22
28
  {!iconName ? null : (
23
29
  <View style={styles.iconStyle}>
@@ -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
  };
@@ -3,14 +3,14 @@ import get from 'lodash/get';
3
3
  import PropTypes from 'prop-types';
4
4
  import React, { useContext } from 'react';
5
5
  import {
6
- I18nManager, StyleSheet, TouchableOpacity, View,
6
+ StyleSheet, TouchableOpacity, View,
7
7
  } from 'react-native';
8
-
8
+ import Icon from 'react-native-vector-icons/FontAwesome';
9
9
  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';
@@ -25,7 +25,7 @@ export const PrimaryStoryCard = (props) => {
25
25
 
26
26
  const { COLORS, FONT_SIZE, locale } = theme || {};
27
27
 
28
- const DATE_FORMAT = I18nManager.isRTL ? "d MMM, yyyy" : "yyyy , MMM d";
28
+ const DATE_FORMAT = 'd MMM, yyyy';
29
29
 
30
30
  const styles = storyStyles(COLORS, FONT_SIZE);
31
31
  const containerStyle = StyleSheet.flatten([
@@ -43,10 +43,37 @@ export const PrimaryStoryCard = (props) => {
43
43
 
44
44
  const name = get(story.authors, [0, 'name']);
45
45
  const authorName = name ? `${translate('By')} ${name} | ` : '';
46
- const readTime = story['read-time'] ? `${story['read-time']} ${translate("min read")}` : '';
46
+ const readTime = story['read-time'] ? `${story['read-time']} ${translate('min read')}` : '';
47
47
 
48
48
  const throttledOnpress = throttle(props.onPress, 1000);
49
49
 
50
+ const showIcon = (name) => (
51
+ <View style={styles.storyType}>
52
+ <Icon name={name} size={22} color={COLORS.MONO7} />
53
+ </View>
54
+ );
55
+
56
+ const showLiveBlogIcon = () => (
57
+ <View style={styles.storyType}>
58
+ <View style={styles.liveBlogIcon} />
59
+ <Text style={styles.liveBlogText}>LIVE</Text>
60
+ </View>
61
+ );
62
+ const showStoryType = () => {
63
+ switch (story['story-template']) {
64
+ case 'text':
65
+ return null;
66
+ case 'photo':
67
+ return showIcon('photo');
68
+ case 'video':
69
+ return showIcon('play');
70
+ case 'live-blog':
71
+ return showLiveBlogIcon();
72
+ default:
73
+ null;
74
+ }
75
+ };
76
+
50
77
  return (
51
78
  <TouchableOpacity
52
79
  testID={COMP_GENERAL_CONSTANTS.primaryStoryCard}
@@ -61,29 +88,27 @@ export const PrimaryStoryCard = (props) => {
61
88
  imageWidth={props.imageWidth}
62
89
  >
63
90
  <Text style={styles.xminContainer}>
64
- {' '}
65
91
  {readTime && (
66
92
  <View style={styles.xmin}>
67
93
  <Text style={styles.xminText}>{readTime}</Text>
68
94
  </View>
69
95
  )}
70
96
  </Text>
97
+ <View style={styles.storyTypeContainer}>{showStoryType()}</View>
71
98
  </ResponsiveImage>
72
-
73
- <View style={styles.authorBlockContainer}>
74
- <Text
75
- style={autorStyle}
76
- testID={COMP_GENERAL_CONSTANTS.primaryStoryAuthor}
77
- >
78
- {authorName}
79
- </Text>
80
- <Text
81
- style={autorStyle}
82
- testID={COMP_GENERAL_CONSTANTS.primaryStoryPubishedAt}
83
- >
84
- {getTimeInFormat(story['published-at'], DATE_FORMAT, locale)}
85
- </Text>
86
- </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>
87
112
  <Text
88
113
  primary
89
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,
@@ -39,4 +35,32 @@ export const storyStyles = (COLORS = {}, FONT_SIZE = {}, DARK_MODE = {}) => ({
39
35
  color: COLORS.BRAND_BLACK,
40
36
  fontSize: FONT_SIZE.h5,
41
37
  },
38
+ storyTypeContainer: {
39
+ position: 'absolute',
40
+ bottom: 0,
41
+ left: 0,
42
+ },
43
+ storyType: {
44
+ backgroundColor: COLORS.MONO1,
45
+ padding: 8,
46
+ justifyContent: 'space-between',
47
+ alignItems: 'space-between',
48
+ flexDirection: 'row',
49
+ },
50
+ storyTypeText: {
51
+ color: COLORS.MONO7,
52
+ fontSize: FONT_SIZE.h5,
53
+ },
54
+ liveBlogText: {
55
+ color: COLORS.MONO7,
56
+ fontSize: FONT_SIZE.h4,
57
+ marginLeft: 10,
58
+ fontWeight: 'bold',
59
+ },
60
+ liveBlogIcon: {
61
+ height: 15,
62
+ width: 15,
63
+ borderRadius: 50,
64
+ backgroundColor: COLORS.BRAND_3,
65
+ },
42
66
  });