settingState

wangdicoder · wangdicoder · commit c4913d01cf5d · 2016-12-04T02:36:35.000+11:00
diff --git a/android/app/app-release.apk b/android/app/app-release.apk
diff --git a/android/app/src/main/assets/index.android.bundle b/android/app/src/main/assets/index.android.bundle
diff --git a/android/app/src/main/assets/index.android.bundle.meta b/android/app/src/main/assets/index.android.bundle.meta
@@ -1,2 +1 @@
-U\
-�� �Dq�V�u�����
+����şǩ{k���F��}
diff --git a/js/actions/modifySettings.js b/js/actions/modifySettings.js
diff --git a/js/actions/requestHomeData.js b/js/actions/requestHomeData.js
@@ -53,7 +53,7 @@ export function fetchData(date) {
                             Toast.show('今日未更新，为您获取往日干货', {position: px2dp(-80)});
                             dispatch(fetchData(getYesterdayFromDate(date)));
                         }else {
-                            Toast.show('今日干货还没更新哎～', {position: px2dp(-80)});
+                            Toast.show('今日干货还未更新', {position: px2dp(-80)});
                             dispatch(receiveData(localData, date));
                         }
                     }
diff --git a/js/components/ListViewForHome.js b/js/components/ListViewForHome.js
@@ -142,7 +142,7 @@ const styles = StyleSheet.create({
         justifyContent: 'center'
     },
     rowContent: {
-        fontSize: px2dp(15),
+        fontSize: px2dp(14),
         color: '#000'
     }
 });
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.themeColor.mainThemeColor
+        mainThemeColor: state.settingState.mainThemeColor
     };
 };
 
diff --git a/js/containers/DiscoveryTab/TextTabPage.js b/js/containers/DiscoveryTab/TextTabPage.js
@@ -33,7 +33,7 @@ class TextTabPage extends BackPageComponent{
                     {this.props.error ?
                         <View style={styles.indicator}>
                             <Text style={{color: this.props.mainThemeColor}}>Ooops, 获取数据失败~ </Text>
-                            <Button onPress={this._fethchData.bind(this)} title="重新获取"/>
+                            <Button onPress={this._fethchData.bind(this)} title="重新获取" color={this.props.mainThemeColor}/>
                         </View>
                         :
                         (this.props.loading ?
@@ -109,7 +109,7 @@ const mapStateToProps = (state) => {
         pageNumber: state.targetData.pageNumber,
         isFullData: state.targetData.isFullData,
         error: state.targetData.error,
-        mainThemeColor: state.themeColor.mainThemeColor
+        mainThemeColor: state.settingState.mainThemeColor
     };
 };
 
diff --git a/js/containers/DiscoveryTab/index.js b/js/containers/DiscoveryTab/index.js
@@ -62,6 +62,8 @@ class DiscoveryFragment extends Component{
                         <RefreshControl
                             refreshing={this.props.loading}
                             onRefresh={this._onRefresh.bind(this)}
+                            tintColor={this.props.mainThemeColor}
+                            colors={[this.props.mainThemeColor]}
                             title="玩命加载中..."
                         />}
                 />
@@ -71,25 +73,38 @@ class DiscoveryFragment extends Component{
 
     _renderHeader(){
         return(
-            <View style={styles.btnPanel}>
-                {this.tabNames.map((item, i)=>{
-                    return(
-                        <View style={styles.btnRow} key={i}>
-                            {this.tabNames[i].map((subItem, index) => {
-                                return(
-                                    <View style={styles.btnCell} key={subItem}>
-                                        <TouchableOpacity
-                                            onPress={this._itemPressCallback.bind(this, subItem)}
-                                            activeOpacity={theme.touchableOpacityActiveOpacity}>
-                                            {this._renderBtnContent(i,index)}
-                                        </TouchableOpacity>
-                                        <Text style={styles.btnCellLabel}>{subItem}</Text>
-                                    </View>
-                                );
-                            })}
-                        </View>
-                    );
-                })}
+            <View>
+                <View style={styles.btnPanel}>
+                    {this.tabNames.map((item, i)=>{
+                        return(
+                            <View style={styles.btnRow} key={i}>
+                                {this.tabNames[i].map((subItem, index) => {
+                                    return(
+                                        <View style={styles.btnCell} key={subItem}>
+                                            <TouchableOpacity
+                                                onPress={this._itemPressCallback.bind(this, subItem)}
+                                                activeOpacity={theme.touchableOpacityActiveOpacity}>
+                                                {this._renderBtnContent(i,index)}
+                                            </TouchableOpacity>
+                                            <Text style={styles.btnCellLabel}>{subItem}</Text>
+                                        </View>
+                                    );
+                                })}
+                            </View>
+                        );
+                    })}
+                </View>
+                {this.props.loading ?
+                    <View style={styles.fakeListViewHeader}>
+                        <Icon name="md-aperture" size={px2dp(16)}/>
+                        <Text style={{marginLeft: px2dp(5)}}>刷新中...</Text>
+                    </View>
+                    :
+                    <View style={styles.fakeListViewHeader}>
+                        <Icon name="md-aperture" size={px2dp(16)}/>
+                        <Text style={{marginLeft: px2dp(5)}}>随机干货</Text>
+                    </View>
+                }
             </View>
         )
     }
@@ -276,6 +291,16 @@ const styles = StyleSheet.create({
         height: px2dp(60),
         alignItems: 'center',
         justifyContent: 'center',
+    },
+    fakeListViewHeader: {
+        flexDirection: 'row',
+        backgroundColor:'#fff',
+        padding: px2dp(8),
+        borderBottomColor:theme.segment.color,
+        borderBottomWidth:theme.segment.width,
+        borderTopColor: theme.segment.color,
+        borderTopWidth: theme.segment.width,
+        alignItems: 'center'
     }
 });
 
@@ -285,7 +310,7 @@ const mapStateToProps = (state) => {
         loading: state.randomData.loading,
         error: state.randomData.error,
         isRenderFooter: state.randomData.isRenderFooter,
-        mainThemeColor: state.themeColor.mainThemeColor
+        mainThemeColor: state.settingState.mainThemeColor
     };
 };
 
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.themeColor.mainThemeColor
+        mainThemeColor: state.settingState.mainThemeColor
     };
 };
 
