diff --git a/src/components/Custom/CustomModal.js b/src/components/Custom/CustomModal.js
index 0a9696b..598acc4 100644
--- a/src/components/Custom/CustomModal.js
+++ b/src/components/Custom/CustomModal.js
@@ -3,6 +3,8 @@
import * as React from 'react';
import {withTheme} from 'react-native-paper';
import {Modalize} from "react-native-modalize";
+import {View} from "react-native-animatable";
+import CustomTabBar from "../Tabbar/CustomTabBar";
/**
* Abstraction layer for Modalize component, using custom configuration
@@ -20,7 +22,12 @@ function CustomModal(props) {
modalStyle={{backgroundColor: colors.card}}
handleStyle={{backgroundColor: colors.primary}}
>
- {props.children}
+
+ {props.children}
+
+
);
}
diff --git a/src/components/Lists/WebSectionList.js b/src/components/Lists/WebSectionList.js
index 82f3e10..fca5013 100644
--- a/src/components/Lists/WebSectionList.js
+++ b/src/components/Lists/WebSectionList.js
@@ -261,6 +261,9 @@ class WebSectionList extends React.PureComponent {
},
}}
duration={4000}
+ style={{
+ bottom: CustomTabBar.TAB_BAR_HEIGHT
+ }}
>
{i18n.t("homeScreen.listUpdateFail")}
diff --git a/src/screens/Amicale/Clubs/ClubDisplayScreen.js b/src/screens/Amicale/Clubs/ClubDisplayScreen.js
index 54a2c08..b453655 100644
--- a/src/screens/Amicale/Clubs/ClubDisplayScreen.js
+++ b/src/screens/Amicale/Clubs/ClubDisplayScreen.js
@@ -7,6 +7,7 @@ import ImageModal from 'react-native-image-modal';
import i18n from "i18n-js";
import AuthenticatedScreen from "../../../components/Amicale/AuthenticatedScreen";
import CustomHTML from "../../../components/Custom/CustomHTML";
+import CustomTabBar from "../../../components/Tabbar/CustomTabBar";
type Props = {
navigation: Object,
@@ -90,7 +91,7 @@ class ClubDisplayScreen extends React.Component {
}
const hasManagers = resp.length > 0;
return (
-
+
{
getContent() {
const hasImage = this.displayData.full_picture !== '' && this.displayData.full_picture !== undefined;
return (
-
+
{
uri: this.displayData.full_picture,
}}
/> : null}
-
+
{this.displayData.message !== undefined ?
{
: }
{this.displayData.description !== null ?
-
+
: }
diff --git a/src/screens/Proximo/ProximoAboutScreen.js b/src/screens/Proximo/ProximoAboutScreen.js
index ab540c9..867faeb 100644
--- a/src/screens/Proximo/ProximoAboutScreen.js
+++ b/src/screens/Proximo/ProximoAboutScreen.js
@@ -4,6 +4,7 @@ import * as React from 'react';
import {Image, ScrollView, View} from 'react-native';
import i18n from "i18n-js";
import {Card, List, Paragraph, Text} from 'react-native-paper';
+import CustomTabBar from "../../components/Tabbar/CustomTabBar";
type Props = {
navigation: Object,
@@ -40,7 +41,7 @@ export default class ProximoAboutScreen extends React.Component {
18h30 - 19h30
-
+
}
diff --git a/src/screens/Proxiwash/ProxiwashAboutScreen.js b/src/screens/Proxiwash/ProxiwashAboutScreen.js
index 40a5e19..d573432 100644
--- a/src/screens/Proxiwash/ProxiwashAboutScreen.js
+++ b/src/screens/Proxiwash/ProxiwashAboutScreen.js
@@ -4,6 +4,7 @@ import * as React from 'react';
import {Image, ScrollView, View} from 'react-native';
import i18n from "i18n-js";
import {Card, List, Paragraph, Text, Title} from 'react-native-paper';
+import CustomTabBar from "../../components/Tabbar/CustomTabBar";
type Props = {
navigation: Object,
@@ -67,7 +68,7 @@ export default class ProxiwashAboutScreen extends React.Component {
{i18n.t('proxiwashScreen.dryersTariff')}
-
+
}
diff --git a/src/screens/ScannerScreen.js b/src/screens/ScannerScreen.js
index 105f655..b326ed5 100644
--- a/src/screens/ScannerScreen.js
+++ b/src/screens/ScannerScreen.js
@@ -9,6 +9,7 @@ import URLHandler from "../utils/URLHandler";
import {Linking} from "expo";
import AlertDialog from "../components/Dialog/AlertDialog";
import i18n from 'i18n-js';
+import CustomTabBar from "../components/Tabbar/CustomTabBar";
type Props = {};
type State = {
@@ -141,25 +142,30 @@ class ScannerScreen extends React.Component {
render() {
return (
-
- {this.state.hasPermission
- ? this.getScanner()
- : this.getPermissionScreen()
- }
+
+ {this.state.hasPermission
+ ? this.getScanner()
+ : this.getPermissionScreen()
+ }
+
+
+
-
);
}
@@ -200,8 +206,6 @@ const styles = StyleSheet.create({
container: {
flex: 1,
justifyContent: 'center',
- alignItems: 'center',
- backgroundColor: '#000000' // the rock-solid workaround
},
cameraContainer: {
marginTop: 'auto',