finish night mode

Author: wangdicoder

android/app/app-release.apk

@@ -1 +1 @@
-����şǩ{k���F��}
+T�����g1����i�,l�

android/app/src/main/assets/index.android.bundle

@@ -37,7 +37,8 @@ export function changeShowThumbnail(value, flag=true) {
 
 export function changeNightMode(value, flag=true) {
     if(flag){
-
+        let dao = new SettingsDataDAO();
+        dao.saveOpenNightMode(value);
     }
 
     if(value){
@@ -74,6 +75,17 @@ function fetchShowThumbnailValue() {
     };
 }
 
+function fetchOpenNightModelValue() {
+    return (dispatch) => {
+        let dao = new SettingsDataDAO();
+        dao.getOpenNightModeValue().then((result)=>{
+            dispatch(changeNightMode(result, false));
+        }, (error)=>{
+            dispatch(changeNightMode(error));
+        });
+    };
+}
+
 function fetchThemeColorValue() {
     return (dispatch) => {
         let dao = new SettingsDataDAO();
@@ -101,5 +113,6 @@ export function initialSettingsStateFacade() {
         dispatch(fetchShowThumbnailValue());
         dispatch(fetchThemeColorValue());
         dispatch(fetchDisplayOrderValue());
+        dispatch(fetchOpenNightModelValue());
     }
 }

android/app/src/main/assets/index.android.bundle.meta

@@ -28,7 +28,7 @@ class CollectionFragment extends Component{
                     </ScrollView>
                     :
                     <View style={{flex: 1, justifyContent:'center', alignItems: 'center'}}>
-                        <Text>还没有任何收藏数据，找篇文章收藏吧～</Text>
+                        <Text style={{color: this.props.subTitleColor}}>还没有任何收藏数据，找篇文章收藏吧～</Text>
                     </View>
                 }
             </View>
@@ -40,6 +40,7 @@ const mapStateToProps = (state) => {
     return {
         dataSource: state.favorData.dataSource,
         pageBackgroundColor: state.settingState.colorScheme.pageBackgroundColor,
+        subTitleColor: state.settingState.colorScheme.subTitleColor,
     };
 };
 

js/actions/modifySettings.js

@@ -72,7 +72,7 @@ class DiscoveryFragment extends Component{
     }
 
     _renderHeader(){
-        const {rowItemBackgroundColor, segmentColor} = this.props;
+        const {rowItemBackgroundColor, segmentColor, subTitleColor} = this.props;
         return(
             <View>
                 <View style={[styles.btnPanel, {backgroundColor: rowItemBackgroundColor, borderBottomColor: segmentColor, borderTopColor: segmentColor}]}>
@@ -97,13 +97,13 @@ class DiscoveryFragment extends Component{
                 </View>
                 {this.props.loading ?
                     <View style={[styles.fakeListViewHeader, {backgroundColor: rowItemBackgroundColor, borderBottomColor: segmentColor, borderTopColor: segmentColor}]}>
-                        <Icon name="md-aperture" color={this.props.arrowColor} size={px2dp(16)}/>
-                        <Text style={{color: this.props.arrowColor, marginLeft: px2dp(5)}}>刷新中...</Text>
+                        <Icon name="md-aperture" color={subTitleColor} size={px2dp(16)}/>
+                        <Text style={{color: subTitleColor, marginLeft: px2dp(5)}}>刷新中...</Text>
                     </View>
                     :
                     <View style={[styles.fakeListViewHeader, {backgroundColor: rowItemBackgroundColor, borderBottomColor: segmentColor, borderTopColor: segmentColor}]}>
-                        <Icon name="md-aperture" color={this.props.arrowColor} size={px2dp(16)}/>
-                        <Text style={{color: this.props.arrowColor, marginLeft: px2dp(5)}}>随机干货</Text>
+                        <Icon name="md-aperture" color={subTitleColor} size={px2dp(16)}/>
+                        <Text style={{color: subTitleColor, marginLeft: px2dp(5)}}>随机干货</Text>
                     </View>
                 }
             </View>

js/containers/CollectionTab/index.js

@@ -3,9 +3,10 @@
  */
 'use strict';
 
-const SHOW_THUMBNAIL = 'showThumbnail';
-const THEME_COLOR = 'themeColor';
-const DISPLAY_ORDER = 'displayOrder';
+const SHOW_THUMBNAIL = '@ShowThumbnail';
+const THEME_COLOR = '@ThemeColor';
+const DISPLAY_ORDER = '@DisplayOrder';
+const NIGHT_MODE = '@NightMode';
 
 import {AsyncStorage} from 'react-native';
 
@@ -30,6 +31,25 @@ export default class SettingsDataDAO{
         });
     }
 
+    saveOpenNightMode(value){
+        AsyncStorage.setItem(NIGHT_MODE, value+'');
+    }
+
+    getOpenNightModeValue(){
+        return new Promise((resolve, reject) => {
+            AsyncStorage.getItem(NIGHT_MODE, (error, result) => {
+                if(!error){
+                    if(result === 'true')
+                        resolve(true);
+                    else
+                        resolve(false);
+                }else{
+                    reject(false);
+                }
+            });
+        });
+    }
+
     saveThemeColor(color){
         AsyncStorage.setItem(THEME_COLOR, color);
     }