diff --git a/src/components/Lists/CardList/CardList.js b/src/components/Lists/CardList/CardList.js index ebb7e81..7de85d5 100644 --- a/src/components/Lists/CardList/CardList.js +++ b/src/components/Lists/CardList/CardList.js @@ -27,7 +27,7 @@ export default class CardList extends React.Component { renderItem = ({item}: { item: cardItem }) => { return ( - + ); }; @@ -36,7 +36,7 @@ export default class CardList extends React.Component { render() { let containerStyle = { ...this.props.contentContainerStyle, - height: 200, + height: 150, justifyContent: 'space-around', }; if (!this.props.isHorizontal) { @@ -53,7 +53,7 @@ export default class CardList extends React.Component { data={this.props.dataset} renderItem={this.renderItem} keyExtractor={this.keyExtractor} - numColumns={this.props.isHorizontal ? undefined : 2} + numColumns={this.props.isHorizontal ? undefined : 3} horizontal={this.props.isHorizontal} contentContainerStyle={containerStyle} /> diff --git a/src/components/Lists/CardList/CardListItem.js b/src/components/Lists/CardList/CardListItem.js index 37c9fad..086d9d5 100644 --- a/src/components/Lists/CardList/CardListItem.js +++ b/src/components/Lists/CardList/CardListItem.js @@ -1,11 +1,11 @@ // @flow import * as React from 'react'; -import {Caption, Card, Paragraph} from 'react-native-paper'; +import {Text, TouchableRipple} from 'react-native-paper'; +import {Image, View} from 'react-native'; import type {cardItem} from "./CardList"; type Props = { - width: string | number, item: cardItem, } @@ -22,22 +22,31 @@ export default class CardListItem extends React.Component { ? item.image : {uri: item.image}; return ( - - - - {item.title} - {item.subtitle} - - + + + {item.title} + + ); } } \ No newline at end of file diff --git a/src/screens/Services/ServicesScreen.js b/src/screens/Services/ServicesScreen.js index 70289ef..9c93715 100644 --- a/src/screens/Services/ServicesScreen.js +++ b/src/screens/Services/ServicesScreen.js @@ -8,7 +8,7 @@ import {withCollapsible} from "../../utils/withCollapsible"; import {Collapsible} from "react-navigation-collapsible"; import {CommonActions} from "@react-navigation/native"; import {Animated, View} from "react-native"; -import {Avatar, Card, List, TouchableRipple} from "react-native-paper"; +import {Avatar, Card, Divider, List, TouchableRipple} from "react-native-paper"; type Props = { navigation: Object, @@ -229,6 +229,7 @@ class ServicesScreen extends React.Component { paddingBottom: CustomTabBar.TAB_BAR_HEIGHT + 20 }} scrollIndicatorInsets={{top: scrollIndicatorInsetTop}} + ItemSeparatorComponent={() => } /> } }