ready for night mode!

wangdicoder · wangdicoder · commit 987b216e412a · 2016-12-04T23:18:47.000+11:00
diff --git a/js/components/BackPageComponent.js b/js/components/BackPageComponent.js
diff --git a/js/components/NavigationBar.js b/js/components/NavigationBar.js
@@ -131,7 +131,7 @@ const styles = StyleSheet.create({
 
 const mapStateToProps = (state) => {
     return {
-        mainThemeColor: state.settingState.mainThemeColor
+        mainThemeColor: state.settingState.dayMode.mainThemeColor
     };
 };
 
diff --git a/js/containers/DiscoveryTab/ImageTabPage.js b/js/containers/DiscoveryTab/ImageTabPage.js
@@ -8,7 +8,7 @@ import React, {Component} from 'react';
 import {StyleSheet, View, Text, ScrollView, Image} from 'react-native';
 import theme from '../../constants/theme';
 import NavigationBar from '../../components/NavigationBar';
-import BackPageComponent from '../BackPageComponent';
+import BackPageComponent from '../../components/BackPageComponent';
 import getCorrectImageUrl from '../../utils/imageFactory';
 
 export default class ImageTabPage extends BackPageComponent{
diff --git a/js/containers/DiscoveryTab/TextTabPage.js b/js/containers/DiscoveryTab/TextTabPage.js
@@ -11,7 +11,7 @@ import {bindActionCreators} from 'redux';
 import * as Actions from '../../actions/requestTargetData';
 import theme from '../../constants/theme';
 import NavigationBar from '../../components/NavigationBar';
-import BackPageComponent from '../BackPageComponent';
+import BackPageComponent from '../../components/BackPageComponent';
 import ListViewWithInfo from '../../components/ListViewWithInfo';
 
 class TextTabPage extends BackPageComponent{
@@ -110,7 +110,7 @@ const mapStateToProps = (state) => {
         pageNumber: state.targetData.pageNumber,
         isFullData: state.targetData.isFullData,
         error: state.targetData.error,
-        mainThemeColor: state.settingState.mainThemeColor,
+        mainThemeColor: state.settingState.dayMode.mainThemeColor,
         isOpenThumbnail: state.settingState.isOpenThumbnail
     };
 };
diff --git a/js/containers/DiscoveryTab/VideoTabPage.js b/js/containers/DiscoveryTab/VideoTabPage.js
@@ -8,7 +8,7 @@ import React, {Component} from 'react';
 import {View, Text} from 'react-native';
 import theme from '../../constants/theme';
 import NavigationBar from '../../components/NavigationBar';
-import BackPageComponent from '../BackPageComponent';
+import BackPageComponent from '../../components/BackPageComponent';
 
 export default class VideoTabPage extends BackPageComponent{
 
diff --git a/js/containers/DiscoveryTab/index.js b/js/containers/DiscoveryTab/index.js
@@ -39,7 +39,7 @@ class DiscoveryFragment extends Component{
     }
 
     _onEndReached(){
-        if(!this.props.isRenderFooter)
+        if(!this.props.isRenderFooter && !this.props.loading)
             this.props.actions.fetchMoreRandomData();
     }
 
@@ -310,7 +310,7 @@ const mapStateToProps = (state) => {
         loading: state.randomData.loading,
         error: state.randomData.error,
         isRenderFooter: state.randomData.isRenderFooter,
-        mainThemeColor: state.settingState.mainThemeColor,
+        mainThemeColor: state.settingState.dayMode.mainThemeColor,
         isOpenThumbnail: state.settingState.isOpenThumbnail
     };
 };
diff --git a/js/containers/HomeTab/index.js b/js/containers/HomeTab/index.js
@@ -187,7 +187,7 @@ const mapStateToProps = (state) => {
         hasData: state.homeData.hasData,
         dataSource: state.homeData.dataSource,
         dataTime: state.homeData.dataTime,
-        mainThemeColor: state.settingState.mainThemeColor,
+        mainThemeColor: state.settingState.dayMode.mainThemeColor,
         displayOrder: state.settingState.displayOrder
     };
 };
diff --git a/js/containers/MainPage.js b/js/containers/MainPage.js
@@ -110,7 +110,7 @@ const styles = {
 
 const mapStateToProps = (state) => {
     return {
-        mainThemeColor: state.settingState.mainThemeColor
+        mainThemeColor: state.settingState.dayMode.mainThemeColor
     };
 };
 
diff --git a/js/containers/MoreTab/AboutAuthor/index.js b/js/containers/MoreTab/AboutAuthor/index.js
@@ -3,7 +3,7 @@
  */
 import React, {Component} from 'react';
 import {StyleSheet, View, Text} from 'react-native';
-import BackPageComponent from '../../BackPageComponent';
+import BackPageComponent from '../../../components/BackPageComponent';
 import NavigationBar from '../../../components/NavigationBar';
 import theme from '../../../constants/theme';
 
diff --git a/js/containers/MoreTab/AboutGankPage.js b/js/containers/MoreTab/AboutGankPage.js
@@ -3,7 +3,7 @@
  */
 import React, {Component} from 'react';
 import {StyleSheet, View, Text} from 'react-native';
-import BackPageComponent from '../BackPageComponent';
+import BackPageComponent from '../../components/BackPageComponent';
 import NavigationBar from '../../components/NavigationBar';
 import theme from '../../constants/theme';
 
diff --git a/js/containers/MoreTab/OrderContentPage.js b/js/containers/MoreTab/OrderContentPage.js
@@ -6,7 +6,7 @@
 import React, {Component, PropTypes} from 'react';
 import {StyleSheet, View, Platform, Text, PanResponder, AsyncStorage} from 'react-native';
 import Icon from 'react-native-vector-icons/Ionicons';
-import BackPageComponent from '../BackPageComponent';
+import BackPageComponent from '../../components/BackPageComponent';
 import NavigationBar from '../../components/NavigationBar';
 import px2dp from '../../utils/px2dp';
 import theme from '../../constants/theme';
diff --git a/js/containers/MoreTab/ThemeColorPage.js b/js/containers/MoreTab/ThemeColorPage.js
@@ -3,7 +3,7 @@
  */
 import React, {Component} from 'react';
 import {StyleSheet, Platform, View, Text, Image, Button, ScrollView, TouchableOpacity} from 'react-native';
-import BackPageComponent from '../BackPageComponent';
+import BackPageComponent from '../../components/BackPageComponent';
 import NavigationBar from '../../components/NavigationBar';
 import theme from '../../constants/theme';
 import colors from '../../constants/colors';
@@ -118,7 +118,7 @@ const styles = StyleSheet.create({
 
 const mapStateToProps = (state) => {
     return {
-        mainThemeColor: state.settingState.mainThemeColor
+        mainThemeColor: state.settingState.dayMode.mainThemeColor
     };
 };
 
diff --git a/js/containers/MoreTab/index.js b/js/containers/MoreTab/index.js
@@ -164,7 +164,7 @@ const styles = StyleSheet.create({
 
 const mapStateToProps = (state) => {
     return {
-        mainThemeColor: state.settingState.mainThemeColor,
+        mainThemeColor: state.settingState.dayMode.mainThemeColor,
         isOpenThumbnail: state.settingState.isOpenThumbnail
     };
 };
diff --git a/js/containers/WebViewPage.js b/js/containers/WebViewPage.js
@@ -7,7 +7,7 @@ import React, {Component, PropTypes} from 'react';
 import {StyleSheet, View, WebView, InteractionManager, Text, TouchableOpacity, ActivityIndicator, Alert, Linking, Clipboard} from 'react-native';
 import theme from '../constants/theme';
 import NavigationBar from '../components/NavigationBar';
-import BackPageComponent from './BackPageComponent';
+import BackPageComponent from '../components/BackPageComponent';
 import Icon from 'react-native-vector-icons/Ionicons';
 import px2dp from '../utils/px2dp';
 import {connect} from 'react-redux';
@@ -191,7 +191,7 @@ const styles = StyleSheet.create({
 
 const mapStateToProps = (state) => {
     return {
-        mainThemeColor: state.settingState.mainThemeColor,
+        mainThemeColor: state.settingState.dayMode.mainThemeColor,
         isStarred: state.favorData.isStarred
     };
 };
diff --git a/js/reducers/randomData.js b/js/reducers/randomData.js
@@ -7,7 +7,7 @@ import * as TYPES from '../actions/actionTypes';
 
 const initialState = {
     dataSource: [],
-    loading: false,
+    loading: true,
     error: false,
     isRenderFooter: false,
 };
diff --git a/js/reducers/settingState.js b/js/reducers/settingState.js
@@ -7,17 +7,36 @@ import colors from '../constants/colors';
 import * as TYPES from '../actions/actionTypes';
 
 const initialState = {
-    mainThemeColor: colors.dodgerBlue,
-    isOpenThumbnail: false,
-    displayOrder: ['Android','iOS','前端','拓展资源','休息视频','App']
+    isOpenThumbnail: true,
+    displayOrder: ['Android','iOS','前端','拓展资源','休息视频','App'],
+    dayMode: {
+        mainThemeColor: colors.dodgerBlue,
+        pageBackgroundColor: '#f4f4f4',
+        segmentColor: '#ccc',
+        titleColor: '#000',
+        subTitleColor: '#aaa',
+        rowItemBackgroundColor: '#fff'
+    },
+    nightMode: {
+        mainThemeColor: 'rgb(47,47,47)', //200
+        pageBackgroundColor: 'rgb(58,58,58)',
+        segmentColor: 'rgb(54,54,54)',
+        titleColor: 'rgb(177,177,177)',
+        subTitleColor: 'rgb(130,130,130)',
+        rowItemBackgroundColor: 'rgb(63,63,63)',
+    }
 }
 
 export default function settingState(state=initialState, action) {
     switch(action.type){
         case TYPES.CHANGE_COLOR:
             return Object.assign({}, state, {
                 ...state,
-                mainThemeColor: action.color
+                mainThemeColor: action.color,
+                dayMode: {
+                    ...state.dayMode,
+                    mainThemeColor: action.color
+                }
             });
 
         case TYPES.OPEN_SHOW_THUMBNAIL:
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "GankIO",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
