Browse Source

Fixed night mode

keplyx 4 years ago
parent
commit
2b21b00ec8

+ 1
- 1
App.js View File

@@ -56,7 +56,7 @@ export default class App extends React.Component<Props, State> {
56 56
         this.setState({
57 57
             currentTheme: ThemeManager.getCurrentTheme()
58 58
         });
59
-        // clearThemeCache();
59
+        clearThemeCache();
60 60
     }
61 61
 
62 62
     /**

+ 6
- 3
components/FetchedDataSectionList.js View File

@@ -80,8 +80,10 @@ export default class FetchedDataSectionList extends React.Component<Props, State
80 80
 
81 81
 
82 82
     componentWillUnmount() {
83
-        this.willBlurSubscription.remove();
84
-        this.willFocusSubscription.remove();
83
+        if (this.willBlurSubscription !== undefined)
84
+            this.willBlurSubscription.remove();
85
+        if (this.willFocusSubscription !== undefined)
86
+            this.willFocusSubscription.remove();
85 87
 
86 88
     }
87 89
 
@@ -211,7 +213,8 @@ export default class FetchedDataSectionList extends React.Component<Props, State
211 213
                         />
212 214
                         <Text>{dataset[i].title}</Text>
213 215
                     </TabHeading>}
214
-                     key={dataset[i].title}>
216
+                     key={dataset[i].title}
217
+                style={{backgroundColor: ThemeManager.getCurrentThemeVariables().containerBgColor}}>
215 218
                     {this.getSectionList(
216 219
                         [
217 220
                             {

+ 1
- 1
native-base-theme/variables/platformDark.js View File

@@ -261,7 +261,7 @@ export default {
261 261
     fetchedDataSectionListErrorText : "#acacac",
262 262
 
263 263
     // PROXIWASH
264
-    proxiwashFinishedColor: "rgba(12,157,13,0.72)",
264
+    proxiwashFinishedColor: "rgba(17,149,32,0.53)",
265 265
     proxiwashReadyColor: "transparent",
266 266
     proxiwashRunningColor: "rgba(29,59,175,0.65)",
267 267
     proxiwashBrokenColor: "#000000",

+ 2
- 0
screens/HomeScreen.js View File

@@ -7,6 +7,7 @@ import i18n from "i18n-js";
7 7
 import CustomMaterialIcon from '../components/CustomMaterialIcon';
8 8
 import FetchedDataSectionList from "../components/FetchedDataSectionList";
9 9
 import Autolink from 'react-native-autolink';
10
+import ThemeManager from "../utils/ThemeManager";
10 11
 
11 12
 const ICON_AMICALE = require('../assets/amicale.png');
12 13
 const NAME_AMICALE = 'Amicale INSA Toulouse';
@@ -97,6 +98,7 @@ export default class HomeScreen extends FetchedDataSectionList {
97 98
                             <Autolink
98 99
                                 text={item.message}
99 100
                                 hashtag="facebook"
101
+                                style={{color: ThemeManager.getCurrentThemeVariables().textColor}}
100 102
                             /> : <View/>
101 103
                         }
102 104
                     </Body>

+ 1
- 0
screens/ProxiwashScreen.js View File

@@ -337,6 +337,7 @@ export default class ProxiwashScreen extends FetchedDataSectionList {
337 337
                         style={{
338 338
                             height: 64,
339 339
                             position: 'absolute',
340
+                            zIndex: 10, // Make sure the button is above the text
340 341
                             right: 0,
341 342
                             width: '100%'
342 343
                         }}

Loading…
Cancel
Save