Improved drawer item display and fixed modal position

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<Props, State> {
         const onListItemPress = this.onListItemPress.bind(this, item);
         if (item.icon !== undefined) {
             return (
-                <DrawerItem
+                <SidebarItem
-                    label={item.name}
+                    title={item.name}
-                    focused={false}
+                    icon={item.icon}
-                    icon={({color, size}) =>
-                        <MaterialCommunityIcons color={color} size={size} name={item.icon}/>}
                     onPress={onListItemPress}
-                    style={{
-                        marginLeft: 0,
-                        marginRight: 0,
-                        padding: 0,
-                        borderRadius: 0
-                    }}
                 />
             );
         } else {

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 (
+        <DrawerItem
+            label={props.title}
+            focused={false}
+            onPress={props.onPress}
+            icon={({color, size}) =>
+                <MaterialCommunityIcons color={color} size={size} name={props.icon}/>}
+            style={{
+                marginLeft: 0,
+                marginRight: 0,
+                padding: 0,
+                borderRadius: 0,
+            }}
+            labelStyle={{
+                color: colors.text,
+            }}
+        />
+    );
+}
+
+export default withTheme(SidebarItem);

screens/Proximo/ProximoListScreen.js

@@ -301,7 +301,9 @@ export default class ProximoListScreen extends React.Component<Props, State> {
     render() {
         console.log("rendering ProximoListScreen");
         return (
-            <View>
+            <View style={{
+                height: '100%'
+            }}>
                 <Modalize
                     ref={this.modalRef}
                     adjustToContentHeight