diff --git a/components/Sidebar.js b/components/Sidebar.js index b5ed72f..cd9bc18 100644 --- a/components/Sidebar.js +++ b/components/Sidebar.js @@ -3,11 +3,9 @@ import * as React from 'react'; import {Dimensions, FlatList, Image, Platform, StyleSheet, View} from 'react-native'; import i18n from "i18n-js"; -import {MaterialCommunityIcons} from "@expo/vector-icons"; -import ThemeManager from "../utils/ThemeManager"; import * as WebBrowser from 'expo-web-browser'; import SidebarDivider from "./SidebarDivider"; -import {DrawerItem} from '@react-navigation/drawer'; +import SidebarItem from "./SidebarItem"; const deviceWidth = Dimensions.get("window").width; @@ -147,18 +145,10 @@ export default class SideBar extends React.Component { const onListItemPress = this.onListItemPress.bind(this, item); if (item.icon !== undefined) { return ( - - } + ); } else { diff --git a/components/SidebarItem.js b/components/SidebarItem.js new file mode 100644 index 0000000..3781d29 --- /dev/null +++ b/components/SidebarItem.js @@ -0,0 +1,28 @@ +import * as React from 'react'; +import {withTheme} from 'react-native-paper'; +import {DrawerItem} from "@react-navigation/drawer"; +import {MaterialCommunityIcons} from "@expo/vector-icons"; + +function SidebarItem(props) { + const {colors} = props.theme; + return ( + + } + style={{ + marginLeft: 0, + marginRight: 0, + padding: 0, + borderRadius: 0, + }} + labelStyle={{ + color: colors.text, + }} + /> + ); +} + +export default withTheme(SidebarItem); diff --git a/screens/Proximo/ProximoListScreen.js b/screens/Proximo/ProximoListScreen.js index 22cf447..2c06188 100644 --- a/screens/Proximo/ProximoListScreen.js +++ b/screens/Proximo/ProximoListScreen.js @@ -301,7 +301,9 @@ export default class ProximoListScreen extends React.Component { render() { console.log("rendering ProximoListScreen"); return ( - +