From 2b21b00ec8711ef60c1a093b7ac70533d719f68c Mon Sep 17 00:00:00 2001
From: keplyx <keplyx@gmail.com>
Date: Mon, 5 Aug 2019 14:52:18 +0200
Subject: [PATCH] Fixed night mode

---
 App.js                                      | 2 +-
 components/FetchedDataSectionList.js        | 9 ++++++---
 native-base-theme/variables/platformDark.js | 2 +-
 screens/HomeScreen.js                       | 2 ++
 screens/ProxiwashScreen.js                  | 1 +
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/App.js b/App.js
index 14f6053..634f571 100644
--- a/App.js
+++ b/App.js
@@ -56,7 +56,7 @@ export default class App extends React.Component<Props, State> {
         this.setState({
             currentTheme: ThemeManager.getCurrentTheme()
         });
-        // clearThemeCache();
+        clearThemeCache();
     }
 
     /**
diff --git a/components/FetchedDataSectionList.js b/components/FetchedDataSectionList.js
index a41dfe3..734826d 100644
--- a/components/FetchedDataSectionList.js
+++ b/components/FetchedDataSectionList.js
@@ -80,8 +80,10 @@ export default class FetchedDataSectionList extends React.Component<Props, State
 
 
     componentWillUnmount() {
-        this.willBlurSubscription.remove();
-        this.willFocusSubscription.remove();
+        if (this.willBlurSubscription !== undefined)
+            this.willBlurSubscription.remove();
+        if (this.willFocusSubscription !== undefined)
+            this.willFocusSubscription.remove();
 
     }
 
@@ -211,7 +213,8 @@ export default class FetchedDataSectionList extends React.Component<Props, State
                         />
                         <Text>{dataset[i].title}</Text>
                     </TabHeading>}
-                     key={dataset[i].title}>
+                     key={dataset[i].title}
+                style={{backgroundColor: ThemeManager.getCurrentThemeVariables().containerBgColor}}>
                     {this.getSectionList(
                         [
                             {
diff --git a/native-base-theme/variables/platformDark.js b/native-base-theme/variables/platformDark.js
index 3cdaa77..89528a9 100644
--- a/native-base-theme/variables/platformDark.js
+++ b/native-base-theme/variables/platformDark.js
@@ -261,7 +261,7 @@ export default {
     fetchedDataSectionListErrorText : "#acacac",
 
     // PROXIWASH
-    proxiwashFinishedColor: "rgba(12,157,13,0.72)",
+    proxiwashFinishedColor: "rgba(17,149,32,0.53)",
     proxiwashReadyColor: "transparent",
     proxiwashRunningColor: "rgba(29,59,175,0.65)",
     proxiwashBrokenColor: "#000000",
diff --git a/screens/HomeScreen.js b/screens/HomeScreen.js
index cb87939..24d6ee9 100644
--- a/screens/HomeScreen.js
+++ b/screens/HomeScreen.js
@@ -7,6 +7,7 @@ import i18n from "i18n-js";
 import CustomMaterialIcon from '../components/CustomMaterialIcon';
 import FetchedDataSectionList from "../components/FetchedDataSectionList";
 import Autolink from 'react-native-autolink';
+import ThemeManager from "../utils/ThemeManager";
 
 const ICON_AMICALE = require('../assets/amicale.png');
 const NAME_AMICALE = 'Amicale INSA Toulouse';
@@ -97,6 +98,7 @@ export default class HomeScreen extends FetchedDataSectionList {
                             <Autolink
                                 text={item.message}
                                 hashtag="facebook"
+                                style={{color: ThemeManager.getCurrentThemeVariables().textColor}}
                             /> : <View/>
                         }
                     </Body>
diff --git a/screens/ProxiwashScreen.js b/screens/ProxiwashScreen.js
index 2ec2a6c..b835b3b 100644
--- a/screens/ProxiwashScreen.js
+++ b/screens/ProxiwashScreen.js
@@ -337,6 +337,7 @@ export default class ProxiwashScreen extends FetchedDataSectionList {
                         style={{
                             height: 64,
                             position: 'absolute',
+                            zIndex: 10, // Make sure the button is above the text
                             right: 0,
                             width: '100%'
                         }}