background

Author: TrustDec

ios/AwesomeProject.xcodeproj/xcshareddata/xcschemes/AwesomeProject.xcscheme

@@ -81,8 +81,8 @@
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

package-lock.json

@@ -28,6 +28,7 @@
     "react-redux": "^5.0.7",
     "redux": "^3.7.2",
     "redux-logger": "^3.0.6",
+    "redux-saga": "^0.16.0",
     "redux-thunk": "^2.2.0",
     "teaset": "^0.5.6"
   },

package.json

@@ -13,10 +13,11 @@ const Button = props => (
         <Text style={styles.buttonTitle}>{props.title}</Text>
     </TouchableOpacity>
 );
+const popupDialogStyle = {overflow: 'hidden'};
 const PopupDialogView = props => (
-    <PopupDialog {...props}>
+    <PopupDialog {...props} dialogStyle={Object.assign({},popupDialogStyle,props.dialogStyle)}>
         {props.children}
-        <View style={{ flexDirection: 'row', position: 'absolute', bottom: 0 }}>
+        <View style={styles.dialogButtonStyle}>
             {props.cancelBtn && (
                 <Button
                     onPress={props.cancelBtn.onPress}
@@ -65,7 +66,7 @@ PopupDialog.defaultProps = {
     cancelBtn: null,
     overlayOpacity: 0.7,
     overlayBackgroundColor: '#000',
-    dialogStyle: { overflow: 'hidden', backgroundColor: 'rgba(0,0,0,.3)' }
+    dialogStyle: { backgroundColor: 'rgba(0,0,0,.3)' }
 };
 const styles = StyleSheet.create({
     container: {
@@ -77,6 +78,11 @@ const styles = StyleSheet.create({
     buttonTitle: {
         color: '#fff',
         fontSize: 16
+    },
+    dialogButtonStyle:{
+        flexDirection: 'row', 
+        position: 'absolute', 
+        bottom: 0
     }
 });
 export default PopupDialogView;

src/modules/PopupDialog.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { StackNavigator, TabNavigator, TabBarBottom } from 'react-navigation';
-import Ionicons from 'react-native-vector-icons/Ionicons';
+import Icons from 'react-native-vector-icons/Ionicons';
 import CardStackStyleInterpolator from 'react-navigation/src/views/CardStack/CardStackStyleInterpolator';
 import LoginScreen from '../page/Login';
 import RootScreen from '../page/Root';
@@ -16,23 +16,28 @@ import ECMAScript2016 from '../page/ECMAScript2016';
 // main
 import MainScreen from '../page/main';
 
-const TabOptions = (title, navigation) => {
+const TabOptions = (title, yesFocused, noFocused,navigation) => {
     const { state, goBack } = navigation;
-    const tabBarLabel = title;
-    // const tabBarIcon = (({ focused }) => (
-    //     focused
-    //         ? <Image source={iconName} resizeMode={'stretch'} style={{ width: WH, height: WH, tintColor: UTIL.THEMEBG }} />
-    //         : <Image source={iconName} resizeMode={'stretch'} style={{ width: WH, height: WH, tintColor: '#B6B9C3' }} />
-    // ));
+    const tabBarLabel = title;//tintColor: '#B6B9C3'
+    const tabBarIcon = (({ focused }) => (
+        focused
+            ? <Icons name={yesFocused} size={28} color={'#188eee'}/>
+            : <Icons name={noFocused} size={28} color={'#B6B9C3'} />
+    ));
+    
 
-    return { tabBarLabel /*tabBarIcon*/ };
+    return { tabBarLabel,tabBarIcon };
 };
 
 export const NavigationBar = TabNavigator(
     {
         HomeController: {
             screen: MainScreen,
-            navigationOptions: ({ navigation }) => TabOptions('微门户', navigation)
+            navigationOptions: ({ navigation }) => TabOptions('圈子', 'ios-aperture','ios-aperture-outline',navigation)
+        },
+        MyController: {
+            screen: MainScreen,
+            navigationOptions: ({ navigation }) => TabOptions('我的','ios-contact','ios-contact-outline', navigation)
         }
     },
     {
@@ -43,7 +48,7 @@ export const NavigationBar = TabNavigator(
         lazy: true,
         backBehavior: 'none',
         tabBarOptions: {
-            activeTintColor: 'red',
+            activeTintColor: '#188eee',
             inactiveTintColor: '#B6B9C3',
             indicatorStyle: { height: 0 },
             showIcon: true,

src/navigators/AppWithNavigation.js

@@ -27,6 +27,17 @@ const customAnimationConfig = {
     }
 };
 export default class MainHomeScreen extends Component {
+    static navigationOptions = ({ navigation, navigationOptions }) => {
+        const { params } = navigation.state;
+        return {
+            title: params ? params.otherParam : 'MainHome',
+            headerStyle: {
+                backgroundColor: "#188eee"
+            },
+            headerRight: <View />,
+            headerTintColor: "#fff"
+        };
+    };
     onExitLogin = () => {
         const resetAction = NavigationActions.reset({
             index: 0,
@@ -39,7 +50,7 @@ export default class MainHomeScreen extends Component {
         return (
             <View>
                 <Text>MainHomeScreen</Text>
-                <Button onClick={this.onExitLogin} title={'退出登录'} bgColor="#C0392C" />
+                <Button onClick={this.onExitLogin} title={'退出登录'} bgColor="#188eee" />
             </View>
         );
     }

src/page/main/index.js

@@ -13,7 +13,7 @@ const PUBLIC_DIALOG = {
     width: 100,
     height: 100,
     overlayOpacity: 0,
-    dialogStyle: { backgroundColor: 'rgba(0, 0, 0, .7)' }
+    dialogStyle: { backgroundColor: 'rgba(0, 0, 0, .7)', }
 };
 
 export const UPDATE_DIALOG = {