diff --git a/package.json b/package.json index e74d23d..3941b51 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "react-native-linear-gradient": "^2.5.6", "react-native-localize": "^1.4.0", "react-native-modalize": "^2.0.4", - "react-native-paper": "^3.10.1", + "react-native-paper": "^4.0.1", "react-native-permissions": "^2.1.5", "react-native-push-notification": "^4.0.0", "react-native-reanimated": "^1.9.0", diff --git a/src/components/Home/EventDashboardItem.js b/src/components/Home/EventDashboardItem.js index b656d21..d66b8ee 100644 --- a/src/components/Home/EventDashboardItem.js +++ b/src/components/Home/EventDashboardItem.js @@ -1,8 +1,8 @@ // @flow import * as React from 'react'; -import {Avatar, Card, Text, withTheme} from 'react-native-paper'; -import {StyleSheet} from "react-native"; +import {Avatar, Card, Text, TouchableRipple, withTheme} from 'react-native-paper'; +import {StyleSheet, View} from "react-native"; import i18n from "i18n-js"; import type {CustomTheme} from "../../managers/ThemeManager"; @@ -47,24 +47,28 @@ class EventDashBoardItem extends React.Component { } else subtitle = i18n.t('screens.home.dashboard.todayEventsSubtitleNA'); return ( - - - } - /> - - {props.children} - + + + + + } + /> + + {props.children} + + + ); } diff --git a/src/components/Home/FeedItem.js b/src/components/Home/FeedItem.js index d6cfcfc..d887766 100644 --- a/src/components/Home/FeedItem.js +++ b/src/components/Home/FeedItem.js @@ -1,7 +1,7 @@ // @flow import * as React from 'react'; -import {Button, Card, Text} from 'react-native-paper'; +import {Button, Card, Text, TouchableRipple} from 'react-native-paper'; import {Image, View} from "react-native"; import Autolink from "react-native-autolink"; import i18n from "i18n-js"; @@ -75,45 +75,50 @@ class FeedItem extends React.Component { margin: cardMargin, height: cardHeight, }} - onPress={this.onPress} > - - {hasImage ? - - : null} - - {item.message !== undefined ? - : null - } - - - - + + + + {hasImage ? + + : null} + + {item.message !== undefined ? + : null + } + + + + + + ); } diff --git a/src/components/Home/PreviewEventDashboardItem.js b/src/components/Home/PreviewEventDashboardItem.js index 8434503..a8eb0c8 100644 --- a/src/components/Home/PreviewEventDashboardItem.js +++ b/src/components/Home/PreviewEventDashboardItem.js @@ -1,9 +1,9 @@ // @flow import * as React from 'react'; -import {StyleSheet} from "react-native"; +import {StyleSheet, View} from "react-native"; import i18n from "i18n-js"; -import {Avatar, Button, Card} from 'react-native-paper'; +import {Avatar, Button, Card, TouchableRipple} from 'react-native-paper'; import {getFormattedEventTime, isDescriptionEmpty} from "../../utils/Planning"; import CustomHTML from "../Overrides/CustomHTML"; import type {CustomTheme} from "../../managers/ThemeManager"; @@ -36,31 +36,36 @@ class PreviewEventDashboardItem extends React.Component { return ( - {hasImage ? - : - } - {!isEmpty ? - - - : null} + + + {hasImage ? + : + } + {!isEmpty ? + + + : null} - - - + + + + + ); } else diff --git a/src/components/Lists/CardList/CardListItem.js b/src/components/Lists/CardList/CardListItem.js index 4d44c7b..069d567 100644 --- a/src/components/Lists/CardList/CardListItem.js +++ b/src/components/Lists/CardList/CardListItem.js @@ -1,7 +1,8 @@ // @flow import * as React from 'react'; -import {Caption, Card, Paragraph} from 'react-native-paper'; +import {Caption, Card, Paragraph, TouchableRipple} from 'react-native-paper'; +import {View} from "react-native"; import type {cardItem} from "./CardList"; type Props = { @@ -28,17 +29,23 @@ export default class CardListItem extends React.Component { marginLeft: 'auto', marginRight: 'auto', }} - onPress={item.onPress} > - - - {item.title} - {item.subtitle} - + + + + + {item.title} + {item.subtitle} + + + + ); } -} \ No newline at end of file +}