Skip to content

Commit

Permalink
- [x] [个人中心] 修复了动作字眼, 如游戏: 在看 -> 在玩
Browse files Browse the repository at this point in the history
- [x] 取消App内所有更新字眼和提示
- [x] UGC (用户产生内容) 功能,必须提供用户协议 (应付审核用)
- [x] 社区指导原则页面 (应付审核用)
- [x] 举报入口, 只是个样子 (应付审核用)
  • Loading branch information
czy0729 committed Aug 31, 2019
1 parent bf4dd22 commit 83e6ad1
Show file tree
Hide file tree
Showing 27 changed files with 928 additions and 54 deletions.
6 changes: 5 additions & 1 deletion navigations/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @Author: czy0729
* @Date: 2019-03-29 10:38:12
* @Last Modified by: czy0729
* @Last Modified time: 2019-08-31 01:06:47
* @Last Modified time: 2019-08-31 16:11:30
*/
import React from 'react'
import { StyleSheet, View } from 'react-native'
Expand Down Expand Up @@ -35,7 +35,9 @@ import {
Tag,
Timeline,
Tinygrail,
TinygrailOverview,
Topic,
UGCAgree,
User,
Video,
WebView,
Expand Down Expand Up @@ -107,7 +109,9 @@ const HomeStack = createStackNavigator(
Tag,
Timeline,
Tinygrail,
TinygrailOverview,
Topic,
UGCAgree,
User,
Video,
WebView,
Expand Down
8 changes: 5 additions & 3 deletions screens/_/item/friends.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @Author: czy0729
* @Date: 2019-07-24 13:59:03
* @Last Modified by: czy0729
* @Last Modified time: 2019-08-29 17:14:15
* @Last Modified time: 2019-08-31 16:31:04
*/
import React from 'react'
import { StyleSheet } from 'react-native'
Expand Down Expand Up @@ -41,9 +41,11 @@ function ItemFriends({
<Flex.Item style={[styles.item, _.ml.md]}>
<Flex>
<Flex.Item>
<Text>{userName}</Text>
<Text numberOfLines={1}>{userName}</Text>
</Flex.Item>
<Text size={12}>{recent}</Text>
<Text style={_.ml.sm} size={12}>
{recent}
</Text>
</Flex>
<Text style={_.mt.md} size={10} type='sub'>
{!!doing && `${doing}在看`}
Expand Down
4 changes: 2 additions & 2 deletions screens/auth/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @Author: czy0729
* @Date: 2019-03-31 10:25:46
* @Last Modified by: czy0729
* @Last Modified time: 2019-08-30 23:50:18
* @Last Modified time: 2019-08-31 15:00:10
*/
import React from 'react'
import { View } from 'react-native'
Expand Down Expand Up @@ -55,7 +55,7 @@ class Auth extends React.Component {
]}
name='trophy-full'
color={_.colorYellow}
onPress={() => navigation.push('Tinygrail')}
onPress={() => navigation.push('TinygrailOverview')}
/>
<NavigationEvents
onWillFocus={() => {
Expand Down
4 changes: 2 additions & 2 deletions screens/home/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @Author: czy0729
* @Date: 2019-03-13 08:34:37
* @Last Modified by: czy0729
* @Last Modified time: 2019-08-30 23:50:31
* @Last Modified time: 2019-08-31 14:59:55
*/
import React from 'react'
import { NavigationEvents, SafeAreaView } from 'react-navigation'
Expand Down Expand Up @@ -36,7 +36,7 @@ class Home extends React.Component {
<IconTabsHeader
name='trophy-full'
color={_.colorYellow}
onPress={() => navigation.push('Tinygrail')}
onPress={() => navigation.push('TinygrailOverview')}
/>
<IconTabsHeader
name='search'
Expand Down
7 changes: 5 additions & 2 deletions screens/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @Author: czy0729
* @Date: 2019-04-05 21:04:57
* @Last Modified by: czy0729
* @Last Modified time: 2019-08-25 19:55:41
* @Last Modified time: 2019-08-31 16:11:07
*/
export { default as Anitama } from './anitama'
export { default as Auth } from './auth'
Expand All @@ -26,9 +26,12 @@ export { default as Setting } from './setting'
export { default as Subject } from './subject'
export { default as Tag } from './tag'
export { default as Timeline } from './timeline'
export { default as Tinygrail } from './tinygrail'
export { default as Topic } from './topic'
export { default as UGCAgree } from './ugc-agree'
export { default as User } from './user'
export { default as Video } from './video'
export { default as WebView } from './web-view'
export { default as Zone } from './zone'

export { default as Tinygrail } from './tinygrail/index'
export { default as TinygrailOverview } from './tinygrail/overview'
7 changes: 5 additions & 2 deletions screens/rakuen/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @Author: czy0729
* @Date: 2019-04-26 13:40:51
* @Last Modified by: czy0729
* @Last Modified time: 2019-08-11 14:13:29
* @Last Modified time: 2019-08-31 16:43:56
*/
import React from 'react'
import { View } from 'react-native'
Expand Down Expand Up @@ -55,7 +55,7 @@ class Rakuen extends React.Component {
headerLeft: <IconNotify navigation={navigation} />,
headerRight: (
<Popover
data={['设置', '新讨论']}
data={['设置', '新讨论', '社区指导原则']}
onSelect={title => {
switch (title) {
case '设置':
Expand All @@ -64,6 +64,9 @@ class Rakuen extends React.Component {
case '新讨论':
open(HTML_NEW_TOPIC())
break
case '社区指导原则':
navigation.push('UGCAgree')
break
default:
break
}
Expand Down
18 changes: 10 additions & 8 deletions screens/setting/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @Author: czy0729
* @Date: 2019-05-24 01:34:26
* @Last Modified by: czy0729
* @Last Modified time: 2019-08-31 00:21:54
* @Last Modified time: 2019-08-31 15:05:18
*/
import React from 'react'
import { ScrollView, View } from 'react-native'
Expand All @@ -15,6 +15,7 @@ import { info } from '@utils/ui'
import { appNavigate } from '@utils/app'
import { hm } from '@utils/fetch'
import {
IOS,
FEEDBACK_URL,
GITHUB_URL,
GITHUB_RELEASE_URL,
Expand Down Expand Up @@ -180,10 +181,7 @@ class Setting extends React.Component {
border
hd='章节讨论热力图'
ft={
<Switch
checked={heatMap}
onChange={systemStore.switchHeatMap}
/>
<Switch checked={heatMap} onChange={systemStore.switchHeatMap} />
}
withoutFeedback
/>
Expand All @@ -193,9 +191,9 @@ class Setting extends React.Component {
</Text>
<ItemSetting
style={_.mt.sm}
hd='检测更新'
hd='版本'
ft={
hasNewVersion ? (
hasNewVersion && !IOS ? (
<Text type='success' size={16}>
有新版本{name}
<Text type='sub' size={16}>
Expand Down Expand Up @@ -239,7 +237,11 @@ class Setting extends React.Component {
/>
<ItemSetting
border
hd='退出登陆'
hd={
<Text size={16} type='danger'>
退出登陆
</Text>
}
arrow
highlight
onPress={() => Stores.logout(navigation)}
Expand Down
113 changes: 113 additions & 0 deletions screens/tinygrail/index/award.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
/*
* @Author: czy0729
* @Date: 2019-05-29 16:08:10
* @Last Modified by: czy0729
* @Last Modified time: 2019-08-22 16:59:26
*/
import React from 'react'
import { StyleSheet, ScrollView, View } from 'react-native'
import PropTypes from 'prop-types'
import { Touchable, Image, Text, Flex } from '@components'
import { HOST } from '@constants'
import _ from '@styles'

function Award(props, { navigation }) {
return (
<ScrollView
contentContainerStyle={styles.container}
horizontal
showsHorizontalScrollIndicator={false}
>
<Touchable
style={styles.item}
withoutFeedback
onPress={() =>
navigation.push('Award', {
uri: `${HOST}/award/2018`
})
}
>
<View style={styles.image}>
<Image
style={styles.imageHero}
src={require('@assets/images/hero.png')}
size={148}
placeholder={false}
/>
</View>
<Image
style={styles.imageTitle}
src={require('@assets/images/hero_title.png')}
size={184}
height={148}
resizeMode='contain'
placeholder={false}
/>
</Touchable>
{[2017, 2016, 2015, 2014, 2013, 2012, 2011, 2010].map((item, index) => (
<Touchable
key={item}
style={_.ml.md}
withoutFeedback
onPress={() =>
navigation.push('Award', {
uri: `${HOST}/award/${item}`
})
}
>
<Flex
style={[
styles.itemSquare,
{
backgroundColor: index % 2 === 0 ? _.colorDark : _.colorDanger
}
]}
justify='center'
direction='column'
>
{index === 0 && (
<Text size={20} type='plain' bold>
BEST OF
</Text>
)}
<Text size={20} type='plain' bold>
{item}
</Text>
</Flex>
</Touchable>
))}
</ScrollView>
)
}

Award.contextTypes = {
navigation: PropTypes.object
}

export default Award

const styles = StyleSheet.create({
container: {
padding: _.wind
},
item: {
width: 312
},
itemSquare: {
width: 148,
height: 148,
borderRadius: _.radiusMd,
overflow: 'hidden'
},
image: {
backgroundColor: _.colorDanger,
borderRadius: _.radiusMd,
overflow: 'hidden'
},
imageTitle: {
position: 'absolute',
top: 0,
right: 0,
marginRight: -8
}
})
37 changes: 37 additions & 0 deletions screens/tinygrail/index/header.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
* @Author: czy0729
* @Date: 2019-08-10 17:53:18
* @Last Modified by: czy0729
* @Last Modified time: 2019-08-18 21:40:03
*/
import React from 'react'
import { View } from 'react-native'
import PropTypes from 'prop-types'
import { observer } from 'mobx-react'
import { Text } from '@components'
import { StatusBarPlaceholder } from '@screens/_'
import _ from '@styles'
import Award from './award'
import Section from './section'
import Section2 from './section2'

function Header(props, { $ }) {
const { today } = $.home
return (
<>
<StatusBarPlaceholder style={{ backgroundColor: _.colorBg }} />
<Award />
<Section />
<Section2 />
<View style={[_.container.wind, _.mt.lg]}>
<Text align='right'>{today}</Text>
</View>
</>
)
}

Header.contextTypes = {
$: PropTypes.object
}

export default observer(Header)
Loading

0 comments on commit 83e6ad1

Please sign in to comment.