diff --git a/src/page/DiaryDetailPage.js b/src/page/DiaryDetailPage.js index 2389801..8b9d95d 100644 --- a/src/page/DiaryDetailPage.js +++ b/src/page/DiaryDetailPage.js @@ -184,8 +184,6 @@ export default class DiaryDetailPage extends Component { rightButtons: [{ id: 'navButtonMore', icon: Icon.navButtonMore, - - color: Color.primary // android }] } }); diff --git a/src/page/FollowPage.js b/src/page/FollowPage.js index 3fc6ba5..55ef5e5 100644 --- a/src/page/FollowPage.js +++ b/src/page/FollowPage.js @@ -28,8 +28,6 @@ export default class FollowPage extends Component { rightButtons: [{ id: 'followIcon', icon: Icon.navButtonUserList, - - color: Color.primary // android }] }, statusBar: { diff --git a/src/page/NotebookDetailPage.js b/src/page/NotebookDetailPage.js index d58d1e5..3dcda02 100644 --- a/src/page/NotebookDetailPage.js +++ b/src/page/NotebookDetailPage.js @@ -26,8 +26,6 @@ export default class NotebookDetailPage extends Component { topBar.rightButtons = [{ id: 'navButtonNotebookSetting', icon: Icon.navButtonNotebookSetting, - - color: Color.primary }]; } diff --git a/src/page/NotificationPage.js b/src/page/NotificationPage.js index 1f1eeb7..29d59ce 100644 --- a/src/page/NotificationPage.js +++ b/src/page/NotificationPage.js @@ -28,8 +28,6 @@ export default class NotificationPage extends Component { rightButtons: [{ id: 'history', icon: Icon.navButtonTime, - - color: Color.primary // android }] }, statusBar: { diff --git a/src/page/TopicPage.js b/src/page/TopicPage.js index 4d46110..173161a 100644 --- a/src/page/TopicPage.js +++ b/src/page/TopicPage.js @@ -28,7 +28,6 @@ export default class TopicPage extends Component { rightButtons: [{ id: 'write', icon: Icon.navButtonWrite, - color: Color.primary }] }, statusBar: { diff --git a/src/page/UserPage.js b/src/page/UserPage.js index c72cbf8..8d74bf4 100644 --- a/src/page/UserPage.js +++ b/src/page/UserPage.js @@ -49,7 +49,7 @@ export default class UserPage extends Component { }, rightButtons: [{ id: 'followIcon', - icon: Icon.followIcon + icon: Icon.navButtonFollow }] }, statusBar: { @@ -66,8 +66,6 @@ export default class UserPage extends Component { rightButtons: [{ id: 'setting', icon: Icon.navButtonSetting, - - color: Color.primary }] }, statusBar: { @@ -103,7 +101,7 @@ export default class UserPage extends Component { topBar: { rightButtons: [{ id: 'followIcon', - icon: Icon.followIcon + icon: Icon.navButtonFollow }] } }); diff --git a/src/style/icon.js b/src/style/icon.js index 1310fa2..3e933da 100644 --- a/src/style/icon.js +++ b/src/style/icon.js @@ -1,5 +1,7 @@ import Ionicons from "react-native-vector-icons/Ionicons"; import {Platform} from "react-native"; +import Color from '../style/color'; + let Icon = { homeIcon : null, @@ -35,7 +37,7 @@ let Icon = { }; const outline = Platform.OS === 'ios' ? '-outline' : ''; -const iconColor = '#333333'; +const iconColor = Platform.OS === 'ios' ? Color.primary : '#333333'; async function loadIcon() {