diff --git a/js/containers/MainPage.js b/js/containers/MainPage.js
@@ -108,7 +108,7 @@ const styles = {
 
 const mapStateToProps = (state) => {
     return {
-        mainThemeColor: state.themeColor.mainThemeColor
+        mainThemeColor: state.settingState.mainThemeColor
     };
 };
 
diff --git a/js/containers/MoreTab/ThemeColorPage.js b/js/containers/MoreTab/ThemeColorPage.js
@@ -8,7 +8,7 @@ import NavigationBar from '../../components/NavigationBar';
 import theme from '../../constants/theme';
 import colors from '../../constants/colors';
 import px2dp from '../../utils/px2dp';
-import * as Actions from '../../actions/changeThemeColor';
+import {changeColor} from '../../actions/modifySettings';
 import {store} from '../../store/index';
 import {connect} from 'react-redux'
 
@@ -72,7 +72,7 @@ class ThemeColorPage extends BackPageComponent{
     }
 
     _okBtnPressCallback(){
-        store.dispatch(Actions.changeColor(this.state.testColor));
+        store.dispatch(changeColor(this.state.testColor));
         this._handleBack();
     }
 }
@@ -118,7 +118,7 @@ const styles = StyleSheet.create({
 
 const mapStateToProps = (state) => {
     return {
-        mainThemeColor: state.themeColor.mainThemeColor
+        mainThemeColor: state.settingState.mainThemeColor
     };
 };
 
diff --git a/js/containers/MoreTab/index.js b/js/containers/MoreTab/index.js
@@ -161,7 +161,7 @@ const styles = StyleSheet.create({
 
 const mapStateToProps = (state) => {
     return {
-        mainThemeColor: state.themeColor.mainThemeColor
+        mainThemeColor: state.settingState.mainThemeColor
     };
 };
 
diff --git a/js/containers/WebViewPage.js b/js/containers/WebViewPage.js
@@ -191,7 +191,7 @@ const styles = StyleSheet.create({
 
 const mapStateToProps = (state) => {
     return {
-        mainThemeColor: state.themeColor.mainThemeColor,
+        mainThemeColor: state.settingState.mainThemeColor,
         isStarred: state.favorData.isStarred
     };
 };
diff --git a/js/reducers/index.js b/js/reducers/index.js
@@ -6,10 +6,10 @@
 import {combineReducers} from 'redux';
 import homeData from './homeData';
 import targetData from './targetData';
-import themeColor from './themeColor';
+import settingState from './settingState';
 import favorData from './favorData';
 import randomData from './randomData';
 
 export default combineReducers({
-    homeData, targetData, themeColor, favorData, randomData
+    homeData, targetData, settingState, favorData, randomData
 });
diff --git a/js/reducers/settingState.js b/js/reducers/settingState.js
@@ -10,7 +10,7 @@ const initialState = {
     mainThemeColor: colors.dodgerBlue
 }
 
-export default function themeColor(state=initialState, action) {
+export default function settingState(state=initialState, action) {
     switch(action.type){
         case TYPES.CHANGE_COLOR:
             return Object.assign({}, state, {

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-U\`
`2`		`-�� Dq�V�u��`
	`1`	`+��şǩ{k��F��}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ export function fetchData(date) {`
`53`	`53`	`Toast.show('今日未更新，为您获取往日干货', {position: px2dp(-80)});`
`54`	`54`	`dispatch(fetchData(getYesterdayFromDate(date)));`
`55`	`55`	`}else {`
`56`		`- Toast.show('今日干货还没更新哎～', {position: px2dp(-80)});`
	`56`	`+ Toast.show('今日干货还未更新', {position: px2dp(-80)});`
`57`	`57`	`dispatch(receiveData(localData, date));`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ const styles = StyleSheet.create({`
`142`	`142`	`justifyContent: 'center'`
`143`	`143`	`},`
`144`	`144`	`rowContent: {`
`145`		`- fontSize: px2dp(15),`
	`145`	`+ fontSize: px2dp(14),`
`146`	`146`	`color: '#000'`
`147`	`147`	`}`
`148`	`148`	`});`